diff options
Diffstat (limited to 'kradio3/plugins/radio')
| -rw-r--r-- | kradio3/plugins/radio/radio-configuration-ui.ui | 2 | ||||
| -rw-r--r-- | kradio3/plugins/radio/radio-configuration.cpp | 34 | ||||
| -rw-r--r-- | kradio3/plugins/radio/radio.cpp | 8 |
3 files changed, 22 insertions, 22 deletions
diff --git a/kradio3/plugins/radio/radio-configuration-ui.ui b/kradio3/plugins/radio/radio-configuration-ui.ui index 3d538c7..28e936e 100644 --- a/kradio3/plugins/radio/radio-configuration-ui.ui +++ b/kradio3/plugins/radio/radio-configuration-ui.ui @@ -179,7 +179,7 @@ <string>&Search Stations</string> </property> <property name="iconSet"> - <iconset>"tqfind"</iconset> + <iconset>"find"</iconset> </property> </widget> <widget class="TQPushButton"> diff --git a/kradio3/plugins/radio/radio-configuration.cpp b/kradio3/plugins/radio/radio-configuration.cpp index f28b933..f306aeb 100644 --- a/kradio3/plugins/radio/radio-configuration.cpp +++ b/kradio3/plugins/radio/radio-configuration.cpp @@ -230,7 +230,7 @@ void RadioConfiguration::slotStationSelectionChanged(int idx) stackStationEdit->setDisabled(!s); if (s) { - RadioStationConfig *c = stationEditors.tqfind(s->getClassName()); + RadioStationConfig *c = stationEditors.find(s->getClassName()); if (!c) { c = s->createEditor(); if (c) { @@ -490,22 +490,22 @@ void RadioConfiguration::slotLastChangeNow() static TQString &urlEscapes(TQString &s) { - s.tqreplace(TQRegExp("%"), "%25"); - s.tqreplace(TQRegExp("\t"), "%09"); - s.tqreplace(TQRegExp("\n"), "%0A"); - s.tqreplace(TQRegExp("\n"), "%0D"); - s.tqreplace(TQRegExp(" "), "%20"); - s.tqreplace(TQRegExp("\\!"), "%21"); - s.tqreplace(TQRegExp("\""), "%22"); - s.tqreplace(TQRegExp("#"), "%23"); - s.tqreplace(TQRegExp("\\$"), "%24"); - s.tqreplace(TQRegExp("\\&"), "%26"); - s.tqreplace(TQRegExp("'"), "%27"); - s.tqreplace(TQRegExp(","), "%2C"); - s.tqreplace(TQRegExp(":"), "%3A"); - s.tqreplace(TQRegExp(";"), "%3B"); - s.tqreplace(TQRegExp("="), "%3D"); - s.tqreplace(TQRegExp("\\?"), "%3F"); + s.replace(TQRegExp("%"), "%25"); + s.replace(TQRegExp("\t"), "%09"); + s.replace(TQRegExp("\n"), "%0A"); + s.replace(TQRegExp("\n"), "%0D"); + s.replace(TQRegExp(" "), "%20"); + s.replace(TQRegExp("\\!"), "%21"); + s.replace(TQRegExp("\""), "%22"); + s.replace(TQRegExp("#"), "%23"); + s.replace(TQRegExp("\\$"), "%24"); + s.replace(TQRegExp("\\&"), "%26"); + s.replace(TQRegExp("'"), "%27"); + s.replace(TQRegExp(","), "%2C"); + s.replace(TQRegExp(":"), "%3A"); + s.replace(TQRegExp(";"), "%3B"); + s.replace(TQRegExp("="), "%3D"); + s.replace(TQRegExp("\\?"), "%3F"); return s; } diff --git a/kradio3/plugins/radio/radio.cpp b/kradio3/plugins/radio/radio.cpp index af14e66..1f2ac45 100644 --- a/kradio3/plugins/radio/radio.cpp +++ b/kradio3/plugins/radio/radio.cpp @@ -217,7 +217,7 @@ bool Radio::setPresetFile(const TQString &presetFile) int Radio::getStationIdx(const RadioStation &rs) const { RawStationList &sl = const_cast<RawStationList&>(m_stationList.all()); - return sl.tqfind(&rs); + return sl.find(&rs); } int Radio::getCurrentStationIdx() const @@ -245,7 +245,7 @@ bool Radio::setActiveDevice(IRadioDevice *rd, bool keepPower) // check if new station is in "connections" // special case: rd == NULL: power off active device, new active device = NULL - if (!rd || IRadioDeviceClient::iConnections.tqcontainsRef(rd)) { // new device is ok + if (!rd || IRadioDeviceClient::iConnections.containsRef(rd)) { // new device is ok // save old power state and power off old device bool oldPowerOn = false; @@ -433,13 +433,13 @@ void Radio::noticeDisconnectI(IRadioDeviceClient::cmplInterface *rd, bool pointe if (rd == m_activeDevice) { // search a new active device - if (IRadioDeviceClient::iConnections.tqfindRef(rd) >= 0) { + if (IRadioDeviceClient::iConnections.findRef(rd) >= 0) { IRadioDevice *new_rd = NULL; new_rd = IRadioDeviceClient::iConnections.next(); // choose next device as active device if next exists if (!new_rd) { - IRadioDeviceClient::iConnections.tqfindRef(rd); + IRadioDeviceClient::iConnections.findRef(rd); new_rd = IRadioDeviceClient::iConnections.prev(); // otherwise try prev then, may be NULL (no connections) } setActiveDevice(new_rd); |