diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-12-15 17:01:04 +0100 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-12-15 17:01:04 +0100 |
| commit | 1be07ceabb90b9ca510dd6ff3f2f3bdb6e448543 (patch) | |
| tree | 8897b7fd209889561a5047f4fdc9edd95f61ee38 /src/tabbar.cpp | |
| parent | Merge commit 'refs/merge-requests/71' of git://gitorious.org/rekonq/mainline ... (diff) | |
| parent | factor out WebTab class from WebView (diff) | |
| download | rekonq-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/tabbar.cpp')
| -rw-r--r-- | src/tabbar.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tabbar.cpp b/src/tabbar.cpp index 1246d669..ada879a3 100644 --- a/src/tabbar.cpp +++ b/src/tabbar.cpp @@ -36,7 +36,7 @@ #include "application.h" #include "mainwindow.h" #include "urlbar.h" -#include "webview.h" +#include "webtab.h" #include "websnap.h" #include "mainview.h" @@ -144,8 +144,8 @@ void TabBar::showTabPreview(int tab) { MainView *mv = qobject_cast<MainView *>(parent()); - WebView *view = mv->webView(tab); - WebView *currentView = mv->webView(currentIndex()); + WebTab *view = mv->webTab(tab); + WebTab *currentView = mv->webTab(currentIndex()); // should fix bug #212219 if(!currentView) |