Imported Upstream version 2.4

1 files changed, 11 insertions, 11 deletions

diff --git a/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp b/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp
index cdfa870..2091a54 100644
--- a/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp
+++ b/src/frontend/mainindex/bookmarks/btbookmarkfolder.cpp
@@ -7,18 +7,16 @@
 *
 **********/
 
+#include "frontend/mainindex/bookmarks/btbookmarkfolder.h"
 
-#include "btbookmarkfolder.h"
-#include "btbookmarkitembase.h"
-#include "btbookmarkitem.h"
-#include "btbookmarkloader.h"
-
-#include "util/cresmgr.h"
-#include "util/directoryutil.h"
-
+#include <QDebug>
 #include <QFileDialog>
+#include "frontend/mainindex/bookmarks/btbookmarkitembase.h"
+#include "frontend/mainindex/bookmarks/btbookmarkitem.h"
+#include "frontend/mainindex/bookmarks/btbookmarkloader.h"
+#include "util/cresmgr.h"
+#include "util/directory.h"
 
-#include <QDebug>
 
 BtBookmarkFolder::BtBookmarkFolder(QTreeWidgetItem* parent, QString name)
         : BtBookmarkItemBase(parent) {
@@ -86,12 +84,14 @@ void BtBookmarkFolder::rename() {
 }
 
 void BtBookmarkFolder::update() {
+    namespace DU = util::directory;
+
     qDebug() << "BtBookmarkFolder::update()";
     BtBookmarkItemBase::update();
     if (isExpanded() && childCount())
-        setIcon(0, util::filesystem::DirectoryUtil::getIcon(CResMgr::mainIndex::openedFolder::icon));
+        setIcon(0, DU::getIcon(CResMgr::mainIndex::openedFolder::icon));
     else
-        setIcon(0, util::filesystem::DirectoryUtil::getIcon(CResMgr::mainIndex::closedFolder::icon));
+        setIcon(0, DU::getIcon(CResMgr::mainIndex::closedFolder::icon));
 }
 
 bool BtBookmarkFolder::hasDescendant(QTreeWidgetItem* item) const {