From 2099b8ed36b9caaa32e3012be7209834fb61b2a7 Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Sun, 2 Dec 2018 02:05:52 +0200 Subject: [PATCH] add headers comments for all c++ files --- app/alternativeshelper.cpp | 9 +++++--- app/alternativeshelper.h | 6 +++-- app/commontools.cpp | 1 + app/commontools.h | 1 + app/dock/contextmenu.cpp | 4 ++++ app/dock/contextmenu.h | 1 + app/dock/dockconfigview.cpp | 10 ++++---- app/dock/dockconfigview.h | 13 +++++++---- app/dock/docksecconfigview.cpp | 10 ++++---- app/dock/docksecconfigview.h | 9 +++++--- app/dock/dockview.cpp | 10 ++++---- app/dock/dockview.h | 3 +++ app/dock/effects.cpp | 4 ++++ app/dock/effects.h | 2 ++ app/dock/panelshadows.cpp | 23 +++++++++++-------- app/dock/panelshadows_p.h | 2 ++ app/dock/positioner.cpp | 6 +++-- app/dock/positioner.h | 2 ++ app/dock/screenedgeghostwindow.cpp | 6 ++++- app/dock/screenedgeghostwindow.h | 1 + app/dock/visibilitymanager.cpp | 7 ++++-- app/dock/visibilitymanager.h | 3 +++ app/dock/visibilitymanager_p.h | 4 ++++ app/dockcorona.cpp | 10 ++++---- app/dockcorona.h | 6 +++-- app/globalshortcuts.cpp | 12 +++++++--- app/globalshortcuts.h | 4 +++- app/importer.cpp | 4 +++- app/importer.h | 1 + app/infoview.cpp | 10 +++++--- app/infoview.h | 2 ++ app/launcherssignals.cpp | 3 +++ app/launcherssignals.h | 2 ++ app/layout.cpp | 10 +++++--- app/layout.h | 7 ++++-- app/layoutmanager.cpp | 3 +++ app/layoutmanager.h | 3 +++ app/main.cpp | 5 +++- app/packageplugins/shell/dockpackage.cpp | 4 +++- app/packageplugins/shell/dockpackage.h | 8 ++++--- app/plasmathemeextended.cpp | 3 +++ app/plasmathemeextended.h | 10 +++++--- app/schemecolors.cpp | 2 ++ app/schemecolors.h | 1 + app/screenpool.cpp | 4 ++++ app/screenpool.h | 2 ++ .../delegates/activitycmbboxdelegate.cpp | 3 +++ .../delegates/activitycmbboxdelegate.h | 1 + app/settings/delegates/checkboxdelegate.cpp | 1 + app/settings/delegates/checkboxdelegate.h | 1 + .../delegates/colorcmbboxdelegate.cpp | 5 +++- app/settings/delegates/colorcmbboxdelegate.h | 1 + .../delegates/colorcmbboxitemdelegate.cpp | 2 +- .../delegates/colorcmbboxitemdelegate.h | 1 + app/settings/delegates/layoutnamedelegate.cpp | 1 + app/settings/delegates/layoutnamedelegate.h | 1 + app/settings/settingsdialog.cpp | 3 +++ app/settings/settingsdialog.h | 2 ++ app/settings/universalsettings.cpp | 5 +++- app/settings/universalsettings.h | 6 +++-- app/sortedactivitiesmodel.cpp | 5 +++- app/sortedactivitiesmodel.h | 1 + app/wm/abstractwindowinterface.cpp | 4 ++++ app/wm/abstractwindowinterface.h | 8 ++++++- app/wm/waylandinterface.cpp | 9 ++++++-- app/wm/waylandinterface.h | 10 ++++---- app/wm/windowinfowrap.h | 1 + app/wm/xwindowinterface.cpp | 7 +++++- app/wm/xwindowinterface.h | 3 +++ containmentactions/contextmenu/menu.cpp | 4 ++++ containmentactions/contextmenu/menu.h | 2 ++ liblattedock/dock.h | 1 + liblattedock/extras.h | 14 +++++++---- liblattedock/iconitem.cpp | 4 ++++ liblattedock/iconitem.h | 3 +++ liblattedock/lattedockplugin.cpp | 5 +++- liblattedock/lattedockplugin.h | 1 + liblattedock/qml/GlowPoint.qml | 8 +++---- liblattedock/quickwindowsystem.cpp | 5 ++++ liblattedock/quickwindowsystem.h | 1 + 80 files changed, 290 insertions(+), 92 deletions(-) diff --git a/app/alternativeshelper.cpp b/app/alternativeshelper.cpp index 90c7f0f36..be9f9a222 100644 --- a/app/alternativeshelper.cpp +++ b/app/alternativeshelper.cpp @@ -17,17 +17,20 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - #include "alternativeshelper.h" +// Qt #include #include -#include -#include +// KDE #include #include +// Plasma +#include +#include + AlternativesHelper::AlternativesHelper(Plasma::Applet *applet, QObject *parent) : QObject(parent), m_applet(applet) diff --git a/app/alternativeshelper.h b/app/alternativeshelper.h index 0442c9d5b..2827557c1 100644 --- a/app/alternativeshelper.h +++ b/app/alternativeshelper.h @@ -20,10 +20,12 @@ #ifndef ALTERNATIVESHELPER_H #define ALTERNATIVESHELPER_H -#include - +// Qt #include +// Plasma +#include + class AlternativesHelper : public QObject { Q_OBJECT diff --git a/app/commontools.cpp b/app/commontools.cpp index 45849daf3..bcf9a3e48 100644 --- a/app/commontools.cpp +++ b/app/commontools.cpp @@ -20,6 +20,7 @@ #include "commontools.h" +// Qt #include namespace Latte { diff --git a/app/commontools.h b/app/commontools.h index 7a760e5ad..f4852075b 100644 --- a/app/commontools.h +++ b/app/commontools.h @@ -18,6 +18,7 @@ * */ +// Qt #include namespace Latte { diff --git a/app/dock/contextmenu.cpp b/app/dock/contextmenu.cpp index f7b9680c4..f224d913c 100644 --- a/app/dock/contextmenu.cpp +++ b/app/dock/contextmenu.cpp @@ -19,18 +19,22 @@ #include "contextmenu.h" +// local #include "dockview.h" #include "visibilitymanager.h" #include "../dockcorona.h" #include "../layoutmanager.h" +// Qt #include #include +// KDE #include #include #include +// Plasma #include #include #include diff --git a/app/dock/contextmenu.h b/app/dock/contextmenu.h index 007329315..ae91e64eb 100644 --- a/app/dock/contextmenu.h +++ b/app/dock/contextmenu.h @@ -20,6 +20,7 @@ #ifndef CONTEXTMENU_H #define CONTEXTMENU_H +// Qt #include #include #include diff --git a/app/dock/dockconfigview.cpp b/app/dock/dockconfigview.cpp index 6a8304ba3..25ffba417 100644 --- a/app/dock/dockconfigview.cpp +++ b/app/dock/dockconfigview.cpp @@ -20,6 +20,7 @@ #include "dockconfigview.h" +// local #include "dockview.h" #include "panelshadows_p.h" #include "../dockcorona.h" @@ -27,22 +28,23 @@ #include "../settings/universalsettings.h" #include "../wm/abstractwindowinterface.h" +// Qt #include #include #include #include #include +// KDE #include #include - -#include - #include #include - #include +// Plasma +#include + namespace Latte { DockConfigView::DockConfigView(Plasma::Containment *containment, DockView *dockView, QWindow *parent) diff --git a/app/dock/dockconfigview.h b/app/dock/dockconfigview.h index 1be92a7b5..900858533 100644 --- a/app/dock/dockconfigview.h +++ b/app/dock/dockconfigview.h @@ -21,17 +21,20 @@ #ifndef DOCKCONFIGVIEW_H #define DOCKCONFIGVIEW_H +// local +#include "docksecconfigview.h" #include "../plasmaquick/configview.h" #include "../../liblattedock/dock.h" -#include "docksecconfigview.h" - -#include -#include +//Qt #include -#include #include #include +#include + +// Plasma +#include +#include namespace Plasma { class Applet; diff --git a/app/dock/docksecconfigview.cpp b/app/dock/docksecconfigview.cpp index a9b5b6845..57a367e31 100644 --- a/app/dock/docksecconfigview.cpp +++ b/app/dock/docksecconfigview.cpp @@ -19,28 +19,30 @@ #include "docksecconfigview.h" +// local #include "dockconfigview.h" #include "dockview.h" #include "panelshadows_p.h" #include "../dockcorona.h" #include "../wm/abstractwindowinterface.h" +// Qt #include #include #include #include #include +// KDE #include #include - -#include - #include #include - #include +// Plasma +#include + namespace Latte { DockSecConfigView::DockSecConfigView(DockView *dockView, QWindow *parent) diff --git a/app/dock/docksecconfigview.h b/app/dock/docksecconfigview.h index d754e81ca..5969f64ee 100644 --- a/app/dock/docksecconfigview.h +++ b/app/dock/docksecconfigview.h @@ -20,16 +20,19 @@ #ifndef DOCKSECCONFIGVIEW_H #define DOCKSECCONFIGVIEW_H +// local #include "../../liblattedock/dock.h" -#include -#include - +//Qt #include #include #include #include +// Plasma +#include +#include + namespace Plasma { class Applet; class Containment; diff --git a/app/dock/dockview.cpp b/app/dock/dockview.cpp index 1f44861d8..d976bcd32 100644 --- a/app/dock/dockview.cpp +++ b/app/dock/dockview.cpp @@ -20,6 +20,7 @@ #include "dockview.h" +// local #include "contextmenu.h" #include "dockconfigview.h" #include "effects.h" @@ -33,6 +34,7 @@ #include "../settings/universalsettings.h" #include "../../liblattedock/extras.h" +// Qt #include #include #include @@ -40,18 +42,18 @@ #include #include +// KDe #include #include - +#include +#include #include +// Plasma #include #include #include -#include -#include - namespace Latte { //! both alwaysVisible and dockWinBehavior are passed through corona because diff --git a/app/dock/dockview.h b/app/dock/dockview.h index ebaf1fe8d..3a131e446 100644 --- a/app/dock/dockview.h +++ b/app/dock/dockview.h @@ -21,6 +21,7 @@ #ifndef DOCKVIEW_H #define DOCKVIEW_H +// local #include "dockconfigview.h" #include "effects.h" #include "positioner.h" @@ -30,8 +31,10 @@ #include "../plasmaquick/configview.h" #include "../../liblattedock/dock.h" +// C++ #include +// Qt #include #include #include diff --git a/app/dock/effects.cpp b/app/dock/effects.cpp index c7d56d37d..9b1434209 100644 --- a/app/dock/effects.cpp +++ b/app/dock/effects.cpp @@ -18,12 +18,16 @@ */ #include "effects.h" + +// local #include "dockview.h" #include "panelshadows_p.h" #include "../../liblattedock/dock.h" +// Qt #include +// KDE #include #include diff --git a/app/dock/effects.h b/app/dock/effects.h index 215583952..8d3b6292f 100644 --- a/app/dock/effects.h +++ b/app/dock/effects.h @@ -20,10 +20,12 @@ #ifndef EFFECTS_H #define EFFECTS_H +// Qt #include #include #include +// Plasma #include #include diff --git a/app/dock/panelshadows.cpp b/app/dock/panelshadows.cpp index 58b59e77b..b12ec43a0 100644 --- a/app/dock/panelshadows.cpp +++ b/app/dock/panelshadows.cpp @@ -18,12 +18,23 @@ #include "panelshadows_p.h" +// local +#include + +// Qt +#include #include #include -#include - +// KDE +#include +#include +#include +#include +#include #include + +// X11 #if HAVE_X11 #include #include @@ -32,14 +43,6 @@ #include #endif -#include -#include -#include -#include -#include - -#include - class PanelShadows::Private { public: diff --git a/app/dock/panelshadows_p.h b/app/dock/panelshadows_p.h index b300aaefa..b1ffb874d 100644 --- a/app/dock/panelshadows_p.h +++ b/app/dock/panelshadows_p.h @@ -19,8 +19,10 @@ #ifndef PANELSHADOWS_P_H #define PANELSHADOWS_P_H +// Qt #include +// Plasma #include "plasma/framesvg.h" #include "plasma/svg.h" diff --git a/app/dock/positioner.cpp b/app/dock/positioner.cpp index d775a4ffa..af6febaf0 100644 --- a/app/dock/positioner.cpp +++ b/app/dock/positioner.cpp @@ -19,6 +19,7 @@ #include "positioner.h" +// local #include "dockview.h" #include "effects.h" #include "../dockcorona.h" @@ -26,12 +27,13 @@ #include "../settings/universalsettings.h" #include "../../liblattedock/dock.h" +// Qt #include -#include - +// KDE #include #include +#include namespace Latte { namespace View { diff --git a/app/dock/positioner.h b/app/dock/positioner.h index ccfe33408..22ab62dc8 100644 --- a/app/dock/positioner.h +++ b/app/dock/positioner.h @@ -20,11 +20,13 @@ #ifndef POSITIONER_H #define POSITIONER_H +// Qt #include #include #include #include +// Plasma #include namespace Plasma { diff --git a/app/dock/screenedgeghostwindow.cpp b/app/dock/screenedgeghostwindow.cpp index de4f466e3..96f8d99a6 100644 --- a/app/dock/screenedgeghostwindow.cpp +++ b/app/dock/screenedgeghostwindow.cpp @@ -18,19 +18,23 @@ */ #include "screenedgeghostwindow.h" + +// local #include "dockview.h" #include "../dockcorona.h" +// Qt #include #include #include #include +// KDE #include #include - #include +// X11 #include namespace Latte { diff --git a/app/dock/screenedgeghostwindow.h b/app/dock/screenedgeghostwindow.h index 255dec302..cda841c17 100644 --- a/app/dock/screenedgeghostwindow.h +++ b/app/dock/screenedgeghostwindow.h @@ -20,6 +20,7 @@ #ifndef SCREENEDGEGHOSTWINDOW_H #define SCREENEDGEGHOSTWINDOW_H +// Qt #include #include #include diff --git a/app/dock/visibilitymanager.cpp b/app/dock/visibilitymanager.cpp index c95bcd973..a0deaed82 100644 --- a/app/dock/visibilitymanager.cpp +++ b/app/dock/visibilitymanager.cpp @@ -21,6 +21,7 @@ #include "visibilitymanager.h" #include "visibilitymanager_p.h" +// local #include "dockview.h" #include "positioner.h" #include "screenedgeghostwindow.h" @@ -30,11 +31,13 @@ #include "../wm/windowinfowrap.h" #include "../../liblattedock/extras.h" +// Qt +#include + +// KDE #include #include -#include - namespace Latte { //! BEGIN: VisiblityManagerPrivate implementation diff --git a/app/dock/visibilitymanager.h b/app/dock/visibilitymanager.h index 3b46900c0..270a4b77c 100644 --- a/app/dock/visibilitymanager.h +++ b/app/dock/visibilitymanager.h @@ -21,14 +21,17 @@ #ifndef VISIBILITYMANAGER_H #define VISIBILITYMANAGER_H +// local #include "../plasmaquick/containmentview.h" #include "../schemecolors.h" #include "../wm/windowinfowrap.h" #include "../../liblattedock/dock.h" +// Qt #include #include +// Plasma #include namespace Latte { diff --git a/app/dock/visibilitymanager_p.h b/app/dock/visibilitymanager_p.h index 89171d7af..0cb0bb9c2 100644 --- a/app/dock/visibilitymanager_p.h +++ b/app/dock/visibilitymanager_p.h @@ -1,20 +1,24 @@ #ifndef VISIBILITYMANAGERPRIVATE_H #define VISIBILITYMANAGERPRIVATE_H +// local #include "../schemecolors.h" #include "../wm/abstractwindowinterface.h" #include "../wm/windowinfowrap.h" #include "../../liblattedock/dock.h" +// C++ #include #include +// Qt #include #include #include #include #include +// Plasma #include namespace Latte { diff --git a/app/dockcorona.cpp b/app/dockcorona.cpp index c8bfcc109..5c219fba8 100644 --- a/app/dockcorona.cpp +++ b/app/dockcorona.cpp @@ -20,9 +20,11 @@ #include "dockcorona.h" +// local #include "alternativeshelper.h" #include "globalshortcuts.h" #include "importer.h" +#include "lattedockadaptor.h" #include "launcherssignals.h" #include "layoutmanager.h" #include "plasmathemeextended.h" @@ -34,9 +36,7 @@ #include "wm/waylandinterface.h" #include "wm/xwindowinterface.h" -//dbus adaptor -#include "lattedockadaptor.h" - +// Qt #include #include #include @@ -47,12 +47,13 @@ #include #include +// Plasma #include #include #include - #include +// KDE #include #include #include @@ -62,7 +63,6 @@ #include #include #include - #include #include #include diff --git a/app/dockcorona.h b/app/dockcorona.h index 0cc103946..1ddad3c14 100644 --- a/app/dockcorona.h +++ b/app/dockcorona.h @@ -21,16 +21,18 @@ #ifndef DOCKCORONA_H #define DOCKCORONA_H +// local #include "../liblattedock/dock.h" +// Qt #include #include +// Plasma #include -//#include +// KDE #include -//#include namespace KDeclarative { class QmlObject; diff --git a/app/globalshortcuts.cpp b/app/globalshortcuts.cpp index 19321577e..c47382a15 100644 --- a/app/globalshortcuts.cpp +++ b/app/globalshortcuts.cpp @@ -18,23 +18,31 @@ * along with this program. If not, see . */ -#include "dockcorona.h" #include "globalshortcuts.h" + +// local +#include "dockcorona.h" #include "layoutmanager.h" #include "dock/dockview.h" #include "settings/universalsettings.h" +// C++ +#include + +// Qt #include #include #include #include #include +// KDE #include #include #include #include +// Plasma #include #include @@ -43,8 +51,6 @@ #include #include -#include - //this code is used by activityswitcher in plasma in order to check if the //user has release all the modifier keys from the globalshortcut namespace { diff --git a/app/globalshortcuts.h b/app/globalshortcuts.h index 655c8d109..439daf648 100644 --- a/app/globalshortcuts.h +++ b/app/globalshortcuts.h @@ -21,10 +21,12 @@ #ifndef GLOBALSHORTCUTS_H #define GLOBALSHORTCUTS_H +// local #include "../liblattedock/dock.h" -#include +// Qt #include +#include #include namespace Plasma { diff --git a/app/importer.cpp b/app/importer.cpp index a5d1d11d0..2d6e7d767 100644 --- a/app/importer.cpp +++ b/app/importer.cpp @@ -20,6 +20,7 @@ #include "importer.h" +// local #include "dockcorona.h" #include "layoutmanager.h" #include "layout.h" @@ -27,9 +28,11 @@ #include "settings/universalsettings.h" #include "../liblattedock/dock.h" +// Qt #include #include +// KDE #include #include #include @@ -37,7 +40,6 @@ #include #include - namespace Latte { Importer::Importer(QObject *parent) diff --git a/app/importer.h b/app/importer.h index 748449eaf..db2316d44 100644 --- a/app/importer.h +++ b/app/importer.h @@ -21,6 +21,7 @@ #ifndef IMPORTER_H #define IMPORTER_H +// Qt #include namespace Latte { diff --git a/app/infoview.cpp b/app/infoview.cpp index 0ee8d9aef..e6ab59e86 100644 --- a/app/infoview.cpp +++ b/app/infoview.cpp @@ -19,23 +19,27 @@ */ #include "infoview.h" + +// local #include "dock/panelshadows_p.h" #include "wm/abstractwindowinterface.h" +// Qt #include #include #include #include +// KDE #include #include - -#include #include - #include #include +// Plasma +#include + namespace Latte { InfoView::InfoView(DockCorona *corona, QString message, QScreen *screen, QWindow *parent) diff --git a/app/infoview.h b/app/infoview.h index 9f31de36a..752dfaa7d 100644 --- a/app/infoview.h +++ b/app/infoview.h @@ -21,8 +21,10 @@ #ifndef INFOVIEW_H #define INFOVIEW_H +// local #include "dockcorona.h" +// Qt #include #include #include diff --git a/app/launcherssignals.cpp b/app/launcherssignals.cpp index a50433ff5..e073b6faa 100644 --- a/app/launcherssignals.cpp +++ b/app/launcherssignals.cpp @@ -20,11 +20,14 @@ #include "launcherssignals.h" +// local #include "dockcorona.h" #include "layout.h" +// Qt #include +// Plasma #include #include diff --git a/app/launcherssignals.h b/app/launcherssignals.h index da200e451..ad84365ee 100644 --- a/app/launcherssignals.h +++ b/app/launcherssignals.h @@ -21,9 +21,11 @@ #ifndef LAUNCHERSSIGNALS_H #define LAUNCHERSSIGNALS_H +// local #include "layoutmanager.h" #include "../liblattedock/dock.h" +// Qt #include namespace Plasma { diff --git a/app/layout.cpp b/app/layout.cpp index 46761cd34..3c2d4ce7a 100644 --- a/app/layout.cpp +++ b/app/layout.cpp @@ -20,6 +20,7 @@ #include "layout.h" +// local #include "dockcorona.h" #include "importer.h" #include "layoutmanager.h" @@ -28,17 +29,20 @@ #include "dock/positioner.h" #include "settings/universalsettings.h" +// Qt #include #include #include +// KDE +#include +#include + +// Plasma #include #include #include -#include -#include - namespace Latte { const QString Layout::MultipleLayoutsName = ".multiple-layouts_hidden"; diff --git a/app/layout.h b/app/layout.h index 9b857d1d6..0f8650b51 100644 --- a/app/layout.h +++ b/app/layout.h @@ -21,14 +21,17 @@ #ifndef LAYOUT_H #define LAYOUT_H +// Qt #include #include -#include - +// KDE #include #include +// Plasma +#include + namespace Plasma { class Applet; class Containment; diff --git a/app/layoutmanager.cpp b/app/layoutmanager.cpp index 2f6da58ae..77411e6d8 100644 --- a/app/layoutmanager.cpp +++ b/app/layoutmanager.cpp @@ -20,6 +20,7 @@ #include "layoutmanager.h" +// local #include "importer.h" #include "infoview.h" #include "launcherssignals.h" @@ -29,12 +30,14 @@ #include "settings/settingsdialog.h" #include "settings/universalsettings.h" +// Qt #include #include #include #include #include +// KDE #include #include #include diff --git a/app/layoutmanager.h b/app/layoutmanager.h index 5b0311d92..e94aa132d 100644 --- a/app/layoutmanager.h +++ b/app/layoutmanager.h @@ -21,13 +21,16 @@ #ifndef LAYOUTMANAGER_H #define LAYOUTMANAGER_H +// local #include "launcherssignals.h" #include "settings/settingsdialog.h" +// Qt #include #include #include +// KDE #include namespace Plasma { diff --git a/app/main.cpp b/app/main.cpp index e1f0bf83a..035908d50 100644 --- a/app/main.cpp +++ b/app/main.cpp @@ -18,14 +18,17 @@ * along with this program. If not, see . */ +// local #include "dockcorona.h" #include "config-latte.h" #include "importer.h" #include "../liblattedock/dock.h" +// C++ #include #include +// Qt #include #include #include @@ -35,13 +38,13 @@ #include #include +// KDE #include #include #include #include #include - //! COLORS #define CNORMAL "\e[0m" #define CIGREEN "\e[1;32m" diff --git a/app/packageplugins/shell/dockpackage.cpp b/app/packageplugins/shell/dockpackage.cpp index 7bf243cd8..eaf3d6143 100644 --- a/app/packageplugins/shell/dockpackage.cpp +++ b/app/packageplugins/shell/dockpackage.cpp @@ -20,8 +20,10 @@ #include "dockpackage.h" +// Qt #include +// KDE #include #include @@ -63,7 +65,7 @@ void DockPackage::initPackage(KPackage::Package *package) package->addFileDefinition("preset10", QStringLiteral("presets/multiple-layouts_hidden.layout.latte"), i18n("multiple layouts hidden file")); package->addFileDefinition("themesExtendedInfo", QStringLiteral("themes/themesExtendedInforc"), i18n("a file that contains extended information for plasma themes")); - + package->setFallbackPackage(fallback); qDebug() << "package is valid" << package->isValid(); } diff --git a/app/packageplugins/shell/dockpackage.h b/app/packageplugins/shell/dockpackage.h index ba6403c22..b5ee9e4ed 100644 --- a/app/packageplugins/shell/dockpackage.h +++ b/app/packageplugins/shell/dockpackage.h @@ -18,11 +18,13 @@ * along with this program. If not, see . */ -#ifndef NOWDOCKPACKAGE_H -#define NOWDOCKPACKAGE_H +#ifndef DOCKPACKAGE_H +#define DOCKPACKAGE_H +// Qt #include +// KDE #include namespace Latte { @@ -39,4 +41,4 @@ public: }; } -#endif // NOWDOCKPACKAGE_H +#endif // DOCKPACKAGE_H diff --git a/app/plasmathemeextended.cpp b/app/plasmathemeextended.cpp index 2b9aff0b3..841bd41f3 100644 --- a/app/plasmathemeextended.cpp +++ b/app/plasmathemeextended.cpp @@ -20,14 +20,17 @@ #include "plasmathemeextended.h" +// local #include "commontools.h" #include "dockcorona.h" #include "schemecolors.h" #include "dock/panelshadows_p.h" +// Qt #include #include +// KDE #include #include #include diff --git a/app/plasmathemeextended.h b/app/plasmathemeextended.h index 356cdb497..cc0c9f404 100644 --- a/app/plasmathemeextended.h +++ b/app/plasmathemeextended.h @@ -21,17 +21,21 @@ #ifndef PLASMATHEMEEXTENDED_H #define PLASMATHEMEEXTENDED_H -#include - -#include +// local +#include "schemecolors.h" +// C++ #include +// Qt +#include #include +// KDE #include #include +// Plasma #include namespace Latte { diff --git a/app/schemecolors.cpp b/app/schemecolors.cpp index 9b679a1ee..76c4f2fb0 100644 --- a/app/schemecolors.cpp +++ b/app/schemecolors.cpp @@ -20,10 +20,12 @@ #include "schemecolors.h" +// Qt #include #include #include +// KDE #include #include #include diff --git a/app/schemecolors.h b/app/schemecolors.h index 271766596..8e0e7671d 100644 --- a/app/schemecolors.h +++ b/app/schemecolors.h @@ -21,6 +21,7 @@ #ifndef SCHEMECOLORS_H #define SCHEMECOLORS_H +// Qt #include #include diff --git a/app/screenpool.cpp b/app/screenpool.cpp index 1904ae065..b918d446b 100644 --- a/app/screenpool.cpp +++ b/app/screenpool.cpp @@ -18,13 +18,17 @@ */ #include "screenpool.h" + +// local #include +// Qt #include #include #include #include +// X11 #if HAVE_X11 #include #include diff --git a/app/screenpool.h b/app/screenpool.h index 826c467b9..d3d250fe7 100644 --- a/app/screenpool.h +++ b/app/screenpool.h @@ -20,6 +20,7 @@ #ifndef SCREENPOOL_H #define SCREENPOOL_H +// Qt #include #include #include @@ -27,6 +28,7 @@ #include #include +// KDE #include #include diff --git a/app/settings/delegates/activitycmbboxdelegate.cpp b/app/settings/delegates/activitycmbboxdelegate.cpp index 042eaae6c..7a33c2399 100644 --- a/app/settings/delegates/activitycmbboxdelegate.cpp +++ b/app/settings/delegates/activitycmbboxdelegate.cpp @@ -19,8 +19,10 @@ #include "activitycmbboxdelegate.h" +// local #include "../settingsdialog.h" +// Qt #include #include #include @@ -30,6 +32,7 @@ #include #include +// KDE #include ActivityCmbBoxDelegate::ActivityCmbBoxDelegate(QObject *parent) diff --git a/app/settings/delegates/activitycmbboxdelegate.h b/app/settings/delegates/activitycmbboxdelegate.h index aa5894b36..9a74faa43 100644 --- a/app/settings/delegates/activitycmbboxdelegate.h +++ b/app/settings/delegates/activitycmbboxdelegate.h @@ -20,6 +20,7 @@ #ifndef ACTIVITYCMBBOXDELEGATE_H #define ACTIVITYCMBBOXDELEGATE_H +// Qt #include class QModelIndex; diff --git a/app/settings/delegates/checkboxdelegate.cpp b/app/settings/delegates/checkboxdelegate.cpp index 76b89848f..bf08defa4 100644 --- a/app/settings/delegates/checkboxdelegate.cpp +++ b/app/settings/delegates/checkboxdelegate.cpp @@ -19,6 +19,7 @@ #include "checkboxdelegate.h" +// Qt #include #include #include diff --git a/app/settings/delegates/checkboxdelegate.h b/app/settings/delegates/checkboxdelegate.h index ba2095124..50ac225d1 100644 --- a/app/settings/delegates/checkboxdelegate.h +++ b/app/settings/delegates/checkboxdelegate.h @@ -20,6 +20,7 @@ #ifndef CHECKBOXDELEGATE_H #define CHECKBOXDELEGATE_H +// Qt #include class CheckBoxDelegate : public QStyledItemDelegate diff --git a/app/settings/delegates/colorcmbboxdelegate.cpp b/app/settings/delegates/colorcmbboxdelegate.cpp index f974e7c84..1cb03b668 100644 --- a/app/settings/delegates/colorcmbboxdelegate.cpp +++ b/app/settings/delegates/colorcmbboxdelegate.cpp @@ -18,10 +18,12 @@ */ #include "colorcmbboxdelegate.h" -#include "colorcmbboxitemdelegate.h" +// local +#include "colorcmbboxitemdelegate.h" #include "../settingsdialog.h" +// Qt #include #include #include @@ -32,6 +34,7 @@ #include #include +// KDE #include ColorCmbBoxDelegate::ColorCmbBoxDelegate(QObject *parent, QString iconsPath, QStringList colors) diff --git a/app/settings/delegates/colorcmbboxdelegate.h b/app/settings/delegates/colorcmbboxdelegate.h index 0b83b625b..23afc6f46 100644 --- a/app/settings/delegates/colorcmbboxdelegate.h +++ b/app/settings/delegates/colorcmbboxdelegate.h @@ -20,6 +20,7 @@ #ifndef COLORCMBBOXDELEGATE_H #define COLORCMBBOXDELEGATE_H +// Qt #include class QModelIndex; diff --git a/app/settings/delegates/colorcmbboxitemdelegate.cpp b/app/settings/delegates/colorcmbboxitemdelegate.cpp index 8a0d9936e..4599db1f0 100644 --- a/app/settings/delegates/colorcmbboxitemdelegate.cpp +++ b/app/settings/delegates/colorcmbboxitemdelegate.cpp @@ -19,12 +19,12 @@ #include "colorcmbboxitemdelegate.h" +// Qt #include #include #include #include - ColorCmbBoxItemDelegate::ColorCmbBoxItemDelegate(QObject *parent, QString iconsPath) : QAbstractItemDelegate(parent), m_iconsPath(iconsPath) diff --git a/app/settings/delegates/colorcmbboxitemdelegate.h b/app/settings/delegates/colorcmbboxitemdelegate.h index 03b63267b..ff3802b7d 100644 --- a/app/settings/delegates/colorcmbboxitemdelegate.h +++ b/app/settings/delegates/colorcmbboxitemdelegate.h @@ -20,6 +20,7 @@ #ifndef COLORCMBBOXITEMDELEGATE_H #define COLORCMBBOXITEMDELEGATE_H +// Qt #include class ColorCmbBoxItemDelegate : public QAbstractItemDelegate diff --git a/app/settings/delegates/layoutnamedelegate.cpp b/app/settings/delegates/layoutnamedelegate.cpp index 217243b85..82f376a47 100644 --- a/app/settings/delegates/layoutnamedelegate.cpp +++ b/app/settings/delegates/layoutnamedelegate.cpp @@ -19,6 +19,7 @@ #include "layoutnamedelegate.h" +// Qt #include #include #include diff --git a/app/settings/delegates/layoutnamedelegate.h b/app/settings/delegates/layoutnamedelegate.h index a47ed7c49..f446684d9 100644 --- a/app/settings/delegates/layoutnamedelegate.h +++ b/app/settings/delegates/layoutnamedelegate.h @@ -20,6 +20,7 @@ #ifndef LAYOUTNAMEDELEGATE_H #define LAYOUTNAMEDELEGATE_H +// Qt #include class LayoutNameDelegate : public QStyledItemDelegate diff --git a/app/settings/settingsdialog.cpp b/app/settings/settingsdialog.cpp index f5d00e8e5..07c7f0df3 100644 --- a/app/settings/settingsdialog.cpp +++ b/app/settings/settingsdialog.cpp @@ -21,6 +21,7 @@ #include "settingsdialog.h" +// local #include "dockcorona.h" #include "layout.h" #include "layoutmanager.h" @@ -34,6 +35,7 @@ #include "delegates/activitycmbboxdelegate.h" #include "delegates/layoutnamedelegate.h" +// Qt #include #include #include @@ -47,6 +49,7 @@ #include #include +// KDE #include #include #include diff --git a/app/settings/settingsdialog.h b/app/settings/settingsdialog.h index 8d985e7c3..cd1fe1017 100644 --- a/app/settings/settingsdialog.h +++ b/app/settings/settingsdialog.h @@ -22,8 +22,10 @@ #ifndef SETTINGSDIALOG_H #define SETTINGSDIALOG_H +// local #include "../liblattedock/dock.h" +// Qt #include #include #include diff --git a/app/settings/universalsettings.cpp b/app/settings/universalsettings.cpp index 5312d2bc8..b5be6807c 100644 --- a/app/settings/universalsettings.cpp +++ b/app/settings/universalsettings.cpp @@ -19,14 +19,17 @@ */ #include "universalsettings.h" + +// local #include "layoutmanager.h" #include "sortedactivitiesmodel.h" +// Qt #include #include - #include +// KDE #include #include diff --git a/app/settings/universalsettings.h b/app/settings/universalsettings.h index b9bc80eac..37153f35d 100644 --- a/app/settings/universalsettings.h +++ b/app/settings/universalsettings.h @@ -21,19 +21,21 @@ #ifndef UNIVERSALSETTINGS_H #define UNIVERSALSETTINGS_H +// local #include "dockcorona.h" +#include "../liblattedock/dock.h" +// Qt #include #include #include #include #include +// KDE #include #include -#include "../liblattedock/dock.h" - class SortedActivitiesModel; namespace Latte { diff --git a/app/sortedactivitiesmodel.cpp b/app/sortedactivitiesmodel.cpp index d9995d540..7afc81966 100644 --- a/app/sortedactivitiesmodel.cpp +++ b/app/sortedactivitiesmodel.cpp @@ -17,9 +17,11 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -// Self #include "sortedactivitiesmodel.h" + +// local #include "commontools.h" + // C++ #include @@ -38,6 +40,7 @@ #include #include +// Plasma #include #define PLASMACONFIG "plasma-org.kde.plasma.desktop-appletsrc" diff --git a/app/sortedactivitiesmodel.h b/app/sortedactivitiesmodel.h index c01464198..2f057ba77 100644 --- a/app/sortedactivitiesmodel.h +++ b/app/sortedactivitiesmodel.h @@ -23,6 +23,7 @@ // Qt #include +// Plasma #include // KDE diff --git a/app/wm/abstractwindowinterface.cpp b/app/wm/abstractwindowinterface.cpp index 27ba12ced..5a3180d16 100644 --- a/app/wm/abstractwindowinterface.cpp +++ b/app/wm/abstractwindowinterface.cpp @@ -19,13 +19,17 @@ */ #include "abstractwindowinterface.h" + +// local #include "xwindowinterface.h" #include "waylandinterface.h" +// Qt #include #include #include +// KDE #include #include diff --git a/app/wm/abstractwindowinterface.h b/app/wm/abstractwindowinterface.h index 98485fc1f..cea39643b 100644 --- a/app/wm/abstractwindowinterface.h +++ b/app/wm/abstractwindowinterface.h @@ -21,14 +21,17 @@ #ifndef ABSTRACTWINDOWINTERFACE_H #define ABSTRACTWINDOWINTERFACE_H +// local #include "schemecolors.h" #include "windowinfowrap.h" #include "../liblattedock/dock.h" #include "../liblattedock/extras.h" +// C++ #include #include +// Qt #include #include #include @@ -38,9 +41,12 @@ #include #include -#include +// KDE #include +// Plasma +#include + namespace Latte { class XWindowInterface; diff --git a/app/wm/waylandinterface.cpp b/app/wm/waylandinterface.cpp index 2964e69b1..e8f7d7a5e 100644 --- a/app/wm/waylandinterface.cpp +++ b/app/wm/waylandinterface.cpp @@ -19,11 +19,14 @@ */ #include "waylandinterface.h" + +// local #include "dockcorona.h" #include "dock/dockview.h" #include "dock/screenedgeghostwindow.h" #include "../liblattedock/extras.h" +// Qt #include #include #include @@ -31,12 +34,14 @@ #include #include +// KDE #include #include -#include - #include +// X11 +#include + using namespace KWayland::Client; namespace Latte { diff --git a/app/wm/waylandinterface.h b/app/wm/waylandinterface.h index 1aa05a658..bf1cd3cf1 100644 --- a/app/wm/waylandinterface.h +++ b/app/wm/waylandinterface.h @@ -21,21 +21,23 @@ #ifndef WAYLANDINTERFACE_H #define WAYLANDINTERFACE_H +// local #include "abstractwindowinterface.h" #include "windowinfowrap.h" -#include +// Qt #include - -#include -#include +#include #include +// KDE #include #include #include #include #include +#include +#include namespace Latte { diff --git a/app/wm/windowinfowrap.h b/app/wm/windowinfowrap.h index 38363987f..f0d264dd5 100644 --- a/app/wm/windowinfowrap.h +++ b/app/wm/windowinfowrap.h @@ -21,6 +21,7 @@ #ifndef WINDOWINFOWRAP_H #define WINDOWINFOWRAP_H +// Qt #include #include #include diff --git a/app/wm/xwindowinterface.cpp b/app/wm/xwindowinterface.cpp index 85e5e8ab0..8620d220a 100644 --- a/app/wm/xwindowinterface.cpp +++ b/app/wm/xwindowinterface.cpp @@ -19,18 +19,23 @@ */ #include "xwindowinterface.h" + +// local #include "dock/dockview.h" #include "dock/screenedgeghostwindow.h" #include "../liblattedock/extras.h" +// Qt #include #include #include +// KDE #include #include -#include +// X11 +#include #include namespace Latte { diff --git a/app/wm/xwindowinterface.h b/app/wm/xwindowinterface.h index a17dbd4fe..0255b6bdd 100644 --- a/app/wm/xwindowinterface.h +++ b/app/wm/xwindowinterface.h @@ -21,11 +21,14 @@ #ifndef XWINDOWINTERFACE_H #define XWINDOWINTERFACE_H +// local #include "abstractwindowinterface.h" #include "windowinfowrap.h" +// Qt #include +// KDE #include #include diff --git a/containmentactions/contextmenu/menu.cpp b/containmentactions/contextmenu/menu.cpp index f00c4b94a..daf3330df 100644 --- a/containmentactions/contextmenu/menu.cpp +++ b/containmentactions/contextmenu/menu.cpp @@ -19,8 +19,10 @@ #include "menu.h" +// local #include "../../liblattedock/dock.h" +// Qt #include #include #include @@ -28,9 +30,11 @@ #include #include +// KDE #include #include +// Plasma #include #include #include diff --git a/containmentactions/contextmenu/menu.h b/containmentactions/contextmenu/menu.h index c8797b9e5..e5ac561ee 100644 --- a/containmentactions/contextmenu/menu.h +++ b/containmentactions/contextmenu/menu.h @@ -20,8 +20,10 @@ #ifndef MENU_H #define MENU_H +// Qt #include +// Plasma #include class QAction; diff --git a/liblattedock/dock.h b/liblattedock/dock.h index 916853f6b..478845148 100644 --- a/liblattedock/dock.h +++ b/liblattedock/dock.h @@ -21,6 +21,7 @@ #ifndef DOCK_H #define DOCK_H +// Qt #include #include #include diff --git a/liblattedock/extras.h b/liblattedock/extras.h index 3602dd97c..7b52fe2cf 100644 --- a/liblattedock/extras.h +++ b/liblattedock/extras.h @@ -1,8 +1,16 @@ #ifndef EXTRAS_H #define EXTRAS_H +// local #include "../liblattedock/config-latte-lib.h" +// C++ +#include +#include +#include +#include + +// Qt #include #include #include @@ -10,13 +18,9 @@ #include #include +// Plasma #include -#include -#include -#include -#include - //! There are gcc versions that don't support yet that function even though they //! publish themselves as C++14 compatible. Such a case is gcc 4.8.x that openSUSE //! LEAP 42.2-3 is using. By enabling this flag such systems can be build correctly. diff --git a/liblattedock/iconitem.cpp b/liblattedock/iconitem.cpp index e2d08b5f9..178050a47 100644 --- a/liblattedock/iconitem.cpp +++ b/liblattedock/iconitem.cpp @@ -21,8 +21,11 @@ */ #include "iconitem.h" + +// local #include "../liblattedock/extras.h" +// Qt #include #include #include @@ -31,6 +34,7 @@ #include #include +// KDE #include #include #include diff --git a/liblattedock/iconitem.h b/liblattedock/iconitem.h index 1bca8268d..2ec71e582 100644 --- a/liblattedock/iconitem.h +++ b/liblattedock/iconitem.h @@ -23,13 +23,16 @@ #ifndef ICONITEM_H #define ICONITEM_H +// C++ #include +// Qt #include #include #include #include +// Plasma #include // this file is based on PlasmaCore::IconItem class, thanks to KDE diff --git a/liblattedock/lattedockplugin.cpp b/liblattedock/lattedockplugin.cpp index 12fd545cd..2953bfd93 100644 --- a/liblattedock/lattedockplugin.cpp +++ b/liblattedock/lattedockplugin.cpp @@ -19,10 +19,13 @@ */ #include "lattedockplugin.h" -#include "quickwindowsystem.h" + +// local #include "dock.h" #include "iconitem.h" +#include "quickwindowsystem.h" +// Qt #include void LatteDockPlugin::registerTypes(const char *uri) diff --git a/liblattedock/lattedockplugin.h b/liblattedock/lattedockplugin.h index b732d3cf5..554638ca2 100644 --- a/liblattedock/lattedockplugin.h +++ b/liblattedock/lattedockplugin.h @@ -21,6 +21,7 @@ #ifndef LATTEDOCKPLUGIN_H #define LATTEDOCKPLUGIN_H +// Qt #include class LatteDockPlugin : public QQmlExtensionPlugin diff --git a/liblattedock/qml/GlowPoint.qml b/liblattedock/qml/GlowPoint.qml index 80fd6c105..85c56c917 100644 --- a/liblattedock/qml/GlowPoint.qml +++ b/liblattedock/qml/GlowPoint.qml @@ -19,12 +19,12 @@ */ import QtQuick 2.0 -import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as Components -import org.kde.plasma.plasmoid 2.0 - import QtGraphicalEffects 1.0 +import org.kde.plasma.components 2.0 as Components +import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.plasma.plasmoid 2.0 + Item{ // property string color id: glowItem diff --git a/liblattedock/quickwindowsystem.cpp b/liblattedock/quickwindowsystem.cpp index c6b632391..748deecd0 100644 --- a/liblattedock/quickwindowsystem.cpp +++ b/liblattedock/quickwindowsystem.cpp @@ -19,13 +19,18 @@ */ #include "quickwindowsystem.h" + +// local #include "../app/config-latte.h" +// Qt #include #include +// Plasma #include +// X11 #if HAVE_X11 #include #endif diff --git a/liblattedock/quickwindowsystem.h b/liblattedock/quickwindowsystem.h index 2334e11d1..786986d55 100644 --- a/liblattedock/quickwindowsystem.h +++ b/liblattedock/quickwindowsystem.h @@ -21,6 +21,7 @@ #ifndef QUICKWINDOWSYSTEM_H #define QUICKWINDOWSYSTEM_H +// Qt #include #include #include