Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace include guards and use pragma once #1937

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions panel/config/addplugindialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
* END_COMMON_COPYRIGHT_HEADER */


#ifndef LXQT_ADDPLUGINDIALOG_H
#define LXQT_ADDPLUGINDIALOG_H
#pragma once

#include <LXQt/PluginInfo>
#include <QDialog>
Expand Down Expand Up @@ -59,5 +58,3 @@ private slots:
void filter();
void emitPluginSelected();
};

#endif // LXQT_ADDPLUGINDIALOG_H
5 changes: 1 addition & 4 deletions panel/config/configpaneldialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef CONFIGPANELDIALOG_H
#define CONFIGPANELDIALOG_H
#pragma once

#include "configplacement.h"
#include "configstyling.h"
Expand All @@ -52,5 +51,3 @@ class ConfigPanelDialog : public LXQt::ConfigDialog
ConfigStyling *mStylingPage;
ConfigPluginsWidget *mPluginsPage;
};

#endif // CONFIGPANELDIALOG_H
5 changes: 1 addition & 4 deletions panel/config/configplacement.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef CONFIGPLACEMENT_H
#define CONFIGPLACEMENT_H
#pragma once

#include "../lxqtpanel.h"
#include <QSettings>
Expand Down Expand Up @@ -89,5 +88,3 @@ private slots:
int mOldScreenNum;
bool mOldReserveSpace;
};

#endif
5 changes: 1 addition & 4 deletions panel/config/configpluginswidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef CONFIGPLUGINSWIDGET_H
#define CONFIGPLUGINSWIDGET_H
#pragma once

#include "../lxqtpanel.h"

Expand Down Expand Up @@ -60,5 +59,3 @@ private slots:
QScopedPointer<AddPluginDialog> mAddPluginDialog;
LXQtPanel *mPanel;
};

#endif
5 changes: 1 addition & 4 deletions panel/config/configstyling.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef CONFIGSTYLING_H
#define CONFIGSTYLING_H
#pragma once

#include "../lxqtpanel.h"
#include <QSettings>
Expand Down Expand Up @@ -77,5 +76,3 @@ private slots:
QString mOldBackgroundImage;
int mOldOpacity;
};

#endif
6 changes: 2 additions & 4 deletions panel/ilxqtpanel.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
* END_COMMON_COPYRIGHT_HEADER */


#ifndef ILXQTPANEL_H
#define ILXQTPANEL_H
#pragma once

#include <QRect>
#include "lxqtpanelglobals.h"

Expand Down Expand Up @@ -128,5 +128,3 @@ class LXQT_PANEL_API ILXQtPanel
*/
virtual bool isLocked() const = 0;
};

#endif // ILXQTPANEL_H
5 changes: 1 addition & 4 deletions panel/ilxqtpanelplugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
* END_COMMON_COPYRIGHT_HEADER */


#ifndef ILXQTPANELPLUGIN_H
#define ILXQTPANELPLUGIN_H
#pragma once

#include <QtPlugin>
#include "ilxqtpanel.h"
Expand Down Expand Up @@ -248,5 +247,3 @@ class LXQT_PANEL_API ILXQtPanelPluginLibrary

Q_DECLARE_INTERFACE(ILXQtPanelPluginLibrary,
"lxqt.org/Panel/PluginInterface/3.0")

#endif // ILXQTPANELPLUGIN_H
7 changes: 1 addition & 6 deletions panel/lxqtpanel.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef LXQTPANEL_H
#define LXQTPANEL_H
#pragma once

#include <QFrame>
#include <QString>
Expand Down Expand Up @@ -708,6 +706,3 @@ private slots:
// settings should be kept private for security
LXQt::Settings *settings() const { return mSettings; }
};


#endif // LXQTPANEL_H
7 changes: 1 addition & 6 deletions panel/lxqtpanelapplication.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef LXQTPANELAPPLICATION_H
#define LXQTPANELAPPLICATION_H
#pragma once

#include <LXQt/Application>
#include "ilxqtpanelplugin.h"
Expand Down Expand Up @@ -184,6 +182,3 @@ private slots:
Q_DECLARE_PRIVATE(LXQtPanelApplication)
Q_DISABLE_COPY(LXQtPanelApplication)
};


#endif // LXQTPANELAPPLICATION_H
5 changes: 1 addition & 4 deletions panel/lxqtpanelapplication_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
* Boston, MA 02110-1301 USA
*/

#ifndef LXQTPANELAPPLICATION_P_H
#define LXQTPANELAPPLICATION_P_H
#pragma once

#include "lxqtpanelapplication.h"

Expand All @@ -41,5 +40,3 @@ class LXQtPanelApplicationPrivate {
private:
LXQtPanelApplication *const q_ptr;
};

#endif // LXQTPANELAPPLICATION_P_H
5 changes: 1 addition & 4 deletions panel/lxqtpanelglobals.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef __LXQT_PANEL_GLOBALS_H__
#define __LXQT_PANEL_GLOBALS_H__
#pragma once

#include <QtGlobal>

Expand All @@ -35,5 +34,3 @@
#else
#define LXQT_PANEL_API Q_DECL_IMPORT
#endif

#endif // __LXQT_PANEL_GLOBALS_H__
6 changes: 1 addition & 5 deletions panel/lxqtpanellayout.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef LXQTPANELLAYOUT_H
#define LXQTPANELLAYOUT_H
#pragma once

#include <QLayout>
#include <QList>
Expand Down Expand Up @@ -102,5 +100,3 @@ public slots:

void setItemGeometry(QLayoutItem *item, const QRect &geometry, bool withAnimation);
};

#endif // LXQTPANELLAYOUT_H
4 changes: 1 addition & 3 deletions panel/lxqtpanellimits.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -44,4 +43,3 @@
#define PANEL_SHOW_DELAY 0

#define SETTINGS_SAVE_DELAY 3000
#endif // LXQTPANELLIMITS_H
5 changes: 1 addition & 4 deletions panel/lxqtpanelpluginconfigdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@
* END_COMMON_COPYRIGHT_HEADER */


#ifndef LXQTPANELPLUGINCONFIGDIALOG_H
#define LXQTPANELPLUGINCONFIGDIALOG_H
#pragma once

#include <QAbstractButton>
#include <QDialog>
Expand Down Expand Up @@ -64,5 +63,3 @@ protected slots:
PluginSettings &mSettings;

};

#endif // LXQTPANELPLUGINCONFIGDIALOG_H
5 changes: 1 addition & 4 deletions panel/panelpluginsmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef PANELPLUGINSMODEL_H
#define PANELPLUGINSMODEL_H
#pragma once

#include <QAbstractListModel>
#include <memory>
Expand Down Expand Up @@ -337,5 +336,3 @@ public slots:
};

Q_DECLARE_METATYPE(Plugin const *)

#endif // PANELPLUGINSMODEL_H
7 changes: 1 addition & 6 deletions panel/plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef PLUGIN_H
#define PLUGIN_H
#pragma once

#include <QFrame>
#include <QString>
Expand Down Expand Up @@ -129,6 +127,3 @@ private slots:
void settingsChanged();

};


#endif // PLUGIN_H
6 changes: 1 addition & 5 deletions panel/pluginmoveprocessor.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef PLUGINMOVEPROCESSOR_H
#define PLUGINMOVEPROCESSOR_H
#pragma once

#include <QWidget>
#include <QVariantAnimation>
Expand Down Expand Up @@ -95,5 +93,3 @@ class LXQT_PANEL_API CursorAnimation: public QVariantAnimation
public:
void updateCurrentValue(const QVariant &value) { QCursor::setPos(value.toPoint()); }
};

#endif // PLUGINMOVEPROCESSOR_H
5 changes: 1 addition & 4 deletions panel/pluginsettings.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef PLUGIN_SETTINGS_H
#define PLUGIN_SETTINGS_H
#pragma once

#include <QObject>
#include <QString>
Expand Down Expand Up @@ -93,5 +92,3 @@ class LXQT_PANEL_API PluginSettings : public QObject
QScopedPointer<PluginSettingsPrivate> d_ptr;
Q_DECLARE_PRIVATE(PluginSettings)
};

#endif
5 changes: 1 addition & 4 deletions panel/pluginsettings_p.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef PLUGIN_SETTINGS_P_H
#define PLUGIN_SETTINGS_P_H
#pragma once

#include "pluginsettings.h"

Expand All @@ -35,5 +34,3 @@ class PluginSettingsFactory
public:
static PluginSettings * create(LXQt::Settings *settings, const QString &group, QObject *parent = nullptr);
};

#endif //PLUGIN_SETTINGS_P_H
6 changes: 1 addition & 5 deletions panel/popupmenu.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef POPUPMENU_H
#define POPUPMENU_H
#pragma once

#include <QMenu>
#include "lxqtpanelglobals.h"
Expand All @@ -46,5 +44,3 @@ class LXQT_PANEL_API PopupMenu: public QMenu
protected:
virtual void keyPressEvent(QKeyEvent* e);
};

#endif // POPUPMENU_H
6 changes: 1 addition & 5 deletions plugin-backlight/backlight.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef LXQTBACKLIGHT_H
#define LXQTBACKLIGHT_H
#pragma once

#include <QToolButton>
#include "../panel/ilxqtpanelplugin.h"
Expand Down Expand Up @@ -82,5 +80,3 @@ class Slider: public QSlider
protected:
bool event(QEvent * event) override;
};

#endif // LXQTBACKLIGHT_H
6 changes: 1 addition & 5 deletions plugin-backlight/sliderdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */


#ifndef SLIDERDIALOG_H
#define SLIDERDIALOG_H
#pragma once

#include <QDialog>
#include <QSlider>
Expand Down Expand Up @@ -59,5 +57,3 @@ private Q_SLOTS:
void upButtonClicked(bool);

};

#endif // SLIDERDIALOG_H
5 changes: 1 addition & 4 deletions plugin-colorpicker/colorbutton.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#ifndef COLORBUTTON_H
#define COLORBUTTON_H
#pragma once

#include <QToolButton>

Expand All @@ -19,5 +18,3 @@ class ColorButton : public QToolButton

QColor color;
};

#endif // COLORBUTTON_H
5 changes: 1 addition & 4 deletions plugin-colorpicker/colorpicker.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@
*
* END_COMMON_COPYRIGHT_HEADER */

#ifndef LXQT_COLORPICKER_H
#define LXQT_COLORPICKER_H
#pragma once

#include "../panel/ilxqtpanelplugin.h"
#include <QFrame>
Expand Down Expand Up @@ -106,5 +105,3 @@ class ColorPickerLibrary: public QObject, public ILXQtPanelPluginLibrary
return new ColorPicker(startupInfo);
}
};

#endif
Loading