Imported Upstream version 2.4

20 files changed, 172 insertions, 193 deletions

diff --git a/src/frontend/display/btcolorwidget.cpp b/src/frontend/display/btcolorwidget.cpp
index 735f23f..37bea2d 100644
--- a/src/frontend/display/btcolorwidget.cpp
+++ b/src/frontend/display/btcolorwidget.cpp
@@ -7,11 +7,13 @@
 *
 **********/
 
-#include "btcolorwidget.h"
-#include <QPalette>
+#include "frontend/display/btcolorwidget.h"
+
 #include <QColor>
-#include <QMouseEvent>
 #include <QColorDialog>
+#include <QMouseEvent>
+#include <QPalette>
+
 
 BtColorWidget::BtColorWidget(QWidget* parent)
         : QFrame(parent) {
diff --git a/src/frontend/display/btcolorwidget.h b/src/frontend/display/btcolorwidget.h
index aac8615..0d8e8ad 100644
--- a/src/frontend/display/btcolorwidget.h
+++ b/src/frontend/display/btcolorwidget.h
@@ -1,19 +1,18 @@
-//
-// C++ Interface: BtColorWidget
-//
-// Description: A color choosing widget for the toolbar
-//
-//
-// Author: The BibleTime team <info@bibletime.info>, (C) 1999-2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2009 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
 
 #ifndef BTCOLORWIDGET_H
 #define BTCOLORWIDGET_H
 
 #include <QFrame>
+
+
 class QPaintEvent;
 
 class BtColorWidget : public QFrame {
diff --git a/src/frontend/display/btfontsizewidget.cpp b/src/frontend/display/btfontsizewidget.cpp
index 9d45a6a..116d0d7 100644
--- a/src/frontend/display/btfontsizewidget.cpp
+++ b/src/frontend/display/btfontsizewidget.cpp
@@ -7,9 +7,11 @@
 *
 **********/
 
-#include "btfontsizewidget.h"
-#include <QFontDatabase>
+#include "frontend/display/btfontsizewidget.h"
+
 #include <QCompleter>
+#include <QFontDatabase>
+
 
 BtFontSizeWidget::BtFontSizeWidget(QWidget* parent)
         : QComboBox(parent) {
diff --git a/src/frontend/display/btfontsizewidget.h b/src/frontend/display/btfontsizewidget.h
index 81cfa86..3db867d 100644
--- a/src/frontend/display/btfontsizewidget.h
+++ b/src/frontend/display/btfontsizewidget.h
@@ -1,14 +1,11 @@
-//
-// C++ Interface: BtFontSizeWidget
-//
-// Description: A font combobox widget for the toolbar
-//
-//
-// Author: The BibleTime team <info@bibletime.info>, (C) 1999-2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
+/*********
+*
+* This file is part of BibleTime's source code, http://www.bibletime.info/.
+*
+* Copyright 1999-2008 by the BibleTime developers.
+* The BibleTime source code is licensed under the GNU General Public License version 2.0.
+*
+**********/
 
 #ifndef BTFONTSIZEWIDGET_H
 #define BTFONTSIZEWIDGET_H
diff --git a/src/frontend/display/bthtmlfindtext.cpp b/src/frontend/display/bthtmlfindtext.cpp
index 9e0feff..70e8a5d 100644
--- a/src/frontend/display/bthtmlfindtext.cpp
+++ b/src/frontend/display/bthtmlfindtext.cpp
@@ -7,12 +7,14 @@
 *
 **********/
 
-#include "bthtmlfindtext.h"
-#include "bthtmlreaddisplay.h"
-#include "creaddisplay.h"
+#include "frontend/display/bthtmlfindtext.h"
+
+#include <QMdiSubWindow>
 #include "frontend/cmdiarea.h"
+#include "frontend/display/bthtmlreaddisplay.h"
+#include "frontend/display/creaddisplay.h"
 #include "frontend/displaywindow/cdisplaywindow.h"
-#include <QMdiSubWindow>
+
 
 static BtHtmlFindText* dialog = 0;
 
diff --git a/src/frontend/display/bthtmlfindtext.h b/src/frontend/display/bthtmlfindtext.h
index 0500247..3c24489 100644
--- a/src/frontend/display/bthtmlfindtext.h
+++ b/src/frontend/display/bthtmlfindtext.h
@@ -10,7 +10,10 @@
 #ifndef BTHTMLFINDTEXT_H
 #define BTHTMLFINDTEXT_H
 
+/// \todo Qt Designer UI file!?
 #include "ui_bthtmlfindtext.h"
+
+
 class CMDIArea;
 class QWebView;
 
diff --git a/src/frontend/display/bthtmljsobject.cpp b/src/frontend/display/bthtmljsobject.cpp
index b1b97a6..195564e 100644
--- a/src/frontend/display/bthtmljsobject.cpp
+++ b/src/frontend/display/bthtmljsobject.cpp
@@ -6,16 +6,19 @@
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
-#include "bthtmljsobject.h"
-#include "bthtmlreaddisplay.h"
-#include "frontend/cinfodisplay.h"
-#include "frontend/cdragdrop.h"
-#include "backend/managers/creferencemanager.h"
-#include "backend/managers/cswordbackend.h"
-#include "backend/keys/cswordkey.h"
-#include "backend/config/cbtconfig.h"
+
+#include "frontend/display/bthtmljsobject.h"
+
 #include <boost/scoped_ptr.hpp>
 #include <QObject>
+#include "backend/config/cbtconfig.h"
+#include "backend/keys/cswordkey.h"
+#include "backend/managers/referencemanager.h"
+#include "backend/managers/cswordbackend.h"
+#include "frontend/cdragdrop.h"
+#include "frontend/cinfodisplay.h"
+#include "frontend/display/bthtmlreaddisplay.h"
+
 
 using namespace InfoDisplay;
 
@@ -49,14 +52,14 @@ void BtHtmlJsObject::mouseDownLeft(const QString& url, const int& x, const int&
 
 void BtHtmlJsObject::mouseClick(const QString& url) {
     m_dndData.mousePressed = false;
-    if (!url.isEmpty() && CReferenceManager::isHyperlink(url)) {
+    if (!url.isEmpty() && ReferenceManager::isHyperlink(url)) {
         QString module;
         QString key;
-        CReferenceManager::Type type;
+        ReferenceManager::Type type;
 
-        CReferenceManager::decodeHyperlink(url, module, key, type);
+        ReferenceManager::decodeHyperlink(url, module, key, type);
         if (module.isEmpty()) {
-            module = CReferenceManager::preferredModule( type );
+            module = ReferenceManager::preferredModule( type );
         }
         m_display->connectionsProxy()->emitReferenceClicked(module, key);
     }
@@ -82,8 +85,8 @@ void BtHtmlJsObject::mouseMoveEvent(const QString& attributes, const int& x, con
                 // create a new bookmark drag!
                 QString moduleName = QString::null;
                 QString keyName = QString::null;
-                CReferenceManager::Type type;
-                if ( !CReferenceManager::decodeHyperlink(m_dndData.url, moduleName, keyName, type) )
+                ReferenceManager::Type type;
+                if ( !ReferenceManager::decodeHyperlink(m_dndData.url, moduleName, keyName, type) )
                     return;
                 drag = new QDrag(m_display->view());
                 BTMimeData* mimedata = new BTMimeData(moduleName, keyName, QString::null);
diff --git a/src/frontend/display/bthtmljsobject.h b/src/frontend/display/bthtmljsobject.h
index d418b71..c3536ff 100644
--- a/src/frontend/display/bthtmljsobject.h
+++ b/src/frontend/display/bthtmljsobject.h
@@ -6,12 +6,15 @@
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
+
 #ifndef BTHTMLJSOBJECT_H
 #define BTHTMLJSOBJECT_H
 
 #include <QObject>
+
 #include <QPoint>
 
+
 class BtHtmlReadDisplay;
 
 class BtHtmlJsObject: public QObject {
diff --git a/src/frontend/display/bthtmlreaddisplay.cpp b/src/frontend/display/bthtmlreaddisplay.cpp
index 7ce6f40..3d97fba 100644
--- a/src/frontend/display/bthtmlreaddisplay.cpp
+++ b/src/frontend/display/bthtmlreaddisplay.cpp
@@ -7,21 +7,22 @@
 *
 **********/
 
-#include "bthtmlreaddisplay.h"
-#include "bthtmljsobject.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/creadwindow.h"
+#include "frontend/display/bthtmlreaddisplay.h"
+
+#include <boost/scoped_ptr.hpp>
+#include <QMenu>
+#include <QString>
+#include "backend/config/cbtconfig.h"
+#include "backend/keys/cswordkey.h"
+#include "backend/managers/referencemanager.h"
 #include "frontend/cdragdrop.h"
 #include "frontend/cinfodisplay.h"
-#include "backend/managers/creferencemanager.h"
-#include "backend/keys/cswordkey.h"
-#include "backend/config/cbtconfig.h"
-#include "util/ctoolclass.h"
+#include "frontend/display/bthtmljsobject.h"
+#include "frontend/displaywindow/cdisplaywindow.h"
+#include "frontend/displaywindow/creadwindow.h"
+#include "util/directory.h"
 #include "util/cpointers.h"
-#include "util/directoryutil.h"
-#include <boost/scoped_ptr.hpp>
-#include <QString>
-#include <QMenu>
+
 
 using namespace InfoDisplay;
 
@@ -55,9 +56,11 @@ BtHtmlReadDisplay::~BtHtmlReadDisplay() {
 
 // Read javascript into memory once and create the c++ javascript object
 void BtHtmlReadDisplay::initJavascript() {
+    namespace DU = util::directory;
+
     // read bthtml.js javascript file once
     if (javascript.size() == 0) {
-        QString jsFile = util::filesystem::DirectoryUtil::getJavascriptDir().canonicalPath() + "/bthtml.js";
+        QString jsFile = DU::getJavascriptDir().canonicalPath() + "/bthtml.js";
         QFile file(jsFile);
         if (file.open(QFile::ReadOnly)) {
             while (!file.atEnd()) {
@@ -98,7 +101,7 @@ const QString BtHtmlReadDisplay::text( const CDisplay::TextType format, const CD
                 if (module->type() == CSwordModuleInfo::Lexicon ||
                         module->type() == CSwordModuleInfo::Commentary ||
                         module->type() == CSwordModuleInfo::GenericBook) {
-                    //TODO: This is a BAD HACK, we have to fnd a better solution to manage the settings now
+                    /// \todo This is a BAD HACK, we have to fnd a better solution to manage the settings now
                     CSwordBackend::FilterOptions filterOptions;
                     filterOptions.footnotes = false;
                     filterOptions.strongNumbers = false;
@@ -123,7 +126,7 @@ const QString BtHtmlReadDisplay::text( const CDisplay::TextType format, const CD
                 return QString::null;
             }
             else if (format == HTMLText) {
-                //	TODO: It does not appear this is ever called
+                //	\todo It does not appear this is ever called
             }
             else { //plain text requested
                 return selectedText();
@@ -133,8 +136,8 @@ const QString BtHtmlReadDisplay::text( const CDisplay::TextType format, const CD
         case AnchorOnly: {
             QString moduleName;
             QString keyName;
-            CReferenceManager::Type type;
-            CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
+            ReferenceManager::Type type;
+            ReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
 
             return keyName;
         }
@@ -142,8 +145,8 @@ const QString BtHtmlReadDisplay::text( const CDisplay::TextType format, const CD
         case AnchorTextOnly: {
             QString moduleName;
             QString keyName;
-            CReferenceManager::Type type;
-            CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
+            ReferenceManager::Type type;
+            ReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
 
             if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
                 boost::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
@@ -157,14 +160,14 @@ const QString BtHtmlReadDisplay::text( const CDisplay::TextType format, const CD
         case AnchorWithText: {
             QString moduleName;
             QString keyName;
-            CReferenceManager::Type type;
-            CReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
+            ReferenceManager::Type type;
+            ReferenceManager::decodeHyperlink(activeAnchor(), moduleName, keyName, type);
 
             if (CSwordModuleInfo* module = backend()->findModuleByName(moduleName)) {
                 boost::scoped_ptr<CSwordKey> key( CSwordKey::createInstance(module) );
                 key->key( keyName );
 
-                //TODO: This is a BAD HACK, we have to fnd a better solution to manage the settings now
+                /// \todo This is a BAD HACK, we have to fnd a better solution to manage the settings now
                 CSwordBackend::FilterOptions filterOptions;
                 filterOptions.footnotes = false;
                 filterOptions.strongNumbers = false;
diff --git a/src/frontend/display/bthtmlreaddisplay.h b/src/frontend/display/bthtmlreaddisplay.h
index 020a685..7c2d91f 100644
--- a/src/frontend/display/bthtmlreaddisplay.h
+++ b/src/frontend/display/bthtmlreaddisplay.h
@@ -10,18 +10,17 @@
 #ifndef BTHTMLREADDISPLAY_H
 #define BTHTMLREADDISPLAY_H
 
-//BibleTime includes
-#include "bthtmljsobject.h"
-#include "creaddisplay.h"
+#include "frontend/display/creaddisplay.h"
+#include <QWebPage>
 
-//Qt includes
 #include <QDragEnterEvent>
 #include <QDropEvent>
+#include <QPoint>
 #include <QTimerEvent>
 #include <QWebView>
-#include <QWebPage>
 #include <QWebFrame>
-#include <QPoint>
+#include "frontend/display/bthtmljsobject.h"
+
 
 class BtHtmlReadDisplayView;
 class QScrollArea;
diff --git a/src/frontend/display/cdisplay.cpp b/src/frontend/display/cdisplay.cpp
index b66f8af..a63b55b 100644
--- a/src/frontend/display/cdisplay.cpp
+++ b/src/frontend/display/cdisplay.cpp
@@ -7,29 +7,22 @@
 *
 **********/
 
-#include "cdisplay.h"
+#include "frontend/display/cdisplay.h"
 
-#include "bthtmlreaddisplay.h"
-typedef BtHtmlReadDisplay HTMLREADDISPLAY;
-
-#include "cplainwritedisplay.h"
-#include "chtmlwritedisplay.h"
-
-#include "backend/managers/creferencemanager.h"
-
-#include "util/ctoolclass.h"
-
-
-//Qt includes
+#include <QApplication>
 #include <QClipboard>
-#include <QMenu>
-#include <QTimer>
 #include <QDebug>
-#include <QApplication>
 #include <QFileDialog>
+#include <QMenu>
+#include <QTimer>
+#include "backend/managers/referencemanager.h"
+#include "frontend/display/bthtmlreaddisplay.h"
+#include "frontend/display/chtmlwritedisplay.h"
+#include "frontend/display/cplainwritedisplay.h"
+#include "util/tool.h"
 
-//KDE includes
 
+typedef BtHtmlReadDisplay HTMLREADDISPLAY;
 
 CDisplayConnections::CDisplayConnections( CDisplay* display ) : m_display(display) {}
 
@@ -47,7 +40,7 @@ void CDisplayConnections::saveAsPlain() {
 
 /** Emits the signal. */
 void CDisplayConnections::emitReferenceClicked( const QString& module, const QString& key) {
-    qDebug("CDisplayConnections::emitReferenceClicked");
+    qDebug() << "CDisplayConnections::emitReferenceClicked";
     qDebug() << "Module: " << module << " key: " << key;
     emit referenceClicked( module, key );
 }
@@ -161,7 +154,7 @@ bool CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart p
     const QString filename = QFileDialog::getSaveFileName(0, QObject::tr("Save document ..."), "", filter);
 
     if (!filename.isEmpty()) {
-        CToolClass::savePlainFile(filename, content);
+        util::tool::savePlainFile(filename, content);
     }
     return true;
 }
@@ -169,10 +162,10 @@ bool CDisplay::save( const CDisplay::TextType format, const CDisplay::TextPart p
 /** Emits the signal which used when a reference was clicked. */
 void CDisplay::emitReferenceClicked( const QString& reference ) {
     QString module, key;
-    CReferenceManager::Type type;
-    CReferenceManager::decodeHyperlink(reference, module, key, type);
+    ReferenceManager::Type type;
+    ReferenceManager::decodeHyperlink(reference, module, key, type);
     if (module.isEmpty()) {
-        module = CReferenceManager::preferredModule( type );
+        module = ReferenceManager::preferredModule( type );
     }
     m_connections->emitReferenceClicked(module, key);
 }
@@ -181,8 +174,8 @@ void CDisplay::emitReferenceClicked( const QString& reference ) {
 void CDisplay::emitReferenceDropped( const QString& reference ) {
     QString module;
     QString key;
-    CReferenceManager::Type type;
-    CReferenceManager::decodeHyperlink(reference, module, key, type);
+    ReferenceManager::Type type;
+    ReferenceManager::decodeHyperlink(reference, module, key, type);
     m_connections->emitReferenceDropped(key);
 }
 
diff --git a/src/frontend/display/cdisplay.h b/src/frontend/display/cdisplay.h
index 0fdaa0e..b84c26e 100644
--- a/src/frontend/display/cdisplay.h
+++ b/src/frontend/display/cdisplay.h
@@ -7,27 +7,21 @@
 *
 **********/
 
-
-
 #ifndef CDISPLAY_H
 #define CDISPLAY_H
 
-//BibleTime includes
 #include "util/cpointers.h"
-#include "backend/managers/cswordbackend.h"
 
-//Qt includes
 #include <QMap>
+#include "backend/managers/cswordbackend.h"
 
 
 class CDisplayConnections;
-class CReadWindow;
-class CWriteWindow;
-
 class CDisplayWindow;
 class CReadDisplay;
+class CReadWindow;
 class CWriteDisplay;
-
+class CWriteWindow;
 class QMenu;
 
 /** The base class for all display widgets.
diff --git a/src/frontend/display/chtmlwritedisplay.cpp b/src/frontend/display/chtmlwritedisplay.cpp
index d238b0d..4d08666 100644
--- a/src/frontend/display/chtmlwritedisplay.cpp
+++ b/src/frontend/display/chtmlwritedisplay.cpp
@@ -7,22 +7,20 @@
 *
 **********/
 
+#include "frontend/display/chtmlwritedisplay.h"
 
-
-#include "chtmlwritedisplay.h"
-#include "btfontsizewidget.h"
-#include "btcolorwidget.h"
-#include "frontend/displaywindow/cwritewindow.h"
-#include "frontend/displaywindow/btactioncollection.h"
-#include "util/cresmgr.h"
-#include "util/directoryutil.h"
-
-#include <QMenu>
-#include <QToolTip>
-#include <QTextEdit>
 #include <QFontComboBox>
 #include <QMenu>
+#include <QTextEdit>
 #include <QToolBar>
+#include <QToolTip>
+#include "frontend/display/btcolorwidget.h"
+#include "frontend/display/btfontsizewidget.h"
+#include "frontend/displaywindow/btactioncollection.h"
+#include "frontend/displaywindow/cwritewindow.h"
+#include "util/cresmgr.h"
+#include "util/directory.h"
+
 
 class BtActionCollection;
 
@@ -137,6 +135,8 @@ void CHTMLWriteDisplay::slotFontFamilyChoosen(const QFont& font) {
 }
 
 void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * actions) {
+    namespace DU = util::directory;
+
     //--------------------font chooser-------------------------
     m_fontFamilyChooser = new QFontComboBox(this);
     actions->addAction(CResMgr::displaywindows::writeWindow::fontFamily::actionName, m_fontFamilyChooser);
@@ -164,7 +164,7 @@ void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * action
 
     //--------------------bold toggle-------------------------
     m_actions.bold = new QAction(
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::boldText::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::boldText::icon),
         tr("Bold"),
         actions);
     m_actions.bold->setCheckable(true);
@@ -177,7 +177,7 @@ void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * action
 
     //--------------------italic toggle-------------------------
     m_actions.italic = new QAction(
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::italicText::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::italicText::icon),
         tr("Italic"),
         actions );
     m_actions.italic->setCheckable(true);
@@ -189,7 +189,7 @@ void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * action
 
     //--------------------underline toggle-------------------------
     m_actions.underline = new QAction(
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::underlinedText::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::underlinedText::icon),
         tr("Underline"),
         actions );
     m_actions.underline->setCheckable(true);
@@ -204,7 +204,7 @@ void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * action
 
     //--------------------align left toggle-------------------------
     m_actions.alignLeft = new QAction(
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::alignLeft::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::alignLeft::icon),
         tr("Left"), actions);
     m_actions.alignLeft->setCheckable(true);
     m_actions.alignLeft->setShortcut(CResMgr::displaywindows::writeWindow::alignLeft::accel);
@@ -215,7 +215,7 @@ void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * action
 
     //--------------------align center toggle-------------------------
     m_actions.alignCenter = new QAction(
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::alignCenter::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::alignCenter::icon),
         tr("Center"), actions);
     m_actions.alignCenter->setCheckable(true);
     m_actions.alignCenter->setShortcut(CResMgr::displaywindows::writeWindow::alignCenter::accel);
@@ -226,7 +226,7 @@ void CHTMLWriteDisplay::setupToolbar(QToolBar * bar, BtActionCollection * action
 
     //--------------------align right toggle-------------------------
     m_actions.alignRight = new QAction(
-        util::filesystem::DirectoryUtil::getIcon(CResMgr::displaywindows::writeWindow::alignRight::icon),
+        DU::getIcon(CResMgr::displaywindows::writeWindow::alignRight::icon),
         tr("Right"), actions);
     m_actions.alignRight->setCheckable(true);
     m_actions.alignRight->setShortcut(CResMgr::displaywindows::writeWindow::alignRight::accel);
diff --git a/src/frontend/display/chtmlwritedisplay.h b/src/frontend/display/chtmlwritedisplay.h
index 5ea7527..56f3f53 100644
--- a/src/frontend/display/chtmlwritedisplay.h
+++ b/src/frontend/display/chtmlwritedisplay.h
@@ -10,18 +10,18 @@
 #ifndef CHTMLWRITEDISPLAY_H
 #define CHTMLWRITEDISPLAY_H
 
-//BibleTime includes
-#include "cplainwritedisplay.h"
+#include "frontend/display/cplainwritedisplay.h"
 
+
+class BtActionCollection;
+class BtColorWidget;
+class BtFontSizeWidget;
 class CWriteWindow;
-class QMenu;
-class QWidget;
-class QToolBar;
 class QAction;
 class QFontComboBox;
-class BtFontSizeWidget;
-class BtColorWidget;
-class BtActionCollection;
+class QMenu;
+class QToolBar;
+class QWidget;
 
 /** The WYSIWYG implementation of the write display interface.
   * @author The BibleTime team
diff --git a/src/frontend/display/cplainwritedisplay.cpp b/src/frontend/display/cplainwritedisplay.cpp
index ff70c0a..720aa72 100644
--- a/src/frontend/display/cplainwritedisplay.cpp
+++ b/src/frontend/display/cplainwritedisplay.cpp
@@ -7,21 +7,20 @@
 *
 **********/
 
-#include "cplainwritedisplay.h"
-#include "frontend/displaywindow/btactioncollection.h"
-#include "frontend/cdragdrop.h"
-#include "frontend/displaywindow/cdisplaywindow.h"
-#include "frontend/displaywindow/cwritewindow.h"
-
-#include "backend/keys/cswordkey.h"
+#include "frontend/display/cplainwritedisplay.h"
 
 #include <boost/scoped_ptr.hpp>
-
-//Qt includes
 #include <QDragEnterEvent>
-#include <QDropEvent>
 #include <QDragMoveEvent>
+#include <QDropEvent>
 #include <QMenu>
+#include <QDebug>
+
+#include "backend/keys/cswordkey.h"
+#include "frontend/cdragdrop.h"
+#include "frontend/displaywindow/btactioncollection.h"
+#include "frontend/displaywindow/cdisplaywindow.h"
+#include "frontend/displaywindow/cwritewindow.h"
 
 
 CPlainWriteDisplay::CPlainWriteDisplay(CWriteWindow* parentWindow, QWidget* parent) : QTextEdit(parentWindow ? parentWindow : parent), CWriteDisplay(parentWindow) {
@@ -50,12 +49,12 @@ void CPlainWriteDisplay::setText( const QString& newText ) {
 }
 
 bool CPlainWriteDisplay::hasSelection() {
-    //TODO: test this
+    /// \todo test this
     return textCursor().hasSelection();
 }
 
 QWidget* CPlainWriteDisplay::view() {
-    qDebug("CPlainWriteDisplay::view()");
+    qDebug() << "CPlainWriteDisplay::view()";
     return this;
 }
 
@@ -128,11 +127,11 @@ void CPlainWriteDisplay::dragMoveEvent( QDragMoveEvent* e ) {
 
 /** Reimplementation to manage drops of our drag and drop objects. */
 void CPlainWriteDisplay::dropEvent( QDropEvent* e ) {
-    //qDebug("CPlainWriteDisplay::dropEvent");
+    //qDebug() << "CPlainWriteDisplay::dropEvent";
     const BTMimeData* mimedata = qobject_cast<const BTMimeData*>(e->mimeData());
 
     if ( mimedata && mimedata->hasFormat("BibleTime/Bookmark") ) {
-        //qDebug("format was bookmark");
+        //qDebug() << "format was bookmark";
         e->acceptProposedAction();
 
         BTMimeData::ItemList items = mimedata->bookmarks();
@@ -151,7 +150,7 @@ void CPlainWriteDisplay::dropEvent( QDropEvent* e ) {
         }
     }
     else if ( e->mimeData()->hasFormat("text/plain")) {
-        //qDebug("format was plain text");
+        //qDebug() << "format was plain text";
         e->acceptProposedAction();
         setTextCursor(cursorForPosition(e->pos()));
         textCursor().insertText( e->mimeData()->text() );
diff --git a/src/frontend/display/cplainwritedisplay.h b/src/frontend/display/cplainwritedisplay.h
index 3968f74..30efc72 100644
--- a/src/frontend/display/cplainwritedisplay.h
+++ b/src/frontend/display/cplainwritedisplay.h
@@ -7,26 +7,20 @@
 *
 **********/
 
-
-
 #ifndef CPLAINWRITEDISPLAY_H
 #define CPLAINWRITEDISPLAY_H
 
-//Bibletime include files
-#include "cwritedisplay.h"
-
-//Qt includes
 #include <QTextEdit>
+#include "frontend/display/cwritedisplay.h"
 
 
+class BtActionCollection;
 class CHTMLWriteDisplay;
-
-class QWidget;
-class QMenu;
+class QDragEnterEvent;
 class QDragMoveEvent;
 class QDropEvent;
-class QDragEnterEvent;
-class BtActionCollection;
+class QMenu;
+class QWidget;
 
 /** The write display implementation for plain source code editing.
   * @author The BibleTime team
diff --git a/src/frontend/display/creaddisplay.cpp b/src/frontend/display/creaddisplay.cpp
index afe00cd..de0680b 100644
--- a/src/frontend/display/creaddisplay.cpp
+++ b/src/frontend/display/creaddisplay.cpp
@@ -7,29 +7,20 @@
 *
 **********/
 
+#include "frontend/display/creaddisplay.h"
 
-
-//BibleTime includes
-#include "creaddisplay.h"
-
-#include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/drivers/cswordbiblemoduleinfo.h"
-#include "backend/drivers/cswordlexiconmoduleinfo.h"
 #include "backend/drivers/cswordbookmoduleinfo.h"
+#include "backend/drivers/cswordlexiconmoduleinfo.h"
+#include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/keys/cswordkey.h"
-#include "backend/keys/cswordversekey.h"
-#include "backend/keys/cswordtreekey.h"
 #include "backend/keys/cswordldkey.h"
-
+#include "backend/keys/cswordtreekey.h"
+#include "backend/keys/cswordversekey.h"
+#include "frontend/cexportmanager.h"
 #include "frontend/displaywindow/cdisplaywindow.h"
 #include "frontend/displaywindow/creadwindow.h"
 
-#include "frontend/cexportmanager.h"
-
-#include <boost/scoped_ptr.hpp>
-
-//KDE includes
-
 
 CReadDisplay::CReadDisplay(CReadWindow* readWindow) :
         CDisplay(readWindow),
diff --git a/src/frontend/display/creaddisplay.h b/src/frontend/display/creaddisplay.h
index c94bd41..57524b5 100644
--- a/src/frontend/display/creaddisplay.h
+++ b/src/frontend/display/creaddisplay.h
@@ -7,20 +7,18 @@
 *
 **********/
 
-
-
 #ifndef CREADDISPLAY_H
 #define CREADDISPLAY_H
 
-#include "cdisplay.h"
-#include "backend/managers/cswordbackend.h"
+#include "frontend/display/cdisplay.h"
 
 #include <QString>
+#include "backend/managers/cswordbackend.h"
+
 
-/**The base class for all read-only widgets like KHTMLView.
+/** The base class for all read-only widgets like KHTMLView.
   *@author The BibleTime team
   */
-
 class CReadDisplay :  public CDisplay {
     public:
         /**
diff --git a/src/frontend/display/cwritedisplay.cpp b/src/frontend/display/cwritedisplay.cpp
index ddd9d8f..f30d217 100644
--- a/src/frontend/display/cwritedisplay.cpp
+++ b/src/frontend/display/cwritedisplay.cpp
@@ -7,15 +7,15 @@
 *
 **********/
 
-
-
-//BibleTime includes
-#include "cwritedisplay.h"
+#include "frontend/display/cwritedisplay.h"
 
 #include "frontend/displaywindow/cwritewindow.h"
 
 
-CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {}
-
-CWriteDisplay::~CWriteDisplay() {}
+CWriteDisplay::CWriteDisplay( CWriteWindow* writeWindow ) : CDisplay(writeWindow) {
+    // Intentionally empty
+}
 
+CWriteDisplay::~CWriteDisplay() {
+    // Intentionally empty
+}
diff --git a/src/frontend/display/cwritedisplay.h b/src/frontend/display/cwritedisplay.h
index 24dd29f..33ef5a5 100644
--- a/src/frontend/display/cwritedisplay.h
+++ b/src/frontend/display/cwritedisplay.h
@@ -7,21 +7,18 @@
 *
 **********/
 
-
-
 #ifndef CWRITEDISPLAY_H
 #define CWRITEDISPLAY_H
 
-#include "cdisplay.h"
+#include "frontend/display/cdisplay.h"
 
-class QToolBar;
-class BtActionCollection;
 
+class BtActionCollection;
+class QToolBar;
 
-/**The base class for all read/write-display classes.
+/** The base class for all read/write-display classes.
   *@author The BibleTime team
   */
-
 class CWriteDisplay : public CDisplay  {
     protected:
         friend class CDisplay;