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

This reverts commit 5fb78f4b68672906005b059e7e5066c702bc5c90.

5 files changed, 36 insertions, 36 deletions

diff --git a/kradio3/plugins/gui-standard-display/displaycfg.cpp b/kradio3/plugins/gui-standard-display/displaycfg.cpp
index 8d4e1ca..0e92da7 100644
--- a/kradio3/plugins/gui-standard-display/displaycfg.cpp
+++ b/kradio3/plugins/gui-standard-display/displaycfg.cpp
@@ -20,7 +20,7 @@
 #include <kcolordialog.h>
 #include <kfontdialog.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <tqlabel.h>
 #include <tqbuttongroup.h>
@@ -32,9 +32,9 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
 {
     TQGroupBox *bg = new TQGroupBox(i18n("Display Colors"), this);
     bg->setColumnLayout(0, Qt::Vertical );
-    bg->layout()->setSpacing( 8 );
-    bg->layout()->setMargin( 12 );
-    TQGridLayout *gl = new TQGridLayout (bg->layout());
+    bg->tqlayout()->setSpacing( 8 );
+    bg->tqlayout()->setMargin( 12 );
+    TQGridLayout *gl = new TQGridLayout (bg->tqlayout());
 
     m_btnActive   = new KColorButton(queryDisplayActiveColor(), bg);
     m_btnInactive = new KColorButton(queryDisplayInactiveColor(), bg);
@@ -48,16 +48,16 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
     TQLabel *l2  = new TQLabel(i18n("Inactive Text"), bg);
     TQLabel *l3  = new TQLabel(i18n("Background Color"), bg);
 
-    l1->setAlignment(TQLabel::AlignCenter);
-    l2->setAlignment(TQLabel::AlignCenter);
-    l3->setAlignment(TQLabel::AlignCenter);
+    l1->tqsetAlignment(TQLabel::AlignCenter);
+    l2->tqsetAlignment(TQLabel::AlignCenter);
+    l3->tqsetAlignment(TQLabel::AlignCenter);
 
-    l1->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
-    l2->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
-    l3->setSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
-    m_btnActive  ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
-    m_btnInactive->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
-    m_btnBkgnd   ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+    l1->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    l2->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    l3->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+    m_btnActive  ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+    m_btnInactive->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+    m_btnBkgnd   ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 
     m_btnActive  ->setMinimumSize(TQSize(40, 40));
     m_btnInactive->setMinimumSize(TQSize(40, 40));
@@ -72,7 +72,7 @@ DisplayConfiguration::DisplayConfiguration(TQWidget *parent)
 
     m_fontChooser = new KFontChooser(this, NULL, false, TQStringList(), true, 4);
     m_fontChooser->setFont(queryDisplayFont());
-    m_fontChooser->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
+    m_fontChooser->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding));
 
     TQVBoxLayout  *l = new TQVBoxLayout(this, 10);
     l->addWidget(bg);
diff --git a/kradio3/plugins/gui-standard-display/radioview.cpp b/kradio3/plugins/gui-standard-display/radioview.cpp
index efe5bf1..c5f12f2 100644
--- a/kradio3/plugins/gui-standard-display/radioview.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqwidgetstack.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtoolbutton.h>
 #include <tqslider.h>
 #include <tqfile.h>
@@ -162,10 +162,10 @@ RadioView::RadioView(const TQString &name)
     btnSnooze->setIconSet(SmallIconSet("kradio_zzz"));
     btnPlugins->setIconSet(SmallIconSet("kradio_plugins"));
 
-    widgetStacks[clsRadioSound]  ->setSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,   TQSizePolicy::Preferred));
-    widgetStacks[clsRadioDisplay]->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
-    widgetStacks[clsRadioSeek]   ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
-    comboStations                ->setSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+    widgetStacks[clsRadioSound]  ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Minimum,   TQSizePolicy::Preferred));
+    widgetStacks[clsRadioDisplay]->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Preferred));
+    widgetStacks[clsRadioSeek]   ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
+    comboStations                ->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed));
     comboStations->setMinimumHeight(28);
 
 
@@ -439,7 +439,7 @@ bool RadioView::startRecordingWithFormat(
     querySoundStreamDescription(id, descr);
     int menu_id = m_NextRecordingMenuID++;
     m_RecordingMenu->insertItem(SmallIcon("kradio_record"),
-                                i18n("Stop Recording of %1").arg(descr),
+                                i18n("Stop Recording of %1").tqarg(descr),
                                 menu_id);
     m_MenuID2StreamID.insert(menu_id, id);
     m_StreamID2MenuID.insert(id, menu_id);
@@ -477,7 +477,7 @@ bool RadioView::noticeSoundStreamChanged(SoundStreamID id)
         querySoundStreamDescription(id, descr);
         m_RecordingMenu->changeItem(m_StreamID2MenuID[id],
                                     SmallIcon("kradio_record"),
-                                    i18n("Stop Recording of %1").arg(descr));
+                                    i18n("Stop Recording of %1").tqarg(descr));
         return true;
     }
     return false;
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
index f449122..17afde3 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyradio.cpp
@@ -185,11 +185,11 @@ bool RadioViewFrequencyRadio::setDisplayColors(const TQColor &activeText,
     if (parentWidget() && parentWidget()->backgroundPixmap() ){
         KPixmapIO io;
         TQImage  i = io.convertToImage(*parentWidget()->backgroundPixmap());
-        KImageEffect::fade(i, 0.5, colorGroup().color(TQColorGroup::Dark));
+        KImageEffect::fade(i, 0.5, tqcolorGroup().color(TQColorGroup::Dark));
         setPaletteBackgroundPixmap(io.convertToPixmap(i));
         setBackgroundOrigin(WindowOrigin);
     } else {
-        setBackgroundColor(colorGroup().color(TQColorGroup::Button));
+        setBackgroundColor(tqcolorGroup().color(TQColorGroup::Button));
     }
 
     if (change)
@@ -222,7 +222,7 @@ bool RadioViewFrequencyRadio::noticePowerChanged (bool on, const IRadioDevice */
     queryIsStereo(ssid, s);
     noticeStereoChanged(ssid, s);
 
-    repaint();
+    tqrepaint();
     return true;
 }
 
@@ -246,7 +246,7 @@ bool RadioViewFrequencyRadio::noticeSignalQualityChanged(SoundStreamID id, float
     if (queryCurrentSoundStreamID() != id)
         return false;
     m_quality = q;
-    repaint ();
+    tqrepaint ();
     return true;
 }
 
@@ -256,7 +256,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool  s)
     if (queryCurrentSoundStreamID() != id)
         return false;
     m_stereo = s;
-    repaint ();
+    tqrepaint ();
     return true;
 }
 
@@ -269,7 +269,7 @@ bool RadioViewFrequencyRadio::noticeStereoChanged(SoundStreamID id, bool  s)
 bool RadioViewFrequencyRadio::noticeFrequencyChanged(float f, const RadioStation *)
 {
     m_frequency = f;
-    repaint ();
+    tqrepaint ();
     return true;
 }
 
@@ -320,10 +320,10 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
          xx_sg = r.x() + margin,
          xy_sg = r.y() + margin;
 
-    TQPen activePen (colorGroup().color(TQColorGroup::Text), penw);
-    TQPen inactivePen (colorGroup().color(TQColorGroup::Mid), penw);
-    TQBrush activeBrush = colorGroup().brush(TQColorGroup::Text);
-    TQBrush inactiveBrush = colorGroup().brush(TQColorGroup::Mid);
+    TQPen activePen (tqcolorGroup().color(TQColorGroup::Text), penw);
+    TQPen inactivePen (tqcolorGroup().color(TQColorGroup::Mid), penw);
+    TQBrush activeBrush = tqcolorGroup().brush(TQColorGroup::Text);
+    TQBrush inactiveBrush = tqcolorGroup().brush(TQColorGroup::Mid);
 
     // draw stereo symbol
     paint->setPen(  (m_stereo && m_power) ? activePen : inactivePen);
@@ -403,9 +403,9 @@ void RadioViewFrequencyRadio::drawContents(TQPainter *paint)
 
     TQString s;
     if (m_frequency < 10) {
-        s = i18n("%1 kHz").arg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
+        s = i18n("%1 kHz").tqarg(KGlobal::locale()->formatNumber((int)(m_frequency * 1000), 0));
     } else {
-        s = i18n("%1 MHz").arg(KGlobal::locale()->formatNumber(m_frequency, 2));
+        s = i18n("%1 MHz").tqarg(KGlobal::locale()->formatNumber(m_frequency, 2));
     }
 
     float pxs = xh_f;
diff --git a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
index 318c049..e334e45 100644
--- a/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_frequencyseeker.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <math.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqtoolbutton.h>
 #include <tqaccel.h>
diff --git a/kradio3/plugins/gui-standard-display/radioview_volume.cpp b/kradio3/plugins/gui-standard-display/radioview_volume.cpp
index 8e4f024..abde874 100644
--- a/kradio3/plugins/gui-standard-display/radioview_volume.cpp
+++ b/kradio3/plugins/gui-standard-display/radioview_volume.cpp
@@ -17,7 +17,7 @@
 
 #include <math.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqaccel.h>
 #include <tqtooltip.h>
 
@@ -37,7 +37,7 @@ RadioViewVolume::RadioViewVolume(TQWidget *parent, const TQString &name)
 {
     float v = 0;
     SoundStreamID ssid = queryCurrentSoundStreamID();
-    sendLogDebug (TQString ("RadioViewVolume: ssid=%1").arg(ssid.getID()));
+    sendLogDebug (TQString ("RadioViewVolume: ssid=%1").tqarg(ssid.getID()));
     queryPlaybackVolume(ssid, v);
     m_slider = new TQSlider(SLIDER_MINVAL,
                            SLIDER_MAXVAL,