Index: sources/applicationcontroller.cpp
===================================================================
diff -u -r5e78f0799b46963feb5756decb1a27b952cd19b3 -re1605219ac2baf49ef21d0889f845ac53d59c3c1
--- sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision 5e78f0799b46963feb5756decb1a27b952cd19b3)
+++ sources/applicationcontroller.cpp	(.../applicationcontroller.cpp)	(revision e1605219ac2baf49ef21d0889f845ac53d59c3c1)
@@ -24,9 +24,6 @@
 #include "usbwatcher.h"
 #include "filehandler.h"
 
-// Singleton
-SINGLETON_INIT(ApplicationController)
-
 /*!
  * \brief ApplicationController Constructor
  * \param parent
@@ -52,28 +49,26 @@
 void ApplicationController::initConnections()
 {
 
-    connect(_MainTimer        , SIGNAL(        didTimeout()),
-            this              ,   SLOT(onMainTimerTimeout()));
+    connect(&_MainTimer        , SIGNAL(        didTimeout()),
+            this               ,   SLOT(onMainTimerTimeout()));
 
     // From GUI
-    connect(_GuiController , SIGNAL(didActionTransmit(GuiActionType, const QVariantList &)),
-            this           ,   SLOT( onActionTransmit(GuiActionType, const QVariantList &)));
+    connect(&_GuiController , SIGNAL(didActionTransmit(GuiActionType, const QVariantList &)),
+            this            ,   SLOT( onActionTransmit(GuiActionType, const QVariantList &)));
 
     // From HD/DG
-    connect(_MessageDispatcher, SIGNAL(didActionReceive(GuiActionType, const QVariantList &)),
-            this              ,   SLOT( onActionReceive(GuiActionType, const QVariantList &)));
+    connect(&_MessageDispatcher, SIGNAL(didActionReceive(GuiActionType, const QVariantList &)),
+            this               ,   SLOT( onActionReceive(GuiActionType, const QVariantList &)));
 
-    connect(_GuiController , SIGNAL(didUSBDriveUmount()),
-            this           ,   SLOT( onUSBDriveUmount()));
+    connect(&_GuiController , SIGNAL(didUSBDriveUmount()),
+            this            ,   SLOT( onUSBDriveUmount()));
     connect(&_USBWatcher    , SIGNAL(didUSBDriveMount ()),
-            this           ,   SLOT( onUSBDriveMount ()));
+            this            ,   SLOT( onUSBDriveMount ()));
     connect(&_USBWatcher    , SIGNAL(didUSBDriveRemove()),
-            this           ,   SLOT( onUSBDriveRemove()));
+            this            ,   SLOT( onUSBDriveRemove()));
 
-    connect(_GuiController , SIGNAL(didExportLog()),
-            this           ,   SLOT( onExportLog()));
-
-
+    connect(&_GuiController , SIGNAL(didExportLog()),
+            this            ,   SLOT( onExportLog()));
 }
 
 /*!