From b487c807711cfee057e522eda9f578c5e8a8d54f Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 22 May 2009 16:07:36 +0200
Subject: Access Manager Porting. Compiles && links

---
 src/networkaccessmanager.cpp | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 6f0e2a3e..3fe42cbb 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -40,6 +40,7 @@
 
 // Qt Includes
 #include <QtCore/QPointer>
+#include <QtCore/QIODevice>
 
 #include <QtGui/QDialog>
 #include <QtGui/QStyle>
@@ -48,11 +49,12 @@
 #include <QtNetwork/QAuthenticator>
 #include <QtNetwork/QNetworkProxy>
 #include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
 #include <QtNetwork/QSslError>
 
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
-        : QNetworkAccessManager(parent)
+        : AccessManager(parent)
 {
     connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
             SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)));
@@ -73,6 +75,19 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 }
 
 
+NetworkAccessManager::~NetworkAccessManager()
+{
+// FIXME: implement me!!
+}
+
+
+QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData)
+{
+// FIXME: implement me!!
+    return put(req,outgoingData);
+}
+
+
 void NetworkAccessManager::loadSettings()
 {
     QNetworkProxy proxy;
-- 
cgit v1.2.1


From 2e66b40db71b99220754c126a8e4e3606c3505f2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 23 May 2009 01:22:31 +0200
Subject: Fixing new AccessManager. Removed webpage createPlugin slot

---
 src/networkaccessmanager.cpp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 3fe42cbb..2c42f5d2 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -75,19 +75,6 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 }
 
 
-NetworkAccessManager::~NetworkAccessManager()
-{
-// FIXME: implement me!!
-}
-
-
-QNetworkReply *NetworkAccessManager::createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData)
-{
-// FIXME: implement me!!
-    return put(req,outgoingData);
-}
-
-
 void NetworkAccessManager::loadSettings()
 {
     QNetworkProxy proxy;
-- 
cgit v1.2.1


From ccb09a51449cfac70cedf33875e317b4005263f4 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 26 May 2009 14:29:42 +0200
Subject: Fixing Compilation

---
 src/networkaccessmanager.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 2c42f5d2..ddab6ffe 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -63,7 +63,7 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 
 #ifndef QT_NO_OPENSSL
     connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
-            SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
+            SLOT(slotSSLErrors(QNetworkReply*, const QList<QSslError>&)));
 #endif
 
     loadSettings();
@@ -159,7 +159,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
 
 
 #ifndef QT_NO_OPENSSL
-void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
+void NetworkAccessManager::slotSSLErrors(QNetworkReply *reply, const QList<QSslError> &error)
 {
     MainWindow *mainWindow = Application::instance()->mainWindow();
 
-- 
cgit v1.2.1


From 6ce525e98335a4ab0225b29a451473bdc3a5ae19 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Tue, 26 May 2009 14:33:28 +0200
Subject: load AccessManager Proxy fix

---
 src/networkaccessmanager.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index ddab6ffe..d0c9833b 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -77,9 +77,9 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 
 void NetworkAccessManager::loadSettings()
 {
-    QNetworkProxy proxy;
     if (ReKonfig::isProxyEnabled())
     {
+        QNetworkProxy proxy;
         if (ReKonfig::proxyType() == 0)
         {
             proxy.setType(QNetworkProxy::Socks5Proxy);
@@ -92,8 +92,9 @@ void NetworkAccessManager::loadSettings()
         proxy.setPort(ReKonfig::proxyPort());
         proxy.setUser(ReKonfig::proxyUserName());
         proxy.setPassword(ReKonfig::proxyPassword());
+ 
+       setProxy(proxy);
     }
-    setProxy(proxy);
 }
 
 
-- 
cgit v1.2.1


From aec95ee71d1e47580e66cbdc11d61dca815a8d0b Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 28 May 2009 12:04:06 +0200
Subject: cosmetic

---
 src/networkaccessmanager.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index d0c9833b..7f05bf1c 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -168,7 +168,9 @@ void NetworkAccessManager::slotSSLErrors(QNetworkReply *reply, const QList<QSslE
     for (int i = 0; i < error.count(); ++i)
         errorStrings += error.at(i).errorString();
     QString errors = errorStrings.join(QLatin1String("\n"));
-    int ret = KMessageBox::warningContinueCancel(mainWindow, i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n");
+    int ret = KMessageBox::warningContinueCancel(mainWindow, 
+                    i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n");
+
     if (ret == KMessageBox::Yes)
         reply->ignoreSslErrors();
 }
-- 
cgit v1.2.1