1 files changed, 31 insertions, 8 deletions
diff --git a/src/bibletimeapp.cpp b/src/bibletimeapp.cpp
index f73d501..c8e4274 100644
--- a/src/bibletimeapp.cpp
+++ b/src/bibletimeapp.cpp
@@ -2,38 +2,61 @@
 *
 * This file is part of BibleTime's source code, http://www.bibletime.info/.
 *
-* Copyright 1999-2011 by the BibleTime developers.
+* Copyright 1999-2014 by the BibleTime developers.
 * The BibleTime source code is licensed under the GNU General Public License version 2.0.
 *
 **********/
 
 #include "bibletimeapp.h"
 
-#include <QMessageBox>
-#include "backend/config/cbtconfig.h"
+#include <QDebug>
+#include <QFile>
+#include "frontend/messagedialog.h"
+#include "backend/config/btconfig.h"
+#include "backend/managers/cswordbackend.h"
 #include "backend/managers/cdisplaytemplatemgr.h"
-#include "util/cresmgr.h"
+#include "util/geticon.h"
 
 
+BibleTimeApp::BibleTimeApp(int &argc, char **argv)
+    : QApplication(argc, argv)
+    , m_init(false)
+{
+    setApplicationName("bibletime");
+    setApplicationVersion(BT_VERSION);
+}
+
 BibleTimeApp::~BibleTimeApp() {
     // Prevent writing to the log file before the directory cache is init:
-    if (!m_init)
+    if (!m_init || BtConfig::m_instance == 0)
         return;
 
     //we can set this safely now because we close now (hopyfully without crash)
-    CBTConfig::set(CBTConfig::crashedLastTime, false);
-    CBTConfig::set(CBTConfig::crashedTwoTimes, false);
+    btConfig().setValue("state/crashedLastTime", false);
+    btConfig().setValue("state/crashedTwoTimes", false);
 
     delete CDisplayTemplateMgr::instance();
     CLanguageMgr::destroyInstance();
     CSwordBackend::destroyInstance();
+    util::clearIconCache();
+
+    BtConfig::destroyInstance();
+}
+
+bool BibleTimeApp::initBtConfig() {
+    Q_ASSERT(m_init);
+
+    return BtConfig::initBtConfig();
 }
 
 bool BibleTimeApp::initDisplayTemplateManager() {
+    Q_ASSERT(m_init);
+
     QString errorMessage;
     new CDisplayTemplateMgr(errorMessage);
     if (errorMessage.isNull())
         return true;
-    QMessageBox::critical(0, tr("Fatal error!"), errorMessage);
+    message::showCritical(0, tr("Fatal error!"), errorMessage);
     return false;
 }
+