Fixing conflicts merging master

git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/playground/network/rekonq@964593 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

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
+