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/bookmarks | |
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/bookmarks')
-rw-r--r-- | src/bookmarks/bookmarksmanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp index 1c881e08..6442192a 100644 --- a/src/bookmarks/bookmarksmanager.cpp +++ b/src/bookmarks/bookmarksmanager.cpp @@ -32,6 +32,7 @@ // Local Includes #include "mainwindow.h" +#include "webtab.h" #include "webview.h" // KDE Includes @@ -88,7 +89,7 @@ QString BookmarkOwner::currentUrl() const QString BookmarkOwner::currentTitle() const { - return Application::instance()->mainWindow()->currentTab()->title(); + return Application::instance()->mainWindow()->currentTab()->view()->title(); } |