summaryrefslogtreecommitdiff
path: root/src/mainwindow.h
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2009-12-15 17:01:04 +0100
committerAndrea Diamantini <adjam7@gmail.com>2009-12-15 17:01:04 +0100
commit1be07ceabb90b9ca510dd6ff3f2f3bdb6e448543 (patch)
tree8897b7fd209889561a5047f4fdc9edd95f61ee38 /src/mainwindow.h
parentMerge commit 'refs/merge-requests/71' of git://gitorious.org/rekonq/mainline ... (diff)
parentfactor out WebTab class from WebView (diff)
downloadrekonq-1be07ceabb90b9ca510dd6ff3f2f3bdb6e448543.tar.xz
I tried a bit, but this is not working pretty well :(
We are actually creating two widget for request. I'll merge it anyway to let you fix it :) Merge commit 'refs/merge-requests/72' of git://gitorious.org/rekonq/mainline into m72 Conflicts: src/mainview.cpp src/webview.cpp
Diffstat (limited to 'src/mainwindow.h')
-rw-r--r--src/mainwindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h
index f07a46da..5360d264 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -49,7 +49,7 @@ class FindBar;
class SidePanel;
class BookmarksPanel;
class WebInspectorDock;
-class WebView;
+class WebTab;
class MainView;
@@ -67,7 +67,7 @@ public:
~MainWindow();
MainView *mainView() const;
- WebView *currentTab() const;
+ WebTab *currentTab() const;
QAction *actionByName(const QString name);
virtual QSize sizeHint() const;
virtual KActionCollection *actionCollection () const;