From 48b58f830a585b773435c9af5ee2fe8f0c7c641d Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Sun, 4 Mar 2018 16:38:16 +0300 Subject: 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/views/dolphinfileitemlistwidget.cpp | 4 +- src/views/dolphinfileitemlistwidget.h | 3 +- src/views/dolphinitemlistview.cpp | 15 ++--- src/views/dolphinitemlistview.h | 5 +- src/views/dolphinnewfilemenuobserver.h | 4 +- src/views/dolphinremoteencoding.cpp | 16 ++--- src/views/dolphinremoteencoding.h | 6 +- src/views/dolphinview.cpp | 70 +++++++++++----------- src/views/dolphinview.h | 10 ++-- src/views/dolphinviewactionhandler.cpp | 16 +++-- src/views/dolphinviewactionhandler.h | 1 + src/views/draganddrophelper.cpp | 8 +-- src/views/draganddrophelper.h | 2 +- src/views/renamedialog.cpp | 12 ++-- src/views/renamedialog.h | 3 +- src/views/tooltips/dolphinfilemetadatawidget.cpp | 15 +++-- src/views/tooltips/dolphinfilemetadatawidget.h | 3 +- src/views/tooltips/tooltipmanager.cpp | 3 +- src/views/tooltips/tooltipmanager.h | 4 +- src/views/versioncontrol/kversioncontrolplugin.h | 3 +- src/views/versioncontrol/updateitemstatesthread.h | 2 +- .../versioncontrol/versioncontrolobserver.cpp | 7 +-- src/views/versioncontrol/versioncontrolobserver.h | 2 +- src/views/viewmodecontroller.h | 7 ++- src/views/viewproperties.cpp | 1 - src/views/viewproperties.h | 5 +- src/views/zoomlevelinfo.cpp | 2 + 27 files changed, 115 insertions(+), 114 deletions(-) (limited to 'src/views') diff --git a/src/views/dolphinfileitemlistwidget.cpp b/src/views/dolphinfileitemlistwidget.cpp index 197fe5591..3a1572de9 100644 --- a/src/views/dolphinfileitemlistwidget.cpp +++ b/src/views/dolphinfileitemlistwidget.cpp @@ -19,10 +19,10 @@ #include "dolphinfileitemlistwidget.h" -#include - #include "dolphindebug.h" +#include + DolphinFileItemListWidget::DolphinFileItemListWidget(KItemListWidgetInformant* informant, QGraphicsItem* parent) : KFileItemListWidget(informant, parent) diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h index a04bc6828..5c2d17eec 100644 --- a/src/views/dolphinfileitemlistwidget.h +++ b/src/views/dolphinfileitemlistwidget.h @@ -21,8 +21,7 @@ #define DOLPHINFILEITEMLISTWIDGET_H #include "dolphin_export.h" - -#include +#include "kitemviews/kfileitemlistwidget.h" #include "versioncontrol/kversioncontrolplugin.h" /** diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp index be142205d..0655b3308 100644 --- 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 -#include +#include "kitemviews/kfileitemmodel.h" +#include "kitemviews/kitemlistcontroller.h" +#include "views/viewmodecontroller.h" +#include "zoomlevelinfo.h" #include -#include - -#include "zoomlevelinfo.h" - DolphinItemListView::DolphinItemListView(QGraphicsWidget* parent) : KFileItemListView(parent), diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h index ff14fbe7c..b8e3ab7de 100644 --- a/src/views/dolphinitemlistview.h +++ b/src/views/dolphinitemlistview.h @@ -20,10 +20,9 @@ #ifndef DOLPHINITEMLISTVIEW_H #define DOLPHINITEMLISTVIEW_H -#include -#include - #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 2386bce1e..6bb42ed82 100644 --- a/src/views/dolphinnewfilemenuobserver.h +++ b/src/views/dolphinnewfilemenuobserver.h @@ -20,10 +20,10 @@ #ifndef DOLPHINNEWFILEMENUOBSERVER_H #define DOLPHINNEWFILEMENUOBSERVER_H -#include - #include "dolphin_export.h" +#include + class DolphinNewFileMenu; /** diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index bdf747f08..269cc3085 100644 --- 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 + #include -#include +#include #include -#include -#include -#include -#include +#include #include +#include #include +#include +#include + +#include #define DATA_KEY QStringLiteral("Charset") diff --git a/src/views/dolphinremoteencoding.h b/src/views/dolphinremoteencoding.h index ca1cea2c7..bcb0d7901 100644 --- a/src/views/dolphinremoteencoding.h +++ b/src/views/dolphinremoteencoding.h @@ -20,11 +20,11 @@ #ifndef DOLPHINREMOTEENCODING_H #define DOLPHINREMOTEENCODING_H -#include -#include -#include #include "dolphin_export.h" +#include +#include +#include class KActionMenu; class DolphinViewActionHandler; diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 463ab51ba..acd66eb57 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -20,44 +20,17 @@ #include "dolphinview.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#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 +#include #endif +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include DolphinView::DolphinView(const QUrl& url, QWidget* parent) : QWidget(parent), diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 61f6af1e2..ea1b9c007 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -21,16 +21,16 @@ #ifndef DOLPHINVIEW_H #define DOLPHINVIEW_H -#include - #include "dolphin_export.h" -#include #include -#include #include -#include +#include +#include +#include + #include +#include #include typedef KIO::FileUndoManager::CommandType CommandType; diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index 9fff160b2..2b3a241a3 100644 --- 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 -#include - +#ifdef HAVE_BALOO +#include +#endif #include #include -#include #include #include #include #include -#include "dolphindebug.h" - -#ifdef HAVE_BALOO - #include -#endif +#include +#include DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) : QObject(parent), diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h index eb375b5c9..be2273917 100644 --- a/src/views/dolphinviewactionhandler.h +++ b/src/views/dolphinviewactionhandler.h @@ -24,6 +24,7 @@ #include "dolphin_export.h" #include "views/dolphinview.h" + #include class KToggleAction; diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp index bd4374ec3..d437b877e 100644 --- a/src/views/draganddrophelper.cpp +++ b/src/views/draganddrophelper.cpp @@ -20,13 +20,13 @@ #include "draganddrophelper.h" -#include -#include -#include - #include #include +#include +#include +#include + QHash DragAndDropHelper::m_urlListMatchesUrlCache; bool DragAndDropHelper::urlListMatchesUrl(const QList& urls, const QUrl& destUrl) diff --git a/src/views/draganddrophelper.h b/src/views/draganddrophelper.h index 0c7eadc6c..1a6b5900e 100644 --- a/src/views/draganddrophelper.h +++ b/src/views/draganddrophelper.h @@ -22,10 +22,10 @@ #define DRAGANDDROPHELPER_H #include "dolphin_export.h" + #include #include - class QDropEvent; class QWidget; namespace KIO { class DropJob; } diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 24b7986be..44c0a5a7b 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -19,21 +19,21 @@ #include "renamedialog.h" -#include -#include +#include +#include #include #include #include -#include +#include +#include +#include #include #include +#include #include -#include #include -#include #include -#include RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) : QDialog(parent), diff --git a/src/views/renamedialog.h b/src/views/renamedialog.h index 8da770895..5b04f857c 100644 --- a/src/views/renamedialog.h +++ b/src/views/renamedialog.h @@ -22,8 +22,9 @@ #include "dolphin_export.h" -#include #include + +#include #include class QLineEdit; diff --git a/src/views/tooltips/dolphinfilemetadatawidget.cpp b/src/views/tooltips/dolphinfilemetadatawidget.cpp index fcf51a240..1df6a6673 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.cpp +++ b/src/views/tooltips/dolphinfilemetadatawidget.cpp @@ -24,20 +24,19 @@ #include #include #include -#include - -#include -#include -#include -#include -#include - #ifndef HAVE_BALOO #include #else #include #endif +#include +#include +#include +#include +#include +#include + DolphinFileMetaDataWidget::DolphinFileMetaDataWidget(QWidget* parent) : QWidget(parent), m_preview(nullptr), diff --git a/src/views/tooltips/dolphinfilemetadatawidget.h b/src/views/tooltips/dolphinfilemetadatawidget.h index e7459b197..1e2cfadb6 100644 --- a/src/views/tooltips/dolphinfilemetadatawidget.h +++ b/src/views/tooltips/dolphinfilemetadatawidget.h @@ -22,9 +22,10 @@ #ifndef DOLPHINFILEMETADATAWIDGET_H #define DOLPHINFILEMETADATAWIDGET_H -#include #include +#include + class KFileItemList; class QLabel; diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index 3d3598ff5..19c87b084 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -20,7 +20,7 @@ #include "tooltipmanager.h" #include "dolphinfilemetadatawidget.h" -#include + #include #include #include @@ -28,6 +28,7 @@ #include #include +#include #include #include #include diff --git a/src/views/tooltips/tooltipmanager.h b/src/views/tooltips/tooltipmanager.h index 746d6cb67..f6d2b7304 100644 --- a/src/views/tooltips/tooltipmanager.h +++ b/src/views/tooltips/tooltipmanager.h @@ -20,11 +20,11 @@ #ifndef TOOLTIPMANAGER_H #define TOOLTIPMANAGER_H +#include + #include #include -#include - class DolphinFileMetaDataWidget; class KToolTipWidget; class QTimer; diff --git a/src/views/versioncontrol/kversioncontrolplugin.h b/src/views/versioncontrol/kversioncontrolplugin.h index a3be381f3..d59da515b 100644 --- a/src/views/versioncontrol/kversioncontrolplugin.h +++ b/src/views/versioncontrol/kversioncontrolplugin.h @@ -22,8 +22,9 @@ #include -#include #include +#include + class KFileItemList; class KFileItem; /** diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h index d33a64cc7..92563faa5 100644 --- a/src/views/versioncontrol/updateitemstatesthread.h +++ b/src/views/versioncontrol/updateitemstatesthread.h @@ -21,7 +21,7 @@ #define UPDATEITEMSTATESTHREAD_H #include "dolphin_export.h" -#include +#include "views/versioncontrol/versioncontrolobserver.h" #include #include diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 459bef0e9..7295a245a 100644 --- 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 #include -#include "dolphindebug.h" #include -#include - -#include "updateitemstatesthread.h" #include diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index 2c2fe2940..ea0834e65 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -26,10 +26,10 @@ #include -#include #include #include #include +#include class KFileItemList; class KFileItemModel; diff --git a/src/views/viewmodecontroller.h b/src/views/viewmodecontroller.h index 6fa43c38b..2cc5c6c91 100644 --- a/src/views/viewmodecontroller.h +++ b/src/views/viewmodecontroller.h @@ -20,10 +20,11 @@ #ifndef VIEWMODECONTROLLER_H #define VIEWMODECONTROLLER_H -#include -#include #include "dolphin_export.h" -#include +#include "views/dolphinview.h" + +#include +#include /** * @brief Allows the DolphinView to control the view implementations for the diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 4444f64e7..e5d636cd1 100644 --- 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 diff --git a/src/views/viewproperties.h b/src/views/viewproperties.h index 05b80f455..6a3f18e6b 100644 --- a/src/views/viewproperties.h +++ b/src/views/viewproperties.h @@ -21,9 +21,10 @@ #ifndef VIEWPROPERTIES_H #define VIEWPROPERTIES_H -#include -#include #include "dolphin_export.h" +#include "views/dolphinview.h" + +#include class ViewPropertySettings; /** diff --git a/src/views/zoomlevelinfo.cpp b/src/views/zoomlevelinfo.cpp index faca8fd5d..d64974d29 100644 --- a/src/views/zoomlevelinfo.cpp +++ b/src/views/zoomlevelinfo.cpp @@ -18,7 +18,9 @@ ***************************************************************************/ #include "zoomlevelinfo.h" + #include + #include int ZoomLevelInfo::minimumLevel() -- cgit v1.3