From dcc43cd1018165624594cd7d2b496d0739745d43 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 22 Aug 2009 21:27:38 +0200
Subject: Rekonq 0.2.51 with (just) one urlbar and (just, again) KDE 4.3.1
 support

Note that pointing to KDE 4.3.1 is due to the problems about POST connections
to be fixed
---
 CMakeLists.txt               |  4 ++--
 src/networkaccessmanager.cpp |  2 +-
 src/networkaccessmanager.h   | 16 ++++++----------
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68516293..b7ad3bc1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,7 +9,7 @@ PROJECT( rekonq )
 # rekonq info
 SET(REKONQ_MAJOR_VERSION "0")
 SET(REKONQ_MINOR_VERSION "2")
-SET(REKONQ_PATCH_VERSION "0")
+SET(REKONQ_PATCH_VERSION "51")
 
 SET(REKONQ_VERSION_STR
     "${REKONQ_MAJOR_VERSION}.${REKONQ_MINOR_VERSION}.${REKONQ_PATCH_VERSION}"
@@ -27,7 +27,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.2)
 
 SET(QT_MIN_VERSION 4.5.0)
 FIND_PACKAGE(Qt4 REQUIRED)
-SET(KDE_MIN_VERSION 4.2.0)
+SET(KDE_MIN_VERSION 4.3.1)
 FIND_PACKAGE(KDE4 REQUIRED)
 
 INCLUDE(MacroOptionalFindPackage)
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 473fa770..c99fa094 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -56,7 +56,7 @@
 
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
-        : RekonqAccessManager(parent)
+        : AccessManager(parent)
         , m_diskCache(0)
 {
     connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index a6c264f2..45a3e9f9 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -27,22 +27,18 @@
 #ifndef NETWORKACCESSMANAGER_H
 #define NETWORKACCESSMANAGER_H
 
-#include <kdeversion.h>
 
-#if KDE_IS_VERSION(4, 2, 70)
-    #include <kio/accessmanager.h>
-    using namespace KIO;
-    typedef AccessManager RekonqAccessManager;
-#else
-    #include <QtNetwork/QNetworkAccessManager>
-    typedef QNetworkAccessManager RekonqAccessManager;
-#endif
+// KDE Includes
+#include <kio/accessmanager.h>
 
 // Forward Declarations
 class QNetworkDiskCache;
 
 
-class NetworkAccessManager : public RekonqAccessManager
+using namespace KIO;
+
+
+class NetworkAccessManager : public AccessManager
 {
     Q_OBJECT
 
-- 
cgit v1.2.1