summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-05-23 01:22:31 +0200
committerAndrea Diamantini <adjam7@gmail.com>2009-05-23 01:22:31 +0200
commit2e66b40db71b99220754c126a8e4e3606c3505f2 (patch)
tree4e1ef645560eb196628f3adadcf1fea7c2aa7267
parentAccess Manager Porting. Compiles && links (diff)
downloadrekonq-2e66b40db71b99220754c126a8e4e3606c3505f2.tar.xz
Fixing new AccessManager. Removed webpage createPlugin slot
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/networkaccessmanager.cpp13
-rw-r--r--src/networkaccessmanager.h6
-rw-r--r--src/webview.cpp20
-rw-r--r--src/webview.h6
5 files changed, 5 insertions, 42 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7fba4466..615a68e5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -54,7 +54,7 @@ TARGET_LINK_LIBRARIES( rekonq
${QT_LIBRARIES}
${QT_QTNETWORK_LIBRARY}
# ${QT_QTWEBKIT_LIBRARY}
- ${QT_QTUITOOLS_LIBRARY}
+# ${QT_QTUITOOLS_LIBRARY}
${KDE4_KUTILS_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KIO_LIBS}
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;
diff --git a/src/networkaccessmanager.h b/src/networkaccessmanager.h
index a61a3483..ae356743 100644
--- a/src/networkaccessmanager.h
+++ b/src/networkaccessmanager.h
@@ -36,20 +36,18 @@ class NetworkAccessManager : public AccessManager
public:
NetworkAccessManager(QObject *parent = 0);
- ~NetworkAccessManager();
public slots:
void loadSettings();
-protected:
- QNetworkReply *createRequest(Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0);
-
private slots:
void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
+
#ifndef QT_NO_OPENSSL
void sslErrors(QNetworkReply *reply, const QList<QSslError> &error);
#endif
+
};
#endif // NETWORKACCESSMANAGER_H
diff --git a/src/webview.cpp b/src/webview.cpp
index 1e713f5a..6887c29b 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -63,7 +63,7 @@
#include <QtWebKit/QWebSettings>
#include <QtWebKit/QWebView>
-#include <QtUiTools/QUiLoader>
+// #include <QtUiTools/QUiLoader>
WebPage::WebPage(QObject *parent)
@@ -78,11 +78,6 @@ WebPage::WebPage(QObject *parent)
}
-WebPage::~WebPage()
-{
-}
-
-
bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type)
{
QString scheme = request.url().scheme();
@@ -197,19 +192,6 @@ KWebPage *WebPage::createWindow(QWebPage::WebWindowType type)
}
-QObject *WebPage::createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues)
-{
- kDebug() << "creating PLUGIN for rekonq ";
- kDebug() << "classId = " << classId;
- kDebug() << "url = " << url;
- kDebug() << "Param Names = " << paramNames;
- kDebug() << "Param Values = " << paramValues;
-
- QUiLoader loader;
- return loader.createWidget(classId, view());
-}
-
-
void WebPage::handleUnsupportedContent(QNetworkReply *reply)
{
// create convenience fake api:// protocol for KDE apidox search and Qt docs
diff --git a/src/webview.h b/src/webview.h
index 6cddf77f..eff5f98b 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -56,7 +56,7 @@ signals:
public:
WebPage(QObject *parent = 0);
- ~WebPage();
+
protected:
bool acceptNavigationRequest(QWebFrame *frame,
@@ -64,10 +64,6 @@ protected:
NavigationType type);
KWebPage *createWindow(QWebPage::WebWindowType type);
- QObject *createPlugin(const QString &classId,
- const QUrl &url,
- const QStringList &paramNames,
- const QStringList &paramValues);
private slots:
void handleUnsupportedContent(QNetworkReply *reply);