qt4- and other fixes

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

include/automatable_object.h

@@ -257,24 +257,24 @@ protected:
 	virtual void redoStep( journalEntry & _je )
 	{
 		saveJournallingState( FALSE );
-#ifndef QT3
+/*#ifndef QT3
 		setValue( static_cast<T>( value() +
 					_je.data().value<EDIT_STEP_TYPE>() ) );
-#else
+#else*/
 		setValue( static_cast<T>( value() + static_cast<EDIT_STEP_TYPE>(
 						_je.data().toDouble() ) ) );
-#endif
+//#endif
 		restoreJournallingState();
 	}
 
 	virtual void undoStep( journalEntry & _je )
 	{
 		journalEntry je( _je.actionID(),
-#ifndef QT3
+/*#ifndef QT3
 					-_je.data().value<EDIT_STEP_TYPE>()
-#else
+#else*/
 			static_cast<EDIT_STEP_TYPE>( -_je.data().toDouble() )
-#endif
+//#endif
 				);
 		redoStep( je );
 	}

include/cpuload_widget.h

@@ -31,9 +31,9 @@
 
 #ifdef QT4
 
-#include <QtGui/QWidget>
+#include <QtCore/QTimer>
 #include <QtGui/QPixmap>
-#include <QTimer>
+#include <QtGui/QWidget>
 
 #else
 

include/fade_button.h

@@ -30,7 +30,7 @@
 
 #ifdef QT4
 
-#include <QAbstractButton>
+#include <QtGui/QAbstractButton>
 #include <QtGui/QColor>
 
 #else

include/file_browser.h

@@ -35,7 +35,7 @@
 
 #ifdef QT4
 
-#include <QDir>
+#include <QtCore/QDir>
 
 #else
 

include/kmultitabbar.h

@@ -27,9 +27,9 @@
 
 #ifndef QT3
 
-#include <QLayout>
 #include <QtCore/QString>
 #include <QtCore/QList>
+#include <QtGui/QLayout>
 #include <QtGui/QPushButton>
 
 class QPixmap;

include/ladspa_manager.h

@@ -42,10 +42,10 @@
 
 #ifdef QT4
 
-#include <QtCore/QString>
-#include <QStringList>
 #include <QtCore/QMap>
 #include <QtCore/QPair>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
 
 #else
 

include/lmms_constants.h

@@ -21,10 +21,13 @@
  * Boston, MA 02111-1307, USA.
  *
  */
+
 #ifndef _LMMS_CONSTANTS_H
 #define _LMMS_CONSTANTS_H
 
 const float F_PI = 3.141593f;
 const float F_2PI = 6.283185f;
 const float F_PI_2 = 1.570796f;
+
 #endif
+

include/midi_alsa_seq.h

@@ -45,7 +45,7 @@
 #ifdef QT4
 
 #include <QtCore/QThread>
-#include <QTimer>
+#include <QtCore/QTimer>
 
 #else
 

include/midi_client.h

@@ -30,8 +30,8 @@
 
 #ifdef QT4
 
+#include <QtCore/QStringList>
 #include <QtCore/QVector>
-#include <QStringList>
 
 #else
 

include/name_label.h

@@ -31,7 +31,7 @@
 
 #ifdef QT4
 
-#include <QLabel>
+#include <QtGui/QLabel>
 #include <QtGui/QPixmap>
 
 #else

include/plugin_browser.h

@@ -35,9 +35,9 @@
 
 #ifdef QT4
 
+#include <QtCore/QTimer>
 #include <QtCore/QVector>
 #include <QtGui/QPixmap>
-#include <QTimer>
 
 #else
 

include/project_journal.h

@@ -32,9 +32,9 @@
 
 #ifndef QT3
 
+#include <QtCore/QHash>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
-#include <QtCore/QMap>
 
 #else
 
@@ -109,7 +109,11 @@ public:
 
 
 private:
+#ifndef QT3
+	typedef QHash<jo_id_t, journallingObject *> joIDMap;
+#else
 	typedef QMap<jo_id_t, journallingObject *> joIDMap;
+#endif
 	typedef vvector<jo_id_t> journalEntryVector;
 
 	joIDMap m_joIDs;

include/side_bar_widget.h

@@ -1,7 +1,7 @@
 /*
  * side_bar_widget.h - base-class for all side-bar-widgets
  *
- * Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -30,9 +30,9 @@
 
 #ifdef QT4
 
-#include <QtGui/QWidget>
-#include <QVBoxLayout>
 #include <QtGui/QPixmap>
+#include <QtGui/QVBoxLayout>
+#include <QtGui/QWidget>
 
 #else
 

include/tab_bar.h

@@ -1,7 +1,7 @@
 /*
  * tab_bar.h - class tabBar
  *
- * Copyright (c) 2004-2005 Tobias Doerffel <tobydox/at/users.sourceforge.net>
+ * Copyright (c) 2004-2006 Tobias Doerffel <tobydox/at/users.sourceforge.net>
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
@@ -34,9 +34,9 @@
 
 #ifdef QT4
 
-#include <QtGui/QWidget>
 #include <QtCore/QMap>
-#include <QLayout>
+#include <QtGui/QLayout>
+#include <QtGui/QWidget>
 
 #else