1 files changed, 15 insertions, 13 deletions
diff --git a/src/frontend/mainindex/bookmarks/btbookmarkloader.cpp b/src/frontend/mainindex/bookmarks/btbookmarkloader.cpp
index f6f3913..ddf656e 100644
--- a/src/frontend/mainindex/bookmarks/btbookmarkloader.cpp
+++ b/src/frontend/mainindex/bookmarks/btbookmarkloader.cpp
@@ -7,24 +7,22 @@
 *
 **********/
 
-#include "btbookmarkloader.h"
+#include "frontend/mainindex/bookmarks/btbookmarkloader.h"
 
-#include "btbookmarkitem.h"
-#include "btbookmarkfolder.h"
-
-#include "util/ctoolclass.h"
-#include "backend/drivers/cswordmoduleinfo.h"
-
-#include <QTreeWidgetItem>
+#include <QDebug>
 #include <QDomElement>
 #include <QDomNode>
 #include <QDomDocument>
-#include <QTextStream>
 #include <QFile>
 #include <QIODevice>
 #include <QTextCodec>
+#include <QTextStream>
+#include <QTreeWidgetItem>
+#include "backend/drivers/cswordmoduleinfo.h"
+#include "frontend/mainindex/bookmarks/btbookmarkitem.h"
+#include "frontend/mainindex/bookmarks/btbookmarkfolder.h"
+#include "util/tool.h"
 
-#include <QDebug>
 
 #define CURRENT_SYNTAX_VERSION 1
 
@@ -102,8 +100,10 @@ QTreeWidgetItem* BtBookmarkLoader::handleXmlElement(QDomElement& element, QTreeW
 
 
 QString BtBookmarkLoader::loadXmlFromFile(QString fileName) {
+    namespace DU = util::directory;
+
     if (fileName.isNull()) {
-        fileName = util::filesystem::DirectoryUtil::getUserBaseDir().absolutePath() + "/bookmarks.xml";
+        fileName = DU::getUserBaseDir().absolutePath() + "/bookmarks.xml";
     }
     QFile file(fileName);
     if (!file.exists())
@@ -122,9 +122,11 @@ QString BtBookmarkLoader::loadXmlFromFile(QString fileName) {
 }
 
 void BtBookmarkLoader::saveTreeFromRootItem(QTreeWidgetItem* rootItem, QString fileName, bool forceOverwrite) {
+    namespace DU = util::directory;
+
     Q_ASSERT(rootItem);
     if (fileName.isNull()) {
-        fileName = util::filesystem::DirectoryUtil::getUserBaseDir().absolutePath() + "/bookmarks.xml";
+        fileName = DU::getUserBaseDir().absolutePath() + "/bookmarks.xml";
     }
 
     QDomDocument doc("DOC");
@@ -139,7 +141,7 @@ void BtBookmarkLoader::saveTreeFromRootItem(QTreeWidgetItem* rootItem, QString f
     for (int i = 0; i < rootItem->childCount(); i++) {
         saveItem(rootItem->child(i), content);
     }
-    CToolClass::savePlainFile(fileName, doc.toString(), forceOverwrite, QTextCodec::codecForName("UTF-8"));
+    util::tool::savePlainFile(fileName, doc.toString(), forceOverwrite, QTextCodec::codecForName("UTF-8"));
 
 }