Major cleanup in the #includes. Moved the contents of all.h into individal files.

8 files changed, 24 insertions, 8 deletions

diff --git a/muse2/synti/deicsonze/deicsonze.cpp b/muse2/synti/deicsonze/deicsonze.cpp
index 131a1742..6d86eda9 100644
--- a/muse2/synti/deicsonze/deicsonze.cpp
+++ b/muse2/synti/deicsonze/deicsonze.cpp
@@ -32,6 +32,9 @@
 
 // #include <stdio.h>
 
+#include <QDomDocument>
+#include <QTemporaryFile>
+
 #include "muse/midi.h"
 #include "libsynti/mess.h"
 #include "deicsonze.h"
diff --git a/muse2/synti/deicsonze/deicsonzegui.cpp b/muse2/synti/deicsonze/deicsonzegui.cpp
index ba038b1b..8f9fafd0 100644
--- a/muse2/synti/deicsonze/deicsonzegui.cpp
+++ b/muse2/synti/deicsonze/deicsonzegui.cpp
@@ -27,6 +27,15 @@
 // 02111-1307, USA or point your web browser to http://www.gnu.org.
 //===========================================================================
 
+#include <QDir>
+#include <QDomDocument>
+#include <QFileDialog>
+#include <QMenu>
+#include <QMessageBox>
+#include <QMouseEvent>
+#include <QPainter>
+#include <QSocketNotifier>
+
 #include "muse/midi.h"
 #include "muse/midictrl.h"
 #include "config.h"
diff --git a/muse2/synti/deicsonze/deicsonzepreset.cpp b/muse2/synti/deicsonze/deicsonzepreset.cpp
index ef114014..1b070935 100644
--- a/muse2/synti/deicsonze/deicsonzepreset.cpp
+++ b/muse2/synti/deicsonze/deicsonzepreset.cpp
@@ -31,6 +31,8 @@
 #include <iostream>
 #include <algorithm>
 
+#include <QDomElement>
+
 //-----------------------------------------------------------
 // Constructor destructor
 //-----------------------------------------------------------
diff --git a/muse2/synti/deicsonze/deicsonzepreset.h b/muse2/synti/deicsonze/deicsonzepreset.h
index 67dcd9b1..be98b48e 100644
--- a/muse2/synti/deicsonze/deicsonzepreset.h
+++ b/muse2/synti/deicsonze/deicsonzepreset.h
@@ -30,6 +30,7 @@
 #ifndef __DEICSONZEPRESET_H
 #define __DEICSONZEPRESET_H
 
+#include <vector>
 #include <string>
 #include "al/xml.h"
 
diff --git a/muse2/synti/fluidsynth/fluidsynti.cpp b/muse2/synti/fluidsynth/fluidsynti.cpp
index ffd72561..72031d59 100644
--- a/muse2/synti/fluidsynth/fluidsynti.cpp
+++ b/muse2/synti/fluidsynth/fluidsynti.cpp
@@ -7,12 +7,13 @@
  *
  */
 
-#include "fluidsynti.h"
-#include "muse/midi.h"
-
 #include <list>
 #include <iostream>
-#include <qfileinfo.h>
+
+#include <QFileInfo>
+
+#include "fluidsynti.h"
+#include "muse/midi.h"
 
 FluidCtrl FluidSynth::fluidCtrl[] = {
       //{ "Expression", CTRL_EXPRESSION, 0, 127 },
diff --git a/muse2/synti/fluidsynth/fluidsynti.h b/muse2/synti/fluidsynth/fluidsynti.h
index a7e4ebfc..0816475c 100644
--- a/muse2/synti/fluidsynth/fluidsynti.h
+++ b/muse2/synti/fluidsynth/fluidsynti.h
@@ -11,9 +11,9 @@
 #define __MUSE_FLUIDSYNTI_H__
 
 #include <fluidsynth.h>
-#include <qstring.h>
 #include <pthread.h>
 #include <string>
+
 #include "fluidsynthgui.h"
 #include "libsynti/mess.h"
 #include "muse/debug.h"
diff --git a/muse2/synti/s1/s1.cpp b/muse2/synti/s1/s1.cpp
index 8520a742..0dca2656 100644
--- a/muse2/synti/s1/s1.cpp
+++ b/muse2/synti/s1/s1.cpp
@@ -15,8 +15,8 @@
 
 #include <cmath>
 #include <list>
-#include <qmessagebox.h>
-#include <stdio.h>
+
+#include <QMessageBox>
 
 #include "libsynti/mono.h"
 
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp
index 82f1bd07..95309372 100644
--- a/muse2/synti/simpledrums2/simpledrums.cpp
+++ b/muse2/synti/simpledrums2/simpledrums.cpp
@@ -15,7 +15,7 @@
 //#include "libsynti/mpevent.h"
 #include "muse/mpevent.h"   
 #include "simpledrums.h"
-// #include <qstring.h>
+
 #include <samplerate.h>
 
 const char* SimpleSynth::synth_state_descr[] =