fixes for Qt4-version

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

include/audio_device.h

@@ -111,7 +111,11 @@ public:
 	public:
 		setupWidget( const QString & _caption, QWidget * _parent ) :
 			tabWidget( tabWidget::tr( "Settings for %1" ).arg(
-					tr( _caption ) ).toUpper(), _parent )
+					tabWidget::tr( _caption
+#ifndef QT3
+						.toAscii()
+#endif
+							) ).toUpper(), _parent )
 		{
 		}
 

include/bb_track.h

@@ -132,11 +132,7 @@ public:
 	}
 	void enableAutomation( track * _track )
 	{
-#ifndef QT3
 		m_disabled_tracks.removeAll( _track );
-#else
-		m_disabled_tracks.remove( _track );
-#endif
 	}
 
 

include/fifo_buffer.h

@@ -49,29 +49,53 @@ public:
 		m_size( _size )
 	{
 		m_buffer = new T[_size];
+#ifndef QT3
+		m_reader_sem.acquire( _size );
+#else
 		m_reader_sem += _size;
+#endif
 	}
 
 	~fifoBuffer()
 	{
 		delete[] m_buffer;
+#ifndef QT3
+		m_reader_sem.release( m_size );
+#else
 		m_reader_sem -= m_size;
+#endif
 	}
 
 	void write( T _element )
 	{
+#ifndef QT3
+		m_writer_sem.acquire();
+#else
 		m_writer_sem++;
+#endif
 		m_buffer[m_writer_index++] = _element;
 		m_writer_index %= m_size;
+#ifndef QT3
+		m_reader_sem.release();
+#else
 		m_reader_sem--;
+#endif
 	}
 
 	T read( void )
 	{
+#ifndef QT3
+		m_reader_sem.acquire();
+#else
 		m_reader_sem++;
+#endif
 		T element = m_buffer[m_reader_index++];
 		m_reader_index %= m_size;
+#ifndef QT3
+		m_writer_sem.release();
+#else
 		m_writer_sem--;
+#endif
 		return( element );
 	}
 

include/midi_client.h

@@ -116,7 +116,11 @@ public:
 	public:
 		setupWidget( const QString & _caption, QWidget * _parent ) :
 			tabWidget( tabWidget::tr( "Settings for %1" ).arg(
-					tr( _caption ) ).toUpper(), _parent )
+					tr( _caption
+#ifndef QT3
+						.toAscii()
+#endif
+							) ).toUpper(), _parent )
 		{
 		}
 

include/qt3support.h

@@ -182,6 +182,10 @@ inline QString baseName( const QString & _file )
 #define transformed xForm
 
 
+// QList
+#define removeAll remove
+
+
 // QGridLayout
 #define setColumnStretch setColStretch
 #define columnCount numCols