From 70b9eea2ba01c3691497f49e4c45cb070c16193c Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 1 Jul 2011 03:43:07 +0000 Subject: TQt4 port kradio This enables compilation under both Qt3 and Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kradio@1238952 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kradio3/src/radiodevice_interfaces.cpp | 54 +++++++++++++++++----------------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'kradio3/src/radiodevice_interfaces.cpp') diff --git a/kradio3/src/radiodevice_interfaces.cpp b/kradio3/src/radiodevice_interfaces.cpp index 3f8a015..0a75a8b 100644 --- a/kradio3/src/radiodevice_interfaces.cpp +++ b/kradio3/src/radiodevice_interfaces.cpp @@ -27,7 +27,7 @@ IF_IMPL_SENDER ( IRadioDevice::notifyPowerChanged(bool on), noticePowerChanged(on, this) ); IF_IMPL_SENDER ( IRadioDevice::notifyStationChanged (const RadioStation &s), noticeStationChanged (s, this) ); -IF_IMPL_SENDER ( IRadioDevice::notifyDescriptionChanged (const QString&s), +IF_IMPL_SENDER ( IRadioDevice::notifyDescriptionChanged (const TQString&s), noticeDescriptionChanged (s, this) ); IF_IMPL_SENDER ( IRadioDevice::notifyCurrentSoundStreamIDChanged(SoundStreamID id), noticeCurrentSoundStreamIDChanged(id, this) ); @@ -43,22 +43,22 @@ IF_IMPL_SENDER ( IRadioDeviceClient::sendPowerOff(), IF_IMPL_SENDER ( IRadioDeviceClient::sendActivateStation(const RadioStation &rs), activateStation(rs) ); -IF_IMPL_QUERY ( bool IRadioDeviceClient::queryIsPowerOn(), +IF_IMPL_TQUERY ( bool IRadioDeviceClient::queryIsPowerOn(), isPowerOn(), false ); -IF_IMPL_QUERY ( bool IRadioDeviceClient::queryIsPowerOff(), +IF_IMPL_TQUERY ( bool IRadioDeviceClient::queryIsPowerOff(), isPowerOff(), true ); -IF_IMPL_QUERY ( const RadioStation & IRadioDeviceClient::queryCurrentStation(), +IF_IMPL_TQUERY ( const RadioStation & IRadioDeviceClient::queryCurrentStation(), getCurrentStation(), undefinedRadioStation ); -static QString IRadioDeviceClient_unknown("unknown"); -IF_IMPL_QUERY ( const QString & IRadioDeviceClient::queryDescription(), +static TQString IRadioDeviceClient_unknown("unknown"); +IF_IMPL_TQUERY ( const TQString & IRadioDeviceClient::queryDescription(), getDescription(), IRadioDeviceClient_unknown ); -IF_IMPL_QUERY ( SoundStreamID IRadioDeviceClient::queryCurrentSoundStreamID(), +IF_IMPL_TQUERY ( SoundStreamID IRadioDeviceClient::queryCurrentSoundStreamID(), getCurrentSoundStreamID(), SoundStreamID::InvalidID ); @@ -120,31 +120,31 @@ IF_IMPL_SENDER ( IRadioSoundClient::sendSignalMinQuality (float q), IF_IMPL_SENDER ( IRadioSoundClient::sendStereo(bool s), setStereo(s) ) -IF_IMPL_QUERY ( float IRadioSoundClient::queryVolume(), +IF_IMPL_TQUERY ( float IRadioSoundClient::queryVolume(), getVolume(), 0.0 ) -IF_IMPL_QUERY ( float IRadioSoundClient::queryTreble(), +IF_IMPL_TQUERY ( float IRadioSoundClient::queryTreble(), getTreble(), 0.0 ) -IF_IMPL_QUERY ( float IRadioSoundClient::queryBass(), +IF_IMPL_TQUERY ( float IRadioSoundClient::queryBass(), getBass(), 0.0 ) -IF_IMPL_QUERY ( float IRadioSoundClient::queryBalance(), +IF_IMPL_TQUERY ( float IRadioSoundClient::queryBalance(), getBalance(), 0.0 ) -IF_IMPL_QUERY ( float IRadioSoundClient::querySignalQuality(), +IF_IMPL_TQUERY ( float IRadioSoundClient::querySignalQuality(), getSignalQuality(), 0.0 ) -IF_IMPL_QUERY ( float IRadioSoundClient::querySignalMinQuality(), +IF_IMPL_TQUERY ( float IRadioSoundClient::querySignalMinQuality(), getSignalMinQuality(), 0.75 ) -IF_IMPL_QUERY ( bool IRadioSoundClient::queryHasGoodQuality(), +IF_IMPL_TQUERY ( bool IRadioSoundClient::queryHasGoodQuality(), hasGoodQuality(), false ) -IF_IMPL_QUERY ( bool IRadioSoundClient::queryIsStereo(), +IF_IMPL_TQUERY ( bool IRadioSoundClient::queryIsStereo(), isStereo(), false ) -IF_IMPL_QUERY ( bool IRadioSoundClient::queryIsMuted(), +IF_IMPL_TQUERY ( bool IRadioSoundClient::queryIsMuted(), isMuted(), true ) @@ -207,16 +207,16 @@ IF_IMPL_SENDER ( ISeekRadioClient::sendStartSeekDown(), IF_IMPL_SENDER ( ISeekRadioClient::sendStopSeek(), stopSeek() ); -IF_IMPL_QUERY ( bool ISeekRadioClient::queryIsSeekRunning(), +IF_IMPL_TQUERY ( bool ISeekRadioClient::queryIsSeekRunning(), isSeekRunning(), false ); -IF_IMPL_QUERY ( bool ISeekRadioClient::queryIsSeekUpRunning(), +IF_IMPL_TQUERY ( bool ISeekRadioClient::queryIsSeekUpRunning(), isSeekUpRunning(), false ); -IF_IMPL_QUERY ( bool ISeekRadioClient::queryIsSeekDownRunning(), +IF_IMPL_TQUERY ( bool ISeekRadioClient::queryIsSeekDownRunning(), isSeekDownRunning(), false ); -IF_IMPL_QUERY ( float ISeekRadioClient::queryProgress(), +IF_IMPL_TQUERY ( float ISeekRadioClient::queryProgress(), getProgress(), 1.0 ); @@ -261,22 +261,22 @@ IF_IMPL_SENDER ( IFrequencyRadioClient::sendMaxFrequency(float mf), IF_IMPL_SENDER ( IFrequencyRadioClient::sendScanStep(float s), setScanStep(s) ) -IF_IMPL_QUERY ( float IFrequencyRadioClient::queryFrequency(), +IF_IMPL_TQUERY ( float IFrequencyRadioClient::queryFrequency(), getFrequency(), 0 ) -IF_IMPL_QUERY ( float IFrequencyRadioClient::queryMinFrequency(), +IF_IMPL_TQUERY ( float IFrequencyRadioClient::queryMinFrequency(), getMinFrequency(), 0 ) -IF_IMPL_QUERY ( float IFrequencyRadioClient::queryMinDeviceFrequency(), +IF_IMPL_TQUERY ( float IFrequencyRadioClient::queryMinDeviceFrequency(), getMinDeviceFrequency(), 0 ) -IF_IMPL_QUERY ( float IFrequencyRadioClient::queryMaxFrequency(), +IF_IMPL_TQUERY ( float IFrequencyRadioClient::queryMaxFrequency(), getMaxFrequency(), 0 ) -IF_IMPL_QUERY ( float IFrequencyRadioClient::queryMaxDeviceFrequency(), +IF_IMPL_TQUERY ( float IFrequencyRadioClient::queryMaxDeviceFrequency(), getMaxDeviceFrequency(), 0 ) -IF_IMPL_QUERY ( float IFrequencyRadioClient::queryScanStep(), +IF_IMPL_TQUERY ( float IFrequencyRadioClient::queryScanStep(), getScanStep(), 0.05 ) @@ -312,7 +312,7 @@ IF_IMPL_SENDER ( IInternetRadioClient::sendURL(const KURL &url), static KURL emptyURL; -IF_IMPL_QUERY ( const KURL &IInternetRadioClient::queryURL(), +IF_IMPL_TQUERY ( const KURL &IInternetRadioClient::queryURL(), getURL(), emptyURL ) -- cgit v1.2.1