diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-12-13 17:04:31 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-12-13 17:04:31 +0100 |
| commit | f126bc9416cb4769721361354265cadcc742fc8a (patch) | |
| tree | 9460afb61bd12edc08cd69c8bc43871947c42343 /src/webview.h | |
| parent | Merge commit 'refs/merge-requests/67' of git://gitorious.org/rekonq/mainline ... (diff) | |
| parent | walletwidget on top of the webview (not over) (diff) | |
| download | rekonq-f126bc9416cb4769721361354265cadcc742fc8a.tar.xz | |
Merge commit 'refs/merge-requests/68' of git://gitorious.org/rekonq/mainline into m68
Conflicts:
src/walletwidget.cpp
Diffstat (limited to 'src/webview.h')
| -rw-r--r-- | src/webview.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/webview.h b/src/webview.h index 39cc51da..18ea66ad 100644 --- a/src/webview.h +++ b/src/webview.h @@ -45,7 +45,7 @@ class WebView : public KWebView Q_OBJECT public: - explicit WebView(QWidget *parent = 0); + explicit WebView(QWidget *parent = 0, QWidget *messageWidget = 0); ~WebView(); WebPage *page(); @@ -53,7 +53,6 @@ public: QString lastStatusBarText() const; int progress(); QPoint mousePos(); - QWidget *walletBar(); protected: void contextMenuEvent(QContextMenuEvent *event); @@ -77,7 +76,7 @@ private slots: private: WebPage *m_page; - WalletWidget *m_walletBar; + QWidget *m_messageWidget; int m_progress; QString m_statusBarText; QPoint m_mousePos; |