summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorDaniel Poelzleithner <git@poelzi.org>2020-12-07 12:10:56 +0100
committerDaniel Poelzleithner <git@poelzi.org>2020-12-07 12:10:56 +0100
commite77124c39828cbc120f6bf566db084869a04b42d (patch)
tree46020dafe469eed4f04bf7d8081935ae1338a28d /src/control
parentbf343d2677f19d1886682c4bd15e26f70884ce27 (diff)
Slimdown moc_compilation.cpp
The moc_compilation file became unbearable large, easily taking 10 minutes to compile whenever a Q_OBJECT changes. AUTOMOC scans for <basename>_moc.cpp includes and does not add the file to the moc_compilation whenever it is included in the propper cpp file. After this patch, moc_compilation.cpp is empty and the mocs are compiled with the approptial cpp, increasing recompile speeds by a factor of 10 when just a header file changed.
Diffstat (limited to 'src/control')
-rw-r--r--src/control/control.cpp1
-rw-r--r--src/control/controlaudiotaperpot.cpp2
-rw-r--r--src/control/controleffectknob.cpp3
-rw-r--r--src/control/controlencoder.cpp2
-rw-r--r--src/control/controlindicator.cpp2
-rw-r--r--src/control/controllinpotmeter.cpp2
-rw-r--r--src/control/controllogpotmeter.cpp2
-rw-r--r--src/control/controlmodel.cpp2
-rw-r--r--src/control/controlobject.cpp8
-rw-r--r--src/control/controlobjectscript.cpp4
-rw-r--r--src/control/controlpotmeter.cpp4
-rw-r--r--src/control/controlproxy.cpp4
-rw-r--r--src/control/controlpushbutton.cpp2
-rw-r--r--src/control/controlttrotary.cpp2
14 files changed, 33 insertions, 7 deletions
diff --git a/src/control/control.cpp b/src/control/control.cpp
index 6f988913f3..5ea6a51dad 100644
--- a/src/control/control.cpp
+++ b/src/control/control.cpp
@@ -1,6 +1,7 @@
#include "control/control.h"
#include "control/controlobject.h"
+#include "moc_control.cpp"
#include "util/stat.h"
//static
diff --git a/src/control/controlaudiotaperpot.cpp b/src/control/controlaudiotaperpot.cpp
index 9264b67774..d5f8000a10 100644
--- a/src/control/controlaudiotaperpot.cpp
+++ b/src/control/controlaudiotaperpot.cpp
@@ -1,6 +1,8 @@
#include "control/controlaudiotaperpot.h"
+#include "moc_controlaudiotaperpot.cpp"
+
ControlAudioTaperPot::ControlAudioTaperPot(const ConfigKey& key,
double minDB,
double maxDB,
diff --git a/src/control/controleffectknob.cpp b/src/control/controleffectknob.cpp
index cf01306458..1dfd28d592 100644
--- a/src/control/controleffectknob.cpp
+++ b/src/control/controleffectknob.cpp
@@ -1,7 +1,8 @@
#include "control/controleffectknob.h"
-#include "util/math.h"
#include "effects/effectmanifestparameter.h"
+#include "moc_controleffectknob.cpp"
+#include "util/math.h"
ControlEffectKnob::ControlEffectKnob(const ConfigKey& key, double dMinValue, double dMaxValue)
: ControlPotmeter(key, dMinValue, dMaxValue) {
diff --git a/src/control/controlencoder.cpp b/src/control/controlencoder.cpp
index 3dd146a6e9..be9b6893ab 100644
--- a/src/control/controlencoder.cpp
+++ b/src/control/controlencoder.cpp
@@ -1,5 +1,7 @@
#include "control/controlencoder.h"
+#include "moc_controlencoder.cpp"
+
ControlEncoder::ControlEncoder(const ConfigKey& key, bool bIgnoreNops)
: ControlObject(key, bIgnoreNops) {
if (m_pControl) {
diff --git a/src/control/controlindicator.cpp b/src/control/controlindicator.cpp
index 2d655b02b0..3dc77a108a 100644
--- a/src/control/controlindicator.cpp
+++ b/src/control/controlindicator.cpp
@@ -1,5 +1,7 @@
#include "control/controlindicator.h"
+
#include "control/controlproxy.h"
+#include "moc_controlindicator.cpp"
#include "util/math.h"
ControlIndicator::ControlIndicator(const ConfigKey& key)
diff --git a/src/control/controllinpotmeter.cpp b/src/control/controllinpotmeter.cpp
index deaa65f91a..72a2fc721d 100644
--- a/src/control/controllinpotmeter.cpp
+++ b/src/control/controllinpotmeter.cpp
@@ -1,5 +1,7 @@
#include "control/controllinpotmeter.h"
+#include "moc_controllinpotmeter.cpp"
+
ControlLinPotmeter::ControlLinPotmeter(const ConfigKey& key,
double dMinValue,
double dMaxValue,
diff --git a/src/control/controllogpotmeter.cpp b/src/control/controllogpotmeter.cpp
index b0c4e40163..ad84a38380 100644
--- a/src/control/controllogpotmeter.cpp
+++ b/src/control/controllogpotmeter.cpp
@@ -17,6 +17,8 @@
#include "control/controllogpotmeter.h"
+#include "moc_controllogpotmeter.cpp"
+
ControlLogpotmeter::ControlLogpotmeter(const ConfigKey& key, double dMaxValue, double minDB)
: ControlPotmeter(key, 0, dMaxValue) {
// Override ControlPotmeters default value of 0.5
diff --git a/src/control/controlmodel.cpp b/src/control/controlmodel.cpp
index 923be754b2..33824eb52f 100644
--- a/src/control/controlmodel.cpp
+++ b/src/control/controlmodel.cpp
@@ -1,5 +1,7 @@
#include "control/controlmodel.h"
+#include "moc_controlmodel.cpp"
+
ControlModel::ControlModel(QObject* pParent)
: QAbstractTableModel(pParent) {
diff --git a/src/control/controlobject.cpp b/src/control/controlobject.cpp
index 5aa71b84ce..98736f6138 100644
--- a/src/control/controlobject.cpp
+++ b/src/control/controlobject.cpp
@@ -15,13 +15,15 @@
* *
***************************************************************************/
-#include <QtDebug>
+#include "control/controlobject.h"
+
#include <QHash>
-#include <QSet>
#include <QMutexLocker>
+#include <QSet>
+#include <QtDebug>
-#include "control/controlobject.h"
#include "control/control.h"
+#include "moc_controlobject.cpp"
#include "util/stat.h"
#include "util/timer.h"
diff --git a/src/control/controlobjectscript.cpp b/src/control/controlobjectscript.cpp
index ae6438e87e..501967b4b3 100644
--- a/src/control/controlobjectscript.cpp
+++ b/src/control/controlobjectscript.cpp
@@ -1,6 +1,8 @@
+#include "control/controlobjectscript.h"
+
#include <QtDebug>
-#include "control/controlobjectscript.h"
+#include "moc_controlobjectscript.cpp"
ControlObjectScript::ControlObjectScript(const ConfigKey& key, QObject* pParent)
: ControlProxy(key, pParent, ControlFlag::NoAssertIfMissing) {
diff --git a/src/control/controlpotmeter.cpp b/src/control/controlpotmeter.cpp
index a62b77ef43..667358f7aa 100644
--- a/src/control/controlpotmeter.cpp
+++ b/src/control/controlpotmeter.cpp
@@ -15,9 +15,11 @@
* *
***************************************************************************/
-#include "control/controlpushbutton.h"
#include "control/controlpotmeter.h"
+
#include "control/controlproxy.h"
+#include "control/controlpushbutton.h"
+#include "moc_controlpotmeter.cpp"
ControlPotmeter::ControlPotmeter(const ConfigKey& key,
double dMinValue,
diff --git a/src/control/controlproxy.cpp b/src/control/controlproxy.cpp
index 5ca1f04630..51e7876f1a 100644
--- a/src/control/controlproxy.cpp
+++ b/src/control/controlproxy.cpp
@@ -1,7 +1,9 @@
+#include "control/controlproxy.h"
+
#include <QtDebug>
-#include "control/controlproxy.h"
#include "control/control.h"
+#include "moc_controlproxy.cpp"
ControlProxy::ControlProxy(const QString& g, const QString& i, QObject* pParent, ControlFlags flags)
: ControlProxy(ConfigKey(g, i), pParent, flags) {
diff --git a/src/control/controlpushbutton.cpp b/src/control/controlpushbutton.cpp
index 29c4e9dd9b..e4a9200b41 100644
--- a/src/control/controlpushbutton.cpp
+++ b/src/control/controlpushbutton.cpp
@@ -17,6 +17,8 @@
#include "control/controlpushbutton.h"
+#include "moc_controlpushbutton.cpp"
+
/* -------- ------------------------------------------------------
Purpose: Creates a new simulated latching push-button.
Input: key - Key for the configuration file
diff --git a/src/control/controlttrotary.cpp b/src/control/controlttrotary.cpp
index 930c8c48d6..cb0961ac9f 100644
--- a/src/control/controlttrotary.cpp
+++ b/src/control/controlttrotary.cpp
@@ -16,6 +16,8 @@
#include "control/controlttrotary.h"
+#include "moc_controlttrotary.cpp"
+
/* -------- ------------------------------------------------------
Purpose: Creates a new rotary encoder
Input: key