From 63b34dc6ccd32c9bc7c3d8c0137ff12530238bde Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Thu, 30 Oct 2008 01:50:51 +0100
Subject: reKonq initial commit. Yeah!

---
 src/networkaccessmanager.cpp | 154 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)
 create mode 100644 src/networkaccessmanager.cpp

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
new file mode 100644
index 00000000..8922c8c0
--- /dev/null
+++ b/src/networkaccessmanager.cpp
@@ -0,0 +1,154 @@
+/****************************************************************************
+**
+** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License versions 2.0 or 3.0 as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file.  Please review the following information
+** to ensure GNU General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** http://www.gnu.org/copyleft/gpl.html.  In addition, as a special
+** exception, Nokia gives you certain additional rights. These rights
+** are described in the Nokia Qt GPL Exception version 1.3, included in
+** the file GPL_EXCEPTION.txt in this package.
+**
+** Qt for Windows(R) Licensees
+** As a special exception, Nokia, as the sole copyright holder for Qt
+** Designer, grants users of the Qt/Eclipse Integration plug-in the
+** right for the Qt/Eclipse Integration to link to functionality
+** provided by Qt Designer and its related libraries.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+**
+****************************************************************************/
+
+#include "networkaccessmanager.h"
+
+#include "browserapplication.h"
+#include "browsermainwindow.h"
+#include "ui_passworddialog.h"
+#include "ui_proxy.h"
+
+#include <QtCore/QSettings>
+
+#include <QtGui/QDialog>
+#include <QtGui/QMessageBox>
+#include <QtGui/QStyle>
+#include <QtGui/QTextDocument>
+
+#include <QtNetwork/QAuthenticator>
+#include <QtNetwork/QNetworkProxy>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QSslError>
+
+NetworkAccessManager::NetworkAccessManager(QObject *parent)
+    : QNetworkAccessManager(parent)
+{
+    connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
+            SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
+    connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
+            SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
+#ifndef QT_NO_OPENSSL
+    connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
+            SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
+#endif
+    loadSettings();
+}
+
+void NetworkAccessManager::loadSettings()
+{
+    QSettings settings;
+    settings.beginGroup(QLatin1String("proxy"));
+    QNetworkProxy proxy;
+    if (settings.value(QLatin1String("enabled"), false).toBool()) {
+        if (settings.value(QLatin1String("type"), 0).toInt() == 0)
+            proxy.setType(QNetworkProxy::Socks5Proxy);
+        else
+            proxy.setType(QNetworkProxy::HttpProxy);
+        proxy.setHostName(settings.value(QLatin1String("hostName")).toString());
+        proxy.setPort(settings.value(QLatin1String("port"), 1080).toInt());
+        proxy.setUser(settings.value(QLatin1String("userName")).toString());
+        proxy.setPassword(settings.value(QLatin1String("password")).toString());
+    }
+    setProxy(proxy);
+}
+
+void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
+{
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+    QDialog dialog(mainWindow);
+    dialog.setWindowFlags(Qt::Sheet);
+
+    Ui::PasswordDialog passwordDialog;
+    passwordDialog.setupUi(&dialog);
+
+    passwordDialog.iconLabel->setText(QString());
+    passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+
+    QString introMessage = tr("<qt>Enter username and password for \"%1\" at %2</qt>");
+    introMessage = introMessage.arg(Qt::escape(reply->url().toString())).arg(Qt::escape(reply->url().toString()));
+    passwordDialog.introLabel->setText(introMessage);
+    passwordDialog.introLabel->setWordWrap(true);
+
+    if (dialog.exec() == QDialog::Accepted) {
+        auth->setUser(passwordDialog.userNameLineEdit->text());
+        auth->setPassword(passwordDialog.passwordLineEdit->text());
+    }
+}
+
+void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
+{
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+    QDialog dialog(mainWindow);
+    dialog.setWindowFlags(Qt::Sheet);
+
+    Ui::ProxyDialog proxyDialog;
+    proxyDialog.setupUi(&dialog);
+
+    proxyDialog.iconLabel->setText(QString());
+    proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+
+    QString introMessage = tr("<qt>Connect to proxy \"%1\" using:</qt>");
+    introMessage = introMessage.arg(Qt::escape(proxy.hostName()));
+    proxyDialog.introLabel->setText(introMessage);
+    proxyDialog.introLabel->setWordWrap(true);
+
+    if (dialog.exec() == QDialog::Accepted) {
+        auth->setUser(proxyDialog.userNameLineEdit->text());
+        auth->setPassword(proxyDialog.passwordLineEdit->text());
+    }
+}
+
+#ifndef QT_NO_OPENSSL
+void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
+{
+    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+
+    QStringList errorStrings;
+    for (int i = 0; i < error.count(); ++i)
+        errorStrings += error.at(i).errorString();
+    QString errors = errorStrings.join(QLatin1String("\n"));
+    int ret = QMessageBox::warning(mainWindow, QCoreApplication::applicationName(),
+                           tr("SSL Errors:\n\n%1\n\n%2\n\n"
+                              "Do you want to ignore these errors?").arg(reply->url().toString()).arg(errors),
+                           QMessageBox::Yes | QMessageBox::No,
+                           QMessageBox::No);
+    if (ret == QMessageBox::Yes)
+        reply->ignoreSslErrors();
+}
+#endif
-- 
cgit v1.2.1


From 2147abb0c02358b512925191d3e545574ec80e08 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 1 Nov 2008 13:04:26 +0100
Subject: Localizing strings..

---
 src/networkaccessmanager.cpp | 88 +++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 54 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 8922c8c0..f09a39ab 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -1,58 +1,41 @@
-/****************************************************************************
-**
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License versions 2.0 or 3.0 as published by the Free
-** Software Foundation and appearing in the file LICENSE.GPL included in
-** the packaging of this file.  Please review the following information
-** to ensure GNU General Public Licensing requirements will be met:
-** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.  In addition, as a special
-** exception, Nokia gives you certain additional rights. These rights
-** are described in the Nokia Qt GPL Exception version 1.3, included in
-** the file GPL_EXCEPTION.txt in this package.
-**
-** Qt for Windows(R) Licensees
-** As a special exception, Nokia, as the sole copyright holder for Qt
-** Designer, grants users of the Qt/Eclipse Integration plug-in the
-** right for the Qt/Eclipse Integration to link to functionality
-** provided by Qt Designer and its related libraries.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
-**
-****************************************************************************/
-
+/* ============================================================
+ *
+ * This file is a part of the reKonq project
+ *
+ * Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
+ *
+ *
+ * This program is free software; you can redistribute it
+ * and/or modify it under the terms of the GNU General
+ * Public License as published by the Free Software Foundation;
+ * either version 2, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * ============================================================ */
+
+
+// Local Includes
 #include "networkaccessmanager.h"
-
 #include "browserapplication.h"
 #include "browsermainwindow.h"
 #include "ui_passworddialog.h"
 #include "ui_proxy.h"
 
-#include <QtCore/QSettings>
-
-#include <QtGui/QDialog>
-#include <QtGui/QMessageBox>
-#include <QtGui/QStyle>
-#include <QtGui/QTextDocument>
+// Qt Includes
+#include <QSettings>
+#include <QDialog>
+#include <QMessageBox>
+#include <QStyle>
+#include <QTextDocument>
+#include <QAuthenticator>
+#include <QNetworkProxy>
+#include <QNetworkReply>
+#include <QSslError>
 
-#include <QtNetwork/QAuthenticator>
-#include <QtNetwork/QNetworkProxy>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QSslError>
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
     : QNetworkAccessManager(parent)
@@ -99,8 +82,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
     passwordDialog.iconLabel->setText(QString());
     passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
 
-    QString introMessage = tr("<qt>Enter username and password for \"%1\" at %2</qt>");
-    introMessage = introMessage.arg(Qt::escape(reply->url().toString())).arg(Qt::escape(reply->url().toString()));
+    QString introMessage = i18n("<qt>Enter username and password for ") + Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
     passwordDialog.introLabel->setText(introMessage);
     passwordDialog.introLabel->setWordWrap(true);
 
@@ -123,8 +105,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
     proxyDialog.iconLabel->setText(QString());
     proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
 
-    QString introMessage = tr("<qt>Connect to proxy \"%1\" using:</qt>");
-    introMessage = introMessage.arg(Qt::escape(proxy.hostName()));
+    QString introMessage = i18n("<qt>Connect to proxy ") + Qt::escape(proxy.hostName()) + i18n(" using:</qt>");
     proxyDialog.introLabel->setText(introMessage);
     proxyDialog.introLabel->setWordWrap(true);
 
@@ -144,8 +125,7 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError
         errorStrings += error.at(i).errorString();
     QString errors = errorStrings.join(QLatin1String("\n"));
     int ret = QMessageBox::warning(mainWindow, QCoreApplication::applicationName(),
-                           tr("SSL Errors:\n\n%1\n\n%2\n\n"
-                              "Do you want to ignore these errors?").arg(reply->url().toString()).arg(errors),
+                           i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n",
                            QMessageBox::Yes | QMessageBox::No,
                            QMessageBox::No);
     if (ret == QMessageBox::Yes)
-- 
cgit v1.2.1


From 4a0acb308cfecde67af334f48a521c221c4aee1a Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 7 Nov 2008 00:17:56 +0100
Subject: Setting right license

---
 src/networkaccessmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index f09a39ab..01ab06ce 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -2,6 +2,7 @@
  *
  * This file is a part of the reKonq project
  *
+ * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
  * Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
  *
  *
-- 
cgit v1.2.1


From 689ec1f948776a747b640cac2d0aee865948429e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Fri, 5 Dec 2008 11:55:59 +0100
Subject: Fully using KConfig files to manage cookies and settings

---
 src/networkaccessmanager.cpp | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 01ab06ce..79549d25 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -26,8 +26,10 @@
 #include "ui_passworddialog.h"
 #include "ui_proxy.h"
 
+// KDE Includes
+#include <KConfig>
+
 // Qt Includes
-#include <QSettings>
 #include <QDialog>
 #include <QMessageBox>
 #include <QStyle>
@@ -52,24 +54,33 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
     loadSettings();
 }
 
+
 void NetworkAccessManager::loadSettings()
 {
-    QSettings settings;
-    settings.beginGroup(QLatin1String("proxy"));
+    KConfig config("rekonqrc");
+    KConfigGroup group = config.group("proxy");
+
     QNetworkProxy proxy;
-    if (settings.value(QLatin1String("enabled"), false).toBool()) {
-        if (settings.value(QLatin1String("type"), 0).toInt() == 0)
+    if ( group.readEntry( QString("enabled"), false) ) 
+    {
+        if ( group.readEntry( QString("type"), 0) == 0 )
+        {
             proxy.setType(QNetworkProxy::Socks5Proxy);
+        }
         else
+        {
             proxy.setType(QNetworkProxy::HttpProxy);
-        proxy.setHostName(settings.value(QLatin1String("hostName")).toString());
-        proxy.setPort(settings.value(QLatin1String("port"), 1080).toInt());
-        proxy.setUser(settings.value(QLatin1String("userName")).toString());
-        proxy.setPassword(settings.value(QLatin1String("password")).toString());
+        }
+        proxy.setHostName( group.readEntry( QString("hostName"), QString() ) );
+        proxy.setPort( group.readEntry( QString("port"), 1080 ) );
+        proxy.setUser( group.readEntry( QString("userName"), QString() ) );
+        proxy.setPassword( group.readEntry( QString("password"), QString() ) );
     }
     setProxy(proxy);
 }
 
+
+
 void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
 {
     BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
@@ -87,7 +98,8 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
     passwordDialog.introLabel->setText(introMessage);
     passwordDialog.introLabel->setWordWrap(true);
 
-    if (dialog.exec() == QDialog::Accepted) {
+    if (dialog.exec() == QDialog::Accepted) 
+    {
         auth->setUser(passwordDialog.userNameLineEdit->text());
         auth->setPassword(passwordDialog.passwordLineEdit->text());
     }
@@ -110,7 +122,8 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
     proxyDialog.introLabel->setText(introMessage);
     proxyDialog.introLabel->setWordWrap(true);
 
-    if (dialog.exec() == QDialog::Accepted) {
+    if (dialog.exec() == QDialog::Accepted) 
+    {
         auth->setUser(proxyDialog.userNameLineEdit->text());
         auth->setPassword(proxyDialog.passwordLineEdit->text());
     }
-- 
cgit v1.2.1


From c8279e0c4a76db65547e6c711b8e7717e0d28059 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 7 Dec 2008 00:18:36 +0100
Subject: No more QmessageBox here..

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 79549d25..c5967d2a 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -23,15 +23,16 @@
 #include "networkaccessmanager.h"
 #include "browserapplication.h"
 #include "browsermainwindow.h"
+
 #include "ui_passworddialog.h"
 #include "ui_proxy.h"
 
 // KDE Includes
 #include <KConfig>
+#include <KMessageBox>
 
 // Qt Includes
 #include <QDialog>
-#include <QMessageBox>
 #include <QStyle>
 #include <QTextDocument>
 #include <QAuthenticator>
@@ -138,11 +139,9 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError
     for (int i = 0; i < error.count(); ++i)
         errorStrings += error.at(i).errorString();
     QString errors = errorStrings.join(QLatin1String("\n"));
-    int ret = QMessageBox::warning(mainWindow, QCoreApplication::applicationName(),
-                           i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n",
-                           QMessageBox::Yes | QMessageBox::No,
-                           QMessageBox::No);
-    if (ret == QMessageBox::Yes)
+    int ret = KMessageBox::warningYesNo( mainWindow,
+                                                                i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n");
+    if (ret == KMessageBox::Yes)
         reply->ignoreSslErrors();
 }
 #endif
-- 
cgit v1.2.1


From 19e901a0ca9630b2003dd24ccfa6da54eb70bb09 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 14 Dec 2008 18:27:17 +0100
Subject: adjusted rekonq name commented out (hopefully, for now) resizeEvents
 and focusInEvents in urlbar & searchbar

---
 src/networkaccessmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c5967d2a..869a6144 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -1,6 +1,6 @@
 /* ============================================================
  *
- * This file is a part of the reKonq project
+ * This file is a part of the rekonq project
  *
  * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
  * Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
-- 
cgit v1.2.1


From c7048563b95f8d27b20aac0a0e1fbc5c4584c514 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 27 Dec 2008 12:54:30 +0100
Subject: BrowserMainWindow --> MainWindow

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 869a6144..7390cd22 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -22,7 +22,7 @@
 // Local Includes
 #include "networkaccessmanager.h"
 #include "browserapplication.h"
-#include "browsermainwindow.h"
+#include "mainwindow.h"
 
 #include "ui_passworddialog.h"
 #include "ui_proxy.h"
@@ -84,7 +84,7 @@ void NetworkAccessManager::loadSettings()
 
 void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
 {
-    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    MainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
 
     QDialog dialog(mainWindow);
     dialog.setWindowFlags(Qt::Sheet);
@@ -108,7 +108,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
 
 void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
 {
-    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    MainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
 
     QDialog dialog(mainWindow);
     dialog.setWindowFlags(Qt::Sheet);
@@ -133,7 +133,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
 #ifndef QT_NO_OPENSSL
 void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
 {
-    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    MainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
 
     QStringList errorStrings;
     for (int i = 0; i < error.count(); ++i)
-- 
cgit v1.2.1


From 76d30285358bedd8b2fc6caf48d2a871f7546685 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 19 Jan 2009 02:26:13 +0100
Subject: Ported tons of code to KConfigXT. To merge kcfg branch we need just
 to port cookie settings..

---
 src/networkaccessmanager.cpp | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 7390cd22..1d601440 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -18,17 +18,22 @@
  *
  * ============================================================ */
 
+// Self Includes
+#include "networkaccessmanager.h"
+#include "networkaccessmanager.moc"
 
 // Local Includes
-#include "networkaccessmanager.h"
 #include "browserapplication.h"
 #include "mainwindow.h"
 
+// Auto Includes
+#include "rekonq.h"
+
+// Ui Includes
 #include "ui_passworddialog.h"
 #include "ui_proxy.h"
 
 // KDE Includes
-#include <KConfig>
 #include <KMessageBox>
 
 // Qt Includes
@@ -58,13 +63,10 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 
 void NetworkAccessManager::loadSettings()
 {
-    KConfig config("rekonqrc");
-    KConfigGroup group = config.group("proxy");
-
     QNetworkProxy proxy;
-    if ( group.readEntry( QString("enabled"), false) ) 
+    if ( ReKonfig::enableProxy() ) 
     {
-        if ( group.readEntry( QString("type"), 0) == 0 )
+        if ( ReKonfig::proxyType() == 0 )
         {
             proxy.setType(QNetworkProxy::Socks5Proxy);
         }
@@ -72,10 +74,10 @@ void NetworkAccessManager::loadSettings()
         {
             proxy.setType(QNetworkProxy::HttpProxy);
         }
-        proxy.setHostName( group.readEntry( QString("hostName"), QString() ) );
-        proxy.setPort( group.readEntry( QString("port"), 1080 ) );
-        proxy.setUser( group.readEntry( QString("userName"), QString() ) );
-        proxy.setPassword( group.readEntry( QString("password"), QString() ) );
+        proxy.setHostName( ReKonfig::proxyHostName() );
+        proxy.setPort( ReKonfig::proxyPort() );
+        proxy.setUser( ReKonfig::proxyUserName() );
+        proxy.setPassword( ReKonfig::proxyPassword() );
     }
     setProxy(proxy);
 }
@@ -95,7 +97,8 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
     passwordDialog.iconLabel->setText(QString());
     passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
 
-    QString introMessage = i18n("<qt>Enter username and password for ") + Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
+    QString introMessage = i18n("<qt>Enter username and password for ") + 
+                            Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
     passwordDialog.introLabel->setText(introMessage);
     passwordDialog.introLabel->setWordWrap(true);
 
@@ -139,8 +142,7 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError
     for (int i = 0; i < error.count(); ++i)
         errorStrings += error.at(i).errorString();
     QString errors = errorStrings.join(QLatin1String("\n"));
-    int ret = KMessageBox::warningYesNo( mainWindow,
-                                                                i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n");
+    int ret = KMessageBox::warningYesNo( 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


From e095ed8b62c56745367fe79186431fe4f175d777 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 2 Feb 2009 01:14:46 +0100
Subject: Fixed download problems rewamp proxy ui fixing settings

---
 src/networkaccessmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 1d601440..82947c3b 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -64,7 +64,7 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 void NetworkAccessManager::loadSettings()
 {
     QNetworkProxy proxy;
-    if ( ReKonfig::enableProxy() ) 
+    if ( ReKonfig::isProxyEnabled() ) 
     {
         if ( ReKonfig::proxyType() == 0 )
         {
-- 
cgit v1.2.1


From 39ff47469cdc4a7df148368ed60470dc042f677e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 15 Feb 2009 15:44:52 +0100
Subject: {Browser,}Application. Again..

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 82947c3b..f4e23fb1 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -23,7 +23,7 @@
 #include "networkaccessmanager.moc"
 
 // Local Includes
-#include "browserapplication.h"
+#include "application.h"
 #include "mainwindow.h"
 
 // Auto Includes
@@ -86,7 +86,7 @@ void NetworkAccessManager::loadSettings()
 
 void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
 {
-    MainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    MainWindow *mainWindow = Application::instance()->mainWindow();
 
     QDialog dialog(mainWindow);
     dialog.setWindowFlags(Qt::Sheet);
@@ -111,7 +111,7 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
 
 void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
 {
-    MainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    MainWindow *mainWindow = Application::instance()->mainWindow();
 
     QDialog dialog(mainWindow);
     dialog.setWindowFlags(Qt::Sheet);
@@ -136,7 +136,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
 #ifndef QT_NO_OPENSSL
 void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
 {
-    MainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
+    MainWindow *mainWindow = Application::instance()->mainWindow();
 
     QStringList errorStrings;
     for (int i = 0; i < error.count(); ++i)
-- 
cgit v1.2.1


From 39409ac6a2880ad815d6096231d0fcdcfd2547f6 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 22 Mar 2009 10:21:09 +0100
Subject: Fixed Copyright intro

---
 src/networkaccessmanager.cpp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index f4e23fb1..96e099b8 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -1,22 +1,23 @@
 /* ============================================================
- *
- * This file is a part of the rekonq project
- *
- * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
- * Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
- *
- *
- * This program is free software; you can redistribute it
- * and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation;
- * either version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * ============================================================ */
+*
+* This file is a part of the rekonq project
+*
+* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
+* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
+*
+*
+* This program is free software; you can redistribute it
+* and/or modify it under the terms of the GNU General
+* Public License as published by the Free Software Foundation;
+* either version 2, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* ============================================================ */
+
 
 // Self Includes
 #include "networkaccessmanager.h"
-- 
cgit v1.2.1


From 48b25611c94d380b40948a3de0bfab5678668e1d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 25 Mar 2009 00:47:24 +0100
Subject: Huge update. Fixed quite all of the settings troubles..

From now on, we (mainly) go on WebView bugfixing..
---
 src/networkaccessmanager.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 96e099b8..882ae4e1 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -36,6 +36,7 @@
 
 // KDE Includes
 #include <KMessageBox>
+#include <KDebug>
 
 // Qt Includes
 #include <QDialog>
@@ -64,6 +65,7 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 
 void NetworkAccessManager::loadSettings()
 {
+    kWarning() << "loading NetworkAccessManager settings..";
     QNetworkProxy proxy;
     if ( ReKonfig::isProxyEnabled() ) 
     {
-- 
cgit v1.2.1


From 473540ed565ce6c2f5767e29b956aad0dadf458d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 28 Mar 2009 15:46:46 +0100
Subject: Added QNetworkDiskCache. Thanks to Ben Meyer's Qt Blog post

---
 src/networkaccessmanager.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 882ae4e1..1c426c61 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -55,11 +55,23 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
             SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
     connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
             SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
+
 #ifndef QT_NO_OPENSSL
     connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
             SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
 #endif
+
     loadSettings();
+
+#if QT_VERSION >= 0x040500
+
+    QNetworkDiskCache *diskCache = new QNetworkDiskCache(this);
+    QString location = KStandardDirs::locateLocal("cache","",true);
+    diskCache->setCacheDirectory(location);
+    setCache(diskCache);
+
+#endif    
+
 }
 
 
-- 
cgit v1.2.1


From a934072cf9695e46e793898102590322f43c0733 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 28 Mar 2009 15:53:26 +0100
Subject: astyle. First round..

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 1c426c61..c0b05e6a 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -49,10 +49,10 @@
 
 
 NetworkAccessManager::NetworkAccessManager(QObject *parent)
-    : QNetworkAccessManager(parent)
+        : QNetworkAccessManager(parent)
 {
     connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
-            SLOT(authenticationRequired(QNetworkReply*,QAuthenticator*)));
+            SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)));
     connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
             SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
 
@@ -66,11 +66,11 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 #if QT_VERSION >= 0x040500
 
     QNetworkDiskCache *diskCache = new QNetworkDiskCache(this);
-    QString location = KStandardDirs::locateLocal("cache","",true);
+    QString location = KStandardDirs::locateLocal("cache", "", true);
     diskCache->setCacheDirectory(location);
     setCache(diskCache);
 
-#endif    
+#endif
 
 }
 
@@ -79,9 +79,9 @@ void NetworkAccessManager::loadSettings()
 {
     kWarning() << "loading NetworkAccessManager settings..";
     QNetworkProxy proxy;
-    if ( ReKonfig::isProxyEnabled() ) 
+    if (ReKonfig::isProxyEnabled())
     {
-        if ( ReKonfig::proxyType() == 0 )
+        if (ReKonfig::proxyType() == 0)
         {
             proxy.setType(QNetworkProxy::Socks5Proxy);
         }
@@ -89,10 +89,10 @@ void NetworkAccessManager::loadSettings()
         {
             proxy.setType(QNetworkProxy::HttpProxy);
         }
-        proxy.setHostName( ReKonfig::proxyHostName() );
-        proxy.setPort( ReKonfig::proxyPort() );
-        proxy.setUser( ReKonfig::proxyUserName() );
-        proxy.setPassword( ReKonfig::proxyPassword() );
+        proxy.setHostName(ReKonfig::proxyHostName());
+        proxy.setPort(ReKonfig::proxyPort());
+        proxy.setUser(ReKonfig::proxyUserName());
+        proxy.setPassword(ReKonfig::proxyPassword());
     }
     setProxy(proxy);
 }
@@ -112,12 +112,12 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
     passwordDialog.iconLabel->setText(QString());
     passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
 
-    QString introMessage = i18n("<qt>Enter username and password for ") + 
-                            Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
+    QString introMessage = i18n("<qt>Enter username and password for ") +
+                           Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
     passwordDialog.introLabel->setText(introMessage);
     passwordDialog.introLabel->setWordWrap(true);
 
-    if (dialog.exec() == QDialog::Accepted) 
+    if (dialog.exec() == QDialog::Accepted)
     {
         auth->setUser(passwordDialog.userNameLineEdit->text());
         auth->setPassword(passwordDialog.passwordLineEdit->text());
@@ -141,7 +141,7 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
     proxyDialog.introLabel->setText(introMessage);
     proxyDialog.introLabel->setWordWrap(true);
 
-    if (dialog.exec() == QDialog::Accepted) 
+    if (dialog.exec() == QDialog::Accepted)
     {
         auth->setUser(proxyDialog.userNameLineEdit->text());
         auth->setPassword(proxyDialog.passwordLineEdit->text());
@@ -157,7 +157,7 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError
     for (int i = 0; i < error.count(); ++i)
         errorStrings += error.at(i).errorString();
     QString errors = errorStrings.join(QLatin1String("\n"));
-    int ret = KMessageBox::warningYesNo( mainWindow, i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n");
+    int ret = KMessageBox::warningYesNo(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


From 651f97d0652e90ab1af4e80418f42468cc5932e2 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sat, 28 Mar 2009 23:46:38 +0100
Subject: pedantic

---
 src/networkaccessmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c0b05e6a..3c15bcf5 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -37,6 +37,7 @@
 // KDE Includes
 #include <KMessageBox>
 #include <KDebug>
+#include <KStandardDirs>
 
 // Qt Includes
 #include <QDialog>
-- 
cgit v1.2.1


From 98f53721514116b876d18bf0a2da89d2a53cc97d Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 29 Mar 2009 00:05:45 +0100
Subject: Revert "pedantic" Too much things committed a time..

This reverts commit 651f97d0652e90ab1af4e80418f42468cc5932e2.
---
 src/networkaccessmanager.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 3c15bcf5..c0b05e6a 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -37,7 +37,6 @@
 // KDE Includes
 #include <KMessageBox>
 #include <KDebug>
-#include <KStandardDirs>
 
 // Qt Includes
 #include <QDialog>
-- 
cgit v1.2.1


From 08deb6b161ef0cdda7ed8e49870b16f41d78eb4e Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 29 Mar 2009 00:13:01 +0100
Subject: Revert "Revert "pedantic"" Reapplied previous changes. Sorry for
 confusion. Time to bed..

This reverts commit 98f53721514116b876d18bf0a2da89d2a53cc97d.
---
 src/networkaccessmanager.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index c0b05e6a..3c15bcf5 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -37,6 +37,7 @@
 // KDE Includes
 #include <KMessageBox>
 #include <KDebug>
+#include <KStandardDirs>
 
 // Qt Includes
 #include <QDialog>
-- 
cgit v1.2.1


From e1781ecb6ce807cf4afd991d16c55b1d9b5f8e58 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 5 Apr 2009 17:16:28 +0200
Subject: Compiles just with 4.5..

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 3c15bcf5..26078ed6 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -64,15 +64,10 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 
     loadSettings();
 
-#if QT_VERSION >= 0x040500
-
     QNetworkDiskCache *diskCache = new QNetworkDiskCache(this);
     QString location = KStandardDirs::locateLocal("cache", "", true);
     diskCache->setCacheDirectory(location);
     setCache(diskCache);
-
-#endif
-
 }
 
 
-- 
cgit v1.2.1


From 245509053d7fd6427b8d7170ab088917b7fe70f0 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 5 Apr 2009 18:13:13 +0200
Subject: Ported Authentication Ui to Kdialog shining.. ;)

---
 src/networkaccessmanager.cpp | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 3c15bcf5..028dfabb 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -31,7 +31,7 @@
 #include "rekonq.h"
 
 // Ui Includes
-#include "ui_passworddialog.h"
+#include "ui_password.h"
 #include "ui_proxy.h"
 
 // KDE Includes
@@ -104,24 +104,25 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
 {
     MainWindow *mainWindow = Application::instance()->mainWindow();
 
-    QDialog dialog(mainWindow);
-    dialog.setWindowFlags(Qt::Sheet);
+    KDialog dialog(mainWindow,Qt::Sheet);
 
-    Ui::PasswordDialog passwordDialog;
-    passwordDialog.setupUi(&dialog);
+    Ui::passwordWidget passwordWidget;
+    passwordWidget.setupUi(&dialog);
 
-    passwordDialog.iconLabel->setText(QString());
-    passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
+
+    passwordWidget.iconLabel->setText(QString());
+    passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
 
     QString introMessage = i18n("<qt>Enter username and password for ") +
                            Qt::escape(reply->url().toString()) + i18n(" at ") + Qt::escape(reply->url().toString()) + "</qt>";
-    passwordDialog.introLabel->setText(introMessage);
-    passwordDialog.introLabel->setWordWrap(true);
+    passwordWidget.introLabel->setText(introMessage);
+    passwordWidget.introLabel->setWordWrap(true);
 
     if (dialog.exec() == QDialog::Accepted)
     {
-        auth->setUser(passwordDialog.userNameLineEdit->text());
-        auth->setPassword(passwordDialog.passwordLineEdit->text());
+        auth->setUser(passwordWidget.userNameLineEdit->text());
+        auth->setPassword(passwordWidget.passwordLineEdit->text());
     }
 }
 
@@ -129,23 +130,24 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
 {
     MainWindow *mainWindow = Application::instance()->mainWindow();
 
-    QDialog dialog(mainWindow);
-    dialog.setWindowFlags(Qt::Sheet);
+    KDialog dialog(mainWindow, Qt::Sheet);
+
+    Ui::proxyWidget proxyWdg;
+    proxyWdg.setupUi(&dialog);
 
-    Ui::ProxyDialog proxyDialog;
-    proxyDialog.setupUi(&dialog);
+    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
 
-    proxyDialog.iconLabel->setText(QString());
-    proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
+    proxyWdg.iconLabel->setText(QString());
+    proxyWdg.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
 
     QString introMessage = i18n("<qt>Connect to proxy ") + Qt::escape(proxy.hostName()) + i18n(" using:</qt>");
-    proxyDialog.introLabel->setText(introMessage);
-    proxyDialog.introLabel->setWordWrap(true);
+    proxyWdg.introLabel->setText(introMessage);
+    proxyWdg.introLabel->setWordWrap(true);
 
     if (dialog.exec() == QDialog::Accepted)
     {
-        auth->setUser(proxyDialog.userNameLineEdit->text());
-        auth->setPassword(proxyDialog.passwordLineEdit->text());
+        auth->setUser(proxyWdg.userNameLineEdit->text());
+        auth->setPassword(proxyWdg.passwordLineEdit->text());
     }
 }
 
-- 
cgit v1.2.1


From 0af5a5a14308715a141f238e8302e646a0d183c7 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 22 Apr 2009 00:33:05 +0200
Subject: pedantic

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 1d9f2a78..04054360 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -36,7 +36,6 @@
 
 // KDE Includes
 #include <KMessageBox>
-#include <KDebug>
 #include <KStandardDirs>
 
 // Qt Includes
@@ -73,7 +72,6 @@ NetworkAccessManager::NetworkAccessManager(QObject *parent)
 
 void NetworkAccessManager::loadSettings()
 {
-    kWarning() << "loading NetworkAccessManager settings..";
     QNetworkProxy proxy;
     if (ReKonfig::isProxyEnabled())
     {
@@ -160,3 +158,4 @@ void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError
         reply->ignoreSslErrors();
 }
 #endif
+
-- 
cgit v1.2.1


From 7557af13f9f904cb9a6240d2101fb14e1ffdca99 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 22 Apr 2009 01:33:28 +0200
Subject: Fixing Copyrights

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 04054360..79109d7a 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -3,7 +3,8 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details
 *
 *
 * This program is free software; you can redistribute it
-- 
cgit v1.2.1


From e52ed70c8e6e1abd8adc27dd0052328fa5f4deff Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Sun, 26 Apr 2009 23:51:25 +0200
Subject: Including moc files && lineedit class Q_OBJECT fix

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 79109d7a..d3d46f60 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -4,7 +4,6 @@
 *
 * Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
 * Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
-* Copyright (C) 2009 rekonq team. Please, see AUTHORS file for details
 *
 *
 * This program is free software; you can redistribute it
-- 
cgit v1.2.1


From 0c033610fca4cf9e03fc425fe0a130da3cb6f879 Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Mon, 27 Apr 2009 12:28:24 +0200
Subject: kdialog fixes

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index d3d46f60..311124e8 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -98,11 +98,13 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
     MainWindow *mainWindow = Application::instance()->mainWindow();
 
     KDialog dialog(mainWindow,Qt::Sheet);
+    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
 
     Ui::passwordWidget passwordWidget;
-    passwordWidget.setupUi(&dialog);
+    QWidget widget;
+    passwordWidget.setupUi(&widget);
 
-    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
+    dialog.setMainWidget(&widget);
 
     passwordWidget.iconLabel->setText(QString());
     passwordWidget.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
@@ -124,11 +126,13 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
     MainWindow *mainWindow = Application::instance()->mainWindow();
 
     KDialog dialog(mainWindow, Qt::Sheet);
+    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
 
     Ui::proxyWidget proxyWdg;
-    proxyWdg.setupUi(&dialog);
-
-    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
+    QWidget widget;
+    proxyWdg.setupUi(&widget);
+    
+    dialog.setMainWidget(&widget);
 
     proxyWdg.iconLabel->setText(QString());
     proxyWdg.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
-- 
cgit v1.2.1


From 82862fbd150afae0101757d1d6081e0e6ddf7baa Mon Sep 17 00:00:00 2001
From: Andrea Diamantini <adjam7@gmail.com>
Date: Wed, 29 Apr 2009 11:24:11 +0200
Subject: astyle

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

(limited to 'src/networkaccessmanager.cpp')

diff --git a/src/networkaccessmanager.cpp b/src/networkaccessmanager.cpp
index 311124e8..d92edbd6 100644
--- a/src/networkaccessmanager.cpp
+++ b/src/networkaccessmanager.cpp
@@ -97,8 +97,8 @@ void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthent
 {
     MainWindow *mainWindow = Application::instance()->mainWindow();
 
-    KDialog dialog(mainWindow,Qt::Sheet);
-    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
+    KDialog dialog(mainWindow, Qt::Sheet);
+    dialog.setButtons(KDialog::Ok | KDialog::Cancel);
 
     Ui::passwordWidget passwordWidget;
     QWidget widget;
@@ -126,12 +126,12 @@ void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &prox
     MainWindow *mainWindow = Application::instance()->mainWindow();
 
     KDialog dialog(mainWindow, Qt::Sheet);
-    dialog.setButtons( KDialog::Ok | KDialog::Cancel );
+    dialog.setButtons(KDialog::Ok | KDialog::Cancel);
 
     Ui::proxyWidget proxyWdg;
     QWidget widget;
     proxyWdg.setupUi(&widget);
-    
+
     dialog.setMainWidget(&widget);
 
     proxyWdg.iconLabel->setText(QString());
-- 
cgit v1.2.1