EBN fixes + minor coding guideline fixes (thanks to Max Blazejak!).

svn path=/trunk/KDE/kdebase/apps/; revision=666164

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 43b699ee2b226e52af6c891f905e323f45744c2a..2f24f746e01d54383bffc5720f7686e9679310dc 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -19,9 +19,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <config-kmetadata.h>
 #include "dolphinmainwindow.h"
 
+#include <config-kmetadata.h>
+
 #include "dolphinapplication.h"
 #include "dolphinnewmenu.h"
 #include "dolphinsettings.h"

diff --git a/src/dolphinsortfilterproxymodel.cpp b/src/dolphinsortfilterproxymodel.cpp
index 6242bfdd2a14c7dc4ea049728d69b77e6914c9c3..5f6cb357511d41b8cfe96e6e9a42704ef1f89808 100644 (file)
--- a/src/dolphinsortfilterproxymodel.cpp
+++ b/src/dolphinsortfilterproxymodel.cpp
@@ -1,23 +1,23 @@
 /***************************************************************************
-*   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
-*   Copyright (C) 2006 by Dominic Battre <dominic battre de>              *
-*   Copyright (C) 2006 by Martin Pool <mbp canonical com>                 *
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-*   This program is distributed in the hope that it will be useful,       *
-*   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
-*   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
-*   GNU General Public License for more details.                          *
-*                                                                         *
-*   You should have received a copy of the GNU General Public License     *
-*   along with this program; if not, write to the                         *
-*   Free Software Foundation, Inc.,                                       *
-*   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
-***************************************************************************/
+ *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Dominic Battre <dominic@battre.de>              *
+ *   Copyright (C) 2006 by Martin Pool <mbp@canonical.com>                 *
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ *   This program is distributed in the hope that it will be useful,       *
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
+ *   GNU General Public License for more details.                          *
+ *                                                                         *
+ *   You should have received a copy of the GNU General Public License     *
+ *   along with this program; if not, write to the                         *
+ *   Free Software Foundation, Inc.,                                       *
+ *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
+ ***************************************************************************/
 
 #include "dolphinsortfilterproxymodel.h"
 

diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp
index 565323b4a088a3d130668b66d9039f7114b1f7be..7dfb07c6ab0bfd5366bd6639f8a14fc860b0fbea 100644 (file)
--- a/src/infosidebarpage.cpp
+++ b/src/infosidebarpage.cpp
@@ -17,9 +17,21 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include "infosidebarpage.h"
+
 #include <config-kmetadata.h>
 
-#include "infosidebarpage.h"
+#include <kfileplacesmodel.h>
+#include <klocale.h>
+#include <kstandarddirs.h>
+#include <kio/previewjob.h>
+#include <kfileitem.h>
+#include <kdialog.h>
+#include <kglobalsettings.h>
+#include <kfilemetainfo.h>
+#include <kvbox.h>
+#include <kseparator.h>
+#include <kiconloader.h>
 
 #include <QDir>
 #include <QEvent>
@@ -34,21 +46,9 @@
 #include <QResizeEvent>
 #include <QTimer>
 
-#include <kfileplacesmodel.h>
-#include <klocale.h>
-#include <kstandarddirs.h>
-#include <kio/previewjob.h>
-#include <kfileitem.h>
-#include <kdialog.h>
-#include <kglobalsettings.h>
-#include <kfilemetainfo.h>
-#include <kvbox.h>
-#include <kseparator.h>
-#include <kiconloader.h>
-
-#include "pixmapviewer.h"
 #include "dolphinsettings.h"
 #include "metadatawidget.h"
+#include "pixmapviewer.h"
 
 InfoSidebarPage::InfoSidebarPage(QWidget* parent) :
     SidebarPage(parent),

diff --git a/src/metadatawidget.cpp b/src/metadatawidget.cpp
index 52b33093d48ea6674b9919c5cdb99beedf7e6229..a3d5f842e2a2aac25cb95feace83ab9f796c1ccd 100644 (file)
--- a/src/metadatawidget.cpp
+++ b/src/metadatawidget.cpp
@@ -17,10 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include <config-kmetadata.h>
-
 #include "metadatawidget.h"
 
+#include <config-kmetadata.h>
+
 #include <klocale.h>
 
 #include <QtGui/QLabel>