From 456180325e9a9c32d994e8bc75b6dd85f0cd867b Mon Sep 17 00:00:00 2001 From: eelke Date: Mon, 31 Dec 2018 15:43:22 +0100 Subject: [PATCH] Code cleanups --- core/WorkManager.cpp | 47 ---------------------- core/WorkManager.h | 22 ---------- core/core.pro | 2 - pglab/CrudModel.cpp | 1 - pglab/DatabaseWindow.cpp | 5 +-- pglab/DatabaseWindow.h | 5 +-- pglab/{MainWindow.ui => DatabaseWindow.ui} | 6 +-- pglab/TablesPage.cpp | 1 - pglab/TablesPage.h | 6 --- pglab/pglab.pro | 5 ++- 10 files changed, 10 insertions(+), 90 deletions(-) delete mode 100644 core/WorkManager.cpp delete mode 100644 core/WorkManager.h rename pglab/{MainWindow.ui => DatabaseWindow.ui} (98%) diff --git a/core/WorkManager.cpp b/core/WorkManager.cpp deleted file mode 100644 index 05cf95d..0000000 --- a/core/WorkManager.cpp +++ /dev/null @@ -1,47 +0,0 @@ -#include "WorkManager.h" - -#include -#include -#include -#include -#include - - -class WorkManagerImpl: public WorkManager { -public: - void addRunnable(QRunnable *runnable) override; - void addWork(Work work) override; -}; - - - -std::shared_ptr WorkManager::getWorkManager() -{ - static std::shared_ptr wm = std::make_shared(); - return wm; -} - -void WorkManagerImpl::addRunnable(QRunnable *runnable) -{ - auto tp = QThreadPool::globalInstance(); - tp->start(runnable); -} - -class CallableTask : public QRunnable { -public: - CallableTask(WorkManager::Work &&w) - : work(std::move(w)) - {} -protected: - void run() final - { - work(); - } -private: - WorkManager::Work work; -}; - -void WorkManagerImpl::addWork(Work work) -{ - addRunnable(new CallableTask(std::move(work))); -} diff --git a/core/WorkManager.h b/core/WorkManager.h deleted file mode 100644 index c90239d..0000000 --- a/core/WorkManager.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef WORKMANAGER_H -#define WORKMANAGER_H - -#include -#include - -class QRunnable; - -class WorkManager { -public: - - static std::shared_ptr getWorkManager(); - - using Work = std::function; - - virtual ~WorkManager() = default; - virtual void addRunnable(QRunnable *runnable) = 0; - virtual void addWork(Work work) = 0; - -}; - -#endif // WORKMANAGER_H diff --git a/core/core.pro b/core/core.pro index a4a7e22..2289bec 100644 --- a/core/core.pro +++ b/core/core.pro @@ -31,7 +31,6 @@ SOURCES += my_boost_assert_handler.cpp \ QueuedBackgroundTask.cpp \ ExplainTreeModelItem.cpp \ jsoncpp.cpp \ - WorkManager.cpp \ SqlParser.cpp \ SqlAstNode.cpp \ SqlAstSelectList.cpp \ @@ -48,7 +47,6 @@ HEADERS += PasswordManager.h \ Expected.h \ ExplainTreeModelItem.h \ json/json.h \ - WorkManager.h \ TaskControl.h \ ControllableTask.h \ RunControllableTask.h \ diff --git a/pglab/CrudModel.cpp b/pglab/CrudModel.cpp index f404c1b..3acc331 100644 --- a/pglab/CrudModel.cpp +++ b/pglab/CrudModel.cpp @@ -6,7 +6,6 @@ #include "catalog/PgConstraintContainer.h" #include "GlobalIoService.h" #include "SqlFormattingUtils.h" -#include "WorkManager.h" #include "Pgsql_oids.h" #include #include diff --git a/pglab/DatabaseWindow.cpp b/pglab/DatabaseWindow.cpp index c5890c2..b073b7e 100644 --- a/pglab/DatabaseWindow.cpp +++ b/pglab/DatabaseWindow.cpp @@ -1,5 +1,5 @@ #include "DatabaseWindow.h" -#include "ui_MainWindow.h" +#include "ui_DatabaseWindow.h" #include "TablesPage.h" #include "FunctionsPage.h" #include "SequencesPage.h" @@ -18,7 +18,6 @@ #include "plugin_support/PluginContentWidget.h" #include "CodeGenerator.h" #include "MasterController.h" -#include "WorkManager.h" #include "ScopeGuard.h" #include "EditTableWidget.h" #include "plugin_support/PluginContentWidgetContextBase.h" @@ -68,7 +67,7 @@ using namespace DatabaseWindow_details; DatabaseWindow::DatabaseWindow(MasterController *master, QWidget *parent) : QMainWindow(parent) - , ui(new Ui::MainWindow) + , ui(new Ui::DatabaseWindow) , m_context(new DatabaseWindowContentContext(this)) , m_masterController(master) { diff --git a/pglab/DatabaseWindow.h b/pglab/DatabaseWindow.h index 8183dff..3c30a82 100644 --- a/pglab/DatabaseWindow.h +++ b/pglab/DatabaseWindow.h @@ -11,7 +11,6 @@ #include #include #include "Pgsql_Connection.h" -//#include "QueuedBackgroundTask.h" #include "ControllableTask.h" #include #include @@ -24,7 +23,7 @@ #include namespace Ui { - class MainWindow; + class DatabaseWindow; } namespace Pgsql { @@ -64,7 +63,7 @@ public: void addPage(PluginContentWidget* page, QString caption); private: - Ui::MainWindow *ui; + Ui::DatabaseWindow *ui; DatabaseWindow_details::DatabaseWindowContentContext *m_context; ConnectionConfig m_config; diff --git a/pglab/MainWindow.ui b/pglab/DatabaseWindow.ui similarity index 98% rename from pglab/MainWindow.ui rename to pglab/DatabaseWindow.ui index 98fe391..81bbb23 100644 --- a/pglab/MainWindow.ui +++ b/pglab/DatabaseWindow.ui @@ -1,7 +1,7 @@ - MainWindow - + DatabaseWindow + 0 @@ -45,7 +45,7 @@ 0 0 993 - 25 + 20 diff --git a/pglab/TablesPage.cpp b/pglab/TablesPage.cpp index 4afd76f..1445c62 100644 --- a/pglab/TablesPage.cpp +++ b/pglab/TablesPage.cpp @@ -10,7 +10,6 @@ #include "ConstraintModel.h" #include "IconColumnDelegate.h" #include "IndexModel.h" -#include "DatabaseWindow.h" #include "PgLabItemDelegate.h" #include "PropertiesPage.h" #include "ResultTableModelUtil.h" diff --git a/pglab/TablesPage.h b/pglab/TablesPage.h index 5079c45..e741605 100644 --- a/pglab/TablesPage.h +++ b/pglab/TablesPage.h @@ -37,11 +37,8 @@ public: void setNamespaceFilter(TablesTableModel::NamespaceFilter filter); private: Ui::TablesPage *ui; - // QWidget *m_columnsTab; ColumnPage *m_columnsPage; -// QWidget *m_propertiesTab; PropertiesPage *m_propertiesPage; -// QWidget *m_triggerTab; TriggerPage *m_triggerPage; SqlCodePreview *m_sqlCodePreview; std::shared_ptr m_catalog; @@ -49,10 +46,8 @@ private: ColumnTableModel* m_columnsModel = nullptr; ConstraintModel* m_constraintModel = nullptr; IndexModel* m_indexModel = nullptr; - //NamespaceFilterWidget* m_namespaceFilterWidget; void retranslateUi(bool all = true); -// QWidget* addDetailTab(QWidget *contents, bool infront = false); void selectedTableChanged(const std::optional &table); void updateSqlTab(const std::optional &table); @@ -60,7 +55,6 @@ private slots: void tableListTable_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void tableListTable_layoutChanged(const QList &parents, QAbstractItemModel::LayoutChangeHint hint); -// void constraintsTable_currentRowChanged(const QModelIndex ¤t, const QModelIndex &previous); void constraintsTable_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); void constraintsTable_modelReset(); void indexesTable_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected); diff --git a/pglab/pglab.pro b/pglab/pglab.pro index 18d35e4..d492635 100644 --- a/pglab/pglab.pro +++ b/pglab/pglab.pro @@ -158,7 +158,7 @@ CustomDataRole.h \ plugin_support/IPluginContentWidgetContext.h \ plugin_support/PluginContentWidgetContextBase.h -FORMS += mainwindow.ui \ +FORMS += \ ConnectionManagerWindow.ui \ CreateDatabaseDialog.ui \ TuplesResultWidget.ui \ @@ -170,7 +170,8 @@ FORMS += mainwindow.ui \ NamespaceFilterWidget.ui \ ApplicationWindow.ui \ CrudTab.ui \ - CodeGenerator.ui + CodeGenerator.ui \ + DatabaseWindow.ui RESOURCES += \ resources.qrc