update TSqlJoin class

Author: treefrogframework

src/tabstractcontroller.h

@@ -35,6 +35,11 @@ class T_CORE_EXPORT TAbstractController : public QObject {
     void setContext(TActionContext *context) { _context = context; }
     static QThread *currentThread() { return QThread::currentThread(); }
 
+    TAbstractController(const TAbstractController &) = delete;
+    TAbstractController &operator=(const TAbstractController &) = delete;
+    TAbstractController(TAbstractController &&) = delete;
+    TAbstractController &operator=(TAbstractController &&) = delete;
+
 protected:
     virtual TSession &session();
     virtual bool addCookie(const TCookie &cookie);
@@ -54,8 +59,6 @@ class T_CORE_EXPORT TAbstractController : public QObject {
     QVariantMap _exportVars;
     TActionContext *_context {nullptr};
 
-    T_DISABLE_COPY(TAbstractController)
-    T_DISABLE_MOVE(TAbstractController)
     friend class TDirectView;
 };
 

src/tsqljoin.h

@@ -13,29 +13,20 @@
 template <class T>
 class TSqlJoin {
 public:
-    TSqlJoin();
     TSqlJoin(int joinColumn, const TCriteria &criteria);
     TSqlJoin(TSql::JoinMode joinMode, int joinColumn, const TCriteria &criteria);
-    TSqlJoin(const TSqlJoin &other);
 
-    TSqlJoin &operator=(const TSqlJoin &other);
     TSql::JoinMode joinMode() const { return _mode; }
     int joinColumn() const { return _joinColumn; }
     TCriteria criteria() const { return _criteria; }
 
 private:
-    TSql::JoinMode _mode;
-    int _joinColumn;
+    TSql::JoinMode _mode {TSql::InnerJoin};
+    int _joinColumn {-1};
     TCriteria _criteria;
 };
 
 
-template <class T>
-inline TSqlJoin<T>::TSqlJoin() :
-    _mode(TSql::InnerJoin), _joinColumn(-1), _criteria()
-{
-}
-
 template <class T>
 inline TSqlJoin<T>::TSqlJoin(int joinColumn, const TCriteria &criteria) :
     _mode(TSql::InnerJoin), _joinColumn(joinColumn), _criteria(criteria)
@@ -47,18 +38,3 @@ inline TSqlJoin<T>::TSqlJoin(TSql::JoinMode joinMode, int joinColumn, const TCri
     _mode(joinMode), _joinColumn(joinColumn), _criteria(criteria)
 {
 }
-
-template <class T>
-inline TSqlJoin<T>::TSqlJoin(const TSqlJoin &other) :
-    _mode(other.mode), _joinColumn(other._joinColumn), _criteria(other._criteria)
-{
-}
-
-template <class T>
-inline TSqlJoin<T> &TSqlJoin<T>::operator=(const TSqlJoin &other)
-{
-    _mode = other._mode;
-    _joinColumn = other._joinColumn;
-    _criteria = other._criteria;
-}
-