summaryrefslogtreecommitdiffstats
path: root/kradio3/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'kradio3/src/include')
-rw-r--r--kradio3/src/include/interfaces.h24
-rw-r--r--kradio3/src/include/radio_interfaces.h20
-rw-r--r--kradio3/src/include/radiodevice_interfaces.h60
-rw-r--r--kradio3/src/include/radiodevicepool_interfaces.h8
-rw-r--r--kradio3/src/include/soundstreamclient_interfaces.h6
-rw-r--r--kradio3/src/include/stationselection_interfaces.h4
-rw-r--r--kradio3/src/include/timecontrol_interfaces.h12
7 files changed, 67 insertions, 67 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*/);