summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
authorAndrea Diamantini <adjam7@gmail.com>2012-11-11 09:40:36 +0100
committerAndrea Diamantini <adjam7@gmail.com>2012-12-10 02:48:06 +0100
commit4f1dae7834becb7d7105a0cc9945d9a0c04383b8 (patch)
treebe823d81fe7ab1cc199b11bc5b32823d3cc9bdf7 /src/urlbar
parentClean up previous commit about adblock and fix enable/disable feature (diff)
downloadrekonq-4f1dae7834becb7d7105a0cc9945d9a0c04383b8.tar.xz
WARNING: BIG COMMIT
This commit reviews and partially fix the Q/K action mess in rekonq code. We now store actions in different actioncollections (one for each tab && one for each window). Related to this code review, you can find also fixes for some triggered actions NOT working (well) before: - fullscreen - bookmark all tabs - new (clean) tab
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/urlbar.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 9321d442..2b32738d 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -40,7 +40,6 @@
// Local Includes
#include "adblockmanager.h"
#include "bookmarkmanager.h"
-#include "bookmarkowner.h" // FIXME: Why is this needed? Why everything interesting in BookmarkManager is in its owner?
#include "iconmanager.h"
#include "adblockwidget.h"
@@ -726,7 +725,7 @@ void UrlBar::manageBookmarks()
if (bookmark.isNull())
{
- bookmark = BookmarkManager::self()->owner()->bookmarkCurrentPage();
+ bookmark = BookmarkManager::self()->bookmarkCurrentPage();
}
// calculate position