From d3c85722c7815bbacafead59847679b50798c6ce Mon Sep 17 00:00:00 2001
From: eelke <eelke@eelkeklein.nl>
Date: Sun, 6 Jan 2019 08:17:37 +0100
Subject: [PATCH] Remove unneeded headers and code.

---
 pglab/DatabaseWindow.cpp | 63 +++++-----------------------------------
 pglab/DatabaseWindow.h   | 17 ++---------
 2 files changed, 10 insertions(+), 70 deletions(-)

diff --git a/pglab/DatabaseWindow.cpp b/pglab/DatabaseWindow.cpp
index 8e8dda4..9381f95 100644
--- a/pglab/DatabaseWindow.cpp
+++ b/pglab/DatabaseWindow.cpp
@@ -1,25 +1,19 @@
 #include "DatabaseWindow.h"
 #include "plugin_support/IPluginContentWidgetContext.h"
-#include "TablesPage.h"
-#include "FunctionsPage.h"
-#include "SequencesPage.h"
 #include "util.h"
-#include "CodeGenerator.h"
 #include "MasterController.h"
-#include "ScopeGuard.h"
-#include "EditTableWidget.h"
 #include "TaskExecutor.h"
 #include <QApplication>
-#include <QCloseEvent>
-#include <QElapsedTimer>
-#include <QFileDialog>
 #include <QMessageBox>
 #include <QMetaMethod>
-#include <QMetaObject>
-#include <QStandardPaths>
-#include <QTextTable>
-#include <QVBoxLayout>
-#include <algorithm>
+#include <QTableView>
+
+// Pages that should become modules
+#include "TablesPage.h"
+#include "EditTableWidget.h"
+#include "CodeGenerator.h"
+#include "FunctionsPage.h"
+#include "SequencesPage.h"
 
 namespace pg = Pgsql;
 
@@ -73,7 +67,6 @@ void DatabaseWindow::setConfig(const ConnectionConfig &config)
 void DatabaseWindow::catalogLoaded()
 {
 	try	{
-		//SCOPE_EXIT { loadFuture = {}; };
 		m_database = loadWatcher.future().result();
 		auto ctx = context();
 		ctx->registerObject(m_database);
@@ -128,46 +121,6 @@ void DatabaseWindow::on_actionAbout_triggered()
 
 }
 
-void DatabaseWindow::closeEvent(QCloseEvent* /*event*/)
-{
-	// TODO collect which files need saving
-//	std::vector<QString> files_to_save;
-//	int n = ui->tabWidget->count();
-//	for (int i = 0; i < n; ++i) {
-//		QWidget *w = ui->tabWidget->widget(i);
-//		QueryTab *qt = dynamic_cast<QueryTab*>(w);
-//		if (qt) {
-//			if (qt->isChanged()) {
-//				files_to_save.push_back(qt->fileName());
-//			}
-//		}
-//	}
-
-//	QString s;
-//	for (const auto& e : files_to_save) {
-//		s += e + "\n";
-//	}
-
-//	QMessageBox msgBox;
-//	msgBox.setIcon(QMessageBox::Warning);
-//	msgBox.setText("The following documents need to be saved");
-//	msgBox.setInformativeText(s);
-//	msgBox.setStandardButtons(QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel);
-//	msgBox.setDefaultButton(QMessageBox::Cancel);
-//	//int ret =
-//	msgBox.exec();
-
-
-}
-
-void DatabaseWindow::showEvent(QShowEvent *event)
-{
-	if (!event->spontaneous()) {
-//		m_queryTextChanged = false;
-	}
-	event->accept();
-}
-
 void DatabaseWindow::on_actionShow_connection_manager_triggered()
 {
 	m_masterController->showConnectionManager();
diff --git a/pglab/DatabaseWindow.h b/pglab/DatabaseWindow.h
index 8366707..ee748bb 100644
--- a/pglab/DatabaseWindow.h
+++ b/pglab/DatabaseWindow.h
@@ -1,24 +1,13 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "ASyncDBConnection.h"
+#include "plugin_support/LMainWindow.h"
 #include "ConnectionConfig.h"
 #include "OpenDatabase.h"
-#include "plugin_support/LMainWindow.h"
-#include <QRunnable>
-#include <QSocketNotifier>
-#include <memory>
-#include <future>
 #include "Pgsql_Connection.h"
 #include "ControllableTask.h"
-#include <chrono>
-#include <deque>
-#include <mutex>
-
-#include <QMutex>
-#include <QWaitCondition>
-#include <QFuture>
 #include <QFutureWatcher>
+#include <memory>
 
 namespace Pgsql {
 	class Connection;
@@ -72,8 +61,6 @@ private:
 
 	QFutureWatcher<LoadCatalog::Result> loadWatcher;
 
-	void closeEvent(QCloseEvent *event);
-	void showEvent(QShowEvent *event);
 	void newCreateTablePage();
 
 private slots: