Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

1 files changed, 26 insertions, 26 deletions

diff --git a/kscd/kscd.cpp b/kscd/kscd.cpp
index 2dbf3c8c..74842d50 100644
--- a/kscd/kscd.cpp
+++ b/kscd/kscd.cpp
@@ -24,8 +24,8 @@
 
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <textstream.h>
-#include <layout.h>
+#include <tqtextstream.h>
+#include <tqlayout.h>
 #include <tqhbox.h>
 #include <tqvbox.h>
 #include <tqapplication.h>
@@ -76,7 +76,7 @@
 
 #include "cddbdlg.h"
 #include "configWidget.h"
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <kcompactdisc.h>
 #include <fixx11h.h>
 
@@ -212,7 +212,7 @@ KSCD::KSCD( TQWidget *parent, const char *name )
 
   setFocusPolicy(TQ_NoFocus);
 
-  songListCB->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
+  songListCB->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Fixed);
   adjustSize();
   setFixedHeight(this->height());
 } // KSCD
@@ -550,7 +550,7 @@ void KSCD::trackChanged(unsigned track, unsigned trackLength)
             justTheName = justTheName.right(justTheName.length() - 4);
 
             TQToolTip::remove(songListCB);
-            TQToolTip::add(songListCB, i18n("Current track: %1").arg(justTheName));
+            TQToolTip::add(songListCB, i18n("Current track: %1").tqarg(justTheName));
         }
         timeSlider->blockSignals(true);
         timeSlider->setRange(0, trackLength ? trackLength - 1 : 0);
@@ -688,7 +688,7 @@ void KSCD::randomSelected()
 {
     setShuffle(Prefs::randomPlay()?0:1);
 
-    /* FIXME this helps us to display "Random" in Status line
+    /* FIXME this helps us to display "Random" in tqStatus line
        should it maybe to be replaced with symbol "RAND" or something others */
     statuslabel->setText(Prefs::randomPlay()?i18n("Random"):i18n("Play"));
 } // randomSelected
@@ -800,7 +800,7 @@ void KSCD::setDevicePaths()
     {
         // This device did not seem usable.
         TQString str = i18n("CD-ROM read or access error (or no audio disc in drive).\n"\
-                            "Please make sure you have access permissions to:\n%1").arg(
+                            "Please make sure you have access permissions to:\n%1").tqarg(
                              KCompactDisc::urlToDevice(Prefs::cdDevice()));
         KMessageBox::error(this, str, i18n("Error"));
     }
@@ -1211,8 +1211,8 @@ void KSCD::lookupCDDBDone(CDDB::Result result)
       CDInfoList::iterator it;
       TQStringList list;
       for ( it = cddb_info.begin(); it != cddb_info.end(); ++it  ) {
-        list.append( TQString("%1, %2, %3").arg((*it).artist).arg((*it).title)
-            .arg((*it).genre));
+        list.append( TQString("%1, %2, %3").tqarg((*it).artist).tqarg((*it).title)
+            .tqarg((*it).genre));
       }
 
       bool ok(false);
@@ -1313,7 +1313,7 @@ int KSCD::currentPosition()
     return m_cd->trackPosition();
 }
 
-int KSCD::getStatus()
+int KSCD::gettqStatus()
 {
     if (m_cd->isPlaying())
       return 2;
@@ -1419,62 +1419,62 @@ void KSCD::information(int i)
     {
         case 0:
             str = TQString("http://musicmoz.org/cgi-bin/ext.cgi?artist=%1")
-                   .arg(encodedArtist);
+                   .tqarg(encodedArtist);
             break;
 
          case 1:
             str = TQString("http://ubl.artistdirect.com/cgi-bin/gx.cgi/AppLogic+Search?select=MusicArtist&searchstr=%1&searchtype=NormalSearch")
-                .arg(encodedArtist);
+                .tqarg(encodedArtist);
             break;
 
         case 2:
             str = TQString("http://www.cduniverse.com/cgi-bin/cdubin.exe/rlinka/ean=%1")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 3:
             str = TQString("http://www.alltheweb.com/search?cat=web&q=%1")
-                    .arg(encodedArtist);
+                    .tqarg(encodedArtist);
             break;
 
         case 4:
             str = TQString("http://altavista.com/web/results?q=%1&kgs=0&kls=1&avkw=xytx")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 5:
             str = TQString("http://msxml.excite.com/_1_2UDOUB70SVHVHR__info.xcite/dog/results?otmpl=dog/webresults.htm&qkw=%1&qcat=web&qk=20&top=1&start=&ver=14060")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 6:
             str = TQString("http://www.google.com/search?q=%1")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 7:
             str = TQString("http://groups.google.com/groups?oi=djq&as_q=%1&num=20")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 8:
             str = TQString("http://www.hotbot.com/default.asp?prov=Inktomi&query=%1&ps=&loc=searchbox&tab=web")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
             break;
 
         case 9:
             str = TQString("http://search.lycos.com/default.asp?lpv=1&loc=searchhp&tab=web&query=%1")
-                  .arg(encodedArtist);
+                  .tqarg(encodedArtist);
              break;
 
          case 10:
              str = TQString("http://search.dmoz.org/cgi-bin/search?search=%1")
-                   .arg(encodedArtist);
+                   .tqarg(encodedArtist);
              break;
 
          case 11:
              str = TQString("http://search.yahoo.com/bin/search?p=%1")
-                   .arg(encodedArtist);
+                   .tqarg(encodedArtist);
              break;
 
          default:
@@ -1563,13 +1563,13 @@ TQStringList KSCD::trackList()
   return tracks;
 }
 
-void KSCD::populateSongList(TQString infoStatus)
+void KSCD::populateSongList(TQString infotqStatus)
 {
     // set the artist and title labels as well as the dock tooltip.
-    if (!infoStatus.isEmpty())
-        artistlabel->setText(infoStatus);
+    if (!infotqStatus.isEmpty())
+        artistlabel->setText(infotqStatus);
     else
-        artistlabel->setText(TQString("%1 - %2").arg(cddbInfo.artist, cddbInfo.title));
+        artistlabel->setText(TQString("%1 - %2").tqarg(cddbInfo.artist, cddbInfo.title));
 
     songListCB->clear();
     for (unsigned i = 0; i < cddbInfo.trackInfoList.count(); i++)