reduced header-dependencies

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1406 0778d3d1-df1d-0410-868b-ea421aaaa00d

include/automatable_slider.h

@@ -27,7 +27,6 @@
 #define _AUTOMATABLE_SLIDER_H
 
 #include <QtGui/QSlider>
-#include <QtXml/QDomElement>
 
 #include "automatable_model_view.h"
 

include/effect.h

@@ -27,8 +27,6 @@
 #ifndef _EFFECT_H
 #define _EFFECT_H
 
-#include <Qt/QtXml>
-
 #include "plugin.h"
 #include "engine.h"
 #include "mixer.h"

include/meter_model.h

@@ -25,7 +25,7 @@
 #ifndef _METER_MODEL_H
 #define _METER_MODEL_H
 
-#include "lcd_spinbox.h"
+#include "automatable_model.h"
 
 
 class meterModel : public model
@@ -46,8 +46,8 @@ public:
 
 
 private:
-	lcdSpinBoxModel m_numeratorModel;
-	lcdSpinBoxModel m_denominatorModel;
+	intModel m_numeratorModel;
+	intModel m_denominatorModel;
 
 
 	friend class meterDialog;

include/mmp.h

@@ -26,7 +26,7 @@
 #ifndef _MMP_H
 #define _MMP_H
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "export.h"
 #include "types.h"

include/pch.h

@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef _PCH_H_hsd
-#define _PCH_H_hsd
+#ifndef _PCH_H
+#define _PCH_H
 
 #include <Qt/QtCore>
 #include <Qt/QtGui>

include/song.h

@@ -30,8 +30,6 @@
 
 #include "track_container.h"
 #include "automatable_model.h"
-#include "automatable_slider.h"
-#include "lcd_spinbox.h"
 #include "controller.h"
 #include "meter_model.h"
 
@@ -259,11 +257,11 @@ private:
 
 	automationTrack * m_globalAutomationTrack;
 
-	lcdSpinBoxModel m_tempoModel;
+	intModel m_tempoModel;
 	meterModel m_timeSigModel;
 	int m_oldTicksPerTact;
-	sliderModel m_masterVolumeModel;
-	sliderModel m_masterPitchModel;
+	intModel m_masterVolumeModel;
+	intModel m_masterPitchModel;
 
 	controllerVector m_controllers;
 

plugins/audio_file_processor/audio_file_processor.cpp

@@ -25,7 +25,7 @@
 
 #include <QtGui/QPainter>
 #include <QtGui/QBitmap>
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtCore/QFileInfo>
 #include <QtGui/QDropEvent>
 

plugins/bass_booster/bassbooster_controls.cpp

@@ -23,6 +23,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "bassbooster_controls.h"
 #include "bass_booster.h"
 

plugins/flp_import/flp_import.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtGui/QApplication>
 #include <QtGui/QProgressDialog>
 #include <QtCore/QDir>

plugins/kicker/kicker.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtGui/QPainter>
 
 #include "kicker.h"

plugins/ladspa_effect/ladspa_controls.cpp

@@ -23,6 +23,7 @@
  */
 
 
+#include <QtXml/QDomElement>
 
 #include "ladspa_effect.h"
 

plugins/lb302/lb302.cpp

@@ -29,7 +29,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "lb302.h"
 #include "engine.h"

plugins/lb303/lb303.cpp

@@ -29,7 +29,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "lb303.h"
 #include "engine.h"

plugins/midi_import/midi_import.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtCore/QDir>
 #include <QtGui/QApplication>
 #include <QtGui/QProgressDialog>

plugins/peak_controller_effect/peak_controller_effect_controls.cpp

@@ -22,6 +22,9 @@
  *
  */
 
+
+#include <QtXml/QDomElement>
+
 #include "peak_controller.h"
 #include "peak_controller_effect_controls.h"
 #include "peak_controller_effect.h"

plugins/sf2_player/sf2_player.cpp

@@ -26,7 +26,7 @@
 #include <QtGui/QLayout>
 #include <QtGui/QLabel>
 #include <QtGui/QFileDialog>
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 
 #include "sf2_player.h"
 #include "engine.h"

plugins/stereo_enhancer/stereoenhancer_controls.cpp

@@ -22,6 +22,9 @@
  *
  */
 
+
+#include <QtXml/QDomElement>
+
 #include "stereoenhancer_controls.h"
 #include "stereo_enhancer.h"
 

plugins/stereo_matrix/stereomatrix_controls.cpp

@@ -22,6 +22,9 @@
  *
  */
 
+
+#include <QtXml/QDomElement>
+
 #include "stereomatrix_controls.h"
 #include "stereo_matrix.h"
 

plugins/triple_oscillator/triple_oscillator.cpp

@@ -23,7 +23,7 @@
  */
  
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtGui/QBitmap>
 #include <QtGui/QPainter>
 

plugins/vibed/vibed.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomDocument>
 #include <QtCore/QMap>
 #include <QtGui/QWhatsThis>
 

plugins/vst_base/lvsl_client.cpp

@@ -26,13 +26,16 @@
 #include "lvsl_client.h"
 #include "lmmsconfig.h"
 
+#include <QtCore/QCoreApplication>
+#include <QtCore/QDir>
+#include <QtCore/QEventLoop>
 #include <QtCore/QLocale>
 #include <QtCore/QTime>
-#include <QtCore/QDir>
 #include <QtGui/QMdiArea>
 #include <QtGui/QMdiSubWindow>
 #include <QtGui/QX11EmbedContainer>
 #include <QtGui/QX11Info>
+#include <QtXml/QDomDocument>
 
 #ifdef LMMS_HAVE_UNISTD_H
 #include <unistd.h>

plugins/vst_base/lvsl_client.h

@@ -29,7 +29,6 @@
 #include <QtCore/QString>
 #include <QtCore/QMutex>
 #include <QtGui/QWidget>
-#include <Qt/QtXml>
 
 #include "mixer.h"
 #include "communication.h"

plugins/vst_effect/vst_effect_controls.cpp

@@ -23,6 +23,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "vst_effect_controls.h"
 #include "vst_effect.h"
 

src/core/automatable_model.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "automatable_model.h"

src/core/automation_pattern.cpp

@@ -27,7 +27,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>
 

src/core/config_mgr.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtGui/QMessageBox>

src/core/controller.cpp

@@ -25,7 +25,7 @@
  *
  */
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 

src/core/controller_connection.cpp

@@ -25,7 +25,7 @@
  *
  */
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 

src/core/effect.cpp

@@ -26,6 +26,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "effect.h"
 #include "engine.h"
 #include "dummy_effect.h"

src/core/effect_chain.cpp

@@ -26,6 +26,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "effect_chain.h"
 #include "effect.h"
 #include "engine.h"

src/core/fx_mixer.cpp

@@ -25,6 +25,8 @@
  */
 
 
+#include <QtXml/QDomElement>
+
 #include "fx_mixer.h"
 #include "effect.h"
 #include "song.h"

src/core/inline_automation.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "inline_automation.h"
 

src/core/instrument_functions.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "instrument_functions.h"

src/core/instrument_sound_shaping.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "instrument_sound_shaping.h"

src/core/journalling_object.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "journalling_object.h"
 #include "project_journal.h"

src/core/lfo_controller.cpp

@@ -26,7 +26,7 @@
  */
 
 #include <math.h>
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 

src/core/midi/midi_controller.cpp

@@ -25,7 +25,7 @@
  *
  */
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 

src/core/midi/midi_port.cpp

@@ -26,7 +26,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "midi_port.h"
 #include "midi_client.h"

src/core/mmp.cpp

@@ -30,6 +30,7 @@
 #include <math.h>
 
 #include <QtCore/QFile>
+#include <QtCore/QTextStream>
 #include <QtGui/QMessageBox>
 
 

src/core/note.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include <math.h>
 

src/core/peak_controller.cpp

@@ -26,7 +26,7 @@
  */
 
 #include <math.h>
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QObject>
 #include <QtCore/QVector>
 

src/core/serializing_object.cpp

@@ -23,7 +23,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 #include "serializing_object.h"
 

src/core/surround_area.cpp

@@ -32,7 +32,7 @@
 #include <QtGui/QApplication>
 #include <QtGui/QMouseEvent>
 #include <QtGui/QPainter>
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 
 
 #include "caption_menu.h"

src/core/timeline.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QTimer>
 #include <QtGui/QApplication>
 #include <QtGui/QLayout>

src/core/track_container.cpp

@@ -26,6 +26,7 @@
 
 #include <QtGui/QApplication>
 #include <QtGui/QProgressDialog>
+#include <QtXml/QDomElement>
 
 #include "track_container.h"
 #include "instrument_track.h"

src/gui/main_window.cpp

@@ -25,7 +25,8 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
+#include <QtCore/QUrl>
 #include <QtGui/QApplication>
 #include <QtGui/QCloseEvent>
 #include <QtGui/QDesktopServices>

src/gui/song_editor.cpp

@@ -36,9 +36,11 @@
 #include <math.h>
 
 #include "song_editor.h"
+#include "automatable_slider.h"
+#include "combobox.h"
 #include "cpuload_widget.h"
 #include "embed.h"
-#include "combobox.h"
+#include "lcd_spinbox.h"
 #include "main_window.h"
 #include "meter_dialog.h"
 #include "mmp.h"

src/gui/widgets/meter_dialog.cpp

@@ -1,6 +1,7 @@
 /*
  * meter_dialog.cpp - dialog for entering meter settings
  *
+ * Copyright (c) 2008 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * Copyright (c) 2006-2008 Danny McRae <khjklujn/at/yahoo.com>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
@@ -22,6 +23,7 @@
  *
  */
 
+
 #include <QtGui/QLayout>
 #include <QtGui/QPushButton>
 #include <QtGui/QLabel>
@@ -30,6 +32,7 @@
 #include "meter_model.h"
 #include "embed.h"
 #include "gui_templates.h"
+#include "lcd_spinbox.h"
 
 
 meterDialog::meterDialog( QWidget * _parent, bool _simple ) :

src/gui/widgets/tempo_sync_knob.cpp

@@ -30,6 +30,7 @@
 
 #include <QtGui/QMouseEvent>
 #include <QtGui/QMdiArea>
+#include <QtXml/QDomElement>
 
 #include "engine.h"
 #include "caption_menu.h"

src/tracks/bb_track.cpp

@@ -25,7 +25,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtGui/QColorDialog>
 #include <QtGui/QMenu>
 #include <QtGui/QPainter>

src/tracks/instrument_track.cpp

@@ -26,9 +26,6 @@
  */
 
 
-#include "instrument_track.h"
-
-
 #include <QtCore/QDir>
 #include <QtCore/QFile>
 #include <QtCore/QQueue>
@@ -44,7 +41,7 @@
 #include <QtGui/QMdiSubWindow>
 #include <QtGui/QPainter>
 
-
+#include "instrument_track.h"
 #include "audio_port.h"
 #include "automation_pattern.h"
 #include "bb_track.h"
@@ -63,6 +60,7 @@
 #include "instrument.h"
 #include "instrument_function_views.h"
 #include "instrument_midi_io_view.h"
+#include "lcd_spinbox.h"
 #include "led_checkbox.h"
 #include "main_window.h"
 #include "midi_client.h"

src/tracks/pattern.cpp

@@ -26,7 +26,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtCore/QTimer>
 #include <QtGui/QMenu>
 #include <QtGui/QMessageBox>

src/tracks/sample_track.cpp

@@ -26,7 +26,7 @@
  */
 
 
-#include <Qt/QtXml>
+#include <QtXml/QDomElement>
 #include <QtGui/QDropEvent>
 #include <QtGui/QLayout>
 #include <QtGui/QMdiArea>