summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/history.cpp4
-rw-r--r--src/networkaccessmanager.cpp2
-rw-r--r--src/networkaccessmanager.h14
3 files changed, 16 insertions, 4 deletions
diff --git a/src/history.cpp b/src/history.cpp
index 409ac51b..da13b3d0 100644
--- a/src/history.cpp
+++ b/src/history.cpp
@@ -408,9 +408,13 @@ void HistoryManager::save()
if (saveAll)
{
if (historyFile.exists() && !historyFile.remove())
+ {
kWarning() << "History: error removing old history." << historyFile.errorString();
+ }
if (!tempFile.rename(historyFile.fileName()))
+ {
kWarning() << "History: error moving new history over old." << tempFile.errorString() << historyFile.fileName();
+ }
}
m_lastSavedUrl = m_history.value(0).url;
}
diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c57d3fa7..32bc15b5 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -56,7 +56,7 @@
NetworkAccessManager::NetworkAccessManager(QObject *parent)
- : QNetworkAccessManager(parent)
+ : RekonqAccessManager(parent)
, m_diskCache(0)
{
connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index ed4577e4..1eea9a0d 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -27,14 +27,22 @@
#ifndef NETWORKACCESSMANAGER_H
#define NETWORKACCESSMANAGER_H
-// KDE Includes
-#include <QtNetwork/QNetworkAccessManager>
+#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
// Forward Declarations
class QNetworkDiskCache;
-class NetworkAccessManager : public QNetworkAccessManager
+class NetworkAccessManager : public RekonqAccessManager
{
Q_OBJECT