summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt28
-rw-r--r--src/CMakeLists.txt23
-rw-r--r--src/kaccessmanager.cpp206
-rw-r--r--src/kaccessmanager.h52
-rw-r--r--src/networkmanager.cpp2
-rw-r--r--src/networkmanager.h8
6 files changed, 7 insertions, 312 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62c47767..89c4a9ce 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,19 +36,6 @@ INCLUDE(KDE4Defaults)
INCLUDE(MacroLibrary)
# ==================================================================================
-# KDE Version
-
-if(${KDE_VERSION_MINOR} GREATER "2")
- SET(KDE_OLD_VERSION false)
-else(${KDE_VERSION_MINOR} GREATER "2")
- if(${KDE_VERSION_RELEASE} GREATER "69")
- SET(KDE_OLD_VERSION false)
- else(${KDE_VERSION_RELEASE} GREATER "69")
- SET(KDE_OLD_VERSION true)
- endif(${KDE_VERSION_RELEASE} GREATER "69")
-endif(${KDE_VERSION_MINOR} GREATER "2")
-
-# ==================================================================================
# Log messages
MESSAGE(STATUS "")
@@ -93,20 +80,6 @@ ELSE(KDE4_FOUND)
ENDIF(KDE4_FOUND)
-# --------------- KNetworkAccessManager
-if(KDE_OLD_VERSION)
-
- MESSAGE(STATUS " As KDE version is minor than KDE 4.2.70, rekonq will have ")
- MESSAGE(STATUS " some functions about KDE integration disabled ")
- MESSAGE(STATUS "")
-
-endif(KDE_OLD_VERSION)
-
-MESSAGE(STATUS "")
-MESSAGE(STATUS "-----------------------------------------------------------------------")
-MESSAGE(STATUS "")
-
-
##### FINAL RESULTS #####
IF(QT_FOUND AND KDE4_FOUND)
@@ -132,4 +105,3 @@ IF(REKONQ_CAN_BE_COMPILED)
ENDIF(REKONQ_CAN_BE_COMPILED)
# ================================================================================
-
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d89b72ad..e8c39158 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,13 +1,7 @@
### ------- SETTING REKONQ FILES..
-if(KDE_OLD_VERSION)
- SET( rekonq_NAM kaccessmanager.cpp )
-else(KDE_OLD_VERSION)
- SET( rekonq_NAM networkmanager.cpp )
-endif(KDE_OLD_VERSION)
-
SET( rekonq_SRCS
- ${rekonq_NAM}
+ networkmanager.cpp
autosaver.cpp
application.cpp
mainwindow.cpp
@@ -51,7 +45,6 @@ KDE4_ADD_UI_FILES( rekonq_SRCS
KDE4_ADD_KCFG_FILES( rekonq_SRCS rekonq.kcfgc )
-
### ------------- INCLUDING DIRECTORIES...
INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR}
@@ -60,30 +53,17 @@ INCLUDE_DIRECTORIES ( ${CMAKE_CURRENT_SOURCE_DIR}
${QT4_INCLUDES}
)
-if(KDE_OLD_VERSION)
-
- INCLUDE_DIRECTORIES( ${KDENETWORK_INCLUDE_DIR} )
-
-endif(KDE_OLD_VERSION)
-
### -------------- ADDING DEFINITIONS...
ADD_DEFINITIONS ( ${KDE4_DEFINITIONS} )
-if(KDE_OLD_VERSION)
-
- ADD_DEFINITIONS ( ${KDENETWORK_DEFINITIONS} )
-
-endif(KDE_OLD_VERSION)
-
### --------------- ADDING EXECUTABLE...
KDE4_ADD_EXECUTABLE( rekonq ${rekonq_SRCS} )
-
### --------------- TARGETTING LINK LIBRARIES...
TARGET_LINK_LIBRARIES ( rekonq
@@ -93,7 +73,6 @@ TARGET_LINK_LIBRARIES ( rekonq
${QT_QTUITOOLS_LIBRARY}
${KDE4_KUTILS_LIBS}
${KDE4_KDEUI_LIBS}
- ${KDE4_KIO_LIBS}
)
diff --git a/src/kaccessmanager.cpp b/src/kaccessmanager.cpp
deleted file mode 100644
index a79ff865..00000000
--- a/src/kaccessmanager.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 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 3, 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 "kaccessmanager.h"
-#include "kaccessmanager.moc"
-
-// Local Includes
-#include "application.h"
-#include "mainwindow.h"
-
-// Auto Includes
-#include "rekonq.h"
-
-// Ui Includes
-#include "ui_password.h"
-#include "ui_proxy.h"
-
-// KDE Includes
-#include <KMessageBox>
-#include <KStandardDirs>
-
-// Qt Includes
-#include <QtCore/QPointer>
-#include <QtCore/QIODevice>
-
-#include <QtGui/QStyle>
-#include <QtGui/QTextDocument>
-
-#include <QtNetwork/QAuthenticator>
-#include <QtNetwork/QNetworkProxy>
-#include <QtNetwork/QNetworkReply>
-#include <QtNetwork/QNetworkRequest>
-#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(slotSSLErrors(QNetworkReply*, const QList<QSslError>&)));
-#endif
-
- loadSettings();
-
- // resetting disk cache
- resetDiskCache();
-}
-
-
-void NetworkAccessManager::loadSettings()
-{
- if (ReKonfig::isProxyEnabled())
- {
- QNetworkProxy proxy;
- if (ReKonfig::proxyType() == 0)
- {
- proxy.setType(QNetworkProxy::Socks5Proxy);
- }
- else
- {
- proxy.setType(QNetworkProxy::HttpProxy);
- }
- proxy.setHostName(ReKonfig::proxyHostName());
- proxy.setPort(ReKonfig::proxyPort());
- proxy.setUser(ReKonfig::proxyUserName());
- proxy.setPassword(ReKonfig::proxyPassword());
-
- setProxy(proxy);
- }
-}
-
-
-
-void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
-{
- MainWindow *mainWindow = Application::instance()->mainWindow();
-
- QPointer<KDialog> dialog = new KDialog(mainWindow, Qt::Sheet);
- dialog->setButtons(KDialog::Ok | KDialog::Cancel);
-
- Ui::passwordWidget passwordWidget;
- QWidget widget;
- passwordWidget.setupUi(&widget);
-
- dialog->setMainWidget(&widget);
-
- 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 %1 at %2</qt>",
- Qt::escape(reply->url().toString()),
- Qt::escape(reply->url().toString()) );
- passwordWidget.introLabel->setText(introMessage);
- passwordWidget.introLabel->setWordWrap(true);
-
- if (dialog->exec() == KDialog::Ok)
- {
- auth->setUser(passwordWidget.userNameLineEdit->text());
- auth->setPassword(passwordWidget.passwordLineEdit->text());
- }
- delete dialog;
-}
-
-
-void NetworkAccessManager::resetDiskCache()
-{
- if(!m_diskCache)
- {
- m_diskCache = new QNetworkDiskCache(this);
- QString location = KStandardDirs::locateLocal("cache", "", true);
- kDebug() << location;
-
- m_diskCache->setCacheDirectory(location);
- setCache(m_diskCache);
- }
- else
- {
- QString location = m_diskCache->cacheDirectory();
-// setCache(0);
-// delete m_diskCache;
-
- QDir cacheDir(location + QString("/http") );
- QStringList fileList = cacheDir.entryList();
- foreach(QString str, fileList)
- {
- QFile file(str);
- file.remove();
- }
-
-// m_diskCache = new QNetworkDiskCache(this);
-// m_diskCache->setCacheDirectory(location);
-// setCache(m_diskCache);
- }
-}
-
-
-void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
-{
- MainWindow *mainWindow = Application::instance()->mainWindow();
-
- QPointer<KDialog> dialog = new KDialog(mainWindow, Qt::Sheet);
- dialog->setButtons(KDialog::Ok | KDialog::Cancel);
-
- Ui::proxyWidget proxyWdg;
- 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));
-
- QString introMessage = i18n("<qt>Connect to proxy %1 using:</qt>", Qt::escape(proxy.hostName()) );
- proxyWdg.introLabel->setText(introMessage);
- proxyWdg.introLabel->setWordWrap(true);
-
- if (dialog->exec() == KDialog::Ok)
- {
- auth->setUser(proxyWdg.userNameLineEdit->text());
- auth->setPassword(proxyWdg.passwordLineEdit->text());
- }
- delete dialog;
-}
-
-
-#ifndef QT_NO_OPENSSL
-void NetworkAccessManager::slotSSLErrors(QNetworkReply *reply, const QList<QSslError> &error)
-{
- MainWindow *mainWindow = Application::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 = KMessageBox::warningContinueCancel(mainWindow,
- i18n("SSL Errors:\n\n") + reply->url().toString() + "\n\n" + QString(errors) + "\n\n");
-
- if (ret == KMessageBox::Yes)
- reply->ignoreSslErrors();
-}
-#endif
diff --git a/src/kaccessmanager.h b/src/kaccessmanager.h
deleted file mode 100644
index 8a88594f..00000000
--- a/src/kaccessmanager.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ============================================================
-*
-* This file is a part of the rekonq project
-*
-* Copyright (C) 2007-2008 Trolltech ASA. All rights reserved
-* Copyright (C) 2008-2009 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 3, 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.
-*
-* ============================================================ */
-
-
-#ifndef KACCESSMANAGER_H
-#define KACCESSMANAGER_H
-
-
-// Qt Includes
-#include <QtNetwork/QNetworkAccessManager>
-
-
-class NetworkAccessManager : public QNetworkAccessManager
-{
- Q_OBJECT
-
-public:
- NetworkAccessManager(QObject *parent = 0);
-
- void resetDiskCache();
-
-public slots:
- void loadSettings();
-
-private slots:
- void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
- void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
-
-#ifndef QT_NO_OPENSSL
- void slotSSLErrors(QNetworkReply *reply, const QList<QSslError> &error);
-#endif
-
-};
-
-#endif // KACCESSMANAGER_H
diff --git a/src/networkmanager.cpp b/src/networkmanager.cpp
index 3d6df204..3d4091bb 100644
--- a/src/networkmanager.cpp
+++ b/src/networkmanager.cpp
@@ -54,7 +54,7 @@
NetworkAccessManager::NetworkAccessManager(QObject *parent)
- : AccessManager(parent)
+ : QNetworkAccessManager(parent)
, m_diskCache(0)
{
connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
diff --git a/src/networkmanager.h b/src/networkmanager.h
index 1f1af2ef..3bfa7eff 100644
--- a/src/networkmanager.h
+++ b/src/networkmanager.h
@@ -23,14 +23,16 @@
#define NETWORKMANAGER_H
// KDE Includes
-#include <KIO/AccessManager>
+// #include <KIO/AccessManager>
+
+#include <QtNetwork/QNetworkAccessManager>
// Forward Declarations
class QNetworkDiskCache;
-using namespace KIO;
+// using namespace KIO;
-class NetworkAccessManager : public AccessManager
+class NetworkAccessManager : public QNetworkAccessManager
{
Q_OBJECT
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-03 18:54:33 +0000