1 files changed, 19 insertions, 27 deletions
diff --git a/src/frontend/cexportmanager.cpp b/src/frontend/cexportmanager.cpp
index f1ceed6..008963a 100644
--- a/src/frontend/cexportmanager.cpp
+++ b/src/frontend/cexportmanager.cpp
@@ -7,39 +7,31 @@
 *
 **********/
 
+#include "frontend/cexportmanager.h"
 
-
-#include "cexportmanager.h"
-
+#include <boost/scoped_ptr.hpp>
+#include <QApplication>
+#include <QClipboard>
+#include <QFileDialog>
+#include <QList>
+#include <QProgressDialog>
+#include <QTextStream>
+#include "backend/drivers/cswordmoduleinfo.h"
 #include "backend/keys/cswordkey.h"
 #include "backend/keys/cswordversekey.h"
-#include "backend/drivers/cswordmoduleinfo.h"
-#include "backend/managers/creferencemanager.h"
+#include "backend/managers/referencemanager.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
 #include "backend/rendering/centrydisplay.h"
 #include "backend/rendering/chtmlexportrendering.h"
 #include "backend/rendering/cplaintextexportrendering.h"
-
 #include "frontend/cprinter.h"
+#include "util/tool.h"
 
-#include "util/ctoolclass.h"
-#include <boost/scoped_ptr.hpp>
-
-//Qt includes
-#include <QClipboard>
-#include <QList>
-#include <QProgressDialog>
-#include <QTextStream>
-#include <QApplication>
-#include <QFileDialog>
-
-//KDE includes
-
-
-//Sword includes
+// Sword includes:
 #include <swkey.h>
 #include <listkey.h>
 
+
 using namespace Rendering;
 using namespace Printing;
 
@@ -95,7 +87,7 @@ bool CExportManager::saveKey(CSwordKey* key, const Format format, const bool add
     }
 
     if (!progressWasCancelled()) {
-        CToolClass::savePlainFile(filename, text, false, (format == HTML) ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale() );
+        util::tool::savePlainFile(filename, text, false, (format == HTML) ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale() );
         closeProgressDialog();
         return true;
     }
@@ -143,7 +135,7 @@ bool CExportManager::saveKeyList(sword::ListKey* list, CSwordModuleInfo* module,
     const QString text = render->renderKeyTree(tree);
 
     if (!progressWasCancelled()) {
-        CToolClass::savePlainFile(filename, text, false, (format == HTML) ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale() );
+        util::tool::savePlainFile(filename, text, false, (format == HTML) ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale() );
         closeProgressDialog();
         return true;
     }
@@ -190,7 +182,7 @@ bool CExportManager::saveKeyList(QList<CSwordKey*>& list, const Format format, c
     const QString text = render->renderKeyTree(tree);
 
     if (!progressWasCancelled()) {
-        CToolClass::savePlainFile(filename, text, false, (format == HTML) ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale() );
+        util::tool::savePlainFile(filename, text, false, (format == HTML) ? QTextCodec::codecForName("UTF-8") : QTextCodec::codecForLocale() );
         closeProgressDialog();
         return true;
     }
@@ -392,11 +384,11 @@ bool CExportManager::printKey( CSwordKey* key, CSwordBackend::DisplayOptions dis
 bool CExportManager::printByHyperlink( const QString& hyperlink, CSwordBackend::DisplayOptions displayOptions, CSwordBackend::FilterOptions filterOptions ) {
     QString moduleName;
     QString keyName;
-    CReferenceManager::Type type;
+    ReferenceManager::Type type;
 
-    CReferenceManager::decodeHyperlink(hyperlink, moduleName, keyName, type);
+    ReferenceManager::decodeHyperlink(hyperlink, moduleName, keyName, type);
     if (moduleName.isEmpty()) {
-        moduleName = CReferenceManager::preferredModule(type);
+        moduleName = ReferenceManager::preferredModule(type);
     }
 
     CPrinter::KeyTree tree;