1 files changed, 11 insertions, 13 deletions
diff --git a/src/backend/rendering/cdisplayrendering.cpp b/src/backend/rendering/cdisplayrendering.cpp
index e648303..cc3f7c9 100644
--- a/src/backend/rendering/cdisplayrendering.cpp
+++ b/src/backend/rendering/cdisplayrendering.cpp
@@ -7,19 +7,17 @@
 *
 **********/
 
-#include "cdisplayrendering.h"
+#include "backend/rendering/cdisplayrendering.h"
 
-#include "backend/managers/cdisplaytemplatemgr.h"
-#include "backend/managers/creferencemanager.h"
+#include <QString>
+#include <QRegExp>
+#include <QDebug>
 #include "backend/keys/cswordkey.h"
 #include "backend/keys/cswordversekey.h"
-
+#include "backend/managers/cdisplaytemplatemgr.h"
+#include "backend/managers/referencemanager.h"
 #include "util/cpointers.h"
 
-//Qt
-#include <QString>
-#include <QRegExp>
-#include <QDebug>
 
 namespace Rendering {
 
@@ -88,8 +86,8 @@ const QString CDisplayRendering::entryLink( const KeyTreeItem& item, CSwordModul
     else {
         return QString("<a name=\"").append(keyToHTMLAnchor(item.key())).append("\" ")
                .append("href=\"")
-               .append(CReferenceManager::encodeHyperlink(
-                           module->name(), item.key(), CReferenceManager::typeFromModule(module->type()))
+               .append(ReferenceManager::encodeHyperlink(
+                           module->name(), item.key(), ReferenceManager::typeFromModule(module->type()))
                       )
                .append("\">").append(linkText).append("</a>\n");
     }
@@ -108,7 +106,7 @@ const QString CDisplayRendering::keyToHTMLAnchor(const QString& key) {
 
 const QString CDisplayRendering::finishText( const QString& oldText, KeyTree& tree ) {
     QList<CSwordModuleInfo*> modules = collectModules(&tree);
-    qDebug("CDisplayRendering::finishText");
+    qDebug() << "CDisplayRendering::finishText";
 
     //marking words is very slow, we have to find a better solution
 
@@ -123,12 +121,12 @@ const QString CDisplayRendering::finishText( const QString& oldText, KeyTree& tr
      while (pos != -1) { //word begin found
       //qWarning("found word at %i in %i", pos, text.length());
       int endPos = pos + 1;
-      if (!CToolClass::inHTMLTag(pos+1, text)) { //the re has a positive look ahead which matches one char before the word start
+      if (!util::tool::inHTMLTag(pos+1, text)) { //the re has a positive look ahead which matches one char before the word start
        //qWarning("matched %s", text.mid(pos+1, 4).latin1());
 
        //find end of word and put a marker around it
        endPos = text.find(QRegExp("\\b|[,.:]"), pos+1);
-       if ((endPos != -1) && !CToolClass::inHTMLTag(endPos, text) && (endPos - pos >= 3)) { //reuire wordslonger than 3 chars
+       if ((endPos != -1) && !util::tool::inHTMLTag(endPos, text) && (endPos - pos >= 3)) { //reuire wordslonger than 3 chars
         text.insert(endPos, "</span>");
         text.insert(pos, "<span class=\"word\">");