From 4d794ecaaa2f2b5ca1499dee4047fc09ec7c4636 Mon Sep 17 00:00:00 2001 From: Nils Fenner Date: Mon, 25 Sep 2023 11:47:30 +0200 Subject: [PATCH] Replace include guards and use pragma once --- panel/config/addplugindialog.h | 5 +---- panel/config/configpaneldialog.h | 5 +---- panel/config/configplacement.h | 5 +---- panel/config/configpluginswidget.h | 5 +---- panel/config/configstyling.h | 5 +---- panel/ilxqtpanel.h | 6 ++---- panel/ilxqtpanelplugin.h | 5 +---- panel/lxqtpanel.h | 7 +------ panel/lxqtpanelapplication.h | 7 +------ panel/lxqtpanelapplication_p.h | 5 +---- panel/lxqtpanelglobals.h | 5 +---- panel/lxqtpanellayout.h | 6 +----- panel/lxqtpanellimits.h | 4 +--- panel/lxqtpanelpluginconfigdialog.h | 5 +---- panel/panelpluginsmodel.h | 5 +---- panel/plugin.h | 7 +------ panel/pluginmoveprocessor.h | 6 +----- panel/pluginsettings.h | 5 +---- panel/pluginsettings_p.h | 5 +---- panel/popupmenu.h | 6 +----- plugin-backlight/backlight.h | 6 +----- plugin-backlight/sliderdialog.h | 6 +----- plugin-colorpicker/colorbutton.h | 5 +---- plugin-colorpicker/colorpicker.h | 5 +---- plugin-cpuload/lxqtcpuload.h | 7 ++----- plugin-cpuload/lxqtcpuloadconfiguration.h | 6 +----- plugin-cpuload/lxqtcpuloadplugin.h | 8 +------- plugin-customcommand/custombutton.h | 5 +---- plugin-customcommand/lxqtcustomcommand.h | 5 +---- plugin-customcommand/lxqtcustomcommandconfiguration.h | 5 +---- plugin-desktopswitch/desktopswitch.h | 6 +----- plugin-desktopswitch/desktopswitchbutton.h | 5 +---- plugin-desktopswitch/desktopswitchconfiguration.h | 6 +----- plugin-directorymenu/directorymenu.h | 8 +------- plugin-directorymenu/directorymenuconfiguration.h | 6 +----- plugin-dom/domplugin.h | 6 +----- plugin-dom/domtreeitem.h | 5 +---- plugin-dom/treewindow.h | 5 +---- plugin-kbindicator/src/content.h | 5 +---- plugin-kbindicator/src/controls.h | 5 +---- plugin-kbindicator/src/kbdinfo.h | 5 +---- plugin-kbindicator/src/kbdkeeper.h | 5 +---- plugin-kbindicator/src/kbdlayout.h | 5 +---- plugin-kbindicator/src/kbdstate.h | 6 +----- plugin-kbindicator/src/kbdstateconfig.h | 5 +---- plugin-kbindicator/src/kbdwatcher.h | 5 +---- plugin-kbindicator/src/settings.h | 5 +---- plugin-kbindicator/src/x11/kbdlayout.h | 5 +---- plugin-mainmenu/lxqtmainmenu.h | 6 +----- plugin-mainmenu/lxqtmainmenuconfiguration.h | 6 +----- plugin-mainmenu/menustyle.h | 6 +----- plugin-mainmenu/xdgcachedmenu.h | 6 +----- plugin-mount/actions/deviceaction.h | 5 +---- plugin-mount/actions/deviceaction_info.h | 5 +---- plugin-mount/actions/deviceaction_menu.h | 5 +---- plugin-mount/actions/deviceaction_nothing.h | 6 +----- plugin-mount/actions/ejectaction.h | 5 +---- plugin-mount/actions/ejectaction_nothing.h | 6 +----- plugin-mount/actions/ejectaction_optical.h | 5 +---- plugin-mount/button.h | 5 +---- plugin-mount/configuration.h | 5 +---- plugin-mount/lxqtmountplugin.h | 5 +---- plugin-mount/menudiskitem.h | 5 +---- plugin-mount/popup.h | 5 +---- plugin-networkmonitor/lxqtnetworkmonitor.h | 9 ++------- plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h | 6 +----- plugin-networkmonitor/lxqtnetworkmonitorplugin.h | 8 +------- plugin-quicklaunch/lxqtquicklaunch.h | 6 +----- plugin-quicklaunch/lxqtquicklaunchplugin.h | 4 +--- plugin-quicklaunch/quicklaunchaction.h | 5 +---- plugin-quicklaunch/quicklaunchbutton.h | 6 +----- plugin-sensors/chip.h | 5 +---- plugin-sensors/feature.h | 5 +---- plugin-sensors/lxqtsensors.h | 6 +----- plugin-sensors/lxqtsensorsconfiguration.h | 5 +---- plugin-sensors/lxqtsensorsplugin.h | 6 +----- plugin-sensors/sensors.h | 5 +---- plugin-showdesktop/showdesktop.h | 8 +------- plugin-spacer/spacer.h | 7 +------ plugin-spacer/spacerconfiguration.h | 6 +----- plugin-statusnotifier/dbustypes.h | 7 ++----- plugin-statusnotifier/statusnotifier.h | 5 +---- plugin-statusnotifier/statusnotifierbutton.h | 5 +---- plugin-statusnotifier/statusnotifierconfiguration.h | 5 +---- plugin-statusnotifier/statusnotifieriteminterface.h | 4 +--- plugin-statusnotifier/statusnotifierwatcher.h | 5 +---- plugin-sysstat/lxqtsysstat.h | 5 +---- plugin-sysstat/lxqtsysstatcolours.h | 6 +----- plugin-sysstat/lxqtsysstatconfiguration.h | 6 +----- plugin-sysstat/lxqtsysstatutils.h | 5 +---- plugin-taskbar/lxqtgrouppopup.h | 5 +---- plugin-taskbar/lxqttaskbar.h | 6 +----- plugin-taskbar/lxqttaskbarconfiguration.h | 5 +---- plugin-taskbar/lxqttaskbarplugin.h | 6 +----- plugin-taskbar/lxqttaskbutton.h | 6 +----- plugin-taskbar/lxqttaskgroup.h | 5 +---- plugin-volume/alsadevice.h | 5 +---- plugin-volume/alsaengine.h | 5 +---- plugin-volume/audiodevice.h | 5 +---- plugin-volume/audioengine.h | 5 +---- plugin-volume/lxqtvolume.h | 5 +---- plugin-volume/lxqtvolumeconfiguration.h | 5 +---- plugin-volume/ossengine.h | 5 +---- plugin-volume/pulseaudioengine.h | 5 +---- plugin-volume/volumebutton.h | 5 +---- plugin-volume/volumepopup.h | 5 +---- plugin-worldclock/lxqtworldclock.h | 5 +---- plugin-worldclock/lxqtworldclockconfiguration.h | 6 +----- .../lxqtworldclockconfigurationmanualformat.h | 6 +----- plugin-worldclock/lxqtworldclockconfigurationtimezones.h | 6 +----- 110 files changed, 114 insertions(+), 493 deletions(-) diff --git a/panel/config/addplugindialog.h b/panel/config/addplugindialog.h index a77659390..e702f6396 100644 --- a/panel/config/addplugindialog.h +++ b/panel/config/addplugindialog.h @@ -26,8 +26,7 @@ * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_ADDPLUGINDIALOG_H -#define LXQT_ADDPLUGINDIALOG_H +#pragma once #include #include @@ -59,5 +58,3 @@ private slots: void filter(); void emitPluginSelected(); }; - -#endif // LXQT_ADDPLUGINDIALOG_H diff --git a/panel/config/configpaneldialog.h b/panel/config/configpaneldialog.h index 9356d603c..ce9135435 100644 --- a/panel/config/configpaneldialog.h +++ b/panel/config/configpaneldialog.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef CONFIGPANELDIALOG_H -#define CONFIGPANELDIALOG_H +#pragma once #include "configplacement.h" #include "configstyling.h" @@ -52,5 +51,3 @@ class ConfigPanelDialog : public LXQt::ConfigDialog ConfigStyling *mStylingPage; ConfigPluginsWidget *mPluginsPage; }; - -#endif // CONFIGPANELDIALOG_H diff --git a/panel/config/configplacement.h b/panel/config/configplacement.h index 6a928135b..3117a66b5 100644 --- a/panel/config/configplacement.h +++ b/panel/config/configplacement.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef CONFIGPLACEMENT_H -#define CONFIGPLACEMENT_H +#pragma once #include "../lxqtpanel.h" #include @@ -89,5 +88,3 @@ private slots: int mOldScreenNum; bool mOldReserveSpace; }; - -#endif diff --git a/panel/config/configpluginswidget.h b/panel/config/configpluginswidget.h index 2d3bfbda0..de48d2a2a 100644 --- a/panel/config/configpluginswidget.h +++ b/panel/config/configpluginswidget.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef CONFIGPLUGINSWIDGET_H -#define CONFIGPLUGINSWIDGET_H +#pragma once #include "../lxqtpanel.h" @@ -60,5 +59,3 @@ private slots: QScopedPointer mAddPluginDialog; LXQtPanel *mPanel; }; - -#endif diff --git a/panel/config/configstyling.h b/panel/config/configstyling.h index 12f0974a1..16a21e85b 100644 --- a/panel/config/configstyling.h +++ b/panel/config/configstyling.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef CONFIGSTYLING_H -#define CONFIGSTYLING_H +#pragma once #include "../lxqtpanel.h" #include @@ -77,5 +76,3 @@ private slots: QString mOldBackgroundImage; int mOldOpacity; }; - -#endif diff --git a/panel/ilxqtpanel.h b/panel/ilxqtpanel.h index 6bbade652..9719dd559 100644 --- a/panel/ilxqtpanel.h +++ b/panel/ilxqtpanel.h @@ -26,8 +26,8 @@ * END_COMMON_COPYRIGHT_HEADER */ -#ifndef ILXQTPANEL_H -#define ILXQTPANEL_H +#pragma once + #include #include "lxqtpanelglobals.h" @@ -128,5 +128,3 @@ class LXQT_PANEL_API ILXQtPanel */ virtual bool isLocked() const = 0; }; - -#endif // ILXQTPANEL_H diff --git a/panel/ilxqtpanelplugin.h b/panel/ilxqtpanelplugin.h index 94f88a4c7..982b59628 100644 --- a/panel/ilxqtpanelplugin.h +++ b/panel/ilxqtpanelplugin.h @@ -26,8 +26,7 @@ * END_COMMON_COPYRIGHT_HEADER */ -#ifndef ILXQTPANELPLUGIN_H -#define ILXQTPANELPLUGIN_H +#pragma once #include #include "ilxqtpanel.h" @@ -248,5 +247,3 @@ class LXQT_PANEL_API ILXQtPanelPluginLibrary Q_DECLARE_INTERFACE(ILXQtPanelPluginLibrary, "lxqt.org/Panel/PluginInterface/3.0") - -#endif // ILXQTPANELPLUGIN_H diff --git a/panel/lxqtpanel.h b/panel/lxqtpanel.h index f3be5cd96..931f57924 100644 --- a/panel/lxqtpanel.h +++ b/panel/lxqtpanel.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTPANEL_H -#define LXQTPANEL_H +#pragma once #include #include @@ -708,6 +706,3 @@ private slots: // settings should be kept private for security LXQt::Settings *settings() const { return mSettings; } }; - - -#endif // LXQTPANEL_H diff --git a/panel/lxqtpanelapplication.h b/panel/lxqtpanelapplication.h index a672e7e46..596a7dca5 100644 --- a/panel/lxqtpanelapplication.h +++ b/panel/lxqtpanelapplication.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTPANELAPPLICATION_H -#define LXQTPANELAPPLICATION_H +#pragma once #include #include "ilxqtpanelplugin.h" @@ -184,6 +182,3 @@ private slots: Q_DECLARE_PRIVATE(LXQtPanelApplication) Q_DISABLE_COPY(LXQtPanelApplication) }; - - -#endif // LXQTPANELAPPLICATION_H diff --git a/panel/lxqtpanelapplication_p.h b/panel/lxqtpanelapplication_p.h index 4dd26182c..91acfcaf4 100644 --- a/panel/lxqtpanelapplication_p.h +++ b/panel/lxqtpanelapplication_p.h @@ -18,8 +18,7 @@ * Boston, MA 02110-1301 USA */ -#ifndef LXQTPANELAPPLICATION_P_H -#define LXQTPANELAPPLICATION_P_H +#pragma once #include "lxqtpanelapplication.h" @@ -41,5 +40,3 @@ class LXQtPanelApplicationPrivate { private: LXQtPanelApplication *const q_ptr; }; - -#endif // LXQTPANELAPPLICATION_P_H diff --git a/panel/lxqtpanelglobals.h b/panel/lxqtpanelglobals.h index 5792dd625..07599469c 100644 --- a/panel/lxqtpanelglobals.h +++ b/panel/lxqtpanelglobals.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef __LXQT_PANEL_GLOBALS_H__ -#define __LXQT_PANEL_GLOBALS_H__ +#pragma once #include @@ -35,5 +34,3 @@ #else #define LXQT_PANEL_API Q_DECL_IMPORT #endif - -#endif // __LXQT_PANEL_GLOBALS_H__ diff --git a/panel/lxqtpanellayout.h b/panel/lxqtpanellayout.h index bdba39ea5..3e4f586ae 100644 --- a/panel/lxqtpanellayout.h +++ b/panel/lxqtpanellayout.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTPANELLAYOUT_H -#define LXQTPANELLAYOUT_H +#pragma once #include #include @@ -102,5 +100,3 @@ public slots: void setItemGeometry(QLayoutItem *item, const QRect &geometry, bool withAnimation); }; - -#endif // LXQTPANELLAYOUT_H diff --git a/panel/lxqtpanellimits.h b/panel/lxqtpanellimits.h index f326cbc5c..ce08f5052 100644 --- a/panel/lxqtpanellimits.h +++ b/panel/lxqtpanellimits.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTPANELLIMITS_H -#define LXQTPANELLIMITS_H +#pragma once #define PANEL_DEFAULT_SIZE 32 #define PANEL_MINIMUM_SIZE 16 @@ -44,4 +43,3 @@ #define PANEL_SHOW_DELAY 0 #define SETTINGS_SAVE_DELAY 3000 -#endif // LXQTPANELLIMITS_H diff --git a/panel/lxqtpanelpluginconfigdialog.h b/panel/lxqtpanelpluginconfigdialog.h index 8fdb14e7b..0b1e5439f 100644 --- a/panel/lxqtpanelpluginconfigdialog.h +++ b/panel/lxqtpanelpluginconfigdialog.h @@ -26,8 +26,7 @@ * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTPANELPLUGINCONFIGDIALOG_H -#define LXQTPANELPLUGINCONFIGDIALOG_H +#pragma once #include #include @@ -64,5 +63,3 @@ protected slots: PluginSettings &mSettings; }; - -#endif // LXQTPANELPLUGINCONFIGDIALOG_H diff --git a/panel/panelpluginsmodel.h b/panel/panelpluginsmodel.h index d76e9346f..194933fe3 100644 --- a/panel/panelpluginsmodel.h +++ b/panel/panelpluginsmodel.h @@ -23,8 +23,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef PANELPLUGINSMODEL_H -#define PANELPLUGINSMODEL_H +#pragma once #include #include @@ -337,5 +336,3 @@ public slots: }; Q_DECLARE_METATYPE(Plugin const *) - -#endif // PANELPLUGINSMODEL_H diff --git a/panel/plugin.h b/panel/plugin.h index fdb3e48f6..30a47b362 100644 --- a/panel/plugin.h +++ b/panel/plugin.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef PLUGIN_H -#define PLUGIN_H +#pragma once #include #include @@ -129,6 +127,3 @@ private slots: void settingsChanged(); }; - - -#endif // PLUGIN_H diff --git a/panel/pluginmoveprocessor.h b/panel/pluginmoveprocessor.h index 009c682dc..218e59086 100644 --- a/panel/pluginmoveprocessor.h +++ b/panel/pluginmoveprocessor.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef PLUGINMOVEPROCESSOR_H -#define PLUGINMOVEPROCESSOR_H +#pragma once #include #include @@ -95,5 +93,3 @@ class LXQT_PANEL_API CursorAnimation: public QVariantAnimation public: void updateCurrentValue(const QVariant &value) { QCursor::setPos(value.toPoint()); } }; - -#endif // PLUGINMOVEPROCESSOR_H diff --git a/panel/pluginsettings.h b/panel/pluginsettings.h index 13faa8573..8eda08c70 100644 --- a/panel/pluginsettings.h +++ b/panel/pluginsettings.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef PLUGIN_SETTINGS_H -#define PLUGIN_SETTINGS_H +#pragma once #include #include @@ -93,5 +92,3 @@ class LXQT_PANEL_API PluginSettings : public QObject QScopedPointer d_ptr; Q_DECLARE_PRIVATE(PluginSettings) }; - -#endif diff --git a/panel/pluginsettings_p.h b/panel/pluginsettings_p.h index a293822a2..c58469963 100644 --- a/panel/pluginsettings_p.h +++ b/panel/pluginsettings_p.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef PLUGIN_SETTINGS_P_H -#define PLUGIN_SETTINGS_P_H +#pragma once #include "pluginsettings.h" @@ -35,5 +34,3 @@ class PluginSettingsFactory public: static PluginSettings * create(LXQt::Settings *settings, const QString &group, QObject *parent = nullptr); }; - -#endif //PLUGIN_SETTINGS_P_H diff --git a/panel/popupmenu.h b/panel/popupmenu.h index b533a95b7..b66b17f5b 100644 --- a/panel/popupmenu.h +++ b/panel/popupmenu.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef POPUPMENU_H -#define POPUPMENU_H +#pragma once #include #include "lxqtpanelglobals.h" @@ -46,5 +44,3 @@ class LXQT_PANEL_API PopupMenu: public QMenu protected: virtual void keyPressEvent(QKeyEvent* e); }; - -#endif // POPUPMENU_H diff --git a/plugin-backlight/backlight.h b/plugin-backlight/backlight.h index c803a3e8f..82739fd14 100644 --- a/plugin-backlight/backlight.h +++ b/plugin-backlight/backlight.h @@ -24,9 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTBACKLIGHT_H -#define LXQTBACKLIGHT_H +#pragma once #include #include "../panel/ilxqtpanelplugin.h" @@ -82,5 +80,3 @@ class Slider: public QSlider protected: bool event(QEvent * event) override; }; - -#endif // LXQTBACKLIGHT_H diff --git a/plugin-backlight/sliderdialog.h b/plugin-backlight/sliderdialog.h index 641986364..3c66744d6 100644 --- a/plugin-backlight/sliderdialog.h +++ b/plugin-backlight/sliderdialog.h @@ -24,9 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef SLIDERDIALOG_H -#define SLIDERDIALOG_H +#pragma once #include #include @@ -59,5 +57,3 @@ private Q_SLOTS: void upButtonClicked(bool); }; - -#endif // SLIDERDIALOG_H diff --git a/plugin-colorpicker/colorbutton.h b/plugin-colorpicker/colorbutton.h index 9077139a5..845bbec63 100644 --- a/plugin-colorpicker/colorbutton.h +++ b/plugin-colorpicker/colorbutton.h @@ -1,5 +1,4 @@ -#ifndef COLORBUTTON_H -#define COLORBUTTON_H +#pragma once #include @@ -19,5 +18,3 @@ class ColorButton : public QToolButton QColor color; }; - -#endif // COLORBUTTON_H diff --git a/plugin-colorpicker/colorpicker.h b/plugin-colorpicker/colorpicker.h index 919f42490..0ee2a392e 100644 --- a/plugin-colorpicker/colorpicker.h +++ b/plugin-colorpicker/colorpicker.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_COLORPICKER_H -#define LXQT_COLORPICKER_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -106,5 +105,3 @@ class ColorPickerLibrary: public QObject, public ILXQtPanelPluginLibrary return new ColorPicker(startupInfo); } }; - -#endif diff --git a/plugin-cpuload/lxqtcpuload.h b/plugin-cpuload/lxqtcpuload.h index 3651e655f..a3e4a4f6e 100644 --- a/plugin-cpuload/lxqtcpuload.h +++ b/plugin-cpuload/lxqtcpuload.h @@ -25,8 +25,8 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTCPULOAD_H -#define LXQTCPULOAD_H +#pragma once + #include class ILXQtPanelPlugin; @@ -82,6 +82,3 @@ class LXQtCpuLoad: public QFrame QColor fontColor; }; - - -#endif // LXQTCPULOAD_H diff --git a/plugin-cpuload/lxqtcpuloadconfiguration.h b/plugin-cpuload/lxqtcpuloadconfiguration.h index 4746825bd..3ed4b8ae3 100644 --- a/plugin-cpuload/lxqtcpuloadconfiguration.h +++ b/plugin-cpuload/lxqtcpuloadconfiguration.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTCPULOADCONFIGURATION_H -#define LXQTCPULOADCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -67,5 +65,3 @@ private slots: void barOrientationChanged(int index); }; - -#endif // LXQTCPULOADCONFIGURATION_H diff --git a/plugin-cpuload/lxqtcpuloadplugin.h b/plugin-cpuload/lxqtcpuloadplugin.h index 9954ce9ef..2c709bb44 100644 --- a/plugin-cpuload/lxqtcpuloadplugin.h +++ b/plugin-cpuload/lxqtcpuloadplugin.h @@ -25,10 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTCPULOADPLUGIN_H -#define LXQTCPULOADPLUGIN_H - +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -68,6 +65,3 @@ class LXQtCpuLoadPluginLibrary: public QObject, public ILXQtPanelPluginLibrary return new LXQtCpuLoadPlugin(startupInfo); } }; - - -#endif // LXQTCPULOADPLUGIN_H diff --git a/plugin-customcommand/custombutton.h b/plugin-customcommand/custombutton.h index 5a24e9304..903cf664e 100644 --- a/plugin-customcommand/custombutton.h +++ b/plugin-customcommand/custombutton.h @@ -23,8 +23,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef CUSTOMBUTTON_H -#define CUSTOMBUTTON_H +#pragma once #include @@ -60,5 +59,3 @@ private slots: signals: void wheelScrolled(int); }; - -#endif // CUSTOMBUTTON_H diff --git a/plugin-customcommand/lxqtcustomcommand.h b/plugin-customcommand/lxqtcustomcommand.h index d37cf03ef..80ada8e0f 100644 --- a/plugin-customcommand/lxqtcustomcommand.h +++ b/plugin-customcommand/lxqtcustomcommand.h @@ -23,8 +23,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTCUSTOMCOMMAND_H -#define LXQTCUSTOMCOMMAND_H +#pragma once #include "../panel/ilxqtpanelplugin.h" @@ -99,5 +98,3 @@ class LXQtCustomCommandPluginLibrary: public QObject, public ILXQtPanelPluginLib return new LXQtCustomCommand(startupInfo); } }; - -#endif // LXQTCUSTOMCOMMAND_H diff --git a/plugin-customcommand/lxqtcustomcommandconfiguration.h b/plugin-customcommand/lxqtcustomcommandconfiguration.h index 26dc9e114..5b081e05f 100644 --- a/plugin-customcommand/lxqtcustomcommandconfiguration.h +++ b/plugin-customcommand/lxqtcustomcommandconfiguration.h @@ -23,8 +23,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTCUSTOMCOMMANDCONFIGURATION_H -#define LXQTCUSTOMCOMMANDCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -63,5 +62,3 @@ protected slots: Ui::LXQtCustomCommandConfiguration *ui; bool mLockSettingChanges; }; - -#endif // LXQTCUSTOMCOMMANDCONFIGURATION_H diff --git a/plugin-desktopswitch/desktopswitch.h b/plugin-desktopswitch/desktopswitch.h index 73d7a9e78..1a41fac1e 100644 --- a/plugin-desktopswitch/desktopswitch.h +++ b/plugin-desktopswitch/desktopswitch.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef DESKTOPSWITCH_H -#define DESKTOPSWITCH_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -134,5 +132,3 @@ class DesktopSwitchPluginLibrary: public QObject, public ILXQtPanelPluginLibrary return new DesktopSwitchUnsupported{startupInfo}; } }; - -#endif diff --git a/plugin-desktopswitch/desktopswitchbutton.h b/plugin-desktopswitch/desktopswitchbutton.h index f252b861d..5d031c7cf 100644 --- a/plugin-desktopswitch/desktopswitchbutton.h +++ b/plugin-desktopswitch/desktopswitchbutton.h @@ -26,8 +26,7 @@ * END_COMMON_COPYRIGHT_HEADER */ -#ifndef DESKTOPSWITCHBUTTON_H -#define DESKTOPSWITCHBUTTON_H +#pragma once #include #include @@ -59,5 +58,3 @@ class DesktopSwitchButton : public QToolButton bool mUrgencyHint; QSet mUrgentWIds; }; - -#endif diff --git a/plugin-desktopswitch/desktopswitchconfiguration.h b/plugin-desktopswitch/desktopswitchconfiguration.h index 3defaadc3..2cc44c8a6 100644 --- a/plugin-desktopswitch/desktopswitchconfiguration.h +++ b/plugin-desktopswitch/desktopswitchconfiguration.h @@ -24,9 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef DESKTOPSWITCHCERCONFIGURATION_H -#define DESKTOPSWITCHCERCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -60,5 +58,3 @@ private slots: void rowsChanged(int value); void labelTypeChanged(int type); }; - -#endif // DESKTOPSWITCHCERCONFIGURATION_H diff --git a/plugin-directorymenu/directorymenu.h b/plugin-directorymenu/directorymenu.h index fabfc542b..dd962531e 100644 --- a/plugin-directorymenu/directorymenu.h +++ b/plugin-directorymenu/directorymenu.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef DIRECTORYMENU_H -#define DIRECTORYMENU_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include "directorymenuconfiguration.h" @@ -90,7 +88,3 @@ class DirectoryMenuLibrary: public QObject, public ILXQtPanelPluginLibrary return new DirectoryMenu(startupInfo); } }; - - -#endif - diff --git a/plugin-directorymenu/directorymenuconfiguration.h b/plugin-directorymenu/directorymenuconfiguration.h index 188a74b15..4a5b9b1eb 100644 --- a/plugin-directorymenu/directorymenuconfiguration.h +++ b/plugin-directorymenu/directorymenuconfiguration.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef DIRECTORYMENUCONFIGURATION_H -#define DIRECTORYMENUCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -74,5 +72,3 @@ private slots: private: }; - -#endif // DIRECTORYMENUCONFIGURATION_H diff --git a/plugin-dom/domplugin.h b/plugin-dom/domplugin.h index cc8614e0b..1b6eefb0c 100644 --- a/plugin-dom/domplugin.h +++ b/plugin-dom/domplugin.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef DOMPLUGIN_H -#define DOMPLUGIN_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -62,5 +60,3 @@ class DomPluginLibrary: public QObject, public ILXQtPanelPluginLibrary return new DomPlugin(startupInfo); } }; - -#endif // DOMPLUGIN_H diff --git a/plugin-dom/domtreeitem.h b/plugin-dom/domtreeitem.h index 3e3f21d81..a979e3973 100644 --- a/plugin-dom/domtreeitem.h +++ b/plugin-dom/domtreeitem.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef DOMTREEITEM_H -#define DOMTREEITEM_H +#pragma once #include #include @@ -54,5 +53,3 @@ private slots: void init(); void fill(); }; - -#endif // DOMTREEITEM_H diff --git a/plugin-dom/treewindow.h b/plugin-dom/treewindow.h index 11bd51790..b384f1343 100644 --- a/plugin-dom/treewindow.h +++ b/plugin-dom/treewindow.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef TREEWINDOW_H -#define TREEWINDOW_H +#pragma once #include #include @@ -60,5 +59,3 @@ private slots: void initPropertiesView(); }; - -#endif // TREEWINDOW_H diff --git a/plugin-kbindicator/src/content.h b/plugin-kbindicator/src/content.h index 239d5b50c..34d96614c 100644 --- a/plugin-kbindicator/src/content.h +++ b/plugin-kbindicator/src/content.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _CONTENT_H_ -#define _CONTENT_H_ +#pragma once #include #include "controls.h" @@ -62,5 +61,3 @@ public slots: QLabel *m_scrollLock; QToolButton *m_layout; }; - -#endif diff --git a/plugin-kbindicator/src/controls.h b/plugin-kbindicator/src/controls.h index ac43d527a..4430bc505 100644 --- a/plugin-kbindicator/src/controls.h +++ b/plugin-kbindicator/src/controls.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _CONTROLS_H_ -#define _CONTROLS_H_ +#pragma once enum Controls { Caps, @@ -33,5 +32,3 @@ enum Controls { Scroll, Layout }; - -#endif diff --git a/plugin-kbindicator/src/kbdinfo.h b/plugin-kbindicator/src/kbdinfo.h index 301741b7e..adfbd9621 100644 --- a/plugin-kbindicator/src/kbdinfo.h +++ b/plugin-kbindicator/src/kbdinfo.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _KBDINFO_H_ -#define _KBDINFO_H_ +#pragma once #include #include @@ -74,5 +73,3 @@ class KbdInfo QList m_keyboardInfo; int m_current = 0; }; - -#endif diff --git a/plugin-kbindicator/src/kbdkeeper.h b/plugin-kbindicator/src/kbdkeeper.h index 2e51a61a6..e882df3fc 100644 --- a/plugin-kbindicator/src/kbdkeeper.h +++ b/plugin-kbindicator/src/kbdkeeper.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _KBDKEEPER_H_ -#define _KBDKEEPER_H_ +#pragma once #include #include @@ -102,5 +101,3 @@ protected slots: QHash m_mapping; QString m_active; }; - -#endif diff --git a/plugin-kbindicator/src/kbdlayout.h b/plugin-kbindicator/src/kbdlayout.h index 475396c76..00c4e1664 100644 --- a/plugin-kbindicator/src/kbdlayout.h +++ b/plugin-kbindicator/src/kbdlayout.h @@ -24,12 +24,9 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _KBDLAYOUT_H_ -#define _KBDLAYOUT_H_ +#pragma once #ifdef X11_ENABLED #include "x11/kbdlayout.h" typedef X11Kbd KbdLayout; #endif - -#endif diff --git a/plugin-kbindicator/src/kbdstate.h b/plugin-kbindicator/src/kbdstate.h index d4691f359..b468b8dff 100644 --- a/plugin-kbindicator/src/kbdstate.h +++ b/plugin-kbindicator/src/kbdstate.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _KDBSTATE_H_ -#define _KDBSTATE_H_ +#pragma once #include "../panel/ilxqtpanelplugin.h" #include "settings.h" @@ -70,6 +69,3 @@ protected slots: KbdWatcher m_watcher; Content m_content; }; - - -#endif diff --git a/plugin-kbindicator/src/kbdstateconfig.h b/plugin-kbindicator/src/kbdstateconfig.h index 3e3a7d855..3b46394db 100644 --- a/plugin-kbindicator/src/kbdstateconfig.h +++ b/plugin-kbindicator/src/kbdstateconfig.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _KBDSTATECONFIG_H_ -#define _KBDSTATECONFIG_H_ +#pragma once #include @@ -48,5 +47,3 @@ class KbdStateConfig : public QDialog private: Ui::KbdStateConfig *m_ui; }; - -#endif diff --git a/plugin-kbindicator/src/kbdwatcher.h b/plugin-kbindicator/src/kbdwatcher.h index 15553d44a..e08dc334a 100644 --- a/plugin-kbindicator/src/kbdwatcher.h +++ b/plugin-kbindicator/src/kbdwatcher.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _KBDWATCHER_H_ -#define _KBDWATCHER_H_ +#pragma once #include "kbdlayout.h" #include "controls.h" @@ -60,5 +59,3 @@ private slots: KbdLayout m_layout; QScopedPointer m_keeper; }; - -#endif diff --git a/plugin-kbindicator/src/settings.h b/plugin-kbindicator/src/settings.h index 1858cf743..5064cd478 100644 --- a/plugin-kbindicator/src/settings.h +++ b/plugin-kbindicator/src/settings.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _SETTINGS_H_ -#define _SETTINGS_H_ +#pragma once #include "../panel/pluginsettings.h" @@ -65,5 +64,3 @@ class Settings private: PluginSettings *m_settings; }; - -#endif diff --git a/plugin-kbindicator/src/x11/kbdlayout.h b/plugin-kbindicator/src/x11/kbdlayout.h index fdb4df2f1..e5f97a4fc 100644 --- a/plugin-kbindicator/src/x11/kbdlayout.h +++ b/plugin-kbindicator/src/x11/kbdlayout.h @@ -24,8 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef _X11KBD_H_ -#define _X11KBD_H_ +#pragma once #include #include "../controls.h" @@ -56,5 +55,3 @@ class X11Kbd: public QObject private: QScopedPointer m_priv; }; - -#endif diff --git a/plugin-mainmenu/lxqtmainmenu.h b/plugin-mainmenu/lxqtmainmenu.h index 7dedb297c..59fba75aa 100644 --- a/plugin-mainmenu/lxqtmainmenu.h +++ b/plugin-mainmenu/lxqtmainmenu.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQT_MAINMENU_H -#define LXQT_MAINMENU_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -137,5 +135,3 @@ class LXQtMainMenuPluginLibrary: public QObject, public ILXQtPanelPluginLibrary public: ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new LXQtMainMenu(startupInfo);} }; - -#endif diff --git a/plugin-mainmenu/lxqtmainmenuconfiguration.h b/plugin-mainmenu/lxqtmainmenuconfiguration.h index 7774737bb..54bc3b76e 100644 --- a/plugin-mainmenu/lxqtmainmenuconfiguration.h +++ b/plugin-mainmenu/lxqtmainmenuconfiguration.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTMAINMENUCONFIGURATION_H -#define LXQTMAINMENUCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -74,5 +72,3 @@ private slots: void customFontChanged(bool value); void customFontSizeChanged(int value); }; - -#endif // LXQTMAINMENUCONFIGURATION_H diff --git a/plugin-mainmenu/menustyle.h b/plugin-mainmenu/menustyle.h index 770b63454..fbb7b3c84 100644 --- a/plugin-mainmenu/menustyle.h +++ b/plugin-mainmenu/menustyle.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef MENUSTYLE_H -#define MENUSTYLE_H +#pragma once #include @@ -47,5 +45,3 @@ class MenuStyle : public QProxyStyle private: int mIconSize; }; - -#endif // MENUSTYLE_H diff --git a/plugin-mainmenu/xdgcachedmenu.h b/plugin-mainmenu/xdgcachedmenu.h index 456e562e5..44c850c01 100644 --- a/plugin-mainmenu/xdgcachedmenu.h +++ b/plugin-mainmenu/xdgcachedmenu.h @@ -18,8 +18,7 @@ * */ -#ifndef XDGCACHEDMENU_H -#define XDGCACHEDMENU_H +#pragma once #include #include @@ -64,6 +63,3 @@ class XdgCachedMenuAction: public QAction QString iconName_; QString filePath_; }; - - -#endif // XDGCACHEDMENU_H diff --git a/plugin-mount/actions/deviceaction.h b/plugin-mount/actions/deviceaction.h index 42b706970..fa8083c20 100644 --- a/plugin-mount/actions/deviceaction.h +++ b/plugin-mount/actions/deviceaction.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_DEVICEACTION_H -#define LXQT_PLUGIN_MOUNT_DEVICEACTION_H +#pragma once #include #include @@ -65,5 +64,3 @@ public slots: LXQtMountPlugin *mPlugin; QMap mKnownDeviceDescriptions; }; - -#endif // DEVICEACTION_H diff --git a/plugin-mount/actions/deviceaction_info.h b/plugin-mount/actions/deviceaction_info.h index 58ff5a5b6..f32e77f27 100644 --- a/plugin-mount/actions/deviceaction_info.h +++ b/plugin-mount/actions/deviceaction_info.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_DEVICEACTION_INFO_H -#define LXQT_PLUGIN_MOUNT_DEVICEACTION_INFO_H +#pragma once #include "deviceaction.h" @@ -49,5 +48,3 @@ class DeviceActionInfo : public DeviceAction private: void showMessage(const QString &text); }; - -#endif // DEVICEACTION_INFO_H diff --git a/plugin-mount/actions/deviceaction_menu.h b/plugin-mount/actions/deviceaction_menu.h index 8ad14366e..76142c14c 100644 --- a/plugin-mount/actions/deviceaction_menu.h +++ b/plugin-mount/actions/deviceaction_menu.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_DEVICEACTION_MENU_H -#define LXQT_PLUGIN_MOUNT_DEVICEACTION_MENU_H +#pragma once #include "deviceaction.h" @@ -50,5 +49,3 @@ class DeviceActionMenu : public DeviceAction Popup *mPopup; QTimer mHideTimer; }; - -#endif // DEVICEACTIONMENU_H diff --git a/plugin-mount/actions/deviceaction_nothing.h b/plugin-mount/actions/deviceaction_nothing.h index 0136b860d..c125c121c 100644 --- a/plugin-mount/actions/deviceaction_nothing.h +++ b/plugin-mount/actions/deviceaction_nothing.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQT_PLUGIN_MOUNT_DEVICEACTION_NOTHING_H -#define LXQT_PLUGIN_MOUNT_DEVICEACTION_NOTHING_H +#pragma once #include "deviceaction.h" #include @@ -44,5 +42,3 @@ class DeviceActionNothing : public DeviceAction void doDeviceAdded(Solid::Device device); void doDeviceRemoved(Solid::Device device); }; - -#endif // DEVICEACTIONNOTHING_H diff --git a/plugin-mount/actions/ejectaction.h b/plugin-mount/actions/ejectaction.h index 90ed5b288..0244692c0 100644 --- a/plugin-mount/actions/ejectaction.h +++ b/plugin-mount/actions/ejectaction.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_EJECTACTION_H -#define LXQT_PLUGIN_MOUNT_EJECTACTION_H +#pragma once #include #include @@ -61,5 +60,3 @@ public slots: LXQtMountPlugin *mPlugin; }; - -#endif // EJECTACTION_H diff --git a/plugin-mount/actions/ejectaction_nothing.h b/plugin-mount/actions/ejectaction_nothing.h index f0729437b..0296b9706 100644 --- a/plugin-mount/actions/ejectaction_nothing.h +++ b/plugin-mount/actions/ejectaction_nothing.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQT_PLUGIN_MOUNT_EJECTACTION_NOTHING_H -#define LXQT_PLUGIN_MOUNT_EJECTACTION_NOTHING_H +#pragma once #include "ejectaction.h" #include @@ -43,5 +41,3 @@ class EjectActionNothing : public EjectAction protected: void doEjectPressed(void); }; - -#endif // EJECTACTION_NOTHING_H diff --git a/plugin-mount/actions/ejectaction_optical.h b/plugin-mount/actions/ejectaction_optical.h index 82eee10c7..a5ba69598 100644 --- a/plugin-mount/actions/ejectaction_optical.h +++ b/plugin-mount/actions/ejectaction_optical.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_EJECTACTION_OPTICAL_H -#define LXQT_PLUGIN_MOUNT_EJECTACTION_OPTICAL_H +#pragma once #include "ejectaction.h" @@ -42,5 +41,3 @@ class EjectActionOptical : public EjectAction protected: void doEjectPressed(void); }; - -#endif // EJECTACTION_OPTICAL_H diff --git a/plugin-mount/button.h b/plugin-mount/button.h index 2e5023c20..1d8e05142 100644 --- a/plugin-mount/button.h +++ b/plugin-mount/button.h @@ -26,8 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_BUTTON_H -#define LXQT_PLUGIN_MOUNT_BUTTON_H +#pragma once #include @@ -39,5 +38,3 @@ class Button : public QToolButton Button(QWidget *parent = nullptr); ~Button(); }; - -#endif diff --git a/plugin-mount/configuration.h b/plugin-mount/configuration.h index 8da1d3796..87bd5076c 100644 --- a/plugin-mount/configuration.h +++ b/plugin-mount/configuration.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_CONFIGURATION_H -#define LXQT_PLUGIN_MOUNT_CONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" @@ -58,5 +57,3 @@ protected slots: Ui::Configuration *ui; bool mLockSettingChanges; }; - -#endif // LXQTMOUNTCONFIGURATION_H diff --git a/plugin-mount/lxqtmountplugin.h b/plugin-mount/lxqtmountplugin.h index b2aef9355..85922d46f 100644 --- a/plugin-mount/lxqtmountplugin.h +++ b/plugin-mount/lxqtmountplugin.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTMOUNTPLUGIN_H -#define LXQTMOUNTPLUGIN_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include "../panel/lxqtpanel.h" @@ -89,5 +88,3 @@ class LXQtMountPluginLibrary: public QObject, public ILXQtPanelPluginLibrary return new LXQtMountPlugin(startupInfo); } }; - -#endif diff --git a/plugin-mount/menudiskitem.h b/plugin-mount/menudiskitem.h index 52ffa3405..76249715f 100644 --- a/plugin-mount/menudiskitem.h +++ b/plugin-mount/menudiskitem.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_MENUDISKITEM_H -#define LXQT_PLUGIN_MOUNT_MENUDISKITEM_H +#pragma once #include #include @@ -72,5 +71,3 @@ private slots: bool mDiskButtonClicked; bool mEjectButtonClicked; }; - -#endif // MENUDISKITEM_H diff --git a/plugin-mount/popup.h b/plugin-mount/popup.h index d699dcb11..c7062d99d 100644 --- a/plugin-mount/popup.h +++ b/plugin-mount/popup.h @@ -26,8 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PLUGIN_MOUNT_POPUP_H -#define LXQT_PLUGIN_MOUNT_POPUP_H +#pragma once #include "menudiskitem.h" @@ -76,5 +75,3 @@ private slots: void addItem(Solid::Device device); }; - -#endif // POPUP_H diff --git a/plugin-networkmonitor/lxqtnetworkmonitor.h b/plugin-networkmonitor/lxqtnetworkmonitor.h index 25c560a0f..b0ee23986 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitor.h +++ b/plugin-networkmonitor/lxqtnetworkmonitor.h @@ -25,8 +25,8 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTNETWORKMONITOR_H -#define LXQTNETWORKMONITOR_H +#pragma once + #include class ILXQtPanelPlugin; @@ -67,8 +67,3 @@ class LXQtNetworkMonitor: public QFrame QPixmap m_pic; ILXQtPanelPlugin *mPlugin; }; - - -#endif // LXQTNETWORKMONITOR_H - - diff --git a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h index 33c963e6d..4377af742 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h +++ b/plugin-networkmonitor/lxqtnetworkmonitorconfiguration.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTNETWORKMONITORCONFIGURATION_H -#define LXQTNETWORKMONITORCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -58,5 +56,3 @@ private slots: void saveSettings(); void loadSettings(); }; - -#endif // LXQTNETWORKMONITORCONFIGURATION_H diff --git a/plugin-networkmonitor/lxqtnetworkmonitorplugin.h b/plugin-networkmonitor/lxqtnetworkmonitorplugin.h index 7d71e895d..5ba69c836 100644 --- a/plugin-networkmonitor/lxqtnetworkmonitorplugin.h +++ b/plugin-networkmonitor/lxqtnetworkmonitorplugin.h @@ -25,10 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTNETWORKMONITORPLUGIN_H -#define LXQTNETWORKMONITORPLUGIN_H - +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -67,6 +64,3 @@ class LXQtNetworkMonitorPluginLibrary: public QObject, public ILXQtPanelPluginLi return new LXQtNetworkMonitorPlugin(startupInfo); } }; - - -#endif // LXQTNETWORKMONITORPLUGIN_H diff --git a/plugin-quicklaunch/lxqtquicklaunch.h b/plugin-quicklaunch/lxqtquicklaunch.h index 732d800dc..e008c8943 100644 --- a/plugin-quicklaunch/lxqtquicklaunch.h +++ b/plugin-quicklaunch/lxqtquicklaunch.h @@ -26,9 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTQUICKLAUNCH_H -#define LXQTQUICKLAUNCH_H +#pragma once #include "../panel/lxqtpanel.h" #include @@ -81,5 +79,3 @@ private slots: void buttonMoveLeft(); void buttonMoveRight(); }; - -#endif diff --git a/plugin-quicklaunch/lxqtquicklaunchplugin.h b/plugin-quicklaunch/lxqtquicklaunchplugin.h index 52f5fd642..b6f01429d 100644 --- a/plugin-quicklaunch/lxqtquicklaunchplugin.h +++ b/plugin-quicklaunch/lxqtquicklaunchplugin.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTQUICKLAUNCHPLUGIN_H -#define LXQTQUICKLAUNCHPLUGIN_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -65,4 +64,3 @@ class LXQtQuickLaunchPluginLibrary: public QObject, public ILXQtPanelPluginLibra return new LXQtQuickLaunchPlugin(startupInfo); } }; -#endif // LXQTQUICKLAUNCHPLUGIN_H diff --git a/plugin-quicklaunch/quicklaunchaction.h b/plugin-quicklaunch/quicklaunchaction.h index 523e5e711..89b79f246 100644 --- a/plugin-quicklaunch/quicklaunchaction.h +++ b/plugin-quicklaunch/quicklaunchaction.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef QUICKLAUNCHACTION_H -#define QUICKLAUNCHACTION_H +#pragma once #include @@ -91,5 +90,3 @@ public slots: QHash m_settingsMap; QList m_additionalActions; }; - -#endif diff --git a/plugin-quicklaunch/quicklaunchbutton.h b/plugin-quicklaunch/quicklaunchbutton.h index d039c5f8d..621c6d644 100644 --- a/plugin-quicklaunch/quicklaunchbutton.h +++ b/plugin-quicklaunch/quicklaunchbutton.h @@ -26,9 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTQUICKLAUNCHBUTTON_H -#define LXQTQUICKLAUNCHBUTTON_H +#pragma once #include "quicklaunchaction.h" #include @@ -89,5 +87,3 @@ class ButtonMimeData: public QMimeData private: QuickLaunchButton *mButton; }; - -#endif diff --git a/plugin-sensors/chip.h b/plugin-sensors/chip.h index ea2d24b3c..93ed20de6 100644 --- a/plugin-sensors/chip.h +++ b/plugin-sensors/chip.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef CHIP_H -#define CHIP_H +#pragma once #include "feature.h" #include "sensors.h" @@ -54,5 +53,3 @@ class Chip QList mFeatures; }; - -#endif // CHIP_H diff --git a/plugin-sensors/feature.h b/plugin-sensors/feature.h index e88645024..6880c8698 100644 --- a/plugin-sensors/feature.h +++ b/plugin-sensors/feature.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef FEATURE_H -#define FEATURE_H +#pragma once #include #include @@ -56,5 +55,3 @@ class Feature QList mSubFeatures; }; - -#endif // CHIP_H diff --git a/plugin-sensors/lxqtsensors.h b/plugin-sensors/lxqtsensors.h index 1b328864c..69fa31c16 100644 --- a/plugin-sensors/lxqtsensors.h +++ b/plugin-sensors/lxqtsensors.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTSENSORS_H -#define LXQTSENSORS_H +#pragma once #include "sensors.h" #include "../panel/pluginsettings.h" @@ -78,6 +77,3 @@ public slots: void initDefaultSettings(); PluginSettings *mSettings; }; - - -#endif // LXQTSENSORS_H diff --git a/plugin-sensors/lxqtsensorsconfiguration.h b/plugin-sensors/lxqtsensorsconfiguration.h index 690cefa20..a07ddf97c 100644 --- a/plugin-sensors/lxqtsensorsconfiguration.h +++ b/plugin-sensors/lxqtsensorsconfiguration.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTSENSORSCONFIGURATION_H -#define LXQTSENSORSCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -64,5 +63,3 @@ private slots: void changeProgressBarColor(); void detectedChipSelected(int index); }; - -#endif // LXQTSENSORSCONFIGURATION_H diff --git a/plugin-sensors/lxqtsensorsplugin.h b/plugin-sensors/lxqtsensorsplugin.h index b725b6d90..026ceadde 100644 --- a/plugin-sensors/lxqtsensorsplugin.h +++ b/plugin-sensors/lxqtsensorsplugin.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTSENSORSPLUGIN_H -#define LXQTSENSORSPLUGIN_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -70,5 +68,3 @@ class LXQtSensorsPluginLibrary: public QObject, public ILXQtPanelPluginLibrary return new LXQtSensorsPlugin(startupInfo); } }; - -#endif // LXQTSENSORSPLUGIN_H diff --git a/plugin-sensors/sensors.h b/plugin-sensors/sensors.h index 94d540efe..bb68f0266 100644 --- a/plugin-sensors/sensors.h +++ b/plugin-sensors/sensors.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef SENSORS_H -#define SENSORS_H +#pragma once #include "chip.h" #include @@ -56,5 +55,3 @@ class Sensors static int mInstanceCounter; static bool mSensorsInitialized; }; - -#endif // SENSORS_H diff --git a/plugin-showdesktop/showdesktop.h b/plugin-showdesktop/showdesktop.h index 517cba57a..6c117a435 100644 --- a/plugin-showdesktop/showdesktop.h +++ b/plugin-showdesktop/showdesktop.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef SHOWDESKTOP_H -#define SHOWDESKTOP_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -69,7 +67,3 @@ class ShowDesktopLibrary: public QObject, public ILXQtPanelPluginLibrary return new ShowDesktop(startupInfo); } }; - - -#endif - diff --git a/plugin-spacer/spacer.h b/plugin-spacer/spacer.h index 9242f1843..7847e7ad0 100644 --- a/plugin-spacer/spacer.h +++ b/plugin-spacer/spacer.h @@ -24,9 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef SPACER_H -#define SPACER_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -88,6 +86,3 @@ class SpacerPluginLibrary: public QObject, public ILXQtPanelPluginLibrary public: ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new Spacer(startupInfo);} }; - -#endif - diff --git a/plugin-spacer/spacerconfiguration.h b/plugin-spacer/spacerconfiguration.h index 89c9a648a..b3cbc9bc7 100644 --- a/plugin-spacer/spacerconfiguration.h +++ b/plugin-spacer/spacerconfiguration.h @@ -24,9 +24,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef SPACERCONFIGURATION_H -#define SPACERCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -60,5 +58,3 @@ private slots: void typeChanged(int index); void widthTypeChanged(bool expandableChecked); }; - -#endif // SPACERCONFIGURATION_H diff --git a/plugin-statusnotifier/dbustypes.h b/plugin-statusnotifier/dbustypes.h index 99a0e9811..c3369ed3f 100644 --- a/plugin-statusnotifier/dbustypes.h +++ b/plugin-statusnotifier/dbustypes.h @@ -26,10 +26,9 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#include +#pragma once -#ifndef DBUSTYPES_H -#define DBUSTYPES_H +#include struct IconPixmap { int width; @@ -54,5 +53,3 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, ToolTip &toolTip) Q_DECLARE_METATYPE(IconPixmap) Q_DECLARE_METATYPE(ToolTip) - -#endif // DBUSTYPES_H diff --git a/plugin-statusnotifier/statusnotifier.h b/plugin-statusnotifier/statusnotifier.h index 6e2498426..a13954be5 100644 --- a/plugin-statusnotifier/statusnotifier.h +++ b/plugin-statusnotifier/statusnotifier.h @@ -26,8 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef STATUSNOTIFIER_PLUGIN_H -#define STATUSNOTIFIER_PLUGIN_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include "statusnotifierwidget.h" @@ -64,5 +63,3 @@ class StatusNotifierLibrary : public QObject, public ILXQtPanelPluginLibrary return new StatusNotifier(startupInfo); } }; - -#endif // STATUSNOTIFIER_PLUGIN_H diff --git a/plugin-statusnotifier/statusnotifierbutton.h b/plugin-statusnotifier/statusnotifierbutton.h index 7f0f45f68..f31a848bb 100644 --- a/plugin-statusnotifier/statusnotifierbutton.h +++ b/plugin-statusnotifier/statusnotifierbutton.h @@ -26,8 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef STATUSNOTIFIERBUTTON_H -#define STATUSNOTIFIERBUTTON_H +#pragma once #include #include @@ -94,5 +93,3 @@ public slots: void refetchIcon(Status status, const QString& themePath); void resetIcon(); }; - -#endif // STATUSNOTIFIERBUTTON_H diff --git a/plugin-statusnotifier/statusnotifierconfiguration.h b/plugin-statusnotifier/statusnotifierconfiguration.h index 3e2d5205d..28dd3e967 100644 --- a/plugin-statusnotifier/statusnotifierconfiguration.h +++ b/plugin-statusnotifier/statusnotifierconfiguration.h @@ -23,8 +23,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef STATUSNOTIFIERCONFIGURATION_H -#define STATUSNOTIFIERCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -56,5 +55,3 @@ class StatusNotifierConfiguration : public LXQtPanelPluginConfigDialog private slots: void saveSettings(); }; - -#endif // STATUSNOTIFIERCONFIGURATION_H diff --git a/plugin-statusnotifier/statusnotifieriteminterface.h b/plugin-statusnotifier/statusnotifieriteminterface.h index 4d91a3d76..f09299df3 100644 --- a/plugin-statusnotifier/statusnotifieriteminterface.h +++ b/plugin-statusnotifier/statusnotifieriteminterface.h @@ -36,8 +36,7 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef STATUSNOTIFIERITEMINTERFACE_H -#define STATUSNOTIFIERITEMINTERFACE_H +#pragma once #include #include @@ -171,4 +170,3 @@ namespace org { typedef ::StatusNotifierItemInterface StatusNotifierItem; } } -#endif diff --git a/plugin-statusnotifier/statusnotifierwatcher.h b/plugin-statusnotifier/statusnotifierwatcher.h index 5b248c1a4..33b1ae1e7 100644 --- a/plugin-statusnotifier/statusnotifierwatcher.h +++ b/plugin-statusnotifier/statusnotifierwatcher.h @@ -26,8 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef STATUSNOTIFIERWATCHER_H -#define STATUSNOTIFIERWATCHER_H +#pragma once #include #include @@ -69,5 +68,3 @@ public slots: QStringList mHosts; QDBusServiceWatcher *mWatcher; }; - -#endif // STATUSNOTIFIERWATCHER_H diff --git a/plugin-sysstat/lxqtsysstat.h b/plugin-sysstat/lxqtsysstat.h index bdb90a805..717bb406b 100644 --- a/plugin-sysstat/lxqtsysstat.h +++ b/plugin-sysstat/lxqtsysstat.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTPANELSYSSTAT_H -#define LXQTPANELSYSSTAT_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include "lxqtsysstatconfiguration.h" @@ -223,5 +222,3 @@ class LXQtSysStatLibrary: public QObject, public ILXQtPanelPluginLibrary return new LXQtSysStat(startupInfo); } }; - -#endif // LXQTPANELSYSSTAT_H diff --git a/plugin-sysstat/lxqtsysstatcolours.h b/plugin-sysstat/lxqtsysstatcolours.h index 0bd7f8be2..6765e895f 100644 --- a/plugin-sysstat/lxqtsysstatcolours.h +++ b/plugin-sysstat/lxqtsysstatcolours.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTSYSSTATCOLOURS_HPP -#define LXQTSYSSTATCOLOURS_HPP +#pragma once #include @@ -84,5 +82,3 @@ public slots: void applyColoursToButtons(); }; - -#endif // LXQTSYSSTATCOLOURS_HPP diff --git a/plugin-sysstat/lxqtsysstatconfiguration.h b/plugin-sysstat/lxqtsysstatconfiguration.h index 32c2de328..5ab140d90 100644 --- a/plugin-sysstat/lxqtsysstatconfiguration.h +++ b/plugin-sysstat/lxqtsysstatconfiguration.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTSYSSTATCONFIGURATION_H -#define LXQTSYSSTATCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -77,5 +75,3 @@ public slots: void loadSettings(); }; - -#endif // LXQTSYSSTATCONFIGURATION_H diff --git a/plugin-sysstat/lxqtsysstatutils.h b/plugin-sysstat/lxqtsysstatutils.h index e83aee767..9b8d5828a 100644 --- a/plugin-sysstat/lxqtsysstatutils.h +++ b/plugin-sysstat/lxqtsysstatutils.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTSYSSTATUTILS_HPP -#define LXQTSYSSTATUTILS_HPP +#pragma once #include @@ -37,5 +36,3 @@ QString netSpeedToString(int value); int netSpeedFromString(QString value); } - -#endif // LXQTSYSSTATUTILS_HPP diff --git a/plugin-taskbar/lxqtgrouppopup.h b/plugin-taskbar/lxqtgrouppopup.h index 515236c79..d19c0fdd2 100644 --- a/plugin-taskbar/lxqtgrouppopup.h +++ b/plugin-taskbar/lxqtgrouppopup.h @@ -28,8 +28,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTTASKPOPUP_H -#define LXQTTASKPOPUP_H +#pragma once #include #include @@ -74,5 +73,3 @@ class LXQtGroupPopup: public QFrame LXQtTaskGroup *mGroup; QTimer mCloseTimer; }; - -#endif // LXQTTASKPOPUP_H diff --git a/plugin-taskbar/lxqttaskbar.h b/plugin-taskbar/lxqttaskbar.h index 5b2e79e7a..93a429fa3 100644 --- a/plugin-taskbar/lxqttaskbar.h +++ b/plugin-taskbar/lxqttaskbar.h @@ -28,9 +28,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTTASKBAR_H -#define LXQTTASKBAR_H +#pragma once #include "../panel/ilxqtpanel.h" #include "../panel/ilxqtpanelplugin.h" @@ -152,5 +150,3 @@ private slots: QWidget *mPlaceHolder; LeftAlignedTextStyle *mStyle; }; - -#endif // LXQTTASKBAR_H diff --git a/plugin-taskbar/lxqttaskbarconfiguration.h b/plugin-taskbar/lxqttaskbarconfiguration.h index e559508b7..3c58d7da8 100644 --- a/plugin-taskbar/lxqttaskbarconfiguration.h +++ b/plugin-taskbar/lxqttaskbarconfiguration.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTTASKBARCONFIGURATION_H -#define LXQTTASKBARCONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -55,5 +54,3 @@ class LXQtTaskbarConfiguration : public LXQtPanelPluginConfigDialog private slots: void saveSettings(); }; - -#endif // LXQTTASKBARCONFIGURATION_H diff --git a/plugin-taskbar/lxqttaskbarplugin.h b/plugin-taskbar/lxqttaskbarplugin.h index 9c3076990..c5c9024b5 100644 --- a/plugin-taskbar/lxqttaskbarplugin.h +++ b/plugin-taskbar/lxqttaskbarplugin.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTTASKBARPLUGIN_H -#define LXQTTASKBARPLUGIN_H +#pragma once #include "../panel/ilxqtpanel.h" #include "../panel/ilxqtpanelplugin.h" @@ -65,5 +63,3 @@ class LXQtTaskBarPluginLibrary: public QObject, public ILXQtPanelPluginLibrary public: ILXQtPanelPlugin *instance(const ILXQtPanelPluginStartupInfo &startupInfo) const { return new LXQtTaskBarPlugin(startupInfo);} }; - -#endif // LXQTTASKBARPLUGIN_H diff --git a/plugin-taskbar/lxqttaskbutton.h b/plugin-taskbar/lxqttaskbutton.h index 69f3b41d8..bf78d40fb 100644 --- a/plugin-taskbar/lxqttaskbutton.h +++ b/plugin-taskbar/lxqttaskbutton.h @@ -27,9 +27,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQTTASKBUTTON_H -#define LXQTTASKBUTTON_H +#pragma once #include #include @@ -146,5 +144,3 @@ public slots: }; typedef QHash LXQtTaskButtonHash; - -#endif // LXQTTASKBUTTON_H diff --git a/plugin-taskbar/lxqttaskgroup.h b/plugin-taskbar/lxqttaskgroup.h index 88dcccb01..d2ee31fef 100644 --- a/plugin-taskbar/lxqttaskgroup.h +++ b/plugin-taskbar/lxqttaskgroup.h @@ -28,8 +28,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTTASKGROUP_H -#define LXQTTASKGROUP_H +#pragma once #include "../panel/ilxqtpanel.h" #include "../panel/ilxqtpanelplugin.h" @@ -117,5 +116,3 @@ private slots: void recalculateFrameIfVisible(); void regroup(); }; - -#endif // LXQTTASKGROUP_H diff --git a/plugin-volume/alsadevice.h b/plugin-volume/alsadevice.h index e2ceab817..6e08f8167 100644 --- a/plugin-volume/alsadevice.h +++ b/plugin-volume/alsadevice.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef ALSADEVICE_H -#define ALSADEVICE_H +#pragma once #include "audiodevice.h" @@ -65,5 +64,3 @@ class AlsaDevice : public AudioDevice long m_volumeMin; long m_volumeMax; }; - -#endif // ALSADEVICE_H diff --git a/plugin-volume/alsaengine.h b/plugin-volume/alsaengine.h index 538293e7f..dc7703e4e 100644 --- a/plugin-volume/alsaengine.h +++ b/plugin-volume/alsaengine.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef ALSAENGINE_H -#define ALSAENGINE_H +#pragma once #include "audioengine.h" @@ -66,5 +65,3 @@ private slots: QMap m_mixerMap; static AlsaEngine *m_instance; }; - -#endif // ALSAENGINE_H diff --git a/plugin-volume/audiodevice.h b/plugin-volume/audiodevice.h index 991275338..1d1619aed 100644 --- a/plugin-volume/audiodevice.h +++ b/plugin-volume/audiodevice.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef AUDIODEVICE_H -#define AUDIODEVICE_H +#pragma once #include @@ -86,5 +85,3 @@ public slots: uint m_index; QString m_description; }; - -#endif // AUDIODEVICE_H diff --git a/plugin-volume/audioengine.h b/plugin-volume/audioengine.h index 528d88ebf..c7bfc87ca 100644 --- a/plugin-volume/audioengine.h +++ b/plugin-volume/audioengine.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef AUDIOENGINE_H -#define AUDIOENGINE_H +#pragma once #include #include @@ -60,5 +59,3 @@ public slots: protected: QList m_sinks; }; - -#endif // AUDIOENGINE_H diff --git a/plugin-volume/lxqtvolume.h b/plugin-volume/lxqtvolume.h index c4527d3f3..a53efffa3 100644 --- a/plugin-volume/lxqtvolume.h +++ b/plugin-volume/lxqtvolume.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTVOLUME_H -#define LXQTVOLUME_H +#pragma once #include "../panel/ilxqtpanelplugin.h" #include @@ -95,5 +94,3 @@ class LXQtVolumePluginLibrary: public QObject, public ILXQtPanelPluginLibrary return new LXQtVolume(startupInfo); } }; - -#endif // LXQTVOLUME_H diff --git a/plugin-volume/lxqtvolumeconfiguration.h b/plugin-volume/lxqtvolumeconfiguration.h index 23d83ae9a..50001fa4b 100644 --- a/plugin-volume/lxqtvolumeconfiguration.h +++ b/plugin-volume/lxqtvolumeconfiguration.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQTVOLUMECONFIGURATION_H -#define LXQTVOLUMECONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -92,5 +91,3 @@ protected slots: Ui::LXQtVolumeConfiguration *ui; bool mLockSettingChanges; }; - -#endif // LXQTVOLUMECONFIGURATION_H diff --git a/plugin-volume/ossengine.h b/plugin-volume/ossengine.h index 03d974da8..c0161b04c 100644 --- a/plugin-volume/ossengine.h +++ b/plugin-volume/ossengine.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef OSSENGINE_H -#define OSSENGINE_H +#pragma once #include "audioengine.h" @@ -66,5 +65,3 @@ class OssEngine : public AudioEngine int m_leftVolume; int m_rightVolume; }; - -#endif // OSSENGINE_H diff --git a/plugin-volume/pulseaudioengine.h b/plugin-volume/pulseaudioengine.h index 906128408..70984fdf4 100644 --- a/plugin-volume/pulseaudioengine.h +++ b/plugin-volume/pulseaudioengine.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef PULSEAUDIOENGINE_H -#define PULSEAUDIOENGINE_H +#pragma once #include "audioengine.h" @@ -95,5 +94,3 @@ private slots: QMap m_cVolumeMap; }; - -#endif // PULSEAUDIOENGINE_H diff --git a/plugin-volume/volumebutton.h b/plugin-volume/volumebutton.h index aabbd5b76..b6f268494 100644 --- a/plugin-volume/volumebutton.h +++ b/plugin-volume/volumebutton.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef VOLUMEBUTTON_H -#define VOLUMEBUTTON_H +#pragma once #include #include @@ -69,5 +68,3 @@ private slots: QString m_mixerCommand; QStringList m_mixerParams; }; - -#endif // VOLUMEBUTTON_H diff --git a/plugin-volume/volumepopup.h b/plugin-volume/volumepopup.h index 8d98be0ad..31a7170b1 100644 --- a/plugin-volume/volumepopup.h +++ b/plugin-volume/volumepopup.h @@ -25,8 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef VOLUMEPOPUP_H -#define VOLUMEPOPUP_H +#pragma once #include @@ -82,5 +81,3 @@ private slots: Qt::Corner m_anchor; AudioDevice *m_device; }; - -#endif // VOLUMEPOPUP_H diff --git a/plugin-worldclock/lxqtworldclock.h b/plugin-worldclock/lxqtworldclock.h index 1881d4d10..e7f2fbb50 100644 --- a/plugin-worldclock/lxqtworldclock.h +++ b/plugin-worldclock/lxqtworldclock.h @@ -26,8 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ -#ifndef LXQT_PANEL_WORLDCLOCK_H -#define LXQT_PANEL_WORLDCLOCK_H +#pragma once #include @@ -147,5 +146,3 @@ class LXQtWorldClockLibrary: public QObject, public ILXQtPanelPluginLibrary return new LXQtWorldClock(startupInfo); } }; - -#endif // LXQT_PANEL_WORLDCLOCK_H diff --git a/plugin-worldclock/lxqtworldclockconfiguration.h b/plugin-worldclock/lxqtworldclockconfiguration.h index 9a1c66536..463446d97 100644 --- a/plugin-worldclock/lxqtworldclockconfiguration.h +++ b/plugin-worldclock/lxqtworldclockconfiguration.h @@ -25,9 +25,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQT_PANEL_WORLDCLOCK_CONFIGURATION_H -#define LXQT_PANEL_WORLDCLOCK_CONFIGURATION_H +#pragma once #include "../panel/lxqtpanelpluginconfigdialog.h" #include "../panel/pluginsettings.h" @@ -93,5 +91,3 @@ private slots: void setBold(int row, bool value); int findTimeZone(const QString& timeZone); }; - -#endif // LXQT_PANEL_WORLDCLOCK_CONFIGURATION_H diff --git a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h index 4e3d67e6c..c62c0ad3f 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h +++ b/plugin-worldclock/lxqtworldclockconfigurationmanualformat.h @@ -26,9 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQT_PANEL_WORLDCLOCK_CONFIGURATION_MANUAL_FORMAT_H -#define LXQT_PANEL_WORLDCLOCK_CONFIGURATION_MANUAL_FORMAT_H +#pragma once #include #include @@ -58,5 +56,3 @@ class LXQtWorldClockConfigurationManualFormat : public QDialog private: Ui::LXQtWorldClockConfigurationManualFormat *ui; }; - -#endif // LXQT_PANEL_WORLDCLOCK_CONFIGURATION_MANUAL_FORMAT_H diff --git a/plugin-worldclock/lxqtworldclockconfigurationtimezones.h b/plugin-worldclock/lxqtworldclockconfigurationtimezones.h index d4bd551bc..0137a4e94 100644 --- a/plugin-worldclock/lxqtworldclockconfigurationtimezones.h +++ b/plugin-worldclock/lxqtworldclockconfigurationtimezones.h @@ -26,9 +26,7 @@ * * END_COMMON_COPYRIGHT_HEADER */ - -#ifndef LXQT_PANEL_WORLDCLOCK_CONFIGURATION_TIMEZONES_H -#define LXQT_PANEL_WORLDCLOCK_CONFIGURATION_TIMEZONES_H +#pragma once #include #include @@ -63,5 +61,3 @@ public slots: QTreeWidgetItem* makeSureParentsExist(const QStringList &parts, QMap &parentItems); }; - -#endif // LXQT_PANEL_WORLDCLOCK_CONFIGURATION_TIMEZONES_H