1 files changed, 20 insertions, 22 deletions
diff --git a/src/frontend/cmodulechooserdialog.cpp b/src/frontend/cmodulechooserdialog.cpp
index 2107b2c..d2d7505 100644
--- a/src/frontend/cmodulechooserdialog.cpp
+++ b/src/frontend/cmodulechooserdialog.cpp
@@ -7,30 +7,28 @@
 *
 **********/
 
-#include "cmodulechooserdialog.h"
+#include "frontend/cmodulechooserdialog.h"
 
-#include "backend/drivers/cswordmoduleinfo.h"
-#include "backend/managers/cswordbackend.h"
-#include "backend/btmoduletreeitem.h"
-
-#include "util/cpointers.h"
-#include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-#include "util/dialogutil.h"
-#include "util/directoryutil.h"
-#include "backend/config/cbtconfig.h"
-
-#include <QDialog>
 #include <QButtonGroup>
+#include <QDebug>
+#include <QDialog>
 #include <QDialogButtonBox>
 #include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
 #include <QSpacerItem>
+#include <QStringList>
 #include <QTreeWidget>
 #include <QVBoxLayout>
-#include <QStringList>
-#include <QDebug>
-#include <QHeaderView>
-#include <QLabel>
+#include "backend/btmoduletreeitem.h"
+#include "backend/config/cbtconfig.h"
+#include "backend/drivers/cswordmoduleinfo.h"
+#include "backend/managers/cswordbackend.h"
+#include "util/cpointers.h"
+#include "util/cresmgr.h"
+#include "util/tool.h"
+#include "util/dialogutil.h"
+#include "util/directory.h"
 
 
 CModuleChooserDialog::CModuleChooserDialog( QWidget* parent, QString title, QString label, QList<CSwordModuleInfo*>*  allModules)
@@ -58,7 +56,7 @@ void CModuleChooserDialog::init() {
 
 /** Initializes the view of this dialog */
 void CModuleChooserDialog::initView() {
-    //TODO: choose the button text?
+    /// \todo choose the button text?
 
     QVBoxLayout *vboxLayout;
     QHBoxLayout *hboxLayout;
@@ -66,7 +64,7 @@ void CModuleChooserDialog::initView() {
 
     vboxLayout = new QVBoxLayout(this);
 
-    QLabel* label = CToolClass::explanationLabel(this, QString::null, m_labelText);
+    QLabel* label = util::tool::explanationLabel(this, QString::null, m_labelText);
     vboxLayout->addWidget(label);
 
     m_moduleChooser = new QTreeWidget(this);
@@ -94,7 +92,7 @@ void CModuleChooserDialog::initView() {
 
 
 void CModuleChooserDialog::initTree() {
-    //qDebug("CModuleChooserDialog::initTree");
+    //qDebug() << "CModuleChooserDialog::initTree";
 
     // See BTModuleTreeItem documentation.
     BTModuleTreeItem root(m_filters, m_grouping, &m_moduleList);
@@ -127,10 +125,10 @@ void CModuleChooserDialog::slotOk() {
     for ( ; *it; ++it ) {
         //add the module to list if the box is checked
         if ((*it)->checkState(0) == Qt::Checked) {
-            qDebug("was checked");
+            qDebug() << "was checked";
             for (QList<CSwordModuleInfo*>::iterator all_iter(m_moduleList.begin()); all_iter != m_moduleList.end(); ++all_iter) {
                 if ((*all_iter)->name() == (*it)->text(0)) {
-                    qDebug("append");
+                    qDebug() << "append";
                     mods.append(*all_iter);
                     break;
                 }