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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

17 files changed, 57 insertions, 57 deletions

diff --git a/kmid/channel.cpp b/kmid/channel.cpp
index 7d077dd7..2fe22de6 100644
--- a/kmid/channel.cpp
+++ b/kmid/channel.cpp
@@ -48,7 +48,7 @@ KMidChannel::KMidChannel(int chn,TQWidget *parent) : TQWidget (parent)
     keyboard = TQPixmap(locate("appdata","icons/keyboard.xpm"));
     penB = new TQPen (black);
     penW = new TQPen (white);
-    penT = new TQPen (colorGroup().background());
+    penT = new TQPen (tqcolorGroup().background());
 
     KConfig *kcfg=KGlobal::instance()->config();
     kcfg->setGroup("KMid");
@@ -87,7 +87,7 @@ void KMidChannel::paintEvent( TQPaintEvent * )
 
     TQPainter *qpaint=new TQPainter(this);
 
-    TQString tmp = i18n("Channel %1").arg(channel);
+    TQString tmp = i18n("Channel %1").tqarg(channel);
     qpaint->setFont(*qcvfont);
     qpaint->setPen(*penB);
     qpaint->drawText(2,20,tmp);
@@ -185,7 +185,7 @@ void KMidChannel::reset(int level)
         replay=TRUE;
     };
 
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KMidChannel::saveState(bool *p,int *pgm)
@@ -198,7 +198,7 @@ void KMidChannel::loadState(bool *p,int *pgm)
 {
     for (int i=0;i<128;i++) pressed[i]=p[i];
     instrumentCombo->setCurrentItem(*pgm);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KMidChannel::pgmChanged(int i)
diff --git a/kmid/channelcfgdlg.cpp b/kmid/channelcfgdlg.cpp
index 45d8fa0f..db320a28 100644
--- a/kmid/channelcfgdlg.cpp
+++ b/kmid/channelcfgdlg.cpp
@@ -9,7 +9,7 @@
 #include "channelview.h"
 #include "channelcfgdlg.h"
 #include "version.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqvbuttongroup.h>
 
 ChannelViewConfigDialog::ChannelViewConfigDialog(TQWidget *parent,const char *name) : KDialogBase(parent,name,TRUE,i18n("Configure Channel View"),Ok|Cancel, Ok)
diff --git a/kmid/collectdlg.cpp b/kmid/collectdlg.cpp
index 20ac8def..11158b18 100644
--- a/kmid/collectdlg.cpp
+++ b/kmid/collectdlg.cpp
@@ -164,7 +164,7 @@ void CollectionDialog::newCollection()
    int i=slman->createCollection(name.ascii());
    if (i==-1)
 	{
-	TQString s = i18n("The name '%1' is already used").arg(name);
+	TQString s = i18n("The name '%1' is already used").tqarg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
@@ -190,7 +190,7 @@ int i;
    i=slman->createCollection(name.ascii());
    if (i==-1)
 	{
-	TQString s = i18n("The name '%1' is already used").arg(name);
+	TQString s = i18n("The name '%1' is already used").tqarg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
@@ -232,7 +232,7 @@ if (idx==0) return;
   {
    if (slman->getCollection(name.ascii())!=NULL)
 	{
-	TQString s = i18n("The name '%1' is already used").arg(name);
+	TQString s = i18n("The name '%1' is already used").tqarg(name);
 	KMessageBox::sorry(this, s);
 	}
 	else
diff --git a/kmid/kdisptext.cpp b/kmid/kdisptext.cpp
index a0e7461d..72436009 100644
--- a/kmid/kdisptext.cpp
+++ b/kmid/kdisptext.cpp
@@ -26,7 +26,7 @@
 #include <tqfont.h>
 #include <tqfontmetrics.h>
 #include <tqrect.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kconfig.h>
 #include <kglobal.h>
@@ -125,7 +125,7 @@ void KDisplayText::ClearEv(bool totally)
     TQT_TQOBJECT(this)->killTimers();
     autoscrollv=0;
     resizeContents(0,0);
-    viewport()->repaint(TRUE);
+    viewport()->tqrepaint(TRUE);
   }
 }
 
@@ -367,7 +367,7 @@ void KDisplayText::CursorToHome(void)
 
 
     setContentsPos(0,0);
-    viewport()->repaint(true);
+    viewport()->tqrepaint(true);
 } 
 
 void KDisplayText::PaintIn(int type)
@@ -487,7 +487,7 @@ void KDisplayText::gotomsec(ulong i)
 	TQT_TQOBJECT(this)->killTimers();
 	autoscrollv=0;
         setContentsPos(0,first_line->ypos);
-        viewport()->repaint();
+        viewport()->tqrepaint();
         
     }
 }
@@ -508,7 +508,7 @@ void KDisplayText::fontChanged(void)
     qfmetr=new TQFontMetrics(*qtextfont);
     calculatePositions();
     nvisiblelines=height()/qfmetr->lineSpacing();
-    viewport()->repaint(TRUE);
+    viewport()->tqrepaint(TRUE);
 }
 
 void KDisplayText::ChangeTypeOfTextEvents(int type)
@@ -534,7 +534,7 @@ void KDisplayText::ChangeTypeOfTextEvents(int type)
 
         setContentsPos(0,first_line->ypos);
     }
-    viewport()->repaint(TRUE);
+    viewport()->tqrepaint(TRUE);
 }
 
 int KDisplayText::ChooseTypeOfTextEvents(void)
diff --git a/kmid/kdisptext.h b/kmid/kdisptext.h
index 2c331425..8cd9939f 100644
--- a/kmid/kdisptext.h
+++ b/kmid/kdisptext.h
@@ -113,7 +113,7 @@ public:
     
     void setLyricsEncoding(const TQString &enc);
 
-//    TQSize sizeHint();
+//    TQSize tqsizeHint();
  
 public slots:
     void ScrollDown();
diff --git a/kmid/klcdnumber.cpp b/kmid/klcdnumber.cpp
index 3fdf80c4..355f9578 100644
--- a/kmid/klcdnumber.cpp
+++ b/kmid/klcdnumber.cpp
@@ -197,7 +197,7 @@ void KLCDNumber::setValue(double v)
 void KLCDNumber::display (double v)
 {
     setValue(v);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KLCDNumber::display (int v)
@@ -317,13 +317,13 @@ void KLCDNumber::defaultValueClicked()
 void KLCDNumber::setLCDBackgroundColor(int r,int g,int b)
 {
     backgcolor=TQColor(r,g,b);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KLCDNumber::setLCDColor(int r,int g,int b)
 {
     LCDcolor=TQColor(r,g,b);
-    repaint(FALSE);
+    tqrepaint(FALSE);
 }
 
 void KLCDNumber::setRange(double min, double max)
@@ -332,7 +332,7 @@ void KLCDNumber::setRange(double min, double max)
     maxValue=max;
 }
 
-TQSize KLCDNumber::sizeHint()
+TQSize KLCDNumber::tqsizeHint()
 {
     return TQSize(83,28);
 }
diff --git a/kmid/klcdnumber.h b/kmid/klcdnumber.h
index 6f9096c4..cf1fca4e 100644
--- a/kmid/klcdnumber.h
+++ b/kmid/klcdnumber.h
@@ -121,7 +121,7 @@ public:
     void display (int v);
     void display (double v);
 
-    TQSize sizeHint ();
+    TQSize tqsizeHint ();
 //    TQSizePolicy sizePolicy();
 
 protected:
diff --git a/kmid/kmidclient.cpp b/kmid/kmidclient.cpp
index ce4a18fd..706e7cbf 100644
--- a/kmid/kmidclient.cpp
+++ b/kmid/kmidclient.cpp
@@ -35,7 +35,7 @@
 #include <tqlabel.h>
 #include <tqfile.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>
 #include <kcharsets.h>
@@ -96,7 +96,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
     connect (timebar,TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(slotSeek(int)));
 
     timetags = new QSliderTime(timebar,this);
-    timetags->setMinimumSize(timetags->sizeHint());
+    timetags->setMinimumSize(timetags->tqsizeHint());
 
     qlabelTempo= new TQLabel(i18n("Tempo:"), this,"tempolabel",
                             TQLabel::NoFrame);
@@ -108,7 +108,7 @@ kmidClient::kmidClient(TQWidget *parent, KActionCollection *ac, const char *name
     tempoLCD->setRange(3,999);
     tempoLCD->setDefaultValue(120);
     tempoLCD->setUserSetDefaultValue(true);
-    tempoLCD->setMinimumSize(tempoLCD->sizeHint());
+    tempoLCD->setMinimumSize(tempoLCD->tqsizeHint());
     connect(tempoLCD,TQT_SIGNAL(valueChanged(double)),this,TQT_SLOT(slotSetTempo(double)));
 
     comboSongs = new TQComboBox(FALSE, this,"Songs");
@@ -290,10 +290,10 @@ int kmidClient::openFile(const char *filename)
         switch (r)
         {
         case (-1) : errormsg =
-                            i18n("The file %1 does not exist or cannot be opened.").arg(filename);
+                            i18n("The file %1 does not exist or cannot be opened.").tqarg(filename);
         break;
         case (-2) : errormsg =
-                            i18n("The file %1 is not a MIDI file.").arg(filename);break;
+                            i18n("The file %1 is not a MIDI file.").tqarg(filename);break;
         case (-3) : errormsg =
                             i18n("Ticks per quarter note is negative. Please send this file to larrosa@kde.org");break;
         case (-4) : errormsg =
@@ -301,7 +301,7 @@ int kmidClient::openFile(const char *filename)
         case (-5) : errormsg =
                             i18n("This file is corrupted or not well built.");break;
         case (-6) : errormsg =
-                            i18n("%1 is not a regular file.").arg(filename);break;
+                            i18n("%1 is not a regular file.").tqarg(filename);break;
         default :   errormsg = i18n("Unknown error message");break;
         }
         KMessageBox::error(this, errormsg);
@@ -310,10 +310,10 @@ int kmidClient::openFile(const char *filename)
         midifile_opened=0L;
         timebar->setRange(0,240000);
         timebar->setValue(0);
-        timetags->repaint(TRUE);
+        timetags->tqrepaint(TRUE);
         kdispt->ClearEv();
-        kdispt->repaint(TRUE);
-        topLevelWidget()->setCaption("KMid");
+        kdispt->tqrepaint(TRUE);
+        tqtopLevelWidget()->setCaption("KMid");
 
         return -1;
     }
@@ -327,7 +327,7 @@ int kmidClient::openFile(const char *filename)
     //    noteArray=player->parseNotes();
     noteArray=player->noteArray();
     timebar->setRange(0,(int)(player->information()->millisecsTotal));
-    timetags->repaint(TRUE);
+    timetags->tqrepaint(TRUE);
     kdispt->ClearEv();
     spev=player->specialEvents();
     while (spev)
@@ -343,7 +343,7 @@ int kmidClient::openFile(const char *filename)
     kdispt->CursorToHome();
 //    kdispt->updateScrollBars();
     emit mustRechooseTextEvent();
-    kdispt->repaint(TRUE);
+    kdispt->tqrepaint(TRUE);
     tempoLCD->display(tempoToMetronomeTempo(m_kMid.pctl->tempo));
     currentTempo=tempoLCD->getValue();
     tempoLCD->setDefaultValue(tempoToMetronomeTempo(m_kMid.pctl->tempo)*m_kMid.pctl->ratioTempo);
@@ -353,7 +353,7 @@ int kmidClient::openFile(const char *filename)
     char *capt=new char[strlen(fn)+20];
     sprintf(capt,"KMid - %s",fn);
     delete fn;
-    topLevelWidget()->setCaption(capt);
+    tqtopLevelWidget()->setCaption(capt);
     delete capt;
 
     timebar->setValue(0);
@@ -1129,7 +1129,7 @@ void kmidClient::repaintText(int type)
 {
     kdispt->ChangeTypeOfTextEvents(type);
     typeoftextevents=type;
-    kdispt->repaint(TRUE);
+    kdispt->tqrepaint(TRUE);
 }
 
 int kmidClient::ChooseTypeOfTextEvents(void)
@@ -1265,12 +1265,12 @@ void kmidClient::slotSelectSong(int i)
         player->removeSong();
         timebar->setRange(0,240000);
         timebar->setValue(0);
-        timetags->repaint(TRUE);
+        timetags->tqrepaint(TRUE);
         kdispt->ClearEv();
-        kdispt->repaint(TRUE);
+        kdispt->tqrepaint(TRUE);
         comboSongs->clear();
-        comboSongs->repaint(TRUE);
-        topLevelWidget()->setCaption("KMid");
+        comboSongs->tqrepaint(TRUE);
+        tqtopLevelWidget()->setCaption("KMid");
         return;
     }
 
@@ -1487,7 +1487,7 @@ void kmidClient::slotSetTempo(double value)
 
     timebar->setRange(0,(int)(player->information()->millisecsTotal));
     timebar->setValue(pausedatmillisec);
-    timetags->repaint(TRUE);
+    timetags->tqrepaint(TRUE);
 
     kdispt->ClearEv(false);
 
@@ -1522,9 +1522,9 @@ void kmidClient::downloadFinished(KIO::Job *)
     kapp->exit_loop();
 }
 
-TQSize kmidClient::sizeHint() const
+TQSize kmidClient::tqsizeHint() const
 {
-    TQSize sh = TQWidget::sizeHint();
+    TQSize sh = TQWidget::tqsizeHint();
     return sh.expandedTo(TQSize(560,420));
 }
 
diff --git a/kmid/kmidclient.h b/kmid/kmidclient.h
index 3b6fbad8..dbfa7518 100644
--- a/kmid/kmidclient.h
+++ b/kmid/kmidclient.h
@@ -217,7 +217,7 @@ public:
     void setCurrentSong(int i);
     void setPlayListMode(int i);
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 private:
     TQSlider *timebar;
     QSliderTime *timetags;
diff --git a/kmid/kmidframe.cpp b/kmid/kmidframe.cpp
index 0b02c608..9ebf9f84 100644
--- a/kmid/kmidframe.cpp
+++ b/kmid/kmidframe.cpp
@@ -567,7 +567,7 @@ void kmidFrame::file_SaveLyrics()
 
   if (stat(TQFile::encodeName(filename), &statbuf)!=-1)
   {
-    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").arg(filename);
+    TQString s = i18n("File %1 already exists\nDo you want to overwrite it?").tqarg(filename);
     if (KMessageBox::warningYesNo(this,s,TQString(),i18n("Overwrite"),KStdGuiItem::cancel())==1)
       return;
   }
diff --git a/kmid/ktrianglebutton.cpp b/kmid/ktrianglebutton.cpp
index e94f0980..155daf31 100644
--- a/kmid/ktrianglebutton.cpp
+++ b/kmid/ktrianglebutton.cpp
@@ -47,7 +47,7 @@ void KTriangleButton::enterEvent( TQEvent* )
   if ( isEnabled() )
     {
       raised = TRUE;
-      repaint(FALSE);
+      tqrepaint(FALSE);
     }
 }
 
@@ -56,7 +56,7 @@ void KTriangleButton::leaveEvent( TQEvent * )
   if( raised != FALSE )
     {
       raised = FALSE;
-      repaint();
+      tqrepaint();
     }
 }
 
@@ -75,21 +75,21 @@ void KTriangleButton::paint( TQPainter *painter )
 {
   if ( isDown() || isOn() )
     {
-      if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
 	qDrawWinButton( painter, 0, 0, width(),
-			height(), colorGroup(), TRUE );
+			height(), tqcolorGroup(), TRUE );
       else
 	qDrawShadePanel( painter, 0, 0, width(),
-			 height(), colorGroup(), TRUE, 2, 0L );
+			 height(), tqcolorGroup(), TRUE, 2, 0L );
     }
   else if ( raised )
     {
-      if ( tqstyle().styleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
+      if ( tqstyle().tqstyleHint(TQStyle::SH_GUIStyle) == WindowsStyle )
 	qDrawWinButton( painter, 0, 0, width(), height(),
-			colorGroup(), FALSE );
+			tqcolorGroup(), FALSE );
       else
 	qDrawShadePanel( painter, 0, 0, width(), height(),
-			 colorGroup(), FALSE, 2, 0L );
+			 tqcolorGroup(), FALSE, 2, 0L );
     }
 
   if (dir==Right)
diff --git a/kmid/main.cpp b/kmid/main.cpp
index 4e83d57f..45cd1fab 100644
--- a/kmid/main.cpp
+++ b/kmid/main.cpp
@@ -26,7 +26,7 @@
 #include <signal.h>
 
 #include <tqwidget.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kapplication.h>
 #include <klocale.h>
diff --git a/kmid/midicfgdlg.cpp b/kmid/midicfgdlg.cpp
index 8a434711..00497d05 100644
--- a/kmid/midicfgdlg.cpp
+++ b/kmid/midicfgdlg.cpp
@@ -24,7 +24,7 @@
 #include <tqpushbutton.h>
 #include <tqlistbox.h>
 #include <tqlabel.h> 
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>
 #include <kfiledialog.h>
@@ -56,7 +56,7 @@ MidiConfigDialog::MidiConfigDialog(DeviceManager *dm,
   for (int i=0;i<devman->midiPorts()+devman->synthDevices();i++)
   {
     if (strcmp(devman->type(i),"")!=0)    
-      temp = TQString("%1 - %2").arg(devman->name(i)).arg(devman->type(i));
+      temp = TQString("%1 - %2").tqarg(devman->name(i)).tqarg(devman->type(i));
     else
       temp = devman->name(i);
 
diff --git a/kmid/qslidertime.cpp b/kmid/qslidertime.cpp
index aa879da5..ba1b62f8 100644
--- a/kmid/qslidertime.cpp
+++ b/kmid/qslidertime.cpp
@@ -108,7 +108,7 @@ if (kslider==NULL) return;
 }  
 
 
-TQSize QSliderTime::sizeHint()
+TQSize QSliderTime::tqsizeHint()
 {
   return TQSize(10,fontheight+2);
 }
diff --git a/kmid/qslidertime.h b/kmid/qslidertime.h
index 3dda085d..a409332b 100644
--- a/kmid/qslidertime.h
+++ b/kmid/qslidertime.h
@@ -43,7 +43,7 @@ public:
 
   int getFontHeight(void) {return fontheight;};
 
-  TQSize sizeHint();
+  TQSize tqsizeHint();
   TQSizePolicy sizePolicy();
 
 private:
diff --git a/kmid/rhythmview.cpp b/kmid/rhythmview.cpp
index 240ee242..49499d46 100644
--- a/kmid/rhythmview.cpp
+++ b/kmid/rhythmview.cpp
@@ -95,7 +95,7 @@ void RhythmView::resizeEvent(TQResizeEvent *)
     }
 }
 
-TQSize RhythmView::sizeHint()
+TQSize RhythmView::tqsizeHint()
 {
     return TQSize(10,10);
 }
diff --git a/kmid/rhythmview.h b/kmid/rhythmview.h
index 8af09613..97a7ae1a 100644
--- a/kmid/rhythmview.h
+++ b/kmid/rhythmview.h
@@ -43,7 +43,7 @@ public:
 
     void Beat(void); // Just increase the beat
 
-    TQSize sizeHint();
+    TQSize tqsizeHint();
     TQSizePolicy sizePolicy();
 
 private: