Corrected some usage of QueueTask that was already broken as QueueTask is defunct.

core/ExplainTreeModelItem.cpp

@@ -4,6 +4,14 @@
 
 namespace {
 
+	class registerMetaTypes {
+	public:
+		registerMetaTypes()
+		{
+			qRegisterMetaType<ExplainRoot::SPtr>();
+		}
+	} registerMetaTypes_instance;
+
 	ExplainTreeModelItemPtr createPlanItemFromJson(Json::Value &plan)
 	{
 

core/ExplainTreeModelItem.h

@@ -1,9 +1,9 @@
 #pragma once
 
 #include <QList>
-//#include <QVariant>
 #include <vector>
 #include <memory>
+#include <QMetaType>
 
 namespace Json {
 
@@ -161,3 +161,4 @@ public:
 
 };
 
+Q_DECLARE_METATYPE(ExplainRoot::SPtr);

pglab/DatabaseWindow.cpp

@@ -50,11 +50,6 @@ namespace DatabaseWindow_details {
 			return m_window->getDatabase();
 		}
 
-		void QueueTask(TSQueue::t_Callable ) override
-		{
-//			m_window->QueueTask(c);
-		}
-
 		void showStatusMessage(const QString &msg) override
 		{
 			m_window->statusBar()->showMessage(msg);

pglab/QueryTab.cpp

@@ -54,14 +54,11 @@ QueryTab::QueryTab(IPluginContentWidgetContext *context_, QWidget *parent)
 	connect(ui->removeButton, &QPushButton::clicked, m_queryParamListController,
         &QueryParamListController::on_removeParam);
 
-	context()->QueueTask([this]() { startConnect(); });
+	startConnect();
 }
 
 QueryTab::~QueryTab()
 {
-//	m_dbConnection.blockSignals(true);
-//	m_dbConnection.closeConnection();
-
 	delete ui;
 }
 
@@ -158,7 +155,16 @@ void QueryTab::execute()
         
 		auto cb = [this](Expected<std::shared_ptr<Pgsql::Result>> res, qint64 elapsedms)
 		{
-			context()->QueueTask([this, res, elapsedms]() { query_ready(res, elapsedms); });
+			if (res.valid()) {
+				auto && dbresult = res.get();
+				QMetaObject::invokeMethod(this, "query_ready",
+							Q_ARG(std::shared_ptr<Pgsql::Result>, dbresult),
+									  Q_ARG(qint64, elapsedms));
+			}
+			else {
+				/// \todo handle error
+
+			}
 		};
 
         if (m_queryParamListController->empty())
@@ -201,7 +207,8 @@ void QueryTab::explain(bool analyze)
 							explain = ExplainRoot::createFromJson(root);
 						}
 					}
-					context()->QueueTask([this, explain]() { explain_ready(explain); });
+					QMetaObject::invokeMethod(this, "explain_ready",
+									Q_ARG(ExplainRoot::SPtr, explain));
 				}).detach();
 			}
 		}
@@ -436,10 +443,8 @@ std::string QueryTab::getCommandUtf8() const
 
 //}
 
-void QueryTab::query_ready(Expected<std::shared_ptr<Pgsql::Result>> exp_res, qint64 elapsedms)
+void QueryTab::query_ready(std::shared_ptr<Pgsql::Result> dbres, qint64 elapsedms)
 {
-    if (exp_res.valid()) {
-        auto dbres = exp_res.get();
 	if (dbres) {
 		addLog("query_ready with result");
 		auto st = dbres->resultStatus();
@@ -513,10 +518,6 @@ void QueryTab::query_ready(Expected<std::shared_ptr<Pgsql::Result>> exp_res, qin
 		addLog("query_ready with NO result");
 	}
 }
-    else {
-            // we have an error
-    }
-}
 
 void QueryTab::markError(const Pgsql::ErrorDetails &details)
 {

pglab/QueryTab.h

@@ -94,8 +94,6 @@ private:
 
 	QString getCommand() const;
 	std::string getCommandUtf8() const;
-	void explain_ready(ExplainRoot::SPtr explain);
-	void query_ready(Expected<std::shared_ptr<Pgsql::Result>> dbres, qint64 elapsedms);
 
 	//QTabWidget *getTabWidget();
 	//void setTabCaption(const QString &caption, const QString &tooltip);
@@ -104,6 +102,9 @@ private:
 
 private slots:
 
+	void explain_ready(ExplainRoot::SPtr explain);
+	void query_ready(std::shared_ptr<Pgsql::Result>, qint64 elapsedms);
+
 	void queryTextChanged();
 	void connectionStateChanged(ASyncDBConnection::State state);
 	void receiveNotice(Pgsql::ErrorDetails notice);

pglab/pglab.pro

@@ -28,7 +28,6 @@ win32:RC_ICONS += pglab.ico
 SOURCES += main.cpp\
     QueryResultModel.cpp \
     QueryExplainModel.cpp \
-    tsqueue.cpp \
 	CreateDatabaseDialog.cpp \
 	ConnectionManagerWindow.cpp \
 	ConnectionListModel.cpp \
@@ -93,7 +92,6 @@ PropertyProxyModel.cpp \
 HEADERS  += \
     QueryResultModel.h \
     QueryExplainModel.h \
-    tsqueue.h \
 	CreateDatabaseDialog.h \
 	ConnectionManagerWindow.h \
 	ConnectionListModel.h \

pglab/tsqueue.cpp

@@ -1,27 +0,0 @@
-#include "tsqueue.h"
-
-TSQueue::TSQueue()
-{}
-
-void TSQueue::add(t_Callable callable)
-{
-	std::lock_guard<std::mutex> g(m);
-	futureQueue.push_back(std::move(callable));
-}
-
-bool TSQueue::empty()
-{
-	std::lock_guard<std::mutex> g(m);
-	return futureQueue.empty();
-}
-
-TSQueue::t_Callable TSQueue::pop()
-{
-	std::lock_guard<std::mutex> g(m);
-	auto f = std::move(futureQueue.front());
-	futureQueue.pop_front();
-	if (futureQueue.empty()) {
-	}
-	return f;
-}
-

pglab/tsqueue.h

@@ -1,26 +0,0 @@
-#ifndef TSQUEUE_H
-#define TSQUEUE_H
-
-//#include "Win32Event.h"
-#include <deque>
-#include <functional>
-#include <mutex>
-
-class TSQueue {
-public:
-	using t_Callable = std::function<void()>;
-
-	TSQueue();
-	void add(t_Callable callable);
-	bool empty();
-	t_Callable pop();
-
-private:
-	using t_CallableQueue = std::deque<t_Callable>;
-
-	std::mutex m;
-	t_CallableQueue futureQueue;
-};
-
-
-#endif // TSQUEUE_H