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

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()

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,

src/dolphincontextmenu.h

@@ -20,13 +20,11 @@
 #ifndef DOLPHINCONTEXTMENU_H
 #define DOLPHINCONTEXTMENU_H
 
-#include <KFileItem>
-#include <QUrl>
 #include <KFileCopyToMenu>
+#include <KFileItem>
+
 #include <QMenu>
-
-
-
+#include <QUrl>
 
 class QAction;
 class DolphinMainWindow;

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 <KHelpMenu>
-#include <KJobWidgets>
-#include <QLineEdit>
-#include <KToolBar>
-#include <KIO/JobUiDelegate>
-#include <KLocalizedString>
-#include <KProtocolManager>
-#include <KProtocolInfo>
-#include <QMenu>
-#include <KMessageBox>
-#include <KFilePlacesModel>
 #include <KFileItemListProperties>
+#include <KFilePlacesModel>
+#include <KHelpMenu>
+#include <KIO/JobUiDelegate>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMessageBox>
+#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

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;
 

src/dolphinnewfilemenu.h

@@ -21,10 +21,10 @@
 #ifndef DOLPHINNEWFILEMENU_H
 #define DOLPHINNEWFILEMENU_H
 
-#include <KNewFileMenu>
-
 #include "dolphin_export.h"
 
+#include <KNewFileMenu>
+
 class KJob;
 
 /**

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 <KToolInvocation>
 
-#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 <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>();)
 

src/dolphinpart.h

@@ -21,8 +21,8 @@
 #define DOLPHINPART_H
 
 #include <KParts/ReadOnlyPart>
-#include <QUrl>
 
+#include <QUrl>
 
 class DolphinNewFileMenu;
 class DolphinViewActionHandler;

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)

src/dolphinpart_ext.h

@@ -24,6 +24,7 @@
 #include <kparts/fileinfoextension.h>
 #include <kparts/listingfilterextension.h>
 #include <kparts/listingnotificationextension.h>
+
 #include <QUrl>
 
 class DolphinPart;

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) :

src/dolphinrecenttabsmenu.h

@@ -21,6 +21,7 @@
 #define DOLPHIN_RECENT_TABS_MENU_H
 
 #include <KActionMenu>
+
 #include <QUrl>
 
 class QAction;

src/dolphinremoveaction.cpp

@@ -22,9 +22,6 @@
 
 #include <QApplication>
 
-#include <KLocalizedString>
-
-
 DolphinRemoveAction::DolphinRemoveAction(QObject* parent, KActionCollection* collection) :
     QAction(parent),
     m_collection(collection)

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.

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),

src/dolphintabpage.cpp

@@ -19,8 +19,8 @@
 
 #include "dolphintabpage.h"
 
-#include "dolphinviewcontainer.h"
 #include "dolphin_generalsettings.h"
+#include "dolphinviewcontainer.h"
 
 #include <QSplitter>
 #include <QVBoxLayout>

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;

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),

src/dolphinviewcontainer.cpp

@@ -18,38 +18,35 @@
  ***************************************************************************/
 
 #include "dolphinviewcontainer.h"
-#include <KProtocolManager>
 
-#include <QDropEvent>
-#include <QTimer>
-#include <QMimeData>
-#include <QVBoxLayout>
-#include <QLoggingCategory>
-
-#include <KFileItemActions>
-#include <KFilePlacesModel>
-#include <KLocalizedString>
-#include <KIO/PreviewJob>
-#include <kio_version.h>
-#include <KMessageWidget>
-#include <KShell>
-#include <QUrl>
-#include <KUrlComboBox>
-#include <KUrlNavigator>
-#include <KRun>
-
-#ifdef KActivities_FOUND
-#endif
-
-#include "global.h"
-#include "dolphindebug.h"
 #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 <KIO/PreviewJob>
+#include <KLocalizedString>
+#include <KMessageWidget>
+#include <KProtocolManager>
+#include <KRun>
+#include <KShell>
+#include <KUrlComboBox>
+#include <KUrlNavigator>
+#include <kio_version.h>
+
+#include <QDropEvent>
+#include <QLoggingCategory>
+#include <QMimeData>
+#include <QTimer>
+#include <QUrl>
+#include <QVBoxLayout>
+
 DolphinViewContainer::DolphinViewContainer(const QUrl& url, QWidget* parent) :
     QWidget(parent),
     m_topLayout(nullptr),

src/dolphinviewcontainer.h

@@ -20,18 +20,17 @@
 #ifndef DOLPHINVIEWCONTAINER_H
 #define DOLPHINVIEWCONTAINER_H
 
-#include <KFileItem>
-#include <KCompletion>
-#include <KIO/Job>
+#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;

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)

src/global.cpp

@@ -18,8 +18,9 @@
  */
 
 #include "global.h"
-#include "dolphindebug.h"
+
 #include "dolphin_generalsettings.h"
+#include "dolphindebug.h"
 
 #include <KRun>
 

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
 

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;

src/kitemviews/kfileitemlistwidget.cpp

@@ -21,8 +21,9 @@
 #include "kfileitemmodel.h"
 #include "kitemlistview.h"
 
-#include <KLocalizedString>
 #include <KFormat>
+#include <KLocalizedString>
+
 #include <QMimeDatabase>
 
 KFileItemListWidgetInformant::KFileItemListWidgetInformant() :

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
 {

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>

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>
 

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
 

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>

src/kitemviews/kitemlistcontainer.cpp

@@ -24,7 +24,6 @@
 
 #include "kitemlistcontroller.h"
 #include "kitemlistview.h"
-
 #include "private/kitemlistsmoothscroller.h"
 
 #include <QApplication>

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),

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;

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>

src/kitemviews/kitemlistheader.cpp

@@ -19,7 +19,6 @@
 
 #include "kitemlistheader.h"
 #include "kitemlistview.h"
-
 #include "private/kitemlistheaderwidget.h"
 
 KItemListHeader::~KItemListHeader()

src/kitemviews/kitemlistheader.h

@@ -21,6 +21,7 @@
 #define KITEMLISTHEADER_H
 
 #include "dolphin_export.h"
+
 #include <QHash>
 #include <QObject>
 

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>
 

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

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>
 

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
 {

src/kitemviews/kitemlistwidget.cpp

@@ -23,10 +23,8 @@
 #include "kitemlistwidget.h"
 
 #include "kitemlistview.h"
-
 #include "private/kitemlistselectiontoggle.h"
 
-
 #include <QApplication>
 #include <QPainter>
 #include <QPropertyAnimation>

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>

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;

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.

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>

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)

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.

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
 

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>

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>
 

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
 {

src/kitemviews/private/kbaloorolesprovider.h

@@ -26,6 +26,7 @@
 #include <QHash>
 #include <QSet>
 #include <QVariant>
+
 namespace Baloo {
     class File;
 }

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) :

src/kitemviews/private/kdirectorycontentscounter.h

@@ -23,8 +23,8 @@
 
 #include "kdirectorycontentscounterworker.h"
 
-#include <QSet>
 #include <QQueue>
+#include <QSet>
 
 class KDirWatch;
 class KFileItemModel;

src/kitemviews/private/kfileitemclipboard.cpp

@@ -19,10 +19,11 @@
 
 #include "kfileitemclipboard.h"
 
+#include <KUrlMimeData>
+
 #include <QApplication>
 #include <QClipboard>
 #include <QMimeData>
-#include <KUrlMimeData>
 
 class KFileItemClipboardSingleton
 {

src/kitemviews/private/kfileitemclipboard.h

@@ -20,13 +20,13 @@
 #ifndef KFILEITEMCLIPBOARD_H
 #define KFILEITEMCLIPBOARD_H
 
-#include <QUrl>
-#include <QList>
-#include <QSet>
-#include <QObject>
-
 #include "dolphin_export.h"
 
+#include <QList>
+#include <QObject>
+#include <QSet>
+#include <QUrl>
+
 /**
  * @brief Wrapper for QClipboard to provide fast access for checking
  *        whether a KFileItem has been clipped.

src/kitemviews/private/kfileitemmodeldirlister.cpp

@@ -18,6 +18,7 @@
  ***************************************************************************/
 
 #include "kfileitemmodeldirlister.h"
+
 #include <KLocalizedString>
 #include <KIO/Job>
 

src/kitemviews/private/kfileitemmodeldirlister.h

@@ -21,7 +21,9 @@
 #define KFILEITEMMODELDIRLISTER_H
 
 #include "dolphin_export.h"
+
 #include <KDirLister>
+
 #include <QUrl>
 
 /**

src/kitemviews/private/kfileitemmodelfilter.h

@@ -22,6 +22,7 @@
 #define KFILEITEMMODELFILTER_H
 
 #include "dolphin_export.h"
+
 #include <QStringList>
 
 class KFileItem;

src/kitemviews/private/kitemlistheaderwidget.cpp

@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistheaderwidget.h"
-
-#include <kitemviews/kitemmodelbase.h>
+#include "kitemviews/kitemmodelbase.h"
 
 #include <QApplication>
 #include <QGraphicsSceneHoverEvent>

src/kitemviews/private/kitemlistheaderwidget.h

@@ -21,6 +21,7 @@
 #define KITEMLISTHEADERWIDGET_H
 
 #include "dolphin_export.h"
+
 #include <QGraphicsWidget>
 #include <QHash>
 #include <QList>

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.

src/kitemviews/private/kitemlistrubberband.h

@@ -21,6 +21,7 @@
 #define KITEMLISTRUBBERBAND_H
 
 #include "dolphin_export.h"
+
 #include <QObject>
 #include <QPointF>
 

src/kitemviews/private/kitemlistselectiontoggle.cpp

@@ -20,6 +20,7 @@
 #include "kitemlistselectiontoggle.h"
 
 #include <KIconLoader>
+
 #include <QPainter>
 
 

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),

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>
 

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) :

src/kitemviews/private/kitemlistviewanimation.cpp

@@ -18,8 +18,7 @@
  ***************************************************************************/
 
 #include "kitemlistviewanimation.h"
-
-#include <kitemviews/kitemlistview.h>
+#include "kitemviews/kitemlistview.h"
 
 #include <QPropertyAnimation>
 

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
 

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] =
 {

src/main.cpp

@@ -19,21 +19,22 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
-#include "dolphin_version.h"
-#include "dolphinmainwindow.h"
-#include "dolphin_generalsettings.h"
 #include "dbusinterface.h"
-#include "global.h"
+#include "dolphin_generalsettings.h"
+#include "dolphin_version.h"
 #include "dolphindebug.h"
+#include "dolphinmainwindow.h"
+#include "global.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

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.

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),

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;

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/JobUiDelegate>
-#include <QMenu>
-#include <KJobWidgets>
-#include <KSharedConfig>
-#include <KConfigGroup>
-#include <KUrlMimeData>
-#include <KFileItemListProperties>
-#include <KLocalizedString>
-#include <KIO/PasteJob>
-#include <KIO/Paste>
 #include <KIO/FileUndoManager>
+#include <KIO/JobUiDelegate>
+#include <KIO/Paste>
+#include <KIO/PasteJob>
+#include <KJobWidgets>
+#include <KLocalizedString>
 #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) :

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;
 

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),

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;
 }

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>

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
 {

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

src/panels/information/informationpanelcontent.h

@@ -20,12 +20,11 @@
 #ifndef INFORMATIONPANELCONTENT_H
 #define INFORMATIONPANELCONTENT_H
 
+#include <KFileItem>
 #include <config-baloo.h>
 
-#include <KFileItem>
-
-#include <QUrl>
 #include <QPointer>
+#include <QUrl>
 #include <QWidget>
 
 class KFileItemList;

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
 {

src/panels/information/phononwidget.h

@@ -21,12 +21,12 @@
 #ifndef PHONONWIDGET_H
 #define PHONONWIDGET_H
 
-#include <QUrl>
-#include <QSize>
-#include <QWidget>
-
 #include <Phonon/Global>
 
+#include <QSize>
+#include <QUrl>
+#include <QWidget>
+
 namespace Phonon
 {
     class AudioOutput;

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;
 

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.

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) :

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;

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),

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
 {

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

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

src/panels/places/placesitemmodel.h

@@ -20,15 +20,16 @@
 #ifndef PLACESITEMMODEL_H
 #define PLACESITEMMODEL_H
 
-#include <kitemviews/kstandarditemmodel.h>
-#include <KFilePlacesModel>
+#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;

src/panels/places/placespanel.cpp

@@ -24,34 +24,35 @@
 #include "placespanel.h"
 
 #include "dolphin_generalsettings.h"
-
 #include "global.h"
-#include <KFileItem>
-#include <KDirNotify>
-#include <QIcon>
-#include <KIO/Job>
-#include <KIO/DropJob>
-#include <KIO/EmptyTrashJob>
-#include <KIO/JobUiDelegate>
-#include <KFilePlacesModel>
-#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 "kitemviews/kitemlistcontainer.h"
+#include "kitemviews/kitemlistcontroller.h"
+#include "kitemviews/kitemlistselectionmanager.h"
+#include "kitemviews/kstandarditem.h"
+#include "views/draganddrophelper.h"
+
+#include <KDirNotify>
+#include <KFileItem>
+#include <KFilePlacesModel>
+#include <KIO/DropJob>
+#include <KIO/EmptyTrashJob>
+#include <KIO/Job>
+#include <KIO/JobUiDelegate>
+#include <KIconLoader>
+#include <KJobWidgets>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KNotification>
+
 #include <QGraphicsSceneDragDropEvent>
+#include <QIcon>
+#include <QMenu>
 #include <QVBoxLayout>
 
 PlacesPanel::PlacesPanel(QWidget* parent) :

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;

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.

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>

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>
 

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),

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),