diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2011-11-14 18:49:04 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2011-12-12 16:40:28 +0100 |
| commit | b111a11cb46bfd572c2fed9c67d648bcff10a3ce (patch) | |
| tree | a5a12a0ac980f6af2fe245d8cdd8575dd8e95601 /src/application.cpp | |
| parent | let history, bookmarks and passwords sync on change (first bits) (diff) | |
| download | rekonq-b111a11cb46bfd572c2fed9c67d648bcff10a3ce.tar.xz | |
BookmarkProvider --> BookmarkManager
We have 7 managers and 1 provider... finally fixing this strange
thing!
Diffstat (limited to 'src/application.cpp')
| -rw-r--r-- | src/application.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/application.cpp b/src/application.cpp index 768f25a2..5c6e9659 100644 --- a/src/application.cpp +++ b/src/application.cpp @@ -38,7 +38,7 @@ // Local Includes #include "adblockmanager.h" -#include "bookmarkprovider.h" +#include "bookmarkmanager.h" #include "downloadmanager.h" #include "filterurljob.h" #include "historymanager.h" @@ -109,11 +109,11 @@ Application::~Application() m_historyManager.clear(); } - if (!m_bookmarkProvider.isNull()) + if (!m_bookmarkManager.isNull()) { - kDebug() << "deleting bookmark Provider"; - delete m_bookmarkProvider.data(); - m_bookmarkProvider.clear(); + kDebug() << "deleting bookmark Manager"; + delete m_bookmarkManager.data(); + m_bookmarkManager.clear(); } if (!m_sessionManager.isNull()) @@ -293,7 +293,7 @@ int Application::newInstance() historyManager(); // bookmarks loading - connect(bookmarkProvider(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), + connect(bookmarkManager(), SIGNAL(openUrl(const KUrl&, const Rekonq::OpenType&)), instance(), SLOT(loadUrl(const KUrl&, const Rekonq::OpenType&))); // crash recovering @@ -351,13 +351,13 @@ HistoryManager *Application::historyManager() } -BookmarkProvider *Application::bookmarkProvider() +BookmarkManager *Application::bookmarkManager() { - if (m_bookmarkProvider.isNull()) + if (m_bookmarkManager.isNull()) { - m_bookmarkProvider = new BookmarkProvider; + m_bookmarkManager = new BookmarkManager; } - return m_bookmarkProvider.data(); + return m_bookmarkManager.data(); } |