Merge branch '2.3' into column-cache-fix

121 files changed, 322 insertions, 757 deletions

diff --git a/src/widget/controlwidgetconnection.cpp b/src/widget/controlwidgetconnection.cpp
index c198c45e0b..2822cb7f3d 100644
--- a/src/widget/controlwidgetconnection.cpp
+++ b/src/widget/controlwidgetconnection.cpp
@@ -1,11 +1,13 @@
-#include <QStyle>
 #include "widget/controlwidgetconnection.h"
 
-#include "widget/wbasewidget.h"
+#include <QStyle>
+
 #include "control/controlproxy.h"
+#include "moc_controlwidgetconnection.cpp"
+#include "util/assert.h"
 #include "util/debug.h"
 #include "util/valuetransformer.h"
-#include "util/assert.h"
+#include "widget/wbasewidget.h"
 
 ControlWidgetConnection::ControlWidgetConnection(
         WBaseWidget* pBaseWidget,
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.cpp b/src/widget/hexspinbox.cpp
index ab0c04d697..c58ef0fe88 100644
--- a/src/widget/hexspinbox.cpp
+++ b/src/widget/hexspinbox.cpp
@@ -1,5 +1,7 @@
 #include "widget/hexspinbox.h"
 
+#include "moc_hexspinbox.cpp"
+
 HexSpinBox::HexSpinBox(QWidget* pParent)
         : QSpinBox(pParent) {
     setRange(0, 255);
diff --git a/src/widget/hexspinbox.h b/src/widget/hexspinbox.h
index 6942000d3c..709bd99fa5 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>
@@ -14,5 +13,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 e502336763..f06fbc26ce 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.cpp b/src/widget/paintable.cpp
index 2b84241e91..073d7ba841 100644
--- a/src/widget/paintable.cpp
+++ b/