From 31894261f74ef000de68d1162dc36066faeb643b Mon Sep 17 00:00:00 2001 From: Danny McRae Date: Thu, 10 Aug 2006 19:04:00 +0000 Subject: [PATCH] added qt4 includes to ladspa stuff git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@301 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 18 ++++++++++++++++++ include/effect.h | 9 +++++++++ include/effect_chain.h | 8 ++++++++ include/effect_label.h | 10 ++++++++++ include/effect_tab_widget.h | 5 ++++- include/ladspa_control.h | 10 ++++++++++ include/rack_plugin.h | 12 ++++++++++++ include/rack_view.h | 13 ++++++++++++- src/core/effect.cpp | 9 +++++++++ src/core/effect_tab_widget.cpp | 1 - src/core/ladspa_port_dialog.cpp | 1 + src/widgets/ladspa_control.cpp | 9 +++++++++ src/widgets/ladspa_description.cpp | 10 +++++++++- src/widgets/rack_plugin.cpp | 1 + src/widgets/rack_view.cpp | 9 +++++++++ 15 files changed, 121 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85bc608d1..3ae0e9297 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,22 @@ 2006-08-10 Danny McRae + * include/effect.h: + * include/effect_chain.h: + * include/effect_label.h: + * include/effect_tab_widget.h: + * include/ladspa_control.h: + * include/ladspa_control_dialog.h: + * include/ladspa_description.h: + * include/rack_plugin.h: + * include/rack_view.h: + * src/core/effect.cpp: + * src/core/effect_tab_widget.cpp: + * src/core/ladspa_port_dialog.cpp: + * src/core/ladspa_control_dialog.cpp: + * src/widgets/ladspa_description.cpp: + * src/widgets/rack_plugin.cpp: + * src/widgets/rack_view.cpp: + added Qt4 includes + * include/config_mgr.h: * include/setup_dialog.h: * src/core/config_mgr.cpp: diff --git a/include/effect.h b/include/effect.h index efba87acd..c9ffad1cd 100644 --- a/include/effect.h +++ b/include/effect.h @@ -32,8 +32,17 @@ #include #endif +#ifdef QT4 + +#include + +#else + #include +#endif + + #include "qt3support.h" #include "engine.h" diff --git a/include/effect_chain.h b/include/effect_chain.h index 8e0615600..b0eea4343 100644 --- a/include/effect_chain.h +++ b/include/effect_chain.h @@ -28,8 +28,16 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include + +#else + #include +#endif + #include "qt3support.h" #include "engine.h" diff --git a/include/effect_label.h b/include/effect_label.h index ec30c6981..4c896f07a 100644 --- a/include/effect_label.h +++ b/include/effect_label.h @@ -29,10 +29,20 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include +#include +#include + +#else + #include #include #include +#endif + #include "journalling_object.h" #include "tab_widget.h" #include "effect_tab_widget.h" diff --git a/include/effect_tab_widget.h b/include/effect_tab_widget.h index b21eb1d46..d644e48c9 100644 --- a/include/effect_tab_widget.h +++ b/include/effect_tab_widget.h @@ -35,6 +35,10 @@ #ifdef QT4 #include +#include +#include +#include +#include #else @@ -43,7 +47,6 @@ #include #include #include -#include #endif diff --git a/include/ladspa_control.h b/include/ladspa_control.h index d7aaaba71..5533a3e9f 100644 --- a/include/ladspa_control.h +++ b/include/ladspa_control.h @@ -28,9 +28,19 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include +#include + +#else + #include #include +#endif + + #include "journalling_object.h" #include "track.h" #include "knob.h" diff --git a/include/rack_plugin.h b/include/rack_plugin.h index bff1121ac..c870fef0d 100644 --- a/include/rack_plugin.h +++ b/include/rack_plugin.h @@ -28,11 +28,23 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include +#include +#include +#include + +#else + #include #include #include #include +#endif + + #include "journalling_object.h" #include "led_checkbox.h" #include "track.h" diff --git a/include/rack_view.h b/include/rack_view.h index 9321948ce..3e0fc1169 100644 --- a/include/rack_view.h +++ b/include/rack_view.h @@ -27,11 +27,22 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include +#include +#include +#include + +#else + #include #include #include #include -#include + +#endif + #include "types.h" #include "journalling_object.h" diff --git a/src/core/effect.cpp b/src/core/effect.cpp index 094083b4e..ca9b2d8dc 100644 --- a/src/core/effect.cpp +++ b/src/core/effect.cpp @@ -27,8 +27,17 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include + +#else + #include "qmessagebox.h" +#endif + + #include "effect.h" #include "mixer.h" #include "config_mgr.h" diff --git a/src/core/effect_tab_widget.cpp b/src/core/effect_tab_widget.cpp index ffc3cdd07..a9347689f 100644 --- a/src/core/effect_tab_widget.cpp +++ b/src/core/effect_tab_widget.cpp @@ -40,7 +40,6 @@ #include #include -#include #include #endif diff --git a/src/core/ladspa_port_dialog.cpp b/src/core/ladspa_port_dialog.cpp index 0a763bb90..01d00f20f 100644 --- a/src/core/ladspa_port_dialog.cpp +++ b/src/core/ladspa_port_dialog.cpp @@ -32,6 +32,7 @@ #ifdef QT4 #include +#include #else diff --git a/src/widgets/ladspa_control.cpp b/src/widgets/ladspa_control.cpp index 06d8c2f31..5f4c2f1ae 100644 --- a/src/widgets/ladspa_control.cpp +++ b/src/widgets/ladspa_control.cpp @@ -27,8 +27,17 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include + +#else + #include +#endif + + #include "ladspa_control.h" #include "effect.h" diff --git a/src/widgets/ladspa_description.cpp b/src/widgets/ladspa_description.cpp index 95aec77f3..02cfd13ae 100644 --- a/src/widgets/ladspa_description.cpp +++ b/src/widgets/ladspa_description.cpp @@ -26,9 +26,17 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT -#include +#ifdef QT4 + +#include + +#else + #include +#endif + + #include "ladspa_description.h" #include "mixer.h" #include "audio_device.h" diff --git a/src/widgets/rack_plugin.cpp b/src/widgets/rack_plugin.cpp index a51fdbc60..91d83e141 100644 --- a/src/widgets/rack_plugin.cpp +++ b/src/widgets/rack_plugin.cpp @@ -35,6 +35,7 @@ #include #include #include +#include #else diff --git a/src/widgets/rack_view.cpp b/src/widgets/rack_view.cpp index a43e3da31..1f6a1bb2d 100644 --- a/src/widgets/rack_view.cpp +++ b/src/widgets/rack_view.cpp @@ -27,8 +27,17 @@ #include "ladspa_manager.h" #ifdef LADSPA_SUPPORT +#ifdef QT4 + +#include + +#else + #include +#endif + + #include "rack_view.h"