summaryrefslogtreecommitdiff
path: root/src/application.cpp
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-07-29 11:22:24 +0200
committerAndrea Diamantini <adjam7@gmail.com>2012-12-10 02:48:04 +0100
commitfe7c06fffa370f8f04a3035f3ae92975ea39b960 (patch)
treef60ad5a2bd0c72ccac0c195dc5630c15071e35f2 /src/application.cpp
parentClass Application Import, first (important) part (diff)
downloadrekonq-fe7c06fffa370f8f04a3035f3ae92975ea39b960.tar.xz
Insert back HistoryManager
There are a few notable changes here: - rekonq_defines.h clean up, removing the enums from there - let HistoryManager be accessible by a self function
Diffstat (limited to 'src/application.cpp')
-rw-r--r--src/application.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 98b74649..2434eeaa 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -36,6 +36,9 @@
#include "webwindow.h"
#include "urlresolver.h"
+// Local Manager(s) Includes
+#include "historymanager.h"
+
// // KDE Includes
#include <KCmdLineArgs>
@@ -225,7 +228,8 @@ int Application::newInstance()
setWindowIcon(KIcon("rekonq"));
-// FIXME historyManager();
+ // just create History Manager...
+ HistoryManager::self();
ReKonfig::setRecoverOnCrash(ReKonfig::recoverOnCrash() + 1);
saveConfiguration();
@@ -440,8 +444,8 @@ void Application::updateConfiguration()
// // Applies user defined CSS to all open webpages.
// defaultSettings->setUserStyleSheetUrl(ReKonfig::userCSS());
//
-// // ====== load Settings on main classes
-// historyManager()->loadSettings();
+ // ====== load Settings on main classes
+ HistoryManager::self()->loadSettings();
//
// defaultSettings = 0;
//