From b1057f437bf65300831a0ccb45b920787c6b318d Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 11 Jun 2011 06:00:15 +0000
Subject: TQt4 port kdemultimedia This enables compilation under both Qt3 and
 Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 arts/midi/Makefile.am           | 4 ++--
 arts/midi/artsmidi.idl          | 2 +-
 arts/midi/audiosync_impl.cc     | 2 +-
 arts/midi/audiosync_impl.h      | 2 +-
 arts/midi/midisyncgroup_impl.cc | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'arts/midi')

diff --git a/arts/midi/Makefile.am b/arts/midi/Makefile.am
index b5719649..b7d655a1 100644
--- a/arts/midi/Makefile.am
+++ b/arts/midi/Makefile.am
@@ -9,12 +9,12 @@ bin_PROGRAMS = midisend
 noinst_PROGRAMS = midisynctest
 
 midisend_SOURCES = midisend.cc midimsg.c
-midisend_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBPTHREAD)
+midisend_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD)
 midisend_LDADD   = libartsmidi_idl.la
 midisend_COMPILE_FIRST = artsmidi.h
 
 midisynctest_SOURCES = midisynctest.cc
-midisynctest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBPTHREAD)
+midisynctest_LDFLAGS = $(all_libraries) $(LIB_QT) $(KDE_RPATH) $(LIBPTHREAD)
 midisynctest_LDADD   = libartsmidi.la -lsoundserver_idl
 midisynctest_COMPILE_FIRST = artsmidi.h
 
diff --git a/arts/midi/artsmidi.idl b/arts/midi/artsmidi.idl
index 70157d95..82e6e9e4 100644
--- a/arts/midi/artsmidi.idl
+++ b/arts/midi/artsmidi.idl
@@ -54,7 +54,7 @@ struct TimeStamp {
 /**
  * different status of a midi command
  */
-enum MidiCommandStatus {
+enum MidiCommandtqStatus {
 // Masks:
 	mcsCommandMask		= 0xf0,
 	mcsChannelMask		= 0x0f,
diff --git a/arts/midi/audiosync_impl.cc b/arts/midi/audiosync_impl.cc
index 20f089df..a75992c6 100644
--- a/arts/midi/audiosync_impl.cc
+++ b/arts/midi/audiosync_impl.cc
@@ -188,7 +188,7 @@ void AudioSync_impl::synchronizeTo(const TimeStamp& time)
 #endif
 }
 
-AudioSync_impl *AudioSync_impl::find(AudioSync audioSync)
+AudioSync_impl *AudioSync_impl::tqfind(AudioSync audioSync)
 {
 	list<AudioSync_impl *>::iterator i;
 
diff --git a/arts/midi/audiosync_impl.h b/arts/midi/audiosync_impl.h
index 302c93cb..dde1aed0 100644
--- a/arts/midi/audiosync_impl.h
+++ b/arts/midi/audiosync_impl.h
@@ -67,7 +67,7 @@ public:
 	void updateTime();
 
 	// interface to MidiSyncGroup
-	static AudioSync_impl *find(AudioSync audioSync);
+	static AudioSync_impl *tqfind(AudioSync audioSync);
 
 	void synchronizeTo(const TimeStamp& time);
 	void setSyncGroup(MidiSyncGroup_impl *syncGroup);
diff --git a/arts/midi/midisyncgroup_impl.cc b/arts/midi/midisyncgroup_impl.cc
index 5d5305dd..f446899f 100644
--- a/arts/midi/midisyncgroup_impl.cc
+++ b/arts/midi/midisyncgroup_impl.cc
@@ -68,7 +68,7 @@ void MidiSyncGroup_impl::removeClient(MidiClient client)
 
 void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync)
 {
-	AudioSync_impl *impl = AudioSync_impl::find(audioSync);
+	AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync);
 	impl->setSyncGroup(this);
 	audioSyncs.push_back(impl);
 
@@ -77,7 +77,7 @@ void MidiSyncGroup_impl::addAudioSync(AudioSync audioSync)
 
 void MidiSyncGroup_impl::removeAudioSync(AudioSync audioSync)
 {
-	AudioSync_impl *impl = AudioSync_impl::find(audioSync);
+	AudioSync_impl *impl = AudioSync_impl::tqfind(audioSync);
 	impl->setSyncGroup(0);
 	audioSyncs.remove(impl);
 }
-- 
cgit v1.2.1