change, Q_DISABLE_COPY -> T_DISABLE_COPY

wbreadlee · Oct 12, 2016 · dd93926 · dd93926
1 parent 168c9a5
commit dd93926
Show file tree

Hide file tree

Showing 57 changed files with 121 additions and 60 deletions.
diff --git a/src/tabstractcontroller.h b/src/tabstractcontroller.h
@@ -27,7 +27,8 @@ class T_CORE_EXPORT TAbstractController
 
 private:
     QVariantMap exportVars;
-    Q_DISABLE_COPY(TAbstractController)
+    T_DISABLE_COPY(TAbstractController)
+    T_DISABLE_MOVE(TAbstractController)
 };
 
 

diff --git a/src/tabstractlogstream.h b/src/tabstractlogstream.h
@@ -39,7 +39,8 @@ public slots:
     QList<TLogger *> loggerList;
     bool nonBuffering;
 
-    Q_DISABLE_COPY(TAbstractLogStream)
+    T_DISABLE_COPY(TAbstractLogStream)
+    T_DISABLE_MOVE(TAbstractLogStream)
 };
 
 #endif // TABSTRACTLOGSTREAM_H
diff --git a/src/tabstractwebsocket.h b/src/tabstractwebsocket.h
@@ -51,7 +51,8 @@ class T_CORE_EXPORT TAbstractWebSocket
     TBasicTimer *keepAliveTimer;
 
     friend class TWebSocketWorker;
-    Q_DISABLE_COPY(TAbstractWebSocket)
+    T_DISABLE_COPY(TAbstractWebSocket)
+    T_DISABLE_MOVE(TAbstractWebSocket)
 };
 
 #endif // TABSTRACTWEBSOCKET_H
diff --git a/src/taccesslogstream.h b/src/taccesslogstream.h
@@ -21,7 +21,8 @@ class T_CORE_EXPORT TAccessLogStream
 
     // Disable
     TAccessLogStream();
-    Q_DISABLE_COPY(TAccessLogStream)
+    T_DISABLE_COPY(TAccessLogStream)
+    T_DISABLE_MOVE(TAccessLogStream)
 };
 
 #endif // TACCESSLOGSTREAM_H
diff --git a/src/tactioncontext.h b/src/tactioncontext.h
@@ -54,7 +54,8 @@ class T_CORE_EXPORT TActionContext : public TDatabaseContext
     QList<TTemporaryFile *> tempFiles;
     THttpRequest *httpReq;
 
-    Q_DISABLE_COPY(TActionContext)
+    T_DISABLE_COPY(TActionContext)
+    T_DISABLE_MOVE(TActionContext)
 };
 
 #endif // TACTIONCONTEXT_H
diff --git a/src/tactioncontroller.h b/src/tactioncontroller.h
@@ -141,7 +141,8 @@ class T_CORE_EXPORT TActionController : public QObject, public TAbstractControll
     friend class TActionContext;
     friend class TSessionCookieStore;
     friend class TDirectView;
-    Q_DISABLE_COPY(TActionController)
+    T_DISABLE_COPY(TActionController)
+    T_DISABLE_MOVE(TActionController)
 };
 
 

diff --git a/src/tactionmailer.h b/src/tactionmailer.h
@@ -16,7 +16,8 @@ class T_CORE_EXPORT TActionMailer : public TAbstractController
     bool deliver(const QString &templateName = "mail");
 
 private:
-    Q_DISABLE_COPY(TActionMailer)
+    T_DISABLE_COPY(TActionMailer)
+    T_DISABLE_MOVE(TActionMailer)
 };
 
 #endif // TACTIONMAILER_H
diff --git a/src/tactionthread.h b/src/tactionthread.h
@@ -35,7 +35,8 @@ class T_CORE_EXPORT TActionThread : public QThread, public TActionContext
 private:
     THttpSocket *httpSocket;
 
-    Q_DISABLE_COPY(TActionThread)
+    T_DISABLE_COPY(TActionThread)
+    T_DISABLE_MOVE(TActionThread)
 };
 
 #endif // TACTIONTHREAD_H
diff --git a/src/tactionview.h b/src/tactionview.h
@@ -56,7 +56,8 @@ class T_CORE_EXPORT TActionView : public QObject, public TActionHelper, public T
     QString responsebody;
 
 private:
-    Q_DISABLE_COPY(TActionView)
+    T_DISABLE_COPY(TActionView)
+    T_DISABLE_MOVE(TActionView)
 
     void setVariantMap(const QVariantMap &vars);
     void setController(TActionController *controller);

diff --git a/src/tactionworker.h b/src/tactionworker.h
@@ -30,7 +30,8 @@ class T_CORE_EXPORT TActionWorker : public QThread, public TActionContext
     QString clientAddr;
     TEpollHttpSocket *socket;
 
-    Q_DISABLE_COPY(TActionWorker)
+    T_DISABLE_COPY(TActionWorker)
+    T_DISABLE_MOVE(TActionWorker)
 };
 
 #endif // TACTIONWORKER_H
diff --git a/src/tapplicationscheduler.h b/src/tapplicationscheduler.h
@@ -22,7 +22,8 @@ class T_CORE_EXPORT TApplicationScheduler : public TScheduler
     void rollbackTransaction();
 
 private:
-    Q_DISABLE_COPY(TApplicationScheduler)
+    T_DISABLE_COPY(TApplicationScheduler)
+    T_DISABLE_MOVE(TApplicationScheduler)
 };
 
 #endif // TAPPLICATIONSCHEDULER_H
diff --git a/src/tapplicationserverbase.h b/src/tapplicationserverbase.h
@@ -41,7 +41,8 @@ class T_CORE_EXPORT TApplicationServerBase
     friend class TThreadApplicationServer;
     friend class TPreforkApplicationServer;
     friend class TMultiplexingServer;
-    Q_DISABLE_COPY(TApplicationServerBase)
+    T_DISABLE_COPY(TApplicationServerBase)
+    T_DISABLE_MOVE(TApplicationServerBase)
 };
 
 #endif // TAPPLICATIONSERVERBASE_H
diff --git a/src/tappsettings.h b/src/tappsettings.h
@@ -25,6 +25,7 @@ class T_CORE_EXPORT TAppSettings
     QSettings *appIniSettings;
 
     friend class TWebApplication;
-    Q_DISABLE_COPY(TAppSettings)
+    T_DISABLE_COPY(TAppSettings)
+    T_DISABLE_MOVE(TAppSettings)
 };
 #endif // TAPPSETTINGS_H
diff --git a/src/tbasiclogstream.h b/src/tbasiclogstream.h
@@ -23,7 +23,8 @@ class T_CORE_EXPORT TBasicLogStream : public TAbstractLogStream
     QMutex mutex;
     QBasicTimer timer;
 
-    Q_DISABLE_COPY(TBasicLogStream)
+    T_DISABLE_COPY(TBasicLogStream)
+    T_DISABLE_MOVE(TBasicLogStream)
 };
 
 #endif // TBASICLOGSTREAM_H
diff --git a/src/tbasictimer.h b/src/tbasictimer.h
@@ -24,7 +24,8 @@ public slots:
     int interval_;
     QObject *receiver_;
 
-    Q_DISABLE_COPY(TBasicTimer)
+    T_DISABLE_COPY(TBasicTimer)
+    T_DISABLE_MOVE(TBasicTimer)
 };
 
 #endif // TBASICTIMER_H
diff --git a/src/tdatabasecontext.h b/src/tdatabasecontext.h
@@ -33,7 +33,8 @@ class T_CORE_EXPORT TDatabaseContext
 private:
     TSqlTransaction transactions;
 
-    Q_DISABLE_COPY(TDatabaseContext)
+    T_DISABLE_COPY(TDatabaseContext)
+    T_DISABLE_MOVE(TDatabaseContext)
 };
 
 #endif // TDATABASECONTEXT_H
diff --git a/src/tdirectview.h b/src/tdirectview.h
@@ -18,7 +18,8 @@ class T_CORE_EXPORT TDirectView : public TActionView
     bool addCookie(const QByteArray &name, const QByteArray &value, const QDateTime &expire = QDateTime(), const QString &path = QString(), const QString &domain = QString(), bool secure = false, bool httpOnly = false);
 
 private:
-    Q_DISABLE_COPY(TDirectView)
+    T_DISABLE_COPY(TDirectView)
+    T_DISABLE_MOVE(TDirectView)
 };
 
 #endif // TDIRECTVIEW_H
diff --git a/src/tepoll.h b/src/tepoll.h
@@ -57,7 +57,8 @@ class T_CORE_EXPORT TEpoll
     TQueue<TSendData *> sendRequests;
 
     TEpoll();
-    Q_DISABLE_COPY(TEpoll);
+    T_DISABLE_COPY(TEpoll)
+    T_DISABLE_MOVE(TEpoll);
 };
 
 #endif // TEPOLL_H
diff --git a/src/tepollhttpsocket.h b/src/tepollhttpsocket.h
@@ -43,7 +43,8 @@ public slots:
 
     friend class TEpollSocket;
     friend class TActionWorker;
-    Q_DISABLE_COPY(TEpollHttpSocket)
+    T_DISABLE_COPY(TEpollHttpSocket)
+    T_DISABLE_MOVE(TEpollHttpSocket)
 };
 
 #endif // TEPOLLHTTPSOCKET_H
diff --git a/src/tepollsocket.h b/src/tepollsocket.h
@@ -69,7 +69,8 @@ class T_CORE_EXPORT TEpollSocket : public QObject
 
     friend class TEpoll;
     friend class TMultiplexingServer;
-    Q_DISABLE_COPY(TEpollSocket)
+    T_DISABLE_COPY(TEpollSocket)
+    T_DISABLE_MOVE(TEpollSocket)
 };
 
 #endif // TEPOLLSOCKET_H
diff --git a/src/tepollwebsocket.h b/src/tepollwebsocket.h
@@ -57,7 +57,8 @@ public slots:
     TEpollWebSocket(int socketDescriptor, const QHostAddress &address, const THttpRequestHeader &header);
 
     friend class TEpoll;
-    Q_DISABLE_COPY(TEpollWebSocket)
+    T_DISABLE_COPY(TEpollWebSocket)
+    T_DISABLE_MOVE(TEpollWebSocket)
 };
 
 #endif // TEPOLLWEBSOCKET_H
diff --git a/src/tfileaiologger.h b/src/tfileaiologger.h
@@ -26,7 +26,8 @@ class T_CORE_EXPORT TFileAioLogger : public TLogger
 private:
     TFileAioWriter *writer;
 
-    Q_DISABLE_COPY(TFileAioLogger)
+    T_DISABLE_COPY(TFileAioLogger)
+    T_DISABLE_MOVE(TFileAioLogger)
 };
 
 #endif // TFILEAIOLOGGER_H
diff --git a/src/tfileaiowriter.h b/src/tfileaiowriter.h
@@ -24,7 +24,8 @@ class T_CORE_EXPORT TFileAioWriter
 private:
     TFileAioWriterData *d;
 
-    Q_DISABLE_COPY(TFileAioWriter)
+    T_DISABLE_COPY(TFileAioWriter)
+    T_DISABLE_MOVE(TFileAioWriter)
 };
 
 #endif // TFILEAIOWRITER_H
diff --git a/src/thttpresponse.h b/src/thttpresponse.h
@@ -29,7 +29,8 @@ class T_CORE_EXPORT THttpResponse
     QByteArray tmpByteArray;
     QIODevice *bodyDevice;
 
-    Q_DISABLE_COPY(THttpResponse)
+    T_DISABLE_COPY(THttpResponse)
+    T_DISABLE_MOVE(THttpResponse)
 };
 
 

diff --git a/src/thttpsocket.h b/src/thttpsocket.h
@@ -45,7 +45,8 @@ protected slots:
     void requestWrite(const QByteArray &data);  // internal use
 
 private:
-    Q_DISABLE_COPY(THttpSocket)
+    T_DISABLE_COPY(THttpSocket)
+    T_DISABLE_MOVE(THttpSocket)
 
     int sid {0};
     qint64 lengthToRead {-1};

diff --git a/src/thttputility.h b/src/thttputility.h
@@ -38,7 +38,8 @@ class T_CORE_EXPORT THttpUtility
 
 private:
     THttpUtility();
-    Q_DISABLE_COPY(THttpUtility)
+    T_DISABLE_COPY(THttpUtility)
+    T_DISABLE_MOVE(THttpUtility)
 };
 
 

diff --git a/src/tjsmodule.h b/src/tjsmodule.h
@@ -38,7 +38,8 @@ class T_CORE_EXPORT TJSModule : public QObject
     QString moduleFilePath;
     QMutex mutex;
 
-    Q_DISABLE_COPY(TJSModule);
+    T_DISABLE_COPY(TJSModule)
+    T_DISABLE_MOVE(TJSModule);
 
     friend class TJSLoader;
     friend class TReactComponent;

diff --git a/src/tkvsdatabasepool.h b/src/tkvsdatabasepool.h
@@ -36,7 +36,8 @@ class T_CORE_EXPORT TKvsDatabasePool : public QObject
     static int maxDbConnectionsPerProcess();
 
 private:
-    Q_DISABLE_COPY(TKvsDatabasePool)
+    T_DISABLE_COPY(TKvsDatabasePool)
+    T_DISABLE_MOVE(TKvsDatabasePool)
     TKvsDatabasePool(const QString &environment);
 
     TStack<QString> *cachedDatabase {nullptr};

diff --git a/src/tmodelobject.h b/src/tmodelobject.h
@@ -23,7 +23,8 @@ class T_CORE_EXPORT TModelObject : public QObject
     virtual QStringList propertyNames() const;
 
 private:
-    Q_DISABLE_COPY(TModelObject)
+    T_DISABLE_COPY(TModelObject)
+    T_DISABLE_MOVE(TModelObject)
 };
 
 #endif // TMODELOBJECT_H
diff --git a/src/tmongocursor.h b/src/tmongocursor.h
@@ -29,7 +29,8 @@ class T_CORE_EXPORT TMongoCursor
 
     TMongoCursor();
     friend class TMongoDriver;
-    Q_DISABLE_COPY(TMongoCursor)
+    T_DISABLE_COPY(TMongoCursor)
+    T_DISABLE_MOVE(TMongoCursor)
 };
 
 #endif // TMONGOCURSOR_H
diff --git a/src/tmongodriver.h b/src/tmongodriver.h
@@ -50,7 +50,8 @@ class T_CORE_EXPORT TMongoDriver : public TKvsDriver
     int errorCode;
     QString errorString;
 
-    Q_DISABLE_COPY(TMongoDriver)
+    T_DISABLE_COPY(TMongoDriver)
+    T_DISABLE_MOVE(TMongoDriver)
 };
 
 #endif // TMONGODRIVER_H
diff --git a/src/tmongoodmapper.h b/src/tmongoodmapper.h
@@ -56,7 +56,8 @@ class TMongoODMapper : protected TMongoQuery
     QString sortColumn;
     Tf::SortOrder sortOrder;
 
-    Q_DISABLE_COPY(TMongoODMapper)
+    T_DISABLE_COPY(TMongoODMapper)
+    T_DISABLE_MOVE(TMongoODMapper)
 };
 
 

diff --git a/src/tmultiplexingserver.h b/src/tmultiplexingserver.h
@@ -47,7 +47,8 @@ class T_CORE_EXPORT TMultiplexingServer : public QThread, public TApplicationSer
     QBasicTimer reloadTimer;
 
     TMultiplexingServer(int listeningSocket, QObject *parent = 0);  // Constructor
-    Q_DISABLE_COPY(TMultiplexingServer)
+    T_DISABLE_COPY(TMultiplexingServer)
+    T_DISABLE_MOVE(TMultiplexingServer)
 };
 
 

diff --git a/src/tpopmailer.h b/src/tpopmailer.h
@@ -43,7 +43,8 @@ class T_CORE_EXPORT TPopMailer : public QObject
     bool write(const QByteArray &command);
 
 private:
-    Q_DISABLE_COPY(TPopMailer)
+    T_DISABLE_COPY(TPopMailer)
+    T_DISABLE_MOVE(TPopMailer)
 
     QTcpSocket *socket;
     QString popHostName;

diff --git a/src/tpreforkapplicationserver.h b/src/tpreforkapplicationserver.h
@@ -24,7 +24,8 @@ class T_CORE_EXPORT TPreforkApplicationServer : public QTcpServer, public TAppli
 #endif
 
 private:
-    Q_DISABLE_COPY(TPreforkApplicationServer)
+    T_DISABLE_COPY(TPreforkApplicationServer)
+    T_DISABLE_MOVE(TPreforkApplicationServer)
 };
 
 #endif // TPREFORKAPPLICATIONSERVER_H
diff --git a/src/tpublisher.h b/src/tpublisher.h
@@ -35,7 +35,8 @@ protected slots:
     TPublisher();
     QMap<QString, Pub*> pubobj;
 
-    Q_DISABLE_COPY(TPublisher)
+    T_DISABLE_COPY(TPublisher)
+    T_DISABLE_MOVE(TPublisher)
 };
 
 #endif // TPUBLISHER_H
diff --git a/src/treactcomponent.h b/src/treactcomponent.h
@@ -23,7 +23,8 @@ class T_CORE_EXPORT TReactComponent
     TJSLoader *jsLoader;
     QDateTime loadedTime;
 
-    Q_DISABLE_COPY(TReactComponent)
+    T_DISABLE_COPY(TReactComponent)
+    T_DISABLE_MOVE(TReactComponent)
 };
 
 #endif // TREACTCOMPONENT_H
diff --git a/src/tredisdriver.h b/src/tredisdriver.h
@@ -47,7 +47,8 @@ class T_CORE_EXPORT TRedisDriver : public TKvsDriver
     QByteArray buffer;
     int pos;
 
-    Q_DISABLE_COPY(TRedisDriver)
+    T_DISABLE_COPY(TRedisDriver)
+    T_DISABLE_MOVE(TRedisDriver)
 };
 
 #endif // TREDISDRIVER_H
diff --git a/src/tscheduler.h b/src/tscheduler.h
@@ -35,7 +35,8 @@ private slots:
     QTimer *timer;
     bool rollback {false};
 
-    Q_DISABLE_COPY(TScheduler)
+    T_DISABLE_COPY(TScheduler)
+    T_DISABLE_MOVE(TScheduler)
 };
 
 #endif // TSCHEDULER_H
diff --git a/src/tsendbuffer.h b/src/tsendbuffer.h
@@ -37,7 +37,8 @@ class T_CORE_EXPORT TSendBuffer
     TSendBuffer();
 
     friend class TEpollSocket;
-    Q_DISABLE_COPY(TSendBuffer)
+    T_DISABLE_COPY(TSendBuffer)
+    T_DISABLE_MOVE(TSendBuffer)
 };
 
 #endif // THTTPBUFFER_H