From bebb3391c3db0161986649b99eb546e85c41a853 Mon Sep 17 00:00:00 2001 From: eelke Date: Sun, 26 Nov 2017 13:07:21 +0100 Subject: [PATCH] Builds on windows again --- {src/core => core}/BackupFormatModel.cpp | 0 {src/core => core}/BackupFormatModel.h | 0 {src/core => core}/CMakeLists.txt | 0 {src/core => core}/CsvWriter.cpp | 0 {src/core => core}/CsvWriter.h | 0 {src/core => core}/Expected.h | 0 {src/core => core}/PasswordManager.cpp | 0 {src/core => core}/PasswordManager.h | 0 {src/core => core}/QueuedBackgroundTask.cpp | 0 {src/core => core}/QueuedBackgroundTask.h | 0 {src/core => core}/ScopeGuard.h | 0 {src/core => core}/SqlLexer.cpp | 0 {src/core => core}/SqlLexer.h | 0 core/core.pro | 47 ++++++++++++++ .../core => core}/my_boost_assert_handler.cpp | 0 {src/core => core}/test/main.cpp | 0 {src/core => core}/test/tst_CsvWriter.cpp | 0 .../test/tst_PasswordManager.cpp | 0 {src/core => core}/test/tst_SqlLexer.cpp | 0 {src/core => core}/test/tst_expected.cpp | 0 {src/core => core}/test/tst_scopeguard.cpp | 0 {src/pglab => pglab}/.gitignore | 0 {src/pglab => pglab}/ASyncDBConnection.cpp | 0 {src/pglab => pglab}/ASyncDBConnection.h | 0 {src/pglab => pglab}/ASyncWindow.cpp | 0 {src/pglab => pglab}/ASyncWindow.h | 0 {src/pglab => pglab}/BackupDialog.cpp | 4 ++ {src/pglab => pglab}/BackupDialog.h | 0 {src/pglab => pglab}/BackupDialog.ui | 0 {src/pglab => pglab}/BackupRestore.cpp | 0 {src/pglab => pglab}/CMakeLists.txt | 0 .../CodeBuilderConfiguration.cpp | 4 +- .../CodeBuilderConfiguration.h | 0 {src/pglab => pglab}/ConnectionConfig.cpp | 0 {src/pglab => pglab}/ConnectionConfig.h | 0 {src/pglab => pglab}/ConnectionList.cpp | 0 {src/pglab => pglab}/ConnectionList.h | 0 {src/pglab => pglab}/ConnectionListModel.cpp | 0 {src/pglab => pglab}/ConnectionListModel.h | 0 .../ConnectionManagerWindow.cpp | 0 .../pglab => pglab}/ConnectionManagerWindow.h | 0 .../ConnectionManagerWindow.ui | 0 .../DatabaseInspectorWidget.cpp | 0 .../pglab => pglab}/DatabaseInspectorWidget.h | 0 .../DatabaseInspectorWidget.ui | 0 {src/pglab => pglab}/DatabaseWindow.cpp | 0 {src/pglab => pglab}/DatabaseWindow.h | 0 {src/pglab => pglab}/DatabaseWindow.ui | 0 {src/pglab => pglab}/DatabasesTableModel.cpp | 0 {src/pglab => pglab}/DatabasesTableModel.h | 0 {src/pglab => pglab}/Doxyfile | 0 {src/pglab => pglab}/ExplainTreeModelItem.cpp | 0 {src/pglab => pglab}/ExplainTreeModelItem.h | 0 {src/pglab => pglab}/GlobalIoService.cpp | 0 {src/pglab => pglab}/GlobalIoService.h | 0 {src/pglab => pglab}/MainWindow.cpp | 0 {src/pglab => pglab}/MainWindow.h | 0 {src/pglab => pglab}/MainWindow.ui | 0 {src/pglab => pglab}/MasterController.cpp | 0 {src/pglab => pglab}/MasterController.h | 0 {src/pglab => pglab}/OpenDatabase.cpp | 0 {src/pglab => pglab}/OpenDatabase.h | 0 {src/pglab => pglab}/ParamListModel.cpp | 0 {src/pglab => pglab}/ParamListModel.h | 0 {src/pglab => pglab}/ParamTypeDelegate.cpp | 0 {src/pglab => pglab}/ParamTypeDelegate.h | 0 {src/pglab => pglab}/PgAuthId.cpp | 0 {src/pglab => pglab}/PgAuthId.h | 0 {src/pglab => pglab}/PgAuthIdContainer.cpp | 0 {src/pglab => pglab}/PgAuthIdContainer.h | 0 {src/pglab => pglab}/PgClass.cpp | 0 {src/pglab => pglab}/PgClass.h | 0 {src/pglab => pglab}/PgContainer.h | 0 {src/pglab => pglab}/PgDatabase.cpp | 0 {src/pglab => pglab}/PgDatabase.h | 0 {src/pglab => pglab}/PgDatabaseCatalogue.cpp | 0 {src/pglab => pglab}/PgDatabaseCatalogue.h | 0 {src/pglab => pglab}/PgDatabaseContainer.cpp | 0 {src/pglab => pglab}/PgDatabaseContainer.h | 0 {src/pglab => pglab}/PgNamespace.cpp | 0 {src/pglab => pglab}/PgNamespace.h | 0 {src/pglab => pglab}/PgType.cpp | 0 {src/pglab => pglab}/PgType.h | 0 {src/pglab => pglab}/PgTypeContainer.cpp | 0 {src/pglab => pglab}/PgTypeContainer.h | 0 {src/pglab => pglab}/ProcessStdioWidget.cpp | 0 {src/pglab => pglab}/ProcessStdioWidget.h | 0 {src/pglab => pglab}/ProcessStdioWidget.ui | 0 {src/pglab => pglab}/QueryExplainModel.cpp | 0 {src/pglab => pglab}/QueryExplainModel.h | 0 {src/pglab => pglab}/QueryResultModel.cpp | 0 {src/pglab => pglab}/QueryResultModel.h | 0 {src/pglab => pglab}/QueryTab.cpp | 0 {src/pglab => pglab}/QueryTab.h | 0 {src/pglab => pglab}/QueryTab.ui | 0 {src/pglab => pglab}/RolesTableModel.cpp | 0 {src/pglab => pglab}/RolesTableModel.h | 0 {src/pglab => pglab}/ServerWindow.cpp | 0 {src/pglab => pglab}/ServerWindow.h | 0 {src/pglab => pglab}/ServerWindow.ui | 0 {src/pglab => pglab}/SqlSyntaxHighlighter.cpp | 0 {src/pglab => pglab}/SqlSyntaxHighlighter.h | 0 .../TypeSelectionItemModel.cpp | 0 {src/pglab => pglab}/TypeSelectionItemModel.h | 0 .../icons/16x16/document_green.png | Bin .../icons/16x16/document_red.png | Bin .../icons/16x16/document_yellow.png | Bin {src/pglab => pglab}/icons/about.png | Bin {src/pglab => pglab}/icons/add_connection.png | Bin .../pglab => pglab}/icons/backup_database.png | Bin .../icons/delete_connection.png | Bin {src/pglab => pglab}/icons/folder.png | Bin {src/pglab => pglab}/icons/lightbulb.png | Bin {src/pglab => pglab}/icons/lightbulb_off.png | Bin {src/pglab => pglab}/icons/manage_server.png | Bin {src/pglab => pglab}/icons/new_query_tab.png | Bin .../icons/open_query_window.png | Bin {src/pglab => pglab}/icons/page_white_add.png | Bin .../pglab => pglab}/icons/page_white_copy.png | Bin .../icons/page_white_delete.png | Bin {src/pglab => pglab}/icons/script_delete.png | Bin {src/pglab => pglab}/icons/script_go.png | Bin {src/pglab => pglab}/icons/script_save.png | Bin {src/pglab => pglab}/icons/server_delete.png | Bin {src/pglab => pglab}/icons/server_edit.png | Bin {src/pglab => pglab}/icons/server_go.png | Bin {src/pglab => pglab}/icons/table_save.png | Bin .../icons/token_shortland_character.png | Bin {src/pglab => pglab}/json/json-forwards.h | 0 {src/pglab => pglab}/json/json.h | 0 {src/pglab => pglab}/jsoncpp.cpp | 0 {src/pglab => pglab}/main.cpp | 0 {src/pglab => pglab}/pglab.ico | Bin src/pglab/src.pro => pglab/pglab.pro | 45 +++++-------- {src/pglab => pglab}/resources.qrc | 0 {src/pglab => pglab}/stopwatch.cpp | 0 {src/pglab => pglab}/stopwatch.h | 0 {src/pglab => pglab}/tsqueue.cpp | 0 {src/pglab => pglab}/tsqueue.h | 0 {src/pglab => pglab}/tuplesresultwidget.cpp | 0 {src/pglab => pglab}/tuplesresultwidget.h | 0 {src/pglab => pglab}/tuplesresultwidget.ui | 0 {src/pglab => pglab}/util.cpp | 0 {src/pglab => pglab}/util.h | 0 pglabAll.pro | 11 ++++ {src/pgsql => pgsql}/Pgsql_Connection.cpp | 0 {src/pgsql => pgsql}/Pgsql_Connection.h | 0 {src/pgsql => pgsql}/Pgsql_Params.cpp | 0 {src/pgsql => pgsql}/Pgsql_Params.h | 0 {src/pgsql => pgsql}/Pgsql_Result.cpp | 0 {src/pgsql => pgsql}/Pgsql_Result.h | 0 {src/pgsql => pgsql}/Pgsql_Row.cpp | 0 {src/pgsql => pgsql}/Pgsql_Row.h | 0 {src/pgsql => pgsql}/Pgsql_Value.cpp | 0 {src/pgsql => pgsql}/Pgsql_Value.h | 0 {src/pgsql => pgsql}/Pgsql_declare.h | 0 pgsql/pgsql.pro | 59 ++++++++++++++++++ src/cmake/Modules/FindBotan.cmake | 49 --------------- src/pglab/icons/desktop.ini | 14 ----- src/pgsql/CMakeLists.txt | 22 ------- 160 files changed, 138 insertions(+), 117 deletions(-) rename {src/core => core}/BackupFormatModel.cpp (100%) rename {src/core => core}/BackupFormatModel.h (100%) rename {src/core => core}/CMakeLists.txt (100%) rename {src/core => core}/CsvWriter.cpp (100%) rename {src/core => core}/CsvWriter.h (100%) rename {src/core => core}/Expected.h (100%) rename {src/core => core}/PasswordManager.cpp (100%) rename {src/core => core}/PasswordManager.h (100%) rename {src/core => core}/QueuedBackgroundTask.cpp (100%) rename {src/core => core}/QueuedBackgroundTask.h (100%) rename {src/core => core}/ScopeGuard.h (100%) rename {src/core => core}/SqlLexer.cpp (100%) rename {src/core => core}/SqlLexer.h (100%) create mode 100644 core/core.pro rename {src/core => core}/my_boost_assert_handler.cpp (100%) rename {src/core => core}/test/main.cpp (100%) rename {src/core => core}/test/tst_CsvWriter.cpp (100%) rename {src/core => core}/test/tst_PasswordManager.cpp (100%) rename {src/core => core}/test/tst_SqlLexer.cpp (100%) rename {src/core => core}/test/tst_expected.cpp (100%) rename {src/core => core}/test/tst_scopeguard.cpp (100%) rename {src/pglab => pglab}/.gitignore (100%) rename {src/pglab => pglab}/ASyncDBConnection.cpp (100%) rename {src/pglab => pglab}/ASyncDBConnection.h (100%) rename {src/pglab => pglab}/ASyncWindow.cpp (100%) rename {src/pglab => pglab}/ASyncWindow.h (100%) rename {src/pglab => pglab}/BackupDialog.cpp (99%) rename {src/pglab => pglab}/BackupDialog.h (100%) rename {src/pglab => pglab}/BackupDialog.ui (100%) rename {src/pglab => pglab}/BackupRestore.cpp (100%) rename {src/pglab => pglab}/CMakeLists.txt (100%) rename {src/pglab => pglab}/CodeBuilderConfiguration.cpp (64%) rename {src/pglab => pglab}/CodeBuilderConfiguration.h (100%) rename {src/pglab => pglab}/ConnectionConfig.cpp (100%) rename {src/pglab => pglab}/ConnectionConfig.h (100%) rename {src/pglab => pglab}/ConnectionList.cpp (100%) rename {src/pglab => pglab}/ConnectionList.h (100%) rename {src/pglab => pglab}/ConnectionListModel.cpp (100%) rename {src/pglab => pglab}/ConnectionListModel.h (100%) rename {src/pglab => pglab}/ConnectionManagerWindow.cpp (100%) rename {src/pglab => pglab}/ConnectionManagerWindow.h (100%) rename {src/pglab => pglab}/ConnectionManagerWindow.ui (100%) rename {src/pglab => pglab}/DatabaseInspectorWidget.cpp (100%) rename {src/pglab => pglab}/DatabaseInspectorWidget.h (100%) rename {src/pglab => pglab}/DatabaseInspectorWidget.ui (100%) rename {src/pglab => pglab}/DatabaseWindow.cpp (100%) rename {src/pglab => pglab}/DatabaseWindow.h (100%) rename {src/pglab => pglab}/DatabaseWindow.ui (100%) rename {src/pglab => pglab}/DatabasesTableModel.cpp (100%) rename {src/pglab => pglab}/DatabasesTableModel.h (100%) rename {src/pglab => pglab}/Doxyfile (100%) rename {src/pglab => pglab}/ExplainTreeModelItem.cpp (100%) rename {src/pglab => pglab}/ExplainTreeModelItem.h (100%) rename {src/pglab => pglab}/GlobalIoService.cpp (100%) rename {src/pglab => pglab}/GlobalIoService.h (100%) rename {src/pglab => pglab}/MainWindow.cpp (100%) rename {src/pglab => pglab}/MainWindow.h (100%) rename {src/pglab => pglab}/MainWindow.ui (100%) rename {src/pglab => pglab}/MasterController.cpp (100%) rename {src/pglab => pglab}/MasterController.h (100%) rename {src/pglab => pglab}/OpenDatabase.cpp (100%) rename {src/pglab => pglab}/OpenDatabase.h (100%) rename {src/pglab => pglab}/ParamListModel.cpp (100%) rename {src/pglab => pglab}/ParamListModel.h (100%) rename {src/pglab => pglab}/ParamTypeDelegate.cpp (100%) rename {src/pglab => pglab}/ParamTypeDelegate.h (100%) rename {src/pglab => pglab}/PgAuthId.cpp (100%) rename {src/pglab => pglab}/PgAuthId.h (100%) rename {src/pglab => pglab}/PgAuthIdContainer.cpp (100%) rename {src/pglab => pglab}/PgAuthIdContainer.h (100%) rename {src/pglab => pglab}/PgClass.cpp (100%) rename {src/pglab => pglab}/PgClass.h (100%) rename {src/pglab => pglab}/PgContainer.h (100%) rename {src/pglab => pglab}/PgDatabase.cpp (100%) rename {src/pglab => pglab}/PgDatabase.h (100%) rename {src/pglab => pglab}/PgDatabaseCatalogue.cpp (100%) rename {src/pglab => pglab}/PgDatabaseCatalogue.h (100%) rename {src/pglab => pglab}/PgDatabaseContainer.cpp (100%) rename {src/pglab => pglab}/PgDatabaseContainer.h (100%) rename {src/pglab => pglab}/PgNamespace.cpp (100%) rename {src/pglab => pglab}/PgNamespace.h (100%) rename {src/pglab => pglab}/PgType.cpp (100%) rename {src/pglab => pglab}/PgType.h (100%) rename {src/pglab => pglab}/PgTypeContainer.cpp (100%) rename {src/pglab => pglab}/PgTypeContainer.h (100%) rename {src/pglab => pglab}/ProcessStdioWidget.cpp (100%) rename {src/pglab => pglab}/ProcessStdioWidget.h (100%) rename {src/pglab => pglab}/ProcessStdioWidget.ui (100%) rename {src/pglab => pglab}/QueryExplainModel.cpp (100%) rename {src/pglab => pglab}/QueryExplainModel.h (100%) rename {src/pglab => pglab}/QueryResultModel.cpp (100%) rename {src/pglab => pglab}/QueryResultModel.h (100%) rename {src/pglab => pglab}/QueryTab.cpp (100%) rename {src/pglab => pglab}/QueryTab.h (100%) rename {src/pglab => pglab}/QueryTab.ui (100%) rename {src/pglab => pglab}/RolesTableModel.cpp (100%) rename {src/pglab => pglab}/RolesTableModel.h (100%) rename {src/pglab => pglab}/ServerWindow.cpp (100%) rename {src/pglab => pglab}/ServerWindow.h (100%) rename {src/pglab => pglab}/ServerWindow.ui (100%) rename {src/pglab => pglab}/SqlSyntaxHighlighter.cpp (100%) rename {src/pglab => pglab}/SqlSyntaxHighlighter.h (100%) rename {src/pglab => pglab}/TypeSelectionItemModel.cpp (100%) rename {src/pglab => pglab}/TypeSelectionItemModel.h (100%) rename {src/pglab => pglab}/icons/16x16/document_green.png (100%) rename {src/pglab => pglab}/icons/16x16/document_red.png (100%) rename {src/pglab => pglab}/icons/16x16/document_yellow.png (100%) rename {src/pglab => pglab}/icons/about.png (100%) rename {src/pglab => pglab}/icons/add_connection.png (100%) rename {src/pglab => pglab}/icons/backup_database.png (100%) rename {src/pglab => pglab}/icons/delete_connection.png (100%) rename {src/pglab => pglab}/icons/folder.png (100%) rename {src/pglab => pglab}/icons/lightbulb.png (100%) rename {src/pglab => pglab}/icons/lightbulb_off.png (100%) rename {src/pglab => pglab}/icons/manage_server.png (100%) rename {src/pglab => pglab}/icons/new_query_tab.png (100%) rename {src/pglab => pglab}/icons/open_query_window.png (100%) rename {src/pglab => pglab}/icons/page_white_add.png (100%) rename {src/pglab => pglab}/icons/page_white_copy.png (100%) rename {src/pglab => pglab}/icons/page_white_delete.png (100%) rename {src/pglab => pglab}/icons/script_delete.png (100%) rename {src/pglab => pglab}/icons/script_go.png (100%) rename {src/pglab => pglab}/icons/script_save.png (100%) rename {src/pglab => pglab}/icons/server_delete.png (100%) rename {src/pglab => pglab}/icons/server_edit.png (100%) rename {src/pglab => pglab}/icons/server_go.png (100%) rename {src/pglab => pglab}/icons/table_save.png (100%) rename {src/pglab => pglab}/icons/token_shortland_character.png (100%) rename {src/pglab => pglab}/json/json-forwards.h (100%) rename {src/pglab => pglab}/json/json.h (100%) rename {src/pglab => pglab}/jsoncpp.cpp (100%) rename {src/pglab => pglab}/main.cpp (100%) rename {src/pglab => pglab}/pglab.ico (100%) rename src/pglab/src.pro => pglab/pglab.pro (79%) rename {src/pglab => pglab}/resources.qrc (100%) rename {src/pglab => pglab}/stopwatch.cpp (100%) rename {src/pglab => pglab}/stopwatch.h (100%) rename {src/pglab => pglab}/tsqueue.cpp (100%) rename {src/pglab => pglab}/tsqueue.h (100%) rename {src/pglab => pglab}/tuplesresultwidget.cpp (100%) rename {src/pglab => pglab}/tuplesresultwidget.h (100%) rename {src/pglab => pglab}/tuplesresultwidget.ui (100%) rename {src/pglab => pglab}/util.cpp (100%) rename {src/pglab => pglab}/util.h (100%) create mode 100644 pglabAll.pro rename {src/pgsql => pgsql}/Pgsql_Connection.cpp (100%) rename {src/pgsql => pgsql}/Pgsql_Connection.h (100%) rename {src/pgsql => pgsql}/Pgsql_Params.cpp (100%) rename {src/pgsql => pgsql}/Pgsql_Params.h (100%) rename {src/pgsql => pgsql}/Pgsql_Result.cpp (100%) rename {src/pgsql => pgsql}/Pgsql_Result.h (100%) rename {src/pgsql => pgsql}/Pgsql_Row.cpp (100%) rename {src/pgsql => pgsql}/Pgsql_Row.h (100%) rename {src/pgsql => pgsql}/Pgsql_Value.cpp (100%) rename {src/pgsql => pgsql}/Pgsql_Value.h (100%) rename {src/pgsql => pgsql}/Pgsql_declare.h (100%) create mode 100644 pgsql/pgsql.pro delete mode 100644 src/cmake/Modules/FindBotan.cmake delete mode 100644 src/pglab/icons/desktop.ini delete mode 100644 src/pgsql/CMakeLists.txt diff --git a/src/core/BackupFormatModel.cpp b/core/BackupFormatModel.cpp similarity index 100% rename from src/core/BackupFormatModel.cpp rename to core/BackupFormatModel.cpp diff --git a/src/core/BackupFormatModel.h b/core/BackupFormatModel.h similarity index 100% rename from src/core/BackupFormatModel.h rename to core/BackupFormatModel.h diff --git a/src/core/CMakeLists.txt b/core/CMakeLists.txt similarity index 100% rename from src/core/CMakeLists.txt rename to core/CMakeLists.txt diff --git a/src/core/CsvWriter.cpp b/core/CsvWriter.cpp similarity index 100% rename from src/core/CsvWriter.cpp rename to core/CsvWriter.cpp diff --git a/src/core/CsvWriter.h b/core/CsvWriter.h similarity index 100% rename from src/core/CsvWriter.h rename to core/CsvWriter.h diff --git a/src/core/Expected.h b/core/Expected.h similarity index 100% rename from src/core/Expected.h rename to core/Expected.h diff --git a/src/core/PasswordManager.cpp b/core/PasswordManager.cpp similarity index 100% rename from src/core/PasswordManager.cpp rename to core/PasswordManager.cpp diff --git a/src/core/PasswordManager.h b/core/PasswordManager.h similarity index 100% rename from src/core/PasswordManager.h rename to core/PasswordManager.h diff --git a/src/core/QueuedBackgroundTask.cpp b/core/QueuedBackgroundTask.cpp similarity index 100% rename from src/core/QueuedBackgroundTask.cpp rename to core/QueuedBackgroundTask.cpp diff --git a/src/core/QueuedBackgroundTask.h b/core/QueuedBackgroundTask.h similarity index 100% rename from src/core/QueuedBackgroundTask.h rename to core/QueuedBackgroundTask.h diff --git a/src/core/ScopeGuard.h b/core/ScopeGuard.h similarity index 100% rename from src/core/ScopeGuard.h rename to core/ScopeGuard.h diff --git a/src/core/SqlLexer.cpp b/core/SqlLexer.cpp similarity index 100% rename from src/core/SqlLexer.cpp rename to core/SqlLexer.cpp diff --git a/src/core/SqlLexer.h b/core/SqlLexer.h similarity index 100% rename from src/core/SqlLexer.h rename to core/SqlLexer.h diff --git a/core/core.pro b/core/core.pro new file mode 100644 index 0000000..bb40f96 --- /dev/null +++ b/core/core.pro @@ -0,0 +1,47 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2017-02-26T10:51:14 +# +#------------------------------------------------- + +QT -= gui + +TARGET = core +TEMPLATE = lib +CONFIG += staticlib c++14 + +INCLUDEPATH += C:\prog\include C:\VSproj\boost32\include\boost-1_65_1 +DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX +#LIBS += /LIBPATH:C:\VSproj\boost_1_63_0\stage\lib /LIBPATH:c:\prog\lib\ libpq.lib fmt.lib User32.lib ws2_32.lib + + +# The following define makes your compiler emit warnings if you use +# any feature of Qt which as been marked as deprecated (the exact warnings +# depend on your compiler). Please consult the documentation of the +# deprecated API in order to know how to port your code away from it. +DEFINES += QT_DEPRECATED_WARNINGS + +# You can also make your code fail to compile if you use deprecated APIs. +# In order to do so, uncomment the following line. +# You can also select to disable deprecated APIs only up to a certain version of Qt. +#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0 + +SOURCES += my_boost_assert_handler.cpp \ + SqlLexer.cpp \ + PasswordManager.cpp \ + CsvWriter.cpp \ + BackupFormatModel.cpp \ + QueuedBackgroundTask.cpp + +HEADERS += PasswordManager.h \ + SqlLexer.h \ + ScopeGuard.h \ + CsvWriter.h \ + BackupFormatModel.h \ + QueuedBackgroundTask.h \ + Expected.h + +unix { + target.path = /usr/lib + INSTALLS += target +} diff --git a/src/core/my_boost_assert_handler.cpp b/core/my_boost_assert_handler.cpp similarity index 100% rename from src/core/my_boost_assert_handler.cpp rename to core/my_boost_assert_handler.cpp diff --git a/src/core/test/main.cpp b/core/test/main.cpp similarity index 100% rename from src/core/test/main.cpp rename to core/test/main.cpp diff --git a/src/core/test/tst_CsvWriter.cpp b/core/test/tst_CsvWriter.cpp similarity index 100% rename from src/core/test/tst_CsvWriter.cpp rename to core/test/tst_CsvWriter.cpp diff --git a/src/core/test/tst_PasswordManager.cpp b/core/test/tst_PasswordManager.cpp similarity index 100% rename from src/core/test/tst_PasswordManager.cpp rename to core/test/tst_PasswordManager.cpp diff --git a/src/core/test/tst_SqlLexer.cpp b/core/test/tst_SqlLexer.cpp similarity index 100% rename from src/core/test/tst_SqlLexer.cpp rename to core/test/tst_SqlLexer.cpp diff --git a/src/core/test/tst_expected.cpp b/core/test/tst_expected.cpp similarity index 100% rename from src/core/test/tst_expected.cpp rename to core/test/tst_expected.cpp diff --git a/src/core/test/tst_scopeguard.cpp b/core/test/tst_scopeguard.cpp similarity index 100% rename from src/core/test/tst_scopeguard.cpp rename to core/test/tst_scopeguard.cpp diff --git a/src/pglab/.gitignore b/pglab/.gitignore similarity index 100% rename from src/pglab/.gitignore rename to pglab/.gitignore diff --git a/src/pglab/ASyncDBConnection.cpp b/pglab/ASyncDBConnection.cpp similarity index 100% rename from src/pglab/ASyncDBConnection.cpp rename to pglab/ASyncDBConnection.cpp diff --git a/src/pglab/ASyncDBConnection.h b/pglab/ASyncDBConnection.h similarity index 100% rename from src/pglab/ASyncDBConnection.h rename to pglab/ASyncDBConnection.h diff --git a/src/pglab/ASyncWindow.cpp b/pglab/ASyncWindow.cpp similarity index 100% rename from src/pglab/ASyncWindow.cpp rename to pglab/ASyncWindow.cpp diff --git a/src/pglab/ASyncWindow.h b/pglab/ASyncWindow.h similarity index 100% rename from src/pglab/ASyncWindow.h rename to pglab/ASyncWindow.h diff --git a/src/pglab/BackupDialog.cpp b/pglab/BackupDialog.cpp similarity index 99% rename from src/pglab/BackupDialog.cpp rename to pglab/BackupDialog.cpp index dd6062c..1620453 100644 --- a/src/pglab/BackupDialog.cpp +++ b/pglab/BackupDialog.cpp @@ -9,6 +9,10 @@ #include #include +#ifdef WIN32 +# include // for CreateProcess flags +#endif + BackupDialog::BackupDialog(QWidget *parent) : QDialog(parent), ui(new Ui::BackupDialog) diff --git a/src/pglab/BackupDialog.h b/pglab/BackupDialog.h similarity index 100% rename from src/pglab/BackupDialog.h rename to pglab/BackupDialog.h diff --git a/src/pglab/BackupDialog.ui b/pglab/BackupDialog.ui similarity index 100% rename from src/pglab/BackupDialog.ui rename to pglab/BackupDialog.ui diff --git a/src/pglab/BackupRestore.cpp b/pglab/BackupRestore.cpp similarity index 100% rename from src/pglab/BackupRestore.cpp rename to pglab/BackupRestore.cpp diff --git a/src/pglab/CMakeLists.txt b/pglab/CMakeLists.txt similarity index 100% rename from src/pglab/CMakeLists.txt rename to pglab/CMakeLists.txt diff --git a/src/pglab/CodeBuilderConfiguration.cpp b/pglab/CodeBuilderConfiguration.cpp similarity index 64% rename from src/pglab/CodeBuilderConfiguration.cpp rename to pglab/CodeBuilderConfiguration.cpp index 1cb8dae..946e50d 100644 --- a/src/pglab/CodeBuilderConfiguration.cpp +++ b/pglab/CodeBuilderConfiguration.cpp @@ -1,8 +1,8 @@ -#include "CodeBuilderConfiguration.h" +#include "CodeBuilderConfiguration.h" #include "Pgsql_Result.h" QString CodeBuilder::GenClassDefinition(const Pgsql::Result &result) const { - + return QString(); } diff --git a/src/pglab/CodeBuilderConfiguration.h b/pglab/CodeBuilderConfiguration.h similarity index 100% rename from src/pglab/CodeBuilderConfiguration.h rename to pglab/CodeBuilderConfiguration.h diff --git a/src/pglab/ConnectionConfig.cpp b/pglab/ConnectionConfig.cpp similarity index 100% rename from src/pglab/ConnectionConfig.cpp rename to pglab/ConnectionConfig.cpp diff --git a/src/pglab/ConnectionConfig.h b/pglab/ConnectionConfig.h similarity index 100% rename from src/pglab/ConnectionConfig.h rename to pglab/ConnectionConfig.h diff --git a/src/pglab/ConnectionList.cpp b/pglab/ConnectionList.cpp similarity index 100% rename from src/pglab/ConnectionList.cpp rename to pglab/ConnectionList.cpp diff --git a/src/pglab/ConnectionList.h b/pglab/ConnectionList.h similarity index 100% rename from src/pglab/ConnectionList.h rename to pglab/ConnectionList.h diff --git a/src/pglab/ConnectionListModel.cpp b/pglab/ConnectionListModel.cpp similarity index 100% rename from src/pglab/ConnectionListModel.cpp rename to pglab/ConnectionListModel.cpp diff --git a/src/pglab/ConnectionListModel.h b/pglab/ConnectionListModel.h similarity index 100% rename from src/pglab/ConnectionListModel.h rename to pglab/ConnectionListModel.h diff --git a/src/pglab/ConnectionManagerWindow.cpp b/pglab/ConnectionManagerWindow.cpp similarity index 100% rename from src/pglab/ConnectionManagerWindow.cpp rename to pglab/ConnectionManagerWindow.cpp diff --git a/src/pglab/ConnectionManagerWindow.h b/pglab/ConnectionManagerWindow.h similarity index 100% rename from src/pglab/ConnectionManagerWindow.h rename to pglab/ConnectionManagerWindow.h diff --git a/src/pglab/ConnectionManagerWindow.ui b/pglab/ConnectionManagerWindow.ui similarity index 100% rename from src/pglab/ConnectionManagerWindow.ui rename to pglab/ConnectionManagerWindow.ui diff --git a/src/pglab/DatabaseInspectorWidget.cpp b/pglab/DatabaseInspectorWidget.cpp similarity index 100% rename from src/pglab/DatabaseInspectorWidget.cpp rename to pglab/DatabaseInspectorWidget.cpp diff --git a/src/pglab/DatabaseInspectorWidget.h b/pglab/DatabaseInspectorWidget.h similarity index 100% rename from src/pglab/DatabaseInspectorWidget.h rename to pglab/DatabaseInspectorWidget.h diff --git a/src/pglab/DatabaseInspectorWidget.ui b/pglab/DatabaseInspectorWidget.ui similarity index 100% rename from src/pglab/DatabaseInspectorWidget.ui rename to pglab/DatabaseInspectorWidget.ui diff --git a/src/pglab/DatabaseWindow.cpp b/pglab/DatabaseWindow.cpp similarity index 100% rename from src/pglab/DatabaseWindow.cpp rename to pglab/DatabaseWindow.cpp diff --git a/src/pglab/DatabaseWindow.h b/pglab/DatabaseWindow.h similarity index 100% rename from src/pglab/DatabaseWindow.h rename to pglab/DatabaseWindow.h diff --git a/src/pglab/DatabaseWindow.ui b/pglab/DatabaseWindow.ui similarity index 100% rename from src/pglab/DatabaseWindow.ui rename to pglab/DatabaseWindow.ui diff --git a/src/pglab/DatabasesTableModel.cpp b/pglab/DatabasesTableModel.cpp similarity index 100% rename from src/pglab/DatabasesTableModel.cpp rename to pglab/DatabasesTableModel.cpp diff --git a/src/pglab/DatabasesTableModel.h b/pglab/DatabasesTableModel.h similarity index 100% rename from src/pglab/DatabasesTableModel.h rename to pglab/DatabasesTableModel.h diff --git a/src/pglab/Doxyfile b/pglab/Doxyfile similarity index 100% rename from src/pglab/Doxyfile rename to pglab/Doxyfile diff --git a/src/pglab/ExplainTreeModelItem.cpp b/pglab/ExplainTreeModelItem.cpp similarity index 100% rename from src/pglab/ExplainTreeModelItem.cpp rename to pglab/ExplainTreeModelItem.cpp diff --git a/src/pglab/ExplainTreeModelItem.h b/pglab/ExplainTreeModelItem.h similarity index 100% rename from src/pglab/ExplainTreeModelItem.h rename to pglab/ExplainTreeModelItem.h diff --git a/src/pglab/GlobalIoService.cpp b/pglab/GlobalIoService.cpp similarity index 100% rename from src/pglab/GlobalIoService.cpp rename to pglab/GlobalIoService.cpp diff --git a/src/pglab/GlobalIoService.h b/pglab/GlobalIoService.h similarity index 100% rename from src/pglab/GlobalIoService.h rename to pglab/GlobalIoService.h diff --git a/src/pglab/MainWindow.cpp b/pglab/MainWindow.cpp similarity index 100% rename from src/pglab/MainWindow.cpp rename to pglab/MainWindow.cpp diff --git a/src/pglab/MainWindow.h b/pglab/MainWindow.h similarity index 100% rename from src/pglab/MainWindow.h rename to pglab/MainWindow.h diff --git a/src/pglab/MainWindow.ui b/pglab/MainWindow.ui similarity index 100% rename from src/pglab/MainWindow.ui rename to pglab/MainWindow.ui diff --git a/src/pglab/MasterController.cpp b/pglab/MasterController.cpp similarity index 100% rename from src/pglab/MasterController.cpp rename to pglab/MasterController.cpp diff --git a/src/pglab/MasterController.h b/pglab/MasterController.h similarity index 100% rename from src/pglab/MasterController.h rename to pglab/MasterController.h diff --git a/src/pglab/OpenDatabase.cpp b/pglab/OpenDatabase.cpp similarity index 100% rename from src/pglab/OpenDatabase.cpp rename to pglab/OpenDatabase.cpp diff --git a/src/pglab/OpenDatabase.h b/pglab/OpenDatabase.h similarity index 100% rename from src/pglab/OpenDatabase.h rename to pglab/OpenDatabase.h diff --git a/src/pglab/ParamListModel.cpp b/pglab/ParamListModel.cpp similarity index 100% rename from src/pglab/ParamListModel.cpp rename to pglab/ParamListModel.cpp diff --git a/src/pglab/ParamListModel.h b/pglab/ParamListModel.h similarity index 100% rename from src/pglab/ParamListModel.h rename to pglab/ParamListModel.h diff --git a/src/pglab/ParamTypeDelegate.cpp b/pglab/ParamTypeDelegate.cpp similarity index 100% rename from src/pglab/ParamTypeDelegate.cpp rename to pglab/ParamTypeDelegate.cpp diff --git a/src/pglab/ParamTypeDelegate.h b/pglab/ParamTypeDelegate.h similarity index 100% rename from src/pglab/ParamTypeDelegate.h rename to pglab/ParamTypeDelegate.h diff --git a/src/pglab/PgAuthId.cpp b/pglab/PgAuthId.cpp similarity index 100% rename from src/pglab/PgAuthId.cpp rename to pglab/PgAuthId.cpp diff --git a/src/pglab/PgAuthId.h b/pglab/PgAuthId.h similarity index 100% rename from src/pglab/PgAuthId.h rename to pglab/PgAuthId.h diff --git a/src/pglab/PgAuthIdContainer.cpp b/pglab/PgAuthIdContainer.cpp similarity index 100% rename from src/pglab/PgAuthIdContainer.cpp rename to pglab/PgAuthIdContainer.cpp diff --git a/src/pglab/PgAuthIdContainer.h b/pglab/PgAuthIdContainer.h similarity index 100% rename from src/pglab/PgAuthIdContainer.h rename to pglab/PgAuthIdContainer.h diff --git a/src/pglab/PgClass.cpp b/pglab/PgClass.cpp similarity index 100% rename from src/pglab/PgClass.cpp rename to pglab/PgClass.cpp diff --git a/src/pglab/PgClass.h b/pglab/PgClass.h similarity index 100% rename from src/pglab/PgClass.h rename to pglab/PgClass.h diff --git a/src/pglab/PgContainer.h b/pglab/PgContainer.h similarity index 100% rename from src/pglab/PgContainer.h rename to pglab/PgContainer.h diff --git a/src/pglab/PgDatabase.cpp b/pglab/PgDatabase.cpp similarity index 100% rename from src/pglab/PgDatabase.cpp rename to pglab/PgDatabase.cpp diff --git a/src/pglab/PgDatabase.h b/pglab/PgDatabase.h similarity index 100% rename from src/pglab/PgDatabase.h rename to pglab/PgDatabase.h diff --git a/src/pglab/PgDatabaseCatalogue.cpp b/pglab/PgDatabaseCatalogue.cpp similarity index 100% rename from src/pglab/PgDatabaseCatalogue.cpp rename to pglab/PgDatabaseCatalogue.cpp diff --git a/src/pglab/PgDatabaseCatalogue.h b/pglab/PgDatabaseCatalogue.h similarity index 100% rename from src/pglab/PgDatabaseCatalogue.h rename to pglab/PgDatabaseCatalogue.h diff --git a/src/pglab/PgDatabaseContainer.cpp b/pglab/PgDatabaseContainer.cpp similarity index 100% rename from src/pglab/PgDatabaseContainer.cpp rename to pglab/PgDatabaseContainer.cpp diff --git a/src/pglab/PgDatabaseContainer.h b/pglab/PgDatabaseContainer.h similarity index 100% rename from src/pglab/PgDatabaseContainer.h rename to pglab/PgDatabaseContainer.h diff --git a/src/pglab/PgNamespace.cpp b/pglab/PgNamespace.cpp similarity index 100% rename from src/pglab/PgNamespace.cpp rename to pglab/PgNamespace.cpp diff --git a/src/pglab/PgNamespace.h b/pglab/PgNamespace.h similarity index 100% rename from src/pglab/PgNamespace.h rename to pglab/PgNamespace.h diff --git a/src/pglab/PgType.cpp b/pglab/PgType.cpp similarity index 100% rename from src/pglab/PgType.cpp rename to pglab/PgType.cpp diff --git a/src/pglab/PgType.h b/pglab/PgType.h similarity index 100% rename from src/pglab/PgType.h rename to pglab/PgType.h diff --git a/src/pglab/PgTypeContainer.cpp b/pglab/PgTypeContainer.cpp similarity index 100% rename from src/pglab/PgTypeContainer.cpp rename to pglab/PgTypeContainer.cpp diff --git a/src/pglab/PgTypeContainer.h b/pglab/PgTypeContainer.h similarity index 100% rename from src/pglab/PgTypeContainer.h rename to pglab/PgTypeContainer.h diff --git a/src/pglab/ProcessStdioWidget.cpp b/pglab/ProcessStdioWidget.cpp similarity index 100% rename from src/pglab/ProcessStdioWidget.cpp rename to pglab/ProcessStdioWidget.cpp diff --git a/src/pglab/ProcessStdioWidget.h b/pglab/ProcessStdioWidget.h similarity index 100% rename from src/pglab/ProcessStdioWidget.h rename to pglab/ProcessStdioWidget.h diff --git a/src/pglab/ProcessStdioWidget.ui b/pglab/ProcessStdioWidget.ui similarity index 100% rename from src/pglab/ProcessStdioWidget.ui rename to pglab/ProcessStdioWidget.ui diff --git a/src/pglab/QueryExplainModel.cpp b/pglab/QueryExplainModel.cpp similarity index 100% rename from src/pglab/QueryExplainModel.cpp rename to pglab/QueryExplainModel.cpp diff --git a/src/pglab/QueryExplainModel.h b/pglab/QueryExplainModel.h similarity index 100% rename from src/pglab/QueryExplainModel.h rename to pglab/QueryExplainModel.h diff --git a/src/pglab/QueryResultModel.cpp b/pglab/QueryResultModel.cpp similarity index 100% rename from src/pglab/QueryResultModel.cpp rename to pglab/QueryResultModel.cpp diff --git a/src/pglab/QueryResultModel.h b/pglab/QueryResultModel.h similarity index 100% rename from src/pglab/QueryResultModel.h rename to pglab/QueryResultModel.h diff --git a/src/pglab/QueryTab.cpp b/pglab/QueryTab.cpp similarity index 100% rename from src/pglab/QueryTab.cpp rename to pglab/QueryTab.cpp diff --git a/src/pglab/QueryTab.h b/pglab/QueryTab.h similarity index 100% rename from src/pglab/QueryTab.h rename to pglab/QueryTab.h diff --git a/src/pglab/QueryTab.ui b/pglab/QueryTab.ui similarity index 100% rename from src/pglab/QueryTab.ui rename to pglab/QueryTab.ui diff --git a/src/pglab/RolesTableModel.cpp b/pglab/RolesTableModel.cpp similarity index 100% rename from src/pglab/RolesTableModel.cpp rename to pglab/RolesTableModel.cpp diff --git a/src/pglab/RolesTableModel.h b/pglab/RolesTableModel.h similarity index 100% rename from src/pglab/RolesTableModel.h rename to pglab/RolesTableModel.h diff --git a/src/pglab/ServerWindow.cpp b/pglab/ServerWindow.cpp similarity index 100% rename from src/pglab/ServerWindow.cpp rename to pglab/ServerWindow.cpp diff --git a/src/pglab/ServerWindow.h b/pglab/ServerWindow.h similarity index 100% rename from src/pglab/ServerWindow.h rename to pglab/ServerWindow.h diff --git a/src/pglab/ServerWindow.ui b/pglab/ServerWindow.ui similarity index 100% rename from src/pglab/ServerWindow.ui rename to pglab/ServerWindow.ui diff --git a/src/pglab/SqlSyntaxHighlighter.cpp b/pglab/SqlSyntaxHighlighter.cpp similarity index 100% rename from src/pglab/SqlSyntaxHighlighter.cpp rename to pglab/SqlSyntaxHighlighter.cpp diff --git a/src/pglab/SqlSyntaxHighlighter.h b/pglab/SqlSyntaxHighlighter.h similarity index 100% rename from src/pglab/SqlSyntaxHighlighter.h rename to pglab/SqlSyntaxHighlighter.h diff --git a/src/pglab/TypeSelectionItemModel.cpp b/pglab/TypeSelectionItemModel.cpp similarity index 100% rename from src/pglab/TypeSelectionItemModel.cpp rename to pglab/TypeSelectionItemModel.cpp diff --git a/src/pglab/TypeSelectionItemModel.h b/pglab/TypeSelectionItemModel.h similarity index 100% rename from src/pglab/TypeSelectionItemModel.h rename to pglab/TypeSelectionItemModel.h diff --git a/src/pglab/icons/16x16/document_green.png b/pglab/icons/16x16/document_green.png similarity index 100% rename from src/pglab/icons/16x16/document_green.png rename to pglab/icons/16x16/document_green.png diff --git a/src/pglab/icons/16x16/document_red.png b/pglab/icons/16x16/document_red.png similarity index 100% rename from src/pglab/icons/16x16/document_red.png rename to pglab/icons/16x16/document_red.png diff --git a/src/pglab/icons/16x16/document_yellow.png b/pglab/icons/16x16/document_yellow.png similarity index 100% rename from src/pglab/icons/16x16/document_yellow.png rename to pglab/icons/16x16/document_yellow.png diff --git a/src/pglab/icons/about.png b/pglab/icons/about.png similarity index 100% rename from src/pglab/icons/about.png rename to pglab/icons/about.png diff --git a/src/pglab/icons/add_connection.png b/pglab/icons/add_connection.png similarity index 100% rename from src/pglab/icons/add_connection.png rename to pglab/icons/add_connection.png diff --git a/src/pglab/icons/backup_database.png b/pglab/icons/backup_database.png similarity index 100% rename from src/pglab/icons/backup_database.png rename to pglab/icons/backup_database.png diff --git a/src/pglab/icons/delete_connection.png b/pglab/icons/delete_connection.png similarity index 100% rename from src/pglab/icons/delete_connection.png rename to pglab/icons/delete_connection.png diff --git a/src/pglab/icons/folder.png b/pglab/icons/folder.png similarity index 100% rename from src/pglab/icons/folder.png rename to pglab/icons/folder.png diff --git a/src/pglab/icons/lightbulb.png b/pglab/icons/lightbulb.png similarity index 100% rename from src/pglab/icons/lightbulb.png rename to pglab/icons/lightbulb.png diff --git a/src/pglab/icons/lightbulb_off.png b/pglab/icons/lightbulb_off.png similarity index 100% rename from src/pglab/icons/lightbulb_off.png rename to pglab/icons/lightbulb_off.png diff --git a/src/pglab/icons/manage_server.png b/pglab/icons/manage_server.png similarity index 100% rename from src/pglab/icons/manage_server.png rename to pglab/icons/manage_server.png diff --git a/src/pglab/icons/new_query_tab.png b/pglab/icons/new_query_tab.png similarity index 100% rename from src/pglab/icons/new_query_tab.png rename to pglab/icons/new_query_tab.png diff --git a/src/pglab/icons/open_query_window.png b/pglab/icons/open_query_window.png similarity index 100% rename from src/pglab/icons/open_query_window.png rename to pglab/icons/open_query_window.png diff --git a/src/pglab/icons/page_white_add.png b/pglab/icons/page_white_add.png similarity index 100% rename from src/pglab/icons/page_white_add.png rename to pglab/icons/page_white_add.png diff --git a/src/pglab/icons/page_white_copy.png b/pglab/icons/page_white_copy.png similarity index 100% rename from src/pglab/icons/page_white_copy.png rename to pglab/icons/page_white_copy.png diff --git a/src/pglab/icons/page_white_delete.png b/pglab/icons/page_white_delete.png similarity index 100% rename from src/pglab/icons/page_white_delete.png rename to pglab/icons/page_white_delete.png diff --git a/src/pglab/icons/script_delete.png b/pglab/icons/script_delete.png similarity index 100% rename from src/pglab/icons/script_delete.png rename to pglab/icons/script_delete.png diff --git a/src/pglab/icons/script_go.png b/pglab/icons/script_go.png similarity index 100% rename from src/pglab/icons/script_go.png rename to pglab/icons/script_go.png diff --git a/src/pglab/icons/script_save.png b/pglab/icons/script_save.png similarity index 100% rename from src/pglab/icons/script_save.png rename to pglab/icons/script_save.png diff --git a/src/pglab/icons/server_delete.png b/pglab/icons/server_delete.png similarity index 100% rename from src/pglab/icons/server_delete.png rename to pglab/icons/server_delete.png diff --git a/src/pglab/icons/server_edit.png b/pglab/icons/server_edit.png similarity index 100% rename from src/pglab/icons/server_edit.png rename to pglab/icons/server_edit.png diff --git a/src/pglab/icons/server_go.png b/pglab/icons/server_go.png similarity index 100% rename from src/pglab/icons/server_go.png rename to pglab/icons/server_go.png diff --git a/src/pglab/icons/table_save.png b/pglab/icons/table_save.png similarity index 100% rename from src/pglab/icons/table_save.png rename to pglab/icons/table_save.png diff --git a/src/pglab/icons/token_shortland_character.png b/pglab/icons/token_shortland_character.png similarity index 100% rename from src/pglab/icons/token_shortland_character.png rename to pglab/icons/token_shortland_character.png diff --git a/src/pglab/json/json-forwards.h b/pglab/json/json-forwards.h similarity index 100% rename from src/pglab/json/json-forwards.h rename to pglab/json/json-forwards.h diff --git a/src/pglab/json/json.h b/pglab/json/json.h similarity index 100% rename from src/pglab/json/json.h rename to pglab/json/json.h diff --git a/src/pglab/jsoncpp.cpp b/pglab/jsoncpp.cpp similarity index 100% rename from src/pglab/jsoncpp.cpp rename to pglab/jsoncpp.cpp diff --git a/src/pglab/main.cpp b/pglab/main.cpp similarity index 100% rename from src/pglab/main.cpp rename to pglab/main.cpp diff --git a/src/pglab/pglab.ico b/pglab/pglab.ico similarity index 100% rename from src/pglab/pglab.ico rename to pglab/pglab.ico diff --git a/src/pglab/src.pro b/pglab/pglab.pro similarity index 79% rename from src/pglab/src.pro rename to pglab/pglab.pro index 98dddab..1571144 100644 --- a/src/pglab/src.pro +++ b/pglab/pglab.pro @@ -12,10 +12,10 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql TARGET = pglab TEMPLATE = app -INCLUDEPATH += C:\prog\include C:\Prog\boost\include\boost-1_64 +INCLUDEPATH += C:\prog\include C:\Prog\include\pgsql C:\VSproj\boost32\include\boost-1_65_1 DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX #LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib -LIBS += -LC:/MINGW/LIB -LC:/PROG/LIB -lws2_32 -lpq +LIBS += -LC:\VSproj\boost32\lib -LC:/PROG/LIB -lws2_32 -llibpq debug { LIBS += c:/prog/lib/botand_imp.lib @@ -28,17 +28,12 @@ release { win32:RC_ICONS += pglab.ico SOURCES += main.cpp\ - sqlparser.cpp \ - PgsqlConn.cpp \ QueryResultModel.cpp \ - sqlhighlighter.cpp \ jsoncpp.cpp \ QueryExplainModel.cpp \ ExplainTreeModelItem.cpp \ ASyncDBConnection.cpp \ tsqueue.cpp \ - win32event.cpp \ - waithandlelist.cpp \ DatabaseWindow.cpp \ ConnectionManagerWindow.cpp \ ConnectionListModel.cpp \ @@ -49,7 +44,7 @@ SOURCES += main.cpp\ util.cpp \ DatabaseInspectorWidget.cpp \ PgType.cpp \ - PgsqlDatabaseCatalogue.cpp \ +PgDatabaseCatalogue.cpp \ PgTypeContainer.cpp \ TuplesResultWidget.cpp \ PgNamespace.cpp \ @@ -67,27 +62,20 @@ SOURCES += main.cpp\ DatabasesTableModel.cpp \ PgDatabase.cpp \ PgDatabaseContainer.cpp \ - Pgsql_Params.cpp \ RolesTableModel.cpp \ PgAuthId.cpp \ PgAuthIdContainer.cpp \ - Pgsql_Result.cpp \ - Pgsql_Row.cpp \ - Pgsql_Value.cpp \ ConnectionList.cpp \ - ProcessStdioWidget.cpp + ProcessStdioWidget.cpp \ + GlobalIoService.cpp \ + CodeBuilderConfiguration.cpp HEADERS += \ - sqlparser.h \ - PgsqlConn.h \ QueryResultModel.h \ - sqlhighlighter.h \ QueryExplainModel.h \ ExplainTreeModelItem.h \ ASyncDBConnection.h \ tsqueue.h \ - win32event.h \ - waithandlelist.h \ DatabaseWindow.h \ ConnectionManagerWindow.h \ ConnectionListModel.h \ @@ -97,7 +85,7 @@ HEADERS += \ util.h \ DatabaseInspectorWidget.h \ PgType.h \ - PgsqlDatabaseCatalogue.h \ +PgDatabaseCatalogue.h \ PgTypeContainer.h \ TuplesResultWidget.h \ PgNamespace.h \ @@ -116,16 +104,13 @@ HEADERS += \ PgDatabase.h \ PgDatabaseContainer.h \ PgContainer.h \ - Pgsql_Params.h \ - Pgsql_declare.h \ RolesTableModel.h \ PgAuthId.h \ PgAuthIdContainer.h \ - Pgsql_Result.h \ - Pgsql_Row.h \ - Pgsql_Value.h \ ConnectionList.h \ - ProcessStdioWidget.h + ProcessStdioWidget.h \ + GlobalIoService.h \ + CodeBuilderConfiguration.h FORMS += mainwindow.ui \ DatabaseWindow.ui \ @@ -140,15 +125,15 @@ FORMS += mainwindow.ui \ RESOURCES += \ resources.qrc -#QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 +QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore -else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -L$$OUT_PWD/../pgsql/debug/ -lcore -lpgsql -INCLUDEPATH += $$PWD/../core -DEPENDPATH += $$PWD/../core +INCLUDEPATH += $$PWD/../core $$PWD/../pgsql +DEPENDPATH += $$PWD/../core $$PWD/../pgsql win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib -else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib +else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib $$OUT_PWD/../pgsql/debug/pgsql.lib diff --git a/src/pglab/resources.qrc b/pglab/resources.qrc similarity index 100% rename from src/pglab/resources.qrc rename to pglab/resources.qrc diff --git a/src/pglab/stopwatch.cpp b/pglab/stopwatch.cpp similarity index 100% rename from src/pglab/stopwatch.cpp rename to pglab/stopwatch.cpp diff --git a/src/pglab/stopwatch.h b/pglab/stopwatch.h similarity index 100% rename from src/pglab/stopwatch.h rename to pglab/stopwatch.h diff --git a/src/pglab/tsqueue.cpp b/pglab/tsqueue.cpp similarity index 100% rename from src/pglab/tsqueue.cpp rename to pglab/tsqueue.cpp diff --git a/src/pglab/tsqueue.h b/pglab/tsqueue.h similarity index 100% rename from src/pglab/tsqueue.h rename to pglab/tsqueue.h diff --git a/src/pglab/tuplesresultwidget.cpp b/pglab/tuplesresultwidget.cpp similarity index 100% rename from src/pglab/tuplesresultwidget.cpp rename to pglab/tuplesresultwidget.cpp diff --git a/src/pglab/tuplesresultwidget.h b/pglab/tuplesresultwidget.h similarity index 100% rename from src/pglab/tuplesresultwidget.h rename to pglab/tuplesresultwidget.h diff --git a/src/pglab/tuplesresultwidget.ui b/pglab/tuplesresultwidget.ui similarity index 100% rename from src/pglab/tuplesresultwidget.ui rename to pglab/tuplesresultwidget.ui diff --git a/src/pglab/util.cpp b/pglab/util.cpp similarity index 100% rename from src/pglab/util.cpp rename to pglab/util.cpp diff --git a/src/pglab/util.h b/pglab/util.h similarity index 100% rename from src/pglab/util.h rename to pglab/util.h diff --git a/pglabAll.pro b/pglabAll.pro new file mode 100644 index 0000000..890c392 --- /dev/null +++ b/pglabAll.pro @@ -0,0 +1,11 @@ +TEMPLATE = subdirs + +DEFINES += BOOST_ENABLE_ASSERT_HANDLER + +SUBDIRS += core \ + pgsql \ + pglab + +CONFIG(debug, debug|release) { +# SUBDIRS += tests +} diff --git a/src/pgsql/Pgsql_Connection.cpp b/pgsql/Pgsql_Connection.cpp similarity index 100% rename from src/pgsql/Pgsql_Connection.cpp rename to pgsql/Pgsql_Connection.cpp diff --git a/src/pgsql/Pgsql_Connection.h b/pgsql/Pgsql_Connection.h similarity index 100% rename from src/pgsql/Pgsql_Connection.h rename to pgsql/Pgsql_Connection.h diff --git a/src/pgsql/Pgsql_Params.cpp b/pgsql/Pgsql_Params.cpp similarity index 100% rename from src/pgsql/Pgsql_Params.cpp rename to pgsql/Pgsql_Params.cpp diff --git a/src/pgsql/Pgsql_Params.h b/pgsql/Pgsql_Params.h similarity index 100% rename from src/pgsql/Pgsql_Params.h rename to pgsql/Pgsql_Params.h diff --git a/src/pgsql/Pgsql_Result.cpp b/pgsql/Pgsql_Result.cpp similarity index 100% rename from src/pgsql/Pgsql_Result.cpp rename to pgsql/Pgsql_Result.cpp diff --git a/src/pgsql/Pgsql_Result.h b/pgsql/Pgsql_Result.h similarity index 100% rename from src/pgsql/Pgsql_Result.h rename to pgsql/Pgsql_Result.h diff --git a/src/pgsql/Pgsql_Row.cpp b/pgsql/Pgsql_Row.cpp similarity index 100% rename from src/pgsql/Pgsql_Row.cpp rename to pgsql/Pgsql_Row.cpp diff --git a/src/pgsql/Pgsql_Row.h b/pgsql/Pgsql_Row.h similarity index 100% rename from src/pgsql/Pgsql_Row.h rename to pgsql/Pgsql_Row.h diff --git a/src/pgsql/Pgsql_Value.cpp b/pgsql/Pgsql_Value.cpp similarity index 100% rename from src/pgsql/Pgsql_Value.cpp rename to pgsql/Pgsql_Value.cpp diff --git a/src/pgsql/Pgsql_Value.h b/pgsql/Pgsql_Value.h similarity index 100% rename from src/pgsql/Pgsql_Value.h rename to pgsql/Pgsql_Value.h diff --git a/src/pgsql/Pgsql_declare.h b/pgsql/Pgsql_declare.h similarity index 100% rename from src/pgsql/Pgsql_declare.h rename to pgsql/Pgsql_declare.h diff --git a/pgsql/pgsql.pro b/pgsql/pgsql.pro new file mode 100644 index 0000000..9115bd2 --- /dev/null +++ b/pgsql/pgsql.pro @@ -0,0 +1,59 @@ +#------------------------------------------------- +# +# Project created by QtCreator 2016-11-11T09:17:13 +# +#------------------------------------------------- + +CONFIG += staticlib c++14 +QT += core + +greaterThan(QT_MAJOR_VERSION, 4): QT += widgets sql + +TARGET = pgsql +TEMPLATE = lib + +INCLUDEPATH += C:\prog\include C:\Prog\include\pgsql C:\VSproj\boost32\include\boost-1_65_1 +DEFINES += WIN32_LEAN_AND_MEAN NOMINMAX +#LIBS += -LC:/prog/boost/lib -Lc:/prog/lib libpq.lib fmt.lib User32.lib ws2_32.lib +LIBS += -LC:/PROG/LIB -lws2_32 -llibpq + +debug { +#LIBS += c:/prog/lib/botand_imp.lib +} + +release { +# LIBS += c:\prog\lib\botan.lib +} + +#win32:RC_ICONS += pglab.ico + +SOURCES += Pgsql_Connection.cpp \ + Pgsql_Params.cpp \ + Pgsql_Result.cpp \ + Pgsql_Row.cpp \ + Pgsql_Value.cpp + +HEADERS += Pgsql_Connection.h \ + Pgsql_Params.h \ + Pgsql_Result.h \ + Pgsql_Row.h \ + Pgsql_Value.h \ + Pgsql_declare.h + +#FORMS += + +#RESOURCES += \ +# resources.qrc + +#QMAKE_LFLAGS_WINDOWS = /SUBSYSTEM:WINDOWS,5.01 + +win32:CONFIG(release, debug|release): LIBS += -L$$OUT_PWD/../core/release/ -lcore +else:win32:CONFIG(debug, debug|release): LIBS += -L$$OUT_PWD/../core/debug/ -lcore + +INCLUDEPATH += $$PWD/../core +DEPENDPATH += $$PWD/../core + +win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/libcore.a +else:win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/libcore.a +else:win32:!win32-g++:CONFIG(release, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/release/core.lib +else:win32:!win32-g++:CONFIG(debug, debug|release): PRE_TARGETDEPS += $$OUT_PWD/../core/debug/core.lib diff --git a/src/cmake/Modules/FindBotan.cmake b/src/cmake/Modules/FindBotan.cmake deleted file mode 100644 index 1feb01b..0000000 --- a/src/cmake/Modules/FindBotan.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# - Try to find the Botan library -# -# Once done this will define -# -# BOTAN_FOUND - System has Botan -# BOTAN_INCLUDE_DIR - The Botan include directory -# BOTAN_LIBRARIES - The libraries needed to use Botan -# BOTAN_DEFINITIONS - Compiler switches required for using Botan - -IF (BOTAN_INCLUDE_DIR AND BOTAN_LIBRARY) - # in cache already - SET(Botan_FIND_QUIETLY TRUE) -ENDIF (BOTAN_INCLUDE_DIR AND BOTAN_LIBRARY) - -IF (NOT WIN32) - # try using pkg-config to get the directories and then use these values - # in the FIND_PATH() and FIND_LIBRARY() calls - # also fills in BOTAN_DEFINITIONS, although that isn't normally useful - FIND_PACKAGE(PkgConfig) - PKG_SEARCH_MODULE(PC_BOTAN botan-2) - SET(BOTAN_DEFINITIONS ${PC_BOTAN_CFLAGS}) -ENDIF (NOT WIN32) - -FIND_PATH(BOTAN_INCLUDE_DIR botan/botan.h - HINTS - ${PC_BOTAN_INCLUDEDIR} - ${PC_BOTAN_INCLUDE_DIRS} - /usr/local/include/botan-2 - ) - -FIND_LIBRARY(BOTAN_LIBRARY botan-2 - NAMES ${PC_BOTAN_LIBRARIES} - HINTS - ${PC_BOTAN_LIBDIR} - ${PC_BOTAN_LIBRARY_DIRS} - /usr/local/lib - ) - -MARK_AS_ADVANCED(BOTAN_INCLUDE_DIR BOTAN_LIBRARY) - -# handle the QUIETLY and REQUIRED arguments and set BOTAN_FOUND to TRUE if -# all listed variables are TRUE -INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Botan DEFAULT_MSG BOTAN_LIBRARY BOTAN_INCLUDE_DIR) - -IF(BOTAN_FOUND) - SET(BOTAN_LIBRARIES ${BOTAN_LIBRARY}) - SET(BOTAN_INCLUDE_DIRS ${BOTAN_INCLUDE_DIR}) -ENDIF() diff --git a/src/pglab/icons/desktop.ini b/src/pglab/icons/desktop.ini deleted file mode 100644 index 17ade64..0000000 --- a/src/pglab/icons/desktop.ini +++ /dev/null @@ -1,14 +0,0 @@ -[LocalizedFileNames] -server_go.png=@server_go.png,0 -server_add.png=@server_add.png,0 -server_delete.png=@server_delete.png,0 -script_lightning.png=@script_lightning.png,0 -script_delete.png=@script_delete.png,0 -script_go.png=@script_go.png,0 -database.png=@database.png,0 -script.png=@script.png,0 -folder.png=@folder.png,0 -script_save.png=@script_save.png,0 -lightbulb.png=@lightbulb.png,0 -table_save.png=@table_save.png,0 -lightbulb_off.png=@lightbulb_off.png,0 diff --git a/src/pgsql/CMakeLists.txt b/src/pgsql/CMakeLists.txt deleted file mode 100644 index bc6c34f..0000000 --- a/src/pgsql/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ - -add_library(pgsql STATIC - Pgsql_Connection.cpp - Pgsql_Params.cpp - Pgsql_Result.cpp - Pgsql_Row.cpp - Pgsql_Value.cpp) - -target_link_libraries(pgsql PUBLIC - postgresql - Qt5::Core - ) - -target_include_directories(pgsql INTERFACE - $ -) - -set_target_properties(pgsql PROPERTIES - CXX_STANDARD 14 - CXX_STANDARD_REQUIRED ON - POSITION_INDEPENDENT_CODE True - )