commit 643f1eeee41c975c77739ea6ad70e326b9065612
author Sebastian Zenker <sebastian.zenker@gmx.de> Mon Jan 18 08:34:57 2016 +0100
committer Nobuaki Sukegawa <nsuke@apache.org> Tue Jan 19 02:48:07 2016 +0900
tree d18136708f6e2b789b23494660d54167e14b6f1b
parent 9be7569ab473962648a9baf184248896022ffc92

THRIFT-3563: C++/Qt: removed usage of macro QT_PREPEND_NAMESPACE()
Client: C++
Patch: Sebastian Zenker

This closes #801

lib/cpp/src/thrift/qt/TQTcpServer.h

diff --git a/lib/cpp/src/thrift/qt/TQTcpServer.h b/lib/cpp/src/thrift/qt/TQTcpServer.h
index 8bbb3df..ebe6432 100644
--- a/lib/cpp/src/thrift/qt/TQTcpServer.h
+++ b/lib/cpp/src/thrift/qt/TQTcpServer.h
@@ -50,7 +50,7 @@
   TQTcpServer(boost::shared_ptr<QTcpServer> server,
               boost::shared_ptr<TAsyncProcessor> processor,
               boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> protocolFactory,
-              QT_PREPEND_NAMESPACE(QObject)* parent = NULL);
+              QObject* parent = NULL);
   virtual ~TQTcpServer();
 
 private Q_SLOTS:
@@ -69,7 +69,7 @@
   boost::shared_ptr<TAsyncProcessor> processor_;
   boost::shared_ptr<apache::thrift::protocol::TProtocolFactory> pfact_;
 
-  std::map<QT_PREPEND_NAMESPACE(QTcpSocket)*, boost::shared_ptr<ConnectionContext> > ctxMap_;
+  std::map<QTcpSocket*, boost::shared_ptr<ConnectionContext> > ctxMap_;
 };
 }
 }