From 7e7a020fe8027e6c06777586f1f9da9ea5619bfb Mon Sep 17 00:00:00 2001 From: Jekyll Wu Date: Thu, 20 Oct 2011 22:53:18 +0800 Subject: [PATCH] Minor change on coding style --- src/BookmarkHandler.cpp | 25 +++++++++---------------- src/BookmarkHandler.h | 4 ++-- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/BookmarkHandler.cpp b/src/BookmarkHandler.cpp index cda618350..57da4a708 100644 --- a/src/BookmarkHandler.cpp +++ b/src/BookmarkHandler.cpp @@ -61,13 +61,10 @@ BookmarkHandler::BookmarkHandler( KActionCollection* collection, manager->setUpdate( true ); - if (toplevel) { - m_bookmarkMenu = new KBookmarkMenu( manager, this, m_menu, - collection ); - } else { - m_bookmarkMenu = new KBookmarkMenu( manager, this, m_menu, - NULL); - } + if (toplevel) + m_bookmarkMenu = new KBookmarkMenu( manager, this, m_menu, collection ); + else + m_bookmarkMenu = new KBookmarkMenu( manager, this, m_menu, NULL); } BookmarkHandler::~BookmarkHandler() @@ -75,7 +72,7 @@ BookmarkHandler::~BookmarkHandler() delete m_bookmarkMenu; } -void BookmarkHandler::openBookmark( const KBookmark & bm, Qt::MouseButtons, Qt::KeyboardModifiers ) +void BookmarkHandler::openBookmark( const KBookmark& bm, Qt::MouseButtons, Qt::KeyboardModifiers ) { emit openUrl( bm.url() ); } @@ -85,7 +82,7 @@ void BookmarkHandler::openFolderinTabs( const KBookmarkGroup& group ) } bool BookmarkHandler::enableOption(BookmarkOption option ) const { - if(option == ShowAddBookmark || option == ShowEditBookmark) + if ( option == ShowAddBookmark || option == ShowEditBookmark ) return m_toplevel; else return KBookmarkOwner::enableOption(option); @@ -99,13 +96,9 @@ QString BookmarkHandler::currentUrl() const QString BookmarkHandler::urlForView(ViewProperties* view) const { if ( view ) - { return view->url().prettyUrl(); - } else - { - return QString(); - } + return QString(); } QString BookmarkHandler::currentTitle() const @@ -115,7 +108,7 @@ QString BookmarkHandler::currentTitle() const QString BookmarkHandler::titleForView(ViewProperties* view) const { - const KUrl& url = view ? view->url() : KUrl(); + const KUrl& url = view ? view->url() : KUrl(); if ( url.isLocalFile() ) { QString path = url.path(); @@ -146,7 +139,7 @@ QList > BookmarkHandler::currentBookmarkList() const QList > list; QListIterator iter( m_views ); - + while ( iter.hasNext() ) { ViewProperties* next = iter.next(); diff --git a/src/BookmarkHandler.h b/src/BookmarkHandler.h index 451d56124..f8f51e0fe 100644 --- a/src/BookmarkHandler.h +++ b/src/BookmarkHandler.h @@ -83,7 +83,7 @@ public: /** * Returns the menu which this bookmark handler inserts its actions into. */ - KMenu *menu() const { return m_menu; } + KMenu* menu() const { return m_menu; } QList views() const; ViewProperties* activeView() const; @@ -114,7 +114,7 @@ signals: void openUrls( const QList& urls ); private slots: - void openBookmark( const KBookmark & bm, Qt::MouseButtons, Qt::KeyboardModifiers ); + void openBookmark( const KBookmark& bm, Qt::MouseButtons, Qt::KeyboardModifiers ); private: QString titleForView( ViewProperties* view ) const;