diff options
author | xerus2000 <27jf@pm.me> | 2020-08-13 13:47:36 +0200 |
---|---|---|
committer | xerus2000 <27jf@pm.me> | 2020-11-10 23:39:30 +0100 |
commit | 99419f9a8265221faab895f8f7d9b500b1789f4e (patch) | |
tree | 3a139cd2dbfeb726fa0ae4a913b56dddf91c8b2d /src/widget | |
parent | 6e6685fe7c5db184bdc0fad7d9956a0b43783574 (diff) |
Use #pragma once everywhere
Diffstat (limited to 'src/widget')
58 files changed, 58 insertions, 241 deletions
diff --git a/src/widget/controlwidgetconnection.h b/src/widget/controlwidgetconnection.h index 36b8ef39d1..0b487dedd9 100644 --- a/src/widget/controlwidgetconnection.h +++ b/src/widget/controlwidgetconnection.h @@ -1,5 +1,4 @@ -#ifndef CONTROLWIDGETCONNECTION_H -#define CONTROLWIDGETCONNECTION_H +#pragma once #include <QObject> #include <QString> @@ -140,5 +139,3 @@ class ControlWidgetPropertyConnection final : public ControlWidgetConnection { private: QByteArray m_propertyName; }; - -#endif /* CONTROLWIDGETCONNECTION_H */ diff --git a/src/widget/effectwidgetutils.h b/src/widget/effectwidgetutils.h index f2fd08c1c7..3d2b2c75a9 100644 --- a/src/widget/effectwidgetutils.h +++ b/src/widget/effectwidgetutils.h @@ -1,5 +1,4 @@ -#ifndef EFFECTWIDGETUTILS_H -#define EFFECTWIDGETUTILS_H +#pragma once #include <QDomNode> @@ -121,5 +120,3 @@ class EffectWidgetUtils { private: EffectWidgetUtils() = default; }; - -#endif /* EFFECTWIDGETUTILS_H */ diff --git a/src/widget/hexspinbox.h b/src/widget/hexspinbox.h index 36d2df59bc..d440deff32 100644 --- a/src/widget/hexspinbox.h +++ b/src/widget/hexspinbox.h @@ -1,5 +1,4 @@ -#ifndef HEXSPINBOX_H -#define HEXSPINBOX_H +#pragma once #include <QSpinBox> #include <QValidator> @@ -13,5 +12,3 @@ class HexSpinBox : public QSpinBox { int valueFromText(const QString& text) const override; QValidator::State validate(QString& input, int& pos) const override; }; - -#endif /* HEXSPINBOX_H */ diff --git a/src/widget/knobeventhandler.h b/src/widget/knobeventhandler.h index 27ad2b2e03..bc70d37bd7 100644 --- a/src/widget/knobeventhandler.h +++ b/src/widget/knobeventhandler.h @@ -1,5 +1,4 @@ -#ifndef KNOBEVENTHANDLER_H -#define KNOBEVENTHANDLER_H +#pragma once #include <QMouseEvent> #include <QWheelEvent> @@ -110,5 +109,3 @@ class KnobEventHandler { QPoint m_startPos; QCursor m_blankCursor; }; - -#endif /* KNOBEVENTHANDLER_H */ diff --git a/src/widget/paintable.h b/src/widget/paintable.h index af36b2b384..3f55343b44 100644 --- a/src/widget/paintable.h +++ b/src/widget/paintable.h @@ -1,6 +1,5 @@ -#ifndef PAINTABLE_H -#define PAINTABLE_H +#pragma once #include <QPixmap> #include <QHash> @@ -61,5 +60,3 @@ class Paintable { DrawMode m_drawMode; PixmapSource m_source; }; - -#endif // PAINTABLE diff --git a/src/widget/slidereventhandler.h b/src/widget/slidereventhandler.h index aa6a22e62e..a41aef7c6d 100644 --- a/src/widget/slidereventhandler.h +++ b/src/widget/slidereventhandler.h @@ -1,5 +1,4 @@ -#ifndef SLIDEREVENTHANDLER_H -#define SLIDEREVENTHANDLER_H +#pragma once #include <QMouseEvent> #include <QWheelEvent> @@ -203,5 +202,3 @@ class SliderEventHandler { // Is true if events is emitted while the slider is dragged bool m_bEventWhileDrag; }; - -#endif /* SLIDEREVENTHANDLER_H */ diff --git a/src/widget/trackdroptarget.h b/src/widget/trackdroptarget.h index 664f098bc8..5c61b9279f 100644 --- a/src/widget/trackdroptarget.h +++ b/src/widget/trackdroptarget.h @@ -1,6 +1,5 @@ -#ifndef TRACKDROPTARGET_H -#define TRACKDROPTARGET_H +#pragma once #include <QString> @@ -18,5 +17,3 @@ signals: virtual void trackDropped(QString filename, QString group) = 0; virtual void cloneDeck(QString source_group, QString target_group) = 0; }; - -#endif // TRACKDROPTARGET diff --git a/src/widget/wanalysislibrarytableview.h b/src/widget/wanalysislibrarytableview.h index c3733b8abb..6e5d22fdc2 100644 --- a/src/widget/wanalysislibrarytableview.h +++ b/src/widget/wanalysislibrarytableview.h @@ -1,5 +1,4 @@ -#ifndef WANALYSISLIBRARYTABLEVIEW_H -#define WANALYSISLIBRARYTABLEVIEW_H +#pragma once #include <QWidget> @@ -16,5 +15,3 @@ class WAnalysisLibraryTableView : public WTrackTableView { void onSearch(const QString& text) override; }; - -#endif diff --git a/src/widget/wbasewidget.h b/src/widget/wbasewidget.h index 8b67602903..78923dea6c 100644 --- a/src/widget/wbasewidget.h +++ b/src/widget/wbasewidget.h @@ -1,5 +1,4 @@ -#ifndef WBASEWIDGET_H -#define WBASEWIDGET_H +#pragma once #include <QString> #include <QWidget> @@ -100,5 +99,3 @@ class WBaseWidget { friend class ControlParameterWidgetConnection; }; - -#endif /* WBASEWIDGET_H */ diff --git a/src/widget/wbattery.h b/src/widget/wbattery.h index c04e33de29..faa78a65b9 100644 --- a/src/widget/wbattery.h +++ b/src/widget/wbattery.h @@ -1,5 +1,4 @@ -#ifndef WBATTERY_H -#define WBATTERY_H +#pragma once #include <QList> #include <QPixmap> @@ -40,5 +39,3 @@ class WBattery : public WWidget { QVector<PaintablePointer> m_dischargingPixmaps; QVector<PaintablePointer> m_chargingPixmaps; }; - -#endif /* WBATTERY_H */ diff --git a/src/widget/wbeatspinbox.h b/src/widget/wbeatspinbox.h index f78229867a..17560fbf8f 100644 --- a/src/widget/wbeatspinbox.h +++ b/src/widget/wbeatspinbox.h @@ -1,5 +1,4 @@ -#ifndef WBEATSPINBOX_H -#define WBEATSPINBOX_H +#pragma once #include "control/controlobject.h" #include "control/controlproxy.h" @@ -55,7 +54,3 @@ class WBeatLineEdit : public QLineEdit { bool event(QEvent* pEvent) override; double m_scaleFactor; }; - - - -#endif diff --git a/src/widget/wcombobox.h b/src/widget/wcombobox.h index 930aacb942..b871419a5a 100644 --- a/src/widget/wcombobox.h +++ b/src/widget/wcombobox.h @@ -1,5 +1,4 @@ -#ifndef WCOMBOBOX_H -#define WCOMBOBOX_H +#pragma once #include <QComboBox> #include <QDomNode> @@ -23,5 +22,3 @@ class WComboBox : public QComboBox, public WBaseWidget { private slots: void slotCurrentIndexChanged(int index); }; - -#endif /* WCOMBOBOX_H */ diff --git a/src/widget/wcoverart.h b/src/widget/wcoverart.h index 3b28624f66..17a1d5351f 100644 --- a/src/widget/wcoverart.h +++ b/src/widget/wcoverart.h @@ -1,5 +1,4 @@ -#ifndef WCOVERART_H -#define WCOVERART_H +#pragma once #include <QColor> #include <QDomNode> @@ -76,5 +75,3 @@ class WCoverArt : public QWidget, public WBaseWidget, public TrackDropTarget { DlgCoverArtFullSize* m_pDlgFullSize; QTimer m_clickTimer; }; - -#endif // WCOVERART_H diff --git a/src/widget/wcoverartmenu.h b/src/widget/wcoverartmenu.h index e86c713d4d..a22e3e03d8 100644 --- a/src/widget/wcoverartmenu.h +++ b/src/widget/wcoverartmenu.h @@ -1,5 +1,4 @@ -#ifndef WCOVERARTMENU_H -#define WCOVERARTMENU_H +#pragma once #include <QAction> #include <QMenu> @@ -38,5 +37,3 @@ class WCoverArtMenu : public QMenu { CoverInfo m_coverInfo; }; - -#endif // WCOVERARTMENU_H diff --git a/src/widget/wdisplay.h b/src/widget/wdisplay.h index 1e5715429c..609027d224 100644 --- a/src/widget/wdisplay.h +++ b/src/widget/wdisplay.h @@ -15,8 +15,7 @@ * * ***************************************************************************/ -#ifndef WDISPLAY_H -#define WDISPLAY_H +#pragma once #include <QVector> #include <QPixmap> @@ -78,5 +77,3 @@ class WDisplay : public WWidget { // List of disabled pixmaps. QVector<PaintablePointer> m_disabledPixmaps; }; - -#endif diff --git a/src/widget/weffect.h b/src/widget/weffect.h index 6a0e736cec..8334a1cd5f 100644 --- a/src/widget/weffect.h +++ b/src/widget/weffect.h @@ -1,5 +1,4 @@ -#ifndef WEFFECT_H -#define WEFFECT_H +#pragma once #include <QDomNode> @@ -26,6 +25,3 @@ class WEffect : public WLabel { EffectsManager* m_pEffectsManager; EffectSlotPointer m_pEffectSlot; }; - - -#endif /* WEFFECT_H */ diff --git a/src/widget/weffectbuttonparameter.h b/src/widget/weffectbuttonparameter.h index 2e6b845a9f..5b204efc8a 100644 --- a/src/widget/weffectbuttonparameter.h +++ b/src/widget/weffectbuttonparameter.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTBUTTONPARAMETER_H -#define WEFFECTBUTTONPARAMETER_H +#pragma once #include <QDomNode> @@ -16,6 +15,3 @@ class WEffectButtonParameter : public WEffectParameterBase { void setup(const QDomNode& node, const SkinContext& context) override; }; - - -#endif /* WEFFECTBUTTONPARAMETER_H */ diff --git a/src/widget/weffectchain.h b/src/widget/weffectchain.h index 45b81c8700..2bfa9658c6 100644 --- a/src/widget/weffectchain.h +++ b/src/widget/weffectchain.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTCHAIN_H -#define WEFFECTCHAIN_H +#pragma once #include <QWidget> #include <QLabel> @@ -28,5 +27,3 @@ class WEffectChain : public WLabel { EffectsManager* m_pEffectsManager; EffectChainSlotPointer m_pEffectChainSlot; }; - -#endif /* WEFFECTCHAIN_H */ diff --git a/src/widget/weffectparameter.h b/src/widget/weffectparameter.h index d7a37ab5e2..1dd8265d62 100644 --- a/src/widget/weffectparameter.h +++ b/src/widget/weffectparameter.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTPARAMETER_H -#define WEFFECTPARAMETER_H +#pragma once #include <QDomNode> @@ -16,6 +15,3 @@ class WEffectParameter : public WEffectParameterBase { void setup(const QDomNode& node, const SkinContext& context) override; }; - - -#endif /* WEFFECTPARAMETER_H */ diff --git a/src/widget/weffectparameterbase.h b/src/widget/weffectparameterbase.h index 2b6c9497e2..18acf5e1c5 100644 --- a/src/widget/weffectparameterbase.h +++ b/src/widget/weffectparameterbase.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTPARAMETERBASE_H -#define WEFFECTPARAMETERBASE_H +#pragma once #include <QDomNode> @@ -27,5 +26,3 @@ class WEffectParameterBase : public WLabel { EffectsManager* m_pEffectsManager; EffectParameterSlotBasePointer m_pEffectParameterSlot; }; - -#endif /* WEFFECTPARAMETERBASE_H */ diff --git a/src/widget/weffectparameterknob.h b/src/widget/weffectparameterknob.h index 6fdeaf8afe..3fa13863d9 100644 --- a/src/widget/weffectparameterknob.h +++ b/src/widget/weffectparameterknob.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTKNOB_H -#define WEFFECTKNOB_H +#pragma once #include "widget/wknob.h" #include "effects/effectparameterslot.h" @@ -30,5 +29,3 @@ class WEffectParameterKnob : public WKnob { EffectsManager* m_pEffectsManager; EffectParameterSlotBasePointer m_pEffectParameterSlot; }; - -#endif // WEFFECTKNOB_H diff --git a/src/widget/weffectparameterknobcomposed.h b/src/widget/weffectparameterknobcomposed.h index 4449ffccfe..5131f985b0 100644 --- a/src/widget/weffectparameterknobcomposed.h +++ b/src/widget/weffectparameterknobcomposed.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTKNOBCOMPOSED_H -#define WEFFECTKNOBCOMPOSED_H +#pragma once #include "widget/wknobcomposed.h" #include "effects/effectparameterslot.h" @@ -31,5 +30,3 @@ class WEffectParameterKnobComposed : public WKnobComposed { EffectsManager* m_pEffectsManager; EffectParameterSlotBasePointer m_pEffectParameterSlot; }; - -#endif // WEFFECTKNOBCOMPOSED_H diff --git a/src/widget/weffectpushbutton.h b/src/widget/weffectpushbutton.h index 595486f8f0..63f5366a74 100644 --- a/src/widget/weffectpushbutton.h +++ b/src/widget/weffectpushbutton.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTPUSHBUTTON_H -#define WEFFECTPUSHBUTTON_H +#pragma once #include <QMenu> #include <QAction> @@ -41,5 +40,3 @@ class WEffectPushButton : public WPushButton { EffectParameterSlotBasePointer m_pEffectParameterSlot; QMenu* m_pButtonMenu; }; - -#endif // WEFFECTPUSHBUTTON_H diff --git a/src/widget/weffectselector.h b/src/widget/weffectselector.h index a9816f62f2..dd358af067 100644 --- a/src/widget/weffectselector.h +++ b/src/widget/weffectselector.h @@ -1,5 +1,4 @@ -#ifndef WEFFECTSELECTOR_H -#define WEFFECTSELECTOR_H +#pragma once #include <QDomNode> #include <QComboBox> @@ -31,6 +30,3 @@ class WEffectSelector : public QComboBox, public WBaseWidget { EffectRackPointer m_pRack; double m_scaleFactor; }; - - -#endif /* WEFFECTSELECTOR_H */ diff --git a/src/widget/wkey.h b/src/widget/wkey.h index 6ceba45067..706337ea06 100644 --- a/src/widget/wkey.h +++ b/src/widget/wkey.h @@ -1,5 +1,4 @@ -#ifndef WKEY_H -#define WKEY_H +#pragma once #include <QLabel> @@ -26,5 +25,3 @@ class WKey : public WLabel { ControlProxy m_keyNotation; ControlProxy m_engineKeyDistance; }; - -#endif /* WKEY_H */ diff --git a/src/widget/wknob.h b/src/widget/wknob.h index 3e56b4f979..62298cab54 100644 --- a/src/widget/wknob.h +++ b/src/widget/wknob.h @@ -1,5 +1,4 @@ -#ifndef WKNOB_H -#define WKNOB_H +#pragma once #include <QPixmap> #include <QString> @@ -33,5 +32,3 @@ class WKnob : public WDisplay { KnobEventHandler<WKnob> m_handler; friend class KnobEventHandler<WKnob>; }; - -#endif diff --git a/src/widget/wknobcomposed.h b/src/widget/wknobcomposed.h index 454fd48b13..b5e2283d42 100644 --- a/src/widget/wknobcomposed.h +++ b/src/widget/wknobcomposed.h @@ -1,5 +1,4 @@ -#ifndef WKNOBCOMPOSED_H -#define WKNOBCOMPOSED_H +#pragma once #include <QWidget> #include <QPaintEvent> @@ -67,5 +66,3 @@ class WKnobComposed : public WWidget { friend class KnobEventHandler<WKnobComposed>; }; - -#endif /* WKNOBCOMPOSED_H */ diff --git a/src/widget/wlabel.h b/src/widget/wlabel.h index d63ff5b123..bb7aec8181 100644 --- a/src/widget/wlabel.h +++ b/src/widget/wlabel.h @@ -15,8 +15,7 @@ * * ***************************************************************************/ -#ifndef WLABEL_H -#define WLABEL_H +#pragma once #include <QLabel> #include <QEvent> @@ -60,5 +59,3 @@ class WLabel : public QLabel, public WBaseWidget { double m_scaleFactor; int m_highlight; }; - -#endif diff --git a/src/widget/wlibrarysidebar.h b/src/widget/wlibrarysidebar.h index 8539e8a541..b79237dfd0 100644 --- a/src/widget/wlibrarysidebar.h +++ b/src/widget/wlibrarysidebar.h @@ -1,5 +1,4 @@ -#ifndef WLIBRARYSIDEBAR_H -#define WLIBRARYSIDEBAR_H +#pragma once #include <QBasicTimer> #include <QContextMenuEvent> @@ -42,5 +41,3 @@ class WLibrarySidebar : public QTreeView, public WBaseWidget { QBasicTimer m_expandTimer; QModelIndex m_hoverIndex; }; - -#endif /* WLIBRARYSIDEBAR_H */ diff --git a/src/widget/wlibrarytableview.h b/src/widget/wlibrarytableview.h index 7554053cd2..ae7c77aaf3 100644 --- a/src/widget/wlibrarytableview.h +++ b/src/widget/wlibrarytableview.h @@ -1,8 +1,7 @@ // wlibrarytableview.h // Created 10/19/2009 by RJ Ryan (rryan@mit.edu) -#ifndef WLIBRARYTABLEVIEW_H -#define WLIBRARYTABLEVIEW_H +#pragma once #include <QFont> #include <QString> @@ -69,6 +68,3 @@ class WLibraryTableView : public QTableView, public virtual LibraryView { // executed int m_noSearchVScrollBarPos; }; - - -#endif /* WLIBRARYTABLEVIEW_H */ diff --git a/src/widget/wlibrarytextbrowser.h b/src/widget/wlibrarytextbrowser.h index e61c38efa0..e3846c4e56 100644 --- a/src/widget/wlibrarytextbrowser.h +++ b/src/widget/wlibrarytextbrowser.h @@ -1,8 +1,7 @@ // wlibrarytextbrowser.h // Created 10/23/2009 by RJ Ryan (rryan@mit.edu) -#ifndef WLIBRARYTEXTBROWSER_H -#define WLIBRARYTEXTBROWSER_H +#pragma once #include <QTextBrowser> @@ -15,5 +14,3 @@ class WLibraryTextBrowser : public QTextBrowser, public LibraryView { void onShow() override {} bool hasFocus() const override; }; - -#endif /* WLIBRARYTEXTBROWSER_H */ diff --git a/src/widget/wmainmenubar.h b/src/widget/wmainmenubar.h index 643f386b21..0326bc682e 100644 --- a/src/widget/wmainmenubar.h +++ b/src/widget/wmainmenubar.h @@ -1,5 +1,4 @@ -#ifndef WIDGET_WMAINMENUBAR -#define WIDGET_WMAINMENUBAR +#pragma once #include <QAction> #include <QList> @@ -88,5 +87,3 @@ class WMainMenuBar : public QMenuBar { QList<QAction*> m_loadToDeckActions; QList<QAction*> m_vinylControlEnabledActions; }; - -#endif /* WIDGET_WMAINMENUBAR */ diff --git a/src/widget/wnum |