Index: sources/applicationcontroller.h =================================================================== diff -u -re1605219ac2baf49ef21d0889f845ac53d59c3c1 -r56d00a82669a7a2c00ab90109a89dbec8db27527 --- sources/applicationcontroller.h (.../applicationcontroller.h) (revision e1605219ac2baf49ef21d0889f845ac53d59c3c1) +++ sources/applicationcontroller.h (.../applicationcontroller.h) (revision 56d00a82669a7a2c00ab90109a89dbec8db27527) @@ -15,36 +15,43 @@ // Qt #include -#include // Project #include "main.h" #include "guiglobals.h" #include "applicationpost.h" -#include "caninterface.h" - // define #define _ApplicationController ApplicationController::I() // namespace using namespace Gui; -using namespace Can; class ApplicationController : public QObject { Q_OBJECT ApplicationPost *_applicationPost = nullptr; + QThread *_thread = nullptr; + bool _init = false; + // Singleton SINGLETON(ApplicationController) -public: +public slots: bool init(); + bool init(QThread &vThread); +private slots: + void quit(); + private: void initConnections(); + + void initThread(QThread &vThread); + void quitThread(); + void keepAlive(); private slots: // Should be private for thread safety and is connected internally. @@ -68,8 +75,5 @@ void didUSBDriveRemove(); void didExportLog(); - - void quit(int retcode=0); - };