From df3a03f64cc6292b697c3431e55efb08c7f7f780 Mon Sep 17 00:00:00 2001
From: Daniel Winzen <d@winzen4.de>
Date: Fri, 21 Nov 2014 21:08:48 +0100
Subject: [PATCH] Add more missing Q_OBJECT macros

---
 include/Effect.h     | 1 +
 include/FxMixer.h    | 4 +++-
 include/Plugin.h     | 3 ++-
 src/core/Effect.cpp  | 2 +-
 src/core/FxMixer.cpp | 4 +++-
 src/core/Plugin.cpp  | 4 ++--
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/Effect.h b/include/Effect.h
index aadad4200..f43be1b0f 100644
--- a/include/Effect.h
+++ b/include/Effect.h
@@ -39,6 +39,7 @@ class EffectControls;
 
 class EXPORT Effect : public Plugin
 {
+	Q_OBJECT
 public:
 	Effect( const Plugin::Descriptor * _desc,
 			Model * _parent,
diff --git a/include/FxMixer.h b/include/FxMixer.h
index 88b5a0997..cbd79c9ce 100644
--- a/include/FxMixer.h
+++ b/include/FxMixer.h
@@ -78,6 +78,7 @@ class FxChannel : public ThreadableJob
 
 class FxRoute : public QObject
 {
+	Q_OBJECT
 	public:		
 		FxRoute( FxChannel * from, FxChannel * to, float amount );
 		virtual ~FxRoute();
@@ -116,8 +117,9 @@ class FxRoute : public QObject
 };
 
 
-class EXPORT FxMixer : public JournallingObject, public Model
+class EXPORT FxMixer : public Model, public JournallingObject
 {
+	Q_OBJECT
 public:
 	FxMixer();
 	virtual ~FxMixer();
diff --git a/include/Plugin.h b/include/Plugin.h
index 4887ef0fb..5cfb3760d 100644
--- a/include/Plugin.h
+++ b/include/Plugin.h
@@ -40,8 +40,9 @@ class PluginView;
 class AutomatableModel;
 
 
-class EXPORT Plugin : public JournallingObject, public Model
+class EXPORT Plugin : public Model, public JournallingObject
 {
+	Q_OBJECT
 public:
 	enum PluginTypes
 	{
diff --git a/src/core/Effect.cpp b/src/core/Effect.cpp
index 5a57d3059..3e6e70914 100644
--- a/src/core/Effect.cpp
+++ b/src/core/Effect.cpp
@@ -204,4 +204,4 @@ void Effect::resample( int _i, const sampleFrame * _src_buf,
 	}
 }
 
-
+#include "moc_Effect.cxx"
diff --git a/src/core/FxMixer.cpp b/src/core/FxMixer.cpp
index a83e84da8..37a91b7d4 100644
--- a/src/core/FxMixer.cpp
+++ b/src/core/FxMixer.cpp
@@ -172,8 +172,8 @@ void FxChannel::doProcessing( sampleFrame * _buf )
 
 
 FxMixer::FxMixer() :
-	JournallingObject(),
 	Model( NULL ),
+	JournallingObject(),
 	m_fxChannels()
 {
 	// create master channel
@@ -691,3 +691,5 @@ void FxMixer::validateChannelName( int index, int oldIndex )
 		r->updateName();
 	}
 }
+
+#include "moc_FxMixer.cxx"
diff --git a/src/core/Plugin.cpp b/src/core/Plugin.cpp
index 953be63eb..e18899134 100644
--- a/src/core/Plugin.cpp
+++ b/src/core/Plugin.cpp
@@ -54,8 +54,8 @@ static Plugin::Descriptor dummy_plugin_descriptor =
 
 
 Plugin::Plugin( const Descriptor * _descriptor, Model * parent ) :
-	JournallingObject(),
 	Model( parent ),
+	JournallingObject(),
 	m_descriptor( _descriptor )
 {
 	if( m_descriptor == NULL )
@@ -216,4 +216,4 @@ QDomElement Plugin::Descriptor::SubPluginFeatures::Key::saveXML(
 	return e;
 }
 
-
+#include "moc_Plugin.cxx"