added ControllerDebug singleton to avoid duplicated code

1 files changed, 6 insertions, 7 deletions

diff --git a/src/controllers/bulk/bulkcontroller.cpp b/src/controllers/bulk/bulkcontroller.cpp
index bb48fd5c99..4d038961c5 100644
--- a/src/controllers/bulk/bulkcontroller.cpp
+++ b/src/controllers/bulk/bulkcontroller.cpp
@@ -10,6 +10,7 @@
 #include "controllers/bulk/bulkcontroller.h"
 #include "controllers/bulk/bulksupported.h"
 #include "controllers/defs_controllers.h"
+#include "controllers/controllerdebug.h"
 #include "util/compatibility.h"
 #include "util/trace.h"
 
@@ -210,7 +211,7 @@ int BulkController::close() {
         disconnect(m_pReader, SIGNAL(incomingData(QByteArray)),
                    this, SLOT(receive(QByteArray)));
         m_pReader->stop();
-        if (debugging()) QDebug(QtDebugMsg) << "  Waiting on reader to finish";
+        controllerDebug("  Waiting on reader to finish");
         m_pReader->wait();
         delete m_pReader;
         m_pReader = NULL;
@@ -221,9 +222,7 @@ int BulkController::close() {
     stopEngine();
 
     // Close device
-    if (debugging()) {
-        QDebug(QtDebugMsg) << "  Closing device";
-    }
+    controllerDebug("  Closing device");
     libusb_close(m_phandle);
     m_phandle = NULL;
     setOpen(false);
@@ -251,8 +250,8 @@ void BulkController::send(QByteArray data) {
     if (ret < 0) {
         qWarning() << "Unable to send data to" << getName()
                    << "serial #" << m_sUID;
-    } else if (debugging()) {
-        QDebug(QtDebugMsg) << ret << "bytes sent to" << getName()
-                 << "serial #" << m_sUID;
+    } else {
+        controllerDebug(ret << "bytes sent to" << getName()
+                 << "serial #" << m_sUID);
     }
 }