7 files changed, 19 insertions, 19 deletions
diff --git a/twin/clients/plastik/config/config.cpp b/twin/clients/plastik/config/config.cpp
index 04658796c..0fdc126e2 100644
--- a/twin/clients/plastik/config/config.cpp
+++ b/twin/clients/plastik/config/config.cpp
@@ -49,16 +49,16 @@ PlastikConfig::PlastikConfig(TDEConfig* config, TQWidget* parent)
     load(config);
 
     // setup the connections
-    connect(m_dialog->titleAlign, TQT_SIGNAL(clicked(int)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->animateButtons, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->menuClose, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->titleShadow, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
-    connect(m_dialog->coloredBorder, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SIGNAL(changed()));
+    connect(m_dialog->titleAlign, TQ_SIGNAL(clicked(int)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->animateButtons, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->menuClose, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->titleShadow, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
+    connect(m_dialog->coloredBorder, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SIGNAL(changed()));
 }
 
 PlastikConfig::~PlastikConfig()
@@ -115,7 +115,7 @@ void PlastikConfig::defaults()
 
 extern "C"
 {
-    KDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
+    TDE_EXPORT TQObject* allocate_config(TDEConfig* config, TQWidget* parent) {
         return (new PlastikConfig(config, parent));
     }
 }
diff --git a/twin/clients/plastik/misc.cpp b/twin/clients/plastik/misc.cpp
index 1b259d383..053cf15ea 100644
--- a/twin/clients/plastik/misc.cpp
+++ b/twin/clients/plastik/misc.cpp
@@ -54,8 +54,8 @@ TQColor alphaBlendColors(const TQColor &bgColor, const TQColor &fgColor, const i
 {
 
     // normal button...
-    QRgb rgb = bgColor.rgb();
-    QRgb rgb_b = fgColor.rgb();
+    TQRgb rgb = bgColor.rgb();
+    TQRgb rgb_b = fgColor.rgb();
     int alpha = a;
     if(alpha>255) alpha = 255;
     if(alpha<0) alpha = 0;
diff --git a/twin/clients/plastik/plastik.cpp b/twin/clients/plastik/plastik.cpp
index b5a4808d7..6f835fde8 100644
--- a/twin/clients/plastik/plastik.cpp
+++ b/twin/clients/plastik/plastik.cpp
@@ -590,7 +590,7 @@ PlastikHandler* Handler()
 
 extern "C"
 {
-    KDE_EXPORT KDecorationFactory *create_factory()
+    TDE_EXPORT KDecorationFactory *create_factory()
     {
         KWinPlastik::handler = new KWinPlastik::PlastikHandler();
         return KWinPlastik::handler;
diff --git a/twin/clients/plastik/plastik.h b/twin/clients/plastik/plastik.h
index 587d93f4e..558ac848a 100644
--- a/twin/clients/plastik/plastik.h
+++ b/twin/clients/plastik/plastik.h
@@ -93,7 +93,7 @@ public:
     int  borderSize() { return m_borderSize; }
     bool animateButtons() { return m_animateButtons; }
     bool menuClose() { return m_menuClose; }
-    TQ_Alignment titleAlign() { return m_titleAlign; }
+    TQt::AlignmentFlags titleAlign() { return m_titleAlign; }
     bool reverseLayout() { return m_reverse; }
     TQColor getColor(KWinPlastik::ColorType type, const bool active = true);
 
@@ -113,7 +113,7 @@ private:
     int  m_titleHeightTool;
     TQFont m_titleFont;
     TQFont m_titleFontTool;
-    TQ_Alignment m_titleAlign;
+    TQt::AlignmentFlags m_titleAlign;
 
     // pixmap cache
     TQPixmap *m_pixmaps[2][2][NumPixmaps]; // button pixmaps have normal+pressed state...
diff --git a/twin/clients/plastik/plastikbutton.cpp b/twin/clients/plastik/plastikbutton.cpp
index 5fdadc8e1..3f3f81f62 100644
--- a/twin/clients/plastik/plastikbutton.cpp
+++ b/twin/clients/plastik/plastikbutton.cpp
@@ -51,7 +51,7 @@ PlastikButton::PlastikButton(ButtonType type, PlastikClient *parent, const char
     // no need to reset here as the button will be resetted on first resize.
 
     animTmr = new TQTimer(this);
-    connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) );
+    connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) );
     animProgress = 0;
 }
 
diff --git a/twin/clients/plastik/plastikbutton.h b/twin/clients/plastik/plastikbutton.h
index 6da87100f..6deaa56f6 100644
--- a/twin/clients/plastik/plastikbutton.h
+++ b/twin/clients/plastik/plastikbutton.h
@@ -65,7 +65,7 @@ private:
 /**
  * This class creates bitmaps which can be used as icons on buttons. The icons
  * are "hardcoded".
- * Over the previous "Gimp->xpm->QImage->recolor->SmoothScale->TQPixmap" solution
+ * Over the previous "Gimp->xpm->TQImage->recolor->SmoothScale->TQPixmap" solution
  * it has the important advantage that icons are more scalable and at the same
  * time sharp and not blurred.
  */
diff --git a/twin/clients/plastik/plastikclient.cpp b/twin/clients/plastik/plastikclient.cpp
index 6fa993721..bb2c465a6 100644
--- a/twin/clients/plastik/plastikclient.cpp
+++ b/twin/clients/plastik/plastikclient.cpp
@@ -394,7 +394,7 @@ TQRect PlastikClient::captionRect() const
             buttonsLeftWidth() - buttonsRightWidth() -
             marginLeft - marginRight;
 
-    TQ_Alignment a = Handler()->titleAlign();
+    TQt::AlignmentFlags a = Handler()->titleAlign();
 
     int tX, tW; // position/width of the title buffer
     if (caption.width() >  titleWidth) {