Move SQL object classes into a separate directory

src/AddRecordDialog.h

@@ -1,7 +1,7 @@
 #ifndef ADDRECORDDIALOG_H
 #define ADDRECORDDIALOG_H
 
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 #include <QDialog>
 

src/ColumnDisplayFormatDialog.cpp

@@ -1,6 +1,6 @@
 #include "ColumnDisplayFormatDialog.h"
 #include "ui_ColumnDisplayFormatDialog.h"
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 ColumnDisplayFormatDialog::ColumnDisplayFormatDialog(const QString& colname, QString current_format, QWidget* parent)
     : QDialog(parent),

src/EditIndexDialog.h

@@ -1,7 +1,7 @@
 #ifndef EDITINDEXDIALOG_H
 #define EDITINDEXDIALOG_H
 
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 #include <QDialog>
 #include <QModelIndex>

src/EditTableDialog.h

@@ -1,7 +1,7 @@
 #ifndef EDITTABLEDIALOG_H
 #define EDITTABLEDIALOG_H
 
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 #include <QDialog>
 

src/ExportDataDialog.h

@@ -3,7 +3,7 @@
 
 #include <QDialog>
 
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 class DBBrowserDB;
 

src/ExtendedTableWidget.cpp

@@ -1,7 +1,7 @@
 #include "ExtendedTableWidget.h"
 #include "sqlitetablemodel.h"
 #include "FilterTableHeader.h"
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 #include "Settings.h"
 
 #include <QApplication>

src/ImportCsvDialog.h

@@ -2,7 +2,7 @@
 #define IMPORTCSVDIALOG_H
 
 #include "csvparser.h"
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 #include <QDialog>
 #include <functional>

src/SqlUiLexer.cpp

@@ -3,7 +3,7 @@
 #include "SqlUiLexer.h"
 #include "Qsci/qsciapis.h"
 #include "Settings.h"
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 SqlUiLexer::SqlUiLexer(QObject* parent) :
     QsciLexerSQL(parent)

src/sqlitedb.h

@@ -1,7 +1,7 @@
 #ifndef SQLITEDB_H
 #define SQLITEDB_H
 
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 
 #include <memory>
 #include <mutex>

src/sqlitetablemodel.h

@@ -9,7 +9,7 @@
 #include <QColor>
 #include <memory>
 
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 #include "RowCache.h"
 #include "CondFormat.h"
 

src/sqltextedit.cpp

@@ -1,4 +1,4 @@
-#include "sqlitetypes.h"
+#include "sql/sqlitetypes.h"
 #include "sqltextedit.h"
 #include "Settings.h"
 #include "SqlUiLexer.h"

src/src.pro

@@ -34,7 +34,7 @@ HEADERS += \
     ExportDataDialog.h \
     ImportCsvDialog.h \
     sqltextedit.h \
-    sqlitetypes.h \
+    sql/sqlitetypes.h \
     csvparser.h \
     ExtendedTableWidget.h \
     grammar/Sqlite3Lexer.hpp \
@@ -85,7 +85,7 @@ SOURCES += \
     ExportDataDialog.cpp \
     ImportCsvDialog.cpp \
     sqltextedit.cpp \
-    sqlitetypes.cpp \
+    sql/sqlitetypes.cpp \
     csvparser.cpp \
     ExtendedTableWidget.cpp \
     grammar/Sqlite3Lexer.cpp \

src/tests/CMakeLists.txt

@@ -10,7 +10,7 @@ set(TESTSQLOBJECTS_SRC
     ../sqlitedb.cpp
     ../sqlitetablemodel.cpp
     ../RowLoader.cpp
-    ../sqlitetypes.cpp
+    ../sql/sqlitetypes.cpp
     ../csvparser.cpp
     ../grammar/Sqlite3Lexer.cpp
     ../grammar/Sqlite3Parser.cpp
@@ -26,7 +26,7 @@ set(TESTSQLOBJECTS_HDR
     ../grammar/sqlite3TokenTypes.hpp
     ../grammar/Sqlite3Lexer.hpp
     ../grammar/Sqlite3Parser.hpp
-    ../sqlitetypes.h
+    ../sql/sqlitetypes.h
     ../Data.h
 )
 
@@ -94,7 +94,7 @@ set(TESTREGEX_SRC
     ../sqlitedb.cpp
     ../sqlitetablemodel.cpp
     ../RowLoader.cpp
-    ../sqlitetypes.cpp
+    ../sql/sqlitetypes.cpp
     ../grammar/Sqlite3Lexer.cpp
     ../grammar/Sqlite3Parser.cpp
     ../Settings.cpp
@@ -109,7 +109,7 @@ set(TESTREGEX_HDR
     ../grammar/sqlite3TokenTypes.hpp
     ../grammar/Sqlite3Lexer.hpp
     ../grammar/Sqlite3Parser.hpp
-    ../sqlitetypes.h
+    ../sql/sqlitetypes.h
     ../Data.h
 )
 

src/tests/testsqlobjects.cpp

@@ -1,5 +1,5 @@
 #include "testsqlobjects.h"
-#include "../sqlitetypes.h"
+#include "../sql/sqlitetypes.h"
 
 #include <QtTest/QtTest>