FIxing conflicts

Merge branch 'rekonq04' into dev04try

Conflicts:
	src/CMakeLists.txt

1 files changed, 0 insertions, 5 deletions

diff --git a/src/application.h b/src/application.h
index 0f256a45..786e5173 100644
--- a/src/application.h
+++ b/src/application.h
@@ -45,10 +45,8 @@
 class KIcon;
 class KUrl;
 class BookmarkProvider;
-class CookieJar;
 class HistoryManager;
 class MainWindow;
-class NetworkAccessManager;
 class SessionManager;
 
 
@@ -105,8 +103,6 @@ public:
     static KIcon icon(const KUrl &url);
 
     static HistoryManager *historyManager();
-    static CookieJar *cookieJar();
-    static NetworkAccessManager *networkAccessManager();
     static BookmarkProvider *bookmarkProvider();
     static SessionManager *sessionManager();
     
@@ -141,7 +137,6 @@ private:
     KUrl guessUrlFromString(const QString &url);
 
     static QPointer<HistoryManager> s_historyManager;
-    static QPointer<NetworkAccessManager> s_networkAccessManager;
     static QPointer<BookmarkProvider> s_bookmarkProvider;
     static QPointer<SessionManager> s_sessionManager;