From b319edea150de731530728cc8dbf169a29e98448 Mon Sep 17 00:00:00 2001
From: Albert S <mail@quitesimple.org>
Date: Mon, 29 Apr 2019 23:09:23 +0200
Subject: [PATCH] gui: mainwindow: remove dead code and unused members

---
 gui/mainwindow.cpp | 11 -----------
 gui/mainwindow.h   |  8 ++------
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 985c212..e12b15a 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -28,9 +28,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 		throw std::runtime_error("Failed to open database");
 	}
 	connectSignals();
-	searchThread.start();
 	ui->treeResultsList->setContextMenuPolicy(Qt::ContextMenuPolicy::CustomContextMenu);
-
 	ui->tabWidget->setCurrentIndex(0);
 	ui->statusBar->addWidget(ui->lblSearchResults);
 	ui->statusBar->addWidget(ui->pdfProcessBar);
@@ -42,7 +40,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 void MainWindow::connectSignals()
 {
 	connect(ui->txtSearch, &QLineEdit::returnPressed, this, &MainWindow::lineEditReturnPressed);
-	// connect(this, &MainWindow::beginSearch, searchWorker, &SearchWorker::search);
 	connect(&searchWatcher, &QFutureWatcher<SearchResult>::finished, this,
 			[&]
 			{
@@ -59,12 +56,8 @@ void MainWindow::connectSignals()
 
 	connect(&pdfWorkerWatcher, &QFutureWatcher<PdfPreview>::resultReadyAt, this,
 			[&](int index) { pdfPreviewReceived(pdfWorkerWatcher.resultAt(index)); });
-
 	connect(&pdfWorkerWatcher, &QFutureWatcher<PdfPreview>::progressValueChanged, ui->pdfProcessBar,
 			&QProgressBar::setValue);
-
-	// connect(searchWorker, &SearchWorker::searchCancelled, this, &MainWindow::handleCancelledSearch);
-	//  connect(searchWorker, &SearchWorker::searchError, this, &MainWindow::handleSearchError);
 	connect(ui->treeResultsList, &QTreeWidget::itemActivated, this, &MainWindow::treeSearchItemActivated);
 	connect(ui->treeResultsList, &QTreeWidget::customContextMenuRequested, this,
 			&MainWindow::showSearchResultsContextMenu);
@@ -225,10 +218,6 @@ void MainWindow::makePdfPreview()
 	ui->pdfProcessBar->setMinimum(this->pdfWorkerWatcher.progressMinimum());
 }
 
-void MainWindow::handleCancelledSearch()
-{
-}
-
 void MainWindow::handleSearchError(QString error)
 {
 	ui->lblSearchResults->setText("Error:" + error);
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 0e5a396..72a167d 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -30,23 +30,19 @@ class MainWindow : public QMainWindow
 	QFileIconProvider iconProvider;
 	bool pdfDirty;
 	QSqlDatabase db;
-	QFuture<QVector<SearchResult>> searchFuture;
 	QFutureWatcher<QVector<SearchResult>> searchWatcher;
 	QFutureWatcher<PdfPreview> pdfWorkerWatcher;
 	void add(QString path, unsigned int page);
-	QThread searchThread;
-	QThread pdfWorkerThread;
 	QVector<SearchResult> pdfSearchResults;
 	void connectSignals();
 	void makePdfPreview();
 	bool pdfTabActive();
 	void keyPressEvent(QKeyEvent *event) override;
 	unsigned int processedPdfPreviews;
+	void handleSearchResults(const QVector<SearchResult> &results);
+	void handleSearchError(QString error);
   private slots:
 	void lineEditReturnPressed();
-	void handleSearchResults(const QVector<SearchResult> &results);
-	void handleCancelledSearch();
-	void handleSearchError(QString error);
 	void treeSearchItemActivated(QTreeWidgetItem *item, int i);
 	void showSearchResultsContextMenu(const QPoint &point);
 	void tabChanged();