summaryrefslogtreecommitdiff
path: root/src/webview.h
diff options
context:
space:
mode:
authoradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-06 23:02:43 +0000
committeradjam <adjam@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-05-06 23:02:43 +0000
commit601ebdf6c4faea76016cf0d87d50abc260ca1569 (patch)
treecf601630c933447f2a369f6245f9a04b9a46b08a /src/webview.h
parentTypographical and grammar corrections (diff)
parentEBN Krazy fixes. 1st round.. (diff)
downloadrekonq-601ebdf6c4faea76016cf0d87d50abc260ca1569.tar.xz
Fixing conflicts merging master
git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'src/webview.h')
-rw-r--r--src/webview.h37
1 files changed, 12 insertions, 25 deletions
diff --git a/src/webview.h b/src/webview.h
index c6ca17f8..3742a36d 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -31,12 +31,17 @@
#include <QWebPage>
// Forward Declarations
+class MainWindow;
+class Application;
class KActionCollection;
class QWebFrame;
+class QAuthenticator;
class QMouseEvent;
+class QNetworkProxy;
class QNetworkReply;
+class QSslError;
class WebPage : public QWebPage
@@ -70,7 +75,6 @@ private:
// set the webview mousepressedevent
Qt::KeyboardModifiers m_keyboardModifiers;
Qt::MouseButtons m_pressedButtons;
- bool m_openInNewTab;
KUrl m_loadingUrl;
};
@@ -91,22 +95,10 @@ public:
KActionCollection* webActions();
// inline
- WebPage *webPage() const
- {
- return m_page;
- }
- KUrl url() const
- {
- return KUrl(QWebView::url());
- }
- QString lastStatusBarText() const
- {
- return m_statusBarText;
- }
- int progress() const
- {
- return m_progress;
- }
+ WebPage *webPage() const { return m_page; }
+ KUrl url() const { return KUrl(QWebView::url()); }
+ QString lastStatusBarText() const { return m_statusBarText; }
+ int progress() const { return m_progress; }
signals:
// switching tabs
@@ -126,15 +118,9 @@ protected:
void keyPressEvent(QKeyEvent *event);
private slots:
- void setProgress(int progress)
- {
- m_progress = progress;
- }
+ void setProgress(int progress) { m_progress = progress; }
void loadFinished();
- void setStatusBarText(const QString &string)
- {
- m_statusBarText = string;
- }
+ void setStatusBarText(const QString &string) { m_statusBarText = string; }
void downloadRequested(const QNetworkRequest &request);
void openLinkInNewTab();
@@ -148,3 +134,4 @@ private:
};
#endif
+