summaryrefslogtreecommitdiff
path: root/src/urlbar
diff options
context:
space:
mode:
Diffstat (limited to 'src/urlbar')
-rw-r--r--src/urlbar/bookmarkwidget.cpp6
-rw-r--r--src/urlbar/favoritewidget.cpp2
-rw-r--r--src/urlbar/urlbar.cpp10
-rw-r--r--src/urlbar/urlresolver.cpp4
4 files changed, 11 insertions, 11 deletions
diff --git a/src/urlbar/bookmarkwidget.cpp b/src/urlbar/bookmarkwidget.cpp
index 5beecb4c..c144b8d0 100644
--- a/src/urlbar/bookmarkwidget.cpp
+++ b/src/urlbar/bookmarkwidget.cpp
@@ -30,7 +30,7 @@
// Local includes
#include "application.h"
-#include "bookmarkprovider.h"
+#include "bookmarkmanager.h"
#include "bookmarkowner.h"
// KDE Includes
@@ -119,7 +119,7 @@ void BookmarkWidget::accept()
if (!m_bookmark->isNull() && m_name->text() != m_bookmark->fullText())
{
m_bookmark->setFullText(m_name->text());
- rApp->bookmarkProvider()->bookmarkManager()->emitChanged();
+ rApp->bookmarkManager()->emitChanged();
}
close();
}
@@ -127,7 +127,7 @@ void BookmarkWidget::accept()
void BookmarkWidget::removeBookmark()
{
- rApp->bookmarkProvider()->bookmarkOwner()->deleteBookmark(*m_bookmark);
+ rApp->bookmarkManager()->owner()->deleteBookmark(*m_bookmark);
close();
emit updateIcon();
diff --git a/src/urlbar/favoritewidget.cpp b/src/urlbar/favoritewidget.cpp
index da94410d..f72deace 100644
--- a/src/urlbar/favoritewidget.cpp
+++ b/src/urlbar/favoritewidget.cpp
@@ -33,7 +33,7 @@
// Local includes
#include "application.h"
-#include "bookmarkprovider.h"
+#include "bookmarkmanager.h"
#include "bookmarkowner.h"
// KDE Includes
diff --git a/src/urlbar/urlbar.cpp b/src/urlbar/urlbar.cpp
index 9460cf8a..e95c5c33 100644
--- a/src/urlbar/urlbar.cpp
+++ b/src/urlbar/urlbar.cpp
@@ -41,7 +41,7 @@
#include "webpage.h"
#include "webview.h"
#include "completionwidget.h"
-#include "bookmarkprovider.h"
+#include "bookmarkmanager.h"
#include "bookmarkowner.h"
#include "bookmarkwidget.h"
#include "iconmanager.h"
@@ -397,11 +397,11 @@ void UrlBar::showBookmarkInfo(QPoint pos)
if (_tab->url().scheme() == QL1S("about"))
return;
- KBookmark bookmark = rApp->bookmarkProvider()->bookmarkForUrl(_tab->url());
+ KBookmark bookmark = rApp->bookmarkManager()->bookmarkForUrl(_tab->url());
if (bookmark.isNull())
{
- bookmark = rApp->bookmarkProvider()->bookmarkOwner()->bookmarkCurrentPage();
+ bookmark = rApp->bookmarkManager()->owner()->bookmarkCurrentPage();
updateRightIcons();
}
else
@@ -549,7 +549,7 @@ IconButton *UrlBar::addRightIcon(UrlBar::icon ic)
rightIcon->setToolTip(i18n("Show SSL Info"));
break;
case UrlBar::BK:
- if (rApp->bookmarkProvider()->bookmarkForUrl(_tab->url()).isNull())
+ if (rApp->bookmarkManager()->bookmarkForUrl(_tab->url()).isNull())
{
rightIcon->setIcon(KIcon("bookmarks").pixmap(32, 32, QIcon::Disabled));
rightIcon->setToolTip(i18n("Bookmark this page"));
@@ -678,7 +678,7 @@ void UrlBar::bookmarkContextMenu(QPoint pos)
KMenu menu(this);
QAction *qa;
- if (!rApp->bookmarkProvider()->bookmarkForUrl(_tab->url()).isNull())
+ if (!rApp->bookmarkManager()->bookmarkForUrl(_tab->url()).isNull())
{
qa = new KAction(KIcon("bookmarks"), i18n("Edit Bookmark"), this);
connect(qa, SIGNAL(triggered(bool)), this, SLOT(showBookmarkDialog()));
diff --git a/src/urlbar/urlresolver.cpp b/src/urlbar/urlresolver.cpp
index 073cc728..425f233f 100644
--- a/src/urlbar/urlresolver.cpp
+++ b/src/urlbar/urlresolver.cpp
@@ -30,7 +30,7 @@
// Local Includes
#include "historymanager.h"
-#include "bookmarkprovider.h"
+#include "bookmarkmanager.h"
#include "searchengine.h"
// KDE Includes
@@ -352,7 +352,7 @@ void UrlResolver::computeHistory()
// bookmarks
void UrlResolver::computeBookmarks()
{
- QList<KBookmark> found = rApp->bookmarkProvider()->find(_typedString);
+ QList<KBookmark> found = rApp->bookmarkManager()->find(_typedString);
Q_FOREACH(const KBookmark & b, found)
{
UrlSearchItem gItem(UrlSearchItem::Bookmark, b.url().url(), b.fullText());