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/46
+++ b/46
@@ -1,3 +1,49 @@
+2006-04-09	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/envelope_and_lfo_widget.cpp:
+	do not show hint when loading settings in which lfo-shape is set to USER
+
+	* src/core/preset_preview_play_handle.cpp:
+	disable project-journalling while loading preset
+
+	* src/core/preset_preview_play_handle.cpp:
+	* src/tracks/instrument_track.cpp:
+	for generating infinite notes, pass valueRanges<f_cnt_t>::max instead
+	of ~0 to note-play-handle-constructor as ~0 = 1 for signed ints
+
+	* include/types.h:
+	- changed types of fpab_t and f_cnt_t to be signed - compiler
+	  generates more optimized code this way
+	- added template-struct "valueRanges", containing members "min" and
+	  "max" which hold the minimum and maximum value of the type the
+	  template is instantiated with
+
+	* plugins/bit_invader/bit_invader.cpp:
+	- fixed buffer-overflow when loading sample-data from base64 and more
+	  bytes were decoded than allocated in wave-buffer
+	- delete decoded base64-data after copying it into wave-buffer
+
+2006-04-08	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* src/core/envelope_and_lfo_widget.cpp:
+	- connect valueChanged()-event of lfo-shape-buttongroup with
+	  lfoWaveCh()-slot - fixes bug that clicks at the lfo-wave-buttons
+	  were not recognized
+	- completely revised level()-method which doesn't have the bug
+	  anymore, that in release-phase the envelope-level simply went down
+	  from sustain-level to zero, now it goes down from the level at which
+	  the note was released, new method is also much cleaner and more
+	  optimized (and optmizable by compiler)
+
+	* src/core/preset_preview_play_handle.cpp:
+	hide preview-instrument-track-window after loading settings
+
+2006-04-07	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* plugins/vibed/vibrating_string.h:
+	corrected type-names for resample()-method-parameters (f_cnt_t instead
+	of samplerate_t)
+
 2006-04-06	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>

 	* include/config_mgr.h:
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -9,7 +9,7 @@ AC_ARG_WITH([qtdir], [  --with-qtdir=DIR        Qt installation directory [defau
 # Check that QTDIR is defined or that --with-qtdir given
 if test x"$QTDIR" = x ; then
 	# some usual Qt-locations
-	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 usr/local/qt /usr/local/qt3 /usr/local/qt31/ /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6 /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0"
+	QT_SEARCH="/usr /usr/lib/qt /usr/lib/qt3 /usr/lib/qt31 /usr/lib/qt32 /usr/lib/qt33 /usr/lib/qt-3.0 /usr/lib/qt-3.1 /usr/lib/qt-3.2 /usr/lib/qt-3.3 usr/local/qt /usr/local/qt3 /usr/local/qt31/ /usr/local/qt32 /usr/local/qt33 /usr/share/qt3 /usr/X11R6 /usr/share/qt4 /usr/local/Trolltech/Qt-4.0.0 /usr/local/Trolltech/Qt-4.0.1 /usr/local/Trolltech/Qt-4.1.0 /usr/local/Trolltech/Qt-4.1.0"
 else
 	QT_SEARCH=$QTDIR
 	QTDIR=""
@@ -75,12 +75,6 @@ if test x$UIC = x ; then
        AC_MSG_WARN([*** not found! It's currently not needed but should be part of a proper Qt-devel-tools-installation!])
 fi

-# qembed is the Qt data embedding utility.
-#AC_CHECK_PROG(QEMBED, qembed, $QTDIR/bin/qembed,,$QTDIR/bin/)
-#if test x$QEMBED = x ; then
-#        AC_MSG_ERROR([*** not found! Make sure you have Qt-devel-tools/Qt-extensions installed! On some distributions (e.g. SuSE) the package, containing qembed is also called qt3-extensions.])
-#fi
-
 # lupdate is the Qt translation-update utility.
 AC_CHECK_PROG(LUPDATE, lupdate, $QTDIR/bin/lupdate,,$QTDIR/bin/)
 if test x$LUPDATE = x ; then
@@ -134,7 +128,10 @@ case "${host}" in
        if test x$QT_IS_STATIC = xno ; then
            QT_IS_DYNAMIC=`ls $QTDIR/lib/*.so 2> /dev/null` 
            if test "x$QT_IS_DYNAMIC" = x;  then
-                AC_MSG_ERROR([*** Couldn't find any Qt libraries])
+                QT_IS_DYNAMIC=`ls /usr/lib/libQt*so.4 2> /dev/null` 
+                if test "x$QT_IS_DYNAMIC" = x;  then
+                    AC_MSG_ERROR([*** Couldn't find any Qt libraries])
+		fi
            fi
        fi
 	if test "$QT_MAJOR" = "4" ; then
--- a/configure.in
+++ b/configure.in
@@ -2,8 +2,8 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.50)
-AC_INIT(lmms, 0.1.4-cvs20060406, tobydox/at/users/dot/sourceforge/dot/net)
-AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060406)
+AC_INIT(lmms, 0.1.4-cvs20060409, tobydox/at/users/dot/sourceforge/dot/net)
+AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060409)

 AM_CONFIG_HEADER(config.h)

--- 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

--- a/plugins/audio_file_processor/audio_file_processor.cpp
+++ b/plugins/audio_file_processor/audio_file_processor.cpp
@@ -27,11 +27,11 @@

 #ifdef QT4

-#include <QPainter>
-#include <QBitmap>
+#include <QtGui/QPainter>
+#include <QtGui/QBitmap>
 #include <Qt/QtXml>
-#include <QFileInfo>
-#include <QDropEvent>
+#include <QtCore/QFileInfo>
+#include <QtGui/QDropEvent>

 #else

@@ -507,8 +507,8 @@ void audioFileProcessor::paintEvent( QPaintEvent * )

 	p.setPen( QColor( 0xFF, 0xAA, 0x00 ) );
 	const QRect graph_rect( 4, 174, 241, 70 );
-	const Uint32 frames = tMax( m_sampleBuffer.frames(),
-						static_cast<Uint32>( 1 ) );
+	const f_cnt_t frames = tMax( m_sampleBuffer.frames(),
+						static_cast<f_cnt_t>( 1 ) );
 	const Uint16 start_frame_x = m_sampleBuffer.startFrame() *
 						graph_rect.width() / frames;
 	const Uint16 end_frame_x = m_sampleBuffer.endFrame() *
--- a/plugins/audio_file_processor/audio_file_processor.h
+++ b/plugins/audio_file_processor/audio_file_processor.h
@@ -31,7 +31,7 @@

 #ifdef QT4

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

 #else

--- a/plugins/bit_invader/bit_invader.cpp
+++ b/plugins/bit_invader/bit_invader.cpp
@@ -27,17 +27,13 @@

 #ifdef QT4

-#include <QPainter>
-#include <QButtonGroup>
-#include <QBitmap>
+#include <QtGui/QPainter>
 #include <Qt/QtXml>
-#include <QFileInfo>
-#include <QDropEvent>
+#include <QtGui/QDropEvent>

 #else

 #include <qpainter.h>
-#include <qbuttongroup.h>
 #include <qbitmap.h>
 #include <qdom.h>
 #include <qfileinfo.h>
@@ -595,8 +591,6 @@ void bitInvader::saveSettings( QDomDocument & _doc, QDomElement & _this )

 void bitInvader::loadSettings( const QDomElement & _this )
 {
-
-
 	// Load sample length
 	sample_length = _this.attribute( "sampleLength" ).toInt() ;

@@ -606,13 +600,14 @@ void bitInvader::loadSettings( const QDomElement & _this )
 	// Load sample shape
 	delete[] sample_shape;
 	sample_shape = new float[sample_length];
-	QString sampleString = _this.attribute( "sampleShape");
 	int size = 0;
 	char * dst = 0;
-	base64::decode( sampleString, &dst, &size );
-	memcpy( sample_shape, dst, size  );
+	base64::decode( _this.attribute( "sampleShape"), &dst, &size );
+	memcpy( sample_shape, dst, tMin<int>( size, sample_length *
+							sizeof( float ) ) );

-       	m_graph->setSamplePointer( sample_shape, sample_length );
+	delete[] dst;
+    	m_graph->setSamplePointer( sample_shape, sample_length );

 	// Load LED normalize 
 	m_interpolationToggle->setChecked( _this.attribute(
--- a/plugins/bit_invader/bit_invader.h
+++ b/plugins/bit_invader/bit_invader.h
@@ -28,24 +28,14 @@
 #define _BIT_INVADER_H


-#ifdef QT4
-
-#include <QPixmap>
-
-#else
-
-#include <qpixmap.h>
-#include <qwidget.h>
-
-#endif
-
-
 #include "instrument.h"
 #include "spc_bg_hndl_widget.h"
 #include "graph.h"
 #include "led_checkbox.h"
 #include "oscillator.h"

+class QPixmap;
+
 class knob;
 class notePlayHandle;
 class pixmapButton;
--- a/plugins/bit_invader/graph.cpp
+++ b/plugins/bit_invader/graph.cpp
@@ -27,9 +27,9 @@

 #ifdef QT4

-#include <QPaintEvent>
-#include <QFontMetrics>
-#include <QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>

 #else

--- a/plugins/bit_invader/graph.h
+++ b/plugins/bit_invader/graph.h
@@ -30,9 +30,9 @@

 #ifdef QT4

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

 #else

--- a/plugins/flp_import/flp_import.cpp
+++ b/plugins/flp_import/flp_import.cpp
@@ -49,10 +49,10 @@
 #ifdef QT4

 #include <Qt/QtXml>
-#include <QApplication>
-#include <QProgressDialog>
-#include <QDir>
-#include <QBuffer>
+#include <QtGui/QApplication>
+#include <QtGui/QProgressDialog>
+#include <QtCore/QDir>
+#include <QtCore/QBuffer>

 #else

@@ -506,12 +506,14 @@ bool flpImport::tryImport( trackContainer * _tc )

 			case FLP_Text_CommentRTF:
 			{
+#ifndef QT3
+				QByteArray ba( text, text_len );
+				QBuffer buf( &ba );
+				buf.open( QBuffer::ReadOnly );
+#else
 				QByteArray ba;
 				ba.setRawData( text, text_len );
 				QBuffer buf( ba );
-#ifndef QT3
-				buf.open( QBuffer::ReadOnly );
-#else
 				buf.open( IO_ReadOnly );
 #endif
 				op = html_init();
@@ -521,7 +523,9 @@ bool flpImport::tryImport( trackContainer * _tc )
 				word_print( word, out );
 				word_free( word );
 				op_free( op );
+#ifdef QT3
 				ba.resetRawData( text, text_len );
+#endif

 				_tc->eng()->getProjectNotes()->setText( out );
 				outstring = "";
@@ -856,7 +860,7 @@ QString( "echo \"%1\" > /tmp/flp_rtf_comment.rtf ; unrtf -n --html /tmp/flp_rtf_
 	for( playListItems::const_iterator it = m_plItems.begin();
 						it != m_plItems.end(); ++it )
 	{
-		unsigned int pat_num = ( ( *it ) >> 16 ) - 1;
+		csize pat_num = ( ( *it ) >> 16 ) - 1;
 		while( _tc->eng()->getBBEditor()->numOfBBs() <= pat_num )
 		{
 			track::create( track::BB_TRACK,
--- a/plugins/flp_import/flp_import.h
+++ b/plugins/flp_import/flp_import.h
@@ -35,9 +35,9 @@

 #ifdef QT4

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

 #else

--- a/plugins/flp_import/unrtf/parse.c
+++ b/plugins/flp_import/unrtf/parse.c
@@ -156,7 +156,11 @@ static int my_getchar (QBuffer* f)
 						error_handler("Cannot allocate read buffer");
 				}
 			}
+#ifndef QT3
+			read_buf_end = f->read(read_buf, buffer_size);
+#else
 			read_buf_end = f->readBlock(read_buf, buffer_size);
+#endif
 			read_buf_index = 0;
 			if (!read_buf_end)
 				return EOF;
--- a/plugins/midi_import/midi_import.cpp
+++ b/plugins/midi_import/midi_import.cpp
@@ -32,8 +32,8 @@
 #ifdef QT4

 #include <Qt/QtXml>
-#include <QApplication>
-#include <QProgressDialog>
+#include <QtGui/QApplication>
+#include <QtGui/QProgressDialog>

 #else

--- a/plugins/midi_import/midi_import.h
+++ b/plugins/midi_import/midi_import.h
@@ -35,9 +35,9 @@

 #ifdef QT4

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

 #else

--- a/plugins/organic/organic.cpp
+++ b/plugins/organic/organic.cpp
@@ -27,20 +27,14 @@

 #ifdef QT4

-#include <QPainter>
-#include <QButtonGroup>
-#include <QBitmap>
+#include <QtGui/QPainter>
 #include <Qt/QtXml>
-#include <QFileInfo>
-#include <QDropEvent>
+#include <QtGui/QDropEvent>

 #else

 #include <qpainter.h>
-#include <qbuttongroup.h>
-#include <qbitmap.h>
 #include <qdom.h>
-#include <qfileinfo.h>
 #include <qdom.h>
 #include <qmap.h>
 #include <qcanvas.h>
--- a/plugins/organic/organic.h
+++ b/plugins/organic/organic.h
@@ -27,23 +27,13 @@
 #define _ORGANIC_H


-#ifdef QT4
-
-#include <QPixmap>
-
-#else
-
-#include <qpixmap.h>
-#include <qwidget.h>
-
-#endif
-
-
 #include "instrument.h"
 #include "spc_bg_hndl_widget.h"
 #include "led_checkbox.h"
 #include "oscillator.h"

+class QPixmap;
+
 class knob;
 class notePlayHandle;
 class pixmapButton;
--- a/plugins/plucked_string_synth/plucked_string_synth.cpp
+++ b/plugins/plucked_string_synth/plucked_string_synth.cpp
@@ -28,12 +28,10 @@
 #ifdef QT4

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

 #else

 #include <qdom.h>
-#include <qmap.h>

 #endif

--- a/plugins/triple_oscillator/triple_oscillator.cpp
+++ b/plugins/triple_oscillator/triple_oscillator.cpp
@@ -28,8 +28,8 @@
 #ifdef QT4

 #include <Qt/QtXml>
-#include <QBitmap>
-#include <QPainter>
+#include <QtGui/QBitmap>
+#include <QtGui/QPainter>

 #else

--- a/plugins/vestige/lvsl_client.cpp
+++ b/plugins/vestige/lvsl_client.cpp
@@ -27,10 +27,11 @@

 #ifdef QT4

-#include <QApplication>
-#include <QX11EmbedWidget>
-#include <QX11Info>
-#include <QTime>
+#include <QtCore/QLocale>
+#include <QtCore/QTime>
+#include <QtGui/QApplication>
+#include <QtGui/QX11EmbedWidget>
+#include <QtGui/QX11Info>

 #else

--- a/plugins/vestige/lvsl_client.h
+++ b/plugins/vestige/lvsl_client.h
@@ -30,8 +30,8 @@

 #ifdef QT4

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

 #else

@@ -80,7 +80,7 @@ public:
 	void FASTCALL process( const sampleFrame * _in_buf,
 						sampleFrame * _out_buf );
 	void FASTCALL enqueueMidiEvent( const midiEvent & _event,
-						const Uint32 _frames_ahead );
+						const f_cnt_t _frames_ahead );
 	void FASTCALL setTempo( const bpm_t _bpm );

 	const QMap<QString, QString> & parameterDump( void );
--- a/plugins/vestige/lvsl_server.c
+++ b/plugins/vestige/lvsl_server.c
@@ -512,7 +512,7 @@ void VSTPlugin::enqueueMidiEvent( const midiEvent & _event,



-void VSTPlugin::setBlockSize( const Uint16 _bsize )
+void VSTPlugin::setBlockSize( const fpab_t _bsize )
 {
 	if( _bsize == m_blockSize )
 	{
--- a/plugins/vestige/vestige.cpp
+++ b/plugins/vestige/vestige.cpp
@@ -28,12 +28,12 @@
 #ifdef QT4

 #include <Qt/QtXml>
-#include <QMessageBox>
-#include <QFileDialog>
-#include <QFileInfo>
-#include <QDir>
-#include <QPushButton>
-#include <QCursor>
+#include <QtGui/QMessageBox>
+#include <QtGui/QFileDialog>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+#include <QtGui/QPushButton>
+#include <QtGui/QCursor>

 #else

--- a/plugins/vestige/vestige.h
+++ b/plugins/vestige/vestige.h
@@ -31,7 +31,7 @@

 #ifdef QT4

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

 #else

--- a/plugins/vibed/graph.cpp
+++ b/plugins/vibed/graph.cpp
@@ -27,9 +27,9 @@

 #ifdef QT4

-#include <QPaintEvent>
-#include <QFontMetrics>
-#include <QPainter>
+#include <QtGui/QPaintEvent>
+#include <QtGui/QFontMetrics>
+#include <QtGui/QPainter>

 #else

--- a/plugins/vibed/graph.h
+++ b/plugins/vibed/graph.h
@@ -30,9 +30,9 @@

 #ifdef QT4

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

 #else

--- a/plugins/vibed/impulse_editor.cpp
+++ b/plugins/vibed/impulse_editor.cpp
@@ -26,11 +26,12 @@

 #ifdef QT4

-#include <QPoint>
+#include <QtCore/QPoint>
 #include <Qt/QtXml>
-#include <QMap>
-#include <QLabel>
-#include <QMenu>
+#include <QtCore/QMap>
+#include <QtGui/QLabel>
+#include <QtGui/QMenu>
+#include <QtGui/QWhatsThis>

 #else

@@ -53,7 +54,7 @@

 impulseEditor::impulseEditor( QWidget * _parent, int _x, int _y, 
 					engine * _engine, Uint32 _len ) :
-	QWidget( _parent, "impulseEditor" ),
+	QWidget( _parent/*, "impulseEditor"*/ ),
 	engineObject( _engine ),
 	m_sampleLength( _len ),
 	m_normalizeFactor( 1.0f ),
@@ -61,7 +62,13 @@ impulseEditor::impulseEditor( QWidget * _parent, int _x, int _y,
 {
 	setFixedSize( 153, 124 );
 	m_base = QPixmap::grabWidget( _parent, _x, _y );
+#ifndef QT3
+	QPalette pal = palette();
+	pal.setBrush( backgroundRole(), QBrush( m_base ) );
+	setPalette( pal );
+#else
 	setPaletteBackgroundPixmap( m_base );
+#endif
 	
 	m_graph = new graph( this, eng() );
 	m_graph->setForeground( PLUGIN_NAME::getIconPixmap( "wavegraph4" ) );
--- a/Show More
+++ b/Show More