1 files changed, 19 insertions, 17 deletions

diff --git a/src/util/migrationutil.cpp b/src/util/migrationutil.cpp
index af4efca..84d38a5 100644
--- a/src/util/migrationutil.cpp
+++ b/src/util/migrationutil.cpp
@@ -7,21 +7,21 @@
 *
 **********/
 
-#include "migrationutil.h"
-#include "directoryutil.h"
-#include "backend/config/cbtconfig.h"
-
-#include "swversion.h"
+#include "util/migrationutil.h"
 
 #include <QMessageBox>
 #include <QSettings>
+#include "backend/config/cbtconfig.h"
+#include "util/directory.h"
 
+// Sword includes:
+#include "swversion.h"
 
-using namespace util::filesystem;
 
 namespace util {
+namespace migration {
 
-void MigrationUtil::checkMigration() {
+void checkMigration() {
     if (CBTConfig::get(CBTConfig::bibletimeVersion) != BT_VERSION) {
         sword::SWVersion lastVersion(CBTConfig::get(CBTConfig::bibletimeVersion).toUtf8());
         //lastVersion will be 0.0, if it was an old KDE install,
@@ -32,8 +32,10 @@ void MigrationUtil::checkMigration() {
     }
 }
 
-//Migration code for KDE 4 port, moves from old config dir to ~/.bibletime/
-void MigrationUtil::tryMigrationFromKDE3() {
+// Migration code for KDE 4 port, moves from old config dir to ~/.bibletime/
+void tryMigrationFromKDE3() {
+    namespace DU = util::directory;
+
     //List of potential old KDE directories to load data from.
     QStringList searchDirs;
     searchDirs << "/.kde" << "/.kde3" << "/.kde3.5";
@@ -45,7 +47,7 @@ void MigrationUtil::tryMigrationFromKDE3() {
         QDir searchHome(currSearch);
         QFile oldRc(currSearch + "/share/config/bibletimerc");
         //Copy our old bibletimerc into the new KDE4 directory.
-        QString newRcLoc = DirectoryUtil::getUserBaseDir().absolutePath() + "/bibletimerc";
+        QString newRcLoc(DU::getUserBaseDir().absolutePath() + "/bibletimerc");
         QFile newRc(newRcLoc);
 
         //Migrate only if the old config exists and the new doesn't
@@ -59,23 +61,23 @@ void MigrationUtil::tryMigrationFromKDE3() {
             oldRc.copy(newRcLoc);
             QFile oldBookmarks(currSearch + "/share/apps/bibletime/bookmarks.xml");
             if (oldBookmarks.exists()) {
-                QString newBookmarksLoc = DirectoryUtil::getUserBaseDir().absolutePath() + "/" + "bookmarks.xml";
+                QString newBookmarksLoc(DU::getUserBaseDir().absolutePath() + "/" + "bookmarks.xml");
                 QFile newBookmarks(newBookmarksLoc);
                 newBookmarks.remove();
                 oldBookmarks.copy(newBookmarksLoc);
             }
             QDir sessionDir(currSearch + "/share/apps/bibletime/sessions");
             if (sessionDir.exists()) {
-                DirectoryUtil::copyRecursive(
+                DU::copyRecursive(
                     sessionDir.absolutePath(),
-                    DirectoryUtil::getUserSessionsDir().absolutePath());
+                    DU::getUserSessionsDir().absolutePath());
             }
             else {
                 QDir oldSessionDir(currSearch + "/share/apps/bibletime/profiles");
                 if (oldSessionDir.exists()) {
-                    DirectoryUtil::copyRecursive(
+                    DU::copyRecursive(
                         oldSessionDir.absolutePath(),
-                        DirectoryUtil::getUserSessionsDir().absolutePath());
+                        DU::getUserSessionsDir().absolutePath());
                 }
             }
             //We found at least a config file, so we are done
@@ -86,5 +88,5 @@ void MigrationUtil::tryMigrationFromKDE3() {
     CBTConfig::syncConfig();
 }
 
-}
-
+} // namespace migration
+} // namespace util