1 files changed, 12 insertions, 13 deletions
diff --git a/src/backend/config/cbtconfig.cpp b/src/backend/config/cbtconfig.cpp
index db62863..98a2967 100644
--- a/src/backend/config/cbtconfig.cpp
+++ b/src/backend/config/cbtconfig.cpp
@@ -7,25 +7,23 @@
 *
 **********/
 
-#include "cbtconfig.h"
+#include "backend/config/cbtconfig.h"
 
-// Qt includes
 #include <QDebug>
 #include <QLocale>
 #include <QSettings>
 #include <QVariant>
 #include <QWebSettings>
-
-// Sword includes
-#include <versekey.h> // For range configuration
-
-// BibleTime includes
 #include "backend/btmoduletreeitem.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
 #include "frontend/displaywindow/btactioncollection.h"
 #include "frontend/searchdialog/btsearchoptionsarea.h"
 #include "util/cpointers.h"
-#include "util/directoryutil.h"
+#include "util/directory.h"
+
+// Sword includes:
+#include <versekey.h> // For range configuration
+
 
 namespace CBTConfig {
 namespace {
@@ -712,7 +710,7 @@ CSwordBackend::FilterOptions getFilterOptionDefaults() {
 
 void setupAccelSettings(const keys type,
                         BtActionCollection * const actionCollection) {
-    qDebug("CBTConfig::setupAccelSettings begin");
+    qDebug() << "CBTConfig::setupAccelSettings begin";
     QString groupName;
     switch (type) {
         case allWindows:
@@ -745,12 +743,12 @@ void setupAccelSettings(const keys type,
 
     actionCollection->setConfigGroup(groupName);
     actionCollection->readSettings();
-    qDebug("CBTConfig::setupAccelSettings end");
+    qDebug() << "CBTConfig::setupAccelSettings end";
 }
 
 void saveAccelSettings(const keys type,
                        BtActionCollection * const actionCollection) {
-    qDebug("CBTConfig::saveAccelSettings begin");
+    qDebug() << "CBTConfig::saveAccelSettings begin";
     QString groupName;
     switch (type) {
         case allWindows:
@@ -781,7 +779,7 @@ void saveAccelSettings(const keys type,
 
     actionCollection->setConfigGroup(groupName);
     actionCollection->writeSettings();
-    qDebug("CBTConfig::saveAccelSettings end");
+    qDebug() << "CBTConfig::saveAccelSettings end";
 }
 
 
@@ -800,7 +798,8 @@ void setModuleEncryptionKey(const QString &module, const QString &key) {
 }
 
 QSettings *getConfig() {
-    static QSettings config(util::filesystem::DirectoryUtil::getUserBaseDir().absolutePath() + "/bibletimerc", QSettings::IniFormat);
+    namespace DU = util::directory;
+    static QSettings config(DU::getUserBaseDir().absolutePath() + "/bibletimerc", QSettings::IniFormat);
     return &config;
 }