Remove unused #include

Summary: I used CLion inspection to hunt all unused #include

Reviewers: #dolphin, elvisangelaccio, markg

Reviewed By: #dolphin, elvisangelaccio, markg

Subscribers: bcooksley, markg, elvisangelaccio, #dolphin

Differential Revision: https://phabricator.kde.org/D10985

diff --git a/src/dbusinterface.cpp b/src/dbusinterface.cpp
index 37270b7872993ed1f54bc24803f096064545250f..e5192f2077224a63e74a69105d75501ee197dd1c 100644 (file)
--- a/src/dbusinterface.cpp
+++ b/src/dbusinterface.cpp
@@ -20,11 +20,9 @@
 #include "dbusinterface.h"
 #include "global.h"
 
-#include <QDBusConnection>
-#include <QList>
-#include <QUrl>
 #include <KPropertiesDialog>
-#include <KRun>
+
+#include <QDBusConnection>
 
 DBusInterface::DBusInterface() :
     QObject()

diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp
index 1f4e8f010054a30488588b21892df2fdb063ae2f..c35f442cba8422dbaecd74f13bd09026c13e537b 100644 (file)
--- a/src/dolphincontextmenu.cpp
+++ b/src/dolphincontextmenu.cpp
@@ -20,43 +20,40 @@
 
 #include "dolphincontextmenu.h"
 
+#include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinnewfilemenu.h"
-#include "dolphinviewcontainer.h"
-#include "dolphin_generalsettings.h"
 #include "dolphinremoveaction.h"
+#include "dolphinviewcontainer.h"
+#include "panels/places/placesitem.h"
+#include "panels/places/placesitemmodel.h"
+#include "views/dolphinview.h"
+#include "views/viewmodecontroller.h"
 
-#include <KActionCollection>
 #include <KAbstractFileItemActionPlugin>
+#include <KActionCollection>
 #include <KFileItemActions>
 #include <KFileItemListProperties>
-#include <KIO/RestoreJob>
 #include <KIO/EmptyTrashJob>
 #include <KIO/JobUiDelegate>
 #include <KIO/Paste>
+#include <KIO/RestoreJob>
 #include <KJobWidgets>
+#include <KLocalizedString>
 #include <KMimeTypeTrader>
 #include <KNewFileMenu>
 #include <KPluginMetaData>
 #include <KService>
-#include <KLocalizedString>
 #include <KStandardAction>
 #include <KToolBar>
 
 #include <QApplication>
 #include <QClipboard>
 #include <QKeyEvent>
-#include <QMenuBar>
 #include <QMenu>
+#include <QMenuBar>
 #include <QMimeDatabase>
 
-#include <panels/places/placesitem.h>
-#include <panels/places/placesitemmodel.h>
-
-
-#include "views/dolphinview.h"
-#include "views/viewmodecontroller.h"
-
 DolphinContextMenu::DolphinContextMenu(DolphinMainWindow* parent,
                                        const QPoint& pos,
                                        const KFileItem& fileInfo,

diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h
index 558115fb045587fb0ffcc5f158d25f11812c4512..9ebdb1a566574bc90c779a1e9588bedb9a367d67 100644 (file)
--- a/src/dolphincontextmenu.h
+++ b/src/dolphincontextmenu.h
@@ -20,13 +20,11 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <KFileItem>
-#include <QUrl>
 #include <KFileCopyToMenu>
-#include <QMenu>
-
-
+#include <KFileItem>
 
+#include <QMenu>
+#include <QUrl>
 
 class QAction;
 class DolphinMainWindow;

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index abde14cdd9bd80ee98a612de7c367e5f22218e9b..462675c09a41be884bd6c565214e5f72f2c41803 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -41,44 +41,43 @@
 #include "views/draganddrophelper.h"
 #include "views/viewproperties.h"
 #include "views/dolphinnewfilemenuobserver.h"
-
 #include "dolphin_generalsettings.h"
 
 #include <KActionCollection>
 #include <KActionMenu>
 #include <KAuthorized>
 #include <KConfig>
-#include <kdualaction.h>
+#include <KFileItemListProperties>
+#include <KFilePlacesModel>
 #include <KHelpMenu>
-#include <KJobWidgets>
-#include <QLineEdit>
-#include <KToolBar>
 #include <KIO/JobUiDelegate>
+#include <KJobWidgets>
 #include <KLocalizedString>
-#include <KProtocolManager>
-#include <KProtocolInfo>
-#include <QMenu>
 #include <KMessageBox>
-#include <KFilePlacesModel>
-#include <KFileItemListProperties>
+#include <KProtocolInfo>
+#include <KProtocolManager>
 #include <KRun>
 #include <KShell>
 #include <KStandardAction>
 #include <KToggleAction>
-#include <KUrlNavigator>
+#include <KToolBar>
 #include <KToolInvocation>
 #include <KUrlComboBox>
+#include <KUrlNavigator>
 
 #include <QApplication>
-#include <QMenuBar>
 #include <QClipboard>
-#include <QToolButton>
-#include <QTimer>
-#include <QStandardPaths>
-#include <QPushButton>
 #include <QCloseEvent>
-#include <QShowEvent>
 #include <QDialog>
+#include <QLineEdit>
+#include <QMenu>
+#include <QMenuBar>
+#include <QPushButton>
+#include <QShowEvent>
+#include <QStandardPaths>
+#include <QTimer>
+#include <QToolButton>
+#include <kdualaction.h>
 
 namespace {
     // Used for GeneralSettings::version() to determine whether

diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h
index 5e900e930d9fb40ec1e5dfa4a44df27426064e36..25233096ab2a967bcbd70aadf84350af389907bf 100644 (file)
--- a/src/dolphinmainwindow.h
+++ b/src/dolphinmainwindow.h
@@ -23,15 +23,14 @@
 #define DOLPHIN_MAINWINDOW_H
 
 #include <config-baloo.h>
-
 #include <kio/fileundomanager.h>
 #include <ksortablelist.h>
 #include <kxmlguiwindow.h>
-#include <QIcon>
-#include <QUrl>
 
+#include <QIcon>
 #include <QList>
 #include <QPointer>
+#include <QUrl>
 
 typedef KIO::FileUndoManager::CommandType CommandType;
 

diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h
index 3505017e13ae86929c3d81ccc90ddf00293e9be5..b741df1c7adef25f0cd8a934812aa6c5f23748bb 100644 (file)
--- a/src/dolphinnewfilemenu.h
+++ b/src/dolphinnewfilemenu.h
@@ -21,10 +21,10 @@
 #ifndef DOLPHINNEWFILEMENU_H
 #define DOLPHINNEWFILEMENU_H
 
-#include <KNewFileMenu>
-
 #include "dolphin_export.h"
 
+#include <KNewFileMenu>
+
 class KJob;
 
 /**

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 11ea91428cdf924a851d042d81fbe308f1c318d5..e0f06bc5f8deed6beade74d2e541e41101100ddb 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,43 +18,42 @@
 */
 
 #include "dolphinpart.h"
-#include "dolphinremoveaction.h"
 
-#include <KFileItemListProperties>
+#include "dolphindebug.h"
+#include "dolphinnewfilemenu.h"
+#include "dolphinpart_ext.h"
+#include "dolphinremoveaction.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/private/kfileitemmodeldirlister.h"
+#include "views/dolphinnewfilemenuobserver.h"
+#include "views/dolphinremoteencoding.h"
+#include "views/dolphinview.h"
+#include "views/dolphinviewactionhandler.h"
 
 #include <KAboutData>
 #include <KActionCollection>
-#include "dolphindebug.h"
+#include <KAuthorized>
+#include <KConfigGroup>
+#include <KFileItemListProperties>
 #include <KIconLoader>
+#include <KJobWidgets>
 #include <KLocalizedString>
 #include <KMessageBox>
+#include <KMimeTypeEditor>
 #include <KPluginFactory>
 #include <KRun>
-#include <KToolInvocation>
-#include <KAuthorized>
-#include <QMenu>
 #include <KSharedConfig>
-#include <KConfigGroup>
-#include <KMimeTypeEditor>
-#include <KJobWidgets>
-
-#include "dolphinpart_ext.h"
-#include "dolphinnewfilemenu.h"
-#include "views/dolphinview.h"
-#include "views/dolphinviewactionhandler.h"
-#include "views/dolphinnewfilemenuobserver.h"
-#include "views/dolphinremoteencoding.h"
-#include "kitemviews/kfileitemmodel.h"
-#include "kitemviews/private/kfileitemmodeldirlister.h"
+#include <KToolInvocation>
 
-#include <QStandardPaths>
 #include <QActionGroup>
-#include <QTextDocument>
 #include <QApplication>
 #include <QClipboard>
 #include <QDir>
-#include <QKeyEvent>
 #include <QInputDialog>
+#include <QKeyEvent>
+#include <QMenu>
+#include <QStandardPaths>
+#include <QTextDocument>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 845d843651aa6b1d9e7c548646abf1f800b4b001..864c08344e11a20535248b94fe77bf46df29e006 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -21,8 +21,8 @@
 #define DOLPHINPART_H
 
 #include <KParts/ReadOnlyPart>
-#include <QUrl>
 
+#include <QUrl>
 
 class DolphinNewFileMenu;
 class DolphinViewActionHandler;

diff --git a/src/dolphinpart_ext.cpp b/src/dolphinpart_ext.cpp
index a9cefb0619b14b65cfaddf45a950af18172d4434..8c6e9641adec4e3e07a54dcf8f400a7bf5b48b77 100644 (file)
--- a/src/dolphinpart_ext.cpp
+++ b/src/dolphinpart_ext.cpp
@@ -22,11 +22,6 @@
 #include "dolphinpart.h"
 #include "views/dolphinview.h"
 
-#include <QVariant>
-
-#include <KFileItem>
-
-
 DolphinPartBrowserExtension::DolphinPartBrowserExtension(DolphinPart* part)
     :KParts::BrowserExtension( part )
     ,m_part(part)

diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h
index 2011bcd0c3adae91e95bfadcb5118c1f495133be..f2e96d3d18046a4c3158a347f8bffdd6c3354996 100644 (file)
--- a/src/dolphinpart_ext.h
+++ b/src/dolphinpart_ext.h
@@ -24,6 +24,7 @@
 #include <kparts/fileinfoextension.h>
 #include <kparts/listingfilterextension.h>
 #include <kparts/listingnotificationextension.h>
+
 #include <QUrl>
 
 class DolphinPart;

diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp
index f425df21805cf218d89500c99145a8da721a3c99..e85cedbf978d0f8793dd6039fd5d68d164239181 100644 (file)
--- a/src/dolphinrecenttabsmenu.cpp
+++ b/src/dolphinrecenttabsmenu.cpp
@@ -19,9 +19,10 @@
 
 #include "dolphinrecenttabsmenu.h"
 
-#include <KLocalizedString>
 #include <KAcceleratorManager>
+#include <KLocalizedString>
 #include <kio/global.h>
+
 #include <QMenu>
 
 DolphinRecentTabsMenu::DolphinRecentTabsMenu(QObject* parent) :

diff --git a/src/dolphinrecenttabsmenu.h b/src/dolphinrecenttabsmenu.h
index fe92a516d1c7b41fdd067ebba47b6e3fe02ef000..1d052b9b0b4871c7209ec88ae36c7cb13fd227c8 100644 (file)
--- a/src/dolphinrecenttabsmenu.h
+++ b/src/dolphinrecenttabsmenu.h
@@ -21,6 +21,7 @@
 #define DOLPHIN_RECENT_TABS_MENU_H
 
 #include <KActionMenu>
+
 #include <QUrl>
 
 class QAction;

diff --git a/src/dolphinremoveaction.cpp b/src/dolphinremoveaction.cpp
index ea7efe6c86730c66476df6d6747c4d522937baf2..078aa3dd42f75e564304cd3ea0f5a41dd8f6231a 100644 (file)
--- a/src/dolphinremoveaction.cpp
+++ b/src/dolphinremoveaction.cpp
@@ -22,9 +22,6 @@
 
 #include <QApplication>
 
-#include <KLocalizedString>
-
-
 DolphinRemoveAction::DolphinRemoveAction(QObject* parent, KActionCollection* collection) :
     QAction(parent),
     m_collection(collection)

diff --git a/src/dolphinremoveaction.h b/src/dolphinremoveaction.h
index 6ba25923af3f6c1019fa681a28c97db9e8c83768..9ea3406e8caff61316a1476a137f196daf27f5d6 100644 (file)
--- a/src/dolphinremoveaction.h
+++ b/src/dolphinremoveaction.h
@@ -23,11 +23,11 @@
 
 #include "dolphin_export.h"
 
+#include <KActionCollection>
+
 #include <QAction>
 #include <QPointer>
 
-#include <KActionCollection>
-
 /**
  * A QAction that manages the delete based on the current state of
  * the Shift key or the parameter passed to update.

diff --git a/src/dolphintabbar.cpp b/src/dolphintabbar.cpp
index 484a9f3a07e7f6f03e5b7c8c53c79f07ff73d6fe..fc52afff6991ccb7a2b300b0097a0791771a76cd 100644 (file)
--- a/src/dolphintabbar.cpp
+++ b/src/dolphintabbar.cpp
@@ -19,13 +19,12 @@
 
 #include "dolphintabbar.h"
 
-#include <QTimer>
-#include <QDragEnterEvent>
 #include <KLocalizedString>
+
+#include <QDragEnterEvent>
 #include <QMenu>
-#include <QIcon>
-#include <QUrl>
 #include <QMimeData>
+#include <QTimer>
 
 DolphinTabBar::DolphinTabBar(QWidget* parent) :
     QTabBar(parent),

diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp
index 1d3a6f08c91af5b26345ee5c5fd2e16e20787367..342d6f6deeca850414bda003d09509fb33c31ffc 100644 (file)
--- a/src/dolphintabpage.cpp
+++ b/src/dolphintabpage.cpp
@@ -19,8 +19,8 @@
 
 #include "dolphintabpage.h"
 
-#include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
+#include "dolphinviewcontainer.h"
 
 #include <QSplitter>
 #include <QVBoxLayout>

diff --git a/src/dolphintabpage.h b/src/dolphintabpage.h
index ba4c144d91acf85b4bcf3574c4a24788c8792b61..6c70a60621ba4bb8bdeac1175fd7a6412686311a 100644 (file)
--- a/src/dolphintabpage.h
+++ b/src/dolphintabpage.h
@@ -20,9 +20,9 @@
 #ifndef DOLPHIN_TAB_PAGE_H
 #define DOLPHIN_TAB_PAGE_H
 
-#include <QWidget>
 #include <QPointer>
 #include <QUrl>
+#include <QWidget>
 
 class QSplitter;
 class DolphinViewContainer;

diff --git a/src/dolphintabwidget.cpp b/src/dolphintabwidget.cpp
index da1ced4b31124cb86cf3242fabcf6f678352aea9..8b13cebe6258c1510f5786ec92c6fcfb08cff5d6 100644 (file)
--- a/src/dolphintabwidget.cpp
+++ b/src/dolphintabwidget.cpp
@@ -23,12 +23,13 @@
 #include "dolphintabpage.h"
 #include "dolphinviewcontainer.h"
 
-#include <QApplication>
-#include <QDropEvent>
 #include <KConfigGroup>
+#include <KRun>
 #include <KShell>
 #include <kio/global.h>
-#include <KRun>
+
+#include <QApplication>
+#include <QDropEvent>
 
 DolphinTabWidget::DolphinTabWidget(QWidget* parent) :
     QTabWidget(parent),

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 83b9f4343778235f303f6893324e4d288c28a5c2..1620f3c368625c804d497111126a61c41940f9cd 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -18,37 +18,34 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
-#include <KProtocolManager>
 
-#include <QDropEvent>
-#include <QTimer>
-#include <QMimeData>
-#include <QVBoxLayout>
-#include <QLoggingCategory>
+#include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
+#include "filterbar/filterbar.h"
+#include "global.h"
+#include "search/dolphinsearchbox.h"
+#include "statusbar/dolphinstatusbar.h"
+#include "views/viewmodecontroller.h"
+#include "views/viewproperties.h"
 
 #include <KFileItemActions>
 #include <KFilePlacesModel>
-#include <KLocalizedString>
 #include <KIO/PreviewJob>
-#include <kio_version.h>
+#include <KLocalizedString>
 #include <KMessageWidget>
+#include <KProtocolManager>
+#include <KRun>
 #include <KShell>
-#include <QUrl>
 #include <KUrlComboBox>
 #include <KUrlNavigator>
-#include <KRun>
-
-#ifdef KActivities_FOUND
-#endif
+#include <kio_version.h>
 
-#include "global.h"
-#include "dolphindebug.h"
-#include "dolphin_generalsettings.h"
-#include "filterbar/filterbar.h"
-#include "search/dolphinsearchbox.h"
-#include "statusbar/dolphinstatusbar.h"
-#include "views/viewmodecontroller.h"
-#include "views/viewproperties.h"
+#include <QDropEvent>
+#include <QLoggingCategory>
+#include <QMimeData>
+#include <QTimer>
+#include <QUrl>
+#include <QVBoxLayout>
 
 DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     QWidget(parent),

diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h
index 837b168d704c4fe1a939d068023274d59115e688..993584b7ad249a5e5a5c5d603ee4b9cc758e22a8 100644 (file)
--- a/src/dolphinviewcontainer.h
+++ b/src/dolphinviewcontainer.h
@@ -20,18 +20,17 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include <KFileItem>
+#include "config-dolphin.h"
+#include "views/dolphinview.h"
+
 #include <KCompletion>
+#include <KFileItem>
 #include <KIO/Job>
-
 #include <KUrlNavigator>
 
 #include <QElapsedTimer>
 #include <QWidget>
 
-#include <views/dolphinview.h>
-#include <config-dolphin.h>
-
 #ifdef KF5Activities_FOUND
 namespace KActivities {
     class ResourceInstance;

diff --git a/src/filterbar/filterbar.cpp b/src/filterbar/filterbar.cpp
index 97f76cff47a8c3698effc1de75108841f7f44601..813a50838bed208a8a364a34ca90cad915e14a44 100644 (file)
--- a/src/filterbar/filterbar.cpp
+++ b/src/filterbar/filterbar.cpp
@@ -18,15 +18,16 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
+
 #include "filterbar.h"
 
+#include <KLocalizedString>
+
+#include <QHBoxLayout>
 #include <QKeyEvent>
 #include <QLabel>
-#include <QToolButton>
-#include <QHBoxLayout>
-
-#include <KLocalizedString>
 #include <QLineEdit>
+#include <QToolButton>
 
 FilterBar::FilterBar(QWidget* parent) :
     QWidget(parent)

diff --git a/src/global.cpp b/src/global.cpp
index d0e477bc8d1b3ab22142615fbea8223b3aaf1906..aaeb5812060e18d7f2a38d494d9afa3afc4eedcd 100644 (file)
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -18,8 +18,9 @@
  */
 
 #include "global.h"
-#include "dolphindebug.h"
+
 #include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
 
 #include <KRun>
 

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index dd8167d79ae64fa93bba07427070716bc943eef2..3c1ef1b98dee04ecaecfa453f20a966fdbb2d6ef 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -19,17 +19,17 @@
 
 #include "kfileitemlistview.h"
 
-#include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
+#include "kfileitemmodelrolesupdater.h"
 #include "private/kpixmapmodifier.h"
 
 #include <KIconLoader>
 
-#include <QPainter>
-#include <QTimer>
 #include <QGraphicsScene>
 #include <QGraphicsView>
+#include <QPainter>
+#include <QTimer>
 
 // #define KFILEITEMLISTVIEW_DEBUG
 

diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h
index c7fdf972db9562395a68fdf0cd5bf740ff3e778d..c13ea5ef2d403395d96ee513a2e1bf781ffef609 100644 (file)
--- a/src/kitemviews/kfileitemlistview.h
+++ b/src/kitemviews/kfileitemlistview.h
@@ -21,8 +21,7 @@
 #define KFILEITEMLISTVIEW_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kstandarditemlistview.h>
+#include "kitemviews/kstandarditemlistview.h"
 
 class KFileItemModelRolesUpdater;
 class QTimer;

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 92b84b14559c9c9eaa64348f4bf96145b7689140..4298101de0391493d132d5a425861233868663f9 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.cpp
+++ b/src/kitemviews/kfileitemlistwidget.cpp
@@ -21,8 +21,9 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
-#include <KLocalizedString>
 #include <KFormat>
+#include <KLocalizedString>
+
 #include <QMimeDatabase>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :

diff --git a/src/kitemviews/kfileitemlistwidget.h b/src/kitemviews/kfileitemlistwidget.h
index fbb0300f81e587b42be460e2bfe0c17b0561d409..7ce415dbee2986421d9c2ca0973feaa0998a5b6f 100644 (file)
--- a/src/kitemviews/kfileitemlistwidget.h
+++ b/src/kitemviews/kfileitemlistwidget.h
@@ -21,8 +21,7 @@
 #define KFILEITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kstandarditemlistwidget.h>
+#include "kitemviews/kstandarditemlistwidget.h"
 
 class DOLPHIN_EXPORT KFileItemListWidgetInformant : public KStandardItemListWidgetInformant
 {

diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index ae0ad30b631fcf6d43adef4911c73cde144e49cd..b6a0016428a2110ce443e78e113e96784edfc408 100644 (file)
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -22,15 +22,13 @@
 #include "kfileitemmodel.h"
 
 #include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
+#include "private/kfileitemmodeldirlister.h"
+#include "private/kfileitemmodelsortalgorithm.h"
 
 #include <KLocalizedString>
 #include <KUrlMimeData>
 
-#include "dolphindebug.h"
-
-#include "private/kfileitemmodelsortalgorithm.h"
-#include "private/kfileitemmodeldirlister.h"
-
 #include <QElapsedTimer>
 #include <QMimeData>
 #include <QTimer>

diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h
index 4589b542241e8b65181bd8dffc09a764cf996796..75953f0b7e8ed303c92f4826870377f4fa212ac3 100644 (file)
--- a/src/kitemviews/kfileitemmodel.h
+++ b/src/kitemviews/kfileitemmodel.h
@@ -21,14 +21,15 @@
 #define KFILEITEMMODEL_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/private/kfileitemmodelfilter.h"
+
 #include <KFileItem>
-#include <QUrl>
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/private/kfileitemmodelfilter.h>
 
 #include <QCollator>
 #include <QHash>
 #include <QSet>
+#include <QUrl>
 
 #include <functional>
 

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index ddbed16a8fbd86e39dbc899437dd1a7fcce5c601..6c96a08d164c9914938d1b193d9b9dffeb2d28a2 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -20,31 +20,30 @@
 #include "kfileitemmodelrolesupdater.h"
 
 #include "kfileitemmodel.h"
+#include "private/kdirectorycontentscounter.h"
+#include "private/kpixmapmodifier.h"
 
 #include <KConfig>
 #include <KConfigGroup>
-#include <KSharedConfig>
-#include <KIconLoader>
-#include <KJobWidgets>
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
-#include <KPluginLoader>
+#include <KIconLoader>
+#include <KJobWidgets>
 #include <KOverlayIconPlugin>
+#include <KPluginLoader>
+#include <KSharedConfig>
 
-#include "private/kpixmapmodifier.h"
-#include "private/kdirectorycontentscounter.h"
+#ifdef HAVE_BALOO
+#include "private/kbaloorolesprovider.h"
+#include <Baloo/File>
+#include <Baloo/FileMonitor>
+#endif
 
 #include <QApplication>
 #include <QPainter>
 #include <QElapsedTimer>
 #include <QTimer>
 
-#ifdef HAVE_BALOO
-    #include "private/kbaloorolesprovider.h"
-    #include <Baloo/File>
-    #include <Baloo/FileMonitor>
-#endif
-
 
 // #define KFILEITEMMODELROLESUPDATER_DEBUG
 

diff --git a/src/kitemviews/kfileitemmodelrolesupdater.h b/src/kitemviews/kfileitemmodelrolesupdater.h
index d971a7c17164b16300b2b374922768abec48584d..0eef7fcd4f1220a412ac4d1b7c3f157d1e0c819a 100644 (file)
--- a/src/kitemviews/kfileitemmodelrolesupdater.h
+++ b/src/kitemviews/kfileitemmodelrolesupdater.h
@@ -20,12 +20,11 @@
 #ifndef KFILEITEMMODELROLESUPDATER_H
 #define KFILEITEMMODELROLESUPDATER_H
 
-#include <config-baloo.h>
+#include "dolphin_export.h"
+#include "kitemviews/kitemmodelbase.h"
 
 #include <KFileItem>
-#include <kitemviews/kitemmodelbase.h>
-
-#include "dolphin_export.h"
+#include <config-baloo.h>
 
 #include <QObject>
 #include <QSet>

diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index cdc7baa3575a40bf50e46824c32a45dcb6b6c960..f308667b3810033f55589db93dc168e3315db4ec 100644 (file)
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -24,7 +24,6 @@
 
 #include "kitemlistcontroller.h"
 #include "kitemlistview.h"
-
 #include "private/kitemlistsmoothscroller.h"
 
 #include <QApplication>

diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp
index cef58b643f37f4348de0c5da840a5176bd06cb80..36d8e4671b3ad5626e77f0502bcc5ed355eb17ab 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.cpp
+++ b/src/kitemviews/kitemlistcontroller.cpp
@@ -23,13 +23,13 @@
 
 #include "kitemlistcontroller.h"
 
-
-#include "kitemlistview.h"
 #include "kitemlistselectionmanager.h"
-
-#include "private/kitemlistrubberband.h"
+#include "kitemlistview.h"
 #include "private/kitemlistkeyboardsearchmanager.h"
+#include "private/kitemlistrubberband.h"
+#include "views/draganddrophelper.h"
 
+#include <QAccessible>
 #include <QApplication>
 #include <QDrag>
 #include <QGraphicsScene>
@@ -37,8 +37,6 @@
 #include <QGraphicsView>
 #include <QMimeData>
 #include <QTimer>
-#include <QAccessible>
-#include <views/draganddrophelper.h>
 
 KItemListController::KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent) :
     QObject(parent),

diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h
index 3de5edece9e79913abad5a18e4b85f09557ad65a..2f84a6c2c3f2580ffb9acd0d6e9d255453ce74af 100644 (file)
--- a/src/kitemviews/kitemlistcontroller.h
+++ b/src/kitemviews/kitemlistcontroller.h
@@ -24,11 +24,11 @@
 #define KITEMLISTCONTROLLER_H
 
 #include "dolphin_export.h"
-
 #include "kitemset.h"
 
 #include <QObject>
 #include <QPointF>
+
 class QTimer;
 class KItemModelBase;
 class KItemListKeyboardSearchManager;

diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h
index ec5fb145eb053dc065d9e4d68148fead56d83968..0e5c61f744a334d0c35228e34ca718b73089c5a1 100644 (file)
--- a/src/kitemviews/kitemlistgroupheader.h
+++ b/src/kitemviews/kitemlistgroupheader.h
@@ -21,8 +21,7 @@
 #define KITEMLISTGROUPHEADER_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemliststyleoption.h>
+#include "kitemviews/kitemliststyleoption.h"
 
 #include <QByteArray>
 #include <QGraphicsWidget>

diff --git a/src/kitemviews/kitemlistheader.cpp b/src/kitemviews/kitemlistheader.cpp
index 935961a8bc650ef9592bfa01f8b105194e86bc2b..cfc2c2b729177feec126c285f6c142a45d50c27c 100644 (file)
--- a/src/kitemviews/kitemlistheader.cpp
+++ b/src/kitemviews/kitemlistheader.cpp
@@ -19,7 +19,6 @@
 
 #include "kitemlistheader.h"
 #include "kitemlistview.h"
-
 #include "private/kitemlistheaderwidget.h"
 
 KItemListHeader::~KItemListHeader()

diff --git a/src/kitemviews/kitemlistheader.h b/src/kitemviews/kitemlistheader.h
index ef1dd0f859a2b6b510e3cf98896304916fe5bc2e..95258a592efaa86b61d02231804687e09c874f7c 100644 (file)
--- a/src/kitemviews/kitemlistheader.h
+++ b/src/kitemviews/kitemlistheader.h
@@ -21,6 +21,7 @@
 #define KITEMLISTHEADER_H
 
 #include "dolphin_export.h"
+
 #include <QHash>
 #include <QObject>
 

diff --git a/src/kitemviews/kitemlistselectionmanager.h b/src/kitemviews/kitemlistselectionmanager.h
index e4fe0c2304849dbed411b48dc390e7fff0a2d1e3..4bb503a802bdd4b3a1108f19a80a43b6e8085dde 100644 (file)
--- a/src/kitemviews/kitemlistselectionmanager.h
+++ b/src/kitemviews/kitemlistselectionmanager.h
@@ -24,9 +24,8 @@
 #define KITEMLISTSELECTIONMANAGER_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/kitemset.h>
+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/kitemset.h"
 
 #include <QObject>
 

diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp
index f457b00ac05d9b3052841f4d36098a65800c99d5..489c6f9b69f44522670b946fb72c74f7d886cbe6 100644 (file)
--- a/src/kitemviews/kitemlistview.cpp
+++ b/src/kitemviews/kitemlistview.cpp
@@ -27,6 +27,7 @@
 #include "kitemlistcontroller.h"
 #include "kitemlistheader.h"
 #include "kitemlistselectionmanager.h"
+#include "kitemlistviewaccessible.h"
 #include "kstandarditemlistwidget.h"
 
 #include "private/kitemlistheaderwidget.h"
@@ -34,13 +35,12 @@
 #include "private/kitemlistsizehintresolver.h"
 #include "private/kitemlistviewlayouter.h"
 
+#include <QElapsedTimer>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsView>
 #include <QStyleOptionRubberBand>
 #include <QTimer>
-#include <QElapsedTimer>
 
-#include "kitemlistviewaccessible.h"
 
 namespace {
     // Time in ms until reaching the autoscroll margin triggers

diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h
index 7af3d3283ab06044cfb09fc01ef2da48b17fd1cc..8320883f1fc323dd405801cfc1b900af21fd9f39 100644 (file)
--- a/src/kitemviews/kitemlistview.h
+++ b/src/kitemviews/kitemlistview.h
@@ -24,12 +24,12 @@
 #define KITEMLISTVIEW_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemliststyleoption.h"
+#include "kitemviews/kitemlistwidget.h"
+#include "kitemviews/kitemmodelbase.h"
+#include "kitemviews/kstandarditemlistgroupheader.h"
+#include "kitemviews/private/kitemlistviewanimation.h"
 
-#include <kitemviews/kstandarditemlistgroupheader.h>
-#include <kitemviews/kitemliststyleoption.h>
-#include <kitemviews/kitemlistwidget.h>
-#include <kitemviews/kitemmodelbase.h>
-#include <kitemviews/private/kitemlistviewanimation.h>
 #include <QGraphicsWidget>
 #include <QSet>
 

diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index ce45ed81d01ca7462b865b8933b3e54c77843aba..69c126f6d6cf08fc7bfdd18d3bd7018293097bb1 100644 (file)
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -27,8 +27,8 @@
 #include "kitemlistview.h"
 #include "private/kitemlistviewlayouter.h"
 
-#include <qgraphicsscene.h>
-#include <qgraphicsview.h>
+#include <QGraphicsScene>
+#include <QGraphicsView>
 
 KItemListView* KItemListViewAccessible::view() const
 {

diff --git a/src/kitemviews/kitemlistwidget.cpp b/src/kitemviews/kitemlistwidget.cpp
index f92309254f2944b0aeeda6c9b013c5f73a587d0d..61dd7256eb98b7e9ac7f61b4981ea52b8f32edf7 100644 (file)
--- a/src/kitemviews/kitemlistwidget.cpp
+++ b/src/kitemviews/kitemlistwidget.cpp
@@ -23,10 +23,8 @@
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"
-
 #include "private/kitemlistselectiontoggle.h"
 
-
 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>

diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index 06fea0e39120b1afadfe55f6230ce8a104ad4411..433048aa029e049bcabbfd06850dd19af0f89c1d 100644 (file)
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -24,8 +24,7 @@
 #define KITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemliststyleoption.h>
+#include "kitemviews/kitemliststyleoption.h"
 
 #include <QBitArray>
 #include <QGraphicsWidget>

diff --git a/src/kitemviews/kitemmodelbase.h b/src/kitemviews/kitemmodelbase.h
index 7db387ec2e4eefc555c5594be79f0b51ab9a5bdc..257872f9ca91f1058299030e9116f0c683ab9e45 100644 (file)
--- a/src/kitemviews/kitemmodelbase.h
+++ b/src/kitemviews/kitemmodelbase.h
@@ -24,13 +24,12 @@
 #define KITEMMODELBASE_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemrange.h"
+#include "kitemviews/kitemset.h"
 
-#include <kitemviews/kitemrange.h>
-#include <kitemviews/kitemset.h>
-
-#include <QUrl>
 #include <QHash>
 #include <QObject>
+#include <QUrl>
 #include <QVariant>
 
 class QMimeData;

diff --git a/src/kitemviews/kitemset.h b/src/kitemviews/kitemset.h
index b831953c66ae43a14801636f960918f2dc275e4e..14aa665a149829ee9e428a7f3bcc8574c6466408 100644 (file)
--- a/src/kitemviews/kitemset.h
+++ b/src/kitemviews/kitemset.h
@@ -21,8 +21,7 @@
 #define KITEMSET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemrange.h>
+#include "kitemviews/kitemrange.h"
 
 /**
  * @brief Stores a set of integer numbers in a space-efficient way.

diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h
index 136bb866fab8dccc7ffaae03365a812f76d7de96..c420a58b1e0ab558979d2bb5851d00a797a2e9b1 100644 (file)
--- a/src/kitemviews/kstandarditemlistgroupheader.h
+++ b/src/kitemviews/kstandarditemlistgroupheader.h
@@ -21,8 +21,7 @@
 #define KSTANDARDITEMLISTGROUPHEADER_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemlistgroupheader.h>
+#include "kitemviews/kitemlistgroupheader.h"
 
 #include <QPixmap>
 #include <QStaticText>

diff --git a/src/kitemviews/kstandarditemlistview.cpp b/src/kitemviews/kstandarditemlistview.cpp
index 00f111053c6d0dc2c14d6f15c8483168345e5c9a..ee1c061036f7a10c6b90183923a546fc57759f4e 100644 (file)
--- a/src/kitemviews/kstandarditemlistview.cpp
+++ b/src/kitemviews/kstandarditemlistview.cpp
@@ -19,9 +19,10 @@
 
 #include "kstandarditemlistview.h"
 
-#include <KIconLoader>
 #include "kstandarditemlistwidget.h"
 
+#include <KIconLoader>
+
 KStandardItemListView::KStandardItemListView(QGraphicsWidget* parent) :
     KItemListView(parent),
     m_itemLayout(DetailsLayout)

diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h
index f6125621ff5bec7b0516ff3a3e32bcd080f12849..cf5ce5fc1c09cb40d29cd4a7ced3368726a8a38b 100644 (file)
--- a/src/kitemviews/kstandarditemlistview.h
+++ b/src/kitemviews/kstandarditemlistview.h
@@ -21,8 +21,7 @@
 #define KSTANDARDITEMLISTVIEW_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"
 
 /**
  * @brief Provides layouts for icons-, compact- and details-view.

diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 0841ad4017a46d10fa46955eaf3f85627080a892..d396e58f8d9e744702144dab3c97a136f0a1e8f4 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -21,22 +21,21 @@
 
 #include "kfileitemlistview.h"
 #include "kfileitemmodel.h"
+#include "private/kfileitemclipboard.h"
+#include "private/kitemlistroleeditor.h"
+#include "private/kpixmapmodifier.h"
 
 #include <KIconEffect>
 #include <KIconLoader>
 #include <KRatingPainter>
 #include <KStringHandler>
 
-#include "private/kfileitemclipboard.h"
-#include "private/kitemlistroleeditor.h"
-#include "private/kpixmapmodifier.h"
-
 #include <QGraphicsScene>
 #include <QGraphicsSceneResizeEvent>
 #include <QGraphicsView>
-#include <QStyleOption>
-#include <QPixmapCache>
 #include <QGuiApplication>
+#include <QPixmapCache>
+#include <QStyleOption>
 
 // #define KSTANDARDITEMLISTWIDGET_DEBUG
 

diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index b13c303bc173f43b151e1757c080eb6102f960ab..220c0ebc3329071c3dae677305b45ebf0cbedfbd 100644 (file)
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -21,8 +21,7 @@
 #define KSTANDARDITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kitemlistwidget.h>
+#include "kitemviews/kitemlistwidget.h"
 
 #include <QPixmap>
 #include <QPointF>

diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h
index 288b5b84f7097ec42216c897c88289bf25cdf1d0..6685a2038fa0366fc822d1432d8ac1b45167d2dd 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.h
+++ b/src/kitemviews/kstandarditemmodel.h
@@ -21,7 +21,8 @@
 #define KSTANDARDITEMMODEL_H
 
 #include "dolphin_export.h"
-#include <kitemviews/kitemmodelbase.h>
+#include "kitemviews/kitemmodelbase.h"
+
 #include <QHash>
 #include <QList>
 

diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index 182428db5f0ae494476fd0d83e902ddcd7a18d37..bbd0927f21ef639f9371e568d2e9083ffce63651 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -20,16 +20,15 @@
 
 #include "kbaloorolesprovider.h"
 
-#include <QDebug>
-#include <KLocalizedString>
-
 #include <Baloo/File>
 #include <KFileMetaData/PropertyInfo>
 #include <KFileMetaData/UserMetaData>
 #include <KFormat>
+#include <KLocalizedString>
 
-#include <QTime>
 #include <QCollator>
+#include <QDebug>
+#include <QTime>
 
 struct KBalooRolesProviderSingleton
 {

diff --git a/src/kitemviews/private/kbaloorolesprovider.h b/src/kitemviews/private/kbaloorolesprovider.h
index 6fef98edee635884619d16df8008aacf3f1f20c4..64b1a5c8276d2eed4f24917543473e34ed319ca7 100644 (file)
--- a/src/kitemviews/private/kbaloorolesprovider.h
+++ b/src/kitemviews/private/kbaloorolesprovider.h
@@ -26,6 +26,7 @@
 #include <QHash>
 #include <QSet>
 #include <QVariant>
+
 namespace Baloo {
     class File;
 }

diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp
index 2c33edd4114079427b18d72c46a7ae6a6b378e85..977a83d5dd28b7f16a1938b26dde9f9ed0b679e4 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounter.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounter.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 
 #include "kdirectorycontentscounter.h"
-
-#include <kitemviews/kfileitemmodel.h>
+#include "kitemviews/kfileitemmodel.h"
 
 #include <KDirWatch>
+
 #include <QThread>
 
 KDirectoryContentsCounter::KDirectoryContentsCounter(KFileItemModel* model, QObject* parent) :

diff --git a/src/kitemviews/private/kdirectorycontentscounter.h b/src/kitemviews/private/kdirectorycontentscounter.h
index 977765ab72f1b37c7c2a72410155e43aaa7fee06..349860757ac52bc6f5cfb8dbabe5d9fa3b61699d 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounter.h
+++ b/src/kitemviews/private/kdirectorycontentscounter.h
@@ -23,8 +23,8 @@
 
 #include "kdirectorycontentscounterworker.h"
 
-#include <QSet>
 #include <QQueue>
+#include <QSet>
 
 class KDirWatch;
 class KFileItemModel;

diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index 31e6c6198693e958e6e26503d9880626e2515fb8..2bc96a0fac33862cceda4a647f217861dd1eae6d 100644 (file)
--- a/src/kitemviews/private/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -19,10 +19,11 @@
 
 #include "kfileitemclipboard.h"
 
+#include <KUrlMimeData>
+
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
-#include <KUrlMimeData>
 
 class KFileItemClipboardSingleton
 {

diff --git a/src/kitemviews/private/kfileitemclipboard.h b/src/kitemviews/private/kfileitemclipboard.h
index 5b5ab1eec609eca4e1aee07c7a567dfa13e8a22d..9a727ab9fa965c2c6266054316ff6f25f757d33f 100644 (file)
--- a/src/kitemviews/private/kfileitemclipboard.h
+++ b/src/kitemviews/private/kfileitemclipboard.h
@@ -20,12 +20,12 @@
 #ifndef KFILEITEMCLIPBOARD_H
 #define KFILEITEMCLIPBOARD_H
 
-#include <QUrl>
+#include "dolphin_export.h"
+
 #include <QList>
-#include <QSet>
 #include <QObject>
-
-#include "dolphin_export.h"
+#include <QSet>
+#include <QUrl>
 
 /**
  * @brief Wrapper for QClipboard to provide fast access for checking

diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp
index eeeba11b2683db5c41f6fa90dee332e1c5739d3d..c690e9fdf3a934acd1963a21953a674763338654 100644 (file)
--- a/src/kitemviews/private/kfileitemmodeldirlister.cpp
+++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "kfileitemmodeldirlister.h"
+
 #include <KLocalizedString>
 #include <KIO/Job>
 

diff --git a/src/kitemviews/private/kfileitemmodeldirlister.h b/src/kitemviews/private/kfileitemmodeldirlister.h
index b3f85c8da3ee5216705400ae110722260fdc5245..72466d508c9377eeae28282ddd958577f8eef11c 100644 (file)
--- a/src/kitemviews/private/kfileitemmodeldirlister.h
+++ b/src/kitemviews/private/kfileitemmodeldirlister.h
@@ -21,7 +21,9 @@
 #define KFILEITEMMODELDIRLISTER_H
 
 #include "dolphin_export.h"
+
 #include <KDirLister>
+
 #include <QUrl>
 
 /**

diff --git a/src/kitemviews/private/kfileitemmodelfilter.h b/src/kitemviews/private/kfileitemmodelfilter.h
index 67c1c280cdeca4c95399b3d86d826da3c413968a..f9f588aba2a024bdd3f6d9cbd6bfe52b2bc55d1a 100644 (file)
--- a/src/kitemviews/private/kfileitemmodelfilter.h
+++ b/src/kitemviews/private/kfileitemmodelfilter.h
@@ -22,6 +22,7 @@
 #define KFILEITEMMODELFILTER_H
 
 #include "dolphin_export.h"
+
 #include <QStringList>
 
 class KFileItem;

diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp
index 4092ec523ecd349c9059250f69b7d924d1d5bd1a..a994f69c8358267885a897929b9bca7605e4466e 100644 (file)
--- a/src/kitemviews/private/kitemlistheaderwidget.cpp
+++ b/src/kitemviews/private/kitemlistheaderwidget.cpp
@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistheaderwidget.h"
-
-#include <kitemviews/kitemmodelbase.h>
+#include "kitemviews/kitemmodelbase.h"
 
 #include <QApplication>
 #include <QGraphicsSceneHoverEvent>

diff --git a/src/kitemviews/private/kitemlistheaderwidget.h b/src/kitemviews/private/kitemlistheaderwidget.h
index 193f2b34edb1b2103339110160cc5d3a8307638e..350588f0054bfbd94bf1bbbd5e1f311153fe1909 100644 (file)
--- a/src/kitemviews/private/kitemlistheaderwidget.h
+++ b/src/kitemviews/private/kitemlistheaderwidget.h
@@ -21,6 +21,7 @@
 #define KITEMLISTHEADERWIDGET_H
 
 #include "dolphin_export.h"
+
 #include <QGraphicsWidget>
 #include <QHash>
 #include <QList>

diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
index f9d77d0b1a50f74aaae90faebeceb900d1222685..016907da6705705c1925a7f856ffcf238c418fc7 100644 (file)
--- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
+++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.h
@@ -25,9 +25,9 @@
 
 #include "dolphin_export.h"
 
+#include <QElapsedTimer>
 #include <QObject>
 #include <QString>
-#include <QElapsedTimer>
 
 /**
  * @brief Controls the keyboard searching ability for a KItemListController.

diff --git a/src/kitemviews/private/kitemlistrubberband.h b/src/kitemviews/private/kitemlistrubberband.h
index eaef5917334fb5971bfe9eb6477c5c898abdcd53..7d24857a92d2848b110ded2bad7caa77a63cf605 100644 (file)
--- a/src/kitemviews/private/kitemlistrubberband.h
+++ b/src/kitemviews/private/kitemlistrubberband.h
@@ -21,6 +21,7 @@
 #define KITEMLISTRUBBERBAND_H
 
 #include "dolphin_export.h"
+
 #include <QObject>
 #include <QPointF>
 

diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index 25f97ee0201ada1ab9c017f70de9e3cad4cd6a47..d6e434244c91f0e70499160e1aeebfb673443f54 100644 (file)
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -20,6 +20,7 @@
 #include "kitemlistselectiontoggle.h"
 
 #include <KIconLoader>
+
 #include <QPainter>
 
 

diff --git a/src/kitemviews/private/kitemlistsizehintresolver.cpp b/src/kitemviews/private/kitemlistsizehintresolver.cpp
index 5c121c6670d8fbba2981d3a6c9e504acbecbda70..4dee673966cbd1a16b56f570afe698140f8dff05 100644 (file)
--- a/src/kitemviews/private/kitemlistsizehintresolver.cpp
+++ b/src/kitemviews/private/kitemlistsizehintresolver.cpp
@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistsizehintresolver.h"
-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"
 
 KItemListSizeHintResolver::KItemListSizeHintResolver(const KItemListView* itemListView) :
     m_itemListView(itemListView),

diff --git a/src/kitemviews/private/kitemlistsizehintresolver.h b/src/kitemviews/private/kitemlistsizehintresolver.h
index b62c87a69be1196601ce11de101044d8c907213e..96a9dd1bc7b5c7dc7c82de71d0df387d7438f053 100644 (file)
--- a/src/kitemviews/private/kitemlistsizehintresolver.h
+++ b/src/kitemviews/private/kitemlistsizehintresolver.h
@@ -21,8 +21,8 @@
 #define KITEMLISTSIZEHINTRESOLVER_H
 
 #include "dolphin_export.h"
+#include "kitemviews/kitemmodelbase.h"
 
-#include <kitemviews/kitemmodelbase.h>
 #include <QSizeF>
 #include <QVector>
 

diff --git a/src/kitemviews/private/kitemlistsmoothscroller.cpp b/src/kitemviews/private/kitemlistsmoothscroller.cpp
index f1f6145c452a9d5566d9bbd62e0a1cbfd33c55b3..4f6fd3015ca3fcc8ecf6edecace51181eae7939a 100644 (file)
--- a/src/kitemviews/private/kitemlistsmoothscroller.cpp
+++ b/src/kitemviews/private/kitemlistsmoothscroller.cpp
@@ -22,8 +22,8 @@
 #include <QApplication>
 #include <QPropertyAnimation>
 #include <QScrollBar>
-#include <QWheelEvent>
 #include <QStyle>
+#include <QWheelEvent>
 
 KItemListSmoothScroller::KItemListSmoothScroller(QScrollBar* scrollBar,
                                                  QObject* parent) :

diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp
index 7c6782b7a259d6df52d75532bf3315b2330d5fdc..ccc387529b994e29bd85d0163cf042c09c216753 100644 (file)
--- a/src/kitemviews/private/kitemlistviewanimation.cpp
+++ b/src/kitemviews/private/kitemlistviewanimation.cpp
@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistviewanimation.h"
-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"
 
 #include <QPropertyAnimation>
 

diff --git a/src/kitemviews/private/kitemlistviewlayouter.cpp b/src/kitemviews/private/kitemlistviewlayouter.cpp
index ca39426446a390e7cf0f8c9f08dbf55cd6ad1226..c765cdcfe9c787b5cb5cdba037075eb62e5ca8e9 100644 (file)
--- a/src/kitemviews/private/kitemlistviewlayouter.cpp
+++ b/src/kitemviews/private/kitemlistviewlayouter.cpp
@@ -17,12 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "kitemlistviewlayouter.h"
-
-#include <kitemviews/kitemmodelbase.h>
-#include "kitemlistsizehintresolver.h"
-
 #include "dolphindebug.h"
+#include "kitemlistsizehintresolver.h"
+#include "kitemlistviewlayouter.h"
+#include "kitemviews/kitemmodelbase.h"
 
 // #define KITEMLISTVIEWLAYOUTER_DEBUG
 

diff --git a/src/kitemviews/private/kpixmapmodifier.cpp b/src/kitemviews/private/kpixmapmodifier.cpp
index 3bf11483b836bb05cc0e3810aeaee9902dcdfa4f..402fccfdecf55b526ba734036da8b72d62a3b6f4 100644 (file)
--- a/src/kitemviews/private/kpixmapmodifier.cpp
+++ b/src/kitemviews/private/kpixmapmodifier.cpp
@@ -34,9 +34,9 @@
 
 #include "kpixmapmodifier.h"
 
+#include <QGuiApplication>
 #include <QImage>
 #include <QPainter>
-#include <QGuiApplication>
 
 static const quint32 stackBlur8Mul[255] =
 {

diff --git a/src/main.cpp b/src/main.cpp
index e05c67d96a13c2fcadf44a33ecb35324c62bfcb7..db52e11be896eaef3ceeb4842325e7ae5f4b6f49 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,21 +19,22 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
+#include "dbusinterface.h"
+#include "dolphin_generalsettings.h"
 #include "dolphin_version.h"
+#include "dolphindebug.h"
 #include "dolphinmainwindow.h"
-#include "dolphin_generalsettings.h"
-#include "dbusinterface.h"
 #include "global.h"
-#include "dolphindebug.h"
 
-#include <KDBusService>
 #include <KAboutData>
 #include <KCrash>
-#include <QCommandLineParser>
-#include <QApplication>
+#include <KDBusService>
 #include <KLocalizedString>
 #include <Kdelibs4ConfigMigrator>
 
+#include <QApplication>
+#include <QCommandLineParser>
+
 #ifndef Q_OS_WIN
 #include <unistd.h>
 #endif

diff --git a/src/panels/folders/foldersitemlistwidget.h b/src/panels/folders/foldersitemlistwidget.h
index 5a4595c4a96ba4010db7785c04673bc299b5a64d..ef4cf7242f0f5736e1b093a25b3e3f8495d5fa6a 100644 (file)
--- a/src/panels/folders/foldersitemlistwidget.h
+++ b/src/panels/folders/foldersitemlistwidget.h
@@ -20,7 +20,7 @@
 #ifndef FOLDERSITEMLISTWIDGET_H
 #define FOLDERSITEMLISTWIDGET_H
 
-#include <kitemviews/kfileitemlistwidget.h>
+#include "kitemviews/kfileitemlistwidget.h"
 
 /**
  * @brief Extends KFileItemListWidget to use the right text color.

diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index e455780e02c828d886a8188c1ce13ee5701ee823..61417dc5ee4df1e27f56fb78a5369616eaf39cd8 100644 (file)
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -21,15 +21,16 @@
 
 #include "dolphin_folderspanelsettings.h"
 #include "dolphin_generalsettings.h"
-#include "treeviewcontextmenu.h"
 #include "foldersitemlistwidget.h"
-
-#include <views/renamedialog.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kfileitemmodel.h>
+#include "global.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistselectionmanager.h"
+#include "treeviewcontextmenu.h"
+#include "views/draganddrophelper.h"
+#include "views/renamedialog.h"
 
 #include <KJobWidgets>
 #include <KJobUiDelegate>
@@ -44,10 +45,6 @@
 #include <QPropertyAnimation>
 #include <QTimer>
 
-#include <views/draganddrophelper.h>
-
-#include "global.h"
-
 FoldersPanel::FoldersPanel(QWidget* parent) :
     Panel(parent),
     m_updateCurrentItem(false),

diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h
index f67c19cbba3c020f8637a7b5138af0801f6f4bd3..5b9dc3b15f37fa88bf212429b576a1675c02fad2 100644 (file)
--- a/src/panels/folders/folderspanel.h
+++ b/src/panels/folders/folderspanel.h
@@ -20,8 +20,9 @@
 #ifndef FOLDERSPANEL_H
 #define FOLDERSPANEL_H
 
+#include "panels/panel.h"
+
 #include <QUrl>
-#include <panels/panel.h>
 
 class KFileItemModel;
 class KItemListController;

diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp
index 99802ed18c45710e665ffbce4d0d9d040edbc267..bf97c6d8fcb274d4fc9a79069d36fd2b6b0e6942 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.cpp
+++ b/src/panels/folders/treeviewcontextmenu.cpp
@@ -20,28 +20,28 @@
 
 #include "treeviewcontextmenu.h"
 
+#include "folderspanel.h"
+#include "global.h"
+
+#include <KConfigGroup>
+#include <KFileItemListProperties>
 #include <KIO/CopyJob>
 #include <KIO/DeleteJob>
+#include <KIO/FileUndoManager>
 #include <KIO/JobUiDelegate>
-#include <QMenu>
+#include <KIO/Paste>
+#include <KIO/PasteJob>
 #include <KJobWidgets>
-#include <KSharedConfig>
-#include <KConfigGroup>
-#include <KUrlMimeData>
-#include <KFileItemListProperties>
 #include <KLocalizedString>
-#include <KIO/PasteJob>
-#include <KIO/Paste>
-#include <KIO/FileUndoManager>
 #include <KPropertiesDialog>
-
-#include "folderspanel.h"
+#include <KSharedConfig>
+#include <KUrlMimeData>
 
 #include <QApplication>
 #include <QClipboard>
+#include <QMenu>
 #include <QMimeData>
 #include <QPointer>
-#include "global.h"
 
 TreeViewContextMenu::TreeViewContextMenu(FoldersPanel* parent,
                                          const KFileItem& fileInfo) :

diff --git a/src/panels/folders/treeviewcontextmenu.h b/src/panels/folders/treeviewcontextmenu.h
index 3e61c494126f873324ab41ed935688f3fca01cf1..a9491fb5c50aa033f5e6954a57208fcb135f1624 100644 (file)
--- a/src/panels/folders/treeviewcontextmenu.h
+++ b/src/panels/folders/treeviewcontextmenu.h
@@ -20,9 +20,10 @@
 #ifndef TREEVIEWCONTEXTMENU_H
 #define TREEVIEWCONTEXTMENU_H
 
-#include <QObject>
 #include <KFileItem>
 
+#include <QObject>
+
 class QMimeData;
 class FoldersPanel;
 

diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp
index f33ad7a025829dce9260a667436afd968a235efa..3b3789175bb6f48117ac6aee9994d8b0d6457493 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.cpp
+++ b/src/panels/information/filemetadataconfigurationdialog.cpp
@@ -24,14 +24,15 @@
 #else
 #include <Baloo/FileMetaDataConfigWidget>
 #endif
-#include <KSharedConfig>
-#include <KLocalizedString>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <KConfigGroup>
+#include <KLocalizedString>
+#include <KSharedConfig>
 #include <KWindowConfig>
+
 #include <QDialogButtonBox>
+#include <QLabel>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) :
     QDialog(parent),

diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h
index 912fadadc07339ae21345921b63c47ad79fc15dc..cf3e952cb91d8fc2f041b82763b8a79c8458d25b 100644 (file)
--- a/src/panels/information/filemetadataconfigurationdialog.h
+++ b/src/panels/information/filemetadataconfigurationdialog.h
@@ -20,13 +20,14 @@
 #ifndef FILEMETADATACONFIGURATIONDIALOG_H
 #define FILEMETADATACONFIGURATIONDIALOG_H
 
-#include <QDialog>
 #include <KFileItem>
 #include <config-baloo.h>
-
 #ifndef HAVE_BALOO
 class KFileMetaDataConfigurationWidget;
 #else
+
+#include <QDialog>
+
 namespace Baloo {
     class FileMetaDataConfigWidget;
 }

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index ac987c9b4426a77cb791833ecc02240bb0cae825..042849b2511baa90dae257cdea8e782cc830ab61 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -20,10 +20,12 @@
 #include "informationpanel.h"
 
 #include "informationpanelcontent.h"
+
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
 #include <KDirNotify>
+
 #include <QApplication>
 #include <QShowEvent>
 #include <QVBoxLayout>

diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h
index 89a1bc3d24099911fbea12606c2b35346dd5fc97..6bb5862d6935b4d0491f02f9636a4bd788158256 100644 (file)
--- a/src/panels/information/informationpanel.h
+++ b/src/panels/information/informationpanel.h
@@ -20,8 +20,10 @@
 #ifndef INFORMATIONPANEL_H
 #define INFORMATIONPANEL_H
 
-#include <panels/panel.h>
+#include "panels/panel.h"
+
 #include <KFileItem>
+
 class InformationPanelContent;
 namespace KIO
 {

diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index 7507d54fb68a659de5bb75b6dd2723a737d6e6b5..f44a3feb764050d24cabc95fa38a65fbbb2ad01f 100644 (file)
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -21,14 +21,15 @@
 
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
-#include <KJobWidgets>
 #include <KIconEffect>
 #include <KIconLoader>
-#include <QIcon>
+#include <KJobWidgets>
 #include <KLocalizedString>
-#include <QMenu>
 #include <KSeparator>
 #include <KStringHandler>
+
+#include <QIcon>
+#include <QMenu>
 #include <QTextDocument>
 
 #ifndef HAVE_BALOO

diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h
index a6c2b56228bfd2edc6bc09da04f7a1b90c2de2b4..80f3c8e22a09a114d1e9814b875d1159df68e872 100644 (file)
--- a/src/panels/information/informationpanelcontent.h
+++ b/src/panels/information/informationpanelcontent.h
@@ -20,12 +20,11 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
-#include <config-baloo.h>
-
 #include <KFileItem>
+#include <config-baloo.h>
 
-#include <QUrl>
 #include <QPointer>
+#include <QUrl>
 #include <QWidget>
 
 class KFileItemList;

diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index 94523c40dc1e8243853b3d72b02e7c07f27d7ee6..fed6b0ee2850870cc242c2817ae0737392a68381 100644 (file)
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -20,19 +20,16 @@
 
 #include "phononwidget.h"
 
+#include <KIconLoader>
+#include <KLocalizedString>
 #include <Phonon/AudioOutput>
 #include <Phonon/MediaObject>
 #include <Phonon/SeekSlider>
-#pragma GCC diagnostic push                          // Phonon doesn't use C++11 compiler by default, so override
-#pragma GCC diagnostic ignored "-Wsuggest-override"  // specifier is not available. Remove this pragmas after fixing it.
 #include <Phonon/VideoWidget>
-#pragma GCC diagnostic pop
 
-#include <QVBoxLayout>
 #include <QShowEvent>
 #include <QToolButton>
-#include <KIconLoader>
-#include <KLocalizedString>
+#include <QVBoxLayout>
 
 class EmbeddedVideoPlayer : public Phonon::VideoWidget
 {

diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h
index eff613bd96d51580109b76294d8e72d970a03e07..971e8c7312d8c370fd9936ea715f362ec5247d3a 100644 (file)
--- a/src/panels/information/phononwidget.h
+++ b/src/panels/information/phononwidget.h
@@ -21,12 +21,12 @@
 #ifndef PHONONWIDGET_H
 #define PHONONWIDGET_H
 
-#include <QUrl>
+#include <Phonon/Global>
+
 #include <QSize>
+#include <QUrl>
 #include <QWidget>
 
-#include <Phonon/Global>
-
 namespace Phonon
 {
     class AudioOutput;

diff --git a/src/panels/information/pixmapviewer.h b/src/panels/information/pixmapviewer.h
index f6b456ee6272dfcc57e41b2c2c7c5fdf8ca059e7..46e5cf5fc7e5d3a08b574e2014e9e0bd6316ac79 100644 (file)
--- a/src/panels/information/pixmapviewer.h
+++ b/src/panels/information/pixmapviewer.h
@@ -20,10 +20,10 @@
 #ifndef PIXMAPVIEWER_H
 #define PIXMAPVIEWER_H
 
-#include <QWidget>
 #include <QPixmap>
 #include <QQueue>
 #include <QTimeLine>
+#include <QWidget>
 
 class QPaintEvent;
 

diff --git a/src/panels/panel.h b/src/panels/panel.h
index 84d73e74c0087d625d1569b686ab7768351b8c35..ec3405ad2578ed2692034b5e05268ca42c6ebd85 100644 (file)
--- a/src/panels/panel.h
+++ b/src/panels/panel.h
@@ -21,8 +21,8 @@
 #ifndef PANEL_H
 #define PANEL_H
 
-#include <QWidget>
 #include <QUrl>
+#include <QWidget>
 
 /**
  * @brief Base widget for all panels that can be docked on the window borders.

diff --git a/src/panels/places/placesitem.cpp b/src/panels/places/placesitem.cpp
index a1e4611a57fee875ac71b2a159fb70a215d6385a..20c19e1520daae2531acfe463d304cb51fa83abb 100644 (file)
--- a/src/panels/places/placesitem.cpp
+++ b/src/panels/places/placesitem.cpp
@@ -23,9 +23,10 @@
 #include "placesitem.h"
 
 #include "dolphindebug.h"
+#include "placesitemsignalhandler.h"
+
 #include <KDirLister>
 #include <KLocalizedString>
-#include "placesitemsignalhandler.h"
 #include <Solid/Block>
 
 PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) :

diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h
index 733265d468c8ade9bfbe912af6da694b3dd30e86..680590dcd47a73c28541d73548fc231a55fba33e 100644 (file)
--- a/src/panels/places/placesitem.h
+++ b/src/panels/places/placesitem.h
@@ -20,15 +20,18 @@
 #ifndef PLACESITEM_H
 #define PLACESITEM_H
 
+#include "kitemviews/kstandarditem.h"
+
 #include <KBookmark>
-#include <kitemviews/kstandarditem.h>
-#include <QUrl>
-#include <QPointer>
 #include <Solid/Device>
 #include <Solid/OpticalDisc>
+#include <Solid/PortableMediaPlayer>
 #include <Solid/StorageAccess>
 #include <Solid/StorageVolume>
-#include <Solid/PortableMediaPlayer>
+
+#include <QPointer>
+#include <QUrl>
+
 
 class KDirLister;
 class PlacesItemSignalHandler;

diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp
index 9722eb58669adad56ee3e05ecb8c5a782e1783fa..289b511afd893886580e7341aeca90ffa0eaf010 100644 (file)
--- a/src/panels/places/placesitemeditdialog.cpp
+++ b/src/panels/places/placesitemeditdialog.cpp
@@ -23,18 +23,20 @@
 
 #include "placesitemeditdialog.h"
 
-#include <KAboutData>
 #include "dolphindebug.h"
+
+#include <KAboutData>
 #include <KFile>
 #include <KIconButton>
 #include <KLocalizedString>
-#include <QMimeDatabase>
 #include <KUrlRequester>
+
 #include <QCheckBox>
+#include <QDialogButtonBox>
 #include <QEvent>
 #include <QFormLayout>
-#include <QDialogButtonBox>
 #include <QLineEdit>
+#include <QMimeDatabase>
 
 PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) :
     QDialog(parent),

diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h
index 7276622416481f60ccba46417584ee9239cf2bfa..ef14b5c9d2d28798132d28ed8cdda0b8a26ef94d 100644 (file)
--- a/src/panels/places/placesitemlistgroupheader.h
+++ b/src/panels/places/placesitemlistgroupheader.h
@@ -20,7 +20,7 @@
 #ifndef PLACESITEMLISTGROUPHEADER_H
 #define PLACESITEMLISTGROUPHEADER_H
 
-#include <kitemviews/kstandarditemlistgroupheader.h>
+#include "kitemviews/kstandarditemlistgroupheader.h"
 
 class PlacesItemListGroupHeader : public KStandardItemListGroupHeader
 {

diff --git a/src/panels/places/placesitemlistwidget.h b/src/panels/places/placesitemlistwidget.h
index 3be5dde7cf2076ce5e9f66538801461bcf2d7a62..ab78564c3d99f2b20832140c235fa058cde8e17a 100644 (file)
--- a/src/panels/places/placesitemlistwidget.h
+++ b/src/panels/places/placesitemlistwidget.h
@@ -20,7 +20,7 @@
 #ifndef PLACESITEMLISTWIDGET_H
 #define PLACESITEMLISTWIDGET_H
 
-#include <kitemviews/kstandarditemlistwidget.h>
+#include "kitemviews/kstandarditemlistwidget.h"
 
 /**
  * @brief Extends KStandardItemListWidget to interpret the hidden

diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp
index 76b22f1fd8d4bed7790e76e54578ee1997e55855..207a982713be7a3bad71e0cdf49f89bdb022f2ff 100644 (file)
--- a/src/panels/places/placesitemmodel.cpp
+++ b/src/panels/places/placesitemmodel.cpp
@@ -22,25 +22,24 @@
  ***************************************************************************/
 
 #include "placesitemmodel.h"
-#include "placesitemsignalhandler.h"
 
 #include "dolphin_generalsettings.h"
-
 #include "dolphindebug.h"
-#include <QIcon>
-#include <KLocalizedString>
-#include <KAboutData>
 #include "placesitem.h"
-#include <QAction>
-#include <QMimeData>
-#include <QTimer>
-#include <KUrlMimeData>
+#include "placesitemsignalhandler.h"
+#include "views/dolphinview.h"
+#include "views/viewproperties.h"
 
+#include <KAboutData>
+#include <KLocalizedString>
+#include <KUrlMimeData>
 #include <Solid/DeviceNotifier>
 #include <Solid/OpticalDrive>
 
-#include <views/dolphinview.h>
-#include <views/viewproperties.h>
+#include <QAction>
+#include <QIcon>
+#include <QMimeData>
+#include <QTimer>
 
 namespace {
     // A suffix to the application-name of the stored bookmarks is

diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h
index a1b23b220190bc6cce7a930c5f553a6041aea62d..1aa31facdc22bce6f7776350fb4e9c0a1c94239c 100644 (file)
--- a/src/panels/places/placesitemmodel.h
+++ b/src/panels/places/placesitemmodel.h
@@ -20,15 +20,16 @@
 #ifndef PLACESITEMMODEL_H
 #define PLACESITEMMODEL_H
 
-#include <kitemviews/kstandarditemmodel.h>
+#include "kitemviews/kstandarditemmodel.h"
+
 #include <KFilePlacesModel>
+#include <Solid/Predicate>
+#include <Solid/StorageAccess>
 
-#include <QUrl>
 #include <QHash>
 #include <QList>
 #include <QSet>
-#include <Solid/Predicate>
-#include <Solid/StorageAccess>
+#include <QUrl>
 
 class KBookmark;
 class KBookmarkManager;

diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp
index e2bdeaafa2007ee657bdcf30a1ba8efc6db7ffea..29acd034c7315699d17fee9de131aef133ec26ab 100644 (file)
--- a/src/panels/places/placespanel.cpp
+++ b/src/panels/places/placespanel.cpp
@@ -24,34 +24,35 @@
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"
-
 #include "global.h"
-#include <KFileItem>
+#include "placesitem.h"
+#include "placesitemeditdialog.h"
+#include "placesitemlistgroupheader.h"
+#include "placesitemlistwidget.h"
+#include "placesitemmodel.h"
+#include "placesview.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistselectionmanager.h"
+#include "kitemviews/kstandarditem.h"
+#include "views/draganddrophelper.h"
+
 #include <KDirNotify>
-#include <QIcon>
-#include <KIO/Job>
+#include <KFileItem>
+#include <KFilePlacesModel>
 #include <KIO/DropJob>
 #include <KIO/EmptyTrashJob>
+#include <KIO/Job>
 #include <KIO/JobUiDelegate>
-#include <KFilePlacesModel>
+#include <KIconLoader>
 #include <KJobWidgets>
 #include <KLocalizedString>
-#include <KIconLoader>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kstandarditem.h>
-#include <QMenu>
 #include <KMessageBox>
 #include <KNotification>
-#include "placesitem.h"
-#include "placesitemeditdialog.h"
-#include "placesitemlistgroupheader.h"
-#include "placesitemlistwidget.h"
-#include "placesitemmodel.h"
-#include "placesview.h"
-#include <views/draganddrophelper.h>
+
 #include <QGraphicsSceneDragDropEvent>
+#include <QIcon>
+#include <QMenu>
 #include <QVBoxLayout>
 
 PlacesPanel::PlacesPanel(QWidget* parent) :

diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h
index 444785888ec0cfce0fb80b0d4f1a4875980987d6..7159357f8ce2f115540e8772106c5f758a491a4e 100644 (file)
--- a/src/panels/places/placespanel.h
+++ b/src/panels/places/placespanel.h
@@ -21,9 +21,10 @@
 #ifndef PLACESPANEL_H
 #define PLACESPANEL_H
 
-#include <QUrl>
+#include "panels/panel.h"
+
 #include <QMimeData>
-#include <panels/panel.h>
+#include <QUrl>
 
 class KItemListController;
 class PlacesItem;

diff --git a/src/panels/places/placesview.h b/src/panels/places/placesview.h
index ba7193525644e50cb9b1e2c1d90d8b5532c73d57..ffafa30b7e2841c9efd2c26ab827baf84a3fc2b0 100644 (file)
--- a/src/panels/places/placesview.h
+++ b/src/panels/places/placesview.h
@@ -20,7 +20,7 @@
 #ifndef PLACESVIEW_H
 #define PLACESVIEW_H
 
-#include <kitemviews/kstandarditemlistview.h>
+#include "kitemviews/kstandarditemlistview.h"
 
 /**
  * @brief View class for the Places Panel.

diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index 7bd811b381f25a2155ad4b6d981804709ac33bec..4f77f6136c65667e58189b39645eccc7ed5b1009 100644 (file)
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -19,17 +19,15 @@
 
 #include "terminalpanel.h"
 
-#include <signal.h>
-
-#include <KPluginLoader>
-#include <KPluginFactory>
-#include <KService>
-#include <kde_terminal_interface.h>
-#include <KParts/ReadOnlyPart>
-#include <KShell>
 #include <KIO/Job>
 #include <KIO/JobUiDelegate>
 #include <KJobWidgets>
+#include <KParts/ReadOnlyPart>
+#include <KPluginFactory>
+#include <KPluginLoader>
+#include <KService>
+#include <KShell>
+#include <kde_terminal_interface.h>
 
 #include <QDir>
 #include <QShowEvent>

diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h
index b078b76e377e881ac9b0f3bb1b4e853fe76f3db3..b36f24142f8840616709bbc33bdf2711e2d1f225 100644 (file)
--- a/src/panels/terminal/terminalpanel.h
+++ b/src/panels/terminal/terminalpanel.h
@@ -20,7 +20,7 @@
 #ifndef TERMINALPANEL_H
 #define TERMINALPANEL_H
 
-#include <panels/panel.h>
+#include "panels/panel.h"
 
 #include <QQueue>
 

diff --git a/src/search/dolphinfacetswidget.cpp b/src/search/dolphinfacetswidget.cpp
index 21a45cd9b8ec2419a05540d67a746d30b97658d8..7c0e97f86ca4f4f12a7e65fa6d0f267487094fe2 100644 (file)
--- a/src/search/dolphinfacetswidget.cpp
+++ b/src/search/dolphinfacetswidget.cpp
@@ -20,11 +20,12 @@
 #include "dolphinfacetswidget.h"
 
 #include <KLocalizedString>
+
 #include <QButtonGroup>
 #include <QCheckBox>
 #include <QDate>
-#include <QRadioButton>
 #include <QHBoxLayout>
+#include <QRadioButton>
 
 DolphinFacetsWidget::DolphinFacetsWidget(QWidget* parent) :
     QWidget(parent),

diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp
index 6cae37e197dd2e1fdcee56c722e1f6c786006bd8..12f0c213846d6fe0212836ced33b17949971354d 100644 (file)
--- a/src/search/dolphinsearchbox.cpp
+++ b/src/search/dolphinsearchbox.cpp
@@ -21,31 +21,29 @@
 
 #include "dolphin_searchsettings.h"
 #include "dolphinfacetswidget.h"
+#include "panels/places/placesitemmodel.h"
 
-#include <panels/places/placesitemmodel.h>
-
-#include <QIcon>
-#include <QLineEdit>
 #include <KLocalizedString>
-#include <KSeparator>
 #include <KNS3/KMoreToolsMenuFactory>
+#include <KSeparator>
+#include <config-baloo.h>
+#ifdef HAVE_BALOO
+#include <Baloo/Query>
+#include <Baloo/IndexerConfig>
+#endif
 
 #include <QButtonGroup>
 #include <QDir>
+#include <QFontDatabase>
 #include <QHBoxLayout>
+#include <QIcon>
 #include <QLabel>
+#include <QLineEdit>
 #include <QScrollArea>
 #include <QTimer>
 #include <QToolButton>
 #include <QUrlQuery>
 
-#include <config-baloo.h>
-#ifdef HAVE_BALOO
-    #include <Baloo/Query>
-    #include <Baloo/IndexerConfig>
-#endif
-#include <QFontDatabase>
-
 DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
     QWidget(parent),
     m_startedSearching(false),

diff --git a/src/settings/additionalinfodialog.cpp b/src/settings/additionalinfodialog.cpp
index 6b838fc187fe711df6626d4b5679dc5b490930dc..535aa944b9f346778b02ffc46ada1837970729d1 100644 (file)
--- a/src/settings/additionalinfodialog.cpp
+++ b/src/settings/additionalinfodialog.cpp
@@ -19,19 +19,19 @@
 
 #include "additionalinfodialog.h"
 
-#include <config-baloo.h>
-
-#include <KSharedConfig>
-#include <KLocalizedString>
 #include "kitemviews/kfileitemmodel.h"
+
 #include <KConfigGroup>
+#include <KLocalizedString>
+#include <KSharedConfig>
 #include <KWindowConfig>
+#include <config-baloo.h>
 
 #include <QCheckBox>
-#include <QLabel>
-#include <QVBoxLayout>
 #include <QDialogButtonBox>
+#include <QLabel>
 #include <QPushButton>
+#include <QVBoxLayout>
 
 #ifdef HAVE_BALOO
     #include <Baloo/IndexerConfig>

diff --git a/src/settings/additionalinfodialog.h b/src/settings/additionalinfodialog.h
index 2a4cd7dbaa496af1a5541c59eb5cdce0fae2e774..d6bf1e08c5344b46de26f1eefec205c101bf612a 100644 (file)
--- a/src/settings/additionalinfodialog.h
+++ b/src/settings/additionalinfodialog.h
@@ -24,7 +24,6 @@
 #include <QList>
 #include <QListWidget>
 
-
 /**
  * @brief Dialog for changing the additional information shown in the view.
  */

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 59f8c8eee68500ba36daef79664f4264877b9334..b274bb8fbf52013697e73e83a843be161d320777 100644 (file)
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -21,7 +21,8 @@
  ***************************************************************************/
 
 #include "applyviewpropsjob.h"
-#include <views/viewproperties.h>
+
+#include "views/viewproperties.h"
 
 ApplyViewPropsJob::ApplyViewPropsJob(const QUrl& dir,
                                      const ViewProperties& viewProps) :

diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h
index aeb4a60c6de16caba15af69ac094ecd7fbfda8eb..c41f30965ac5b2d3e2eecb29963d4ee974e31b77 100644 (file)
--- a/src/settings/applyviewpropsjob.h
+++ b/src/settings/applyviewpropsjob.h
@@ -24,6 +24,7 @@
 #define APPLYVIEWPROPSJOB_H
 
 #include <KIO/Job>
+
 #include <QUrl>
 
 class ViewProperties;

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index ffed870f1747dde0fa36bd6498f84678b41bc332..5c0d43d836fc1244648cf875eb3a84bda822ea04 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -20,18 +20,18 @@
 
 #include "dolphinsettingsdialog.h"
 
-#include <dolphinmainwindow.h>
 #include "dolphin_generalsettings.h"
+#include "dolphinmainwindow.h"
 #include "general/generalsettingspage.h"
 #include "navigation/navigationsettingspage.h"
 #include "services/servicessettingspage.h"
 #include "startup/startupsettingspage.h"
-#include "viewmodes/viewsettingspage.h"
 #include "trash/trashsettingspage.h"
+#include "viewmodes/viewsettingspage.h"
 
 #include <KAuthorized>
-#include <KWindowConfig>
 #include <KLocalizedString>
+#include <KWindowConfig>
 
 #include <QPushButton>
 

diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp
index fb3f77ebaa3dd3c38cc4be80eb3d324e9b1ac500..ba8d0549c7890f024cc46b9296a02acd6f9a1444 100644 (file)
--- a/src/settings/general/behaviorsettingspage.cpp
+++ b/src/settings/general/behaviorsettingspage.cpp
@@ -20,6 +20,8 @@
 
 #include "behaviorsettingspage.h"
 
+#include "views/viewproperties.h"
+
 #include <KLocalizedString>
 
 #include <QCheckBox>
@@ -27,8 +29,6 @@
 #include <QRadioButton>
 #include <QVBoxLayout>
 
-#include <views/viewproperties.h>
-
 BehaviorSettingsPage::BehaviorSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),
     m_url(url),

diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h
index 16a3e95c2eff235b3a555f7a80a4db43669672fa..779fae3770de48dff19ff111d67b59f9f7e4cd4c 100644 (file)
--- a/src/settings/general/behaviorsettingspage.h
+++ b/src/settings/general/behaviorsettingspage.h
@@ -20,9 +20,10 @@
 #ifndef BEHAVIORSETTINGSPAGE_H
 #define BEHAVIORSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
-#include <QUrl>
 #include "dolphin_generalsettings.h"
+#include "settings/settingspagebase.h"
+
+#include <QUrl>
 
 class QCheckBox;
 class QLabel;

diff --git a/src/settings/general/configurepreviewplugindialog.cpp b/src/settings/general/configurepreviewplugindialog.cpp
index 6a4f3769af941a7a3c98de5cc4db12bc1a9baf13..60e814c13dcb77a4456cae64719651c6121993f7 100644 (file)
--- a/src/settings/general/configurepreviewplugindialog.cpp
+++ b/src/settings/general/configurepreviewplugindialog.cpp
@@ -19,18 +19,18 @@
 
 #include "configurepreviewplugindialog.h"
 
-#include <KPluginLoader>
-#include <KLocalizedString>
-#include <KJobWidgets>
-#include <KIO/JobUiDelegate>
 #include <KIO/DeleteJob>
+#include <KIO/JobUiDelegate>
 #include <KIO/ThumbCreator>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KPluginLoader>
 
-#include <QUrl>
-#include <QVBoxLayout>
-#include <QStandardPaths>
 #include <QDialogButtonBox>
 #include <QPushButton>
+#include <QStandardPaths>
+#include <QUrl>
+#include <QVBoxLayout>
 
 ConfigurePreviewPluginDialog::ConfigurePreviewPluginDialog(const QString& pluginName,
                                                            const QString& desktopEntryName,

diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 39a70582125664a7f2028c6e9e2f453134fcf364..728d082d296791862421f39618c7e7a0f7b7eb4d 100644 (file)
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "confirmationssettingspage.h"
 
-#include <dolphin_generalsettings.h>
+#include "dolphin_generalsettings.h"
 
 #include <KLocalizedString>
 

diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h
index 1aa7be700e25bd1e07c9af55b2d23a3d29e01e81..4cdb32b20040e5c1f144aea4ae9a85421dbe98c0 100644 (file)
--- a/src/settings/general/confirmationssettingspage.h
+++ b/src/settings/general/confirmationssettingspage.h
@@ -19,7 +19,7 @@
 #ifndef CONFIRMATIONSSETTINGSPAGE_H
 #define CONFIRMATIONSSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QCheckBox;
 

diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h
index a68fc933b100ef4b265877fe41f1aaddc779ebe2..1324e9e93b49ffc5607ffe7a19be0aacf990f63b 100644 (file)
--- a/src/settings/general/generalsettingspage.h
+++ b/src/settings/general/generalsettingspage.h
@@ -20,8 +20,9 @@
 #ifndef GENERALSETTINGSPAGE_H
 #define GENERALSETTINGSPAGE_H
 
+#include "settings/settingspagebase.h"
+
 #include <QWidget>
-#include <settings/settingspagebase.h>
 
 class QUrl;
 class SettingsPageBase;

diff --git a/src/settings/general/previewssettingspage.cpp b/src/settings/general/previewssettingspage.cpp
index 672bb722dfe2f80930190fb520ba1b9983f32390..1d6e922c836e3243f88ef04e5c5a6b852f2237c8 100644 (file)
--- a/src/settings/general/previewssettingspage.cpp
+++ b/src/settings/general/previewssettingspage.cpp
@@ -21,20 +21,19 @@
 
 #include "dolphin_generalsettings.h"
 #include "configurepreviewplugindialog.h"
+#include "settings/serviceitemdelegate.h"
+#include "settings/servicemodel.h"
 
+#include <KIO/PreviewJob>
 #include <KLocalizedString>
 #include <KServiceTypeTrader>
-#include <KIO/PreviewJob>
-
-#include <settings/serviceitemdelegate.h>
-#include <settings/servicemodel.h>
 
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QListView>
 #include <QPainter>
-#include <QSpinBox>
 #include <QSortFilterProxyModel>
+#include <QSpinBox>
 
 // default settings
 namespace {

diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h
index 875c19dd6518a5be354be44884ad0fa4f54d38de..957523710130c6a943fe407f70fd19719855bc43 100644 (file)
--- a/src/settings/general/previewssettingspage.h
+++ b/src/settings/general/previewssettingspage.h
@@ -20,7 +20,7 @@
 #ifndef PREVIEWSSETTINGSPAGE_H
 #define PREVIEWSSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QSpinBox;
 class QListView;

diff --git a/src/settings/general/statusbarsettingspage.cpp b/src/settings/general/statusbarsettingspage.cpp
index 85195cb637d154884efb904995931c62fbca3314..58c570f9da87f0b7330d62ed7126f13bfaf28fe6 100644 (file)
--- a/src/settings/general/statusbarsettingspage.cpp
+++ b/src/settings/general/statusbarsettingspage.cpp
@@ -19,7 +19,7 @@
 
 #include "statusbarsettingspage.h"
 
-#include <dolphin_generalsettings.h>
+#include "dolphin_generalsettings.h"
 
 #include <KLocalizedString>
 

diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h
index 3c0bd2b3c1fed32365fc84bb7da7fb36e3e7d594..99e4bbe5870fd8a92da92e3618a958536f57820b 100644 (file)
--- a/src/settings/general/statusbarsettingspage.h
+++ b/src/settings/general/statusbarsettingspage.h
@@ -19,7 +19,7 @@
 #ifndef STATUSBARSETTINGSPAGE_H
 #define STATUSBARSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QCheckBox;
 

diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp
index 2ae88ffd797cedcefaca086f9f144aaffa1ae0e2..bd1124adaf17ab47d36784ad6bf77f25c334afc8 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.cpp
+++ b/src/settings/kcm/kcmdolphingeneral.cpp
@@ -19,16 +19,16 @@
 
 #include "kcmdolphingeneral.h"
 
+#include "settings/general/behaviorsettingspage.h"
+#include "settings/general/previewssettingspage.h"
+#include "settings/general/confirmationssettingspage.h"
+
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
 
-#include <settings/general/behaviorsettingspage.h>
-#include <settings/general/previewssettingspage.h>
-#include <settings/general/confirmationssettingspage.h>
-
-#include <QVBoxLayout>
 #include <QTabWidget>
+#include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinGeneralConfigFactory, registerPlugin<DolphinGeneralConfigModule>(QStringLiteral("dolphingeneral"));)
 

diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h
index 66e42009f81b82f5811d5bb23630bd4cf2015581..c542c0139545bcb9e6ad441832bc17467b3e47b0 100644 (file)
--- a/src/settings/kcm/kcmdolphingeneral.h
+++ b/src/settings/kcm/kcmdolphingeneral.h
@@ -21,6 +21,7 @@
 #define KCMDOLPHINGENERAL_H
 
 #include <kcmodule.h>
+
 #include <QList>
 
 class SettingsPageBase;

diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp
index 54cf7ed3c0b29ec395df97c27b73a6c3d8145f38..bbc07365dd3e524eba890a148ed9de35c8143589 100644 (file)
--- a/src/settings/kcm/kcmdolphinnavigation.cpp
+++ b/src/settings/kcm/kcmdolphinnavigation.cpp
@@ -19,11 +19,11 @@
 
 #include "kcmdolphinnavigation.h"
 
+#include "settings/navigation/navigationsettingspage.h"
+
 #include <KPluginFactory>
 #include <KPluginLoader>
 
-#include <settings/navigation/navigationsettingspage.h>
-
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinNavigationConfigFactory, registerPlugin<DolphinNavigationConfigModule>(QStringLiteral("dolphinnavigation"));)

diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp
index 5d011c627343bb15271b584121098ec3f784f811..202bc5cf5decc7ebbced37fe766481a59186c6ea 100644 (file)
--- a/src/settings/kcm/kcmdolphinservices.cpp
+++ b/src/settings/kcm/kcmdolphinservices.cpp
@@ -19,11 +19,11 @@
 
 #include "kcmdolphinservices.h"
 
+#include "settings/services/servicessettingspage.h"
+
 #include <KPluginFactory>
 #include <KPluginLoader>
 
-#include <settings/services/servicessettingspage.h>
-
 #include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinServicesConfigFactory, registerPlugin<DolphinServicesConfigModule>(QStringLiteral("dolphinservices"));)

diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp
index 71364bf5cb9d3b0774473c8b154f6114161d7e47..8b04baeb69bb30bca79f1ade4cd32b498ca4b74d 100644 (file)
--- a/src/settings/kcm/kcmdolphinviewmodes.cpp
+++ b/src/settings/kcm/kcmdolphinviewmodes.cpp
@@ -19,17 +19,17 @@
 
 #include "kcmdolphinviewmodes.h"
 
+#include "settings/viewmodes/viewsettingstab.h"
+
 #include <KLocalizedString>
 #include <KPluginFactory>
 #include <KPluginLoader>
-#include <QIcon>
-
-#include <settings/viewmodes/viewsettingstab.h>
 
 #include <QDBusConnection>
 #include <QDBusMessage>
-#include <QVBoxLayout>
+#include <QIcon>
 #include <QTabWidget>
+#include <QVBoxLayout>
 
 K_PLUGIN_FACTORY(KCMDolphinViewModesConfigFactory, registerPlugin<DolphinViewModesConfigModule>(QStringLiteral("dolphinviewmodes"));)
 

diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h
index 188fe51f1ec2a45deceeca84358ecb1d49151d31..d7dd4de22f39954a5ad70b0c5e0a387e075555f4 100644 (file)
--- a/src/settings/navigation/navigationsettingspage.h
+++ b/src/settings/navigation/navigationsettingspage.h
@@ -19,7 +19,7 @@
 #ifndef NAVIGATIONSETTINGSPAGE_H
 #define NAVIGATIONSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class QCheckBox;
 

diff --git a/src/settings/serviceitemdelegate.cpp b/src/settings/serviceitemdelegate.cpp
index 3350061b64762f023331a3e266176ba4c1734f3c..0f20304845fca12ec84ce51dcdc35575370a3f3b 100644 (file)
--- a/src/settings/serviceitemdelegate.cpp
+++ b/src/settings/serviceitemdelegate.cpp
@@ -19,13 +19,12 @@
 
 #include "serviceitemdelegate.h"
 
-#include <QPushButton>
-
 #include "servicemodel.h"
 
 #include <QAbstractItemView>
 #include <QCheckBox>
 #include <QPainter>
+#include <QPushButton>
 
 ServiceItemDelegate::ServiceItemDelegate(QAbstractItemView* itemView, QObject* parent) :
     KWidgetItemDelegate(itemView, parent)

diff --git a/src/settings/services/servicessettingspage.cpp b/src/settings/services/servicessettingspage.cpp
index 63f0c323b4b86f161f0b4406dd7a5cd76a788bd4..45acccd9fd1f6ec6624aeefab15512488ef3b32d 100644 (file)
--- a/src/settings/services/servicessettingspage.cpp
+++ b/src/settings/services/servicessettingspage.cpp
@@ -21,19 +21,17 @@
 
 #include "dolphin_generalsettings.h"
 #include "dolphin_versioncontrolsettings.h"
+#include "settings/serviceitemdelegate.h"
+#include "settings/servicemodel.h"
 
 #include <KDesktopFile>
-#include <kdesktopfileactions.h>
-#include <QIcon>
 #include <KLocalizedString>
 #include <KMessageBox>
 #include <KNS3/Button>
 #include <KPluginMetaData>
 #include <KService>
 #include <KServiceTypeTrader>
-
-#include <settings/serviceitemdelegate.h>
-#include <settings/servicemodel.h>
+#include <kdesktopfileactions.h>
 
 #include <QGridLayout>
 #include <QLabel>

diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h
index bcbce19180a7c09b4dac9017499da1e1ccfde96c..cd4cbe52fcc5c463e640b67f53bed514ba2234e1 100644 (file)
--- a/src/settings/services/servicessettingspage.h
+++ b/src/settings/services/servicessettingspage.h
@@ -19,7 +19,7 @@
 #ifndef SERVICESSETTINGSPAGE_H
 #define SERVICESSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 #include <QString>
 

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index 3e1fe7c4ee33b67f60075fe149a0ee881b83e12c..4071ee04f58fb5b80d47c0e3695b898bae762af1 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -19,22 +19,21 @@
 
 #include "startupsettingspage.h"
 
-#include "global.h"
+#include "dolphin_generalsettings.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
-
-#include "dolphin_generalsettings.h"
+#include "global.h"
 
 #include <KLocalizedString>
-#include <QLineEdit>
 #include <KMessageBox>
 
-#include <QVBoxLayout>
 #include <QCheckBox>
+#include <QFileDialog>
 #include <QGroupBox>
 #include <QLabel>
+#include <QLineEdit>
 #include <QPushButton>
-#include <QFileDialog>
+#include <QVBoxLayout>
 
 StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :
     SettingsPageBase(parent),

diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h
index da278e37159adf6a759a05e8ef02ce700766e43c..e06b65697fafa43fd4dc5f5900bddd3a08f48f89 100644 (file)
--- a/src/settings/startup/startupsettingspage.h
+++ b/src/settings/startup/startupsettingspage.h
@@ -19,7 +19,8 @@
 #ifndef STARTUPSETTINGSPAGE_H
 #define STARTUPSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
+
 #include <QUrl>
 
 class QLineEdit;

diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h
index 6faf3f61e22542e476041d6c9b9a0f4fa35fa25d..53ac5f5985f135a8804977619a8c14ac1afbf93a 100644 (file)
--- a/src/settings/trash/trashsettingspage.h
+++ b/src/settings/trash/trashsettingspage.h
@@ -20,6 +20,7 @@
 #define TRASHSETTINGSPAGE_H
 
 #include "settings/settingspagebase.h"
+
 class KCModuleProxy;
 
 /**

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index c185fc55dc1d2fa4bbfee930955b557b3c74dec0..0a9eb166c10c3e748fcd4c07b8f952e15814f45d 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -19,13 +19,13 @@
 
 #include "dolphinfontrequester.h"
 
-#include <KLocalizedString>
 #include <KComboBox>
+#include <KLocalizedString>
 
-#include <QHBoxLayout>
-#include <QPushButton>
 #include <QFontDatabase>
 #include <QFontDialog>
+#include <QHBoxLayout>
+#include <QPushButton>
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
     QWidget(parent),

diff --git a/src/settings/viewmodes/viewmodesettings.cpp b/src/settings/viewmodes/viewmodesettings.cpp
index 2191b76fe76b057827305dba27026ea6837c5f52..6625cfb81aeb953f5013c3f73add4fdf409f9abe 100644 (file)
--- a/src/settings/viewmodes/viewmodesettings.cpp
+++ b/src/settings/viewmodes/viewmodesettings.cpp
@@ -19,9 +19,9 @@
 
 #include "viewmodesettings.h"
 
-#include "dolphin_iconsmodesettings.h"
-#include "dolphin_detailsmodesettings.h"
 #include "dolphin_compactmodesettings.h"
+#include "dolphin_detailsmodesettings.h"
+#include "dolphin_iconsmodesettings.h"
 
 #define VIEWMODESETTINGS_SET_VALUE(mode, setValue, value) \
     switch (mode) { \

diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp
index ab87201e2938b248d9e1dc76f38bfc668704fe4a..dd85a6159e290d907ec51813bc90fc56e98314d3 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.cpp
+++ b/src/settings/viewmodes/viewsettingspage.cpp
@@ -20,14 +20,14 @@
 
 #include "viewsettingspage.h"
 
-#include <views/dolphinview.h>
+#include "views/dolphinview.h"
 #include "viewsettingstab.h"
 
-#include <QVBoxLayout>
-#include <QTabWidget>
-
 #include <KLocalizedString>
 
+#include <QTabWidget>
+#include <QVBoxLayout>
+
 ViewSettingsPage::ViewSettingsPage(QWidget* parent) :
     SettingsPageBase(parent),
     m_tabs()

diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h
index 2e456a867c8fc594ba61b56f723d62d1bef9e41d..3350e1c86aa8a2051a4936165cd58625093fe7da 100644 (file)
--- a/src/settings/viewmodes/viewsettingspage.h
+++ b/src/settings/viewmodes/viewsettingspage.h
@@ -20,7 +20,7 @@
 #ifndef VIEWSETTINGSPAGE_H
 #define VIEWSETTINGSPAGE_H
 
-#include <settings/settingspagebase.h>
+#include "settings/settingspagebase.h"
 
 class ViewSettingsTab;
 class QWidget;

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index e79ac0f4c765a481616d9b6e749056e4d92e7ec2..85af5b083674e4023aa324ab78a714945390577a 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -19,22 +19,21 @@
 
 #include "viewsettingstab.h"
 
-#include "dolphinfontrequester.h"
 #include "dolphin_compactmodesettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_iconsmodesettings.h"
+#include "dolphinfontrequester.h"
+#include "views/zoomlevelinfo.h"
 
 #include <KComboBox>
 #include <KLocalizedString>
 
+#include <QApplication>
 #include <QCheckBox>
 #include <QGroupBox>
+#include <QHelpEvent>
 #include <QLabel>
 #include <QVBoxLayout>
-#include <QHelpEvent>
-#include <QApplication>
-
-#include <views/zoomlevelinfo.h>
 
 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     QWidget(parent),

diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h
index 8b1ffc428d9584f785d1d54fd0af1a087405afb7..0c1b8a3b541eb5d79d15a45994dc485df8a6be40 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -20,8 +20,9 @@
 #ifndef VIEWSETTINGSTAB_H
 #define VIEWSETTINGSTAB_H
 
+#include "settings/viewmodes/viewmodesettings.h"
+
 #include <QWidget>
-#include <settings/viewmodes/viewmodesettings.h>
 
 class DolphinFontRequester;
 class KComboBox;

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 4f005e0dae07b2f452d101626c252c22a22746b2..dbbf5fa68336048d26cb63898eb20a45e6dd1101 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -21,15 +21,15 @@
 #include "viewpropertiesdialog.h"
 
 #include "additionalinfodialog.h"
-#include "kitemviews/kfileitemmodel.h"
-#include "views/dolphinview.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
+#include "kitemviews/kfileitemmodel.h"
 #include "viewpropsprogressinfo.h"
+#include "views/dolphinview.h"
 
+#include <KComboBox>
 #include <KLocalizedString>
 #include <KMessageBox>
-#include <KComboBox>
 #include <KWindowConfig>
 
 #include <QButtonGroup>

diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp
index 471ac01d06d34c5e401064e9ec0695e32cda7913..a6c0c6d58475182dd2c81c205a82dba9fcfb644f 100644 (file)
--- a/src/settings/viewpropsprogressinfo.cpp
+++ b/src/settings/viewpropsprogressinfo.cpp
@@ -19,19 +19,19 @@
  ***************************************************************************/
 
 #include "viewpropsprogressinfo.h"
+
 #include "applyviewpropsjob.h"
+#include "views/viewproperties.h"
+
+#include <KConfigGroup>
+#include <KLocalizedString>
 
+#include <QDialogButtonBox>
 #include <QLabel>
 #include <QProgressBar>
+#include <QPushButton>
 #include <QTimer>
 #include <QVBoxLayout>
-#include <QDialogButtonBox>
-#include <QPushButton>
-
-#include <KConfigGroup>
-#include <KLocalizedString>
-
-#include <views/viewproperties.h>
 
 ViewPropsProgressInfo::ViewPropsProgressInfo(QWidget* parent,
                                              const QUrl& dir,

diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h
index e69de29762ac05edc64d238d830ce565dd33af10..05eafa6f5dd98e5b2e5cf18fa5706f85cfef9975 100644 (file)
--- a/src/settings/viewpropsprogressinfo.h
+++ b/src/settings/viewpropsprogressinfo.h
@@ -20,8 +20,9 @@
 #ifndef VIEWPROPSPROGRESSINFO_H
 #define VIEWPROPSPROGRESSINFO_H
 
-#include <QDialog>
 #include <kio/directorysizejob.h>
+
+#include <QDialog>
 #include <QUrl>
 
 class ApplyViewPropsJob;

diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp
index 14672dff079869f0704ed3615c31b6b0b8d9e996..34916830eaa666e92ebb8125d72c5f929f7e7c7f 100644 (file)
--- a/src/statusbar/dolphinstatusbar.cpp
+++ b/src/statusbar/dolphinstatusbar.cpp
@@ -20,25 +20,23 @@
 #include "dolphinstatusbar.h"
 
 #include "dolphin_generalsettings.h"
+#include "statusbarspaceinfo.h"
+#include "views/dolphinview.h"
+#include "views/zoomlevelinfo.h"
 
-#include <QIcon>
 #include <KLocalizedString>
 #include <KSqueezedTextLabel>
-#include <QMenu>
-
-#include "statusbarspaceinfo.h"
 
 #include <QApplication>
 #include <QHBoxLayout>
+#include <QHelpEvent>
+#include <QIcon>
+#include <QMenu>
 #include <QProgressBar>
-#include <QToolButton>
-#include <QTimer>
 #include <QSlider>
 #include <QTextDocument>
-#include <QHelpEvent>
-
-#include <views/dolphinview.h>
-#include <views/zoomlevelinfo.h>
+#include <QTimer>
+#include <QToolButton>
 
 namespace {
     const int ResetToDefaultTimeout = 1000;

diff --git a/src/statusbar/mountpointobserver.cpp b/src/statusbar/mountpointobserver.cpp
index fa6472c0a7e191618f6a496341a9b271256e90c5..0be0f7173273e92250afa5c045900590d3bffef7 100644 (file)
--- a/src/statusbar/mountpointobserver.cpp
+++ b/src/statusbar/mountpointobserver.cpp
@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "mountpointobserver.h"
+
 #include "mountpointobservercache.h"
 
 #include <KIO/FileSystemFreeSpaceJob>

diff --git a/src/statusbar/spaceinfoobserver.h b/src/statusbar/spaceinfoobserver.h
index 144d11fa7f9fdf3b9fa9d1c7c1ee7f8b78cb46c9..1e74caef475777089cdc9272ae8ca02368cc869c 100644 (file)
--- a/src/statusbar/spaceinfoobserver.h
+++ b/src/statusbar/spaceinfoobserver.h
@@ -20,10 +20,10 @@
 #ifndef SPACEINFOOBSERVER_H
 #define SPACEINFOOBSERVER_H
 
-#include <QObject>
-
 #include <KIO/Job>
 
+#include <QObject>
+
 class QUrl;
 class MountPointObserver;
 

diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp
index a8ba9db8b9f6159517f2dfe3c6d9ecf7baacb389..9b8d249fb97a22d2ab7fac3f8b70fb80c0e1e5d0 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.cpp
+++ b/src/statusbar/statusbarspaceinfo.cpp
@@ -22,12 +22,12 @@
 
 #include "spaceinfoobserver.h"
 
-#include <QMouseEvent>
-
 #include <KLocalizedString>
 #include <KNS3/KMoreToolsMenuFactory>
 #include <knewstuff_version.h>
 
+#include <QMouseEvent>
+
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
     KCapacityBar(KCapacityBar::DrawTextInline, parent),
     m_observer(nullptr)

diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h
index 87e9f776b47db79990bd2dcc16b151f80510dc0f..4f36517aeab5a21ace8a5ee5ef1eac1241d5198e 100644 (file)
--- a/src/statusbar/statusbarspaceinfo.h
+++ b/src/statusbar/statusbarspaceinfo.h
@@ -20,11 +20,10 @@
 #ifndef STATUSBARSPACEINFO_H
 #define STATUSBARSPACEINFO_H
 
-#include <QUrl>
-
-
 #include <KCapacityBar>
 
+#include <QUrl>
+
 class QHideEvent;
 class QShowEvent;
 class QMouseEvent;

diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp
index 197fe5591fd2b434bd91a5edbd91d14cbdd2df58..3a1572de9d48ee289a2dd59ecbdbe5bd6de98127 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.cpp
+++ b/src/views/dolphinfileitemlistwidget.cpp
@@ -19,10 +19,10 @@
 
 #include "dolphinfileitemlistwidget.h"
 
-#include <KIconLoader>
-
 #include "dolphindebug.h"
 
+#include <KIconLoader>
+
 DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant,
                                                      QGraphicsItem* parent) :
     KFileItemListWidget(informant, parent)

diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h
index a04bc68282cd0d852b394e0e364eb0aff1e2b657..5c2d17eec5a3834fac0c5948cf0047924e02ab4a 100644 (file)
--- a/src/views/dolphinfileitemlistwidget.h
+++ b/src/views/dolphinfileitemlistwidget.h
@@ -21,8 +21,7 @@
 #define DOLPHINFILEITEMLISTWIDGET_H
 
 #include "dolphin_export.h"
-
-#include <kitemviews/kfileitemlistwidget.h>
+#include "kitemviews/kfileitemlistwidget.h"
 #include "versioncontrol/kversioncontrolplugin.h"
 
 /**

diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp
index be142205dc6fb79c6785c391c40a1c3b2d478fa5..0655b33080e3b2cf2ec1b71f18248ae807b48493 100644 (file)
--- a/src/views/dolphinitemlistview.cpp
+++ b/src/views/dolphinitemlistview.cpp
@@ -19,21 +19,18 @@
 
 #include "dolphinitemlistview.h"
 
+#include "dolphin_compactmodesettings.h"
+#include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphin_iconsmodesettings.h"
-#include "dolphin_detailsmodesettings.h"
-#include "dolphin_compactmodesettings.h"
 #include "dolphinfileitemlistwidget.h"
-
-#include <kitemviews/kfileitemmodel.h>
-#include <kitemviews/kitemlistcontroller.h>
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "views/viewmodecontroller.h"
+#include "zoomlevelinfo.h"
 
 #include <KIO/PreviewJob>
 
-#include <views/viewmodecontroller.h>
-
-#include "zoomlevelinfo.h"
-
 
 DolphinItemListView::DolphinItemListView(QGraphicsWidget* parent) :
     KFileItemListView(parent),

diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h
index ff14fbe7c4d7e4a4068ded15c1cf646a73052f1f..b8e3ab7de69d1f8318d5dea0880441d766030cf3 100644 (file)
--- a/src/views/dolphinitemlistview.h
+++ b/src/views/dolphinitemlistview.h
@@ -20,10 +20,9 @@
 #ifndef DOLPHINITEMLISTVIEW_H
 #define DOLPHINITEMLISTVIEW_H
 
-#include <kitemviews/kfileitemlistview.h>
-#include <settings/viewmodes/viewmodesettings.h>
-
 #include "dolphin_export.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "settings/viewmodes/viewmodesettings.h"
 
 class KFileItemListView;
 

diff --git a/src/views/dolphinnewfilemenuobserver.h b/src/views/dolphinnewfilemenuobserver.h
index 2386bce1eee927e288559f62022f73310e58342a..6bb42ed824d82fe7688891b5350d04af591aea9b 100644 (file)
--- a/src/views/dolphinnewfilemenuobserver.h
+++ b/src/views/dolphinnewfilemenuobserver.h
@@ -20,10 +20,10 @@
 #ifndef DOLPHINNEWFILEMENUOBSERVER_H
 #define DOLPHINNEWFILEMENUOBSERVER_H
 
-#include <QObject>
-
 #include "dolphin_export.h"
 
+#include <QObject>
+
 class DolphinNewFileMenu;
 
 /**

diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index bdf747f0840e711bdab8a62743d8663fdb4ce486..269cc3085ffd03d8732dcbb23ea9da049c8fd752 100644 (file)
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -24,19 +24,21 @@
  */
 
 #include "dolphinremoteencoding.h"
-#include "dolphinviewactionhandler.h"
 
+#include "dolphinviewactionhandler.h"
 #include "dolphindebug.h"
-#include <KActionMenu>
+
 #include <KActionCollection>
-#include <KConfig>
+#include <KActionMenu>
 #include <KCharsets>
-#include <QMenu>
-#include <KProtocolInfo>
-#include <KProtocolManager>
-#include <KIO/Scheduler>
+#include <KConfig>
 #include <KConfigGroup>
+#include <KIO/Scheduler>
 #include <KLocalizedString>
+#include <KProtocolInfo>
+#include <KProtocolManager>
+
+#include <QMenu>
 
 #define DATA_KEY        QStringLiteral("Charset")
 

diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h
index ca1cea2c7fbc7ab6c1096e707b65d22bed236f80..bcb0d7901369fa6ece3d122a5d5ef69037a4149c 100644 (file)
--- a/src/views/dolphinremoteencoding.h
+++ b/src/views/dolphinremoteencoding.h
@@ -20,11 +20,11 @@
 #ifndef DOLPHINREMOTEENCODING_H
 #define DOLPHINREMOTEENCODING_H
 
-#include <QStringList>
-#include <QAction>
-#include <QUrl>
 #include "dolphin_export.h"
 
+#include <QAction>
+#include <QStringList>
+#include <QUrl>
 
 class KActionMenu;
 class DolphinViewActionHandler;

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 463ab51baf0e428f4e02e8d0f64b397f399338ee..acd66eb572169ee8a2dbc83f0d413a872eefb2f5 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -20,44 +20,17 @@
 
 #include "dolphinview.h"
 
-#include <QAbstractItemView>
-#include <QApplication>
-#include <QClipboard>
-#include <QDropEvent>
-#include <QGraphicsSceneDragDropEvent>
-#include <QTimer>
-#include <QScrollBar>
-#include <QPixmapCache>
-#include <QPointer>
-#include <QMenu>
-#include <QVBoxLayout>
-#include <KDesktopFile>
-#include <KProtocolManager>
-#include <KColorScheme>
-#include <KDirModel>
-#include <KFileItemListProperties>
-#include <KLocalizedString>
-#include <kitemviews/kfileitemmodel.h>
-#include <kitemviews/kfileitemlistview.h>
-#include <kitemviews/kitemlistcontainer.h>
-#include <kitemviews/kitemlistheader.h>
-#include <kitemviews/kitemlistselectionmanager.h>
-#include <kitemviews/kitemlistcontroller.h>
-#include <KIO/CopyJob>
-#include <KIO/DeleteJob>
-#include <KIO/JobUiDelegate>
-#include <KIO/PreviewJob>
-#include <KIO/DropJob>
-#include <KIO/PasteJob>
-#include <KIO/Paste>
-#include <KMessageBox>
-#include <KJobWidgets>
-
-#include "dolphinnewfilemenuobserver.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphin_generalsettings.h"
 #include "dolphinitemlistview.h"
+#include "dolphinnewfilemenuobserver.h"
 #include "draganddrophelper.h"
+#include "kitemviews/kfileitemlistview.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistheader.h"
+#include "kitemviews/kitemlistselectionmanager.h"
 #include "renamedialog.h"
 #include "versioncontrol/versioncontrolobserver.h"
 #include "viewproperties.h"
@@ -65,9 +38,36 @@
 #include "zoomlevelinfo.h"
 
 #ifdef HAVE_BALOO
-    #include <Baloo/IndexerConfig>
+#include <Baloo/IndexerConfig>
 #endif
+#include <KColorScheme>
+#include <KDesktopFile>
+#include <KDirModel>
+#include <KFileItemListProperties>
 #include <KFormat>
+#include <KIO/CopyJob>
+#include <KIO/DeleteJob>
+#include <KIO/DropJob>
+#include <KIO/JobUiDelegate>
+#include <KIO/Paste>
+#include <KIO/PasteJob>
+#include <KIO/PreviewJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KProtocolManager>
+
+#include <QAbstractItemView>
+#include <QApplication>
+#include <QClipboard>
+#include <QDropEvent>
+#include <QGraphicsSceneDragDropEvent>
+#include <QMenu>
+#include <QPixmapCache>
+#include <QPointer>
+#include <QScrollBar>
+#include <QTimer>
+#include <QVBoxLayout>
 
 DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
     QWidget(parent),

diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h
index 61f6af1e2fcfb358d24cfbfc4731407cd300e4e0..ea1b9c00771c52afad13b7f4493c8a62f8611c8d 100644 (file)
--- a/src/views/dolphinview.h
+++ b/src/views/dolphinview.h
@@ -21,16 +21,16 @@
 #ifndef DOLPHINVIEW_H
 #define DOLPHINVIEW_H
 
-#include <config-baloo.h>
-
 #include "dolphin_export.h"
 
-#include <kparts/part.h>
 #include <KFileItem>
-#include <kio/fileundomanager.h>
 #include <KIO/Job>
-#include <QUrl>
+#include <config-baloo.h>
+#include <kio/fileundomanager.h>
+#include <kparts/part.h>
+
 #include <QMimeData>
+#include <QUrl>
 #include <QWidget>
 
 typedef KIO::FileUndoManager::CommandType CommandType;

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 9fff160b25fa2d23e5cd208d0e6ede281e61be96..2b3a241a3ea70ef7be6ba3e95c217cb00e722fb2 100644 (file)
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -20,25 +20,23 @@
 
 #include "dolphinviewactionhandler.h"
 
+#include "dolphindebug.h"
+#include "kitemviews/kfileitemmodel.h"
 #include "settings/viewpropertiesdialog.h"
 #include "views/zoomlevelinfo.h"
 
-#include <QPointer>
-#include <QMenu>
-
+#ifdef HAVE_BALOO
+#include <Baloo/IndexerConfig>
+#endif
 #include <KActionCollection>
 #include <KActionMenu>
-#include <kitemviews/kfileitemmodel.h>
 #include <KLocalizedString>
 #include <KNewFileMenu>
 #include <KPropertiesDialog>
 #include <KProtocolManager>
 
-#include "dolphindebug.h"
-
-#ifdef HAVE_BALOO
-    #include <Baloo/IndexerConfig>
-#endif
+#include <QMenu>
+#include <QPointer>
 
 DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
     QObject(parent),

diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h
index eb375b5c9d460223864d66bf3244e202f206f6ea..be22739178df787ddda5f644b7f05960b944e093 100644 (file)
--- a/src/views/dolphinviewactionhandler.h
+++ b/src/views/dolphinviewactionhandler.h
@@ -24,6 +24,7 @@
 
 #include "dolphin_export.h"
 #include "views/dolphinview.h"
+
 #include <QObject>
 
 class KToggleAction;

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index bd4374ec3acf4369a3ea0571aa07baad7585f080..d437b877ead7ec02249479affb134a83fed8d76b 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -20,13 +20,13 @@
 
 #include "draganddrophelper.h"
 
-#include <QDBusMessage>
-#include <QDBusConnection>
-#include <QMimeData>
-
 #include <KIO/DropJob>
 #include <KJobWidgets>
 
+#include <QDBusConnection>
+#include <QDBusMessage>
+#include <QMimeData>
+
 QHash<QUrl, bool> DragAndDropHelper::m_urlListMatchesUrlCache;
 
 bool DragAndDropHelper::urlListMatchesUrl(const QList<QUrl>& urls, const QUrl& destUrl)

diff --git a/src/views/draganddrophelper.h b/src/views/draganddrophelper.h
index 0c7eadc6cb95c6f8b862a4757c815d887b441533..1a6b5900eb92b08f7c86650016d554778d2e7da4 100644 (file)
--- a/src/views/draganddrophelper.h
+++ b/src/views/draganddrophelper.h
@@ -22,10 +22,10 @@
 #define DRAGANDDROPHELPER_H
 
 #include "dolphin_export.h"
+
 #include <QList>
 #include <QUrl>
 
-
 class QDropEvent;
 class QWidget;
 namespace KIO { class DropJob; }

diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp
index 24b7986be9bf216a45288fe3a4d890bb3a904c64..44c0a5a7beb98323650cfd2a1a4a74decd85c19e 100644 (file)
--- a/src/views/renamedialog.cpp
+++ b/src/views/renamedialog.cpp
@@ -19,21 +19,21 @@
 
 #include "renamedialog.h"
 
-#include <KLocalizedString>
-#include <KJobWidgets>
+#include <KGuiItem>
+#include <KIO/BatchRenameJob>
 #include <KIO/CopyJob>
 #include <KIO/FileUndoManager>
 #include <KJobUiDelegate>
-#include <KIO/BatchRenameJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
 
+#include <QDialogButtonBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QLineEdit>
 #include <QMimeDatabase>
-#include <QDialogButtonBox>
 #include <QPushButton>
-#include <QLineEdit>
 #include <QSpinBox>
-#include <KGuiItem>
 
 RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
     QDialog(parent),

diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h
index 8da770895f92b2a0e9ab13d41d19418ce9e4506f..5b04f857cfdcb398575efcb6aa652b66aee3ce3e 100644 (file)
--- a/src/views/renamedialog.h
+++ b/src/views/renamedialog.h
@@ -22,8 +22,9 @@
 
 #include "dolphin_export.h"
 
-#include <QDialog>
 #include <KFileItem>
+
+#include <QDialog>
 #include <QString>
 
 class QLineEdit;

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp
index fcf51a240731db70520164f01d8dbf03b1d3add3..1df6a66732da090723a56b741b6c800759ffb2ee 100644 (file)
--- a/src/views/tooltips/dolphinfilemetadatawidget.cpp
+++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp
@@ -24,20 +24,19 @@
 #include <KColorScheme>
 #include <KSeparator>
 #include <KStringHandler>
-#include <QTextDocument>
-
-#include <QLabel>
-#include <QStyleOptionFrame>
-#include <QStylePainter>
-#include <QVBoxLayout>
-#include <QTextLayout>
-
 #ifndef HAVE_BALOO
 #include <KFileMetaDataWidget>
 #else
 #include <Baloo/FileMetaDataWidget>
 #endif
 
+#include <QLabel>
+#include <QStyleOptionFrame>
+#include <QStylePainter>
+#include <QTextDocument>
+#include <QTextLayout>
+#include <QVBoxLayout>
+
 DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) :
     QWidget(parent),
     m_preview(nullptr),

diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h
index e7459b19722280c4312d43a564a08296599da998..1e2cfadb677394da10bebf1662f30038f8aae23f 100644 (file)
--- a/src/views/tooltips/dolphinfilemetadatawidget.h
+++ b/src/views/tooltips/dolphinfilemetadatawidget.h
@@ -22,9 +22,10 @@
 #ifndef DOLPHINFILEMETADATAWIDGET_H
 #define DOLPHINFILEMETADATAWIDGET_H
 
-#include <QWidget>
 #include <config-baloo.h>
 
+#include <QWidget>
+
 class KFileItemList;
 class QLabel;
 

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index 3d3598ff5f53fb991a2b3760bbe299063a8396eb..19c87b0847c95725fdb111ea8c977d64f45f1637 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -20,7 +20,7 @@
 #include "tooltipmanager.h"
 
 #include "dolphinfilemetadatawidget.h"
-#include <QIcon>
+
 #include <KIO/JobUiDelegate>
 #include <KIO/PreviewJob>
 #include <KJobWidgets>
@@ -28,6 +28,7 @@
 
 #include <QApplication>
 #include <QDesktopWidget>
+#include <QIcon>
 #include <QLayout>
 #include <QStyle>
 #include <QTimer>

diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h
index 746d6cb67de2e97406f4a83fa00914c9c7e92583..f6d2b7304e0319c30c4662baeeb477a22fc2f027 100644 (file)
--- a/src/views/tooltips/tooltipmanager.h
+++ b/src/views/tooltips/tooltipmanager.h
@@ -20,11 +20,11 @@
 #ifndef TOOLTIPMANAGER_H
 #define TOOLTIPMANAGER_H
 
+#include <KFileItem>
+
 #include <QObject>
 #include <QRect>
 
-#include <KFileItem>
-
 class DolphinFileMetaDataWidget;
 class KToolTipWidget;
 class QTimer;

diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h
index a3be381f3ff31de8e6c6645ec583447159861055..d59da515bab2dada55b117b7bf366274e984b9e6 100644 (file)
--- a/src/views/versioncontrol/kversioncontrolplugin.h
+++ b/src/views/versioncontrol/kversioncontrolplugin.h
@@ -22,8 +22,9 @@
 
 #include <dolphinvcs_export.h>
 
-#include <QObject>
 #include <QAction>
+#include <QObject>
+
 class KFileItemList;
 class KFileItem;
 /**

diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h
index d33a64cc7fdf4c5d4c91be9eedcf772da4409c0f..92563faa5734ed0c0565a237f09c46d9a695b3b6 100644 (file)
--- a/src/views/versioncontrol/updateitemstatesthread.h
+++ b/src/views/versioncontrol/updateitemstatesthread.h
@@ -21,7 +21,7 @@
 #define UPDATEITEMSTATESTHREAD_H
 
 #include "dolphin_export.h"
-#include <views/versioncontrol/versioncontrolobserver.h>
+#include "views/versioncontrol/versioncontrolobserver.h"
 
 #include <QMutex>
 #include <QThread>

diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index 459bef0e9fa5e03c67189b2af0a67425738f3632..7295a245ae02bf6b8c07040c7a0aef876207a6d5 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -20,14 +20,13 @@
 #include "versioncontrolobserver.h"
 
 #include "dolphin_versioncontrolsettings.h"
+#include "dolphindebug.h"
+#include "kitemviews/kfileitemmodel.h"
+#include "updateitemstatesthread.h"
 
 #include <KLocalizedString>
 #include <KService>
-#include "dolphindebug.h"
 #include <KServiceTypeTrader>
-#include <kitemviews/kfileitemmodel.h>
-
-#include "updateitemstatesthread.h"
 
 #include <QTimer>
 

diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h
index 2c2fe2940c3ebf793f33be689ef18ad08dde9f6d..ea0834e657ad155c95661b87e8740f6968c8499c 100644 (file)
--- a/src/views/versioncontrol/versioncontrolobserver.h
+++ b/src/views/versioncontrol/versioncontrolobserver.h
@@ -26,10 +26,10 @@
 
 #include <KFileItem>
 
-#include <QUrl>
 #include <QList>
 #include <QObject>
 #include <QString>
+#include <QUrl>
 
 class KFileItemList;
 class KFileItemModel;

diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h
index 6fa43c38b1cc69d1ac4c0b91e6c09501e261acb6..2cc5c6c9165225c6f42d88c08777c3235f70d18a 100644 (file)
--- a/src/views/viewmodecontroller.h
+++ b/src/views/viewmodecontroller.h
@@ -20,10 +20,11 @@
 #ifndef VIEWMODECONTROLLER_H
 #define VIEWMODECONTROLLER_H
 
-#include <QUrl>
-#include <QObject>
 #include "dolphin_export.h"
-#include <views/dolphinview.h>
+#include "views/dolphinview.h"
+
+#include <QObject>
+#include <QUrl>
 
 /**
  * @brief Allows the DolphinView to control the view implementations for the

diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp
index 4444f64e76f4efc7747f21df371d760fdd285184..e5d636cd1e1626a51b421da2dbf51e49e34c5bd0 100644 (file)
--- a/src/views/viewproperties.cpp
+++ b/src/views/viewproperties.cpp
@@ -22,7 +22,6 @@
 
 #include "dolphin_directoryviewpropertysettings.h"
 #include "dolphin_generalsettings.h"
-
 #include "dolphindebug.h"
 
 #include <QCryptographicHash>

diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h
index 05b80f45551d0e3419a178360a1e360125600c2a..6a3f18e6bdc129e21679e8bfee2c340b6f5731c1 100644 (file)
--- a/src/views/viewproperties.h
+++ b/src/views/viewproperties.h
@@ -21,9 +21,10 @@
 #ifndef VIEWPROPERTIES_H
 #define VIEWPROPERTIES_H
 
-#include <views/dolphinview.h>
-#include <QUrl>
 #include "dolphin_export.h"
+#include "views/dolphinview.h"
+
+#include <QUrl>
 
 class ViewPropertySettings;
 /**

diff --git a/src/views/zoomlevelinfo.cpp b/src/views/zoomlevelinfo.cpp
index faca8fd5d77ee906ed4416db758f148c74c199c1..d64974d2944404f5335b2e99e8e76ac180ad657a 100644 (file)
--- a/src/views/zoomlevelinfo.cpp
+++ b/src/views/zoomlevelinfo.cpp
@@ -18,7 +18,9 @@
  ***************************************************************************/
 
 #include "zoomlevelinfo.h"
+
 #include <KIconLoader>
+
 #include <QSize>
 
 int ZoomLevelInfo::minimumLevel()