diff --git a/CMakeLists.txt b/CMakeLists.txt index 85946385..d705a66c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -95,7 +95,7 @@ endif() set(SQLB_HDR src/version.h - src/sqlitetypes.h + src/sql/sqlitetypes.h src/csvparser.h src/sqlite.h src/grammar/sqlite3TokenTypes.hpp @@ -166,7 +166,7 @@ set(SQLB_SRC src/sqlitedb.cpp src/sqlitetablemodel.cpp src/RowLoader.cpp - src/sqlitetypes.cpp + src/sql/sqlitetypes.cpp src/sqltextedit.cpp src/docktextedit.cpp src/csvparser.cpp diff --git a/src/AddRecordDialog.h b/src/AddRecordDialog.h index bb73f5a4..6497f55e 100644 --- a/src/AddRecordDialog.h +++ b/src/AddRecordDialog.h @@ -1,7 +1,7 @@ #ifndef ADDRECORDDIALOG_H #define ADDRECORDDIALOG_H -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" #include diff --git a/src/ColumnDisplayFormatDialog.cpp b/src/ColumnDisplayFormatDialog.cpp index ddba8159..da62c6d5 100644 --- a/src/ColumnDisplayFormatDialog.cpp +++ b/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), diff --git a/src/EditIndexDialog.h b/src/EditIndexDialog.h index 4d70a15d..1034527e 100644 --- a/src/EditIndexDialog.h +++ b/src/EditIndexDialog.h @@ -1,7 +1,7 @@ #ifndef EDITINDEXDIALOG_H #define EDITINDEXDIALOG_H -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" #include #include diff --git a/src/EditTableDialog.h b/src/EditTableDialog.h index 55a527c2..b19a67ef 100644 --- a/src/EditTableDialog.h +++ b/src/EditTableDialog.h @@ -1,7 +1,7 @@ #ifndef EDITTABLEDIALOG_H #define EDITTABLEDIALOG_H -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" #include diff --git a/src/ExportDataDialog.h b/src/ExportDataDialog.h index 3bc0cf73..ae284a5b 100644 --- a/src/ExportDataDialog.h +++ b/src/ExportDataDialog.h @@ -3,7 +3,7 @@ #include -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" class DBBrowserDB; diff --git a/src/ExtendedTableWidget.cpp b/src/ExtendedTableWidget.cpp index 3e9672f2..7320b84e 100644 --- a/src/ExtendedTableWidget.cpp +++ b/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 diff --git a/src/ImportCsvDialog.h b/src/ImportCsvDialog.h index 41ddc022..546bdafb 100644 --- a/src/ImportCsvDialog.h +++ b/src/ImportCsvDialog.h @@ -2,7 +2,7 @@ #define IMPORTCSVDIALOG_H #include "csvparser.h" -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" #include #include diff --git a/src/SqlUiLexer.cpp b/src/SqlUiLexer.cpp index e050eb71..0ffe8f17 100644 --- a/src/SqlUiLexer.cpp +++ b/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) diff --git a/src/sqlitetypes.cpp b/src/sql/sqlitetypes.cpp similarity index 100% rename from src/sqlitetypes.cpp rename to src/sql/sqlitetypes.cpp diff --git a/src/sqlitetypes.h b/src/sql/sqlitetypes.h similarity index 100% rename from src/sqlitetypes.h rename to src/sql/sqlitetypes.h diff --git a/src/sqlitedb.h b/src/sqlitedb.h index 0c01cda2..677b266e 100644 --- a/src/sqlitedb.h +++ b/src/sqlitedb.h @@ -1,7 +1,7 @@ #ifndef SQLITEDB_H #define SQLITEDB_H -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" #include #include diff --git a/src/sqlitetablemodel.h b/src/sqlitetablemodel.h index ee824bdf..43f3f311 100644 --- a/src/sqlitetablemodel.h +++ b/src/sqlitetablemodel.h @@ -9,7 +9,7 @@ #include #include -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" #include "RowCache.h" #include "CondFormat.h" diff --git a/src/sqltextedit.cpp b/src/sqltextedit.cpp index b6f4253f..d05c7beb 100644 --- a/src/sqltextedit.cpp +++ b/src/sqltextedit.cpp @@ -1,4 +1,4 @@ -#include "sqlitetypes.h" +#include "sql/sqlitetypes.h" #include "sqltextedit.h" #include "Settings.h" #include "SqlUiLexer.h" diff --git a/src/src.pro b/src/src.pro index 905bb1fa..a1b5211b 100644 --- a/src/src.pro +++ b/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 \ diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index bc4fc6bd..f23472f6 100644 --- a/src/tests/CMakeLists.txt +++ b/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 ) diff --git a/src/tests/testsqlobjects.cpp b/src/tests/testsqlobjects.cpp index 5060d5dc..dbf2a4ad 100644 --- a/src/tests/testsqlobjects.cpp +++ b/src/tests/testsqlobjects.cpp @@ -1,5 +1,5 @@ #include "testsqlobjects.h" -#include "../sqlitetypes.h" +#include "../sql/sqlitetypes.h" #include