Fix inadvertent "TQ" changes.

13 files changed, 111 insertions, 111 deletions

diff --git a/kradio3/src/include/interfaces.h b/kradio3/src/include/interfaces.h
index c698521..2e1a68c 100644
--- a/kradio3/src/include/interfaces.h
+++ b/kradio3/src/include/interfaces.h
@@ -180,7 +180,7 @@
 
      Abbreviation by macros:
 
-         IF_TQUERY(     int QueryingQueries(int another_param)        )
+         IF_QUERY(     int QueryingQueries(int another_param)        )
 
 
    - answering queries
@@ -221,7 +221,7 @@
 
    int   ComplementaryInterface::QueryingQueries(int another_param) const
    {
-       IF_SEND_TQUERY( AnsweringQuery(another_param), (int)"default return value" )
+       IF_SEND_QUERY( AnsweringQuery(another_param), (int)"default return value" )
    }
 
 
@@ -231,7 +231,7 @@
                     AnsweringQueries(param)
                  )
 
-   IF_IMPL_TQUERY(  int ComplementaryInterface::SendingMessages(int param),
+   IF_IMPL_QUERY(  int ComplementaryInterface::SendingMessages(int param),
                    ReceivingMessages(param),
                    (int)"default return value"
                 )
@@ -414,12 +414,12 @@ private:
 #ifdef DEBUG
     #include <iostream>
     using namespace std;
-    #define IF_TQUERY_DEBUG \
+    #define IF_QUERY_DEBUG \
         if (iConnections.count() > 1) { \
-            kdDebug() << "class " << typeid(this).name() << ": using IF_TQUERY with #connections > 1\n"; \
+            kdDebug() << "class " << typeid(this).name() << ": using IF_QUERY with #connections > 1\n"; \
         }
 #else
-    #define IF_TQUERY_DEBUG
+    #define IF_QUERY_DEBUG
 #endif
 
 
@@ -454,23 +454,23 @@ private:
 // queries
 
 #define ANSWERS public
-#define TQUERIES protected
+#define QUERIES protected
 
-#define IF_TQUERY(decl) \
+#define IF_QUERY(decl) \
         virtual decl const;
 
-#define IF_SEND_TQUERY(call, default) \
+#define IF_SEND_QUERY(call, default) \
         cmplInterface *o = IFIterator(iConnections).current(); \
         if (o) { \
-            IF_TQUERY_DEBUG \
+            IF_QUERY_DEBUG \
             return o->call; \
         } else { \
             return default; \
         } \
 
-#define IF_IMPL_TQUERY(decl, call, default) \
+#define IF_IMPL_QUERY(decl, call, default) \
         decl const { \
-            IF_SEND_TQUERY(call, default) \
+            IF_SEND_QUERY(call, default) \
         }
 
 #define IF_ANSWER(decl) \
diff --git a/kradio3/src/include/radio_interfaces.h b/kradio3/src/include/radio_interfaces.h
index dbba88d..009df8c 100644
--- a/kradio3/src/include/radio_interfaces.h
+++ b/kradio3/src/include/radio_interfaces.h
@@ -96,16 +96,16 @@ RECEIVERS:
     IF_RECEIVER(  noticePresetFileChanged(const TQString &f)          )
     IF_RECEIVER(  noticeCurrentSoundStreamIDChanged(SoundStreamID id))
 
-TQUERIES:
-    IF_TQUERY   (  bool                   queryIsPowerOn()          )
-    IF_TQUERY   (  bool                   queryIsPowerOff()         )
-    IF_TQUERY   (  const RadioStation  &  queryCurrentStation()     )
-    IF_TQUERY   (  int                    queryStationIdx(const RadioStation &rs)  )
-    IF_TQUERY   (  int                    queryCurrentStationIdx()  )
-    IF_TQUERY   (  const StationList &    queryStations()           )
-    IF_TQUERY   (  const TQString     &    queryPresetFile()         )
-
-    IF_TQUERY   (  SoundStreamID          queryCurrentSoundStreamID() );
+QUERIES:
+    IF_QUERY   (  bool                   queryIsPowerOn()          )
+    IF_QUERY   (  bool                   queryIsPowerOff()         )
+    IF_QUERY   (  const RadioStation  &  queryCurrentStation()     )
+    IF_QUERY   (  int                    queryStationIdx(const RadioStation &rs)  )
+    IF_QUERY   (  int                    queryCurrentStationIdx()  )
+    IF_QUERY   (  const StationList &    queryStations()           )
+    IF_QUERY   (  const TQString     &    queryPresetFile()         )
+
+    IF_QUERY   (  SoundStreamID          queryCurrentSoundStreamID() );
 
 RECEIVERS:
     virtual void noticeConnectedI    (cmplInterface *, bool pointer_valid);
diff --git a/kradio3/src/include/radiodevice_interfaces.h b/kradio3/src/include/radiodevice_interfaces.h
index 262663e..f1e3438 100644
--- a/kradio3/src/include/radiodevice_interfaces.h
+++ b/kradio3/src/include/radiodevice_interfaces.h
@@ -86,13 +86,13 @@ RECEIVERS:
     IF_RECEIVER(  noticeDescriptionChanged (const TQString &, const IRadioDevice *sender = NULL)         )
     IF_RECEIVER(  noticeCurrentSoundStreamIDChanged(SoundStreamID id, const IRadioDevice *sender = NULL))
 
-TQUERIES:
-    IF_TQUERY   (  bool                   queryIsPowerOn()             )
-    IF_TQUERY   (  bool                   queryIsPowerOff()            )
-    IF_TQUERY   (  const RadioStation  &  queryCurrentStation()        )
-    IF_TQUERY   (  const TQString       &  queryDescription()           )
+QUERIES:
+    IF_QUERY   (  bool                   queryIsPowerOn()             )
+    IF_QUERY   (  bool                   queryIsPowerOff()            )
+    IF_QUERY   (  const RadioStation  &  queryCurrentStation()        )
+    IF_QUERY   (  const TQString       &  queryDescription()           )
 
-    IF_TQUERY   (  SoundStreamID          queryCurrentSoundStreamID()    )
+    IF_QUERY   (  SoundStreamID          queryCurrentSoundStreamID()    )
 
 RECEIVERS:
     virtual void noticeConnectedI    (cmplInterface *, bool pointer_valid);
@@ -168,16 +168,16 @@ RECEIVERS:
     IF_RECEIVER(  noticeStereoChanged(bool  s)                   )
     IF_RECEIVER(  noticeMuted(bool m)                            )
 
-TQUERIES:
-    IF_TQUERY   (  float   queryVolume()                          )
-    IF_TQUERY   (  float   queryTreble()                          )
-    IF_TQUERY   (  float   queryBass()                            )
-    IF_TQUERY   (  float   queryBalance ()                        )
-    IF_TQUERY   (  float   querySignalQuality()                   )
-    IF_TQUERY   (  float   querySignalMinQuality()                )
-    IF_TQUERY   (  bool    queryHasGoodQuality()                  )
-    IF_TQUERY   (  bool    queryIsStereo()                        )
-    IF_TQUERY   (  bool    queryIsMuted()                         )
+QUERIES:
+    IF_QUERY   (  float   queryVolume()                          )
+    IF_QUERY   (  float   queryTreble()                          )
+    IF_QUERY   (  float   queryBass()                            )
+    IF_QUERY   (  float   queryBalance ()                        )
+    IF_QUERY   (  float   querySignalQuality()                   )
+    IF_QUERY   (  float   querySignalMinQuality()                )
+    IF_QUERY   (  bool    queryHasGoodQuality()                  )
+    IF_QUERY   (  bool    queryIsStereo()                        )
+    IF_QUERY   (  bool    queryIsMuted()                         )
 
 RECEIVERS:
     virtual void noticeConnectedI    (cmplInterface *, bool pointer_valid);
@@ -234,11 +234,11 @@ RECEIVERS:
     IF_RECEIVER(  noticeSeekFinished (const RadioStation &s, bool goodQuality)          )
     IF_RECEIVER(  noticeProgress (float f)                            )
 
-TQUERIES:
-    IF_TQUERY  (  bool  queryIsSeekRunning()                           )
-    IF_TQUERY  (  bool  queryIsSeekUpRunning()                         )
-    IF_TQUERY  (  bool  queryIsSeekDownRunning()                       )
-    IF_TQUERY  (  float queryProgress ()                               )
+QUERIES:
+    IF_QUERY  (  bool  queryIsSeekRunning()                           )
+    IF_QUERY  (  bool  queryIsSeekUpRunning()                         )
+    IF_QUERY  (  bool  queryIsSeekDownRunning()                       )
+    IF_QUERY  (  float queryProgress ()                               )
 
 RECEIVERS:
     virtual void noticeConnectedI    (cmplInterface *, bool pointer_valid);
@@ -293,13 +293,13 @@ RECEIVERS:
     IF_RECEIVER(  noticeDeviceMinMaxFrequencyChanged(float min, float max)       )
     IF_RECEIVER(  noticeScanStepChanged(float s)                                 )
 
-TQUERIES:
-    IF_TQUERY   (  float queryFrequency()                                         )
-    IF_TQUERY   (  float queryMinFrequency()                                      )
-    IF_TQUERY   (  float queryMinDeviceFrequency()                                )
-    IF_TQUERY   (  float queryMaxFrequency()                                      )
-    IF_TQUERY   (  float queryMaxDeviceFrequency()                                )
-    IF_TQUERY   (  float queryScanStep()                                          )
+QUERIES:
+    IF_QUERY   (  float queryFrequency()                                         )
+    IF_QUERY   (  float queryMinFrequency()                                      )
+    IF_QUERY   (  float queryMinDeviceFrequency()                                )
+    IF_QUERY   (  float queryMaxFrequency()                                      )
+    IF_QUERY   (  float queryMaxDeviceFrequency()                                )
+    IF_QUERY   (  float queryScanStep()                                          )
 
 RECEIVERS:
     virtual void noticeConnectedI    (cmplInterface *, bool pointer_valid);
@@ -339,8 +339,8 @@ SENDERS:
 RECEIVERS:
     IF_RECEIVER(  noticeURLChanged(const KURL &url)                              )
 
-TQUERIES:
-    IF_TQUERY   (  const KURL &queryURL()                                         )
+QUERIES:
+    IF_QUERY   (  const KURL &queryURL()                                         )
 
 RECEIVERS:
     virtual void noticeConnectedI    (cmplInterface *, bool pointer_valid);
diff --git a/kradio3/src/include/radiodevicepool_interfaces.h b/kradio3/src/include/radiodevicepool_interfaces.h
index dadc400..0e2004c 100644
--- a/kradio3/src/include/radiodevicepool_interfaces.h
+++ b/kradio3/src/include/radiodevicepool_interfaces.h
@@ -61,10 +61,10 @@ RECEIVERS:
 	IF_RECEIVER(  noticeDevicesChanged(const TQPtrList<IRadioDevice> &)    )
 	IF_RECEIVER(  noticeDeviceDescriptionChanged(const TQString &)         )
 
-TQUERIES:
-	IF_TQUERY   (  IRadioDevice                  *queryActiveDevice()      )
-	IF_TQUERY   (  const TQPtrList<IRadioDevice>  &queryDevices()           )
-	IF_TQUERY   (  const TQString                 &queryDeviceDescription() )
+QUERIES:
+	IF_QUERY   (  IRadioDevice                  *queryActiveDevice()      )
+	IF_QUERY   (  const TQPtrList<IRadioDevice>  &queryDevices()           )
+	IF_QUERY   (  const TQString                 &queryDeviceDescription() )
 
 RECEIVERS:
 	virtual void noticeConnectedI    (cmplInterface *, bool /*pointer_valid*/);
diff --git a/kradio3/src/include/soundstreamclient_interfaces.h b/kradio3/src/include/soundstreamclient_interfaces.h
index 3f53ac5..d4e4fe5 100644
--- a/kradio3/src/include/soundstreamclient_interfaces.h
+++ b/kradio3/src/include/soundstreamclient_interfaces.h
@@ -191,9 +191,9 @@ ANSWERS:
 
 // device mixer functions
 
-TQUERIES:
-    IF_TQUERY ( TQPtrList<ISoundStreamClient>   queryPlaybackMixers()     );
-    IF_TQUERY ( TQPtrList<ISoundStreamClient>   queryCaptureMixers()      );
+QUERIES:
+    IF_QUERY ( TQPtrList<ISoundStreamClient>   queryPlaybackMixers()     );
+    IF_QUERY ( TQPtrList<ISoundStreamClient>   queryCaptureMixers()      );
 
 
 ANSWERS:
diff --git a/kradio3/src/include/stationselection_interfaces.h b/kradio3/src/include/stationselection_interfaces.h
index 3d24eee..463eca0 100644
--- a/kradio3/src/include/stationselection_interfaces.h
+++ b/kradio3/src/include/stationselection_interfaces.h
@@ -54,8 +54,8 @@ SENDERS:
 RECEIVERS:
     IF_RECEIVER(    noticeStationSelectionChanged(const TQStringList &sl)    )
 
-TQUERIES:
-    IF_TQUERY   (    const TQStringList & queryStationSelection ()            )
+QUERIES:
+    IF_QUERY   (    const TQStringList & queryStationSelection ()            )
 
 
 RECEIVERS:
diff --git a/kradio3/src/include/timecontrol_interfaces.h b/kradio3/src/include/timecontrol_interfaces.h
index 10b114c..7fc72ac 100644
--- a/kradio3/src/include/timecontrol_interfaces.h
+++ b/kradio3/src/include/timecontrol_interfaces.h
@@ -88,12 +88,12 @@ RECEIVERS:
     IF_RECEIVER(    noticeCountdownSecondsChanged(int n)             )
 
 
-TQUERIES:
-    IF_TQUERY   (    TQDateTime           queryNextAlarmTime()         )
-    IF_TQUERY   (    const Alarm*        queryNextAlarm ()            )
-    IF_TQUERY   (    const AlarmVector & queryAlarms ()               )
-    IF_TQUERY   (    int                 queryCountdownSeconds ()     )
-    IF_TQUERY   (    TQDateTime           queryCountdownEnd ()         )
+QUERIES:
+    IF_QUERY   (    TQDateTime           queryNextAlarmTime()         )
+    IF_QUERY   (    const Alarm*        queryNextAlarm ()            )
+    IF_QUERY   (    const AlarmVector & queryAlarms ()               )
+    IF_QUERY   (    int                 queryCountdownSeconds ()     )
+    IF_QUERY   (    TQDateTime           queryCountdownEnd ()         )
 
 RECEIVERS:
     virtual void noticeConnectedI    (cmplInterface *, bool /*pointer_valid*/);
diff --git a/kradio3/src/radio_interfaces.cpp b/kradio3/src/radio_interfaces.cpp
index f4e68a9..b2bcf74 100644
--- a/kradio3/src/radio_interfaces.cpp
+++ b/kradio3/src/radio_interfaces.cpp
@@ -47,36 +47,36 @@ IF_IMPL_SENDER  (  IRadioClient::sendStations(const StationList &sl),
 IF_IMPL_SENDER  (  IRadioClient::sendPresetFile(const TQString &f),
                    setPresetFile(f)                               );
 
-IF_IMPL_TQUERY   (  bool IRadioClient::queryIsPowerOn(),
+IF_IMPL_QUERY   (  bool IRadioClient::queryIsPowerOn(),
                    isPowerOn(),
                    false                     );
 
-IF_IMPL_TQUERY   (  bool IRadioClient::queryIsPowerOff(),
+IF_IMPL_QUERY   (  bool IRadioClient::queryIsPowerOff(),
                    isPowerOff(),
                    true                      );
 
-IF_IMPL_TQUERY   (  const RadioStation  &  IRadioClient::queryCurrentStation(),
+IF_IMPL_QUERY   (  const RadioStation  &  IRadioClient::queryCurrentStation(),
                    getCurrentStation(),
                    undefinedRadioStation          );
 
-IF_IMPL_TQUERY   (  int IRadioClient::queryCurrentStationIdx(),
+IF_IMPL_QUERY   (  int IRadioClient::queryCurrentStationIdx(),
                    getCurrentStationIdx(),
                    -1 );
 
-IF_IMPL_TQUERY   (  int IRadioClient::queryStationIdx(const RadioStation &rs),
+IF_IMPL_QUERY   (  int IRadioClient::queryStationIdx(const RadioStation &rs),
                    getStationIdx(rs),
                    -1 );
 
-IF_IMPL_TQUERY   (  const StationList &  IRadioClient::queryStations(),
+IF_IMPL_QUERY   (  const StationList &  IRadioClient::queryStations(),
                    getStations(),
                    emptyStationList               );
 
 static TQString emptyString;
-IF_IMPL_TQUERY   (  const TQString &  IRadioClient::queryPresetFile(),
+IF_IMPL_QUERY   (  const TQString &  IRadioClient::queryPresetFile(),
                    getPresetFile(),
                    emptyString               );
 
-IF_IMPL_TQUERY   (  SoundStreamID IRadioClient::queryCurrentSoundStreamID(),
+IF_IMPL_QUERY   (  SoundStreamID IRadioClient::queryCurrentSoundStreamID(),
                    getCurrentSoundStreamID(),
                    SoundStreamID::InvalidID  );
 
diff --git a/kradio3/src/radiodevice_interfaces.cpp b/kradio3/src/radiodevice_interfaces.cpp
index 0a75a8b..a1e7fde 100644
--- a/kradio3/src/radiodevice_interfaces.cpp
+++ b/kradio3/src/radiodevice_interfaces.cpp
@@ -43,22 +43,22 @@ IF_IMPL_SENDER  (  IRadioDeviceClient::sendPowerOff(),
 IF_IMPL_SENDER  (  IRadioDeviceClient::sendActivateStation(const RadioStation &rs),
                    activateStation(rs)                            );
 
-IF_IMPL_TQUERY   (  bool IRadioDeviceClient::queryIsPowerOn(),
+IF_IMPL_QUERY   (  bool IRadioDeviceClient::queryIsPowerOn(),
                    isPowerOn(),
                    false                     );
-IF_IMPL_TQUERY   (  bool IRadioDeviceClient::queryIsPowerOff(),
+IF_IMPL_QUERY   (  bool IRadioDeviceClient::queryIsPowerOff(),
                    isPowerOff(),
                    true                      );
-IF_IMPL_TQUERY   (  const RadioStation  &  IRadioDeviceClient::queryCurrentStation(),
+IF_IMPL_QUERY   (  const RadioStation  &  IRadioDeviceClient::queryCurrentStation(),
                    getCurrentStation(),
                    undefinedRadioStation     );
 
 static TQString IRadioDeviceClient_unknown("unknown");
-IF_IMPL_TQUERY   (  const TQString       &  IRadioDeviceClient::queryDescription(),
+IF_IMPL_QUERY   (  const TQString       &  IRadioDeviceClient::queryDescription(),
                    getDescription(),
                    IRadioDeviceClient_unknown                   );
 
-IF_IMPL_TQUERY   (  SoundStreamID IRadioDeviceClient::queryCurrentSoundStreamID(),
+IF_IMPL_QUERY   (  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_TQUERY   (  float  IRadioSoundClient::queryVolume(),
+IF_IMPL_QUERY   (  float  IRadioSoundClient::queryVolume(),
                    getVolume(),
                    0.0            )
-IF_IMPL_TQUERY   (  float  IRadioSoundClient::queryTreble(),
+IF_IMPL_QUERY   (  float  IRadioSoundClient::queryTreble(),
                    getTreble(),
                    0.0            )
-IF_IMPL_TQUERY   (  float  IRadioSoundClient::queryBass(),
+IF_IMPL_QUERY   (  float  IRadioSoundClient::queryBass(),
                    getBass(),
                    0.0            )
-IF_IMPL_TQUERY   (  float  IRadioSoundClient::queryBalance(),
+IF_IMPL_QUERY   (  float  IRadioSoundClient::queryBalance(),
                    getBalance(),
                    0.0            )
-IF_IMPL_TQUERY   (  float  IRadioSoundClient::querySignalQuality(),
+IF_IMPL_QUERY   (  float  IRadioSoundClient::querySignalQuality(),
                    getSignalQuality(),
                    0.0      )
-IF_IMPL_TQUERY   (  float  IRadioSoundClient::querySignalMinQuality(),
+IF_IMPL_QUERY   (  float  IRadioSoundClient::querySignalMinQuality(),
                    getSignalMinQuality(),
                    0.75     )
-IF_IMPL_TQUERY   (  bool   IRadioSoundClient::queryHasGoodQuality(),
+IF_IMPL_QUERY   (  bool   IRadioSoundClient::queryHasGoodQuality(),
                    hasGoodQuality(),
                    false              )
-IF_IMPL_TQUERY   (  bool   IRadioSoundClient::queryIsStereo(),
+IF_IMPL_QUERY   (  bool   IRadioSoundClient::queryIsStereo(),
                    isStereo(),
                    false              )
-IF_IMPL_TQUERY   (  bool   IRadioSoundClient::queryIsMuted(),
+IF_IMPL_QUERY   (  bool   IRadioSoundClient::queryIsMuted(),
                    isMuted(),
                    true               )
 
@@ -207,16 +207,16 @@ IF_IMPL_SENDER  (  ISeekRadioClient::sendStartSeekDown(),
 IF_IMPL_SENDER  (  ISeekRadioClient::sendStopSeek(),
                    stopSeek()                                     );
 
-IF_IMPL_TQUERY   (  bool ISeekRadioClient::queryIsSeekRunning(),
+IF_IMPL_QUERY   (  bool ISeekRadioClient::queryIsSeekRunning(),
                    isSeekRunning(),
                    false                                          );
-IF_IMPL_TQUERY   (  bool ISeekRadioClient::queryIsSeekUpRunning(),
+IF_IMPL_QUERY   (  bool ISeekRadioClient::queryIsSeekUpRunning(),
                    isSeekUpRunning(),
                    false                                          );
-IF_IMPL_TQUERY   (  bool ISeekRadioClient::queryIsSeekDownRunning(),
+IF_IMPL_QUERY   (  bool ISeekRadioClient::queryIsSeekDownRunning(),
                    isSeekDownRunning(),
                    false                                          );
-IF_IMPL_TQUERY   (  float ISeekRadioClient::queryProgress(),
+IF_IMPL_QUERY   (  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_TQUERY   (  float IFrequencyRadioClient::queryFrequency(),
+IF_IMPL_QUERY   (  float IFrequencyRadioClient::queryFrequency(),
                    getFrequency(),
                    0                                              )
-IF_IMPL_TQUERY   (  float IFrequencyRadioClient::queryMinFrequency(),
+IF_IMPL_QUERY   (  float IFrequencyRadioClient::queryMinFrequency(),
                    getMinFrequency(),
                    0                                              )
-IF_IMPL_TQUERY   (  float IFrequencyRadioClient::queryMinDeviceFrequency(),
+IF_IMPL_QUERY   (  float IFrequencyRadioClient::queryMinDeviceFrequency(),
                    getMinDeviceFrequency(),
                    0                                              )
-IF_IMPL_TQUERY   (  float IFrequencyRadioClient::queryMaxFrequency(),
+IF_IMPL_QUERY   (  float IFrequencyRadioClient::queryMaxFrequency(),
                    getMaxFrequency(),
                    0                                              )
-IF_IMPL_TQUERY   (  float IFrequencyRadioClient::queryMaxDeviceFrequency(),
+IF_IMPL_QUERY   (  float IFrequencyRadioClient::queryMaxDeviceFrequency(),
                    getMaxDeviceFrequency(),
                    0                                              )
-IF_IMPL_TQUERY   (  float IFrequencyRadioClient::queryScanStep(),
+IF_IMPL_QUERY   (  float IFrequencyRadioClient::queryScanStep(),
                    getScanStep(),
                    0.05                                           )
 
@@ -312,7 +312,7 @@ IF_IMPL_SENDER  (  IInternetRadioClient::sendURL(const KURL &url),
 
 static KURL emptyURL;
 
-IF_IMPL_TQUERY   (  const KURL &IInternetRadioClient::queryURL(),
+IF_IMPL_QUERY   (  const KURL &IInternetRadioClient::queryURL(),
                    getURL(),
                    emptyURL                                       )
 
diff --git a/kradio3/src/radiodevicepool_interfaces.cpp b/kradio3/src/radiodevicepool_interfaces.cpp
index 6b6fbe1..1f92e9d 100644
--- a/kradio3/src/radiodevicepool_interfaces.cpp
+++ b/kradio3/src/radiodevicepool_interfaces.cpp
@@ -33,17 +33,17 @@ IF_IMPL_SENDER  (  IRadioDevicePool::notifyDeviceDescriptionChanged(const TQStri
 IF_IMPL_SENDER  (  IRadioDevicePoolClient::sendActiveDevice(IRadioDevice *rd, bool keepPower ),
                    setActiveDevice(rd, keepPower)     )
 
-IF_IMPL_TQUERY   (  IRadioDevice *IRadioDevicePoolClient::queryActiveDevice(),
+IF_IMPL_QUERY   (  IRadioDevice *IRadioDevicePoolClient::queryActiveDevice(),
                    getActiveDevice(),
                    NULL                               )
 
 static const TQPtrList<IRadioDevice> IRadioDevicePoolClient_emptyList;
-IF_IMPL_TQUERY   (  const TQPtrList<IRadioDevice> &IRadioDevicePoolClient::queryDevices(),
+IF_IMPL_QUERY   (  const TQPtrList<IRadioDevice> &IRadioDevicePoolClient::queryDevices(),
                    getDevices(),
                    IRadioDevicePoolClient_emptyList                          )
 
 static TQString IRadioDevicePoolClient_unknown("unknown");
-IF_IMPL_TQUERY   (  const TQString &IRadioDevicePoolClient::queryDeviceDescription(),
+IF_IMPL_QUERY   (  const TQString &IRadioDevicePoolClient::queryDeviceDescription(),
                    getDeviceDescription(),
                    IRadioDevicePoolClient_unknown                            )
 
diff --git a/kradio3/src/soundstreamclient_interfaces.cpp b/kradio3/src/soundstreamclient_interfaces.cpp
index 943276c..fd4822c 100644
--- a/kradio3/src/soundstreamclient_interfaces.cpp
+++ b/kradio3/src/soundstreamclient_interfaces.cpp
@@ -417,10 +417,10 @@ void ISoundStreamClient::noticeDisconnectedSoundClient(thisInterface */*i*/, boo
 }
 
 static const TQPtrList<ISoundStreamClient> emptyClientList;
-IF_IMPL_TQUERY   (  TQPtrList<ISoundStreamClient> ISoundStreamClient::queryPlaybackMixers(),
+IF_IMPL_QUERY   (  TQPtrList<ISoundStreamClient> ISoundStreamClient::queryPlaybackMixers(),
                    getPlaybackMixers(),
                    emptyClientList     );
 
-IF_IMPL_TQUERY   (  TQPtrList<ISoundStreamClient> ISoundStreamClient::queryCaptureMixers(),
+IF_IMPL_QUERY   (  TQPtrList<ISoundStreamClient> ISoundStreamClient::queryCaptureMixers(),
                    getPlaybackMixers(),
                    emptyClientList     );
diff --git a/kradio3/src/stationselection_interfaces.cpp b/kradio3/src/stationselection_interfaces.cpp
index 4cdc84d..89d0c3b 100644
--- a/kradio3/src/stationselection_interfaces.cpp
+++ b/kradio3/src/stationselection_interfaces.cpp
@@ -28,7 +28,7 @@ IF_IMPL_SENDER  (   IStationSelectionClient::sendStationSelection(const TQString
 
 static TQStringList IStationSelectionClient_emptyList;
 
-IF_IMPL_TQUERY   (   const TQStringList & IStationSelectionClient::queryStationSelection(),
+IF_IMPL_QUERY   (   const TQStringList & IStationSelectionClient::queryStationSelection(),
                     getStationSelection(),
                     IStationSelectionClient_emptyList
                 )
diff --git a/kradio3/src/timecontrol_interfaces.cpp b/kradio3/src/timecontrol_interfaces.cpp
index c4f42b5..1ba4e57 100644
--- a/kradio3/src/timecontrol_interfaces.cpp
+++ b/kradio3/src/timecontrol_interfaces.cpp
@@ -57,23 +57,23 @@ IF_IMPL_SENDER  (  ITimeControlClient::sendStopCountdown(),
                    stopCountdown()                                           )
 
 
-IF_IMPL_TQUERY   (  TQDateTime      ITimeControlClient::queryNextAlarmTime (),
+IF_IMPL_QUERY   (  TQDateTime      ITimeControlClient::queryNextAlarmTime (),
                    getNextAlarmTime(),
                    TQDateTime()                                               )
 
-IF_IMPL_TQUERY   (  const Alarm *  ITimeControlClient::queryNextAlarm (),
+IF_IMPL_QUERY   (  const Alarm *  ITimeControlClient::queryNextAlarm (),
                    getNextAlarm(),
                    NULL                                                      )
                    
-IF_IMPL_TQUERY   (  const AlarmVector &ITimeControlClient::queryAlarms (),
+IF_IMPL_QUERY   (  const AlarmVector &ITimeControlClient::queryAlarms (),
                    getAlarms(),
                    emptyAlarms                                               )
 
-IF_IMPL_TQUERY   (  int            ITimeControlClient::queryCountdownSeconds (),
+IF_IMPL_QUERY   (  int            ITimeControlClient::queryCountdownSeconds (),
                    getCountdownSeconds(),
                    30*60                                                     )
 
-IF_IMPL_TQUERY   (  TQDateTime      ITimeControlClient::queryCountdownEnd (),
+IF_IMPL_QUERY   (  TQDateTime      ITimeControlClient::queryCountdownEnd (),
                    getCountdownEnd(),
                    TQDateTime()                                               )