summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2011-04-07 19:29:06 +0200
committerAndrea Diamantini <adjam7@gmail.com>2011-04-07 19:29:06 +0200
commita957e857480a55b02e04ddff8e84b968462804f9 (patch)
tree6561672be2658faa234c9b18ac6ef788d369d5bb /src
parentThis commit, available just for the master branch cause of the string changes, (diff)
downloadrekonq-a957e857480a55b02e04ddff8e84b968462804f9.tar.xz
De-parent providers instances and delete them on close. Please,
read about this in the reviewboard request (number 101027) Courtesy patch by JosèManuel Santamarì Lema. Thanks :D BUG:269490 REVIEW:101027
Diffstat (limited to 'src')
-rw-r--r--src/application.cpp43
1 files changed, 37 insertions, 6 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 1fe936f3..eda588a0 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -93,6 +93,37 @@ Application::~Application()
delete window.data();
window.clear();
}
+
+ if (!m_historyManager.isNull()) {
+ delete m_historyManager.data();
+ m_historyManager.clear();
+ }
+
+ if (!m_bookmarkProvider.isNull()) {
+ delete m_bookmarkProvider.data();
+ m_bookmarkProvider.clear();
+ }
+
+ if (!m_sessionManager.isNull()) {
+ delete m_sessionManager.data();
+ m_sessionManager.clear();
+ }
+
+ if (!m_opensearchManager.isNull()) {
+ delete m_opensearchManager.data();
+ m_opensearchManager.clear();
+ }
+
+ if (!m_iconManager.isNull()) {
+ delete m_iconManager.data();
+ m_iconManager.clear();
+ }
+
+ if (!m_adblockManager.isNull()) {
+ delete m_adblockManager.data();
+ m_adblockManager.clear();
+ }
+
}
@@ -272,7 +303,7 @@ HistoryManager *Application::historyManager()
{
if (m_historyManager.isNull())
{
- m_historyManager = new HistoryManager(instance());
+ m_historyManager = new HistoryManager;
}
return m_historyManager.data();
}
@@ -282,7 +313,7 @@ BookmarkProvider *Application::bookmarkProvider()
{
if (m_bookmarkProvider.isNull())
{
- m_bookmarkProvider = new BookmarkProvider(instance());
+ m_bookmarkProvider = new BookmarkProvider;
}
return m_bookmarkProvider.data();
}
@@ -292,7 +323,7 @@ SessionManager *Application::sessionManager()
{
if (m_sessionManager.isNull())
{
- m_sessionManager = new SessionManager(instance());
+ m_sessionManager = new SessionManager;
}
return m_sessionManager.data();
}
@@ -302,7 +333,7 @@ OpenSearchManager *Application::opensearchManager()
{
if (m_opensearchManager.isNull())
{
- m_opensearchManager = new OpenSearchManager(instance());
+ m_opensearchManager = new OpenSearchManager;
}
return m_opensearchManager.data();
}
@@ -312,7 +343,7 @@ IconManager *Application::iconManager()
{
if (m_iconManager.isNull())
{
- m_iconManager = new IconManager(instance());
+ m_iconManager = new IconManager;
}
return m_iconManager.data();
}
@@ -407,7 +438,7 @@ AdBlockManager *Application::adblockManager()
{
if (m_adblockManager.isNull())
{
- m_adblockManager = new AdBlockManager(instance());
+ m_adblockManager = new AdBlockManager;
}
return m_adblockManager.data();
}