summaryrefslogtreecommitdiff
path: root/src/bookmarks
diff options
context:
space:
mode:
Diffstat (limited to 'src/bookmarks')
-rw-r--r--src/bookmarks/bookmarkowner.cpp2
-rw-r--r--src/bookmarks/bookmarkscontextmenu.h6
-rw-r--r--src/bookmarks/bookmarksmanager.cpp3
-rw-r--r--src/bookmarks/bookmarkstoolbar.h7
4 files changed, 10 insertions, 8 deletions
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index f47b978d..d9df6e82 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -163,7 +163,7 @@ void BookmarkOwner::openBookmarkFolder(const KBookmark &bookmark)
return;
}
- foreach (KUrl url, urlList)
+ Q_FOREACH(const KUrl &url, urlList)
{
emit openUrl(url, Rekonq::NewFocusedTab);
}
diff --git a/src/bookmarks/bookmarkscontextmenu.h b/src/bookmarks/bookmarkscontextmenu.h
index 424f8da4..a6691fdd 100644
--- a/src/bookmarks/bookmarkscontextmenu.h
+++ b/src/bookmarks/bookmarkscontextmenu.h
@@ -24,8 +24,8 @@
* ============================================================ */
-#ifndef BOOKMARKCONTEXTMENU_H
-#define BOOKMARKCONTEXTMENU_H
+#ifndef BOOKMARKS_CONTEXT_MENU_H
+#define BOOKMARKS_CONTEXT_MENU_H
// KDE Includes
#include <KBookmarkMenu>
@@ -50,4 +50,4 @@ private:
BookmarkOwner *bmOwner;
};
-#endif // BOOKMARKCONTEXTMENU_H
+#endif // BOOKMARKS_CONTEXT_MENU_H
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index dc545698..ea7b313d 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -297,11 +297,10 @@ void BookmarkProvider::slotPanelChanged()
KBookmark BookmarkProvider::bookmarkForUrl(const KUrl &url)
{
- KBookmark found;
-
KBookmarkGroup root = rootGroup();
if (root.isNull())
{
+ KBookmark found;
return found;
}
diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h
index 5991a032..54a430e3 100644
--- a/src/bookmarks/bookmarkstoolbar.h
+++ b/src/bookmarks/bookmarkstoolbar.h
@@ -30,8 +30,6 @@
// KDE Includes
#include <KBookmarkMenu>
-#include <KToolBar>
-
/**
* This class represent the rekonq bookmarks menu.
@@ -69,6 +67,11 @@ private:
// ------------------------------------------------------------------------------
+
+// KDE Includes
+#include <KToolBar>
+
+
/**
* This class manage the bookmark toolbar.
* Some events from the toolbar are handled to allow the drag and drop