test provate classes

HamedMasafi · Aug 8, 2020 · ef6a30a · ef6a30a
1 parent f7160bd
commit ef6a30a
Show file tree

Hide file tree

Showing 40 changed files with 218 additions and 193 deletions.
diff --git a/src/nut/abstractquery.cpp b/src/nut/abstractquery.cpp
@@ -0,0 +1,43 @@
+/**************************************************************************
+**
+** This file is part of Nut project.
+** https://github.com/HamedMasafi/Nut
+**
+** Nut is free software: you can redistribute it and/or modify
+** it under the terms of the GNU Lesser General Public License as published by
+** the Free Software Foundation, either version 3 of the License, or
+** (at your option) any later version.
+**
+** Nut is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+** GNU Lesser General Public License for more details.
+**
+** You should have received a copy of the GNU Lesser General Public License
+** along with Nut.  If not, see <http://www.gnu.org/licenses/>.
+**
+**************************************************************************/
+
+#include "abstractquery.h"
+#include "abstractquery_p.h"
+
+NUT_BEGIN_NAMESPACE
+
+AbstractQuery::AbstractQuery(QObject *parent) : QObject(parent)
+      , d_ptr(new AbstractQueryPrivate(this))
+{
+
+}
+
+Nut::AbstractQueryPrivate::AbstractQueryPrivate(Nut::AbstractQuery *parent) :
+      q_ptr(parent)
+{
+
+}
+
+Nut::AbstractQueryPrivate::~AbstractQueryPrivate()
+{
+
+}
+
+NUT_END_NAMESPACE
diff --git a/src/nut/querybase_p.h → src/nut/abstractquery.h b/src/nut/querybase_p.h → src/nut/abstractquery.h
@@ -18,37 +18,36 @@
 **
 **************************************************************************/
 
-#ifndef QUERYBASE_H
-#define QUERYBASE_H
+#ifndef NUT_ABSTRACTQUERY_H
+#define NUT_ABSTRACTQUERY_H
 
 #include <QtCore/QObject>
 #include <QtCore/qglobal.h>
 #include <QtCore/QExplicitlySharedDataPointer>
 
 #include "defines.h"
-#include "query_p.h"
+#include "abstractquery_p.h"
 
 NUT_BEGIN_NAMESPACE
 
-//TODO: remove this class
-class Table;
-class AbstractTableSet;
-class NUT_EXPORT QueryBase : public QObject
+class AbstractQueryPrivate;
+class NUT_EXPORT AbstractQuery : public QObject
 {
     Q_OBJECT
 
 protected:
-    QExplicitlySharedDataPointer<QueryPrivate> d;
+    AbstractQueryPrivate *d_ptr;
+    Q_DECLARE_PRIVATE(AbstractQuery)
 
 public:
-    explicit QueryBase(QObject *parent = nullptr);
+    explicit AbstractQuery(QObject *parent = nullptr);
 
 protected:
-//    void addTableToSet(AbstractTableSet *set, Table *table);
+    //    void addTableToSet(TableSetBase *set, Table *table);
 
 public slots:
 };
 
 NUT_END_NAMESPACE
 
-#endif // QUERYBASE_H
+#endif // NUT_ABSTRACTQUERY_H
diff --git a/src/nut/query_p.h → src/nut/abstractquery_p.h b/src/nut/query_p.h → src/nut/abstractquery_p.h
@@ -18,8 +18,19 @@
 **
 **************************************************************************/
 
-#ifndef QUERY_P_H
-#define QUERY_P_H
+#ifndef NUT_QUERY_P_H
+#define NUT_QUERY_P_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists for the convenience
+// of qapplication_*.cpp, qwidget*.cpp and qfiledialog.cpp.  This header
+// file may change from version to version without notice, or even be removed.
+//
+// We mean it.
+//
 
 #include "phrase.h"
 
@@ -31,15 +42,15 @@ NUT_BEGIN_NAMESPACE
 
 class Database;
 class AbstractTableSet;
-class QueryBase;
+class AbstractQuery;
 struct RelationModel;
-class NUT_EXPORT QueryPrivate : public QSharedData {
-    QueryBase *q_ptr;
-    Q_DECLARE_PUBLIC(QueryBase)
+class NUT_EXPORT AbstractQueryPrivate {
+    AbstractQuery *q_ptr;
+    Q_DECLARE_PUBLIC(AbstractQuery)
 
 public:
-    explicit QueryPrivate(QueryBase *parent);
-    ~QueryPrivate();
+    explicit AbstractQueryPrivate(AbstractQuery *parent);
+    ~AbstractQueryPrivate();
 
     QString sql;
     QString className;
@@ -57,4 +68,4 @@ class NUT_EXPORT QueryPrivate : public QSharedData {
 
 NUT_END_NAMESPACE
 
-#endif // QUERY_P_H
+#endif // NUT_QUERY_P_H
diff --git a/src/nut/abstracttableset.h b/src/nut/abstracttableset.h
@@ -26,7 +26,7 @@
 #include <QtCore/QSet>
 #include <QtCore/QExplicitlySharedDataPointer>
 
-#include "defines.h"
+#include <QtNut/defines.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/abstracttablesetdata.h b/src/nut/abstracttablesetdata.h
@@ -22,7 +22,8 @@
 #define NUT_ABSTRACTTABLESETDATA_H
 
 #include <QtCore/QSharedData>
-#include "defines.h"
+
+#include <QtNut/defines.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/bulkinserter.h b/src/nut/bulkinserter.h
@@ -3,9 +3,10 @@
 
 #include <initializer_list>
 #include <QtCore/QDebug>
-#include "defines.h"
-#include "phraselist.h"
-#include "fieldphrase.h"
+#include <QtNut/phraselist.h>
+#include <QtNut/fieldphrase.h>
+
+#include <QtNut/defines.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/changelogtable.h b/src/nut/changelogtable.h
@@ -22,7 +22,7 @@
 #define CHANGELOGTABLE_H
 
 #include <QtCore/qglobal.h>
-#include "table.h"
+#include <QtNut/table.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/database.h b/src/nut/database.h
@@ -26,8 +26,8 @@
 #include <QtCore/QSharedDataPointer>
 #include <QtSql/QSqlDatabase>
 
-#include "defines.h"
-#include "tableset.h"
+#include <QtNut/defines.h>
+#include <QtNut/tableset.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/database_p.h b/src/nut/database_p.h
@@ -21,12 +21,12 @@
 #ifndef DATABASE_P_H
 #define DATABASE_P_H
 
-#include "database.h"
-#include "databasemodel.h"
-
 #include <QtCore/QDebug>
 #include <QtCore/QSharedData>
 
+#include <QtNut/database.h>
+#include <QtNut/databasemodel.h>
+
 NUT_BEGIN_NAMESPACE
 
 class ChangeLogTable;

diff --git a/src/nut/databasemodel.h b/src/nut/databasemodel.h
@@ -25,7 +25,7 @@
 #include <QtCore/QMap>
 #include <QtCore/QString>
 
-#include "defines.h"
+#include <QtNut/defines.h>
 
 class QJsonObject;
 

diff --git a/src/nut/defines.h b/src/nut/defines.h
@@ -23,7 +23,7 @@
 
 #define NUT_NAMESPACE Nut
 
-#include "defines_consts.h"
+#include <QtNut/defines_consts.h>
 #include <QtCore/QtGlobal>
 
 #include <QtCore/QString>

diff --git a/src/nut/generators/abstractsqlgenerator.h b/src/nut/generators/abstractsqlgenerator.h
@@ -24,7 +24,8 @@
 #include <QtCore/qglobal.h>
 #include <QtCore/QObject>
 #include <QtCore/QStringList>
-#include "phrase.h"
+
+#include <QtNut/phrase.h>
 
 class SqlSerializer;
 

diff --git a/src/nut/generators/mysqlgenerator.h b/src/nut/generators/mysqlgenerator.h
@@ -22,7 +22,8 @@
 #define MYSQLGENERATOR_H
 
 #include <QtCore/qglobal.h>
-#include "abstractsqlgenerator.h"
+
+#include <QtNut/abstractsqlgenerator.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/generators/postgresqlgenerator.h b/src/nut/generators/postgresqlgenerator.h
@@ -22,7 +22,8 @@
 #define POSTGRESQLGENERATOR_H
 
 #include <QtCore/qglobal.h>
-#include "abstractsqlgenerator.h"
+
+#include <QtNut/abstractsqlgenerator.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/generators/sqlitegenerator.h b/src/nut/generators/sqlitegenerator.h
@@ -22,7 +22,8 @@
 #define SQLITEGENERATOR_H
 
 #include <QtCore/qglobal.h>
-#include "abstractsqlgenerator.h"
+
+#include <QtNut/abstractsqlgenerator.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/generators/sqlservergenerator.h b/src/nut/generators/sqlservergenerator.h
@@ -22,7 +22,8 @@
 #define SQLSERVERGENERATOR_H
 
 #include <QtCore/qglobal.h>
-#include "abstractsqlgenerator.h"
+
+#include <QtNut/abstractsqlgenerator.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/nut.pro b/src/nut/nut.pro
@@ -30,9 +30,7 @@ HEADERS += \
     $$PWD/changelogtable.h \
     $$PWD/abstracttableset.h \
     $$PWD/abstracttablesetdata.h \
-    $$PWD/querybase_p.h \
     $$PWD/tablemodel.h \
-    $$PWD/query_p.h \
     $$PWD/table.h \
     $$PWD/database.h \
     $$PWD/database_p.h \
@@ -49,7 +47,9 @@ HEADERS += \
     $$PWD/phrases/phrasedatalist.h \
     $$PWD/phrases/phraselist.h \
     $$PWD/phrases/datephrase.h \
-    $$PWD/table_p.h
+    $$PWD/table_p.h \
+    $$PWD/abstractquery.h \
+    $$PWD/abstractquery_p.h
 
 SOURCES += \
     $$PWD/generators/abstractsqlgenerator.cpp \
@@ -64,7 +64,6 @@ SOURCES += \
     $$PWD/databasemodel.cpp \
     $$PWD/abstracttableset.cpp \
     $$PWD/changelogtable.cpp \
-    $$PWD/querybase.cpp \
     $$PWD/tablemodel.cpp \
     $$PWD/table.cpp \
     $$PWD/database.cpp \
@@ -79,7 +78,8 @@ SOURCES += \
     $$PWD/phrases/phrasedata.cpp \
     $$PWD/phrases/phrasedatalist.cpp \
     $$PWD/phrases/phraselist.cpp \
-    $$PWD/phrases/datephrase.cpp
+    $$PWD/phrases/datephrase.cpp \
+    $$PWD/abstractquery.cpp
 
 load(qt_module)
 

diff --git a/src/nut/phrase.h b/src/nut/phrase.h
@@ -21,16 +21,16 @@
 #ifndef PHRASE_H
 #define PHRASE_H
 
-#include "conditionalphrase.h"
-#include "abstractfieldphrase.h"
-#include "fieldphrase.h"
-#include "phraselist.h"
-#include "assignmentphraselist.h"
-#include "phrasedatalist.h"
-#include "phrasedata.h"
-#include "assignmentphrase.h"
-#include "numericphrase.h"
-#include "datephrase.h"
+#include <QtNut/conditionalphrase.h>
+#include <QtNut/abstractfieldphrase.h>
+#include <QtNut/fieldphrase.h>
+#include <QtNut/phraselist.h>
+#include <QtNut/assignmentphraselist.h>
+#include <QtNut/phrasedatalist.h>
+#include <QtNut/phrasedata.h>
+#include <QtNut/assignmentphrase.h>
+#include <QtNut/numericphrase.h>
+#include <QtNut/datephrase.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/phrases/abstractfieldphrase.h b/src/nut/phrases/abstractfieldphrase.h
@@ -21,11 +21,10 @@
 #ifndef ABSTRACTFIELDPHRASE_H
 #define ABSTRACTFIELDPHRASE_H
 
-#include "defines.h"
-
-#include "assignmentphrase.h"
-#include "conditionalphrase.h"
-#include "phraselist.h"
+#include <QtNut/defines.h>
+#include <QtNut/assignmentphrase.h>
+#include <QtNut/conditionalphrase.h>
+#include <QtNut/phraselist.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/phrases/assignmentphrase.h b/src/nut/phrases/assignmentphrase.h
@@ -21,9 +21,8 @@
 #ifndef ASSIGNMENTPHRASE_H
 #define ASSIGNMENTPHRASE_H
 
-#include "defines.h"
-
-#include "assignmentphraselist.h"
+#include <QtNut/defines.h>
+#include <QtNut/assignmentphraselist.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/phrases/assignmentphraselist.h b/src/nut/phrases/assignmentphraselist.h
@@ -21,7 +21,7 @@
 #ifndef ASSIGNMENTPHRASELIST_H
 #define ASSIGNMENTPHRASELIST_H
 
-#include "defines.h"
+#include <QtNut/defines.h>
 
 NUT_BEGIN_NAMESPACE
 

diff --git a/src/nut/phrases/conditionalphrase.h b/src/nut/phrases/conditionalphrase.h
@@ -21,7 +21,7 @@
 #ifndef CONDITIONALPHRASE_H
 #define CONDITIONALPHRASE_H
 
-#include "phrasedata.h"
+#include <QtNut/phrasedata.h>
 
 NUT_BEGIN_NAMESPACE