From 6f6b1bbb69ba6653879431b1c4dcb22c89efba81 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Fri, 10 Oct 2014 23:36:36 +0200 Subject: Clean includes + port to QMenu --- src/settings/services/servicessettingspage.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/settings/services/servicessettingspage.h') diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h index 80af42f88..7a56abd68 100644 --- a/src/settings/services/servicessettingspage.h +++ b/src/settings/services/servicessettingspage.h @@ -24,8 +24,6 @@ #include #include -class QCheckBox; -class QGroupBox; class QListView; class QSortFilterProxyModel; class ServiceModel; -- cgit v1.3 From 0a6257bce3de877e4ae869f974df645c428d32c9 Mon Sep 17 00:00:00 2001 From: Montel Laurent Date: Sat, 18 Oct 2014 15:00:17 +0200 Subject: Fix includes --- src/dolphinapplication.cpp | 2 -- src/dolphincontextmenu.cpp | 11 +---------- src/dolphincontextmenu.h | 4 ---- src/dolphinmainwindow.cpp | 17 ++++------------- src/dolphinmainwindow.h | 1 - src/dolphinpart.cpp | 12 +++++------- src/dolphinpart.h | 1 - src/dolphinrecenttabsmenu.cpp | 2 +- src/dolphintabpage.cpp | 1 + src/dolphinviewcontainer.cpp | 11 +---------- src/dolphinviewcontainer.h | 1 - src/kitemviews/kfileitemlistview.cpp | 5 ----- src/kitemviews/kfileitemlistwidget.cpp | 1 - src/kitemviews/kfileitemmodel.cpp | 1 - src/kitemviews/kfileitemmodelrolesupdater.cpp | 1 - src/kitemviews/kitemlistcontainer.cpp | 1 - src/kitemviews/kitemlistcontainer.h | 1 - src/kitemviews/kitemlistcontroller.h | 3 +-- src/kitemviews/kitemliststyleoption.cpp | 1 - src/kitemviews/kitemlistview.cpp | 2 -- src/kitemviews/kstandarditem.h | 1 - src/kitemviews/kstandarditemlistwidget.cpp | 2 -- .../private/kdirectorycontentscounterworker.h | 1 - src/kitemviews/private/kitemlistheaderwidget.cpp | 1 - .../private/kitemlistkeyboardsearchmanager.cpp | 2 -- src/kitemviews/private/kitemlistselectiontoggle.cpp | 1 - src/panels/folders/folderspanel.h | 2 +- src/panels/folders/treeviewcontextmenu.cpp | 1 - src/panels/information/informationpanel.h | 2 +- src/panels/information/informationpanelcontent.cpp | 3 +-- src/panels/information/informationpanelcontent.h | 3 +-- src/panels/information/pixmapviewer.cpp | 2 -- src/panels/panel.h | 1 - src/panels/places/placesitem.cpp | 1 - src/panels/places/placesitemeditdialog.cpp | 4 +--- src/panels/places/placesitemmodel.cpp | 2 +- src/panels/places/placespanel.cpp | 1 + src/panels/places/placespanel.h | 2 +- src/panels/terminal/terminalpanel.cpp | 2 +- src/panels/terminal/terminalpanel.h | 2 +- src/search/dolphinsearchbox.cpp | 2 -- src/search/dolphinsearchbox.h | 1 - src/settings/applyviewpropsjob.h | 1 - src/settings/dolphinsettingsdialog.cpp | 1 - src/settings/general/behaviorsettingspage.cpp | 4 ---- src/settings/general/generalsettingspage.cpp | 1 - src/settings/kcm/kcmdolphingeneral.cpp | 1 - src/settings/kcm/kcmdolphinnavigation.cpp | 3 --- src/settings/kcm/kcmdolphinservices.cpp | 3 --- src/settings/kcm/kcmdolphinviewmodes.cpp | 2 -- src/settings/navigation/navigationsettingspage.cpp | 1 - src/settings/services/servicessettingspage.h | 1 - src/settings/startup/startupsettingspage.cpp | 2 +- src/settings/viewmodes/dolphinfontrequester.cpp | 2 -- src/settings/viewmodes/viewsettingspage.cpp | 1 - src/settings/viewpropertiesdialog.cpp | 5 ----- src/settings/viewpropsprogressinfo.cpp | 2 +- src/statusbar/dolphinstatusbar.cpp | 6 +++--- src/statusbar/statusbarspaceinfo.cpp | 1 - src/statusbar/statusbarspaceinfo.h | 3 --- src/tests/kfileitemmodeltest.cpp | 1 - src/tests/viewpropertiestest.cpp | 1 - src/views/dolphinitemlistview.cpp | 2 -- src/views/dolphinremoteencoding.cpp | 2 -- src/views/dolphinview.cpp | 9 +-------- src/views/dolphinview.h | 6 +----- src/views/dolphinviewactionhandler.cpp | 2 +- src/views/dolphinviewactionhandler.h | 2 -- src/views/renamedialog.cpp | 4 +--- src/views/tooltips/filemetadatatooltip.cpp | 3 +-- src/views/tooltips/tooltipmanager.cpp | 2 -- src/views/versioncontrol/versioncontrolobserver.cpp | 1 - src/views/versioncontrol/versioncontrolobserver.h | 1 - src/views/viewproperties.cpp | 3 +-- 74 files changed, 35 insertions(+), 162 deletions(-) (limited to 'src/settings/services/servicessettingspage.h') diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp index 41812aaa9..8a6b4cc03 100644 --- a/src/dolphinapplication.cpp +++ b/src/dolphinapplication.cpp @@ -24,9 +24,7 @@ #include #include -#include #include -#include DolphinApplication::DolphinApplication() : m_mainWindow(0) diff --git a/src/dolphincontextmenu.cpp b/src/dolphincontextmenu.cpp index f3337a691..f597d52e3 100644 --- a/src/dolphincontextmenu.cpp +++ b/src/dolphincontextmenu.cpp @@ -27,37 +27,28 @@ #include "dolphinremoveaction.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 "views/dolphinview.h" #include "views/viewmodecontroller.h" diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 62dffd074..f082e1c6c 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -21,16 +21,12 @@ #define DOLPHINCONTEXTMENU_H #include -#include #include #include #include -#include -#include -#include class QAction; class DolphinMainWindow; diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index e6ef74ef3..3f83d054b 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -46,48 +46,39 @@ #include "dolphin_generalsettings.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 -#include -#include -#include +#include #include #include -#include #include #include #include +#include +#include namespace { // Used for GeneralSettings::version() to determine whether diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 3ea4e0e17..0505037ce 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -24,7 +24,6 @@ #include -#include #include #include #include diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 9d4de3fe9..6f84ab1d8 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -25,26 +25,22 @@ #include #include -#include #include -#include #include #include #include #include #include -#include -#include #include #include #include #include #include -#include #include +#include +#include #include "dolphinpart_ext.h" - #include "dolphinnewfilemenu.h" #include "views/dolphinview.h" #include "views/dolphinviewactionhandler.h" @@ -53,11 +49,13 @@ #include "kitemviews/kfileitemmodel.h" #include "kitemviews/private/kfileitemmodeldirlister.h" +#include #include +#include #include #include #include -#include + K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin();) K_EXPORT_PLUGIN(DolphinPartFactory("dolphinpart", "dolphin")) diff --git a/src/dolphinpart.h b/src/dolphinpart.h index 70886d10d..18ea0bfbf 100644 --- a/src/dolphinpart.h +++ b/src/dolphinpart.h @@ -23,7 +23,6 @@ #include #include -#include class DolphinNewFileMenu; class DolphinViewActionHandler; diff --git a/src/dolphinrecenttabsmenu.cpp b/src/dolphinrecenttabsmenu.cpp index f4492a214..bce3996f6 100644 --- a/src/dolphinrecenttabsmenu.cpp +++ b/src/dolphinrecenttabsmenu.cpp @@ -94,4 +94,4 @@ void DolphinRecentTabsMenu::handleAction(QAction* action) if (menu()->actions().count() <= 2) { setEnabled(false); } -} \ No newline at end of file +} diff --git a/src/dolphintabpage.cpp b/src/dolphintabpage.cpp index f7000ea66..763cd8f94 100644 --- a/src/dolphintabpage.cpp +++ b/src/dolphintabpage.cpp @@ -23,6 +23,7 @@ #include "dolphin_generalsettings.h" #include +#include DolphinTabPage::DolphinTabPage(const KUrl& primaryUrl, const KUrl& secondaryUrl, QWidget* parent) : QWidget(parent), diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 25207b5b7..14bc4b7bc 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -20,24 +20,16 @@ #include "dolphinviewcontainer.h" #include -#include -#include -#include -#include #include -#include #include +#include -#include -#include #include #include #include -#include #include #include #include -#include #include #include #include @@ -46,7 +38,6 @@ #include #ifdef KActivities_FOUND -#include #endif #include "dolphin_generalsettings.h" diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index 4ca76961c..ce2f606d5 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -21,7 +21,6 @@ #define DOLPHINVIEWCONTAINER_H #include -#include #include #include diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp index bb918d0de..32d390331 100644 --- a/src/kitemviews/kfileitemlistview.cpp +++ b/src/kitemviews/kfileitemlistview.cpp @@ -22,18 +22,13 @@ #include "kfileitemmodelrolesupdater.h" #include "kfileitemlistwidget.h" #include "kfileitemmodel.h" -#include -#include #include "private/kpixmapmodifier.h" #include #include -#include #include -#include #include -#include #include // #define KFILEITEMLISTVIEW_DEBUG diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp index 4938e9d6d..a304ea69c 100644 --- a/src/kitemviews/kfileitemlistwidget.cpp +++ b/src/kitemviews/kfileitemlistwidget.cpp @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index 25507c23d..489e4edb4 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -30,7 +30,6 @@ #include "private/kfileitemmodelsortalgorithm.h" #include "private/kfileitemmodeldirlister.h" -#include #include #include #include diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp index 256527c9e..8e9b9dd98 100644 --- a/src/kitemviews/kfileitemmodelrolesupdater.cpp +++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp index 5e45a1766..46ac4745e 100644 --- a/src/kitemviews/kitemlistcontainer.cpp +++ b/src/kitemviews/kitemlistcontainer.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index e599992df..3373059d1 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -25,7 +25,6 @@ #include -#include #include class KItemListController; diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index b07f117d0..99df53104 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -28,9 +28,8 @@ #include "kitemset.h" #include -#include #include - +class QTimer; class KItemModelBase; class KItemListKeyboardSearchManager; class KItemListSelectionManager; diff --git a/src/kitemviews/kitemliststyleoption.cpp b/src/kitemviews/kitemliststyleoption.cpp index edd6363c8..1ebcad141 100644 --- a/src/kitemviews/kitemliststyleoption.cpp +++ b/src/kitemviews/kitemliststyleoption.cpp @@ -19,7 +19,6 @@ #include "kitemliststyleoption.h" -#include KItemListStyleOption::KItemListStyleOption() : rect(), diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 8c93361e0..ea1ec3f3a 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -35,11 +35,9 @@ #include "private/kitemlistviewlayouter.h" #include "private/kitemlistviewanimation.h" -#include #include #include #include -#include #include #include #include diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h index 689db4251..59190bfd5 100644 --- a/src/kitemviews/kstandarditem.h +++ b/src/kitemviews/kstandarditem.h @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index b8557c67f..9a08a53db 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -34,7 +33,6 @@ #include "private/kitemlistroleeditor.h" #include "private/kpixmapmodifier.h" -#include #include #include #include diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.h b/src/kitemviews/private/kdirectorycontentscounterworker.h index 96831ef81..b2e31ef0f 100644 --- a/src/kitemviews/private/kdirectorycontentscounterworker.h +++ b/src/kitemviews/private/kdirectorycontentscounterworker.h @@ -20,7 +20,6 @@ #ifndef KDIRECTORYCONTENTENTSCOUNTERWORKER_H #define KDIRECTORYCONTENTENTSCOUNTERWORKER_H -#include #include #include diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp index 6b6530fd2..e820bd789 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.cpp +++ b/src/kitemviews/private/kitemlistheaderwidget.cpp @@ -19,7 +19,6 @@ #include "kitemlistheaderwidget.h" -#include #include #include diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp index 3bd1b01f3..ffa92a1cf 100644 --- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp +++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp @@ -22,8 +22,6 @@ #include "kitemlistkeyboardsearchmanager.h" -#include -#include KItemListKeyboardSearchManager::KItemListKeyboardSearchManager(QObject* parent) : QObject(parent), diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp index c33c15ec2..4daa55f9a 100644 --- a/src/kitemviews/private/kitemlistselectiontoggle.cpp +++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp @@ -19,7 +19,6 @@ #include "kitemlistselectiontoggle.h" -#include #include #include diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h index 14d8e8782..1d3039d1f 100644 --- a/src/panels/folders/folderspanel.h +++ b/src/panels/folders/folderspanel.h @@ -26,7 +26,7 @@ class KFileItemModel; class KItemListController; class QGraphicsSceneDragDropEvent; - +class KFileItem; /** * @brief Shows a tree view of the directories starting from * the currently selected place. diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 445b261b9..330e18560 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -21,7 +21,6 @@ #include "treeviewcontextmenu.h" #include -#include #include #include #include diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h index c68b66ee1..8a1237b95 100644 --- a/src/panels/information/informationpanel.h +++ b/src/panels/information/informationpanel.h @@ -21,7 +21,7 @@ #define INFORMATIONPANEL_H #include - +#include class InformationPanelContent; namespace KIO { diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index 0ec82a424..ce138baee 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -32,6 +32,7 @@ #include #include #include +#include #ifndef HAVE_BALOO #include @@ -49,10 +50,8 @@ #include #include #include -#include #include #include -#include #include #include #include diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index 67fdf6c5a..6e4faec82 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -21,12 +21,11 @@ #define INFORMATIONPANELCONTENT_H #include "config-baloo.h" -#include #include #include -#include #include +#include class KFileItemList; class PhononWidget; diff --git a/src/panels/information/pixmapviewer.cpp b/src/panels/information/pixmapviewer.cpp index 7b3a212f2..0053e43f9 100644 --- a/src/panels/information/pixmapviewer.cpp +++ b/src/panels/information/pixmapviewer.cpp @@ -21,10 +21,8 @@ #include -#include #include #include -#include PixmapViewer::PixmapViewer(QWidget* parent, Transition transition) : QWidget(parent), diff --git a/src/panels/panel.h b/src/panels/panel.h index a0b25d6cc..b2562dd6b 100644 --- a/src/panels/panel.h +++ b/src/panels/panel.h @@ -23,7 +23,6 @@ #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 e667af302..edfe02343 100644 --- a/src/panels/places/placesitem.cpp +++ b/src/panels/places/placesitem.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include "placesitemsignalhandler.h" #include diff --git a/src/panels/places/placesitemeditdialog.cpp b/src/panels/places/placesitemeditdialog.cpp index 87fbf4c29..0fae3f248 100644 --- a/src/panels/places/placesitemeditdialog.cpp +++ b/src/panels/places/placesitemeditdialog.cpp @@ -23,9 +23,7 @@ #include "placesitemeditdialog.h" -#include #include -#include #include #include #include @@ -34,11 +32,11 @@ #include #include #include +#include #include #include #include #include -#include #include #include diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 344e176a3..14d97de5b 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -28,11 +28,11 @@ #include #include #include -#include #include #include #include #include +#include #include #include #include diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index cdc1ebb1a..68c7fa558 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -25,6 +25,7 @@ #include "dolphin_generalsettings.h" +#include #include #include #include diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h index 3078f0222..1f7979eca 100644 --- a/src/panels/places/placespanel.h +++ b/src/panels/places/placespanel.h @@ -29,7 +29,7 @@ class PlacesItem; class PlacesItemModel; class PlacesView; class QGraphicsSceneDragDropEvent; - +class KJob; /** * @brief Combines bookmarks and mounted devices as list. */ diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index c8352f73a..964479628 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -31,9 +31,9 @@ #include #include -#include #include #include +#include TerminalPanel::TerminalPanel(QWidget* parent) : Panel(parent), diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h index 987ee4753..6a0b38f5b 100644 --- a/src/panels/terminal/terminalpanel.h +++ b/src/panels/terminal/terminalpanel.h @@ -33,7 +33,7 @@ namespace KIO { namespace KParts { class ReadOnlyPart; } - +class KJob; /** * @brief Shows the terminal which is synchronized with the URL of the * active view. diff --git a/src/search/dolphinsearchbox.cpp b/src/search/dolphinsearchbox.cpp index 94365c7de..050ae394d 100644 --- a/src/search/dolphinsearchbox.cpp +++ b/src/search/dolphinsearchbox.cpp @@ -26,12 +26,10 @@ #include #include #include -#include #include #include #include -#include #include #include #include diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index eba81346d..16a6ec0c1 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -21,7 +21,6 @@ #define DOLPHINSEARCHBOX_H #include -#include #include #include diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h index 68fdcc46b..1d817fe56 100644 --- a/src/settings/applyviewpropsjob.h +++ b/src/settings/applyviewpropsjob.h @@ -24,7 +24,6 @@ #define APPLYVIEWPROPSJOB_H #include -#include #include class ViewProperties; diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 43d95a0c6..678ef7b8e 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -31,7 +31,6 @@ #include "trash/trashsettingspage.h" #include -#include #include #include diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index af5308028..8d3e0ffb5 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -22,14 +22,10 @@ #include "dolphin_generalsettings.h" -#include -#include #include #include #include -#include -#include #include #include diff --git a/src/settings/general/generalsettingspage.cpp b/src/settings/general/generalsettingspage.cpp index 07a31bc49..f749c33ce 100644 --- a/src/settings/general/generalsettingspage.cpp +++ b/src/settings/general/generalsettingspage.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/src/settings/kcm/kcmdolphingeneral.cpp b/src/settings/kcm/kcmdolphingeneral.cpp index 82b216c3c..68f515ac3 100644 --- a/src/settings/kcm/kcmdolphingeneral.cpp +++ b/src/settings/kcm/kcmdolphingeneral.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include diff --git a/src/settings/kcm/kcmdolphinnavigation.cpp b/src/settings/kcm/kcmdolphinnavigation.cpp index e7892a246..5a0be61be 100644 --- a/src/settings/kcm/kcmdolphinnavigation.cpp +++ b/src/settings/kcm/kcmdolphinnavigation.cpp @@ -19,12 +19,9 @@ #include "kcmdolphinnavigation.h" -#include #include -#include #include #include -#include #include diff --git a/src/settings/kcm/kcmdolphinservices.cpp b/src/settings/kcm/kcmdolphinservices.cpp index ff0b09318..b00f58abc 100644 --- a/src/settings/kcm/kcmdolphinservices.cpp +++ b/src/settings/kcm/kcmdolphinservices.cpp @@ -19,12 +19,9 @@ #include "kcmdolphinservices.h" -#include #include -#include #include #include -#include #include diff --git a/src/settings/kcm/kcmdolphinviewmodes.cpp b/src/settings/kcm/kcmdolphinviewmodes.cpp index 83d697712..fc211cdab 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.cpp +++ b/src/settings/kcm/kcmdolphinviewmodes.cpp @@ -25,13 +25,11 @@ #include #include #include -#include #include #include #include -#include #include #include diff --git a/src/settings/navigation/navigationsettingspage.cpp b/src/settings/navigation/navigationsettingspage.cpp index 10e009faa..7ffb81115 100644 --- a/src/settings/navigation/navigationsettingspage.cpp +++ b/src/settings/navigation/navigationsettingspage.cpp @@ -28,7 +28,6 @@ #include #include -#include #include #include diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h index 7a56abd68..5dbb691af 100644 --- a/src/settings/services/servicessettingspage.h +++ b/src/settings/services/servicessettingspage.h @@ -21,7 +21,6 @@ #include -#include #include class QListView; diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index f1cdfecb8..2c436b541 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -31,11 +31,11 @@ #include #include +#include #include #include #include #include -#include #include "views/dolphinview.h" diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp index e5427f9f3..4d8b4813c 100644 --- a/src/settings/viewmodes/dolphinfontrequester.cpp +++ b/src/settings/viewmodes/dolphinfontrequester.cpp @@ -20,11 +20,9 @@ #include "dolphinfontrequester.h" #include -#include #include #include -#include #include #include #include diff --git a/src/settings/viewmodes/viewsettingspage.cpp b/src/settings/viewmodes/viewsettingspage.cpp index 2639c8bb4..2b657c264 100644 --- a/src/settings/viewmodes/viewsettingspage.cpp +++ b/src/settings/viewmodes/viewsettingspage.cpp @@ -27,7 +27,6 @@ #include #include -#include #include ViewSettingsPage::ViewSettingsPage(QWidget* parent) : diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp index 20229a34b..2e0b172b9 100644 --- a/src/settings/viewpropertiesdialog.cpp +++ b/src/settings/viewpropertiesdialog.cpp @@ -29,24 +29,19 @@ #include -#include #include -#include #include #include #include #include -#include #include #include #include #include #include -#include #include #include -#include #include diff --git a/src/settings/viewpropsprogressinfo.cpp b/src/settings/viewpropsprogressinfo.cpp index a75547609..091003416 100644 --- a/src/settings/viewpropsprogressinfo.cpp +++ b/src/settings/viewpropsprogressinfo.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/statusbar/dolphinstatusbar.cpp b/src/statusbar/dolphinstatusbar.cpp index 4892ee7a8..c5d7b45f6 100644 --- a/src/statusbar/dolphinstatusbar.cpp +++ b/src/statusbar/dolphinstatusbar.cpp @@ -21,11 +21,9 @@ #include "dolphin_generalsettings.h" -#include #include #include #include -#include #include "statusbarspaceinfo.h" @@ -33,10 +31,12 @@ #include #include #include -#include #include #include #include +#include +#include +#include #include #include diff --git a/src/statusbar/statusbarspaceinfo.cpp b/src/statusbar/statusbarspaceinfo.cpp index dd909beb4..1c9048304 100644 --- a/src/statusbar/statusbarspaceinfo.cpp +++ b/src/statusbar/statusbarspaceinfo.cpp @@ -25,7 +25,6 @@ #include #include -#include StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) : KCapacityBar(KCapacityBar::DrawTextInline, parent), diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h index 1065d9f45..597d91ef6 100644 --- a/src/statusbar/statusbarspaceinfo.h +++ b/src/statusbar/statusbarspaceinfo.h @@ -22,9 +22,6 @@ #include -#include -#include -#include #include diff --git a/src/tests/kfileitemmodeltest.cpp b/src/tests/kfileitemmodeltest.cpp index c584c5e62..3d505c766 100644 --- a/src/tests/kfileitemmodeltest.cpp +++ b/src/tests/kfileitemmodeltest.cpp @@ -20,7 +20,6 @@ #include -#include #include #include "kitemviews/kfileitemmodel.h" diff --git a/src/tests/viewpropertiestest.cpp b/src/tests/viewpropertiestest.cpp index 6c72a5706..d5584ce82 100644 --- a/src/tests/viewpropertiestest.cpp +++ b/src/tests/viewpropertiestest.cpp @@ -23,7 +23,6 @@ #include "views/viewproperties.h" #include "testdir.h" -#include #include class ViewPropertiesTest : public QObject diff --git a/src/views/dolphinitemlistview.cpp b/src/views/dolphinitemlistview.cpp index cd16aead0..60c8bb97c 100644 --- a/src/views/dolphinitemlistview.cpp +++ b/src/views/dolphinitemlistview.cpp @@ -30,8 +30,6 @@ #include #include -#include -#include #include diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp index 059b898e5..3b5fbcd71 100644 --- a/src/views/dolphinremoteencoding.cpp +++ b/src/views/dolphinremoteencoding.cpp @@ -31,8 +31,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp index 189849376..4ed32ed43 100644 --- a/src/views/dolphinview.cpp +++ b/src/views/dolphinview.cpp @@ -24,23 +24,18 @@ #include #include -#include #include #include #include -#include -#include #include #include #include #include - +#include #include #include -#include #include #include -#include #include #include #include @@ -59,11 +54,9 @@ #include #include #include -#include #include #include #include -#include #include #include "dolphinnewfilemenuobserver.h" diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 1616bcaa6..d6daf2826 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -27,18 +27,14 @@ #include #include -#include #include #include #include -#include -#include -#include #include typedef KIO::FileUndoManager::CommandType CommandType; - +class QVBoxLayout; class DolphinItemListView; class KFileItemModel; class KItemListContainer; diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp index c3d4319a2..84025a5f8 100644 --- a/src/views/dolphinviewactionhandler.cpp +++ b/src/views/dolphinviewactionhandler.cpp @@ -28,12 +28,12 @@ #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/src/views/dolphinviewactionhandler.h b/src/views/dolphinviewactionhandler.h index 58cdb5416..bf664f731 100644 --- a/src/views/dolphinviewactionhandler.h +++ b/src/views/dolphinviewactionhandler.h @@ -23,8 +23,6 @@ #define DOLPHINVIEWACTIONHANDLER_H #include "libdolphin_export.h" -#include -#include #include "views/dolphinview.h" #include diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index 82c4c8b9d..458b9ef79 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -22,19 +22,17 @@ #include #include #include -#include #include #include -#include #include //TODO port to QCollator #include #include +#include #include #include #include #include -#include #include #include #include diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp index afb1a32d3..11b9ecd1d 100644 --- a/src/views/tooltips/filemetadatatooltip.cpp +++ b/src/views/tooltips/filemetadatatooltip.cpp @@ -23,16 +23,15 @@ #include #include -#include // For the blurred tooltip background #include #include +#include #include #include #include #include -#include #include #include diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp index 25fa8e0ed..0636df795 100644 --- a/src/views/tooltips/tooltipmanager.cpp +++ b/src/views/tooltips/tooltipmanager.cpp @@ -28,8 +28,6 @@ #include #include #include -#include -#include #include #include diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index dca99ed11..ca8ef3bbc 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -31,7 +31,6 @@ #include "updateitemstatesthread.h" #include -#include #include VersionControlObserver::VersionControlObserver(QObject* parent) : diff --git a/src/views/versioncontrol/versioncontrolobserver.h b/src/views/versioncontrol/versioncontrolobserver.h index 562a599d2..b9ab13427 100644 --- a/src/views/versioncontrol/versioncontrolobserver.h +++ b/src/views/versioncontrol/versioncontrolobserver.h @@ -26,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/src/views/viewproperties.cpp b/src/views/viewproperties.cpp index 06097977d..100b1ad2d 100644 --- a/src/views/viewproperties.cpp +++ b/src/views/viewproperties.cpp @@ -23,12 +23,11 @@ #include "dolphin_directoryviewpropertysettings.h" #include "dolphin_generalsettings.h" -#include -#include #include #include #include +#include #include #include #include -- cgit v1.3 From 037d5db85bb0bd798d40c557d424c5c9b87457a8 Mon Sep 17 00:00:00 2001 From: Lukáš Tinkl Date: Mon, 3 Nov 2014 23:52:18 +0100 Subject: Q_DECL_OVERRIDE --- src/dolphincontextmenu.h | 4 +-- src/dolphinmainwindow.cpp | 8 ++--- src/dolphinmainwindow.h | 10 +++--- src/dolphinnewfilemenu.h | 2 +- src/dolphinpart.cpp | 8 ++--- src/dolphinpart.h | 2 +- src/dolphinpart_ext.h | 20 +++++------ src/dolphintabbar.h | 14 ++++---- src/dolphintabwidget.h | 4 +-- src/filterbar/filterbar.h | 4 +-- src/kitemviews/kfileitemlistview.h | 33 +++++++++--------- src/kitemviews/kfileitemlistwidget.h | 16 ++++----- src/kitemviews/kfileitemmodel.h | 35 ++++++++----------- src/kitemviews/kitemlistcontainer.h | 10 +++--- src/kitemviews/kitemlistgroupheader.h | 5 ++- src/kitemviews/kitemlistview.h | 24 ++++++------- src/kitemviews/kitemlistwidget.h | 4 +-- src/kitemviews/kstandarditemlistgroupheader.h | 12 +++---- src/kitemviews/kstandarditemlistview.h | 14 ++++---- src/kitemviews/kstandarditemlistwidget.h | 42 +++++++++++------------ src/kitemviews/kstandarditemmodel.h | 16 ++++----- src/org.kde.dolphin.desktop | 2 +- src/panels/folders/foldersitemlistwidget.h | 2 +- src/panels/folders/folderspanel.h | 6 ++-- src/panels/information/informationpanel.h | 8 ++--- src/panels/information/informationpanelcontent.h | 2 +- src/panels/information/phononwidget.h | 4 +-- src/panels/information/pixmapviewer.h | 4 +-- src/panels/panel.h | 3 +- src/panels/places/placesitemeditdialog.h | 2 +- src/panels/places/placesitemlistgroupheader.h | 2 +- src/panels/places/placesitemlistwidget.h | 4 +-- src/panels/places/placesitemmodel.h | 14 ++++---- src/panels/places/placespanel.h | 4 +-- src/panels/terminal/terminalpanel.h | 6 ++-- src/search/dolphinsearchbox.h | 8 ++--- src/settings/applyviewpropsjob.h | 2 +- src/settings/general/behaviorsettingspage.h | 4 +-- src/settings/general/confirmationssettingspage.h | 4 +-- src/settings/general/generalsettingspage.h | 4 +-- src/settings/general/previewssettingspage.h | 6 ++-- src/settings/general/statusbarsettingspage.h | 4 +-- src/settings/kcm/kcmdolphingeneral.h | 4 +-- src/settings/kcm/kcmdolphinnavigation.h | 4 +-- src/settings/kcm/kcmdolphinservices.h | 4 +-- src/settings/kcm/kcmdolphinviewmodes.h | 4 +-- src/settings/navigation/navigationsettingspage.h | 4 +-- src/settings/serviceitemdelegate.h | 6 ++-- src/settings/servicemodel.h | 8 ++--- src/settings/services/servicessettingspage.h | 6 ++-- src/settings/startup/startupsettingspage.h | 4 +-- src/settings/trash/trashsettingspage.h | 4 +-- src/settings/viewmodes/viewsettingspage.h | 4 +-- src/settings/viewpropsprogressinfo.h | 2 +- src/statusbar/dolphinstatusbar.h | 4 +-- src/statusbar/statusbarspaceinfo.h | 4 +-- src/views/dolphinfileitemlistwidget.h | 2 +- src/views/dolphinitemlistview.h | 12 +++---- src/views/dolphinview.h | 9 +++-- src/views/tooltips/filemetadatatooltip.h | 4 +-- src/views/versioncontrol/updateitemstatesthread.h | 2 +- 61 files changed, 227 insertions(+), 246 deletions(-) (limited to 'src/settings/services/servicessettingspage.h') diff --git a/src/dolphincontextmenu.h b/src/dolphincontextmenu.h index 8ed22dda5..f7f3a231a 100644 --- a/src/dolphincontextmenu.h +++ b/src/dolphincontextmenu.h @@ -89,8 +89,8 @@ public: Command open(); protected: - virtual void keyPressEvent(QKeyEvent *ev); - virtual void keyReleaseEvent(QKeyEvent *ev); + virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; + virtual void keyReleaseEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; private: void openTrashContextMenu(); diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index c9b559439..df04cee69 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp @@ -623,7 +623,7 @@ void DolphinMainWindow::goHome() void DolphinMainWindow::goBack(Qt::MouseButtons buttons) { // The default case (left button pressed) is handled in goBack(). - if (buttons == Qt::MidButton) { + if (buttons == Qt::MiddleButton) { KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator(); const int index = urlNavigator->historyIndex() + 1; openNewTab(urlNavigator->locationUrl(index)); @@ -633,7 +633,7 @@ void DolphinMainWindow::goBack(Qt::MouseButtons buttons) void DolphinMainWindow::goForward(Qt::MouseButtons buttons) { // The default case (left button pressed) is handled in goForward(). - if (buttons == Qt::MidButton) { + if (buttons == Qt::MiddleButton) { KUrlNavigator* urlNavigator = activeViewContainer()->urlNavigator(); const int index = urlNavigator->historyIndex() - 1; openNewTab(urlNavigator->locationUrl(index)); @@ -643,7 +643,7 @@ void DolphinMainWindow::goForward(Qt::MouseButtons buttons) void DolphinMainWindow::goUp(Qt::MouseButtons buttons) { // The default case (left button pressed) is handled in goUp(). - if (buttons == Qt::MidButton) { + if (buttons == Qt::MiddleButton) { openNewTab(KIO::upUrl(activeViewContainer()->url())); } } @@ -651,7 +651,7 @@ void DolphinMainWindow::goUp(Qt::MouseButtons buttons) void DolphinMainWindow::goHome(Qt::MouseButtons buttons) { // The default case (left button pressed) is handled in goHome(). - if (buttons == Qt::MidButton) { + if (buttons == Qt::MiddleButton) { openNewTab(GeneralSettings::self()->homeUrl()); } } diff --git a/src/dolphinmainwindow.h b/src/dolphinmainwindow.h index 12933f9ce..462d3d362 100644 --- a/src/dolphinmainwindow.h +++ b/src/dolphinmainwindow.h @@ -147,16 +147,16 @@ signals: protected: /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; /** @see QMainWindow::closeEvent() */ - virtual void closeEvent(QCloseEvent* event); + virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; /** @see KMainWindow::saveProperties() */ - virtual void saveProperties(KConfigGroup& group); + virtual void saveProperties(KConfigGroup& group) Q_DECL_OVERRIDE; /** @see KMainWindow::readProperties() */ - virtual void readProperties(const KConfigGroup& group); + virtual void readProperties(const KConfigGroup& group) Q_DECL_OVERRIDE; private slots: /** @@ -494,7 +494,7 @@ private: public: UndoUiInterface(); virtual ~UndoUiInterface(); - virtual void jobError(KIO::Job* job); + virtual void jobError(KIO::Job* job) Q_DECL_OVERRIDE; }; KNewFileMenu* m_newFileMenu; diff --git a/src/dolphinnewfilemenu.h b/src/dolphinnewfilemenu.h index e211dfd88..254571eb9 100644 --- a/src/dolphinnewfilemenu.h +++ b/src/dolphinnewfilemenu.h @@ -48,7 +48,7 @@ signals: protected slots: /** @see KNewFileMenu::slotResult() */ - virtual void slotResult(KJob* job); + virtual void slotResult(KJob* job) Q_DECL_OVERRIDE; }; #endif diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp index 0e3f68336..1c79a5980 100644 --- a/src/dolphinpart.cpp +++ b/src/dolphinpart.cpp @@ -204,16 +204,16 @@ void DolphinPart::createActions() this, &DolphinPart::slotGoTriggered); createGoAction("go_applications", "start-here-kde", - i18nc("@action:inmenu Go", "App&lications"), QString("programs:/"), + i18nc("@action:inmenu Go", "App&lications"), QStringLiteral("programs:/"), goActionGroup); createGoAction("go_network_folders", "folder-remote", - i18nc("@action:inmenu Go", "&Network Folders"), QString("remote:/"), + i18nc("@action:inmenu Go", "&Network Folders"), QStringLiteral("remote:/"), goActionGroup); createGoAction("go_settings", "preferences-system", - i18nc("@action:inmenu Go", "Sett&ings"), QString("settings:/"), + i18nc("@action:inmenu Go", "Sett&ings"), QStringLiteral("settings:/"), goActionGroup); createGoAction("go_trash", "user-trash", - i18nc("@action:inmenu Go", "Trash"), QString("trash:/"), + i18nc("@action:inmenu Go", "Trash"), QStringLiteral("trash:/"), goActionGroup); createGoAction("go_autostart", "", i18nc("@action:inmenu Go", "Autostart"), QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/autostart", diff --git a/src/dolphinpart.h b/src/dolphinpart.h index 9439a17bc..9f0ed5570 100644 --- a/src/dolphinpart.h +++ b/src/dolphinpart.h @@ -223,7 +223,7 @@ private Q_SLOTS: void setFilesToSelect(const QList &files); QList filesToSelect() const { return QList(); } // silence moc - virtual bool eventFilter(QObject*, QEvent*); + virtual bool eventFilter(QObject*, QEvent*) Q_DECL_OVERRIDE; private: void createActions(); diff --git a/src/dolphinpart_ext.h b/src/dolphinpart_ext.h index bebde3ada..6adf64972 100644 --- a/src/dolphinpart_ext.h +++ b/src/dolphinpart_ext.h @@ -32,8 +32,8 @@ class DolphinPartBrowserExtension : public KParts::BrowserExtension Q_OBJECT public: DolphinPartBrowserExtension( DolphinPart* part ); - virtual void restoreState(QDataStream &stream); - virtual void saveState(QDataStream &stream); + virtual void restoreState(QDataStream &stream) Q_DECL_OVERRIDE; + virtual void saveState(QDataStream &stream) Q_DECL_OVERRIDE; public Q_SLOTS: void cut(); @@ -53,10 +53,10 @@ class DolphinPartFileInfoExtension : public KParts::FileInfoExtension public: DolphinPartFileInfoExtension(DolphinPart* part); - virtual QueryModes supportedQueryModes() const; - virtual bool hasSelection() const; + virtual QueryModes supportedQueryModes() const Q_DECL_OVERRIDE; + virtual bool hasSelection() const Q_DECL_OVERRIDE; - virtual KFileItemList queryFor(QueryMode mode) const; + virtual KFileItemList queryFor(QueryMode mode) const Q_DECL_OVERRIDE; private: DolphinPart* m_part; @@ -68,10 +68,10 @@ class DolphinPartListingFilterExtension : public KParts::ListingFilterExtension public: DolphinPartListingFilterExtension(DolphinPart* part); - virtual FilterModes supportedFilterModes() const; - virtual bool supportsMultipleFilters(FilterMode mode) const; - virtual QVariant filter(FilterMode mode) const; - virtual void setFilter(FilterMode mode, const QVariant& filter); + virtual FilterModes supportedFilterModes() const Q_DECL_OVERRIDE; + virtual bool supportsMultipleFilters(FilterMode mode) const Q_DECL_OVERRIDE; + virtual QVariant filter(FilterMode mode) const Q_DECL_OVERRIDE; + virtual void setFilter(FilterMode mode, const QVariant& filter) Q_DECL_OVERRIDE; private: DolphinPart* m_part; @@ -83,7 +83,7 @@ class DolphinPartListingNotificationExtension : public KParts::ListingNotificati public: DolphinPartListingNotificationExtension(DolphinPart* part); - virtual NotificationEventTypes supportedNotificationEventTypes() const; + virtual NotificationEventTypes supportedNotificationEventTypes() const Q_DECL_OVERRIDE; public Q_SLOTS: void slotNewItems(const KFileItemList&); diff --git a/src/dolphintabbar.h b/src/dolphintabbar.h index d2b2e9e57..6daa9a1ad 100644 --- a/src/dolphintabbar.h +++ b/src/dolphintabbar.h @@ -35,17 +35,17 @@ signals: void tabDetachRequested(int index); protected: - virtual void dragEnterEvent(QDragEnterEvent* event); - virtual void dragLeaveEvent(QDragLeaveEvent* event); - virtual void dragMoveEvent(QDragMoveEvent* event); - virtual void dropEvent(QDropEvent* event); - virtual void mousePressEvent(QMouseEvent* event); - virtual void mouseDoubleClickEvent(QMouseEvent* event); + virtual void dragEnterEvent(QDragEnterEvent* event) Q_DECL_OVERRIDE; + virtual void dragLeaveEvent(QDragLeaveEvent* event) Q_DECL_OVERRIDE; + virtual void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE; + virtual void dropEvent(QDropEvent* event) Q_DECL_OVERRIDE; + virtual void mousePressEvent(QMouseEvent* event) Q_DECL_OVERRIDE; + virtual void mouseDoubleClickEvent(QMouseEvent* event) Q_DECL_OVERRIDE; /** * Opens a context menu for the tab on the \a event position. */ - virtual void contextMenuEvent(QContextMenuEvent* event); + virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; private slots: void slotAutoActivationTimeout(); diff --git a/src/dolphintabwidget.h b/src/dolphintabwidget.h index 93213ac61..a84b7facb 100644 --- a/src/dolphintabwidget.h +++ b/src/dolphintabwidget.h @@ -173,8 +173,8 @@ private slots: void currentTabChanged(int index); protected: - virtual void tabInserted(int index); - virtual void tabRemoved(int index); + virtual void tabInserted(int index) Q_DECL_OVERRIDE; + virtual void tabRemoved(int index) Q_DECL_OVERRIDE; private: /** diff --git a/src/filterbar/filterbar.h b/src/filterbar/filterbar.h index 5d5463a28..dd9b8b8bb 100644 --- a/src/filterbar/filterbar.h +++ b/src/filterbar/filterbar.h @@ -74,8 +74,8 @@ signals: void focusViewRequest(); protected: - virtual void showEvent(QShowEvent* event); - virtual void keyReleaseEvent(QKeyEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; private: KLineEdit* m_filterInput; diff --git a/src/kitemviews/kfileitemlistview.h b/src/kitemviews/kfileitemlistview.h index 2fd21edbf..9f07c9d8d 100644 --- a/src/kitemviews/kfileitemlistview.h +++ b/src/kitemviews/kfileitemlistview.h @@ -72,28 +72,27 @@ public: */ QStringList enabledPlugins() const; - /** @reimp */ - virtual QPixmap createDragPixmap(const KItemSet& indexes) const; + virtual QPixmap createDragPixmap(const KItemSet& indexes) const Q_DECL_OVERRIDE; protected: - virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const; - virtual void initializeItemListWidget(KItemListWidget* item); + virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; + virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE; virtual void onPreviewsShownChanged(bool shown); - virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous); - virtual void onModelChanged(KItemModelBase* current, KItemModelBase* previous); - virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); - virtual void onItemSizeChanged(const QSizeF& current, const QSizeF& previous); - virtual void onScrollOffsetChanged(qreal current, qreal previous); - virtual void onVisibleRolesChanged(const QList& current, const QList& previous); - virtual void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous); - virtual void onSupportsItemExpandingChanged(bool supportsExpanding); - virtual void onTransactionBegin(); - virtual void onTransactionEnd(); - virtual void resizeEvent(QGraphicsSceneResizeEvent* event); + virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE; + virtual void onModelChanged(KItemModelBase* current, KItemModelBase* previous) Q_DECL_OVERRIDE; + virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE; + virtual void onItemSizeChanged(const QSizeF& current, const QSizeF& previous) Q_DECL_OVERRIDE; + virtual void onScrollOffsetChanged(qreal current, qreal previous) Q_DECL_OVERRIDE; + virtual void onVisibleRolesChanged(const QList& current, const QList& previous) Q_DECL_OVERRIDE; + virtual void onStyleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE; + virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE; + virtual void onTransactionBegin() Q_DECL_OVERRIDE; + virtual void onTransactionEnd() Q_DECL_OVERRIDE; + virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; protected slots: - virtual void slotItemsRemoved(const KItemRangeList& itemRanges); - virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous); + virtual void slotItemsRemoved(const KItemRangeList& itemRanges) Q_DECL_OVERRIDE; + virtual void slotSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; private slots: void triggerVisibleIndexRangeUpdate(); diff --git a/src/kitemviews/kfileitemlistwidget.h b/src/kitemviews/kfileitemlistwidget.h index 8e8958b16..b7061d38c 100644 --- a/src/kitemviews/kfileitemlistwidget.h +++ b/src/kitemviews/kfileitemlistwidget.h @@ -31,10 +31,10 @@ public: virtual ~KFileItemListWidgetInformant(); protected: - virtual QString itemText(int index, const KItemListView* view) const; - virtual bool itemIsLink(int index, const KItemListView* view) const; - virtual QString roleText(const QByteArray& role, const QHash& values) const; - virtual QFont customizedFontForLinks(const QFont& baseFont) const; + virtual QString itemText(int index, const KItemListView* view) const Q_DECL_OVERRIDE; + virtual bool itemIsLink(int index, const KItemListView* view) const Q_DECL_OVERRIDE; + virtual QString roleText(const QByteArray& role, const QHash& values) const Q_DECL_OVERRIDE; + virtual QFont customizedFontForLinks(const QFont& baseFont) const Q_DECL_OVERRIDE; }; class LIBDOLPHINPRIVATE_EXPORT KFileItemListWidget : public KStandardItemListWidget @@ -48,14 +48,14 @@ public: static KItemListWidgetInformant* createInformant(); protected: - virtual bool isRoleRightAligned(const QByteArray& role) const; - virtual bool isHidden() const; - virtual QFont customizedFont(const QFont& baseFont) const; + virtual bool isRoleRightAligned(const QByteArray& role) const Q_DECL_OVERRIDE; + virtual bool isHidden() const Q_DECL_OVERRIDE; + virtual QFont customizedFont(const QFont& baseFont) const Q_DECL_OVERRIDE; /** * @return Selection length without MIME-type extension */ - virtual int selectionLength(const QString& text) const; + virtual int selectionLength(const QString& text) const Q_DECL_OVERRIDE; }; #endif diff --git a/src/kitemviews/kfileitemmodel.h b/src/kitemviews/kfileitemmodel.h index 1a4f6928e..535e0f3e4 100644 --- a/src/kitemviews/kfileitemmodel.h +++ b/src/kitemviews/kfileitemmodel.h @@ -78,9 +78,9 @@ public: */ void cancelDirectoryLoading(); - virtual int count() const; - virtual QHash data(int index) const; - virtual bool setData(int index, const QHash& values); + virtual int count() const Q_DECL_OVERRIDE; + virtual QHash data(int index) const Q_DECL_OVERRIDE; + virtual bool setData(int index, const QHash& values) Q_DECL_OVERRIDE; /** * Sets a separate sorting with directories first (true) or a mixed @@ -99,20 +99,15 @@ public: void setShowDirectoriesOnly(bool enabled); bool showDirectoriesOnly() const; - /** @reimp */ - virtual QMimeData* createMimeData(const KItemSet& indexes) const; + virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE; - /** @reimp */ - virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const; + virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const Q_DECL_OVERRIDE; - /** @reimp */ - virtual bool supportsDropping(int index) const; + virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE; - /** @reimp */ - virtual QString roleDescription(const QByteArray& role) const; + virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE; - /** @reimp */ - virtual QList > groups() const; + virtual QList > groups() const Q_DECL_OVERRIDE; /** * @return The file-item for the index \a index. If the index is in a valid @@ -158,10 +153,10 @@ public: void setRoles(const QSet& roles); QSet roles() const; - virtual bool setExpanded(int index, bool expanded); - virtual bool isExpanded(int index) const; - virtual bool isExpandable(int index) const; - virtual int expandedParentsCount(int index) const; + virtual bool setExpanded(int index, bool expanded) Q_DECL_OVERRIDE; + virtual bool isExpanded(int index) const Q_DECL_OVERRIDE; + virtual bool isExpandable(int index) const Q_DECL_OVERRIDE; + virtual int expandedParentsCount(int index) const Q_DECL_OVERRIDE; QSet expandedDirectories() const; @@ -260,9 +255,9 @@ signals: void urlIsFileError(const QUrl& url); protected: - virtual void onGroupedSortingChanged(bool current); - virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous); - virtual void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous); + virtual void onGroupedSortingChanged(bool current) Q_DECL_OVERRIDE; + virtual void onSortRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; + virtual void onSortOrderChanged(Qt::SortOrder current, Qt::SortOrder previous) Q_DECL_OVERRIDE; private slots: /** diff --git a/src/kitemviews/kitemlistcontainer.h b/src/kitemviews/kitemlistcontainer.h index 3373059d1..55a9a118f 100644 --- a/src/kitemviews/kitemlistcontainer.h +++ b/src/kitemviews/kitemlistcontainer.h @@ -58,11 +58,11 @@ public: bool enabledFrame() const; protected: - virtual void keyPressEvent(QKeyEvent* event); - virtual void showEvent(QShowEvent* event); - virtual void resizeEvent(QResizeEvent* event); - virtual void scrollContentsBy(int dx, int dy); - virtual void wheelEvent(QWheelEvent* event); + virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; + virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; private slots: void slotScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); diff --git a/src/kitemviews/kitemlistgroupheader.h b/src/kitemviews/kitemlistgroupheader.h index 1e8ed2cca..66fe929dd 100644 --- a/src/kitemviews/kitemlistgroupheader.h +++ b/src/kitemviews/kitemlistgroupheader.h @@ -65,7 +65,7 @@ public: void setItemIndex(int index); int itemIndex() const; - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; protected: virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) = 0; @@ -101,8 +101,7 @@ protected: */ virtual void itemIndexChanged(int current, int previous); - /** @reimp */ - virtual void resizeEvent(QGraphicsSceneResizeEvent* event); + virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; virtual QPalette::ColorRole normalTextColorRole() const; virtual QPalette::ColorRole normalBaseColorRole() const; diff --git a/src/kitemviews/kitemlistview.h b/src/kitemviews/kitemlistview.h index c8054a691..cc0754f2a 100644 --- a/src/kitemviews/kitemlistview.h +++ b/src/kitemviews/kitemlistview.h @@ -160,8 +160,7 @@ public: const KItemListStyleOption& styleOption() const; - /** @reimp */ - virtual void setGeometry(const QRectF& rect); + virtual void setGeometry(const QRectF& rect) Q_DECL_OVERRIDE; /** * @return The page step which should be used by the vertical scroll bar. @@ -279,10 +278,7 @@ public: */ void editRole(int index, const QByteArray& role); - /** - * @reimp - */ - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; signals: void scrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); @@ -322,7 +318,7 @@ signals: void roleEditingFinished(int index, const QByteArray& role, const QVariant& value); protected: - virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); + virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; void setItemSize(const QSizeF& size); void setStyleOption(const KItemListStyleOption& option); @@ -379,13 +375,13 @@ protected: virtual void onTransactionBegin(); virtual void onTransactionEnd(); - virtual bool event(QEvent* event); - virtual void mousePressEvent(QGraphicsSceneMouseEvent* event); - virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event); - virtual void dragEnterEvent(QGraphicsSceneDragDropEvent* event); - virtual void dragMoveEvent(QGraphicsSceneDragDropEvent* event); - virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent* event); - virtual void dropEvent(QGraphicsSceneDragDropEvent* event); + virtual bool event(QEvent* event) Q_DECL_OVERRIDE; + virtual void mousePressEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; + virtual void mouseMoveEvent(QGraphicsSceneMouseEvent* event) Q_DECL_OVERRIDE; + virtual void dragEnterEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; + virtual void dragMoveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; + virtual void dragLeaveEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; + virtual void dropEvent(QGraphicsSceneDragDropEvent* event) Q_DECL_OVERRIDE; QList visibleItemListWidgets() const; diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h index c086ee6d3..07fc789f0 100644 --- a/src/kitemviews/kitemlistwidget.h +++ b/src/kitemviews/kitemlistwidget.h @@ -82,7 +82,7 @@ public: * to show the data of the custom model provided by KItemListWidget::data(). * @reimp */ - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; void setVisibleRoles(const QList& roles); QList visibleRoles() const; @@ -203,7 +203,7 @@ protected: virtual void alternateBackgroundChanged(bool enabled); virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous); virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous); - virtual void resizeEvent(QGraphicsSceneResizeEvent* event); + virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; /** * @return The current opacity of the hover-animation. When implementing a custom painting-code for a hover-state diff --git a/src/kitemviews/kstandarditemlistgroupheader.h b/src/kitemviews/kstandarditemlistgroupheader.h index 26158d6ba..871c93d8d 100644 --- a/src/kitemviews/kstandarditemlistgroupheader.h +++ b/src/kitemviews/kstandarditemlistgroupheader.h @@ -35,14 +35,14 @@ public: KStandardItemListGroupHeader(QGraphicsWidget* parent = 0); virtual ~KStandardItemListGroupHeader(); - virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; protected: - virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color); - virtual void paintSeparator(QPainter* painter, const QColor& color); - virtual void roleChanged(const QByteArray ¤t, const QByteArray &previous); - virtual void dataChanged(const QVariant& current, const QVariant& previous); - virtual void resizeEvent(QGraphicsSceneResizeEvent* event); + virtual void paintRole(QPainter* painter, const QRectF& roleBounds, const QColor& color) Q_DECL_OVERRIDE; + virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE; + virtual void roleChanged(const QByteArray ¤t, const QByteArray &previous) Q_DECL_OVERRIDE; + virtual void dataChanged(const QVariant& current, const QVariant& previous) Q_DECL_OVERRIDE; + virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; private: void updateCache(); diff --git a/src/kitemviews/kstandarditemlistview.h b/src/kitemviews/kstandarditemlistview.h index f5b0bfd8c..eb07c7f08 100644 --- a/src/kitemviews/kstandarditemlistview.h +++ b/src/kitemviews/kstandarditemlistview.h @@ -59,15 +59,15 @@ public: ItemLayout itemLayout() const; protected: - virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const; - virtual KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const; - virtual void initializeItemListWidget(KItemListWidget* item); - virtual bool itemSizeHintUpdateRequired(const QSet& changedRoles) const; + virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; + virtual KItemListGroupHeaderCreatorBase* defaultGroupHeaderCreator() const Q_DECL_OVERRIDE; + virtual void initializeItemListWidget(KItemListWidget* item) Q_DECL_OVERRIDE; + virtual bool itemSizeHintUpdateRequired(const QSet& changedRoles) const Q_DECL_OVERRIDE; virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const; virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous); - virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous); - virtual void onSupportsItemExpandingChanged(bool supportsExpanding); - virtual void polishEvent(); + virtual void onScrollOrientationChanged(Qt::Orientation current, Qt::Orientation previous) Q_DECL_OVERRIDE; + virtual void onSupportsItemExpandingChanged(bool supportsExpanding) Q_DECL_OVERRIDE; + virtual void polishEvent() Q_DECL_OVERRIDE; private: void applyDefaultStyleOption(int iconSize, int padding, int horizontalMargin, int verticalMargin); diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h index 403794fc3..7683f8433 100644 --- a/src/kitemviews/kstandarditemlistwidget.h +++ b/src/kitemviews/kstandarditemlistwidget.h @@ -38,11 +38,11 @@ public: KStandardItemListWidgetInformant(); virtual ~KStandardItemListWidgetInformant(); - virtual void calculateItemSizeHints(QVector& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const; + virtual void calculateItemSizeHints(QVector& logicalHeightHints, qreal& logicalWidthHint, const KItemListView* view) const Q_DECL_OVERRIDE; virtual qreal preferredRoleColumnWidth(const QByteArray& role, int index, - const KItemListView* view) const; + const KItemListView* view) const Q_DECL_OVERRIDE; protected: /** * @return The value of the "text" role. The default implementation returns @@ -106,13 +106,13 @@ public: virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0); - virtual QRectF iconRect() const; - virtual QRectF textRect() const; - virtual QRectF textFocusRect() const; - virtual QRectF selectionRect() const; - virtual QRectF expansionToggleRect() const; - virtual QRectF selectionToggleRect() const; - virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0); + virtual QRectF iconRect() const Q_DECL_OVERRIDE; + virtual QRectF textRect() const Q_DECL_OVERRIDE; + virtual QRectF textFocusRect() const Q_DECL_OVERRIDE; + virtual QRectF selectionRect() const Q_DECL_OVERRIDE; + virtual QRectF expansionToggleRect() const Q_DECL_OVERRIDE; + virtual QRectF selectionToggleRect() const Q_DECL_OVERRIDE; + virtual QPixmap createDragPixmap(const QStyleOptionGraphicsItem* option, QWidget* widget = 0) Q_DECL_OVERRIDE; static KItemListWidgetInformant* createInformant(); @@ -172,17 +172,17 @@ protected: */ virtual int selectionLength(const QString& text) const; - virtual void dataChanged(const QHash& current, const QSet& roles = QSet()); - virtual void visibleRolesChanged(const QList& current, const QList& previous); - virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous); - virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous); - virtual void hoveredChanged(bool hovered); - virtual void selectedChanged(bool selected); - virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous); - virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous); - virtual void resizeEvent(QGraphicsSceneResizeEvent* event); - virtual void showEvent(QShowEvent* event); - virtual void hideEvent(QHideEvent* event); + virtual void dataChanged(const QHash& current, const QSet& roles = QSet()) Q_DECL_OVERRIDE; + virtual void visibleRolesChanged(const QList& current, const QList& previous) Q_DECL_OVERRIDE; + virtual void columnWidthChanged(const QByteArray& role, qreal current, qreal previous) Q_DECL_OVERRIDE; + virtual void styleOptionChanged(const KItemListStyleOption& current, const KItemListStyleOption& previous) Q_DECL_OVERRIDE; + virtual void hoveredChanged(bool hovered) Q_DECL_OVERRIDE; + virtual void selectedChanged(bool selected) Q_DECL_OVERRIDE; + virtual void siblingsInformationChanged(const QBitArray& current, const QBitArray& previous) Q_DECL_OVERRIDE; + virtual void editedRoleChanged(const QByteArray& current, const QByteArray& previous) Q_DECL_OVERRIDE; + virtual void resizeEvent(QGraphicsSceneResizeEvent* event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; private slots: void slotCutItemsChanged(); @@ -274,5 +274,3 @@ private: }; #endif - - diff --git a/src/kitemviews/kstandarditemmodel.h b/src/kitemviews/kstandarditemmodel.h index 721e15529..9d1db1a2b 100644 --- a/src/kitemviews/kstandarditemmodel.h +++ b/src/kitemviews/kstandarditemmodel.h @@ -69,14 +69,14 @@ public: */ void appendItem(KStandardItem* item); - virtual int count() const; - virtual QHash data(int index) const; - virtual bool setData(int index, const QHash& values); - virtual QMimeData* createMimeData(const KItemSet& indexes) const; - virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const; - virtual bool supportsDropping(int index) const; - virtual QString roleDescription(const QByteArray& role) const; - virtual QList > groups() const; + virtual int count() const Q_DECL_OVERRIDE; + virtual QHash data(int index) const Q_DECL_OVERRIDE; + virtual bool setData(int index, const QHash& values) Q_DECL_OVERRIDE; + virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE; + virtual int indexForKeyboardSearch(const QString& text, int startFromIndex = 0) const Q_DECL_OVERRIDE; + virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE; + virtual QString roleDescription(const QByteArray& role) const Q_DECL_OVERRIDE; + virtual QList > groups() const Q_DECL_OVERRIDE; virtual void clear(); protected: diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 84325c87f..8c8c86402 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -88,7 +88,7 @@ Name[wa]=Dolphin Name[x-test]=xxDolphinxx Name[zh_CN]=Dolphin Name[zh_TW]=Dolphin -Exec=dolphin %i -caption %c %u +Exec=dolphin %u Icon=system-file-manager Type=Application X-DocPath=dolphin/index.html diff --git a/src/panels/folders/foldersitemlistwidget.h b/src/panels/folders/foldersitemlistwidget.h index 08d41b829..2278762e3 100644 --- a/src/panels/folders/foldersitemlistwidget.h +++ b/src/panels/folders/foldersitemlistwidget.h @@ -34,7 +34,7 @@ public: virtual ~FoldersItemListWidget(); protected: - virtual QPalette::ColorRole normalTextColorRole() const; + virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE; }; #endif diff --git a/src/panels/folders/folderspanel.h b/src/panels/folders/folderspanel.h index 2cbd28f28..7c591cc20 100644 --- a/src/panels/folders/folderspanel.h +++ b/src/panels/folders/folderspanel.h @@ -57,13 +57,13 @@ signals: protected: /** @see Panel::urlChanged() */ - virtual bool urlChanged(); + virtual bool urlChanged() Q_DECL_OVERRIDE; /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; /** @see QWidget::keyPressEvent() */ - virtual void keyPressEvent(QKeyEvent* event); + virtual void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; private slots: void slotItemActivated(int index); diff --git a/src/panels/information/informationpanel.h b/src/panels/information/informationpanel.h index 9a1e6351d..7a0e4165e 100644 --- a/src/panels/information/informationpanel.h +++ b/src/panels/information/informationpanel.h @@ -59,16 +59,16 @@ public slots: protected: /** @see Panel::urlChanged() */ - virtual bool urlChanged(); + virtual bool urlChanged() Q_DECL_OVERRIDE; /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; /** @see QWidget::resizeEvent() */ - virtual void resizeEvent(QResizeEvent* event); + virtual void resizeEvent(QResizeEvent* event) Q_DECL_OVERRIDE; /** @see QWidget::contextMenuEvent() */ - virtual void contextMenuEvent(QContextMenuEvent* event); + virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; private slots: /** diff --git a/src/panels/information/informationpanelcontent.h b/src/panels/information/informationpanelcontent.h index f4103853e..533e9de3b 100644 --- a/src/panels/information/informationpanelcontent.h +++ b/src/panels/information/informationpanelcontent.h @@ -85,7 +85,7 @@ signals: protected: /** @see QObject::eventFilter() */ - virtual bool eventFilter(QObject* obj, QEvent* event); + virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; private slots: /** diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h index 09b4ee26f..837a66888 100644 --- a/src/panels/information/phononwidget.h +++ b/src/panels/information/phononwidget.h @@ -63,8 +63,8 @@ class PhononWidget : public QWidget void hasVideoChanged(bool hasVideo); protected: - virtual void showEvent(QShowEvent *event); - virtual void hideEvent(QHideEvent *event); + virtual void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + virtual void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; private slots: void stateChanged(Phonon::State); diff --git a/src/panels/information/pixmapviewer.h b/src/panels/information/pixmapviewer.h index 8197df979..ddc183351 100644 --- a/src/panels/information/pixmapviewer.h +++ b/src/panels/information/pixmapviewer.h @@ -71,10 +71,10 @@ public: * of the parent widget. Per default no size hint is given. */ void setSizeHint(const QSize& size); - virtual QSize sizeHint() const; + virtual QSize sizeHint() const Q_DECL_OVERRIDE; protected: - virtual void paintEvent(QPaintEvent* event); + virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE; private Q_SLOTS: void checkPendingPixmaps(); diff --git a/src/panels/panel.h b/src/panels/panel.h index f43ebe9d9..d3460bf13 100644 --- a/src/panels/panel.h +++ b/src/panels/panel.h @@ -49,8 +49,7 @@ public: void setCustomContextMenuActions(const QList& actions); QList customContextMenuActions() const; - /** @see QWidget::sizeHint() */ - virtual QSize sizeHint() const; + virtual QSize sizeHint() const Q_DECL_OVERRIDE; public slots: /** diff --git a/src/panels/places/placesitemeditdialog.h b/src/panels/places/placesitemeditdialog.h index 53e62379d..f2bba546b 100644 --- a/src/panels/places/placesitemeditdialog.h +++ b/src/panels/places/placesitemeditdialog.h @@ -54,7 +54,7 @@ public: bool allowGlobal() const; protected: - virtual bool event(QEvent* event); + virtual bool event(QEvent* event) Q_DECL_OVERRIDE; private slots: void slotUrlChanged(const QString& text); diff --git a/src/panels/places/placesitemlistgroupheader.h b/src/panels/places/placesitemlistgroupheader.h index 1c2d5cc25..7daaba602 100644 --- a/src/panels/places/placesitemlistgroupheader.h +++ b/src/panels/places/placesitemlistgroupheader.h @@ -31,7 +31,7 @@ public: virtual ~PlacesItemListGroupHeader(); protected: - virtual void paintSeparator(QPainter* painter, const QColor& color); + virtual void paintSeparator(QPainter* painter, const QColor& color) Q_DECL_OVERRIDE; virtual QPalette::ColorRole normalTextColorRole() const; }; diff --git a/src/panels/places/placesitemlistwidget.h b/src/panels/places/placesitemlistwidget.h index a2a88c1f0..e9e6a0767 100644 --- a/src/panels/places/placesitemlistwidget.h +++ b/src/panels/places/placesitemlistwidget.h @@ -35,8 +35,8 @@ public: virtual ~PlacesItemListWidget(); protected: - virtual bool isHidden() const; - virtual QPalette::ColorRole normalTextColorRole() const; + virtual bool isHidden() const Q_DECL_OVERRIDE; + virtual QPalette::ColorRole normalTextColorRole() const Q_DECL_OVERRIDE; }; #endif diff --git a/src/panels/places/placesitemmodel.h b/src/panels/places/placesitemmodel.h index 229841dc5..38fcfe6af 100644 --- a/src/panels/places/placesitemmodel.h +++ b/src/panels/places/placesitemmodel.h @@ -107,11 +107,9 @@ public: bool storageSetupNeeded(int index) const; void requestStorageSetup(int index); - /** @reimp */ - virtual QMimeData* createMimeData(const KItemSet& indexes) const; + virtual QMimeData* createMimeData(const KItemSet& indexes) const Q_DECL_OVERRIDE; - /** @reimp */ - virtual bool supportsDropping(int index) const; + virtual bool supportsDropping(int index) const Q_DECL_OVERRIDE; void dropMimeDataBefore(int index, const QMimeData* mimeData); @@ -123,15 +121,15 @@ public: */ static QUrl convertedUrl(const QUrl& url); - virtual void clear(); + virtual void clear() Q_DECL_OVERRIDE; signals: void errorMessage(const QString& message); void storageSetupDone(int index, bool success); protected: - virtual void onItemInserted(int index); - virtual void onItemRemoved(int index, KStandardItem* removedItem); - virtual void onItemChanged(int index, const QSet& changedRoles); + virtual void onItemInserted(int index) Q_DECL_OVERRIDE; + virtual void onItemRemoved(int index, KStandardItem* removedItem) Q_DECL_OVERRIDE; + virtual void onItemChanged(int index, const QSet& changedRoles) Q_DECL_OVERRIDE; private slots: void slotDeviceAdded(const QString& udi); diff --git a/src/panels/places/placespanel.h b/src/panels/places/placespanel.h index 3604e9986..81aeedb28 100644 --- a/src/panels/places/placespanel.h +++ b/src/panels/places/placespanel.h @@ -48,8 +48,8 @@ signals: void errorMessage(const QString& error); protected: - virtual bool urlChanged(); - virtual void showEvent(QShowEvent* event); + virtual bool urlChanged() Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; public slots: virtual void readSettings(); diff --git a/src/panels/terminal/terminalpanel.h b/src/panels/terminal/terminalpanel.h index b3ccefb31..75e198e1a 100644 --- a/src/panels/terminal/terminalpanel.h +++ b/src/panels/terminal/terminalpanel.h @@ -61,11 +61,9 @@ signals: void changeUrl(const QUrl& url); protected: - /** @see Panel::urlChanged() */ - virtual bool urlChanged(); + virtual bool urlChanged() Q_DECL_OVERRIDE; - /** @see QWidget::showEvent() */ - virtual void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; private slots: void slotMostLocalUrlResult(KJob* job); diff --git a/src/search/dolphinsearchbox.h b/src/search/dolphinsearchbox.h index 2de4c457c..b0fd16ccc 100644 --- a/src/search/dolphinsearchbox.h +++ b/src/search/dolphinsearchbox.h @@ -105,10 +105,10 @@ public: bool isActive() const; protected: - virtual bool event(QEvent* event); - virtual void showEvent(QShowEvent* event); - virtual void keyReleaseEvent(QKeyEvent* event); - virtual bool eventFilter(QObject* obj, QEvent* event); + virtual bool event(QEvent* event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + virtual void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; signals: /** diff --git a/src/settings/applyviewpropsjob.h b/src/settings/applyviewpropsjob.h index 297adb823..ea9688718 100644 --- a/src/settings/applyviewpropsjob.h +++ b/src/settings/applyviewpropsjob.h @@ -64,7 +64,7 @@ public: int progress() const; private slots: - virtual void slotResult(KJob* job); + virtual void slotResult(KJob* job) Q_DECL_OVERRIDE; void slotEntries(KIO::Job*, const KIO::UDSEntryList&); private: diff --git a/src/settings/general/behaviorsettingspage.h b/src/settings/general/behaviorsettingspage.h index 71ee2849a..6e491696c 100644 --- a/src/settings/general/behaviorsettingspage.h +++ b/src/settings/general/behaviorsettingspage.h @@ -39,10 +39,10 @@ public: virtual ~BehaviorSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private: void loadSettings(); diff --git a/src/settings/general/confirmationssettingspage.h b/src/settings/general/confirmationssettingspage.h index 4d0a652d3..e702fe8ae 100644 --- a/src/settings/general/confirmationssettingspage.h +++ b/src/settings/general/confirmationssettingspage.h @@ -35,10 +35,10 @@ public: virtual ~ConfirmationsSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private: void loadSettings(); diff --git a/src/settings/general/generalsettingspage.h b/src/settings/general/generalsettingspage.h index 245773aee..7073258ff 100644 --- a/src/settings/general/generalsettingspage.h +++ b/src/settings/general/generalsettingspage.h @@ -44,10 +44,10 @@ public: virtual ~GeneralSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private: QList m_pages; diff --git a/src/settings/general/previewssettingspage.h b/src/settings/general/previewssettingspage.h index a43535133..3abf8f926 100644 --- a/src/settings/general/previewssettingspage.h +++ b/src/settings/general/previewssettingspage.h @@ -42,13 +42,13 @@ public: * The settings are persisted automatically when * closing Dolphin. */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** Restores the settings to default values. */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; protected: - virtual void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; private slots: void configureService(const QModelIndex& index); diff --git a/src/settings/general/statusbarsettingspage.h b/src/settings/general/statusbarsettingspage.h index 17bc799bc..608354371 100644 --- a/src/settings/general/statusbarsettingspage.h +++ b/src/settings/general/statusbarsettingspage.h @@ -35,10 +35,10 @@ public: virtual ~StatusBarSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private: void loadSettings(); diff --git a/src/settings/kcm/kcmdolphingeneral.h b/src/settings/kcm/kcmdolphingeneral.h index 6b844c9a8..50331a75c 100644 --- a/src/settings/kcm/kcmdolphingeneral.h +++ b/src/settings/kcm/kcmdolphingeneral.h @@ -36,8 +36,8 @@ public: DolphinGeneralConfigModule(QWidget* parent, const QVariantList& args); virtual ~DolphinGeneralConfigModule(); - virtual void save(); - virtual void defaults(); + virtual void save() Q_DECL_OVERRIDE; + virtual void defaults() Q_DECL_OVERRIDE; private: QList m_pages; diff --git a/src/settings/kcm/kcmdolphinnavigation.h b/src/settings/kcm/kcmdolphinnavigation.h index e7634d661..e8de0753e 100644 --- a/src/settings/kcm/kcmdolphinnavigation.h +++ b/src/settings/kcm/kcmdolphinnavigation.h @@ -35,8 +35,8 @@ public: DolphinNavigationConfigModule(QWidget* parent, const QVariantList& args); virtual ~DolphinNavigationConfigModule(); - virtual void save(); - virtual void defaults(); + virtual void save() Q_DECL_OVERRIDE; + virtual void defaults() Q_DECL_OVERRIDE; private: NavigationSettingsPage* m_navigation; diff --git a/src/settings/kcm/kcmdolphinservices.h b/src/settings/kcm/kcmdolphinservices.h index 70ed366fe..8a63bb045 100644 --- a/src/settings/kcm/kcmdolphinservices.h +++ b/src/settings/kcm/kcmdolphinservices.h @@ -35,8 +35,8 @@ public: DolphinServicesConfigModule(QWidget* parent, const QVariantList& args); virtual ~DolphinServicesConfigModule(); - virtual void save(); - virtual void defaults(); + virtual void save() Q_DECL_OVERRIDE; + virtual void defaults() Q_DECL_OVERRIDE; private: ServicesSettingsPage* m_services; diff --git a/src/settings/kcm/kcmdolphinviewmodes.h b/src/settings/kcm/kcmdolphinviewmodes.h index 3181198fe..0a0b0ff10 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.h +++ b/src/settings/kcm/kcmdolphinviewmodes.h @@ -35,8 +35,8 @@ public: DolphinViewModesConfigModule(QWidget* parent, const QVariantList& args); virtual ~DolphinViewModesConfigModule(); - virtual void save(); - virtual void defaults(); + virtual void save() Q_DECL_OVERRIDE; + virtual void defaults() Q_DECL_OVERRIDE; private: void reparseConfiguration(); diff --git a/src/settings/navigation/navigationsettingspage.h b/src/settings/navigation/navigationsettingspage.h index 7d5b981d4..ff1ed31ef 100644 --- a/src/settings/navigation/navigationsettingspage.h +++ b/src/settings/navigation/navigationsettingspage.h @@ -36,10 +36,10 @@ public: virtual ~NavigationSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private: void loadSettings(); diff --git a/src/settings/serviceitemdelegate.h b/src/settings/serviceitemdelegate.h index 958d0dc57..9f0ced40c 100644 --- a/src/settings/serviceitemdelegate.h +++ b/src/settings/serviceitemdelegate.h @@ -37,16 +37,16 @@ public: virtual ~ServiceItemDelegate(); virtual QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const; + const QModelIndex &index) const Q_DECL_OVERRIDE; virtual void paint(QPainter* painter, const QStyleOptionViewItem& option, - const QModelIndex& index) const; + const QModelIndex& index) const Q_DECL_OVERRIDE; virtual QList createItemWidgets(const QModelIndex&) const Q_DECL_OVERRIDE; virtual void updateItemWidgets(const QList widgets, const QStyleOptionViewItem& option, - const QPersistentModelIndex& index) const; + const QPersistentModelIndex& index) const Q_DECL_OVERRIDE; signals: void requestServiceConfiguration(const QModelIndex& index); diff --git a/src/settings/servicemodel.h b/src/settings/servicemodel.h index b8c2d5248..f2b91c7e4 100644 --- a/src/settings/servicemodel.h +++ b/src/settings/servicemodel.h @@ -47,10 +47,10 @@ public: explicit ServiceModel(QObject* parent = 0); virtual ~ServiceModel(); - virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()); - virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + virtual bool insertRows(int row, int count, const QModelIndex & parent = QModelIndex()) Q_DECL_OVERRIDE; + virtual bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + virtual int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; private: struct ServiceItem diff --git a/src/settings/services/servicessettingspage.h b/src/settings/services/servicessettingspage.h index 5dbb691af..a883aa947 100644 --- a/src/settings/services/servicessettingspage.h +++ b/src/settings/services/servicessettingspage.h @@ -39,13 +39,13 @@ public: virtual ~ServicesSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; protected: - virtual void showEvent(QShowEvent* event); + virtual void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; private slots: /** diff --git a/src/settings/startup/startupsettingspage.h b/src/settings/startup/startupsettingspage.h index d8b15cf5b..aeb5d6333 100644 --- a/src/settings/startup/startupsettingspage.h +++ b/src/settings/startup/startupsettingspage.h @@ -40,10 +40,10 @@ public: virtual ~StartupSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private slots: void slotSettingsChanged(); diff --git a/src/settings/trash/trashsettingspage.h b/src/settings/trash/trashsettingspage.h index bf4a71ea4..5c88aeab7 100644 --- a/src/settings/trash/trashsettingspage.h +++ b/src/settings/trash/trashsettingspage.h @@ -34,10 +34,10 @@ public: virtual ~TrashSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private: void loadSettings(); diff --git a/src/settings/viewmodes/viewsettingspage.h b/src/settings/viewmodes/viewsettingspage.h index 446403182..61671077e 100644 --- a/src/settings/viewmodes/viewsettingspage.h +++ b/src/settings/viewmodes/viewsettingspage.h @@ -40,10 +40,10 @@ public: virtual ~ViewSettingsPage(); /** @see SettingsPageBase::applySettings() */ - virtual void applySettings(); + virtual void applySettings() Q_DECL_OVERRIDE; /** @see SettingsPageBase::restoreDefaults() */ - virtual void restoreDefaults(); + virtual void restoreDefaults() Q_DECL_OVERRIDE; private: QList m_tabs; diff --git a/src/settings/viewpropsprogressinfo.h b/src/settings/viewpropsprogressinfo.h index 7522cf84c..13089b79f 100644 --- a/src/settings/viewpropsprogressinfo.h +++ b/src/settings/viewpropsprogressinfo.h @@ -56,7 +56,7 @@ public: virtual ~ViewPropsProgressInfo(); protected: - virtual void closeEvent(QCloseEvent* event); + virtual void closeEvent(QCloseEvent* event) Q_DECL_OVERRIDE; private slots: void updateProgress(); diff --git a/src/statusbar/dolphinstatusbar.h b/src/statusbar/dolphinstatusbar.h index 7ceb2acf8..1a4ccf682 100644 --- a/src/statusbar/dolphinstatusbar.h +++ b/src/statusbar/dolphinstatusbar.h @@ -101,8 +101,8 @@ signals: void zoomLevelChanged(int zoomLevel); protected: - virtual void contextMenuEvent(QContextMenuEvent* event); - virtual bool eventFilter(QObject* obj, QEvent* event); + virtual void contextMenuEvent(QContextMenuEvent* event) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject* obj, QEvent* event) Q_DECL_OVERRIDE; private slots: void showZoomSliderToolTip(int zoomLevel); diff --git a/src/statusbar/statusbarspaceinfo.h b/src/statusbar/statusbarspaceinfo.h index 48313a81c..5d571beba 100644 --- a/src/statusbar/statusbarspaceinfo.h +++ b/src/statusbar/statusbarspaceinfo.h @@ -46,8 +46,8 @@ public: QUrl url() const; protected: - void showEvent(QShowEvent* event); - void hideEvent(QHideEvent* event); + void showEvent(QShowEvent* event) Q_DECL_OVERRIDE; + void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; private slots: void slotValuesChanged(); diff --git a/src/views/dolphinfileitemlistwidget.h b/src/views/dolphinfileitemlistwidget.h index b9de6fb19..5f7c181e9 100644 --- a/src/views/dolphinfileitemlistwidget.h +++ b/src/views/dolphinfileitemlistwidget.h @@ -40,7 +40,7 @@ public: virtual ~DolphinFileItemListWidget(); protected: - virtual void refreshCache(); + virtual void refreshCache() Q_DECL_OVERRIDE; private: static QPixmap overlayForState(KVersionControlPlugin2::ItemVersion version, int size); diff --git a/src/views/dolphinitemlistview.h b/src/views/dolphinitemlistview.h index 67302e44d..7fd72e5c0 100644 --- a/src/views/dolphinitemlistview.h +++ b/src/views/dolphinitemlistview.h @@ -49,14 +49,14 @@ public: void writeSettings(); protected: - virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const; - virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const; - virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous); - virtual void onPreviewsShownChanged(bool shown); + virtual KItemListWidgetCreatorBase* defaultWidgetCreator() const Q_DECL_OVERRIDE; + virtual bool itemLayoutSupportsItemExpanding(ItemLayout layout) const Q_DECL_OVERRIDE; + virtual void onItemLayoutChanged(ItemLayout current, ItemLayout previous) Q_DECL_OVERRIDE; + virtual void onPreviewsShownChanged(bool shown) Q_DECL_OVERRIDE; virtual void onVisibleRolesChanged(const QList& current, - const QList& previous); + const QList& previous) Q_DECL_OVERRIDE; - virtual void updateFont(); + virtual void updateFont() Q_DECL_OVERRIDE; private: void updateGridSize(); diff --git a/src/views/dolphinview.h b/src/views/dolphinview.h index 7e5eca3a1..c054c311a 100644 --- a/src/views/dolphinview.h +++ b/src/views/dolphinview.h @@ -365,7 +365,7 @@ public slots: void stopLoading(); /** Activates the view if the item list container gets focus. */ - virtual bool eventFilter(QObject* watched, QEvent* event); + virtual bool eventFilter(QObject* watched, QEvent* event) Q_DECL_OVERRIDE; signals: /** @@ -543,11 +543,10 @@ signals: protected: /** Changes the zoom level if Control is pressed during a wheel event. */ - virtual void wheelEvent(QWheelEvent* event); + virtual void wheelEvent(QWheelEvent* event) Q_DECL_OVERRIDE; - /** @reimp */ - virtual void hideEvent(QHideEvent* event); - virtual bool event(QEvent* event); + virtual void hideEvent(QHideEvent* event) Q_DECL_OVERRIDE; + virtual bool event(QEvent* event) Q_DECL_OVERRIDE; private slots: /** diff --git a/src/views/tooltips/filemetadatatooltip.h b/src/views/tooltips/filemetadatatooltip.h index 7197871fc..379b025c8 100644 --- a/src/views/tooltips/filemetadatatooltip.h +++ b/src/views/tooltips/filemetadatatooltip.h @@ -70,8 +70,8 @@ signals: void metaDataRequestFinished(const KFileItemList& items); protected: - virtual void paintEvent(QPaintEvent* event); - virtual void showEvent(QShowEvent *); + virtual void paintEvent(QPaintEvent* event) Q_DECL_OVERRIDE; + virtual void showEvent(QShowEvent *) Q_DECL_OVERRIDE; private: QLabel* m_preview; diff --git a/src/views/versioncontrol/updateitemstatesthread.h b/src/views/versioncontrol/updateitemstatesthread.h index 5c6c6a208..9b744d5b3 100644 --- a/src/views/versioncontrol/updateitemstatesthread.h +++ b/src/views/versioncontrol/updateitemstatesthread.h @@ -53,7 +53,7 @@ public: QMap > itemStates() const; protected: - virtual void run(); + virtual void run() Q_DECL_OVERRIDE; private: QMutex* m_globalPluginMutex; // Protects the m_plugin globally -- cgit v1.3