From 82167d2422a4b6e3071dca68cf65a66e1da41ab4 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Sun, 17 Jul 2011 16:46:24 +0200 Subject: A round of the "new" astyle 2.01... --- src/bookmarks/bookmarkprovider.cpp | 68 +++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'src/bookmarks/bookmarkprovider.cpp') diff --git a/src/bookmarks/bookmarkprovider.cpp b/src/bookmarks/bookmarkprovider.cpp index fc351320..0d1b1ada 100644 --- a/src/bookmarks/bookmarkprovider.cpp +++ b/src/bookmarks/bookmarkprovider.cpp @@ -57,7 +57,7 @@ BookmarkProvider::BookmarkProvider(QObject *parent) m_manager = KBookmarkManager::userBookmarksManager(); const QString bookmarksFile = KStandardDirs::locateLocal("data", QString::fromLatin1("konqueror/bookmarks.xml")); - if (!QFile::exists(bookmarksFile)) + if(!QFile::exists(bookmarksFile)) { kDebug() << "copying of defaultbookmarks.xbel ..."; @@ -91,21 +91,21 @@ BookmarkProvider::~BookmarkProvider() KActionMenu* BookmarkProvider::bookmarkActionMenu(QWidget *parent) { kDebug() << "creating a bookmarks action menu..."; - + KMenu *menu = new KMenu(parent); KActionMenu *bookmarkActionMenu = new KActionMenu(menu); bookmarkActionMenu->setMenu(menu); bookmarkActionMenu->setText(i18n("&Bookmarks")); BookmarkMenu *bMenu = new BookmarkMenu(m_manager, m_owner, menu, m_actionCollection); bMenu->setParent(menu); - + return bookmarkActionMenu; } void BookmarkProvider::registerBookmarkBar(BookmarkToolBar *toolbar) { - if (m_bookmarkToolBars.contains(toolbar)) + if(m_bookmarkToolBars.contains(toolbar)) return; m_bookmarkToolBars.append(toolbar); @@ -120,7 +120,7 @@ void BookmarkProvider::removeBookmarkBar(BookmarkToolBar *toolbar) void BookmarkProvider::registerBookmarkPanel(BookmarksPanel *panel) { - if (panel && !m_bookmarkPanels.contains(panel)) + if(panel && !m_bookmarkPanels.contains(panel)) { m_bookmarkPanels.append(panel); connect(panel, SIGNAL(expansionChanged()), this, SLOT(slotPanelChanged())); @@ -130,13 +130,13 @@ void BookmarkProvider::registerBookmarkPanel(BookmarksPanel *panel) void BookmarkProvider::removeBookmarkPanel(BookmarksPanel *panel) { - if (!panel) + if(!panel) return; m_bookmarkPanels.removeOne(panel); panel->disconnect(this); - if (m_bookmarkPanels.isEmpty()) + if(m_bookmarkPanels.isEmpty()) rApp->bookmarkProvider()->bookmarkManager()->emitChanged(); } @@ -144,7 +144,7 @@ void BookmarkProvider::removeBookmarkPanel(BookmarksPanel *panel) QAction* BookmarkProvider::actionByName(const QString &name) { QAction *action = m_actionCollection->action(name); - if (action) + if(action) return action; return new QAction(this); } @@ -161,8 +161,8 @@ QList BookmarkProvider::find(const QString &text) QList list; KBookmarkGroup root = rApp->bookmarkProvider()->rootGroup(); - if (!root.isNull()) - for (KBookmark bookmark = root.first(); !bookmark.isNull(); bookmark = root.next(bookmark)) + if(!root.isNull()) + for(KBookmark bookmark = root.first(); !bookmark.isNull(); bookmark = root.next(bookmark)) find(&list, bookmark, text); return list; @@ -172,7 +172,7 @@ QList BookmarkProvider::find(const QString &text) KBookmark BookmarkProvider::bookmarkForUrl(const KUrl &url) { KBookmarkGroup root = rootGroup(); - if (root.isNull()) + if(root.isNull()) return KBookmark(); return bookmarkForUrl(root, url); @@ -181,15 +181,15 @@ KBookmark BookmarkProvider::bookmarkForUrl(const KUrl &url) void BookmarkProvider::slotBookmarksChanged() { - foreach(BookmarkToolBar *bookmarkToolBar, m_bookmarkToolBars) + foreach(BookmarkToolBar * bookmarkToolBar, m_bookmarkToolBars) { - if (bookmarkToolBar) + if(bookmarkToolBar) { bookmarkToolBar->toolBar()->clear(); fillBookmarkBar(bookmarkToolBar); } } - if (rApp->mainWindow() && rApp->mainWindow()->currentTab() && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) + if(rApp->mainWindow() && rApp->mainWindow()->currentTab() && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); } @@ -197,25 +197,25 @@ void BookmarkProvider::slotBookmarksChanged() void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) { KBookmarkGroup root = m_manager->toolbar(); - if (root.isNull()) + if(root.isNull()) return; - for (KBookmark bookmark = root.first(); !bookmark.isNull(); bookmark = root.next(bookmark)) + for(KBookmark bookmark = root.first(); !bookmark.isNull(); bookmark = root.next(bookmark)) { - if (bookmark.isGroup()) + if(bookmark.isGroup()) { KBookmarkActionMenu *menuAction = new KBookmarkActionMenu(bookmark.toGroup(), this); menuAction->setDelayed(false); BookmarkMenu *bMenu = new BookmarkMenu(bookmarkManager(), bookmarkOwner(), menuAction->menu(), bookmark.address()); bMenu->setParent(menuAction->menu()); - + connect(menuAction->menu(), SIGNAL(aboutToShow()), toolBar, SLOT(menuDisplayed())); connect(menuAction->menu(), SIGNAL(aboutToHide()), toolBar, SLOT(menuHidden())); toolBar->toolBar()->addAction(menuAction); toolBar->toolBar()->widgetForAction(menuAction)->installEventFilter(toolBar); } - else if (bookmark.isSeparator()) + else if(bookmark.isSeparator()) { toolBar->toolBar()->addSeparator(); } @@ -233,38 +233,38 @@ void BookmarkProvider::fillBookmarkBar(BookmarkToolBar *toolBar) void BookmarkProvider::slotPanelChanged() { - foreach(BookmarksPanel *panel, m_bookmarkPanels) + foreach(BookmarksPanel * panel, m_bookmarkPanels) { - if (panel && panel != sender()) + if(panel && panel != sender()) panel->loadFoldedState(); } - if (rApp->mainWindow() && rApp->mainWindow()->currentTab() && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) + if(rApp->mainWindow() && rApp->mainWindow()->currentTab() && rApp->mainWindow()->currentTab()->url().toMimeDataString().contains("about:bookmarks")) rApp->loadUrl(KUrl("about:bookmarks"), Rekonq::CurrentTab); } void BookmarkProvider::find(QList *list, const KBookmark &bookmark, const QString &text) { - if (bookmark.isGroup()) + if(bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); - for (KBookmark bm = group.first(); !bm.isNull(); bm = group.next(bm)) + for(KBookmark bm = group.first(); !bm.isNull(); bm = group.next(bm)) find(list, bm, text); } else { QStringList words = text.split(' '); bool matches = true; - foreach(const QString &word, words) + foreach(const QString & word, words) { - if (!bookmark.url().url().contains(word, Qt::CaseInsensitive) + if(!bookmark.url().url().contains(word, Qt::CaseInsensitive) && !bookmark.fullText().contains(word, Qt::CaseInsensitive)) { matches = false; break; } } - if (matches) + if(matches) *list << bookmark; } } @@ -274,18 +274,18 @@ KBookmark BookmarkProvider::bookmarkForUrl(const KBookmark &bookmark, const KUrl { KBookmark found; - if (bookmark.isGroup()) + if(bookmark.isGroup()) { KBookmarkGroup group = bookmark.toGroup(); KBookmark bookmark = group.first(); - while (!bookmark.isNull() && found.isNull()) + while(!bookmark.isNull() && found.isNull()) { found = bookmarkForUrl(bookmark, url); bookmark = group.next(bookmark); } } - else if (!bookmark.isSeparator() && bookmark.url() == url) + else if(!bookmark.isSeparator() && bookmark.url() == url) { found = bookmark; } @@ -297,19 +297,19 @@ KBookmark BookmarkProvider::bookmarkForUrl(const KBookmark &bookmark, const KUrl void BookmarkProvider::copyBookmarkGroup(const KBookmarkGroup &groupToCopy, KBookmarkGroup destGroup) { KBookmark bookmark = groupToCopy.first(); - while (!bookmark.isNull()) + while(!bookmark.isNull()) { - if (bookmark.isGroup()) + if(bookmark.isGroup()) { KBookmarkGroup newDestGroup = destGroup.createNewFolder(bookmark.text()); - if (bookmark.toGroup().isToolbarGroup()) + if(bookmark.toGroup().isToolbarGroup()) { newDestGroup.internalElement().setAttribute("toolbar", "yes"); newDestGroup.setIcon("bookmark-toolbar"); } copyBookmarkGroup(bookmark.toGroup(), newDestGroup); } - else if (bookmark.isSeparator()) + else if(bookmark.isSeparator()) { destGroup.createNewSeparator(); } -- cgit v1.2.1