merge 2.3

19 files changed, 12 insertions, 209 deletions

diff --git a/src/control/controlaudiotaperpot.cpp b/src/control/controlaudiotaperpot.cpp
index d5f8000a10..f98a37539e 100644
--- a/src/control/controlaudiotaperpot.cpp
+++ b/src/control/controlaudiotaperpot.cpp
@@ -1,4 +1,3 @@
-
 #include "control/controlaudiotaperpot.h"
 
 #include "moc_controlaudiotaperpot.cpp"
diff --git a/src/control/controlaudiotaperpot.h b/src/control/controlaudiotaperpot.h
index 8c16262d6f..afbc59ad57 100644
--- a/src/control/controlaudiotaperpot.h
+++ b/src/control/controlaudiotaperpot.h
@@ -1,6 +1,4 @@
-
-#ifndef CONTROLAUDIOTAPERPOT_H
-#define CONTROLAUDIOTAPERPOT_H
+#pragma once
 
 #include "control/controlpotmeter.h"
 #include "preferences/usersettings.h"
@@ -14,5 +12,3 @@ class ControlAudioTaperPot : public ControlPotmeter {
     // neutralParameter is a knob position between 0 and 1 where the gain is 1 (0dB)
     ControlAudioTaperPot(const ConfigKey& key, double minDB, double maxDB, double neutralParameter);
 };
-
-#endif // CONTROLAUDIOTAPERPOT_H
diff --git a/src/control/controlbehavior.h b/src/control/controlbehavior.h
index 08f48b724b..1075cf0bea 100644
--- a/src/control/controlbehavior.h
+++ b/src/control/controlbehavior.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLBEHAVIOR_H
-#define CONTROLBEHAVIOR_H
+#pragma once
 
 #include <QTimer>
 #include <QScopedPointer>
@@ -159,5 +158,3 @@ class ControlPushButtonBehavior : public ControlNumericBehavior {
     int m_iNumStates;
     QScopedPointer<QTimer> m_pushTimer;
 };
-
-#endif /* CONTROLBEHAVIOR_H */
diff --git a/src/control/controleffectknob.h b/src/control/controleffectknob.h
index b0a10e2ae8..43e7cc3720 100644
--- a/src/control/controleffectknob.h
+++ b/src/control/controleffectknob.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLEFFECTKNOB_H
-#define CONTROLEFFECTKNOB_H
+#pragma once
 
 #include "control/controlpotmeter.h"
 #include "effects/effectmanifestparameter.h"
@@ -12,5 +11,3 @@ class ControlEffectKnob : public ControlPotmeter {
     void setBehaviour(EffectManifestParameter::ControlHint type,
             double dMinValue, double dMaxValue);
 };
-
-#endif // CONTROLLEFFECTKNOB_H
diff --git a/src/control/controlencoder.h b/src/control/controlencoder.h
index a323ac3133..75b2cb2015 100644
--- a/src/control/controlencoder.h
+++ b/src/control/controlencoder.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLENCODER_H
-#define CONTROLENCODER_H
+#pragma once
 
 #include "preferences/usersettings.h"
 #include "control/controlobject.h"
@@ -9,5 +8,3 @@ class ControlEncoder : public ControlObject {
   public:
     ControlEncoder(const ConfigKey& key, bool bIgnoreNops = true);
 };
-
-#endif
diff --git a/src/control/controlindicator.h b/src/control/controlindicator.h
index 62ec95b452..3cfbead987 100644
--- a/src/control/controlindicator.h
+++ b/src/control/controlindicator.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLINDICATOR_H
-#define CONTROLINDICATOR_H
+#pragma once
 
 #include "control/controlobject.h"
 
@@ -39,5 +38,3 @@ class ControlIndicator : public ControlObject {
     ControlProxy* m_pCOTGuiTickTime;
     ControlProxy* m_pCOTGuiTick50ms;
 };
-
-#endif // CONTROLINDICATOR_H
diff --git a/src/control/controllinpotmeter.h b/src/control/controllinpotmeter.h
index 98c8e95537..bf6d8d4997 100644
--- a/src/control/controllinpotmeter.h
+++ b/src/control/controllinpotmeter.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLLINPOTMETER_H
-#define CONTROLLINPOTMETER_H
+#pragma once
 
 #include "control/controlpotmeter.h"
 
@@ -14,5 +13,3 @@ class ControlLinPotmeter : public ControlPotmeter {
             double dSmallStep = 0,
             bool allowOutOfBounds = false);
 };
-
-#endif // CONTROLLINPOTMETER_H
diff --git a/src/control/controllogpotmeter.cpp b/src/control/controllogpotmeter.cpp
index ad84a38380..4ff8924ed3 100644
--- a/src/control/controllogpotmeter.cpp
+++ b/src/control/controllogpotmeter.cpp
@@ -1,20 +1,3 @@
-/***************************************************************************
-                          controlpotmeter.cpp  -  description
-                             -------------------
-    begin                : Wed Feb 20 2002
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
 #include "control/controllogpotmeter.h"
 
 #include "moc_controllogpotmeter.cpp"
diff --git a/src/control/controllogpotmeter.h b/src/control/controllogpotmeter.h
index 05e7d6bd93..5d5a04cc2f 100644
--- a/src/control/controllogpotmeter.h
+++ b/src/control/controllogpotmeter.h
@@ -1,34 +1,10 @@
-/***************************************************************************
-                          controlpotmeter.h  -  description
-                             -------------------
-    begin                : Wed Feb 20 2002
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CONTROLLOGPOTMETER_H
-#define CONTROLLOGPOTMETER_H
+#pragma once
 
 #include "control/controlpotmeter.h"
 #include "preferences/usersettings.h"
 
-/**
- *@author Tue and Ken Haste Andersen
- */
-
 class ControlLogpotmeter : public ControlPotmeter {
     Q_OBJECT
   public:
     ControlLogpotmeter(const ConfigKey& key, double dMaxValue, double minDB);
 };
-
-#endif
diff --git a/src/control/controlmodel.h b/src/control/controlmodel.h
index 336d505046..93df7b330a 100644
--- a/src/control/controlmodel.h
+++ b/src/control/controlmodel.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLMODEL_H
-#define CONTROLMODEL_H
+#pragma once
 
 #include <QAbstractTableModel>
 #include <QVariant>
@@ -58,5 +57,3 @@ class ControlModel final : public QAbstractTableModel {
     QVector<QHash<int, QVariant> > m_headerInfo;
     QList<ControlInfo> m_controls;
 };
-
-#endif /* CONTROLMODEL_H */
diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp
index 98736f6138..df8983a4e9 100644
--- a/src/control/controlobject.cpp
+++ b/src/control/controlobject.cpp
@@ -1,20 +1,3 @@
-/***************************************************************************
-                          controlobject.cpp  -  description
-                             -------------------
-    begin                : Wed Feb 20 2002
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
 #include "control/controlobject.h"
 
 #include <QHash>
diff --git a/src/control/controlobject.h b/src/control/controlobject.h
index b6f3ae5f53..cfd2dd39d5 100644
--- a/src/control/controlobject.h
+++ b/src/control/controlobject.h
@@ -1,20 +1,3 @@
-/***************************************************************************
-                          controlobject.h  -  description
-                             -------------------
-    begin                : Wed Feb 20 2002
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
 #pragma once
 
 #include <QObject>
diff --git a/src/control/controlobjectscript.h b/src/control/controlobjectscript.h
index 9dbd446ab5..90dce13655 100644
--- a/src/control/controlobjectscript.h
+++ b/src/control/controlobjectscript.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLOBJECTSCRIPT_H
-#define CONTROLOBJECTSCRIPT_H
+#pragma once
 
 #include <QVector>
 
@@ -40,5 +39,3 @@ class ControlObjectScript : public ControlProxy {
   private:
     QVector<ScriptConnection> m_scriptConnections;
 };
-
-#endif // CONTROLOBJECTSCRIPT_H
diff --git a/src/control/controlpotmeter.cpp b/src/control/controlpotmeter.cpp
index 667358f7aa..2c03d4d308 100644
--- a/src/control/controlpotmeter.cpp
+++ b/src/control/controlpotmeter.cpp
@@ -1,20 +1,3 @@
-/***************************************************************************
-                          controlpotmeter.cpp  -  description
-                             -------------------
-    begin                : Wed Feb 20 2002
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
 #include "control/controlpotmeter.h"
 
 #include "control/controlproxy.h"
diff --git a/src/control/controlpotmeter.h b/src/control/controlpotmeter.h
index a3dee755c7..1913513b91 100644
--- a/src/control/controlpotmeter.h
+++ b/src/control/controlpotmeter.h
@@ -1,30 +1,8 @@
-/***************************************************************************
-                          controlpotmeter.h  -  description
-                             -------------------
-    begin                : Wed Feb 20 2002
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CONTROLPOTMETER_H
-#define CONTROLPOTMETER_H
+#pragma once
 
 #include "preferences/usersettings.h"
 #include "control/controlobject.h"
 
-/**
-  *@author Tue and Ken Haste Andersen
-  */
-
 class ControlPushButton;
 class ControlProxy;
 
@@ -97,5 +75,3 @@ class ControlPotmeter : public ControlObject {
     bool m_bAllowOutOfBounds;
     PotmeterControls m_controls;
 };
-
-#endif
diff --git a/src/control/controlproxy.h b/src/control/controlproxy.h
index e86fc08670..4eab2fa38d 100644
--- a/src/control/controlproxy.h
+++ b/src/control/controlproxy.h
@@ -1,5 +1,4 @@
-#ifndef CONTROLPROXY_H
-#define CONTROLPROXY_H
+#pragma once
 
 #include <QObject>
 #include <QSharedPointer>
@@ -207,5 +206,3 @@ class ControlProxy : public QObject {
     // Pointer to connected control.
     QSharedPointer<ControlDoublePrivate> m_pControl;
 };
-
-#endif // CONTROLPROXY_H
diff --git a/src/control/controlpushbutton.cpp b/src/control/controlpushbutton.cpp
index e4a9200b41..1a3b2a1f3b 100644
--- a/src/control/controlpushbutton.cpp
+++ b/src/control/controlpushbutton.cpp
@@ -1,20 +1,3 @@
-/***************************************************************************
-                          controlpushbutton.cpp  -  description
-                             -------------------
-    begin                : Wed Feb 20 2002
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
 #include "control/controlpushbutton.h"
 
 #include "moc_controlpushbutton.cpp"
diff --git a/src/control/controlttrotary.cpp b/src/control/controlttrotary.cpp
index cb0961ac9f..4247d78d8f 100644
--- a/src/control/controlttrotary.cpp
+++ b/src/control/controlttrotary.cpp
@@ -1,19 +1,3 @@
-/***************************************************************************
-                          controlttrotary.cpp  -  description
-                             -------------------
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
-***************************************************************************/
-
-/***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************/
-
 #include "control/controlttrotary.h"
 
 #include "moc_controlttrotary.cpp"
diff --git a/src/control/controlttrotary.h b/src/control/controlttrotary.h
index 59ba41eeb2..ee132fed30 100644
--- a/src/control/controlttrotary.h
+++ b/src/control/controlttrotary.h
@@ -1,21 +1,4 @@
-/***************************************************************************
-                          controlttrotary.h  -  description
-                             -------------------
-    copyright            : (C) 2002 by Tue and Ken Haste Andersen
-    email                :
- ***************************************************************************/
-
-/***************************************************************************
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- ***************************************************************************/
-
-#ifndef CONTROLTTROTARY_H
-#define CONTROLTTROTARY_H
+#pragma once
 
 #include "preferences/usersettings.h"
 #include "control/controlobject.h"
@@ -25,5 +8,3 @@ class ControlTTRotary : public ControlObject {
   public:
     ControlTTRotary(const ConfigKey& key);
 };
-
-#endif