lot of fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@124 0778d3d1-df1d-0410-868b-ea421aaaa00d
2006-04-10 08:22:55 +00:00
parent 1d6e678914
commit b1887d62b8
118 changed files with 377 additions and 324 deletions
--- a/include/about_dialog.h
+++ b/include/about_dialog.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QDialog>
+#include <QtGui/QDialog>

 #else

--- a/include/arp_and_chords_tab_widget.h
+++ b/include/arp_and_chords_tab_widget.h
@@ -31,7 +31,7 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>

 #else

--- a/include/audio_device.h
+++ b/include/audio_device.h
@@ -30,9 +30,9 @@

 #ifdef QT4

-#include <QPair>
-#include <QMutex>
-#include <QThread>
+#include <QtCore/QPair>
+#include <QtCore/QMutex>
+#include <QtCore/QThread>

 #else

--- a/include/audio_file_device.h
+++ b/include/audio_file_device.h
@@ -31,7 +31,7 @@

 #ifdef QT4

-#include <QFile>
+#include <QtCore/QFile>

 #else

--- a/include/audio_jack.h
+++ b/include/audio_jack.h
@@ -41,10 +41,10 @@

 #ifdef QT4

-#include <QMutex>
-#include <QVector>
-#include <QList>
-#include <QMap>
+#include <QtCore/QMutex>
+#include <QtCore/QVector>
+#include <QtCore/QList>
+#include <QtCore/QMap>

 #else

--- a/include/audio_port.h
+++ b/include/audio_port.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QString>
+#include <QtCore/QString>

 #else

--- a/include/audio_sample_recorder.h
+++ b/include/audio_sample_recorder.h
@@ -33,8 +33,8 @@

 #ifdef QT4

-#include <QList>
-#include <QPair>
+#include <QtCore/QList>
+#include <QtCore/QPair>

 #else

--- a/include/automatable_button.h
+++ b/include/automatable_button.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>

 #else

--- a/include/automatable_object.h
+++ b/include/automatable_object.h
@@ -271,7 +271,7 @@ protected:
 	{
 		journalEntry je( _je.actionID(),
 #ifndef QT3
-					-_je.data().value<EDIT_STEP_TYPE>();
+					-_je.data().value<EDIT_STEP_TYPE>()
 #else
 			static_cast<EDIT_STEP_TYPE>( -_je.data().toDouble() )
 #endif
--- a/include/base64.h
+++ b/include/base64.h
@@ -31,7 +31,7 @@

 #ifndef QT3

-#include <QByteArray>
+#include <QtCore/QByteArray>

 #endif

--- a/include/bb_track.h
+++ b/include/bb_track.h
@@ -31,8 +31,8 @@

 #ifdef QT4

-#include <QObject>
-#include <QMap>
+#include <QtCore/QObject>
+#include <QtCore/QMap>

 #else

--- a/include/clipboard.h
+++ b/include/clipboard.h
@@ -35,7 +35,7 @@

 #ifdef QT4

-#include <QMap>
+#include <QtCore/QMap>
 #include <Qt/QtXml>

 #else
--- a/include/combobox.h
+++ b/include/combobox.h
@@ -30,11 +30,11 @@

 #ifdef QT4

-#include <QWidget>
-#include <QVector>
-#include <QMenu>
-#include <QPixmap>
-#include <QPair>
+#include <QtGui/QWidget>
+#include <QtCore/QVector>
+#include <QtGui/QMenu>
+#include <QtGui/QPixmap>
+#include <QtCore/QPair>

 #else

--- a/include/config_mgr.h
+++ b/include/config_mgr.h
@@ -36,10 +36,10 @@

 #ifdef QT4

-#include <QDialog>
-#include <QMap>
-#include <QVector>
-#include <QPair>
+#include <QtGui/QDialog>
+#include <QtCore/QMap>
+#include <QtCore/QVector>
+#include <QtCore/QPair>

 #else

--- a/include/cpuload_widget.h
+++ b/include/cpuload_widget.h
@@ -31,8 +31,8 @@

 #ifdef QT4

-#include <QWidget>
-#include <QPixmap>
+#include <QtGui/QWidget>
+#include <QtGui/QPixmap>
 #include <QTimer>

 #else
--- a/include/embed.h
+++ b/include/embed.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QPixmap>
-#include <QString>
+#include <QtGui/QPixmap>
+#include <QtCore/QString>

 #else

--- a/include/envelope_and_lfo_widget.h
+++ b/include/envelope_and_lfo_widget.h
@@ -36,9 +36,9 @@

 #ifdef QT4

-#include <QWidget>
-#include <QMap>
-#include <QVector>
+#include <QtGui/QWidget>
+#include <QtCore/QMap>
+#include <QtCore/QVector>

 #else

--- a/include/envelope_tab_widget.h
+++ b/include/envelope_tab_widget.h
@@ -32,7 +32,7 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>

 #else

--- a/include/export_project_dialog.h
+++ b/include/export_project_dialog.h
@@ -35,7 +35,7 @@

 #ifdef QT4

-#include <QDialog>
+#include <QtGui/QDialog>

 #else

--- a/include/fade_button.h
+++ b/include/fade_button.h
@@ -31,7 +31,7 @@
 #ifdef QT4

 #include <QAbstractButton>
-#include <QColor>
+#include <QtGui/QColor>

 #else

--- a/include/group_box.h
+++ b/include/group_box.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>

 #else

--- a/include/gui_templates.h
+++ b/include/gui_templates.h
@@ -30,9 +30,9 @@

 #ifdef QT4

-#include <QApplication>
-#include <QFont>
-#include <QDesktopWidget>
+#include <QtGui/QApplication>
+#include <QtGui/QFont>
+#include <QtGui/QDesktopWidget>

 #else

--- a/include/import_filter.h
+++ b/include/import_filter.h
@@ -36,7 +36,7 @@

 #ifdef QT4

-#include <QFile>
+#include <QtCore/QFile>

 #else

@@ -96,7 +96,11 @@ protected:

 	inline int readBlock( char * _data, int _len )
 	{
+#ifndef QT3
+		return( m_file.read( _data, _len ) );
+#else
 		return( m_file.readBlock( _data, _len ) );
+#endif
 	}

 	inline void ungetChar( int _ch )
--- a/include/instrument.h
+++ b/include/instrument.h
@@ -37,8 +37,8 @@

 #ifdef QT4

-#include <QWidget>
-#include <QVector>
+#include <QtGui/QWidget>
+#include <QtCore/QVector>

 #else

--- a/include/instrument_track.h
+++ b/include/instrument_track.h
@@ -31,10 +31,10 @@

 #ifdef QT4

-#include <QApplication>
-#include <QPushButton>
-#include <QPainter>
-#include <QMutex>
+#include <QtGui/QApplication>
+#include <QtGui/QPushButton>
+#include <QtGui/QPainter>
+#include <QtCore/QMutex>

 #else

--- a/include/journalling_object.h
+++ b/include/journalling_object.h
@@ -36,9 +36,9 @@

 #ifndef QT3

-#include <QVariant>
-#include <QVector>
-#include <QStack>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
+#include <QtCore/QStack>

 #else

--- a/include/kmultitabbar.h
+++ b/include/kmultitabbar.h
@@ -28,9 +28,9 @@
 #ifndef QT3

 #include <QLayout>
-#include <QString>
-#include <QList>
-#include <QPushButton>
+#include <QtCore/QString>
+#include <QtCore/QList>
+#include <QtGui/QPushButton>

 class QPixmap;
 class QPainter;
--- a/include/knob.h
+++ b/include/knob.h
@@ -33,8 +33,8 @@

 #ifdef QT4

-#include <QWidget>
-#include <QPoint>
+#include <QtGui/QWidget>
+#include <QtCore/QPoint>

 #else

--- a/include/ladspa_manager.h
+++ b/include/ladspa_manager.h
@@ -42,10 +42,10 @@

 #ifdef QT4

-#include <QString>
+#include <QtCore/QString>
 #include <QStringList>
-#include <QMap>
-#include <QPair>
+#include <QtCore/QMap>
+#include <QtCore/QPair>

 #else

--- a/include/lcd_spinbox.h
+++ b/include/lcd_spinbox.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QLCDNumber>
-#include <QMap>
+#include <QtCore/QMap>
+#include <QtGui/QLCDNumber>

 #else

--- a/include/main_window.h
+++ b/include/main_window.h
@@ -30,9 +30,9 @@

 #ifdef QT4

-#include <QMainWindow>
-#include <QWorkspace>
-#include <QWhatsThis>
+#include <QtGui/QMainWindow>
+#include <QtGui/QWorkspace>
+#include <QtGui/QWhatsThis>

 #else

--- a/include/midi_alsa_raw.h
+++ b/include/midi_alsa_raw.h
@@ -42,7 +42,7 @@

 #ifdef QT4

-#include <QThread>
+#include <QtCore/QThread>

 #else

--- a/include/midi_alsa_seq.h
+++ b/include/midi_alsa_seq.h
@@ -44,7 +44,7 @@

 #ifdef QT4

-#include <QThread>
+#include <QtCore/QThread>
 #include <QTimer>

 #else
--- a/include/midi_client.h
+++ b/include/midi_client.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QVector>
+#include <QtCore/QVector>
 #include <QStringList>

 #else
--- a/include/midi_mapper.h
+++ b/include/midi_mapper.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QPair>
-#include <QFile>
+#include <QtCore/QPair>
+#include <QtCore/QFile>

 #else

--- a/include/midi_port.h
+++ b/include/midi_port.h
@@ -31,7 +31,7 @@

 #ifdef QT4

-#include <QString>
+#include <QtCore/QString>

 #else

--- a/include/midi_tab_widget.h
+++ b/include/midi_tab_widget.h
@@ -31,7 +31,7 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>

 #else

--- a/include/mixer.h
+++ b/include/mixer.h
@@ -34,8 +34,8 @@

 #ifdef QT4

-#include <QMutex>
-#include <QVector>
+#include <QtCore/QMutex>
+#include <QtCore/QVector>

 #else

@@ -168,10 +168,7 @@ public:
 			m_playHandles.push_back( _ph );
 			return( TRUE );
 		}
-		else
-		{
-			delete _ph;
-		}
+		delete _ph;
 		return( FALSE );
 	}

--- a/include/name_label.h
+++ b/include/name_label.h
@@ -32,7 +32,7 @@
 #ifdef QT4

 #include <QLabel>
-#include <QPixmap>
+#include <QtGui/QPixmap>

 #else

--- a/include/note.h
+++ b/include/note.h
@@ -35,7 +35,7 @@

 #ifdef QT4

-#include <QVector>
+#include <QtCore/QVector>

 #else

--- a/include/nstate_button.h
+++ b/include/nstate_button.h
@@ -34,9 +34,9 @@

 #ifdef QT4

-#include <QPixmap>
-#include <QVector>
-#include <QPair>
+#include <QtGui/QPixmap>
+#include <QtCore/QVector>
+#include <QtCore/QPair>

 #else

--- a/include/pattern.h
+++ b/include/pattern.h
@@ -31,12 +31,12 @@

 #ifdef QT4

-#include <QVector>
-#include <QWidget>
-#include <QMutex>
-#include <QDialog>
-#include <QThread>
-#include <QPixmap>
+#include <QtCore/QVector>
+#include <QtGui/QWidget>
+#include <QtCore/QMutex>
+#include <QtGui/QDialog>
+#include <QtCore/QThread>
+#include <QtGui/QPixmap>

 #else

--- a/include/piano_roll.h
+++ b/include/piano_roll.h
@@ -31,9 +31,9 @@

 #ifdef QT4

-#include <QWidget>
-#include <QVector>
-#include <QPixmap>
+#include <QtGui/QWidget>
+#include <QtCore/QVector>
+#include <QtGui/QPixmap>

 #else

--- a/include/piano_widget.h
+++ b/include/piano_widget.h
@@ -31,9 +31,9 @@

 #ifdef QT4

-#include <QWidget>
-#include <QPixmap>
-#include <QScrollBar>
+#include <QtGui/QWidget>
+#include <QtGui/QPixmap>
+#include <QtGui/QScrollBar>

 #else

--- a/include/pixmap_button.h
+++ b/include/pixmap_button.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QPixmap>
+#include <QtGui/QPixmap>

 #else

--- a/include/play_handle.h
+++ b/include/play_handle.h
@@ -35,7 +35,7 @@

 #ifdef QT4

-#include <QVector>
+#include <QtCore/QVector>

 #else

--- a/include/plugin.h
+++ b/include/plugin.h
@@ -35,8 +35,8 @@

 #ifdef QT4

-#include <QString>
-#include <QVector>
+#include <QtCore/QString>
+#include <QtCore/QVector>

 #else

--- a/include/plugin_browser.h
+++ b/include/plugin_browser.h
@@ -35,8 +35,8 @@

 #ifdef QT4

-#include <QVector>
-#include <QPixmap>
+#include <QtCore/QVector>
+#include <QtGui/QPixmap>
 #include <QTimer>

 #else
--- a/include/preset_preview_play_handle.h
+++ b/include/preset_preview_play_handle.h
@@ -31,7 +31,7 @@

 #ifdef QT4

-#include <QMap>
+#include <QtCore/QMap>

 #else

--- a/include/project_journal.h
+++ b/include/project_journal.h
@@ -32,9 +32,9 @@

 #ifndef QT3

-#include <QVariant>
-#include <QVector>
-#include <QMap>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
+#include <QtCore/QMap>

 #else

--- a/include/project_notes.h
+++ b/include/project_notes.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QMainWindow>
+#include <QtGui/QMainWindow>

 #else

--- a/include/qt3support.h
+++ b/include/qt3support.h
@@ -62,7 +62,7 @@ typedef int csize;
 #define vstack QStack
 #define vvector QVector

-#include <QFileInfo>
+#include <QtCore/QFileInfo>

 inline QString baseName( const QString & _file )
 {
--- a/include/rename_dialog.h
+++ b/include/rename_dialog.h
@@ -31,7 +31,7 @@

 #ifdef QT4

-#include <QDialog>
+#include <QtGui/QDialog>

 #else

--- a/include/rubberband.h
+++ b/include/rubberband.h
@@ -31,8 +31,8 @@

 #ifndef QT3

-#include <QRubberBand>
-#include <QVector>
+#include <QtGui/QRubberBand>
+#include <QtCore/QVector>

 #else

--- a/include/sample_buffer.h
+++ b/include/sample_buffer.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QObject>
-#include <QMutex>
+#include <QtCore/QObject>
+#include <QtCore/QMutex>

 #else

--- a/include/sample_track.h
+++ b/include/sample_track.h
@@ -31,7 +31,7 @@

 #ifdef QT4

-#include <QDialog>
+#include <QtGui/QDialog>

 #else

--- a/include/setup_dialog.h
+++ b/include/setup_dialog.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QDialog>
-#include <QMap>
+#include <QtGui/QDialog>
+#include <QtCore/QMap>

 #else

--- a/include/side_bar.h
+++ b/include/side_bar.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QMap>
+#include <QtCore/QMap>

 #else

--- a/include/side_bar_widget.h
+++ b/include/side_bar_widget.h
@@ -30,9 +30,9 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>
 #include <QVBoxLayout>
-#include <QPixmap>
+#include <QtGui/QPixmap>

 #else

--- a/include/spc_bg_hndl_widget.h
+++ b/include/spc_bg_hndl_widget.h
@@ -30,9 +30,9 @@

 #ifdef QT4

-#include <QWidget>
-#include <QPainter>
-#include <QPixmap>
+#include <QtGui/QWidget>
+#include <QtGui/QPainter>
+#include <QtGui/QPixmap>

 #else

--- a/include/string_pair_drag.h
+++ b/include/string_pair_drag.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QDrag>
+#include <QtGui/QDrag>

 #else

--- a/include/surround_area.h
+++ b/include/surround_area.h
@@ -32,7 +32,7 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>

 #else

--- a/include/tab_bar.h
+++ b/include/tab_bar.h
@@ -34,8 +34,8 @@

 #ifdef QT4

-#include <QWidget>
-#include <QMap>
+#include <QtGui/QWidget>
+#include <QtCore/QMap>
 #include <QLayout>

 #else
--- a/include/tab_button.h
+++ b/include/tab_button.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QPushButton>
+#include <QtGui/QPushButton>

 #else

--- a/include/tab_widget.h
+++ b/include/tab_widget.h
@@ -35,8 +35,8 @@

 #ifdef QT4

-#include <QWidget>
-#include <QMap>
+#include <QtGui/QWidget>
+#include <QtCore/QMap>

 #else

--- a/include/templates.h
+++ b/include/templates.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QtAlgorithms>
+#include <QtCore/QtAlgorithms>

 #else

--- a/include/tempo_sync_knob.h
+++ b/include/tempo_sync_knob.h
@@ -28,7 +28,7 @@

 #ifdef QT4

-#include <QPixmap>
+#include <QtGui/QPixmap>

 #else

--- a/include/text_float.h
+++ b/include/text_float.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QWidget>
-#include <QPixmap>
+#include <QtGui/QWidget>
+#include <QtGui/QPixmap>

 #else

--- a/include/timeline.h
+++ b/include/timeline.h
@@ -30,7 +30,7 @@

 #ifdef QT4

-#include <QWidget>
+#include <QtGui/QWidget>

 #else

--- a/include/tool_button.h
+++ b/include/tool_button.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QToolButton>
-#include <QColor>
+#include <QtGui/QToolButton>
+#include <QtGui/QColor>

 #else

--- a/include/track.h
+++ b/include/track.h
@@ -35,9 +35,9 @@

 #ifdef QT4

-#include <QVector>
-#include <QList>
-#include <QWidget>
+#include <QtCore/QVector>
+#include <QtCore/QList>
+#include <QtGui/QWidget>

 #else

--- a/include/track_container.h
+++ b/include/track_container.h
@@ -31,9 +31,9 @@

 #ifdef QT4

-#include <QScrollArea>
-#include <QVector>
-#include <QMainWindow>
+#include <QtGui/QScrollArea>
+#include <QtCore/QVector>
+#include <QtGui/QMainWindow>

 #else

@@ -89,7 +89,7 @@ public:
 		return( FALSE );
 	}

-	unsigned int FASTCALL countTracks( track::trackTypes _tt =
+	Uint16 FASTCALL countTracks( track::trackTypes _tt =
 					track::TOTAL_TRACK_TYPES ) const;

 	void FASTCALL setMutedOfAllTracks( bool _muted );
--- a/include/types.h
+++ b/include/types.h
@@ -47,13 +47,27 @@ typedef Sint16 int_sample_t;		// 16-bit-int-sample


 typedef Uint32 sample_rate_t;		// sample-rate
-typedef Uint16 fpab_t;			// frames per audio-buffer (0-16384)
-typedef Uint32 f_cnt_t;			// standard frame-count
+typedef Sint16 fpab_t;			// frames per audio-buffer (0-16384)
+typedef Sint32 f_cnt_t;			// standard frame-count
 typedef Uint8 ch_cnt_t;			// channel-count (0-SURROUND_CHANNELS)
 typedef Uint16 bpm_t;			// tempo (MIN_BPM to MAX_BPM)
 typedef Uint16 bitrate_t;		// bitrate in kbps
 typedef Sint8 fx_ch_t;			// FX-channel (0 to MAX_EFFECT_CHANNEL)

-typedef Uint32 jo_id_t;			// (unique) ID of an journalling object
+typedef Uint32 jo_id_t;			// (unique) ID of a journalling object
+
+
+template<typename T>
+struct valueRanges
+{
+	enum
+	{
+		max = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
+			~0 : ( ( ( T ) 1 << ( sizeof( T ) * 8 - 1 ) ) - 1 ) ),
+		min = static_cast<T>( static_cast<T>( ~0 ) > 0 ?
+							0 : ( -max - 1 ) )
+	} ;
+} ;
+

 #endif
--- a/include/visualization_widget.h
+++ b/include/visualization_widget.h
@@ -30,8 +30,8 @@

 #ifdef QT4

-#include <QWidget>
-#include <QPixmap>
+#include <QtGui/QWidget>
+#include <QtGui/QPixmap>

 #else