Kitchen sink clean up

- astyle
- copyrights
- (some) includes

5 files changed, 26 insertions, 25 deletions

diff --git a/src/bookmarks/bookmarkmanager.cpp b/src/bookmarks/bookmarkmanager.cpp
index 165966d2..43f4dd3a 100644
--- a/src/bookmarks/bookmarkmanager.cpp
+++ b/src/bookmarks/bookmarkmanager.cpp
@@ -69,12 +69,12 @@ BookmarkManager::BookmarkManager(QObject *parent)
         delete tempManager;
     }
 
-    connect(m_manager, SIGNAL(changed(QString,QString)), this, SLOT(slotBookmarksChanged()));
+    connect(m_manager, SIGNAL(changed(QString, QString)), this, SLOT(slotBookmarksChanged()));
 
     // setup menu
     m_owner = new BookmarkOwner(m_manager, this);
-    connect(m_owner, SIGNAL(openUrl(KUrl,Rekonq::OpenType)),
-            this, SIGNAL(openUrl(KUrl,Rekonq::OpenType)));
+    connect(m_owner, SIGNAL(openUrl(KUrl, Rekonq::OpenType)),
+            this, SIGNAL(openUrl(KUrl, Rekonq::OpenType)));
 
     KAction *a = KStandardAction::addBookmark(m_owner, SLOT(bookmarkCurrentPage()), this);
     m_actionCollection->addAction(QL1S("rekonq_add_bookmark"), a);
diff --git a/src/bookmarks/bookmarkowner.cpp b/src/bookmarks/bookmarkowner.cpp
index 6cea5e9c..3aa3b8d3 100644
--- a/src/bookmarks/bookmarkowner.cpp
+++ b/src/bookmarks/bookmarkowner.cpp
@@ -50,13 +50,13 @@
 #include "../config-nepomuk.h"
 
 #ifdef HAVE_NEPOMUK
-    // Local Nepomuk Includes
-    #include "resourcelinkdialog.h"
+// Local Nepomuk Includes
+#include "resourcelinkdialog.h"
 
-    // Nepomuk Includes
-    #include <Nepomuk/Resource>
-    #include <Nepomuk/Vocabulary/NFO>
-#endif 
+// Nepomuk Includes
+#include <Nepomuk/Resource>
+#include <Nepomuk/Vocabulary/NFO>
+#endif
 
 
 BookmarkOwner::BookmarkOwner(KBookmarkManager *manager, QObject *parent)
@@ -225,8 +225,8 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark)
 #ifdef HAVE_NEPOMUK
         Nepomuk::Resource nfoResource;
         nfoResource = ((QUrl)currentUrl());
-        nfoResource.addType( Nepomuk::Vocabulary::NFO::Website() );
-        nfoResource.setLabel( currentTitle() );
+        nfoResource.addType(Nepomuk::Vocabulary::NFO::Website());
+        nfoResource.setLabel(currentTitle());
 #endif
     }
 
@@ -234,7 +234,7 @@ KBookmark BookmarkOwner::bookmarkCurrentPage(const KBookmark &bookmark)
     if (!bookmark.isNull())
         parent.moveBookmark(newBk, bookmark);
 
-        m_manager->emitChanged(parent);
+    m_manager->emitChanged(parent);
     return newBk;
 }
 
@@ -322,13 +322,13 @@ void BookmarkOwner::editBookmark(KBookmark bookmark)
 
 
 #ifdef HAVE_NEPOMUK
-    void BookmarkOwner::fancyBookmark(KBookmark bookmark)
-    {
-        Nepomuk::Resource nfoResource = (KUrl)bookmark.url();
-        Nepomuk::ResourceLinkDialog r( nfoResource );
-        r.exec();
+void BookmarkOwner::fancyBookmark(KBookmark bookmark)
+{
+    Nepomuk::Resource nfoResource = (KUrl)bookmark.url();
+    Nepomuk::ResourceLinkDialog r(nfoResource);
+    r.exec();
 
-    }
+}
 #endif
 
 bool BookmarkOwner::deleteBookmark(const KBookmark &bookmark)
diff --git a/src/bookmarks/bookmarkscontextmenu.cpp b/src/bookmarks/bookmarkscontextmenu.cpp
index b49f6883..cd2ab5c7 100644
--- a/src/bookmarks/bookmarkscontextmenu.cpp
+++ b/src/bookmarks/bookmarkscontextmenu.cpp
@@ -3,6 +3,7 @@
 * This file is a part of the rekonq project
 *
 * Copyright (C) 2010 by Yoann Laissus <yoann dot laissus at gmail dot com>
+* Copyright (c) 2011-2012 by Phaneendra Hegde <pnh.pes@gmail.com>
 *
 *
 * This program is free software; you can redistribute it and/or
@@ -71,7 +72,7 @@ void BookmarksContextMenu::addBookmarkActions()
 
     addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::EDIT));
 #ifdef HAVE_NEPOMUK
-    addAction(m_bmOwner->createAction(bookmark(),BookmarkOwner::FANCYBOOKMARK));
+    addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::FANCYBOOKMARK));
 #endif
     addAction(m_bmOwner->createAction(bookmark(), BookmarkOwner::DELETE));
 }
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index 482e829f..ad8af326 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -164,7 +164,7 @@ BookmarkToolBar::BookmarkToolBar(KToolBar *toolBar, QObject *parent)
 {
     toolBar->setContextMenuPolicy(Qt::CustomContextMenu);
     connect(toolBar, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenu(QPoint)));
-    connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString,QString)), this, SLOT(hideMenu()));
+    connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)), this, SLOT(hideMenu()));
     toolBar->setAcceptDrops(true);
     toolBar->installEventFilter(this);
     toolBar->setShortcutEnabled(false);
@@ -290,8 +290,8 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event)
     {
         QDragEnterEvent *dragEvent = static_cast<QDragEnterEvent*>(event);
         if (dragEvent->mimeData()->hasFormat(BookmarkManager::bookmark_mime_type())
-            || dragEvent->mimeData()->hasFormat("text/uri-list")
-            || dragEvent->mimeData()->hasFormat("text/plain"))
+                || dragEvent->mimeData()->hasFormat("text/uri-list")
+                || dragEvent->mimeData()->hasFormat("text/plain"))
         {
             QFrame* dropIndicatorWidget = new QFrame(toolBar());
             dropIndicatorWidget->setFrameShape(QFrame::VLine);
@@ -322,8 +322,8 @@ bool BookmarkToolBar::eventFilter(QObject *watched, QEvent *event)
     {
         QDragMoveEvent *dragEvent = static_cast<QDragMoveEvent*>(event);
         if (dragEvent->mimeData()->hasFormat(BookmarkManager::bookmark_mime_type())
-            || dragEvent->mimeData()->hasFormat("text/uri-list")
-            || dragEvent->mimeData()->hasFormat("text/plain"))
+                || dragEvent->mimeData()->hasFormat("text/uri-list")
+                || dragEvent->mimeData()->hasFormat("text/plain"))
         {
             QAction *overAction = toolBar()->actionAt(dragEvent->pos());
             KBookmarkActionInterface *overActionBK = dynamic_cast<KBookmarkActionInterface*>(overAction);
diff --git a/src/bookmarks/bookmarkstreemodel.cpp b/src/bookmarks/bookmarkstreemodel.cpp
index 4df7b981..9e54f010 100644
--- a/src/bookmarks/bookmarkstreemodel.cpp
+++ b/src/bookmarks/bookmarkstreemodel.cpp
@@ -167,7 +167,7 @@ BookmarksTreeModel::BookmarksTreeModel(QObject *parent)
     , m_root(0)
 {
     resetModel();
-    connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString,QString)),
+    connect(rApp->bookmarkManager()->manager(), SIGNAL(changed(QString, QString)),
             this, SLOT(bookmarksChanged(QString)));
 }