summaryrefslogtreecommitdiff
path: root/src/webpage.h
diff options
context:
space:
mode:
authorPanagiotis Papadopoulos <pano_90@gmx.net>2010-04-21 13:34:20 +0200
committerPanagiotis Papadopoulos <pano_90@gmx.net>2010-04-21 13:34:20 +0200
commitf9153663cb8210ac4d6e7055838344839b4e19b6 (patch)
treeb70233b32eadfbebff062c0000f007ca2f99d732 /src/webpage.h
parentMerge branch 'master' of git://gitorious.org/rekonq/mainline into i18n (diff)
parentNebulon's patch. (diff)
downloadrekonq-f9153663cb8210ac4d6e7055838344839b4e19b6.tar.xz
Merge branch 'master' of git://gitorious.org/rekonq/mainline into i18n
Diffstat (limited to 'src/webpage.h')
-rw-r--r--src/webpage.h22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/webpage.h b/src/webpage.h
index 9169ad60..9583cc22 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -6,7 +6,8 @@
* Copyright (C) 2008 Dirk Mueller <mueller@kde.org>
* Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>
* Copyright (C) 2008 Michael Howell <mhowell123@gmail.com>
-* Copyright (C) 2008-2009 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2008-2010 by Andrea Diamantini <adjam7 at gmail dot com>
+* Copyright (C) 2010 by Matthieu Gicquel <matgic78 at gmail dot com>
*
*
* This program is free software; you can redistribute it and/or
@@ -33,7 +34,10 @@
// Local Includes
+#include "rekonqprivate_export.h"
#include "protocolhandler.h"
+#include "newtabpage.h"
+#include "websslinfo.h"
// KDE Includes
#include <KWebPage>
@@ -46,18 +50,18 @@ class QWebFrame;
class QNetworkReply;
-class WebPage : public KWebPage
+class REKONQ_TESTS_EXPORT WebPage : public KWebPage
{
Q_OBJECT
public:
- explicit WebPage(QObject *parent = 0);
+ explicit WebPage(QWidget *parent = 0);
~WebPage();
public slots:
- void manageNetworkErrors(QNetworkReply *reply);
virtual void downloadRequest(const QNetworkRequest &request);
void downloadAllContentsWithKGet();
+
protected:
WebPage *createWindow(WebWindowType type);
@@ -69,13 +73,15 @@ protected Q_SLOTS:
virtual void handleUnsupportedContent(QNetworkReply *reply);
private slots:
+ void manageNetworkErrors(QNetworkReply *reply);
void loadFinished(bool);
-
+ void showSSLInfo();
+
private:
QString errorPage(QNetworkReply *);
-
- QUrl m_requestedUrl;
- ProtocolHandler m_protHandler;
+
+ ProtocolHandler _protHandler;
+ WebSslInfo _sslInfo;
};
#endif