2 files changed, 22 insertions, 7 deletions
diff --git a/src/application.cpp b/src/application.cpp
index 3399dde4..45641ea8 100644
--- a/src/application.cpp
+++ b/src/application.cpp
@@ -51,6 +51,8 @@
 HistoryManager *Application::s_historyManager = 0;
 NetworkAccessManager *Application::s_networkAccessManager = 0;
 DownloadManager *Application::s_downloadManager = 0;
+BookmarkProvider *Application::s_bookmarkProvider = 0;
+
 
 Application::Application()
         : KUniqueApplication()
@@ -174,6 +176,16 @@ DownloadManager *Application::downloadManager()
 }
 
 
+BookmarkProvider *Application::bookmarkProvider()
+{
+    if (!s_bookmarkProvider)
+    {
+        s_bookmarkProvider = new BookmarkProvider();
+    }
+    return s_bookmarkProvider;
+}
+
+
 KIcon Application::icon(const KUrl &url) const
 {
     KIcon icon = KIcon(QWebSettings::iconForUrl(url));
diff --git a/src/application.h b/src/application.h
index 8393e184..ee3d3112 100644
--- a/src/application.h
+++ b/src/application.h
@@ -23,9 +23,6 @@
 #define APPLICATION_H
 
 
-// Local Includes
-#include "download.h"
-
 // KDE Includes
 #include <KUniqueApplication>
 #include <KCmdLineArgs>
@@ -37,12 +34,16 @@
 
 
 // Forward Declarations
-class MainWindow;
-class WebView;
-class HistoryManager;
+class KIcon;
+class KUrl;
+class BookmarkProvider;
 class CookieJar;
-class NetworkAccessManager;
 class DownloadManager;
+class HistoryManager;
+class MainWindow;
+class NetworkAccessManager;
+class WebView;
+
 
 /**
   *
@@ -66,6 +67,7 @@ public:
     static CookieJar *cookieJar();
     static NetworkAccessManager *networkAccessManager();
     static DownloadManager *downloadManager();
+    static BookmarkProvider *bookmarkProvider();
 
 private slots:
 
@@ -79,6 +81,7 @@ private:
     static HistoryManager *s_historyManager;
     static NetworkAccessManager *s_networkAccessManager;
     static DownloadManager *s_downloadManager;
+    static BookmarkProvider *s_bookmarkProvider;
 
     MainWindow* m_mainWindow;
 };