1 files changed, 25 insertions, 28 deletions

diff --git a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp b/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
index cd8f687..1cc6398 100644
--- a/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
+++ b/src/frontend/bookshelfmanager/removepage/btremovepage.cpp
@@ -7,38 +7,35 @@
 *
 **********/
 
+#include "frontend/bookshelfmanager/removepage/btremovepage.h"
 
-#include "btremovepage.h"
-
-
+#include <QDebug>
+#include <QGridLayout>
+#include <QLabel>
+#include <QList>
+#include <QMultiMap>
+#include <QPushButton>
+#include <QString>
+#include <QTreeWidget>
+#include <QTreeWidgetItem>
 #include "backend/btmoduletreeitem.h"
 #include "backend/config/cbtconfig.h"
 #include "backend/drivers/cswordmoduleinfo.h"
-
-#include "util/ctoolclass.h"
+#include "util/directory.h"
+#include "util/dialogutil.h"
 #include "util/cpointers.h"
-#include "util/directoryutil.h"
 #include "util/cresmgr.h"
+#include "util/tool.h"
 
+// Sword includes:
 #include <swmgr.h>
 #include <installmgr.h>
 
-#include <QString>
-#include <QGridLayout>
-#include <QLabel>
-#include <QPushButton>
-#include <QTreeWidget>
-#include <QTreeWidgetItem>
-#include <QMessageBox>
-#include <QList>
-#include <QMultiMap>
-
-#include <QDebug>
-
-
 
 BtRemovePage::BtRemovePage()
         : BtConfigPage() {
+    namespace DU = util::directory;
+
     QGridLayout* layout = new QGridLayout(this);
     layout->setMargin(5);
 
@@ -48,13 +45,13 @@ BtRemovePage::BtRemovePage()
 
     m_view = new QTreeWidget(this);
     m_view->setHeaderLabels(QStringList() << tr("Work") << tr("Install path"));
-    m_view->setColumnWidth(0, CToolClass::mWidth(m_view, 20));
+    m_view->setColumnWidth(0, util::tool::mWidth(m_view, 20));
 
     layout->addWidget( m_view, 2, 0, 1, 2);
 
     m_removeButton = new QPushButton(tr("Remove..."), this);
     m_removeButton->setToolTip(tr("Remove the selected works"));
-    m_removeButton->setIcon( util::filesystem::DirectoryUtil::getIcon(CResMgr::bookshelfmgr::removepage::remove_icon) );
+    m_removeButton->setIcon(DU::getIcon(CResMgr::bookshelfmgr::removepage::remove_icon));
     m_removeButton->setEnabled(false);
     layout->addWidget(m_removeButton, 3, 1, Qt::AlignRight);
 
@@ -89,7 +86,7 @@ void BtRemovePage::populateModuleList() {
 
     // receive signal when user checks modules
     connect(m_view, SIGNAL(itemChanged(QTreeWidgetItem*, int)), this, SLOT(slotSelectionChanged(QTreeWidgetItem*, int)) );
-    qDebug("BtSourceArea::createModuleTree end");
+    qDebug() << "BtSourceArea::createModuleTree end";
 }
 
 void BtRemovePage::addToTree(BTModuleTreeItem* item, QTreeWidgetItem* widgetItem) {
@@ -111,11 +108,11 @@ void BtRemovePage::addToTree(BTModuleTreeItem* item, QTreeWidgetItem* widgetItem
             widgetItem->setFlags(Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
             widgetItem->setCheckState(0, Qt::Unchecked);
 
-            //TODO: add the relevant information in to item or tooltip
+            /// \todo add the relevant information in to item or tooltip
             // (install path, is still available from some source)
 
             QString descr(mInfo->config(CSwordModuleInfo::AbsoluteDataPath));
-            QString toolTipText = CToolClass::moduleToolTip(mInfo);
+            QString toolTipText = util::tool::moduleToolTip(mInfo);
             widgetItem->setText(1, descr);
             widgetItem->setToolTip(0, toolTipText);
             widgetItem->setToolTip(1, descr);
@@ -139,7 +136,7 @@ void BtRemovePage::slotRemoveModules() {
                             .append("\n\n")
                             .append(tr("Do you really want to remove them from your system?"));
 
-    if ((QMessageBox::question(this, tr("Remove Works?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)) {  //Yes was pressed.
+    if ((util::showQuestion(this, tr("Remove Works?"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes)) {  //Yes was pressed.
 
         // Update the module list before really removing. Remember deleting the pointers later.
         QList<CSwordModuleInfo*> toBeDeleted = CPointers::backend()->takeModulesFromList(moduleNames);
@@ -181,12 +178,12 @@ void BtRemovePage::slotRemoveModules() {
 
 
 void BtRemovePage::slotSelectionChanged(QTreeWidgetItem* item, int column) {
-    //qDebug("BtRemovePage::slotSelectionChanged");
+    //qDebug() << "BtRemovePage::slotSelectionChanged";
     // modify the internal list of checked modules
     // if() leaves groups away
     if (!item->childCount() && column == 0) {
         CSwordModuleInfo* mInfo = 0;
-        //qDebug("BtRemovePage::slotSelectionChanged");
+        //qDebug() << "BtRemovePage::slotSelectionChanged";
         foreach (CSwordModuleInfo* module, CPointers::backend()->moduleList()) {
             if (module->name() == item->text(0) && module->config(CSwordModuleInfo::AbsoluteDataPath) == item->text(1)) {
                 mInfo = module;
@@ -213,7 +210,7 @@ void BtRemovePage::slotSelectionChanged(QTreeWidgetItem* item, int column) {
 }
 
 void BtRemovePage::slotItemDoubleClicked(QTreeWidgetItem* /*item*/, int /*column*/) {
-    // TODO: Open the About dialog.
+    // \todo Open the About dialog.
 }
 
 void BtRemovePage::slotSwordSetupChanged() {