diff options
Diffstat (limited to 'kradio3/src')
23 files changed, 123 insertions, 123 deletions
diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp index e873bbc..8d81179 100644 --- a/kradio3/src/aboutwidget.cpp +++ b/kradio3/src/aboutwidget.cpp @@ -25,13 +25,13 @@ #include <tqframe.h> #include <kaboutdialog.h> #include <tqtabwidget.h> -#include <layout.h> +#include <tqlayout.h> #include <tqtabbar.h> #include <tqimage.h> #include <kglobalsettings.h> #include <ktextbrowser.h> -#include <textedit.h> +#include <tqtextedit.h> #include <kdebug.h> #include <kapplication.h> #include <klocale.h> @@ -45,8 +45,8 @@ class KRadioAboutTabWidget : public TQTabWidget { public: KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {} - TQSize sizeHint() const { - return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) ); + TQSize tqsizeHint() const { + return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) ); } }; @@ -75,7 +75,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType if( layoutType & AbtTitle ) { mTitleLabel = new TQLabel( this, "title" ); - mTitleLabel->setAlignment(AlignCenter); + mTitleLabel->tqsetAlignment(AlignCenter); mTopLayout->addWidget( mTitleLabel ); mTopLayout->addSpacing( KDialog::spacingHint() ); } @@ -190,9 +190,9 @@ void KRadioAboutWidget::show( void ) TQWidget::show(); } -TQSize KRadioAboutWidget::sizeHint( void ) const +TQSize KRadioAboutWidget::tqsizeHint( void ) const { - return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) ); + return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) ); } void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ ) @@ -211,7 +211,7 @@ void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ ) f.setBold( true ); mVersionLabel->setFont(f); mAuthorLabel->setFont(f); - mVersionLabel->parentWidget()->layout()->activate(); + mVersionLabel->parentWidget()->tqlayout()->activate(); } update(); @@ -279,7 +279,7 @@ KAboutContainer *KRadioAboutWidget::addContainerPage( const TQString &title, { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << i18n("Invalid layout") << endl; + kdDebug(291) << "addPage: " << i18n("Invalid tqlayout") << endl; return 0; } @@ -309,7 +309,7 @@ KAboutContainer *KRadioAboutWidget::addScrolledContainerPage( { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << "Invalid layout" << endl; + kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; return 0; } @@ -338,7 +338,7 @@ TQFrame *KRadioAboutWidget::addEmptyPage( const TQString &title ) { if( mPageTab == 0 ) { - kdDebug(291) << "addPage: " << "Invalid layout" << endl; + kdDebug(291) << "addPage: " << "Invalid tqlayout" << endl; return 0; } @@ -376,7 +376,7 @@ void KRadioAboutWidget::setTitle( const TQString &title ) { if( mTitleLabel == 0 ) { - kdDebug(291) << "setTitle: " << "Invalid layout" << endl; + kdDebug(291) << "setTitle: " << "Invalid tqlayout" << endl; return; } mTitleLabel->setText(title); @@ -387,7 +387,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName ) { if( mImageLabel == 0 ) { - kdDebug(291) << "setImage: " << "Invalid layout" << endl; + kdDebug(291) << "setImage: " << "Invalid tqlayout" << endl; return; } if( fileName.isNull() ) @@ -402,7 +402,7 @@ void KRadioAboutWidget::setImage( const TQString &fileName ) pix = logo; mImageLabel->setPixmap( pix ); } - mImageFrame->layout()->activate(); + mImageFrame->tqlayout()->activate(); } @@ -441,18 +441,18 @@ void KRadioAboutWidget::setProduct( const TQString &appName, { if( mIconLabel == 0 ) { - kdDebug(291) << "setProduct: " << "Invalid layout" << endl; + kdDebug(291) << "setProduct: " << "Invalid tqlayout" << endl; return; } if ( kapp ) mIconLabel->setPixmap( kapp->icon() ); - TQString msg1 = i18n("%1 %2 (Using KDE %3)").arg(appName). - arg(TQString::fromLatin1(KRADIO_VERSION)). - arg(TQString::fromLatin1(TDE_VERSION_STRING)); - TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").arg('©').arg(year). - arg(author) : TQString::fromLatin1(""); + TQString msg1 = i18n("%1 %2 (Using KDE %3)").tqarg(appName). + arg(TQString::tqfromLatin1(KRADIO_VERSION)). + arg(TQString::tqfromLatin1(TDE_VERSION_STRING)); + TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").tqarg('©').tqarg(year). + arg(author) : TQString::tqfromLatin1(""); mVersionLabel->setText( msg1 ); mAuthorLabel->setText( msg2 ); @@ -461,7 +461,7 @@ void KRadioAboutWidget::setProduct( const TQString &appName, mAuthorLabel->hide(); } - mIconLabel->parentWidget()->layout()->activate(); + mIconLabel->parentWidget()->tqlayout()->activate(); } @@ -563,7 +563,7 @@ void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData) TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(), translatorPage); label->adjustSize(); - label->setMinimumSize(label->sizeHint()); + label->setMinimumSize(label->tqsizeHint()); translatorPage->addWidget(label); } diff --git a/kradio3/src/alarm.cpp b/kradio3/src/alarm.cpp index 475d48b..a7335d7 100644 --- a/kradio3/src/alarm.cpp +++ b/kradio3/src/alarm.cpp @@ -64,7 +64,7 @@ Alarm::~Alarm() TQDateTime Alarm::nextAlarm(bool ignoreEnable) const { - TQDateTime now = TQDateTime::currentDateTime(), + TQDateTime now = TQDateTime::tqcurrentDateTime(), alarm = m_time; if (m_daily) { alarm.setDate (now.date()); diff --git a/kradio3/src/errorlog-interfaces.cpp b/kradio3/src/errorlog-interfaces.cpp index ec18402..65e2e43 100644 --- a/kradio3/src/errorlog-interfaces.cpp +++ b/kradio3/src/errorlog-interfaces.cpp @@ -41,8 +41,8 @@ IErrorLog::~IErrorLog() int IErrorLogClient::sendLogError(const TQString &s) const { kdDebug() << TQString(i18n("%1 Error: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logError(s)); } @@ -50,8 +50,8 @@ int IErrorLogClient::sendLogError(const TQString &s) const int IErrorLogClient::sendLogWarning(const TQString &s) const { kdDebug() << TQString(i18n("%1 Warning: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logWarning(s)); } @@ -59,8 +59,8 @@ int IErrorLogClient::sendLogWarning(const TQString &s) const int IErrorLogClient::sendLogInfo(const TQString &s) const { kdDebug() << TQString(i18n("%1 Information: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logInfo(s)); } @@ -68,16 +68,16 @@ int IErrorLogClient::sendLogInfo(const TQString &s) const int IErrorLogClient::sendLogDebug(const TQString &s) const { kdDebug() << TQString(i18n("%1 Debug: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); IF_SEND_MESSAGE(logDebug(s)); } void IErrorLogClient::staticLogError (const TQString &s) { kdDebug() << TQString(i18n("%1 Error: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logError(s); } @@ -85,8 +85,8 @@ void IErrorLogClient::staticLogError (const TQString &s) void IErrorLogClient::staticLogWarning(const TQString &s) { kdDebug() << TQString(i18n("%1 Warning: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logWarning(s); } @@ -94,8 +94,8 @@ void IErrorLogClient::staticLogWarning(const TQString &s) void IErrorLogClient::staticLogInfo (const TQString &s) { kdDebug() << TQString(i18n("%1 Information: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logInfo(s); } @@ -103,8 +103,8 @@ void IErrorLogClient::staticLogInfo (const TQString &s) void IErrorLogClient::staticLogDebug (const TQString &s) { kdDebug() << TQString(i18n("%1 Debug: %2\n")) - .arg(TQDateTime::currentDateTime().toString(Qt::ISODate)) - .arg(s); + .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)) + .tqarg(s); if (staticLogger) staticLogger->logDebug(s); } diff --git a/kradio3/src/fileringbuffer.cpp b/kradio3/src/fileringbuffer.cpp index a31e007..584b8c2 100644 --- a/kradio3/src/fileringbuffer.cpp +++ b/kradio3/src/fileringbuffer.cpp @@ -32,7 +32,7 @@ FileRingBuffer::FileRingBuffer(const TQString &filename, TQ_UINT64 max_size) m_FillSize = 0; m_Start = 0; m_error = m_File == NULL; - m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").arg(filename); + m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").tqarg(filename); } @@ -65,7 +65,7 @@ bool FileRingBuffer::resize(const TQString &filename, TQ_UINT64 new_max_size) m_FileName = m_BaseFileName + "_" + TQString::number(++m_FileIdx); m_File = fopen(m_FileName.ascii(), "w+"); m_error = m_File == NULL; - m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").arg(filename); + m_errorString = m_File ? TQString() : i18n("cannot open buffer file %1").tqarg(filename); } if (new_max_size >= m_RealSize) { @@ -90,13 +90,13 @@ bool FileRingBuffer::resize(const TQString &filename, TQ_UINT64 new_max_size) newFill += tmp_size; } else { m_error = true; - m_errorString += i18n("FileRingbuffer::resize: Writing to tmpfile %1 failed. ").arg(tmp_file_name); + m_errorString += i18n("FileRingbuffer::resize: Writing to tmpfile %1 failed. ").tqarg(tmp_file_name); } } } } else { m_error = true; - m_errorString += i18n("FileRingbuffer::resize: Opening tmpfile %1 failed. ").arg(tmp_file_name); + m_errorString += i18n("FileRingbuffer::resize: Opening tmpfile %1 failed. ").tqarg(tmp_file_name); } if (!m_error) { @@ -124,7 +124,7 @@ size_t FileRingBuffer::addData (const char *src, size_t size) fseek(m_File, m_Start + m_FillSize, SEEK_SET); if (rest > 0 && fwrite(src, rest, 1, m_File) <= 0) { m_error = true; - m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").arg(m_FileName); + m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").tqarg(m_FileName); } else { m_FillSize += rest; if (m_Start + m_FillSize > m_RealSize) @@ -142,7 +142,7 @@ size_t FileRingBuffer::addData (const char *src, size_t size) fseek(m_File, m_Start + m_FillSize - m_RealSize, SEEK_SET); if (fwrite(src, rest, 1, m_File) <= 0) { m_error = true; - m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").arg(m_FileName); + m_errorString += i18n("FileRingBuffer::addData: failed writing data to file %1.").tqarg(m_FileName); } else { m_FillSize += rest; written += rest; @@ -165,7 +165,7 @@ size_t FileRingBuffer::takeData(char *dst, size_t size) fseek(m_File, m_Start, SEEK_SET); if (fread(dst+read, n, 1, m_File) <= 0) { m_error = true; - m_errorString += i18n("FileRingBuffer::takeData: failed reading data to file %1.").arg(m_FileName); + m_errorString += i18n("FileRingBuffer::takeData: failed reading data to file %1.").tqarg(m_FileName); } else { m_FillSize -= n; m_Start += n; diff --git a/kradio3/src/frequencyradiostation.cpp b/kradio3/src/frequencyradiostation.cpp index 75257b2..d2c9eb3 100644 --- a/kradio3/src/frequencyradiostation.cpp +++ b/kradio3/src/frequencyradiostation.cpp @@ -117,7 +117,7 @@ TQString FrequencyRadioStation::longName() const { TQString longN = name(); if (!longN.isEmpty()) { - longN = i18n("%1, %2").arg(longN).arg(description()); + longN = i18n("%1, %2").tqarg(longN).tqarg(description()); } else { longN = description(); } @@ -131,9 +131,9 @@ TQString FrequencyRadioStation::description() const float cf = frequency(); TQString f; if (cf >= 10) - f = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(cf, 2)); + f = i18n("%1 MHz").tqarg(KGlobal::locale()->formatNumber(cf, 2)); else - f = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber(cf * 1000, 0)); + f = i18n("%1 kHz").tqarg(KGlobal::locale()->formatNumber(cf * 1000, 0)); return f; } diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h index 6d0639a..58d9389 100644 --- a/kradio3/src/include/aboutwidget.h +++ b/kradio3/src/include/aboutwidget.h @@ -94,7 +94,7 @@ class KRadioAboutWidget : public TQWidget public: KRadioAboutWidget(const KAboutData &abtData, int layoutType, TQWidget *parent = 0, char *name = 0); virtual void show( void ); - virtual TQSize sizeHint( void ) const; + virtual TQSize tqsizeHint( void ) const; void setAboutData(const KAboutData &abtData); diff --git a/kradio3/src/include/interfaces.h b/kradio3/src/include/interfaces.h index c698521..7e53a24 100644 --- a/kradio3/src/include/interfaces.h +++ b/kradio3/src/include/interfaces.h @@ -145,7 +145,7 @@ - sending Messages Declare a virtual constant method with return value "int" and the desired - parameters. The return value will indicate how many receivers have handled + parameters. The return value will indicate how many tqreceivers have handled the message: virtual bool SendingMessages(int any_or_non_param) const; @@ -168,7 +168,7 @@ The method has to be implemented by a derived class. The current item of the - receivers conntions list is set to the sender. + tqreceivers conntions list is set to the sender. - querying queries @@ -195,7 +195,7 @@ IF_ANSWER( AnsweringQueries(int another_param) ) The method has to be implemented by a derived class. The current item of the - receivers conntions list is set to the sender. + tqreceivers conntions list is set to the sender. At last a note on maxConnections. This member is set on initialization by @@ -216,7 +216,7 @@ int ComplementaryInterface::SendingMessages(int any_or_non_param) const { IF_SEND_MESSAGE( ReceivingMessages(any_or_non_param) ) - // macro includes "return #receivers" + // macro includes "return #tqreceivers" } int ComplementaryInterface::QueryingQueries(int another_param) const diff --git a/kradio3/src/include/soundstreamclient_interfaces.h b/kradio3/src/include/soundstreamclient_interfaces.h index 3f53ac5..310d42a 100644 --- a/kradio3/src/include/soundstreamclient_interfaces.h +++ b/kradio3/src/include/soundstreamclient_interfaces.h @@ -107,7 +107,7 @@ SENDERS: IF_SENDER_FINE ( queryIsMuted, (SoundStreamID /*id*/, bool &) ) - // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers + // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers IF_SENDER_FINE ( sendReleasePlayback, (SoundStreamID id) ) IF_SENDER_FINE ( sendReleaseCapture, (SoundStreamID id) ) @@ -315,7 +315,7 @@ SENDERS: CALL_SNDSTR_SERVER ( queryIsMuted, (SoundStreamID id, bool &v), (id, v) ) - // sendPreparePlayback/sendPrepareCapture don't make sense for multiple receivers + // sendPreparePlayback/sendPrepareCapture don't make sense for multiple tqreceivers CALL_SNDSTR_SERVER ( sendReleasePlayback, (SoundStreamID id), (id) ) CALL_SNDSTR_SERVER ( sendReleaseCapture, (SoundStreamID id), (id) ) diff --git a/kradio3/src/include/soundstreamid.h b/kradio3/src/include/soundstreamid.h index e7aa4d5..4133103 100644 --- a/kradio3/src/include/soundstreamid.h +++ b/kradio3/src/include/soundstreamid.h @@ -44,7 +44,7 @@ public: bool HasSamePhysicalID(const SoundStreamID &x) const { return m_PhysicalID == x.m_PhysicalID; } bool isValid() const { return m_ID != 0; } // m_PhysicalID is not checked! - void invalidate(); + void tqinvalidate(); static const SoundStreamID InvalidID; diff --git a/kradio3/src/internetradiostation.cpp b/kradio3/src/internetradiostation.cpp index 04cd9f9..6bec8d2 100644 --- a/kradio3/src/internetradiostation.cpp +++ b/kradio3/src/internetradiostation.cpp @@ -115,7 +115,7 @@ TQString InternetRadioStation::longName() const { TQString longN = name(); if (!longN.isEmpty()) { - longN = i18n("%1, %2").arg(longN).arg(description()); + longN = i18n("%1, %2").tqarg(longN).tqarg(description()); } else { longN = description(); } diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp index b5bc509..36be553 100644 --- a/kradio3/src/kradioapp.cpp +++ b/kradio3/src/kradioapp.cpp @@ -104,7 +104,7 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name) } else { KMessageBox::error(NULL, i18n("Library %1: Plugin Entry Point is missing\n") - .arg(lib_name), + .tqarg(lib_name), i18n("Plugin Library Load Error")); library->unload(); info_func = NULL; @@ -114,8 +114,8 @@ PluginLibraryInfo::PluginLibraryInfo (const TQString &lib_name) } else { KMessageBox::error(NULL, i18n("Library %1: \n%2") - .arg(lib_name) - .arg(KLibLoader::self()->lastErrorMessage()), + .tqarg(lib_name) + .tqarg(KLibLoader::self()->lastErrorMessage()), i18n("Plugin Library Load Error")); } } @@ -266,10 +266,10 @@ KLibrary *KRadioApp::LoadLibrary (const TQString &library) m_PluginInfos.insert(it.key(), PluginClassInfo (it.key(), *it, libinfo.init_func)); } } else { - kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " " << i18n("Error: Loading Library %1 failed: %2") - .arg(library).arg(KLibLoader::self()->lastErrorMessage()) + .tqarg(library).tqarg(KLibLoader::self()->lastErrorMessage()) << endl; } @@ -317,15 +317,15 @@ PluginBase *KRadioApp::CreatePlugin (PluginManager *manager, const TQString &cla if (m_PluginInfos.contains(class_name)) { retval = m_PluginInfos[class_name].CreateInstance(object_name); if (!retval) { - kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " " - << i18n("Error: Creation of instance \"%1\" of class %2 falied.").arg(object_name).arg(class_name) + << i18n("Error: Creation of instance \"%1\" of class %2 falied.").tqarg(object_name).tqarg(class_name) << endl; } } else { - kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " " - << i18n("Error: Cannot create instance \"%1\" of unknown class %2.").arg(object_name).arg(class_name) + << i18n("Error: Cannot create instance \"%1\" of unknown class %2.").tqarg(object_name).tqarg(class_name) << endl; } diff --git a/kradio3/src/pluginmanager-configuration-ui.ui b/kradio3/src/pluginmanager-configuration-ui.ui index 13adb7f..abaa991 100644 --- a/kradio3/src/pluginmanager-configuration-ui.ui +++ b/kradio3/src/pluginmanager-configuration-ui.ui @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>87</height> @@ -137,7 +137,7 @@ <property name="name"> <cstring>btnRemovePluginInstance</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -196,7 +196,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>55</height> @@ -207,7 +207,7 @@ <property name="name"> <cstring>btnNewPluginInstance</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -301,7 +301,7 @@ <property name="name"> <cstring>btnRemoveLibrary</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -321,7 +321,7 @@ <property name="name"> <cstring>btnAddLibrary</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>24</width> <height>24</height> @@ -363,7 +363,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>61</height> diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp index 09f8a59..6164f20 100644 --- a/kradio3/src/pluginmanager.cpp +++ b/kradio3/src/pluginmanager.cpp @@ -27,7 +27,7 @@ #include <kconfig.h> #include <kprogress.h> -#include <layout.h> +#include <tqlayout.h> #include <tqframe.h> #include <tqmenudata.h> @@ -120,7 +120,7 @@ void PluginManager::updateWidgetPluginMenuItem(WidgetPluginBase *b, TQMenuData * return; const TQString &name = b->description(); - TQString text = (shown ? i18n("Hide %1") : i18n("Show %1")).arg(name); + TQString text = (shown ? i18n("Hide %1") : i18n("Show %1")).tqarg(name); menu->changeItem(map[b], TQIconSet(SmallIconSet(!shown ? "kradio_show" : "kradio_hide")), @@ -153,7 +153,7 @@ void PluginManager::insertPlugin(PluginBase *p) if (p) { BlockProfiler profiler_cfg("PluginManager::insertPlugin - about/config"); - /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + /*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " Debug: Adding Plugin: " << p->name() << "\n";*/ if (!m_configDialog) @@ -173,7 +173,7 @@ void PluginManager::insertPlugin(PluginBase *p) // connect plugins with each other for (PluginIterator it(m_plugins); it.current(); ++it) { if (it.current() != p) { - /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate) + /*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate) << " Debug: connecting with " << it.current()->name() << "\n";*/ p->connectI(it.current()); } @@ -295,7 +295,7 @@ TQFrame *PluginManager::addConfigurationPage (const ConfigPageInfo &info) KGlobal::instance()->iconLoader()->loadIcon( info.iconName, KIcon::NoGroup, KIcon::SizeMedium ) ); - // fill config frame with layout ... + // fill config frame with tqlayout ... TQGridLayout *l = new TQGridLayout(f); l->setSpacing( 0 ); l->setMargin( 0 ); @@ -378,7 +378,7 @@ void PluginManager::addAboutPage (PluginBase *forWhom, m_aboutPageFrames.insert(forWhom, f); m_aboutPages.insert(forWhom, info.page); - // fill config frame with layout ... + // fill config frame with tqlayout ... TQGridLayout *l = new TQGridLayout(f); l->setSpacing( 0 ); l->setMargin( 0 ); @@ -456,7 +456,7 @@ void PluginManager::restoreState (KConfig *c) TQString object_name = c->readEntry("plugin_name_" + TQString::number(i)); if (m_showProgressBar) - progress->TQWidget::setCaption(i18n("Creating Plugin %1").arg(class_name)); + progress->TQWidget::setCaption(i18n("Creating Plugin %1").tqarg(class_name)); if (class_name.length() && object_name.length()) m_Application->CreatePlugin(this, class_name, object_name); if (m_showProgressBar) @@ -473,7 +473,7 @@ void PluginManager::restoreState (KConfig *c) for (TQMapConstIterator<TQString, PluginClassInfo> it=classes.begin(); it != end; ++it, ++idx) { const PluginClassInfo &cls = *it; if (m_showProgressBar) - progress->TQWidget::setCaption(i18n("Creating Plugin %1").arg(cls.class_name)); + progress->TQWidget::setCaption(i18n("Creating Plugin %1").tqarg(cls.class_name)); m_Application->CreatePlugin(this, cls.class_name, m_Name + "-" + cls.class_name); if (m_showProgressBar) progress->progressBar()->setProgress(idx); @@ -487,7 +487,7 @@ void PluginManager::restoreState (KConfig *c) for (PluginIterator i(m_plugins); i.current(); ++i, ++idx) { BlockProfiler profile_plugin("PluginManager::restoreState - " + i.current()->pluginClassName()); if (m_showProgressBar) - progress->TQWidget::setCaption(i18n("Initializing Plugin %1").arg(i.current()->pluginClassName())); + progress->TQWidget::setCaption(i18n("Initializing Plugin %1").tqarg(i.current()->pluginClassName())); i.current()->restoreState(c); if (m_showProgressBar) progress->progressBar()->setProgress(idx+1); diff --git a/kradio3/src/radiostation-config.cpp b/kradio3/src/radiostation-config.cpp index f045c27..677d798 100644 --- a/kradio3/src/radiostation-config.cpp +++ b/kradio3/src/radiostation-config.cpp @@ -17,7 +17,7 @@ #include <tqlabel.h> #include <tqspinbox.h> -#include <layout.h> +#include <tqlayout.h> #include <klocale.h> #include <math.h> diff --git a/kradio3/src/soundstreamid.cpp b/kradio3/src/soundstreamid.cpp index 1c9cfed..f1905e9 100644 --- a/kradio3/src/soundstreamid.cpp +++ b/kradio3/src/soundstreamid.cpp @@ -62,7 +62,7 @@ SoundStreamID SoundStreamID::createNewID(const SoundStreamID &oldID) } -void SoundStreamID::invalidate() +void SoundStreamID::tqinvalidate() { m_ID = 0; m_PhysicalID = 0; diff --git a/kradio3/src/standardscandialog-ui.ui b/kradio3/src/standardscandialog-ui.ui index 394ccfc..8d0e8d5 100644 --- a/kradio3/src/standardscandialog-ui.ui +++ b/kradio3/src/standardscandialog-ui.ui @@ -38,7 +38,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> @@ -54,7 +54,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>100</width> <height>20</height> @@ -79,7 +79,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>70</width> <height>20</height> @@ -90,7 +90,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> - <cstring>layout2</cstring> + <cstring>tqlayout2</cstring> </property> <hbox> <property name="name"> diff --git a/kradio3/src/standardscandialog.cpp b/kradio3/src/standardscandialog.cpp index b738618..b96f794 100644 --- a/kradio3/src/standardscandialog.cpp +++ b/kradio3/src/standardscandialog.cpp @@ -67,7 +67,7 @@ void StandardScanDialog::start() if (!m_running) { m_running = true; m_stations.all().clear(); - m_startTime = TQDateTime::currentDateTime(); + m_startTime = TQDateTime::tqcurrentDateTime(); m_oldPowerOn = queryIsPowerOn(); m_oldStation = queryCurrentStation().copy(); sendToBeginning(); @@ -153,11 +153,11 @@ bool StandardScanDialog::noticeProgress (float f) progressBar->setProgress((int)rint(f * 100)); if (m_running) { - int secs = m_startTime.secsTo(TQDateTime::currentDateTime()); + int secs = m_startTime.secsTo(TQDateTime::tqcurrentDateTime()); int ms = (int)rint((1 - f) * (float) secs / f * 1000.0); if (ms > 0 && ms < 86400000) // max one day - labelTime->setText(i18n("<p align=\"right\">%1</p>").arg(TQTime(0,0).addMSecs(ms).toString())); + labelTime->setText(i18n("<p align=\"right\">%1</p>").tqarg(TQTime(0,0).addMSecs(ms).toString())); else labelTime->setText(i18n("unknown")); diff --git a/kradio3/src/station-drag-object.cpp b/kradio3/src/station-drag-object.cpp index f8cc2c7..b3fecb7 100644 --- a/kradio3/src/station-drag-object.cpp +++ b/kradio3/src/station-drag-object.cpp @@ -76,7 +76,7 @@ bool StationDragObject::decode (const TQMimeSource *e, TQStringList &stationIDs) { stationIDs.clear(); if (canDecode(e)) { - const TQByteArray &tmp = e->encodedData(e->format(0)); + const TQByteArray &tmp = e->tqencodedData(e->format(0)); TQString str = ""; for (unsigned int pos = 0; pos < tmp.size(); ++pos) { if (tmp[pos]) { diff --git a/kradio3/src/stationlist.cpp b/kradio3/src/stationlist.cpp index 8c6bf80..e7e7d64 100644 --- a/kradio3/src/stationlist.cpp +++ b/kradio3/src/stationlist.cpp @@ -235,7 +235,7 @@ void StationList::merge(const StationList & other) if (! m_metaData.comment.isEmpty()) m_metaData.comment += "\n"; - m_metaData.lastChange = TQDateTime::currentDateTime(); + m_metaData.lastChange = TQDateTime::tqcurrentDateTime(); if (!metaData.maintainer.isEmpty()) m_metaData.maintainer += (count() ? TQString(" / ") : TQString()) + metaData.maintainer; @@ -340,13 +340,13 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool if (!KIO::NetAccess::download(url, tmpfile, NULL)) { if (enableMessageBox) { logger.logError("StationList::readXML: " + - i18n("error downloading preset file %1").arg(url.url())); + i18n("error downloading preset file %1").tqarg(url.url())); TQMessageBox::warning(NULL, "KRadio", i18n("Download of the station preset file at %1 failed.") - .arg(url.url())); + .tqarg(url.url())); } else { logger.logWarning("StationList::readXML: " + - i18n("error downloading preset file %1").arg(url.url())); + i18n("error downloading preset file %1").tqarg(url.url())); } return false; } @@ -358,11 +358,11 @@ bool StationList::readXML (const KURL &url, const IErrorLogClient &logger, bool if (! presetFile.open(IO_ReadOnly)) { logger.logError("StationList::readXML: " + - i18n("error opening preset file %1").arg(tmpfile)); + i18n("error opening preset file %1").tqarg(tmpfile)); if (enableMessageBox) { TQMessageBox::warning(NULL, "KRadio", i18n("Opening of the station preset file at %1 failed.") - .arg(tmpfile)); + .tqarg(tmpfile)); } return false; } @@ -458,11 +458,11 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool outs << output; if (outf->status() != IO_Ok) { logger.logError("StationList::writeXML: " + - i18n("error writing to tempfile %1").arg(tmpFile.name())); + i18n("error writing to tempfile %1").tqarg(tmpFile.name())); if (enableMessageBox) { TQMessageBox::warning(NULL, "KRadio", i18n("Writing station preset file %1 failed.") - .arg(tmpFile.name())); + .tqarg(tmpFile.name())); } return false; } @@ -472,19 +472,19 @@ bool StationList::writeXML (const KURL &url, const IErrorLogClient &logger, bool if (count() <= 1) { logger.logWarning("StationList::writeXML: " + - i18n("uploading preset file %1: ").arg(url.url())); + i18n("uploading preset file %1: ").tqarg(url.url())); logger.logWarning("StationList::writeXML: " + - i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").arg(count())); + i18n("something strange happend, station list has only %1 entries. Writing station preset file skipped").tqarg(count())); } else { if (!KIO::NetAccess::upload(tmpFile.name(), url, NULL)) { logger.logError("StationList::writeXML: " + - i18n("error uploading preset file %1").arg(url.url())); + i18n("error uploading preset file %1").tqarg(url.url())); if (enableMessageBox) { TQMessageBox::warning(NULL, "KRadio", i18n("Upload of station preset file to %1 failed.") - .arg(url.url())); + .tqarg(url.url())); } return false; } diff --git a/kradio3/src/stationlistxmlhandler.cpp b/kradio3/src/stationlistxmlhandler.cpp index 1bd09ed..0e303da 100644 --- a/kradio3/src/stationlistxmlhandler.cpp +++ b/kradio3/src/stationlistxmlhandler.cpp @@ -62,7 +62,7 @@ bool StationListXmlHandler::startDocument () #define START_ELEMENT_ERROR m_logger.logError("StationListXmlHandler::startElement: " + \ i18n("misplaced element %1") \ - .arg(qname));\ + .tqarg(qname));\ return false; bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString &/*localname*/, @@ -113,7 +113,7 @@ bool StationListXmlHandler::startElement (const TQString &/*ns*/, const TQString } else { // unknown m_logger.logWarning("StationListXmlHandler::startElement: " + - i18n("unknown or unexpected element %1").arg(qname)); + i18n("unknown or unexpected element %1").tqarg(qname)); } m_status.push_back(qname); @@ -143,10 +143,10 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString & if (m_status.size()) { m_logger.logError("StationListXmlHandler::endElement: " + i18n("expected element %1, but found %2") - .arg(m_status.back()).arg(qname)); + .tqarg(m_status.back()).tqarg(qname)); } else { m_logger.logError("StationListXmlHandler::endElement: " + - i18n("unexpected element %1").arg(qname)); + i18n("unexpected element %1").tqarg(qname)); } } return true; @@ -155,7 +155,7 @@ bool StationListXmlHandler::endElement (const TQString &/*ns*/, const TQString & #define CHARACTERS_ERROR m_logger.logError("StationListXmlHandler::characters: " + \ i18n("invalid data for element %1") \ - .arg(stat)); \ + .tqarg(stat)); \ return false; bool StationListXmlHandler::characters (const TQString &ch) @@ -169,7 +169,7 @@ bool StationListXmlHandler::characters (const TQString &ch) if (stat == StationListFormat) { if (str != STATION_LIST_FORMAT) { - m_logger.logError(i18n("found a station list with unknown format %1").arg(str)); + m_logger.logError(i18n("found a station list with unknown format %1").tqarg(str)); return false; } @@ -210,13 +210,13 @@ bool StationListXmlHandler::characters (const TQString &ch) if (!m_newStation->setProperty(stat, str)) { m_logger.logWarning("StationListXmlHandler::characters: " + i18n("unknown property %1 for class %2") - .arg(stat) - .arg(m_newStation->getClassName())); + .tqarg(stat) + .tqarg(m_newStation->getClassName())); } } else if (str.length()) { m_logger.logError("StationListXmlHandler::characters: " + - i18n("characters ignored for element %1").arg(stat)); + i18n("characters ignored for element %1").tqarg(stat)); } return true; } diff --git a/kradio3/src/stationselector-ui.ui b/kradio3/src/stationselector-ui.ui index 2844baf..bc3f3dd 100644 --- a/kradio3/src/stationselector-ui.ui +++ b/kradio3/src/stationselector-ui.ui @@ -48,7 +48,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout1</cstring> + <cstring>tqlayout1</cstring> </property> <vbox> <property name="name"> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>40</height> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Minimum</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>10</width> <height>20</height> diff --git a/kradio3/src/timecontrol_interfaces.cpp b/kradio3/src/timecontrol_interfaces.cpp index c4f42b5..248fa47 100644 --- a/kradio3/src/timecontrol_interfaces.cpp +++ b/kradio3/src/timecontrol_interfaces.cpp @@ -83,7 +83,7 @@ void ITimeControlClient::noticeConnectedI(cmplInterface *, bool /*pointer_valid* noticeAlarmsChanged(queryAlarms()); noticeNextAlarmChanged(queryNextAlarm()); TQDateTime end = queryCountdownEnd(); - if (end > TQDateTime::currentDateTime()) + if (end > TQDateTime::tqcurrentDateTime()) noticeCountdownStarted(end); else noticeCountdownStopped(); @@ -95,7 +95,7 @@ void ITimeControlClient::noticeDisconnectedI(cmplInterface *, bool /*pointer_val noticeAlarmsChanged(queryAlarms()); noticeNextAlarmChanged(queryNextAlarm()); TQDateTime end = queryCountdownEnd(); - if (end > TQDateTime::currentDateTime()) + if (end > TQDateTime::tqcurrentDateTime()) noticeCountdownStarted(end); else noticeCountdownStopped(); diff --git a/kradio3/src/widgetplugins.cpp b/kradio3/src/widgetplugins.cpp index c7e866d..d01ef88 100644 --- a/kradio3/src/widgetplugins.cpp +++ b/kradio3/src/widgetplugins.cpp @@ -100,7 +100,7 @@ void WidgetPluginBase::pShowOnOrgDesktop() { KWin::setMainWindow(getWidget(), 0); - logDebug(TQString("%1::pShowOnOrgDesktop: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pShowOnOrgDesktop: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) { TQWidget *w = getWidget(); if (!w) return; @@ -131,7 +131,7 @@ void WidgetPluginBase::pShow() { KWin::setMainWindow(getWidget(), 0); - logDebug(TQString("%1::pShow: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pShow: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); if (m_geoCacheValid && (!isReallyVisible() || m_geoRestoreFlag) ) { TQWidget *w = getWidget(); if (!w) return; @@ -150,9 +150,9 @@ void WidgetPluginBase::pShow() void WidgetPluginBase::pHide() { - logDebug(TQString("%1::pHide1: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pHide1: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); getKWinState(); - logDebug(TQString("%1::pHide2: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").arg(name()).arg(m_saveSticky).arg(m_saveDesktop).arg(isReallyVisible()).arg(isAnywhereVisible()).arg(m_geoCacheValid)); + logDebug(TQString("%1::pHide2: all: %2, desktop: %3, visible:%4, anywherevisible:%5, cachevalid: %6").tqarg(name()).tqarg(m_saveSticky).tqarg(m_saveDesktop).tqarg(isReallyVisible()).tqarg(isAnywhereVisible()).tqarg(m_geoCacheValid)); } |