From 23b44d0344304499ba8e1f199720202381920827 Mon Sep 17 00:00:00 2001 From: Pierre Rossi Date: Thu, 24 Feb 2011 18:35:20 +0100 Subject: No more static members in the Application class, an rApp shortcut for Application::instance, clean up code switching to use the new shortcut Reviewed by: adjam --- src/bookmarks/bookmarkprovider.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/bookmarks/bookmarkprovider.cpp') diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index e4fb9e3a..9e16f774 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -147,7 +147,7 @@ void BookmarkProvider::removeBookmarkPanel(BookmarksPanel *panel) panel->disconnect(this); if (m_bookmarkPanels.isEmpty()) - Application::bookmarkProvider()->bookmarkManager()->emitChanged(); + rApp->bookmarkProvider()->bookmarkManager()->emitChanged(); } @@ -170,7 +170,7 @@ QList BookmarkProvider::find(const QString &text) { QList list; - KBookmarkGroup root = Application::bookmarkProvider()->rootGroup(); + KBookmarkGroup root = rApp->bookmarkProvider()->rootGroup(); if (!root.isNull()) for (KBookmark bookmark = root.first(); !bookmark.isNull(); bookmark = root.next(bookmark)) find(&list, bookmark, text); @@ -199,8 +199,8 @@ void BookmarkProvider::slotBookmarksChanged() fillBookmarkBar(bookmarkToolBar); } } - if(Application::instance()->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) - Application::instance()->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); + if(rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) + rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); } @@ -232,7 +232,7 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) else { KBookmarkAction *action = new KBookmarkAction(bookmark, m_owner, this); - action->setIcon(Application::iconManager()->iconForUrl( KUrl(bookmark.url()) )); + action->setIcon(rApp->iconManager()->iconForUrl( KUrl(bookmark.url()) )); connect(action, SIGNAL(hovered()), toolBar, SLOT(actionHovered())); toolBar->toolBar()->addAction(action); toolBar->toolBar()->widgetForAction(action)->installEventFilter(toolBar); @@ -248,8 +248,8 @@ void BookmarkProvider::slotPanelChanged() if (panel && panel != sender()) panel->loadFoldedState(); } - if(Application::instance()->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) - Application::instance()->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); + if(rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) + rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); } -- cgit v1.2.1