diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-20 19:30:26 +0200 |
| commit | aa05bd3973a2f39f50c14314840f0fe078f16444 (patch) | |
| tree | dd21ae094321ca9f0b803379ad7e93a6b065ec10 /src/application.h | |
| parent | bk toolbar by default for the next rekonq. (diff) | |
| parent | Change from QByteArray to QString in the right way (diff) | |
| download | rekonq-aa05bd3973a2f39f50c14314840f0fe078f16444.tar.xz | |
Merge branch 'opensearch'
Conflicts:
src/CMakeLists.txt
src/urlbar/urlresolver.cpp
Diffstat (limited to 'src/application.h')
| -rw-r--r-- | src/application.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/application.h b/src/application.h index 18c99afb..a08d883c 100644 --- a/src/application.h +++ b/src/application.h @@ -33,6 +33,8 @@ // Rekonq Includes #include "rekonq_defines.h" +#include "opensearchmanager.h" + // KDE Includes #include <KUniqueApplication> #include <KIcon> @@ -111,6 +113,7 @@ public: static BookmarkProvider *bookmarkProvider(); static SessionManager *sessionManager(); static AdBlockManager *adblockManager(); + static OpenSearchManager *opensearchManager(); // DOWNLOADS MANAGEMENT METHODS void addDownload(const QString &srcUrl, const QString &destUrl); @@ -148,6 +151,7 @@ private: static QWeakPointer<BookmarkProvider> s_bookmarkProvider; static QWeakPointer<SessionManager> s_sessionManager; static QWeakPointer<AdBlockManager> s_adblockManager; + static QWeakPointer<OpenSearchManager> s_opensearchManager; MainWindowList m_mainWindows; }; |