1 files changed, 12 insertions, 15 deletions
diff --git a/src/backend/btmoduletreeitem.cpp b/src/backend/btmoduletreeitem.cpp
index d11ecbd..01e4446 100644
--- a/src/backend/btmoduletreeitem.cpp
+++ b/src/backend/btmoduletreeitem.cpp
@@ -7,19 +7,16 @@
 *
 **********/
 
-#include "btmoduletreeitem.h"
+#include "backend/btmoduletreeitem.h"
 
+#include <QDebug>
+#include <QList>
+#include <QString>
 #include "backend/drivers/cswordmoduleinfo.h"
-#include "util/cpointers.h"
 #include "backend/managers/cswordbackend.h"
+#include "util/cpointers.h"
 #include "util/cresmgr.h"
-#include "util/ctoolclass.h"
-
-#include <QString>
-#include <QList>
-
-#include <QDebug>
-
+#include "util/tool.h"
 
 
 //This ctor creates the root item and the tree.
@@ -68,7 +65,7 @@ BTModuleTreeItem::~BTModuleTreeItem() {
 }
 
 QList<BTModuleTreeItem*> BTModuleTreeItem::children() const {
-    //qDebug("BTModuleTreeItem::children");
+    //qDebug() << "BTModuleTreeItem::children";
     QList<BTModuleTreeItem*> childList;
     if (m_firstChild) {
         BTModuleTreeItem* child = m_firstChild;
@@ -81,7 +78,7 @@ QList<BTModuleTreeItem*> BTModuleTreeItem::children() const {
     return childList;
 }
 
-//TODO
+/// \todo
 QString BTModuleTreeItem::iconName() const {
     if (m_type == Category) {
         switch ( m_category) {
@@ -114,10 +111,10 @@ QString BTModuleTreeItem::iconName() const {
         }
     }
     else if (m_type == Module) {
-        return CToolClass::getIconNameForModule(m_moduleInfo);
+        return util::tool::getIconNameForModule(m_moduleInfo);
     }
     else if (m_type == Language) {
-        //TODO: don't hardcode here
+        /// \todo don't hardcode here
         return "flag.svg";
     }
 
@@ -126,7 +123,7 @@ QString BTModuleTreeItem::iconName() const {
 
 
 void BTModuleTreeItem::create_tree(QList<BTModuleTreeItem::Filter*>& filters, BTModuleTreeItem::Grouping grouping) {
-    qDebug("BTModuleTreeItem::create_tree");
+    qDebug() << "BTModuleTreeItem::create_tree";
     static bool map_initialized = false;
     static QMap<CSwordModuleInfo::Category, QString> CategoryNamesMap;
     if (!map_initialized) {
@@ -218,7 +215,7 @@ BTModuleTreeItem* BTModuleTreeItem::create_parent_item(
 }
 
 void BTModuleTreeItem::sort_children(BTModuleTreeItem* parent) {
-    //qDebug("BTModuleTreeItem::sort_children");
+    //qDebug() << "BTModuleTreeItem::sort_children";
 
     // sort each child recursively depth-first
     foreach(BTModuleTreeItem* item, parent->children()) {