Rename old tq methods that no longer need a unique name

13 files changed, 41 insertions, 41 deletions

diff --git a/kradio3/src/aboutwidget.cpp b/kradio3/src/aboutwidget.cpp
index 8d81179..fed81f5 100644
--- a/kradio3/src/aboutwidget.cpp
+++ b/kradio3/src/aboutwidget.cpp
@@ -45,8 +45,8 @@ class KRadioAboutTabWidget : public TQTabWidget
 {
 public:
     KRadioAboutTabWidget( TQWidget* parent ) : TQTabWidget( parent ) {}
-    TQSize tqsizeHint() const {
-    return TQTabWidget::tqsizeHint().expandedTo( tabBar()->tqsizeHint() + TQSize(4,4) );
+    TQSize sizeHint() const {
+    return TQTabWidget::sizeHint().expandedTo( tabBar()->sizeHint() + TQSize(4,4) );
     }
 };
 
@@ -75,7 +75,7 @@ KRadioAboutWidget::KRadioAboutWidget(const KAboutData &aboutData, int layoutType
   if( layoutType & AbtTitle )
   {
     mTitleLabel = new TQLabel( this, "title" );
-    mTitleLabel->tqsetAlignment(AlignCenter);
+    mTitleLabel->setAlignment(AlignCenter);
     mTopLayout->addWidget( mTitleLabel );
     mTopLayout->addSpacing( KDialog::spacingHint() );
   }
@@ -190,9 +190,9 @@ void KRadioAboutWidget::show( void )
     TQWidget::show();
 }
 
-TQSize KRadioAboutWidget::tqsizeHint( void ) const
+TQSize KRadioAboutWidget::sizeHint( void ) const
 {
-    return tqminimumSize().expandedTo( TQSize( TQWidget::tqsizeHint().width(), 0 ) );
+    return minimumSize().expandedTo( TQSize( TQWidget::sizeHint().width(), 0 ) );
 }
 
 void KRadioAboutWidget::fontChange( const TQFont &/*oldFont*/ )
@@ -449,10 +449,10 @@ void KRadioAboutWidget::setProduct( const TQString &appName,
       mIconLabel->setPixmap( kapp->icon() );
 
   TQString msg1 = i18n("%1 %2 (Using KDE %3)").tqarg(appName).
-    arg(TQString::tqfromLatin1(KRADIO_VERSION)).
-    arg(TQString::tqfromLatin1(TDE_VERSION_STRING));
+    arg(TQString::fromLatin1(KRADIO_VERSION)).
+    arg(TQString::fromLatin1(TDE_VERSION_STRING));
   TQString msg2 = !year.isEmpty() ? i18n("%1 %2, %3").tqarg('�').tqarg(year).
-    arg(author) : TQString::tqfromLatin1("");
+    arg(author) : TQString::fromLatin1("");
 
   mVersionLabel->setText( msg1 );
   mAuthorLabel->setText( msg2 );
@@ -563,7 +563,7 @@ void KRadioAboutWidget::setAboutData(const KAboutData &_aboutData)
         TQLabel *label = new TQLabel(KAboutData::aboutTranslationTeam(),
                                    translatorPage);
         label->adjustSize();
-        label->setMinimumSize(label->tqsizeHint());
+        label->setMinimumSize(label->sizeHint());
         translatorPage->addWidget(label);
     }
 
diff --git a/kradio3/src/alarm.cpp b/kradio3/src/alarm.cpp
index a7335d7..475d48b 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::tqcurrentDateTime(),
+    TQDateTime now = TQDateTime::currentDateTime(),
               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 65e2e43..5b55fdb 100644
--- a/kradio3/src/errorlog-interfaces.cpp
+++ b/kradio3/src/errorlog-interfaces.cpp
@@ -41,7 +41,7 @@ IErrorLog::~IErrorLog()
 int IErrorLogClient::sendLogError(const TQString &s) const
 {
     kdDebug() << TQString(i18n("%1 Error: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     IF_SEND_MESSAGE(logError(s));
 }
@@ -50,7 +50,7 @@ int IErrorLogClient::sendLogError(const TQString &s) const
 int IErrorLogClient::sendLogWarning(const TQString &s) const
 {
     kdDebug() << TQString(i18n("%1 Warning: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     IF_SEND_MESSAGE(logWarning(s));
 }
@@ -59,7 +59,7 @@ int IErrorLogClient::sendLogWarning(const TQString &s) const
 int IErrorLogClient::sendLogInfo(const TQString &s) const
 {
     kdDebug() << TQString(i18n("%1 Information: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     IF_SEND_MESSAGE(logInfo(s));
 }
@@ -68,7 +68,7 @@ int IErrorLogClient::sendLogInfo(const TQString &s) const
 int IErrorLogClient::sendLogDebug(const TQString &s) const
 {
     kdDebug() << TQString(i18n("%1 Debug: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     IF_SEND_MESSAGE(logDebug(s));
 }
@@ -76,7 +76,7 @@ int IErrorLogClient::sendLogDebug(const TQString &s) const
 void IErrorLogClient::staticLogError  (const TQString &s)
 {
     kdDebug() << TQString(i18n("%1 Error: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     if (staticLogger)
         staticLogger->logError(s);
@@ -85,7 +85,7 @@ void IErrorLogClient::staticLogError  (const TQString &s)
 void IErrorLogClient::staticLogWarning(const TQString &s)
 {
     kdDebug() << TQString(i18n("%1 Warning: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     if (staticLogger)
         staticLogger->logWarning(s);
@@ -94,7 +94,7 @@ void IErrorLogClient::staticLogWarning(const TQString &s)
 void IErrorLogClient::staticLogInfo   (const TQString &s)
 {
     kdDebug() << TQString(i18n("%1 Information: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     if (staticLogger)
         staticLogger->logInfo(s);
@@ -103,7 +103,7 @@ void IErrorLogClient::staticLogInfo   (const TQString &s)
 void IErrorLogClient::staticLogDebug  (const TQString &s)
 {
     kdDebug() << TQString(i18n("%1 Debug: %2\n"))
-                 .tqarg(TQDateTime::tqcurrentDateTime().toString(Qt::ISODate))
+                 .tqarg(TQDateTime::currentDateTime().toString(Qt::ISODate))
                  .tqarg(s);
     if (staticLogger)
         staticLogger->logDebug(s);
diff --git a/kradio3/src/include/aboutwidget.h b/kradio3/src/include/aboutwidget.h
index 58d9389..6d0639a 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 tqsizeHint( void ) const;
+    virtual TQSize sizeHint( void ) const;
 
     void setAboutData(const KAboutData &abtData);
 
diff --git a/kradio3/src/kradioapp.cpp b/kradio3/src/kradioapp.cpp
index 36be553..2842522 100644
--- a/kradio3/src/kradioapp.cpp
+++ b/kradio3/src/kradioapp.cpp
@@ -266,7 +266,7 @@ KLibrary *KRadioApp::LoadLibrary (const TQString &library)
             m_PluginInfos.insert(it.key(), PluginClassInfo (it.key(), *it, libinfo.init_func));
         }
     } else {
-        kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+        kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
                   << " "
                   << i18n("Error: Loading Library %1 failed: %2")
                      .tqarg(library).tqarg(KLibLoader::self()->lastErrorMessage())
@@ -317,13 +317,13 @@ 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::tqcurrentDateTime().toString(Qt::ISODate)
+            kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
                     << " "
                     << i18n("Error: Creation of instance \"%1\" of class %2 falied.").tqarg(object_name).tqarg(class_name)
                     << endl;
         }
     } else {
-        kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+        kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
                   << " "
                   << 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 abaa991..13adb7f 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="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>87</height>
@@ -137,7 +137,7 @@
                     <property name="name">
                         <cstring>btnRemovePluginInstance</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>24</width>
                             <height>24</height>
@@ -196,7 +196,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>55</height>
@@ -207,7 +207,7 @@
                     <property name="name">
                         <cstring>btnNewPluginInstance</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>24</width>
                             <height>24</height>
@@ -301,7 +301,7 @@
                     <property name="name">
                         <cstring>btnRemoveLibrary</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>24</width>
                             <height>24</height>
@@ -321,7 +321,7 @@
                     <property name="name">
                         <cstring>btnAddLibrary</cstring>
                     </property>
-                    <property name="tqmaximumSize">
+                    <property name="maximumSize">
                         <size>
                             <width>24</width>
                             <height>24</height>
@@ -363,7 +363,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>61</height>
diff --git a/kradio3/src/pluginmanager.cpp b/kradio3/src/pluginmanager.cpp
index 6164f20..892df34 100644
--- a/kradio3/src/pluginmanager.cpp
+++ b/kradio3/src/pluginmanager.cpp
@@ -153,7 +153,7 @@ void PluginManager::insertPlugin(PluginBase *p)
     if (p) {
         BlockProfiler profiler_cfg("PluginManager::insertPlugin - about/config");
 
-        /*kdDebug() << TQDateTime::tqcurrentDateTime().toString(Qt::ISODate)
+        /*kdDebug() << TQDateTime::currentDateTime().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::tqcurrentDateTime().toString(Qt::ISODate)
+                /*kdDebug() << TQDateTime::currentDateTime().toString(Qt::ISODate)
                           << " Debug: connecting with " << it.current()->name() << "\n";*/
                 p->connectI(it.current());
             }
diff --git a/kradio3/src/standardscandialog-ui.ui b/kradio3/src/standardscandialog-ui.ui
index 8d0e8d5..60d48e2 100644
--- a/kradio3/src/standardscandialog-ui.ui
+++ b/kradio3/src/standardscandialog-ui.ui
@@ -54,7 +54,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>100</width>
                             <height>20</height>
@@ -79,7 +79,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>70</width>
                             <height>20</height>
diff --git a/kradio3/src/standardscandialog.cpp b/kradio3/src/standardscandialog.cpp
index b96f794..52e29ba 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::tqcurrentDateTime();
+        m_startTime = TQDateTime::currentDateTime();
         m_oldPowerOn = queryIsPowerOn();
         m_oldStation = queryCurrentStation().copy();
         sendToBeginning();
@@ -153,7 +153,7 @@ bool StandardScanDialog::noticeProgress (float f)
     progressBar->setProgress((int)rint(f * 100));
 
     if (m_running) {
-        int secs = m_startTime.secsTo(TQDateTime::tqcurrentDateTime());
+        int secs = m_startTime.secsTo(TQDateTime::currentDateTime());
         int ms = (int)rint((1 - f) * (float) secs / f * 1000.0);
 
         if (ms > 0 && ms < 86400000)   // max one day
diff --git a/kradio3/src/station-drag-object.cpp b/kradio3/src/station-drag-object.cpp
index b3fecb7..f8cc2c7 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->tqencodedData(e->format(0));
+        const TQByteArray &tmp = e->encodedData(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 e7e7d64..b5965f7 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::tqcurrentDateTime();
+    m_metaData.lastChange = TQDateTime::currentDateTime();
 
     if (!metaData.maintainer.isEmpty())
         m_metaData.maintainer += (count() ? TQString(" / ") : TQString()) + metaData.maintainer;
diff --git a/kradio3/src/stationselector-ui.ui b/kradio3/src/stationselector-ui.ui
index bc3f3dd..586f970 100644
--- a/kradio3/src/stationselector-ui.ui
+++ b/kradio3/src/stationselector-ui.ui
@@ -102,7 +102,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -129,7 +129,7 @@
             <property name="sizeType">
                 <enum>Minimum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>10</width>
                     <height>20</height>
diff --git a/kradio3/src/timecontrol_interfaces.cpp b/kradio3/src/timecontrol_interfaces.cpp
index 248fa47..c4f42b5 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::tqcurrentDateTime())
+	if (end > TQDateTime::currentDateTime())
 		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::tqcurrentDateTime())
+	if (end > TQDateTime::currentDateTime())
 		noticeCountdownStarted(end);
 	else
 		noticeCountdownStopped();