TQt4 port kdemultimedia

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdemultimedia@1236079 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

41 files changed, 161 insertions, 141 deletions

diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.cpp b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
index 583266e0..cab5be35 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.cpp
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.cpp
@@ -72,13 +72,13 @@ GuiSpectrumAnalyser::~GuiSpectrumAnalyser()
 
 void GuiSpectrumAnalyser::mousePressEvent ( TQMouseEvent *e )
 {
-    if (e->button() == LeftButton) {
+    if (e->button() == Qt::LeftButton) {
         if (visualization_mode == MODE_DISABLED)
             setVisualizationMode(MODE_ANALYSER);
         else
             setVisualizationMode(MODE_DISABLED);
     }
-    else if (e->button() == RightButton) {
+    else if (e->button() == Qt::RightButton) {
         contextMenu->popup(mapToGlobal(TQPoint(e->x(), e->y())));
     }
 }
@@ -138,7 +138,7 @@ void GuiSpectrumAnalyser::setVisualizationMode(int mode)
     {
         if (!winSkinVis)
         {
-            winSkinVis=new WinSkinVis(this,"WinSkinVis");
+            winSkinVis=new WinSkinVis(TQT_TQOBJECT(this),"WinSkinVis");
             connect(winSkinVis,TQT_SIGNAL(doRepaint()),this,TQT_SLOT(updatePeaks()));
         }
     }
diff --git a/noatun/modules/winskin/guiSpectrumAnalyser.h b/noatun/modules/winskin/guiSpectrumAnalyser.h
index e2dd3431..8cffa3d6 100644
--- a/noatun/modules/winskin/guiSpectrumAnalyser.h
+++ b/noatun/modules/winskin/guiSpectrumAnalyser.h
@@ -29,6 +29,7 @@ enum analyserMode {MODE_NORMAL = 0, MODE_FIRE = 1, MODE_VERTICAL_LINES = 2};
 
 class GuiSpectrumAnalyser : public WaWidget  {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
     GuiSpectrumAnalyser();
diff --git a/noatun/modules/winskin/vis/realFFT.cpp b/noatun/modules/winskin/vis/realFFT.cpp
index 330280ea..383831b7 100644
--- a/noatun/modules/winskin/vis/realFFT.cpp
+++ b/noatun/modules/winskin/vis/realFFT.cpp
@@ -20,7 +20,7 @@
 RealFFT::RealFFT(int fftlen) {
    int i;
    int temp;
-   int mask;
+   int tqmask;
 
    /*
     *  FFT size is only half the number of data points
@@ -43,8 +43,8 @@ RealFFT::RealFFT(int fftlen) {
    for(i=0;i<Points/2;i++)
    {
       temp=0;
-      for(mask=Points/4;mask>0;mask >>= 1)
-         temp=(temp >> 1) + (i&mask ? Points/2 : 0);
+      for(tqmask=Points/4;tqmask>0;tqmask >>= 1)
+         temp=(temp >> 1) + (i&tqmask ? Points/2 : 0);
 
       BitReversed[i]=temp;
    }
diff --git a/noatun/modules/winskin/vis/visQueue.h b/noatun/modules/winskin/vis/visQueue.h
index 2f737fd1..9360805a 100644
--- a/noatun/modules/winskin/vis/visQueue.h
+++ b/noatun/modules/winskin/vis/visQueue.h
@@ -11,8 +11,8 @@
  */
 
 
-#ifndef __VISQUEUE_H
-#define __VISQUEUE_H
+#ifndef __VISTQUEUE_H
+#define __VISTQUEUE_H
 
 
 #include <vector>
diff --git a/noatun/modules/winskin/waBalanceSlider.h b/noatun/modules/winskin/waBalanceSlider.h
index d120bcc7..cd10aa96 100644
--- a/noatun/modules/winskin/waBalanceSlider.h
+++ b/noatun/modules/winskin/waBalanceSlider.h
@@ -20,7 +20,8 @@
 #include "waWidget.h"
 
 class WaBalanceSlider : public WaWidget {
-    Q_OBJECT 
+    Q_OBJECT
+    TQ_OBJECT
 
   public:
      WaBalanceSlider();
diff --git a/noatun/modules/winskin/waButton.cpp b/noatun/modules/winskin/waButton.cpp
index da113c87..4946d548 100644
--- a/noatun/modules/winskin/waButton.cpp
+++ b/noatun/modules/winskin/waButton.cpp
@@ -50,7 +50,7 @@ void WaButton::paintEvent(TQPaintEvent *) {
 
 
 void WaButton::mousePressEvent(TQMouseEvent* e) {
-    if (e->button() != LeftButton) {
+    if (e->button() != Qt::LeftButton) {
         // We can't deal with it, but maybe the widget can do something clever
         WaWidget::mousePressEvent(e);
     }
@@ -68,7 +68,7 @@ void WaButton::mouseReleaseEvent(TQMouseEvent* e) {
     else {
         pressed = false;
 
-        if (this->rect().contains(e->pos())){
+        if (TQT_TQRECT_OBJECT(this->rect()).tqcontains(e->pos())){
             if (_togglable) {
                 _toggled = !_toggled;
                 emit(toggleEvent(_toggled));
diff --git a/noatun/modules/winskin/waButton.h b/noatun/modules/winskin/waButton.h
index bfaf43ff..a6e67548 100644
--- a/noatun/modules/winskin/waButton.h
+++ b/noatun/modules/winskin/waButton.h
@@ -21,6 +21,7 @@
 
 class WaButton : public WaWidget {
   Q_OBJECT
+  TQ_OBJECT
  public:
    WaButton(int mapId);
    ~WaButton();
diff --git a/noatun/modules/winskin/waClutterbar.h b/noatun/modules/winskin/waClutterbar.h
index 5a96993a..b7560039 100644
--- a/noatun/modules/winskin/waClutterbar.h
+++ b/noatun/modules/winskin/waClutterbar.h
@@ -6,6 +6,7 @@
 
 class WaClutterbar : public WaWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaClutterbar();
diff --git a/noatun/modules/winskin/waDigit.cpp b/noatun/modules/winskin/waDigit.cpp
index 15a3ae46..b81a0da2 100644
--- a/noatun/modules/winskin/waDigit.cpp
+++ b/noatun/modules/winskin/waDigit.cpp
@@ -57,28 +57,28 @@ void WaDigit::paintEvent(TQPaintEvent *)
     // continue parsing
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_MINUS);
     if (len == 6) {
-        waSkinModel->getDigit('-', this, mapRect.x() - x, mapRect.y() - y);
+        waSkinModel->getDigit('-', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
         time++;
     }
     else {
-        waSkinModel->getDigit(' ', this, mapRect.x() - x, mapRect.y() - y);
+        waSkinModel->getDigit(' ', TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
     }
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_1);
-    waSkinModel->getDigit(time[0], this, mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[0], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_2);
-    waSkinModel->getDigit(time[1], this, mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[1], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_3);
-    waSkinModel->getDigit(time[3], this, mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[3], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
 
     mapRect = waSkinModel->getMapGeometry(_WA_MAPPING_DIGIT_4);
-    waSkinModel->getDigit(time[4], this, mapRect.x() - x, mapRect.y() - y);
+    waSkinModel->getDigit(time[4], TQT_TQPAINTDEVICE(this), mapRect.x() - x, mapRect.y() - y);
 }
 
 void WaDigit::mousePressEvent(TQMouseEvent* e) {
-    if (e->button() == LeftButton) {
+    if (e->button() == Qt::LeftButton) {
         reverse_time = !reverse_time;
         emit digitsClicked();
     }
diff --git a/noatun/modules/winskin/waDigit.h b/noatun/modules/winskin/waDigit.h
index cee5da1d..905431bd 100644
--- a/noatun/modules/winskin/waDigit.h
+++ b/noatun/modules/winskin/waDigit.h
@@ -22,6 +22,7 @@
 
 class WaDigit : public WaWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaDigit();
diff --git a/noatun/modules/winskin/waIndicator.h b/noatun/modules/winskin/waIndicator.h
index b4d37482..1c26da6b 100644
--- a/noatun/modules/winskin/waIndicator.h
+++ b/noatun/modules/winskin/waIndicator.h
@@ -22,6 +22,7 @@
 
 class WaIndicator : public WaWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaIndicator(int widget_mapping, int enabled_mapping, int disabled_mapping);
diff --git a/noatun/modules/winskin/waInfo.cpp b/noatun/modules/winskin/waInfo.cpp
index d64191da..fb923994 100644
--- a/noatun/modules/winskin/waInfo.cpp
+++ b/noatun/modules/winskin/waInfo.cpp
@@ -30,7 +30,7 @@ WaInfo::WaInfo() : WaWidget(_WA_MAPPING_INFO)
 
     completePixmap = new TQPixmap();
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     completePixmap->resize(size.width(), size.height());
 
     xGrabbedPos = -1;
@@ -55,7 +55,7 @@ void WaInfo::timeEvent()
         }
 
         if (isVisible())
-            repaint(false);
+            tqrepaint(false);
     }
 }
 
@@ -65,7 +65,7 @@ void WaInfo::scrollerSetup()
     xScrollPos = 0;
     xScrollDirection = 0;
     timer->stop();
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     if (completePixmap->width() > size.width()) {
 		xScrollDirection = 1;
 		
@@ -79,7 +79,7 @@ void WaInfo::scrollerSetup()
 
 void WaInfo::paintEvent(TQPaintEvent *)
 {
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     if (completePixmap->width() <= size.width()) {
 	bitBlt(this, 0, 0, completePixmap);
@@ -127,12 +127,12 @@ void WaInfo::pixmapChange()
     int x = 0;
     int n=infoString ? strlen(infoString) : 0;
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
-    completePixmap->resize(QMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
+    completePixmap->resize(TQMAX(n * _WA_TEXT_WIDTH, size.width()), _WA_TEXT_HEIGHT);
 
     for (i = 0; i < n; i++) {
-	WaSkinModel::instance()->getText(infoString[i], completePixmap, x, 0);
+	WaSkinModel::instance()->getText(infoString[i], TQT_TQPAINTDEVICE(completePixmap), x, 0);
 	x += _WA_TEXT_WIDTH;
     }
 
@@ -140,7 +140,7 @@ void WaInfo::pixmapChange()
     // fill the pixmap with spaces
     if (x < size.width()) {
 	while (x < size.width()) {
-	    WaSkinModel::instance()->getText(' ', completePixmap, x, 0);
+	    WaSkinModel::instance()->getText(' ', TQT_TQPAINTDEVICE(completePixmap), x, 0);
 	    x += _WA_TEXT_WIDTH;
 	}
     }
@@ -150,7 +150,7 @@ void WaInfo::pixmapChange()
 }
 
 void WaInfo::mousePressEvent (TQMouseEvent *e) {
-    if (e->button() == LeftButton)
+    if (e->button() == Qt::LeftButton)
         xGrabbedPos = (e->x() + xScrollPos) % completePixmap->width();
 }
 
diff --git a/noatun/modules/winskin/waInfo.h b/noatun/modules/winskin/waInfo.h
index 32d310e4..3a6dfe29 100644
--- a/noatun/modules/winskin/waInfo.h
+++ b/noatun/modules/winskin/waInfo.h
@@ -23,6 +23,7 @@
 
 class WaInfo : public WaWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaInfo();
diff --git a/noatun/modules/winskin/waJumpSlider.h b/noatun/modules/winskin/waJumpSlider.h
index e8a48b1f..56d37d05 100644
--- a/noatun/modules/winskin/waJumpSlider.h
+++ b/noatun/modules/winskin/waJumpSlider.h
@@ -20,6 +20,7 @@
 
 class WaJumpSlider : public WaWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaJumpSlider();
diff --git a/noatun/modules/winskin/waLabel.cpp b/noatun/modules/winskin/waLabel.cpp
index 54b7513b..bb16d118 100644
--- a/noatun/modules/winskin/waLabel.cpp
+++ b/noatun/modules/winskin/waLabel.cpp
@@ -24,7 +24,7 @@ WaLabel::WaLabel(int mapping) : WaWidget(mapping)
 
     completePixmap = new TQPixmap();
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     completePixmap->resize(size.width(), size.height());
 }
@@ -58,7 +58,7 @@ void WaLabel::pixmapChange()
     int n = label_text ? strlen(label_text) : 0;
 
     for (int i = 0; i < n; i++) 
-	WaSkinModel::instance()->getText(label_text[i], completePixmap, 
+	WaSkinModel::instance()->getText(label_text[i], TQT_TQPAINTDEVICE(completePixmap), 
 				      i * _WA_TEXT_WIDTH, 0);
 }
 
diff --git a/noatun/modules/winskin/waLabel.h b/noatun/modules/winskin/waLabel.h
index ce7ad771..7303e4a0 100644
--- a/noatun/modules/winskin/waLabel.h
+++ b/noatun/modules/winskin/waLabel.h
@@ -17,7 +17,8 @@
 #include "waWidget.h"
 
 class WaLabel : public WaWidget {
-    Q_OBJECT 
+    Q_OBJECT
+    TQ_OBJECT
 
   public:
      WaLabel(int mapping);
diff --git a/noatun/modules/winskin/waMain.h b/noatun/modules/winskin/waMain.h
index fbc47a64..94ae5e83 100644
--- a/noatun/modules/winskin/waMain.h
+++ b/noatun/modules/winskin/waMain.h
@@ -5,6 +5,7 @@
 
 class WaMain : WaWidget {
     Q_OBJECT
+    TQ_OBJECT
 public:
     WaMain();
     ~WaMain();
diff --git a/noatun/modules/winskin/waRegion.cpp b/noatun/modules/winskin/waRegion.cpp
index 06f6851e..5f968b00 100644
--- a/noatun/modules/winskin/waRegion.cpp
+++ b/noatun/modules/winskin/waRegion.cpp
@@ -31,14 +31,14 @@ WaRegion::WaRegion(TQString filename) {
     KSimpleConfig regionFile(filename, true);
 
     // Clear our variables by default
-    window_mask = 0;
-    shade_mask = 0;
+    window_tqmask = 0;
+    shade_tqmask = 0;
 
     // Make the new bitmaps, default window size
-    window_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true);  
-    shade_mask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true);  
+    window_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_MAIN).size(), true);  
+    shade_tqmask = new TQBitmap(WaSkinModel::instance()->getMapGeometry(_WA_MAPPING_TITLE).size(), true);  
 
-    // Load the normal window mask data
+    // Load the normal window tqmask data
     regionFile.setGroup("Normal");
     
     TQValueList<int> num_points;
@@ -53,27 +53,27 @@ WaRegion::WaRegion(TQString filename) {
             point_list = parseList(regionFile.readEntry(pointListNames[x]));
     }
 
-    // Now build the mask
-    buildPixmap(num_points, point_list, window_mask);
+    // Now build the tqmask
+    buildPixmap(num_points, point_list, window_tqmask);
 
-    // Load the windowshade mask data
+    // Load the windowshade tqmask data
     regionFile.setGroup("WindowShade");
    
     num_points = parseList(regionFile.readEntry("NumPoints"));
     point_list = parseList(regionFile.readEntry("PointList"));
 
-    // Now build the mask
-    buildPixmap(num_points, point_list, shade_mask);
+    // Now build the tqmask
+    buildPixmap(num_points, point_list, shade_tqmask);
 }
 
 WaRegion::~WaRegion() {
-   delete window_mask;
-   delete shade_mask;
+   delete window_tqmask;
+   delete shade_tqmask;
 }
 
 void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValueList<int> &points_list, TQBitmap *dest) {
     if (!num_points_list.count()) {
-        dest->fill(Qt::color1);
+        dest->fill(TQt::color1);
         return;
     }
 
@@ -85,8 +85,8 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu
     TQBitmap bm(dest->width()+1,dest->height()+1,true);
     TQPainter bmp(&bm);
 
-    bmp.setBrush(Qt::color1);
-    bmp.setPen(Qt::NoPen); // The polygon border itself should not be part of the visible window
+    bmp.setBrush(TQt::color1);
+    bmp.setPen(TQt::NoPen); // The polygon border itself should not be part of the visible window
 
     // Go over each "region" in the file
     for (TQValueList<int>::const_iterator num_points = num_points_list.begin();num_points != num_points_list.end();num_points++) {
@@ -101,7 +101,7 @@ void WaRegion::buildPixmap(const TQValueList<int> &num_points_list, const TQValu
             point_array.setPoint(i, x, y);
         }
 
-        // Now draw it as a filled polygon on the mask
+        // Now draw it as a filled polygon on the tqmask
         bmp.drawPolygon(point_array);
     }
 
diff --git a/noatun/modules/winskin/waRegion.h b/noatun/modules/winskin/waRegion.h
index 66c7c811..737ebdb9 100644
--- a/noatun/modules/winskin/waRegion.h
+++ b/noatun/modules/winskin/waRegion.h
@@ -9,15 +9,15 @@ public:
     WaRegion(TQString filename);
     ~WaRegion();
 
-    const TQBitmap *mainWindowMask() const { return window_mask; }
-    const TQBitmap *mainWindowShadeMask() const { return shade_mask; }
+    const TQBitmap *mainWindowMask() const { return window_tqmask; }
+    const TQBitmap *mainWindowShadeMask() const { return shade_tqmask; }
 
 private:
    TQValueList<int> parseList(const TQString &list) const;
    void buildPixmap(const TQValueList<int> &num_points, const TQValueList<int> &point_list, TQBitmap *dest);
 
-   TQBitmap *window_mask;
-   TQBitmap *shade_mask;
+   TQBitmap *window_tqmask;
+   TQBitmap *shade_tqmask;
 };
 
 extern WaRegion *windowRegion;
diff --git a/noatun/modules/winskin/waShadeMapping.h b/noatun/modules/winskin/waShadeMapping.h
index d28d4ca8..a20fcf6d 100644
--- a/noatun/modules/winskin/waShadeMapping.h
+++ b/noatun/modules/winskin/waShadeMapping.h
@@ -107,10 +107,10 @@ static const SkinDesc shadeMapFromFile[] = {
     {_WA_FILE_SHUFREP, 69, 61, 23, 12},   // _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES
     {_WA_FILE_SHUFREP, 23, 73, 23, 12},   // _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM
     {_WA_FILE_SHUFREP, 73, 23, 12},       // _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES
-    {_WA_FILE_SHUFREP, 0, 61, 23, 12},    // _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM
-    {_WA_FILE_SHUFREP, 46, 61, 23, 12},   // _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES
-    {_WA_FILE_SHUFREP, 0, 73, 23, 12},    // _WA_SKIN_SHUFREP_EQ_SET_NORM
-    {_WA_FILE_SHUFREP, 46, 73, 23, 12},   // _WA_SKIN_SHUFREP_EQ_SET_PRES
+    {_WA_FILE_SHUFREP, 0, 61, 23, 12},    // _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM
+    {_WA_FILE_SHUFREP, 46, 61, 23, 12},   // _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES
+    {_WA_FILE_SHUFREP, 0, 73, 23, 12},    // _WA_SKIN_SHUFREP_ETQ_SET_NORM
+    {_WA_FILE_SHUFREP, 46, 73, 23, 12},   // _WA_SKIN_SHUFREP_ETQ_SET_PRES
     {_WA_FILE_TEXT, 0, 0, 155, 18},       // _WA_SKIN_TEXT
     {_WA_FILE_VOLUME, 0, 0, 68, 421},     // _WA_SKIN_VOLUME_BAR_ALL_BARS
     {_WA_FILE_VOLUME, 0, 0, 68, 13},      // _WA_SKIN_VOLUME_BAR
diff --git a/noatun/modules/winskin/waSkin.cpp b/noatun/modules/winskin/waSkin.cpp
index d7b443ee..aae49bf9 100644
--- a/noatun/modules/winskin/waSkin.cpp
+++ b/noatun/modules/winskin/waSkin.cpp
@@ -72,8 +72,8 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
 
     createHighLevelElements();
     createButtons();
-    setMinimumSize(sizeHint());
-    setMaximumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
+    setMaximumSize(tqsizeHint());
 
     KWin::setType(this->winId(), NET::Override);
     setBackgroundMode(NoBackground);
@@ -126,7 +126,7 @@ WaSkin::WaSkin() : TQWidget(0, "NoatunWinampSkin"), UserInterface()
     newSong();
 
     // HACK: We won't get focus events otherwise
-    setFocusPolicy(TQWidget::ClickFocus);
+    setFocusPolicy(TQ_ClickFocus);
 
     show();
 }
@@ -142,7 +142,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
 {
     waSkinManager->loadSkin(newSkinDir);
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
 
     if (title_shaded) {
         // waSkinModel::load() resets our skin model :(
@@ -154,7 +154,7 @@ void WaSkin::loadSkin(TQString newSkinDir)
     }
 }
 
-TQSize WaSkin::sizeHint() const
+TQSize WaSkin::tqsizeHint() const
 {
     TQRect temp_rect;
 
@@ -254,8 +254,8 @@ void WaSkin::createButtons()
     repeat->setPixmapDownSelected(_WA_SKIN_SHUFREP_REPEAT_SET_PRES);
 
 
-    eq->setPixmapUp(_WA_SKIN_SHUFREP_EQ_NOT_SET_NORM);
-    eq->setPixmapDown(_WA_SKIN_SHUFREP_EQ_NOT_SET_PRES);
+    eq->setPixmapUp(_WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM);
+    eq->setPixmapDown(_WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES);
 
     playlist->setPixmapUp(_WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_NORM);
     playlist->setPixmapDown( _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES);
@@ -305,7 +305,7 @@ void WaSkin::createHighLevelElements()
 
     waInfo = new WaInfo();
 
-    waStatus = new WaStatus();
+    watqStatus = new WatqStatus();
 
     waStereo = new WaIndicator(_WA_MAPPING_MONOSTER_STEREO, _WA_SKIN_MONOSTER_STEREO_TRUE, _WA_SKIN_MONOSTER_STEREO_FALSE);
     waMono = new WaIndicator(_WA_MAPPING_MONOSTER_MONO, _WA_SKIN_MONOSTER_MONO_TRUE, _WA_SKIN_MONOSTER_MONO_FALSE);
@@ -337,7 +337,7 @@ void WaSkin::setChannels(int val)
 void WaSkin::shade() {
     waSkinModel->setSkinModel(WA_MODEL_WINDOWSHADE);
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
     setMask(*windowRegion->mainWindowShadeMask());
 
     title_shaded = true;
@@ -346,7 +346,7 @@ void WaSkin::shade() {
 void WaSkin::unshade() {
     waSkinModel->setSkinModel(WA_MODEL_NORMAL);
 
-    setMinimumSize(sizeHint());
+    setMinimumSize(tqsizeHint());
     setMask(*windowRegion->mainWindowMask());
 
     title_shaded = false;
@@ -558,9 +558,9 @@ void WaSkin::balanceSetValue(int val)
         waInfo->setText(i18n("Balance: Center"));
     }
     else if (val < 0) {
-        waInfo->setText(i18n("Balance: %1% Left").arg(-val));
+        waInfo->setText(i18n("Balance: %1% Left").tqarg(-val));
     } else {
-        waInfo->setText(i18n("Balance: %1% Right").arg(val));
+        waInfo->setText(i18n("Balance: %1% Right").tqarg(val));
    }
 }
 
@@ -672,14 +672,14 @@ void WaSkin::volumeSliderReleased()
 void WaSkin::volumeSetValue(int val)
 {
     if (mVolumePressed)
-        waInfo->setText(i18n("Volume: %1%").arg(val));
+        waInfo->setText(i18n("Volume: %1%").tqarg(val));
 
     napp->player()->setVolume(val);
 }
 
 void WaSkin::slotPlaying()
 {
-    waStatus->setStatus(STATUS_PLAYING);
+    watqStatus->settqStatus(STATUS_PLAYING);
 
     if (!napp->playlist()->current()) {
       return;
@@ -710,7 +710,7 @@ void WaSkin::slotPlaying()
 
 void WaSkin::slotStopped()
 {
-    waStatus->setStatus(STATUS_STOPPED);
+    watqStatus->settqStatus(STATUS_STOPPED);
 
     waDigit->setTime("");
 
@@ -733,7 +733,7 @@ void WaSkin::slotStopped()
 
 void WaSkin::slotPaused()
 {
-    waStatus->setStatus(STATUS_PAUSED);
+    watqStatus->settqStatus(STATUS_PAUSED);
 }
 
 void WaSkin::keyPressEvent(TQKeyEvent *e) {
diff --git a/noatun/modules/winskin/waSkin.h b/noatun/modules/winskin/waSkin.h
index 947ce81e..5c363428 100644
--- a/noatun/modules/winskin/waSkin.h
+++ b/noatun/modules/winskin/waSkin.h
@@ -33,7 +33,7 @@ class WaMain;
 class WaIndicator;
 class WaTitleBar;
 class WaClutterbar;
-class WaStatus;
+class WatqStatus;
 
 class WaJumpSlider;
 class WaVolumeSlider;
@@ -45,7 +45,8 @@ class WaSkin;
 extern WaSkin *_waskin_instance;
 
 class WaSkin : public TQWidget, public UserInterface {
-  Q_OBJECT 
+  Q_OBJECT
+  TQ_OBJECT 
   NOATUNPLUGIND
     WaSkinModel *waSkinModel;
     WaSkinManager *waSkinManager;
@@ -59,7 +60,7 @@ class WaSkin : public TQWidget, public UserInterface {
     void loadSkin(TQString skinDir);
     void setChannels(int val);
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     static TQString defaultSkin();
     static WaSkin *instance() { return _waskin_instance; }
@@ -158,7 +159,7 @@ class WaSkin : public TQWidget, public UserInterface {
     WaLabel *waFreq;
 
     WaInfo *waInfo;
-    WaStatus *waStatus;
+    WatqStatus *watqStatus;
     WaIndicator *waStereo;
     WaIndicator *waMono;
 
diff --git a/noatun/modules/winskin/waSkinManager.cpp b/noatun/modules/winskin/waSkinManager.cpp
index cb5b0e2a..de7a4d0f 100644
--- a/noatun/modules/winskin/waSkinManager.cpp
+++ b/noatun/modules/winskin/waSkinManager.cpp
@@ -25,20 +25,20 @@ TQStringList WaSkinManager::availableSkins() {
 	
 	// This loop adds them all to our skin list
 	for(unsigned int x = 0;x < skinDirs.count();x++) {
-		TQDir skinQDir(skinDirs[x]);
+		TQDir skinTQDir(skinDirs[x]);
 
 		// We only want directories, although there shouldn't be anything else
-		skinQDir.setFilter( TQDir::Dirs );
+		skinTQDir.setFilter( TQDir::Dirs );
 		// I guess name is as good as any
-		skinQDir.setSorting( TQDir::Name );
+		skinTQDir.setSorting( TQDir::Name );
 
-		for (unsigned int y = 0;y < skinQDir.count();y++) {
-			TQStringList skins = skinQDir.entryList(TQDir::Dirs, TQDir::Name);
+		for (unsigned int y = 0;y < skinTQDir.count();y++) {
+			TQStringList skins = skinTQDir.entryList(TQDir::Dirs, TQDir::Name);
 
 			// We really don't care for '.' and '..'
-			if (skinQDir[y][0] != (char)'.') {
+			if (skinTQDir[y][0] != (char)'.') {
 				// Add ourselves to the list, using our directory name
-				skin_list += skinQDir[y];
+				skin_list += skinTQDir[y];
  			}
 		}
 	}
@@ -82,7 +82,7 @@ bool WaSkinManager::installSkin(TQString _url) {
 			return false;
 
 		TQString base_path;
-		base_path = location + "/" + TQFileInfo(url.path()).baseName().replace(TQRegExp("_"), " ");
+		base_path = location + "/" + TQFileInfo(url.path()).baseName().tqreplace(TQRegExp("_"), " ");
 		KIO::Job *job = KIO::copy("zip:" + url.path(), base_path);
 		connect(job, TQT_SIGNAL(result(KIO::Job *)), this, TQT_SIGNAL(updateSkinList()));
 
diff --git a/noatun/modules/winskin/waSkinManager.h b/noatun/modules/winskin/waSkinManager.h
index 360826b1..bc04d89c 100644
--- a/noatun/modules/winskin/waSkinManager.h
+++ b/noatun/modules/winskin/waSkinManager.h
@@ -9,6 +9,7 @@
 
 class WaSkinManager : public TQObject, public DCOPObject {
 Q_OBJECT
+//TQ_OBJECT
 K_DCOP
 
 public:
diff --git a/noatun/modules/winskin/waSkinMapping.h b/noatun/modules/winskin/waSkinMapping.h
index a3dfc9c5..37d56c08 100644
--- a/noatun/modules/winskin/waSkinMapping.h
+++ b/noatun/modules/winskin/waSkinMapping.h
@@ -107,10 +107,10 @@ static const SkinDesc normalMapFromFile[] = {
     {_WA_FILE_SHUFREP, 69, 61, 23, 12},   // _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES
     {_WA_FILE_SHUFREP, 23, 73, 23, 12},   // _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM
     {_WA_FILE_SHUFREP, 73, 23, 12},       // _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES
-    {_WA_FILE_SHUFREP, 0, 61, 23, 12},    // _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM
-    {_WA_FILE_SHUFREP, 46, 61, 23, 12},   // _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES
-    {_WA_FILE_SHUFREP, 0, 73, 23, 12},    // _WA_SKIN_SHUFREP_EQ_SET_NORM
-    {_WA_FILE_SHUFREP, 46, 73, 23, 12},   // _WA_SKIN_SHUFREP_EQ_SET_PRES
+    {_WA_FILE_SHUFREP, 0, 61, 23, 12},    // _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM
+    {_WA_FILE_SHUFREP, 46, 61, 23, 12},   // _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES
+    {_WA_FILE_SHUFREP, 0, 73, 23, 12},    // _WA_SKIN_SHUFREP_ETQ_SET_NORM
+    {_WA_FILE_SHUFREP, 46, 73, 23, 12},   // _WA_SKIN_SHUFREP_ETQ_SET_PRES
     {_WA_FILE_TEXT, 0, 0, 155, 18},       // _WA_SKIN_TEXT
     {_WA_FILE_VOLUME, 0, 0, 68, 421},     // _WA_SKIN_VOLUME_BAR_ALL_BARS
     {_WA_FILE_VOLUME, 0, 0, 68, 13},      // _WA_SKIN_VOLUME_BAR
diff --git a/noatun/modules/winskin/waSkinModel.cpp b/noatun/modules/winskin/waSkinModel.cpp
index e7562c04..b2cdb0c2 100644
--- a/noatun/modules/winskin/waSkinModel.cpp
+++ b/noatun/modules/winskin/waSkinModel.cpp
@@ -419,37 +419,37 @@ void WaSkinModel::resetSkinModel() {
 
 
 TQChar WaSkinModel::deaccent(TQChar input) {
-    if (TQString("Á").contains(input))
+    if (TQString("Á").tqcontains(input))
         return 'A';
 
-    if (TQString("ÉË").contains(input))
+    if (TQString("ÉË").tqcontains(input))
         return 'E';
  
-    if (TQString("ÍÎ").contains(input))
+    if (TQString("ÍÎ").tqcontains(input))
         return 'I';
 
-    if (TQString("ÔÓ").contains(input))
+    if (TQString("ÔÓ").tqcontains(input))
         return 'O';
 
-    if (TQString("ÚÜ").contains(input))
+    if (TQString("ÚÜ").tqcontains(input))
         return 'U';
 
     if (input == 'Ý')
         return 'Y';
 
-    if (TQString("áâ").contains(input))
+    if (TQString("áâ").tqcontains(input))
         return 'a';
 
-    if (TQString("éë").contains(input))
+    if (TQString("éë").tqcontains(input))
         return 'e';
  
-    if (TQString("îí").contains(input))
+    if (TQString("îí").tqcontains(input))
         return 'i';
 
-    if (TQString("ôó").contains(input))
+    if (TQString("ôó").tqcontains(input))
         return 'o';
 
-    if (TQString("úü").contains(input))
+    if (TQString("úü").tqcontains(input))
         return 'u';
 
    return input;
diff --git a/noatun/modules/winskin/waSkinModel.h b/noatun/modules/winskin/waSkinModel.h
index f200bf83..75f485d5 100644
--- a/noatun/modules/winskin/waSkinModel.h
+++ b/noatun/modules/winskin/waSkinModel.h
@@ -26,7 +26,8 @@ class WaSkinModel;
 extern WaSkinModel *_waskinmodel_instance;
 
 class WaSkinModel : public TQObject {
-  Q_OBJECT 
+  Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaSkinModel();
diff --git a/noatun/modules/winskin/waSkins.h b/noatun/modules/winskin/waSkins.h
index f8d5f623..8e778525 100644
--- a/noatun/modules/winskin/waSkins.h
+++ b/noatun/modules/winskin/waSkins.h
@@ -58,10 +58,10 @@
 #define _WA_SKIN_SHUFREP_PLAYLIST_NOT_SET_PRES   29
 #define _WA_SKIN_SHUFREP_PLAYLIST_SET_NORM       30
 #define _WA_SKIN_SHUFREP_PLAYLIST_SET_PRES       31
-#define _WA_SKIN_SHUFREP_EQ_NOT_SET_NORM         32
-#define _WA_SKIN_SHUFREP_EQ_NOT_SET_PRES         33
-#define _WA_SKIN_SHUFREP_EQ_SET_NORM             34
-#define _WA_SKIN_SHUFREP_EQ_SET_PRES             35
+#define _WA_SKIN_SHUFREP_ETQ_NOT_SET_NORM         32
+#define _WA_SKIN_SHUFREP_ETQ_NOT_SET_PRES         33
+#define _WA_SKIN_SHUFREP_ETQ_SET_NORM             34
+#define _WA_SKIN_SHUFREP_ETQ_SET_PRES             35
 
 #define _WA_SKIN_TEXT                            36
 
diff --git a/noatun/modules/winskin/waSlider.cpp b/noatun/modules/winskin/waSlider.cpp
index 99e52402..3323e7ee 100644
--- a/noatun/modules/winskin/waSlider.cpp
+++ b/noatun/modules/winskin/waSlider.cpp
@@ -70,7 +70,7 @@ void WaSlider::mouseMoveEvent(TQMouseEvent * e)
     if (newX < 0) 
 	newX = 0;
 
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
 
     int maxX = size.width() - slider_width;
     
@@ -102,7 +102,7 @@ void WaSlider::updateSliderPos(int value)
 }
 
 void WaSlider::mousePressEvent(TQMouseEvent *e) {
-    if (e->button() != LeftButton && e->button() != MidButton) {
+    if (e->button() != Qt::LeftButton && e->button() != Qt::MidButton) {
         WaWidget::mousePressEvent(e);
         return;
     }
@@ -143,7 +143,7 @@ void WaSlider::mouseReleaseEvent(TQMouseEvent *e)
 
 int WaSlider::pixel2Value(int xpos)
 {
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     int min = abs(minValue);
     int max = abs(maxValue);
 
@@ -158,7 +158,7 @@ int WaSlider::pixel2Value(int xpos)
 
 int WaSlider::value2Pixel(int value)
 {
-    TQSize size = sizeHint();
+    TQSize size = tqsizeHint();
     float min = (float) minValue;
     float max = (float) maxValue;
     float fmin = min;
diff --git a/noatun/modules/winskin/waSlider.h b/noatun/modules/winskin/waSlider.h
index 47630a6c..0515a3c7 100644
--- a/noatun/modules/winskin/waSlider.h
+++ b/noatun/modules/winskin/waSlider.h
@@ -23,6 +23,7 @@
 
 class WaSlider : public WaWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaSlider(int sliderBarMapId, int sliderId, bool is_volume = false);
diff --git a/noatun/modules/winskin/waStatus.cpp b/noatun/modules/winskin/waStatus.cpp
index 861e8677..20f95d92 100644
--- a/noatun/modules/winskin/waStatus.cpp
+++ b/noatun/modules/winskin/waStatus.cpp
@@ -14,16 +14,16 @@
 #include "waStatus.h"
 #include "waSkinModel.h"
 
-WaStatus::WaStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
+WatqStatus::WatqStatus() : WaWidget(_WA_MAPPING_PLAYPAUS)
 {
     _status = STATUS_STOPPED;
 }
 
-WaStatus::~WaStatus()
+WatqStatus::~WatqStatus()
 {
 }
 
-void WaStatus::paintEvent(TQPaintEvent *)
+void WatqStatus::paintEvent(TQPaintEvent *)
 {
     if (_status == STATUS_PLAYING) {
 	paintPixmap(_WA_SKIN_PLAYPAUS_WORK_INDICATOR);
diff --git a/noatun/modules/winskin/waStatus.h b/noatun/modules/winskin/waStatus.h
index e67054df..e028f318 100644
--- a/noatun/modules/winskin/waStatus.h
+++ b/noatun/modules/winskin/waStatus.h
@@ -22,14 +22,15 @@
 
 enum status_enum {STATUS_PLAYING, STATUS_STOPPED, STATUS_PAUSED};
 
-class WaStatus : public WaWidget {
+class WatqStatus : public WaWidget {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
-     WaStatus();
-    ~WaStatus();
+     WatqStatus();
+    ~WatqStatus();
 
-    void setStatus(status_enum status) { _status = status; update(); }
+    void settqStatus(status_enum status) { _status = status; update(); }
     status_enum status() const { return _status; }
 
   private:
diff --git a/noatun/modules/winskin/waTitleBar.cpp b/noatun/modules/winskin/waTitleBar.cpp
index bba7386e..b3b4917c 100644
--- a/noatun/modules/winskin/waTitleBar.cpp
+++ b/noatun/modules/winskin/waTitleBar.cpp
@@ -25,7 +25,7 @@
 WaTitleBar::WaTitleBar() : WaIndicator(_WA_MAPPING_TITLE, _WA_SKIN_TITLE_ACTIVE, _WA_SKIN_TITLE_INACTIVE)
 {
     moving = false;
-    setState(parentWidget()->isActiveWindow());
+    setState(tqparentWidget()->isActiveWindow());
 }
 
 WaTitleBar::~WaTitleBar()
@@ -34,7 +34,7 @@ WaTitleBar::~WaTitleBar()
 
 void WaTitleBar::mousePressEvent(TQMouseEvent * e)
 {
-    if (e->button() != RightButton) {
+    if (e->button() != Qt::RightButton) {
 	if (!moving) {
 	    moving = true;
 	    mDragStart = e->pos();
@@ -55,7 +55,7 @@ void WaTitleBar::mouseDoubleClickEvent(TQMouseEvent *) {
 
 void WaTitleBar::mouseReleaseEvent(TQMouseEvent * e)
 {
-    if (e->button() != RightButton) {
+    if (e->button() != Qt::RightButton) {
 	moving = false;
 	update();
 	return;
@@ -73,7 +73,7 @@ void WaTitleBar::mouseMoveEvent(TQMouseEvent * e)
     }
 
     if (moving) 
-	parentWidget()->move(e->globalPos() - mDragStart);
+	tqparentWidget()->move(e->globalPos() - mDragStart);
 }
 
 #include <waTitleBar.moc>
diff --git a/noatun/modules/winskin/waTitleBar.h b/noatun/modules/winskin/waTitleBar.h
index 30bfe29a..ad181389 100644
--- a/noatun/modules/winskin/waTitleBar.h
+++ b/noatun/modules/winskin/waTitleBar.h
@@ -29,6 +29,7 @@
 
 class WaTitleBar : public WaIndicator {
     Q_OBJECT
+  TQ_OBJECT
 
   public:
      WaTitleBar();
diff --git a/noatun/modules/winskin/waVolumeSlider.h b/noatun/modules/winskin/waVolumeSlider.h
index 29030c65..0f4d6ebf 100644
--- a/noatun/modules/winskin/waVolumeSlider.h
+++ b/noatun/modules/winskin/waVolumeSlider.h
@@ -19,7 +19,8 @@
 #include "waWidget.h"
 
 class WaVolumeSlider:public WaWidget {
-    Q_OBJECT 
+    Q_OBJECT
+    TQ_OBJECT
 
   public:
      WaVolumeSlider();
diff --git a/noatun/modules/winskin/waWidget.cpp b/noatun/modules/winskin/waWidget.cpp
index a93537b9..0b792c7c 100644
--- a/noatun/modules/winskin/waWidget.cpp
+++ b/noatun/modules/winskin/waWidget.cpp
@@ -14,39 +14,39 @@ WaWidget::~WaWidget() {
 
 void WaWidget::paintPixmap(int pixmap_mapping) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0);
      else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0);
 }
 
 void WaWidget::paintPixmap(int pixmap_mapping, int x, int y) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y);
      else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
 }
 
 void WaWidget::paintPixmap(int pixmap_mapping, int argument) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, this, 0, 0, argument);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), 0, 0, argument);
      else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0);
 
 }
 
 void WaWidget::paintPixmap(int pixmap_mapping, int argument, int x, int y) {
     if (pixmap_mapping != -1) 
-        WaSkinModel::instance()->bltTo(pixmap_mapping, this, x, y, argument);
+        WaSkinModel::instance()->bltTo(pixmap_mapping, TQT_TQPAINTDEVICE(this), x, y, argument);
     else
-        WaSkinModel::instance()->paintBackgroundTo(mapping, this, x, y);
+        WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), x, y);
 }
 
-TQSize WaWidget::sizeHint() {
+TQSize WaWidget::tqsizeHint() {
     return WaSkinModel::instance()->getMapGeometry(mapping).size();
 }
 
 void WaWidget::mousePressEvent(TQMouseEvent *e) {
-    if (e->button() == RightButton)
+    if (e->button() == Qt::RightButton)
         NoatunStdAction::ContextMenu::showContextMenu();
 }
 
diff --git a/noatun/modules/winskin/waWidget.h b/noatun/modules/winskin/waWidget.h
index 076d0a5c..d1fb1d9c 100644
--- a/noatun/modules/winskin/waWidget.h
+++ b/noatun/modules/winskin/waWidget.h
@@ -6,11 +6,12 @@
 
 class WaWidget : public TQWidget {
     Q_OBJECT
+  TQ_OBJECT
 public:
     WaWidget(int mapping);
     virtual ~WaWidget();
 
-    TQSize sizeHint();
+    TQSize tqsizeHint();
 
     void paintPixmap(int wa_mapping);
     void paintPixmap(int wa_mapping, int number);
@@ -18,7 +19,7 @@ public:
     void paintPixmap(int wa_mapping, int x, int y);
     void paintPixmap(int wa_mapping, int number, int x, int y);
  
-    void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, this, 0, 0); }
+    void paintBackground() { WaSkinModel::instance()->paintBackgroundTo(mapping, TQT_TQPAINTDEVICE(this), 0, 0); }
 
 protected:
     void mousePressEvent(TQMouseEvent *);
diff --git a/noatun/modules/winskin/winSkinConfig.cpp b/noatun/modules/winskin/winSkinConfig.cpp
index 07352c7b..0f2067de 100644
--- a/noatun/modules/winskin/winSkinConfig.cpp
+++ b/noatun/modules/winskin/winSkinConfig.cpp
@@ -23,13 +23,13 @@
 #include "waSkinManager.h"
 #include "winSkinConfig.h"
 
-WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
+WinSkinConfig::WinSkinConfig(TQWidget * tqparent, WaSkinManager *waSkinManager) :
         CModule(i18n("Winskin"),
 	        i18n("Skin Selection for the Winskin Plugin"),
 	        "style",
-	        parent)
+	        TQT_TQOBJECT(tqparent))
 {
-    // Make a token horizontal layout box
+    // Make a token horizontal tqlayout box
     vbox = new TQVBoxLayout(this);
     vbox->setSpacing( 6 );
     vbox->setMargin( 0 );
@@ -55,7 +55,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
 
     mWaSkinManager = waSkinManager;
 
-    TQGroupBox *settingsBox = new TQGroupBox( 1, Vertical, i18n("Settings"), this );
+    TQGroupBox *settingsBox = new TQGroupBox( 1,Qt::Vertical, i18n("Settings"), this );
     vbox->addWidget(settingsBox);
 
     TQHBox *box = new TQHBox(settingsBox);
@@ -68,7 +68,7 @@ WinSkinConfig::WinSkinConfig(TQWidget * parent, WaSkinManager *waSkinManager) :
     scrollSpeed->setMinValue( 0 );
     scrollSpeed->setMaxValue( 50 );
     scrollSpeed->setPageStep( 1 );
-    scrollSpeed->setOrientation( TQSlider::Horizontal );
+    scrollSpeed->setOrientation( Qt::Horizontal );
     scrollSpeed->setTickmarks( TQSlider::NoMarks );
 
 	label = new TQLabel(i18n("Fast"), box);
@@ -111,7 +111,7 @@ void WinSkinConfig::reopen() {
     TQString orig_skin = mWaSkinManager->currentSkin();
 
     // Where is that skin in our big-list-o-skins?
-    TQListBoxItem *item = skin_list->findItem(orig_skin);
+    TQListBoxItem *item = skin_list->tqfindItem(orig_skin);
 
     if (item) {
         // Aha, found it... make it the currently selected skin
@@ -138,7 +138,7 @@ void WinSkinConfig::install()
    TQString url;
 
     // Ask the user for directory containing a skin
-    KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString::null, this, "udlg", true );
+    KURLRequesterDlg* udlg = new KURLRequesterDlg( TQString(), this, "udlg", true );
     udlg->urlRequester()->setFilter(mWaSkinManager->skinMimeTypes().join(" "));
     udlg->urlRequester()->setMode( KFile::File | KFile::Directory | KFile::ExistingOnly );
 
@@ -163,7 +163,7 @@ void WinSkinConfig::remove()
 
     // Ask the user first
     if( KMessageBox::warningContinueCancel( this,
-        i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").arg( skin_list->currentText() ), TQString::null, KStdGuiItem::del() )
+        i18n("<qt>Are you sure you want to remove the <b>%1</b> skin?</qt>").tqarg( skin_list->currentText() ), TQString(), KStdGuiItem::del() )
         == KMessageBox::Continue ) {
 
         mWaSkinManager->removeSkin( skin_list->currentText() );
diff --git a/noatun/modules/winskin/winSkinConfig.h b/noatun/modules/winskin/winSkinConfig.h
index 3ba04cad..047f0805 100644
--- a/noatun/modules/winskin/winSkinConfig.h
+++ b/noatun/modules/winskin/winSkinConfig.h
@@ -10,8 +10,9 @@ class TQSlider;
 
 class WinSkinConfig:public CModule {
     Q_OBJECT
+  TQ_OBJECT
   public:
-    WinSkinConfig(TQWidget * parent, WaSkinManager *waManager);
+    WinSkinConfig(TQWidget * tqparent, WaSkinManager *waManager);
 
     void save();
 
diff --git a/noatun/modules/winskin/winSkinVis.cpp b/noatun/modules/winskin/winSkinVis.cpp
index 8ec025d2..f760fac3 100644
--- a/noatun/modules/winskin/winSkinVis.cpp
+++ b/noatun/modules/winskin/winSkinVis.cpp
@@ -17,8 +17,8 @@
 #define __BANDS     75
 #define __SPAHEIGHT 15
 
-WinSkinVis::WinSkinVis(TQObject *parent, const char *name):
-    TQObject(parent,name),Visualization(50) {
+WinSkinVis::WinSkinVis(TQObject *tqparent, const char *name):
+    TQObject(tqparent,name),Visualization(50) {
 
     m_currentPeaks=new float[__BANDS];
 
diff --git a/noatun/modules/winskin/winSkinVis.h b/noatun/modules/winskin/winSkinVis.h
index 51c33205..3f941c6f 100644
--- a/noatun/modules/winskin/winSkinVis.h
+++ b/noatun/modules/winskin/winSkinVis.h
@@ -25,9 +25,10 @@
 
 class WinSkinVis : public TQObject, public Visualization {
   Q_OBJECT
+  TQ_OBJECT
 
  public:
-  WinSkinVis(TQObject* parent,const char* name);
+  WinSkinVis(TQObject* tqparent,const char* name);
   ~WinSkinVis();
 
   /**