eliminated DaemonQTImpl singleton

i2pd.cpp

@@ -1,46 +1,23 @@
-#ifndef ANDROID
 #include <stdlib.h>
 #include "Daemon.h"
-#else
-# include "qt/i2pd_qt/i2pd_qt_gui.h"
-# include <QMessageBox>
-# include <QApplication>
-# include "DaemonQT.h"
-# include "mainwindow.h"
-# include <QThread>
-#endif
 
-int main( int argc, char* argv[] )
+#if defined(QT_GUI_LIB)
+
+namespace i2p
+{
+namespace qt
 {
-#ifdef ANDROID
+    int RunQT (int argc, char* argv[]);
-    //int result = runGUI(argc, argv);
+}
-    //QMessageBox::information(0,"Debug","runGUI completed");
-    QApplication app(argc, argv);
-    qDebug("Initialising the daemon...");
-    bool daemonInitSuccess = i2p::qt::DaemonQTImpl::init(argc, argv);
-    if(!daemonInitSuccess) {
-        QMessageBox::critical(0, "Error", "Daemon init failed");
-        return 1;
 }
-    qDebug("Initialised, creating the main window...");
+int main( int argc, char* argv[] )
-    MainWindow w;
-    qDebug("Before main window.show()...");
-    w.show ();
-    int result;
 {
-        i2p::qt::Controller daemonQtController;
+    return i2p::qt::RunQT (argc, argv);
-        qDebug("Starting the daemon...");
-        emit daemonQtController.startDaemon();
-        qDebug("Starting gui event loop...");
-        result = app.exec();
-        //QMessageBox::information(&w, "Debug", "exec finished");
 }
-    i2p::qt::DaemonQTImpl::deinit();
+
-    //QMessageBox::information(&w, "Debug", "demon stopped");
-    //exit(result); //return from main() causes intermittent sigsegv bugs in some Androids. exit() is a workaround for this
-    qDebug("Exiting the application");
-    return result;
 #else
+int main( int argc, char* argv[] )
+{
     if (Daemon.init(argc, argv))
 	{
 		if (Daemon.start())
@@ -48,8 +25,8 @@ int main( int argc, char* argv[] )
 		Daemon.stop();
 	}
 	return EXIT_SUCCESS;
-#endif
 }
+#endif
 
 #ifdef _WIN32
 #include <windows.h>

qt/i2pd_qt/DaemonQT.cpp

@@ -1,7 +1,11 @@
 #include "DaemonQT.h"
 #include "../../Daemon.h"
-#include <QMutex>
+#include "i2pd_qt_gui.h"
+#include "mainwindow.h"
+#include <QMessageBox>
+#include <QApplication>
 #include <QMutexLocker>
+#include <QThread>
 
 namespace i2p
 {
@@ -18,28 +22,36 @@ namespace i2p
 {
 namespace qt
 {
+	Worker::Worker (DaemonQTImpl& daemon):
+		m_Daemon (daemon)
+	{
+	}
 
-	void Worker::startDaemon() {
+	void Worker::startDaemon() 
+	{
 		qDebug("Performing daemon start...");
-		DaemonQTImpl::start();
+		m_Daemon.start();
 		qDebug("Daemon started.");
 		emit resultReady();
 	}
-	void Worker::restartDaemon() {
+	void Worker::restartDaemon() 
+	{
 		qDebug("Performing daemon restart...");
-		DaemonQTImpl::restart();
+		m_Daemon.restart();
 		qDebug("Daemon restarted.");
 		emit resultReady();
 	}
 	void Worker::stopDaemon() {
 		qDebug("Performing daemon stop...");
-		DaemonQTImpl::stop();
+		m_Daemon.stop();
 		qDebug("Daemon stopped.");
 		emit resultReady();
 	}
 
-	Controller::Controller() {
+    Controller::Controller(DaemonQTImpl& daemon):
-		Worker *worker = new Worker;
+		m_Daemon (daemon) 
+	{
+		Worker *worker = new Worker (m_Daemon);
 		worker->moveToThread(&workerThread);
 		connect(&workerThread, &QThread::finished, worker, &QObject::deleteLater);
 		connect(this, &Controller::startDaemon, worker, &Worker::startDaemon);
@@ -48,40 +60,117 @@ namespace qt
 		connect(worker, &Worker::resultReady, this, &Controller::handleResults);
 		workerThread.start();
 	}
-	Controller::~Controller() {
+	Controller::~Controller() 
+	{
 		qDebug("Closing and waiting for daemon worker thread...");
 		workerThread.quit();
 		workerThread.wait();
 		qDebug("Waiting for daemon worker thread finished.");
-        if(DaemonQTImpl::isRunning()) {
+        if(m_Daemon.isRunning())
+        {
 		    qDebug("Stopping the daemon...");
-            DaemonQTImpl::stop();
+            m_Daemon.stop();
 		    qDebug("Stopped the daemon.");
 		}
 	}
 	
+	DaemonQTImpl::DaemonQTImpl ():
+        mutex(nullptr), m_IsRunning(nullptr), m_RunningChangedCallback(nullptr)
+	{
+	}
+
+	DaemonQTImpl::~DaemonQTImpl ()
+	{
+		delete mutex;
+	}
+
+	bool DaemonQTImpl::init(int argc, char* argv[])
+	{
+		mutex=new QMutex(QMutex::Recursive);
+		setRunningCallback(0);
+        m_IsRunning=false;
+		return Daemon.init(argc,argv);
+
+	}
+	void DaemonQTImpl::deinit()
+	{
+		delete mutex; mutex = nullptr;
+	}
+
+	void DaemonQTImpl::start()
+	{
+		QMutexLocker locker(mutex);
+		setRunning(true);
+		Daemon.start();
+	}
+
+	void DaemonQTImpl::stop()
+	{
+		QMutexLocker locker(mutex);
+		Daemon.stop();
+		setRunning(false);
+	}
 
+	void DaemonQTImpl::restart()
+	{
+		QMutexLocker locker(mutex);
+		stop();
+		start();
+	}
 
-	static DaemonQTImpl::runningChangedCallback DaemonQTImpl_runningChanged;
+	void DaemonQTImpl::setRunningCallback(runningChangedCallback cb)				
-	static bool DaemonQTImpl_running;
+	{
-	static QMutex* mutex;
+		m_RunningChangedCallback = cb;
+	}
 
-	bool DaemonQTImpl::init(int argc, char* argv[]){mutex=new QMutex(QMutex::Recursive);setRunningCallback(0);DaemonQTImpl_running=false;return Daemon.init(argc,argv);}
+	bool DaemonQTImpl::isRunning()
-	void DaemonQTImpl::deinit(){delete mutex;}
+	{
-	void DaemonQTImpl::start(){QMutexLocker locker(mutex);setRunning(true);Daemon.start();}
+        return m_IsRunning;
-	void DaemonQTImpl::stop(){QMutexLocker locker(mutex);Daemon.stop();setRunning(false);}
+	}
-	void DaemonQTImpl::restart(){QMutexLocker locker(mutex);stop();start();}
 
-	void DaemonQTImpl::setRunningCallback(runningChangedCallback cb){DaemonQTImpl_runningChanged=cb;}
+	void DaemonQTImpl::setRunning(bool newValue)
-	bool DaemonQTImpl::isRunning(){return DaemonQTImpl_running;}
+	{
-	void DaemonQTImpl::setRunning(bool newValue){
+        bool oldValue = m_IsRunning;
-		bool oldValue = DaemonQTImpl_running;
+		if(oldValue!=newValue) 
-		if(oldValue!=newValue) {
+		{
-		    DaemonQTImpl_running = newValue;
+            m_IsRunning = newValue;
-		    if(DaemonQTImpl_runningChanged!=0)DaemonQTImpl_runningChanged();
+		    if(m_RunningChangedCallback)
+				m_RunningChangedCallback();
 		}
 	}
 
+	int RunQT (int argc, char* argv[])
+	{
+		 //int result = runGUI(argc, argv);
+		//QMessageBox::information(0,"Debug","runGUI completed");
+		QApplication app(argc, argv);
+		DaemonQTImpl daemon;
+		qDebug("Initialising the daemon...");
+		bool daemonInitSuccess = daemon.init(argc, argv);
+		if(!daemonInitSuccess) 
+		{
+		    QMessageBox::critical(0, "Error", "Daemon init failed");
+		    return 1;
+		}
+		qDebug("Initialised, creating the main window...");
+		MainWindow w;
+		qDebug("Before main window.show()...");
+		w.show ();
+		int result;
+		{
+		    i2p::qt::Controller daemonQtController(daemon);
+		    qDebug("Starting the daemon...");
+		    emit daemonQtController.startDaemon();
+		    qDebug("Starting gui event loop...");
+		    result = app.exec();
+		    //QMessageBox::information(&w, "Debug", "exec finished");
+		}
+		daemon.deinit();
+		//QMessageBox::information(&w, "Debug", "demon stopped");
+		//exit(result); //return from main() causes intermittent sigsegv bugs in some Androids. exit() is a workaround for this
+		qDebug("Exiting the application");
+		return result;
+	}
 }
 }
 

qt/i2pd_qt/DaemonQT.h

@@ -3,27 +3,19 @@
 
 #include <QObject>
 #include <QThread>
+#include <QMutex>
 
 namespace i2p
 {
 namespace qt
 {
-    class Worker : public QObject
-    {
-        Q_OBJECT
-
-    public slots:
-        void startDaemon();
-        void restartDaemon();
-        void stopDaemon();
-
-    signals:
-        void resultReady();
-    };
-
     class DaemonQTImpl
     {
     public:
+
+		DaemonQTImpl ();
+		~DaemonQTImpl ();	
+
         typedef void (*runningChangedCallback)();
 
         /**
@@ -32,15 +24,39 @@ namespace qt
          * @param argv
          * @return success
          */
-        bool static init(int argc, char* argv[]);
+        bool init(int argc, char* argv[]);
-        void static deinit();
+        void deinit();
-        void static start();
+        void start();
-        void static stop();
+        void stop();
-        void static restart();
+        void restart();
-        void static setRunningCallback(runningChangedCallback cb);
+        void setRunningCallback(runningChangedCallback cb);
-        bool static isRunning();
+        bool isRunning();
+    private:
+        void setRunning(bool running);
+	private:
+		QMutex* mutex;
+        bool m_IsRunning;
+		runningChangedCallback m_RunningChangedCallback;
+    };
+
+	class Worker : public QObject
+    {
+        Q_OBJECT
+	public:
+
+		Worker (DaemonQTImpl& daemon);		
+
 	private:
-        void static setRunning(bool running);
+
+		DaemonQTImpl& m_Daemon;		
+
+    public slots:
+        void startDaemon();
+        void restartDaemon();
+        void stopDaemon();
+
+    signals:
+        void resultReady();
     };	
 
     class Controller : public QObject
@@ -48,8 +64,11 @@ namespace qt
         Q_OBJECT
         QThread workerThread;
     public:
-        Controller();
+        Controller(DaemonQTImpl& daemon);
         ~Controller();
+	private:
+		DaemonQTImpl& m_Daemon;	
+
     public slots:
         void handleResults(){}
     signals: