1 files changed, 14 insertions, 13 deletions
diff --git a/src/frontend/bookshelfmanager/btconfigdialog.cpp b/src/frontend/bookshelfmanager/btconfigdialog.cpp
index 0fcbc5a..565765d 100644
--- a/src/frontend/bookshelfmanager/btconfigdialog.cpp
+++ b/src/frontend/bookshelfmanager/btconfigdialog.cpp
@@ -7,23 +7,22 @@
 *
 **********/
 
-
-#include "btconfigdialog.h"
-
-#include "util/directoryutil.h"
-#include "util/ctoolclass.h"
+#include "frontend/bookshelfmanager/btconfigdialog.h"
 
 #include <QDialog>
-#include <QStackedWidget>
+#include <QDialogButtonBox>
+#include <QEvent>
+#include <QFrame>
+#include <QHBoxLayout>
+#include <QLabel>
 #include <QListWidget>
 #include <QListView>
 #include <QListWidgetItem>
+#include <QStackedWidget>
 #include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QLabel>
-#include <QDialogButtonBox>
-#include <QFrame>
-#include <QEvent>
+#include "util/directory.h"
+#include "util/tool.h"
+
 
 BtConfigDialog::BtConfigDialog(QWidget* parent)
         : QDialog(parent),
@@ -63,11 +62,13 @@ BtConfigDialog::BtConfigDialog(QWidget* parent)
 BtConfigDialog::~BtConfigDialog() {}
 
 void BtConfigDialog::addPage(BtConfigPage* pageWidget) {
+    namespace DU = util::directory;
+
     // this is a friend
     pageWidget->m_parentDialog = this;
 
     QVBoxLayout* containerLayout = new QVBoxLayout;
-    QLabel* headerLabel = CToolClass::explanationLabel(pageWidget, pageWidget->header(), pageWidget->label());
+    QLabel* headerLabel = util::tool::explanationLabel(pageWidget, pageWidget->header(), pageWidget->label());
     containerLayout->addWidget(headerLabel);
     containerLayout->addWidget(pageWidget);
     QWidget* containerWidget = new QWidget(m_pageWidget);
@@ -76,7 +77,7 @@ void BtConfigDialog::addPage(BtConfigPage* pageWidget) {
 
 
     QListWidgetItem* item = new QListWidgetItem(m_contentsList);
-    item->setIcon(util::filesystem::DirectoryUtil::getIcon(pageWidget->iconName()));
+    item->setIcon(DU::getIcon(pageWidget->iconName()));
     item->setText(pageWidget->header());
     item->setTextAlignment(Qt::AlignHCenter);
     item->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);