1 files changed, 17 insertions, 20 deletions
diff --git a/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp b/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
index 2a628c9..df388dd 100644
--- a/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
+++ b/src/frontend/bookshelfmanager/indexpage/btindexpage.cpp
@@ -7,31 +7,28 @@
 *
 **********/
 
-#include "btindexpage.h"
+#include "frontend/bookshelfmanager/indexpage/btindexpage.h"
 
-#include "frontend/cmoduleindexdialog.h"
-#include "backend/config/cbtconfig.h"
-
-#include "util/ctoolclass.h"
-#include "util/cresmgr.h"
-#include "util/cpointers.h"
-#include "util/directoryutil.h"
-
-#include "backend/drivers/cswordmoduleinfo.h"
-#include "backend/managers/cswordbackend.h"
-
-//Qt includes
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
 #include <QCheckBox>
 #include <QDir>
+#include <QHBoxLayout>
 #include <QPushButton>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
+#include <QVBoxLayout>
+#include "backend/config/cbtconfig.h"
+#include "backend/drivers/cswordmoduleinfo.h"
+#include "backend/managers/cswordbackend.h"
+#include "frontend/cmoduleindexdialog.h"
+#include "util/directory.h"
+#include "util/cpointers.h"
+#include "util/cresmgr.h"
+#include "util/tool.h"
 
 
 BtIndexPage::BtIndexPage()
         : BtConfigPage() {
+    namespace DU = util::directory;
 
     QVBoxLayout *vboxLayout;
     QHBoxLayout *hboxLayout;
@@ -65,15 +62,15 @@ BtIndexPage::BtIndexPage()
     // configure the list view
     m_moduleList->setHeaderLabels( (QStringList(tr("Work")) << tr("Index size")) );
     m_moduleList->setRootIsDecorated(true);
-    m_moduleList->setColumnWidth(0, CToolClass::mWidth(m_moduleList, 20) );
+    m_moduleList->setColumnWidth(0, util::tool::mWidth(m_moduleList, 20) );
     //m_moduleList->setTextAlignment(1, Qt::AlignRight); see doc...
     m_moduleList->setSortingEnabled(false);
 
     m_autoDeleteOrphanedIndicesBox->setChecked( CBTConfig::get( CBTConfig::autoDeleteOrphanedIndices ) );
 
     // icons for our buttons
-    m_createButton->setIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::bookshelfmgr::indexpage::create_icon));
-    m_deleteButton->setIcon(util::filesystem::DirectoryUtil::getIcon(CResMgr::bookshelfmgr::indexpage::delete_icon));
+    m_createButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::indexpage::create_icon));
+    m_deleteButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::indexpage::delete_icon));
 
     // connect our signals/slots
     connect(m_createButton, SIGNAL(clicked()), this, SLOT(createIndices()));