Code cleanups

core/WorkManager.cpp

@@ -1,47 +0,0 @@
-#include "WorkManager.h"
-
-#include <QRunnable>
-#include <QThreadPool>
-#include <deque>
-#include <functional>
-#include <mutex>
-
-
-class WorkManagerImpl: public WorkManager {
-public:
-	void addRunnable(QRunnable *runnable) override;
-	void addWork(Work work) override;
-};
-
-
-
-std::shared_ptr<WorkManager> WorkManager::getWorkManager()
-{
-	static std::shared_ptr<WorkManager> wm = std::make_shared<WorkManagerImpl>();
-	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)));
-}

core/WorkManager.h

@@ -1,22 +0,0 @@
-#ifndef WORKMANAGER_H
-#define WORKMANAGER_H
-
-#include <functional>
-#include <memory>
-
-class QRunnable;
-
-class WorkManager {
-public:
-
-	static std::shared_ptr<WorkManager> getWorkManager();
-
-	using Work = std::function<void()>;
-
-	virtual ~WorkManager() = default;
-	virtual void addRunnable(QRunnable *runnable) = 0;
-	virtual void addWork(Work work) = 0;
-
-};
-
-#endif // WORKMANAGER_H

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 \

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 <QtConcurrent>
 #include <QFuture>

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)
 {

pglab/DatabaseWindow.h

@@ -11,7 +11,6 @@
 #include <memory>
 #include <future>
 #include "Pgsql_Connection.h"
-//#include "QueuedBackgroundTask.h"
 #include "ControllableTask.h"
 #include <chrono>
 #include <deque>
@@ -24,7 +23,7 @@
 #include <QFutureWatcher>
 
 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;

pglab/DatabaseWindow.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MainWindow</class>
+ <class>DatabaseWindow</class>
- <widget class="QMainWindow" name="MainWindow">
+ <widget class="QMainWindow" name="DatabaseWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -45,7 +45,7 @@
      <x>0</x>
      <y>0</y>
      <width>993</width>
-     <height>25</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuTest">

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"

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<PgDatabaseCatalog>  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<PgClass> &table);
 	void updateSqlTab(const std::optional<PgClass> &table);
@@ -60,7 +55,6 @@ private slots:
 
 	void tableListTable_currentRowChanged(const QModelIndex &current, const QModelIndex &previous);
 	void tableListTable_layoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint);
-//	void constraintsTable_currentRowChanged(const QModelIndex &current, const QModelIndex &previous);
 	void constraintsTable_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);
 	void constraintsTable_modelReset();
 	void indexesTable_selectionChanged(const QItemSelection &selected, const QItemSelection &deselected);

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