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/panels/folders/foldersitemlistwidget.h | 2 +- src/panels/folders/folderspanel.cpp | 21 ++++++------ src/panels/folders/folderspanel.h | 3 +- src/panels/folders/treeviewcontextmenu.cpp | 22 ++++++------- src/panels/folders/treeviewcontextmenu.h | 3 +- .../filemetadataconfigurationdialog.cpp | 9 +++--- .../information/filemetadataconfigurationdialog.h | 5 +-- src/panels/information/informationpanel.cpp | 2 ++ src/panels/information/informationpanel.h | 4 ++- src/panels/information/informationpanelcontent.cpp | 7 ++-- src/panels/information/informationpanelcontent.h | 5 ++- src/panels/information/phononwidget.cpp | 9 ++---- src/panels/information/phononwidget.h | 6 ++-- src/panels/information/pixmapviewer.h | 2 +- src/panels/panel.h | 2 +- src/panels/places/placesitem.cpp | 3 +- src/panels/places/placesitem.h | 11 ++++--- src/panels/places/placesitemeditdialog.cpp | 8 +++-- src/panels/places/placesitemlistgroupheader.h | 2 +- src/panels/places/placesitemlistwidget.h | 2 +- src/panels/places/placesitemmodel.cpp | 21 ++++++------ src/panels/places/placesitemmodel.h | 9 +++--- src/panels/places/placespanel.cpp | 37 +++++++++++----------- src/panels/places/placespanel.h | 5 +-- src/panels/places/placesview.h | 2 +- src/panels/terminal/terminalpanel.cpp | 14 ++++---- src/panels/terminal/terminalpanel.h | 2 +- 27 files changed, 113 insertions(+), 105 deletions(-) (limited to 'src/panels') diff --git a/src/panels/folders/foldersitemlistwidget.h b/src/panels/folders/foldersitemlistwidget.h index 5a4595c4a..ef4cf7242 100644 --- a/src/panels/folders/foldersitemlistwidget.h +++ b/src/panels/folders/foldersitemlistwidget.h @@ -20,7 +20,7 @@ #ifndef FOLDERSITEMLISTWIDGET_H #define FOLDERSITEMLISTWIDGET_H -#include +#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 e455780e0..61417dc5e 100644 --- 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 -#include -#include -#include -#include -#include +#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 #include @@ -44,10 +45,6 @@ #include #include -#include - -#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 f67c19cbb..5b9dc3b15 100644 --- 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 -#include class KFileItemModel; class KItemListController; diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 99802ed18..bf97c6d8f 100644 --- 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 +#include #include #include +#include #include -#include +#include +#include #include -#include -#include -#include -#include #include -#include -#include -#include #include - -#include "folderspanel.h" +#include +#include #include #include +#include #include #include -#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 3e61c4941..a9491fb5c 100644 --- a/src/panels/folders/treeviewcontextmenu.h +++ b/src/panels/folders/treeviewcontextmenu.h @@ -20,9 +20,10 @@ #ifndef TREEVIEWCONTEXTMENU_H #define TREEVIEWCONTEXTMENU_H -#include #include +#include + class QMimeData; class FoldersPanel; diff --git a/src/panels/information/filemetadataconfigurationdialog.cpp b/src/panels/information/filemetadataconfigurationdialog.cpp index f33ad7a02..3b3789175 100644 --- a/src/panels/information/filemetadataconfigurationdialog.cpp +++ b/src/panels/information/filemetadataconfigurationdialog.cpp @@ -24,14 +24,15 @@ #else #include #endif -#include -#include -#include -#include #include +#include +#include #include + #include +#include #include +#include FileMetaDataConfigurationDialog::FileMetaDataConfigurationDialog(QWidget* parent) : QDialog(parent), diff --git a/src/panels/information/filemetadataconfigurationdialog.h b/src/panels/information/filemetadataconfigurationdialog.h index 912fadadc..cf3e952cb 100644 --- a/src/panels/information/filemetadataconfigurationdialog.h +++ b/src/panels/information/filemetadataconfigurationdialog.h @@ -20,13 +20,14 @@ #ifndef FILEMETADATACONFIGURATIONDIALOG_H #define FILEMETADATACONFIGURATIONDIALOG_H -#include #include #include - #ifndef HAVE_BALOO class KFileMetaDataConfigurationWidget; #else + +#include + namespace Baloo { class FileMetaDataConfigWidget; } diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index ac987c9b4..042849b25 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -20,10 +20,12 @@ #include "informationpanel.h" #include "informationpanelcontent.h" + #include #include #include #include + #include #include #include diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h index 89a1bc3d2..6bb5862d6 100644 --- a/src/panels/information/informationpanel.h +++ b/src/panels/information/informationpanel.h @@ -20,8 +20,10 @@ #ifndef INFORMATIONPANEL_H #define INFORMATIONPANEL_H -#include +#include "panels/panel.h" + #include + class InformationPanelContent; namespace KIO { diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 7507d54fb..f44a3feb7 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -21,14 +21,15 @@ #include #include -#include #include #include -#include +#include #include -#include #include #include + +#include +#include #include #ifndef HAVE_BALOO diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index a6c2b5622..80f3c8e22 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -20,12 +20,11 @@ #ifndef INFORMATIONPANELCONTENT_H #define INFORMATIONPANELCONTENT_H -#include - #include +#include -#include #include +#include #include class KFileItemList; diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 94523c40d..fed6b0ee2 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -20,19 +20,16 @@ #include "phononwidget.h" +#include +#include #include #include #include -#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 -#pragma GCC diagnostic pop -#include #include #include -#include -#include +#include class EmbeddedVideoPlayer : public Phonon::VideoWidget { diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h index eff613bd9..971e8c731 100644 --- a/src/panels/information/phononwidget.h +++ b/src/panels/information/phononwidget.h @@ -21,12 +21,12 @@ #ifndef PHONONWIDGET_H #define PHONONWIDGET_H -#include +#include + #include +#include #include -#include - namespace Phonon { class AudioOutput; diff --git a/src/panels/information/pixmapviewer.h b/src/panels/information/pixmapviewer.h index f6b456ee6..46e5cf5fc 100644 --- a/src/panels/information/pixmapviewer.h +++ b/src/panels/information/pixmapviewer.h @@ -20,10 +20,10 @@ #ifndef PIXMAPVIEWER_H #define PIXMAPVIEWER_H -#include #include #include #include +#include class QPaintEvent; diff --git a/src/panels/panel.h b/src/panels/panel.h index 84d73e74c..ec3405ad2 100644 --- a/src/panels/panel.h +++ b/src/panels/panel.h @@ -21,8 +21,8 @@ #ifndef PANEL_H #define PANEL_H -#include #include +#include /** * @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 a1e4611a5..20c19e152 100644 --- 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 #include -#include "placesitemsignalhandler.h" #include PlacesItem::PlacesItem(const KBookmark& bookmark, PlacesItem* parent) : diff --git a/src/panels/places/placesitem.h b/src/panels/places/placesitem.h index 733265d46..680590dcd 100644 --- 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 -#include -#include -#include #include #include +#include #include #include -#include + +#include +#include + class KDirLister; class PlacesItemSignalHandler; diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 9722eb586..289b511af 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -23,18 +23,20 @@ #include "placesitemeditdialog.h" -#include #include "dolphindebug.h" + +#include #include #include #include -#include #include + #include +#include #include #include -#include #include +#include PlacesItemEditDialog::PlacesItemEditDialog(QWidget* parent) : QDialog(parent), diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h index 727662241..ef14b5c9d 100644 --- a/src/panels/places/placesitemlistgroupheader.h +++ b/src/panels/places/placesitemlistgroupheader.h @@ -20,7 +20,7 @@ #ifndef PLACESITEMLISTGROUPHEADER_H #define PLACESITEMLISTGROUPHEADER_H -#include +#include "kitemviews/kstandarditemlistgroupheader.h" class PlacesItemListGroupHeader : public KStandardItemListGroupHeader { diff --git a/src/panels/places/placesitemlistwidget.h b/src/panels/places/placesitemlistwidget.h index 3be5dde7c..ab78564c3 100644 --- a/src/panels/places/placesitemlistwidget.h +++ b/src/panels/places/placesitemlistwidget.h @@ -20,7 +20,7 @@ #ifndef PLACESITEMLISTWIDGET_H #define PLACESITEMLISTWIDGET_H -#include +#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 76b22f1fd..207a98271 100644 --- 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 -#include -#include #include "placesitem.h" -#include -#include -#include -#include +#include "placesitemsignalhandler.h" +#include "views/dolphinview.h" +#include "views/viewproperties.h" +#include +#include +#include #include #include -#include -#include +#include +#include +#include +#include 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 a1b23b220..1aa31facd 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -20,15 +20,16 @@ #ifndef PLACESITEMMODEL_H #define PLACESITEMMODEL_H -#include +#include "kitemviews/kstandarditemmodel.h" + #include +#include +#include -#include #include #include #include -#include -#include +#include class KBookmark; class KBookmarkManager; diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index e2bdeaafa..29acd034c 100644 --- 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 +#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 -#include -#include +#include +#include #include #include +#include #include -#include +#include #include #include -#include -#include -#include -#include -#include -#include #include #include -#include "placesitem.h" -#include "placesitemeditdialog.h" -#include "placesitemlistgroupheader.h" -#include "placesitemlistwidget.h" -#include "placesitemmodel.h" -#include "placesview.h" -#include + #include +#include +#include #include PlacesPanel::PlacesPanel(QWidget* parent) : diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h index 444785888..7159357f8 100644 --- a/src/panels/places/placespanel.h +++ b/src/panels/places/placespanel.h @@ -21,9 +21,10 @@ #ifndef PLACESPANEL_H #define PLACESPANEL_H -#include +#include "panels/panel.h" + #include -#include +#include class KItemListController; class PlacesItem; diff --git a/src/panels/places/placesview.h b/src/panels/places/placesview.h index ba7193525..ffafa30b7 100644 --- a/src/panels/places/placesview.h +++ b/src/panels/places/placesview.h @@ -20,7 +20,7 @@ #ifndef PLACESVIEW_H #define PLACESVIEW_H -#include +#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 7bd811b38..4f77f6136 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -19,17 +19,15 @@ #include "terminalpanel.h" -#include - -#include -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include +#include #include #include diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h index b078b76e3..b36f24142 100644 --- a/src/panels/terminal/terminalpanel.h +++ b/src/panels/terminal/terminalpanel.h @@ -20,7 +20,7 @@ #ifndef TERMINALPANEL_H #define TERMINALPANEL_H -#include +#include "panels/panel.h" #include -- cgit v1.3