diff options
| author | Darrell Anderson <[email protected]> | 2012-04-13 02:31:15 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-04-13 02:31:15 -0500 |
| commit | 7f4c75f7aca7a02131aafb294623abf0dfaa3faf (patch) | |
| tree | 810f22cea0773d25143286b204022af8ce91452a | |
| parent | dd53ab754dde65cecd20bb4605413a5e5489217b (diff) | |
| download | tderadio-7f4c75f7aca7a02131aafb294623abf0dfaa3faf.tar.gz tderadio-7f4c75f7aca7a02131aafb294623abf0dfaa3faf.zip | |
Fix inadvertent "TQ" changes.
27 files changed, 191 insertions, 191 deletions
diff --git a/kradio3/plugins/gui-quickbar/quickbar-configuration.h b/kradio3/plugins/gui-quickbar/quickbar-configuration.h index 1380bc8..e431921 100644 --- a/kradio3/plugins/gui-quickbar/quickbar-configuration.h +++ b/kradio3/plugins/gui-quickbar/quickbar-configuration.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KRADIO_TQUICKBAR_CONFIGURATION_H -#define KRADIO_TQUICKBAR_CONFIGURATION_H +#ifndef KRADIO_QUICKBAR_CONFIGURATION_H +#define KRADIO_QUICKBAR_CONFIGURATION_H #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/kradio3/plugins/gui-quickbar/quickbar.h b/kradio3/plugins/gui-quickbar/quickbar.h index 95d2ea5..54a084e 100644 --- a/kradio3/plugins/gui-quickbar/quickbar.h +++ b/kradio3/plugins/gui-quickbar/quickbar.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KRADIO_TQUICKBAR_H -#define KRADIO_TQUICKBAR_H +#ifndef KRADIO_QUICKBAR_H +#define KRADIO_QUICKBAR_H #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/kradio3/plugins/gui-standard-display/displaycfg_interfaces.cpp b/kradio3/plugins/gui-standard-display/displaycfg_interfaces.cpp index 0e3864e..67e5aba 100644 --- a/kradio3/plugins/gui-standard-display/displaycfg_interfaces.cpp +++ b/kradio3/plugins/gui-standard-display/displaycfg_interfaces.cpp @@ -34,22 +34,22 @@ IF_IMPL_SENDER ( IDisplayCfgClient::sendDisplayFont(const TQFont &f), setDisplayFont(f) ) const TQColor default_display_active_color = TQColor(20, 244, 20); -IF_IMPL_TQUERY ( const TQColor &IDisplayCfgClient::queryDisplayActiveColor(), +IF_IMPL_QUERY ( const TQColor &IDisplayCfgClient::queryDisplayActiveColor(), getDisplayActiveColor(), default_display_active_color ) const TQColor default_display_inactive_color = TQColor(10, 117, 10).light(75); -IF_IMPL_TQUERY ( const TQColor &IDisplayCfgClient::queryDisplayInactiveColor(), +IF_IMPL_QUERY ( const TQColor &IDisplayCfgClient::queryDisplayInactiveColor(), getDisplayInactiveColor(), default_display_inactive_color ) const TQColor default_display_bkgnd_color = TQColor(10, 117, 10); -IF_IMPL_TQUERY ( const TQColor &IDisplayCfgClient::queryDisplayBkgndColor(), +IF_IMPL_QUERY ( const TQColor &IDisplayCfgClient::queryDisplayBkgndColor(), getDisplayBkgndColor(), default_display_bkgnd_color ) const TQFont default_display_font = TQFont("Helvetica"); -IF_IMPL_TQUERY ( const TQFont &IDisplayCfgClient::queryDisplayFont(), +IF_IMPL_QUERY ( const TQFont &IDisplayCfgClient::queryDisplayFont(), getDisplayFont(), default_display_font ) diff --git a/kradio3/plugins/gui-standard-display/displaycfg_interfaces.h b/kradio3/plugins/gui-standard-display/displaycfg_interfaces.h index 49514d5..d458dc9 100644 --- a/kradio3/plugins/gui-standard-display/displaycfg_interfaces.h +++ b/kradio3/plugins/gui-standard-display/displaycfg_interfaces.h @@ -67,11 +67,11 @@ RECEIVERS: IF_RECEIVER( noticeDisplayColorsChanged(const TQColor &activeColor, const TQColor &inactiveColor, const TQColor &bkgnd) ) IF_RECEIVER( noticeDisplayFontChanged(const TQFont &f) ) -TQUERIES: - IF_TQUERY ( const TQColor &queryDisplayActiveColor() ) - IF_TQUERY ( const TQColor &queryDisplayInactiveColor() ) - IF_TQUERY ( const TQColor &queryDisplayBkgndColor() ) - IF_TQUERY ( const TQFont &queryDisplayFont() ) +QUERIES: + IF_QUERY ( const TQColor &queryDisplayActiveColor() ) + IF_QUERY ( const TQColor &queryDisplayInactiveColor() ) + IF_QUERY ( const TQColor &queryDisplayBkgndColor() ) + IF_QUERY ( const TQFont &queryDisplayFont() ) RECEIVERS: virtual void noticeConnectedI (cmplInterface *, bool pointer_valid); diff --git a/kradio3/plugins/lirc/lirc-configuration.cpp b/kradio3/plugins/lirc/lirc-configuration.cpp index c82007e..a51625b 100644 --- a/kradio3/plugins/lirc/lirc-configuration.cpp +++ b/kradio3/plugins/lirc/lirc-configuration.cpp @@ -53,7 +53,7 @@ LIRCConfiguration::LIRCConfiguration (TQWidget *parent, LircSupport *dev) m_descriptions[LIRC_SEARCH_NEXT] = i18n("Search Next Channel"); m_descriptions[LIRC_SEARCH_PREV] = i18n("Search Previous Channel"); m_descriptions[LIRC_SLEEP] = i18n("Enable Sleep Countdown"); - m_descriptions[LIRC_APPLICATION_TQUIT] = i18n("Quit KRadio"); + m_descriptions[LIRC_APPLICATION_QUIT] = i18n("Quit KRadio"); int k = 0; m_order[k++] = LIRC_DIGIT_0; @@ -78,7 +78,7 @@ LIRCConfiguration::LIRCConfiguration (TQWidget *parent, LircSupport *dev) m_order[k++] = LIRC_SEARCH_NEXT; m_order[k++] = LIRC_SEARCH_PREV; m_order[k++] = LIRC_SLEEP; - m_order[k++] = LIRC_APPLICATION_TQUIT; + m_order[k++] = LIRC_APPLICATION_QUIT; m_ActionList->setSorting(-1); m_ActionList->setColumnWidthMode(0, TQListView::Maximum); diff --git a/kradio3/plugins/lirc/lircsupport.cpp b/kradio3/plugins/lirc/lircsupport.cpp index 5b81d8c..676fc7d 100644 --- a/kradio3/plugins/lirc/lircsupport.cpp +++ b/kradio3/plugins/lirc/lircsupport.cpp @@ -238,7 +238,7 @@ void LircSupport::saveState (KConfig *c) const c->writeEntry("LIRC_SEARCH_NEXT", m_Actions[LIRC_SEARCH_NEXT]); c->writeEntry("LIRC_SEARCH_PREV", m_Actions[LIRC_SEARCH_PREV]); c->writeEntry("LIRC_SLEEP", m_Actions[LIRC_SLEEP]); - c->writeEntry("LIRC_APPLICATION_TQUIT", m_Actions[LIRC_APPLICATION_TQUIT]); + c->writeEntry("LIRC_APPLICATION_QUIT", m_Actions[LIRC_APPLICATION_QUIT]); c->writeEntry("ALT_LIRC_DIGIT_0", m_AlternativeActions[LIRC_DIGIT_0]); @@ -263,7 +263,7 @@ void LircSupport::saveState (KConfig *c) const c->writeEntry("ALT_LIRC_SEARCH_NEXT", m_AlternativeActions[LIRC_SEARCH_NEXT]); c->writeEntry("ALT_LIRC_SEARCH_PREV", m_AlternativeActions[LIRC_SEARCH_PREV]); c->writeEntry("ALT_LIRC_SLEEP", m_AlternativeActions[LIRC_SLEEP]); - c->writeEntry("ALT_LIRC_APPLICATION_TQUIT", m_AlternativeActions[LIRC_APPLICATION_TQUIT]); + c->writeEntry("ALT_LIRC_APPLICATION_QUIT", m_AlternativeActions[LIRC_APPLICATION_QUIT]); } void LircSupport::restoreState (KConfig *c) @@ -290,7 +290,7 @@ void LircSupport::restoreState (KConfig *c) m_Actions[LIRC_SEARCH_NEXT] = c->readEntry("LIRC_SEARCH_NEXT", "SOURCE"); m_Actions[LIRC_SEARCH_PREV] = c->readEntry("LIRC_SEARCH_PREV", "MUTE"); m_Actions[LIRC_SLEEP] = c->readEntry("LIRC_SLEEP", "MINIMIZE"); - m_Actions[LIRC_APPLICATION_TQUIT] = c->readEntry("LIRC_APPLICATION_TQUIT", ""); + m_Actions[LIRC_APPLICATION_QUIT] = c->readEntry("LIRC_APPLICATION_QUIT", ""); m_AlternativeActions[LIRC_DIGIT_0] = c->readEntry("ALT_LIRC_DIGIT_0", ""); @@ -315,7 +315,7 @@ void LircSupport::restoreState (KConfig *c) m_AlternativeActions[LIRC_SEARCH_NEXT] = c->readEntry("ALT_LIRC_SEARCH_NEXT", ""); m_AlternativeActions[LIRC_SEARCH_PREV] = c->readEntry("ALT_LIRC_SEARCH_PREV", ""); m_AlternativeActions[LIRC_SLEEP] = c->readEntry("ALT_LIRC_SLEEP", ""); - m_AlternativeActions[LIRC_APPLICATION_TQUIT] = c->readEntry("ALT_LIRC_APPLICATION_TQUIT", ""); + m_AlternativeActions[LIRC_APPLICATION_QUIT] = c->readEntry("ALT_LIRC_APPLICATION_QUIT", ""); emit sigUpdateConfig(); } @@ -519,7 +519,7 @@ bool LircSupport::checkActions(const TQString &lirc_string, int repeat_counter, sendStartCountdown(); } break; - case LIRC_APPLICATION_TQUIT : + case LIRC_APPLICATION_QUIT : retval = true; kapp->quit(); break; diff --git a/kradio3/plugins/lirc/lircsupport.h b/kradio3/plugins/lirc/lircsupport.h index 85c9c29..47aeb9d 100644 --- a/kradio3/plugins/lirc/lircsupport.h +++ b/kradio3/plugins/lirc/lircsupport.h @@ -53,7 +53,7 @@ enum LIRC_Actions { LIRC_SEARCH_NEXT, LIRC_SEARCH_PREV, LIRC_SLEEP, - LIRC_APPLICATION_TQUIT + LIRC_APPLICATION_QUIT }; diff --git a/kradio3/plugins/radio/radio.h b/kradio3/plugins/radio/radio.h index d125eee..2ab5ebf 100644 --- a/kradio3/plugins/radio/radio.h +++ b/kradio3/plugins/radio/radio.h @@ -125,12 +125,12 @@ SENDERS: IF_SENDER ( sendPowerOff() ) IF_SENDER ( sendActivateStation (const RadioStation &rs) ) -TQUERIES: - IF_TQUERY ( bool queryIsPowerOn() ) - IF_TQUERY ( bool queryIsPowerOff() ) - IF_TQUERY ( const RadioStation & queryCurrentStation() ) - IF_TQUERY ( const TQString & queryDescription() ) - IF_TQUERY ( SoundStreamID queryCurrentSoundStreamID() ) +QUERIES: + IF_QUERY ( bool queryIsPowerOn() ) + IF_QUERY ( bool queryIsPowerOff() ) + IF_QUERY ( const RadioStation & queryCurrentStation() ) + IF_QUERY ( const TQString & queryDescription() ) + IF_QUERY ( SoundStreamID queryCurrentSoundStreamID() ) RECEIVERS: virtual bool noticePowerChanged (bool on, const IRadioDevice *sender = NULL); diff --git a/kradio3/plugins/recording/reccfg_interfaces.cpp b/kradio3/plugins/recording/reccfg_interfaces.cpp index 6876f86..9cbc9e6 100644 --- a/kradio3/plugins/recording/reccfg_interfaces.cpp +++ b/kradio3/plugins/recording/reccfg_interfaces.cpp @@ -72,45 +72,45 @@ IF_IMPL_SENDER ( IRecCfgClient::sendRecordingConfig(const RecordingConfig &cf setRecordingConfig(cfg) ); -IF_IMPL_TQUERY ( void IRecCfgClient::queryEncoderBuffer(size_t &BufferSize, size_t &BufferCount), +IF_IMPL_QUERY ( void IRecCfgClient::queryEncoderBuffer(size_t &BufferSize, size_t &BufferCount), getEncoderBuffer(BufferSize, BufferCount), ); static SoundFormat defaultSoundFormat; -IF_IMPL_TQUERY ( const SoundFormat &IRecCfgClient::querySoundFormat (), +IF_IMPL_QUERY ( const SoundFormat &IRecCfgClient::querySoundFormat (), getSoundFormat(), defaultSoundFormat ); -IF_IMPL_TQUERY ( int IRecCfgClient::queryMP3Quality (), +IF_IMPL_QUERY ( int IRecCfgClient::queryMP3Quality (), getMP3Quality(), 7 ); -IF_IMPL_TQUERY ( float IRecCfgClient::queryOggQuality (), +IF_IMPL_QUERY ( float IRecCfgClient::queryOggQuality (), getOggQuality(), 7 ); static TQString defaultRecDir("/tmp"); -IF_IMPL_TQUERY ( const TQString &IRecCfgClient::queryRecordingDirectory(), +IF_IMPL_QUERY ( const TQString &IRecCfgClient::queryRecordingDirectory(), getRecordingDirectory(), defaultRecDir ); -IF_IMPL_TQUERY ( RecordingConfig::OutputFormat IRecCfgClient::queryOutputFormat(), +IF_IMPL_QUERY ( RecordingConfig::OutputFormat IRecCfgClient::queryOutputFormat(), getOutputFormat(), RecordingConfig::outputWAV ); -IF_IMPL_TQUERY ( bool IRecCfgClient::queryPreRecording(int &seconds), +IF_IMPL_QUERY ( bool IRecCfgClient::queryPreRecording(int &seconds), getPreRecording(seconds), false ); static RecordingConfig defaultRecConfig; -IF_IMPL_TQUERY ( const RecordingConfig &IRecCfgClient::queryRecordingConfig(), +IF_IMPL_QUERY ( const RecordingConfig &IRecCfgClient::queryRecordingConfig(), getRecordingConfig(), defaultRecConfig ); diff --git a/kradio3/plugins/recording/reccfg_interfaces.h b/kradio3/plugins/recording/reccfg_interfaces.h index e733921..937ca42 100644 --- a/kradio3/plugins/recording/reccfg_interfaces.h +++ b/kradio3/plugins/recording/reccfg_interfaces.h @@ -84,15 +84,15 @@ RECEIVERS: IF_RECEIVER( noticePreRecordingChanged (bool enable, int seconds) ) IF_RECEIVER( noticeRecordingConfigChanged (const RecordingConfig &cfg) ) -TQUERIES: - IF_TQUERY ( void queryEncoderBuffer(size_t &BufferSize, size_t &BufferCount) ) - IF_TQUERY ( const SoundFormat &querySoundFormat () ) - IF_TQUERY ( int queryMP3Quality () ) - IF_TQUERY ( float queryOggQuality () ) - IF_TQUERY ( const TQString &queryRecordingDirectory() ) - IF_TQUERY ( RecordingConfig::OutputFormat queryOutputFormat() ) - IF_TQUERY ( bool queryPreRecording(int &seconds) ) - IF_TQUERY ( const RecordingConfig &queryRecordingConfig() ) +QUERIES: + IF_QUERY ( void queryEncoderBuffer(size_t &BufferSize, size_t &BufferCount) ) + IF_QUERY ( const SoundFormat &querySoundFormat () ) + IF_QUERY ( int queryMP3Quality () ) + IF_QUERY ( float queryOggQuality () ) + IF_QUERY ( const TQString &queryRecordingDirectory() ) + IF_QUERY ( RecordingConfig::OutputFormat queryOutputFormat() ) + IF_QUERY ( bool queryPreRecording(int &seconds) ) + IF_QUERY ( const RecordingConfig &queryRecordingConfig() ) RECEIVERS: virtual void noticeConnectedI (cmplInterface *, bool /*pointer_valid*/); diff --git a/kradio3/plugins/v4lradio/linux/videodev2.h b/kradio3/plugins/v4lradio/linux/videodev2.h index 5977820..a26f74a 100644 --- a/kradio3/plugins/v4lradio/linux/videodev2.h +++ b/kradio3/plugins/v4lradio/linux/videodev2.h @@ -391,7 +391,7 @@ struct v4l2_buffer /* Flags for 'flags' field */ #define V4L2_BUF_FLAG_MAPPED 0x0001 /* Buffer is mapped (flag) */ -#define V4L2_BUF_FLAG_TQUEUED 0x0002 /* Buffer is queued for processing */ +#define V4L2_BUF_FLAG_QUEUED 0x0002 /* Buffer is queued for processing */ #define V4L2_BUF_FLAG_DONE 0x0004 /* Buffer is ready */ #define V4L2_BUF_FLAG_KEYFRAME 0x0008 /* Image is a keyframe (I-frame) */ #define V4L2_BUF_FLAG_PFRAME 0x0010 /* Image is a P-frame */ @@ -450,7 +450,7 @@ struct v4l2_captureparm __u32 reserved[4]; }; /* Flags for 'capability' and 'capturemode' fields */ -#define V4L2_MODE_HIGHTQUALITY 0x0001 /* High quality imaging mode */ +#define V4L2_MODE_HIGHQUALITY 0x0001 /* High quality imaging mode */ #define V4L2_CAP_TIMEPERFRAME 0x1000 /* timeperframe field is supported */ struct v4l2_outputparm @@ -623,7 +623,7 @@ struct v4l2_control __s32 value; }; -/* Used in the VIDIOC_TQUERYCTRL ioctl for querying controls */ +/* Used in the VIDIOC_QUERYCTRL ioctl for querying controls */ struct v4l2_queryctrl { __u32 id; @@ -637,7 +637,7 @@ struct v4l2_queryctrl __u32 reserved[2]; }; -/* Used in the VIDIOC_TQUERYMENU ioctl for querying menu items */ +/* Used in the VIDIOC_QUERYMENU ioctl for querying menu items */ struct v4l2_querymenu { __u32 id; @@ -828,7 +828,7 @@ struct v4l2_streamparm * I O C T L C O D E S F O R V I D E O D E V I C E S * */ -#define VIDIOC_TQUERYCAP _IOR ('V', 0, struct v4l2_capability) +#define VIDIOC_QUERYCAP _IOR ('V', 0, struct v4l2_capability) #define VIDIOC_RESERVED _IO ('V', 1) #define VIDIOC_ENUM_FMT _IOWR ('V', 2, struct v4l2_fmtdesc) #define VIDIOC_G_FMT _IOWR ('V', 4, struct v4l2_format) @@ -838,7 +838,7 @@ struct v4l2_streamparm #define VIDIOC_S_COMP _IOW ('V', 7, struct v4l2_compression) #endif #define VIDIOC_RETQBUFS _IOWR ('V', 8, struct v4l2_requestbuffers) -#define VIDIOC_TQUERYBUF _IOWR ('V', 9, struct v4l2_buffer) +#define VIDIOC_QUERYBUF _IOWR ('V', 9, struct v4l2_buffer) #define VIDIOC_G_FBUF _IOR ('V', 10, struct v4l2_framebuffer) #define VIDIOC_S_FBUF _IOW ('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW ('V', 14, int) @@ -858,8 +858,8 @@ struct v4l2_streamparm #define VIDIOC_S_TUNER _IOW ('V', 30, struct v4l2_tuner) #define VIDIOC_G_AUDIO _IOR ('V', 33, struct v4l2_audio) #define VIDIOC_S_AUDIO _IOW ('V', 34, struct v4l2_audio) -#define VIDIOC_TQUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) -#define VIDIOC_TQUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) +#define VIDIOC_QUERYCTRL _IOWR ('V', 36, struct v4l2_queryctrl) +#define VIDIOC_QUERYMENU _IOWR ('V', 37, struct v4l2_querymenu) #define VIDIOC_G_INPUT _IOR ('V', 38, int) #define VIDIOC_S_INPUT _IOWR ('V', 39, int) #define VIDIOC_G_OUTPUT _IOR ('V', 46, int) @@ -876,7 +876,7 @@ struct v4l2_streamparm #define VIDIOC_S_CROP _IOW ('V', 60, struct v4l2_crop) #define VIDIOC_G_JPEGCOMP _IOR ('V', 61, struct v4l2_jpegcompression) #define VIDIOC_S_JPEGCOMP _IOW ('V', 62, struct v4l2_jpegcompression) -#define VIDIOC_TQUERYSTD _IOR ('V', 63, v4l2_std_id) +#define VIDIOC_QUERYSTD _IOR ('V', 63, v4l2_std_id) #define VIDIOC_TRY_FMT _IOWR ('V', 64, struct v4l2_format) #define VIDIOC_ENUMAUDIO _IOWR ('V', 65, struct v4l2_audio) #define VIDIOC_ENUMAUDOUT _IOWR ('V', 66, struct v4l2_audioout) diff --git a/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp b/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp index ea0d110..9ef14aa 100644 --- a/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp +++ b/kradio3/plugins/v4lradio/v4lcfg_interfaces.cpp @@ -119,48 +119,48 @@ IF_IMPL_SENDER ( IV4LCfgClient::sendVolumeZeroOnPowerOff(bool a), static TQString defaultRDev("/dev/radio"); // static TQString defaultMDev("/dev/mixer"); -IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryRadioDevice (), +IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryRadioDevice (), getRadioDevice(), defaultRDev ) -IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerID (), +IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerID (), getPlaybackMixerID(), TQString() ) -IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryCaptureMixerID (), +IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryCaptureMixerID (), getCaptureMixerID(), TQString() ) static const TQString channel_line("Line"); -IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerChannel(), +IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryPlaybackMixerChannel(), getPlaybackMixerChannel(), channel_line ) -IF_IMPL_TQUERY ( const TQString &IV4LCfgClient::queryCaptureMixerChannel(), +IF_IMPL_QUERY ( const TQString &IV4LCfgClient::queryCaptureMixerChannel(), getCaptureMixerChannel(), channel_line ) -IF_IMPL_TQUERY ( float IV4LCfgClient::queryDeviceVolume (), +IF_IMPL_QUERY ( float IV4LCfgClient::queryDeviceVolume (), getDeviceVolume(), 0.0 ) -IF_IMPL_TQUERY ( V4LCaps IV4LCfgClient::queryCapabilities(TQString dev), +IF_IMPL_QUERY ( V4LCaps IV4LCfgClient::queryCapabilities(TQString dev), getCapabilities(dev), V4LCaps() ) -IF_IMPL_TQUERY ( bool IV4LCfgClient::queryActivePlayback(), +IF_IMPL_QUERY ( bool IV4LCfgClient::queryActivePlayback(), getActivePlayback(), false ) -IF_IMPL_TQUERY ( bool IV4LCfgClient::queryMuteOnPowerOff(), +IF_IMPL_QUERY ( bool IV4LCfgClient::queryMuteOnPowerOff(), getMuteOnPowerOff(), false ) -IF_IMPL_TQUERY ( bool IV4LCfgClient::queryVolumeZeroOnPowerOff(), +IF_IMPL_QUERY ( bool IV4LCfgClient::queryVolumeZeroOnPowerOff(), getVolumeZeroOnPowerOff(), false ) diff --git a/kradio3/plugins/v4lradio/v4lcfg_interfaces.h b/kradio3/plugins/v4lradio/v4lcfg_interfaces.h index 2a099e1..d9c2a24 100644 --- a/kradio3/plugins/v4lradio/v4lcfg_interfaces.h +++ b/kradio3/plugins/v4lradio/v4lcfg_interfaces.h @@ -131,17 +131,17 @@ RECEIVERS: IF_RECEIVER( noticeMuteOnPowerOffChanged(bool a) ) IF_RECEIVER( noticeVolumeZeroOnPowerOffChanged(bool a) ) -TQUERIES: - IF_TQUERY ( const TQString &queryRadioDevice () ) - IF_TQUERY ( const TQString &queryPlaybackMixerID () ) - IF_TQUERY ( const TQString &queryCaptureMixerID () ) - IF_TQUERY ( const TQString &queryPlaybackMixerChannel() ) - IF_TQUERY ( const TQString &queryCaptureMixerChannel() ) - IF_TQUERY ( float queryDeviceVolume() ) - IF_TQUERY ( V4LCaps queryCapabilities(TQString dev = TQString()) ) - IF_TQUERY ( bool queryActivePlayback() ) - IF_TQUERY ( bool queryMuteOnPowerOff() ) - IF_TQUERY ( bool queryVolumeZeroOnPowerOff() ) +QUERIES: + IF_QUERY ( const TQString &queryRadioDevice () ) + IF_QUERY ( const TQString &queryPlaybackMixerID () ) + IF_QUERY ( const TQString &queryCaptureMixerID () ) + IF_QUERY ( const TQString &queryPlaybackMixerChannel() ) + IF_QUERY ( const TQString &queryCaptureMixerChannel() ) + IF_QUERY ( float queryDeviceVolume() ) + IF_QUERY ( V4LCaps queryCapabilities(TQString dev = TQString()) ) + IF_QUERY ( bool queryActivePlayback() ) + IF_QUERY ( bool queryMuteOnPowerOff() ) + IF_QUERY ( bool queryVolumeZeroOnPowerOff() ) RECEIVERS: virtual void noticeConnectedI (cmplInterface *, bool /*pointer_valid*/); diff --git a/kradio3/plugins/v4lradio/v4lradio.cpp b/kradio3/plugins/v4lradio/v4lradio.cpp index e149ccf..a02dcfe 100644 --- a/kradio3/plugins/v4lradio/v4lradio.cpp +++ b/kradio3/plugins/v4lradio/v4lradio.cpp @@ -1226,7 +1226,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const #ifdef HAVE_V4L2 v4l2_capability caps2; - r = ioctl(fd, VIDIOC_TQUERYCAP, &caps2); + r = ioctl(fd, VIDIOC_QUERYCAP, &caps2); if (r == 0) { c.version = 2; @@ -1247,13 +1247,13 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const c.unsetBalance(); ctrl.id = V4L2_CID_AUDIO_MUTE; - if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) + if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) c.hasMute = !(ctrl.flags & V4L2_CTRL_FLAG_DISABLED); else logError(i18n("V4L2: Querying mute control failed")); ctrl.id = V4L2_CID_AUDIO_VOLUME; - if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setVolume(ctrl.minimum, ctrl.maximum); } else { @@ -1261,7 +1261,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const } ctrl.id = V4L2_CID_AUDIO_TREBLE; - if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setTreble(ctrl.minimum, ctrl.maximum); } else { @@ -1269,7 +1269,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const } ctrl.id = V4L2_CID_AUDIO_BASS; - if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setBass(ctrl.minimum, c.maxBass = ctrl.maximum); } else { @@ -1277,7 +1277,7 @@ V4LCaps V4LRadio::readV4LCaps(const TQString &device) const } ctrl.id = V4L2_CID_AUDIO_BALANCE; - if (0 == ioctl(fd, VIDIOC_TQUERYCTRL, &ctrl)) { + if (0 == ioctl(fd, VIDIOC_QUERYCTRL, &ctrl)) { if (!(ctrl.flags & V4L2_CTRL_FLAG_DISABLED)) c.setBalance(ctrl.minimum, ctrl.maximum); } else { 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() ) |