5 files changed, 14 insertions, 14 deletions
diff --git a/twin/clients/redmond/CMakeLists.txt b/twin/clients/redmond/CMakeLists.txt
index 7240233a0..17a13bac9 100644
--- a/twin/clients/redmond/CMakeLists.txt
+++ b/twin/clients/redmond/CMakeLists.txt
@@ -30,9 +30,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_redmond (module) ####################
+##### twin_redmond (module) ####################
 
-tde_add_kpart( twin3_redmond AUTOMOC
+tde_add_kpart( twin_redmond AUTOMOC
   SOURCES redmond.cpp
   LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/redmond/Makefile.am b/twin/clients/redmond/Makefile.am
index 39985f347..c00af257e 100644
--- a/twin/clients/redmond/Makefile.am
+++ b/twin/clients/redmond/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kde_module_LTLIBRARIES = twin3_redmond.la
+kde_module_LTLIBRARIES = twin_redmond.la
 
-twin3_redmond_la_SOURCES = redmond.cpp
-twin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
+twin_redmond_la_SOURCES = redmond.cpp
+twin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = redmond.h
diff --git a/twin/clients/redmond/redmond.cpp b/twin/clients/redmond/redmond.cpp
index c59cd48d1..006f19122 100644
--- a/twin/clients/redmond/redmond.cpp
+++ b/twin/clients/redmond/redmond.cpp
@@ -210,9 +210,9 @@ static void create_pixmaps ()
 
     // Make sure button pixmaps contrast with the current colour scheme.
     if (tqGray(options()->color(KDecoration::ColorButtonBg, true).rgb()) > 127)
-        btnForeground = new TQColor(Qt::black);
+        btnForeground = new TQColor(TQt::black);
     else
-        btnForeground = new TQColor(Qt::white);
+        btnForeground = new TQColor(TQt::white);
 }
 
 void delete_pixmaps()
@@ -283,7 +283,7 @@ void RedmondButton::setBitmap(const unsigned char *bitmap)
 		deco = TQBitmap(10, 10, bitmap, true);
 	else {
 		deco = TQBitmap(10,10);
-		deco.fill(Qt::color0);
+		deco.fill(TQt::color0);
 	}
 	deco.setMask(deco);
 }
@@ -556,7 +556,7 @@ void RedmondDeco::paintEvent( TQPaintEvent* )
             TQImage image = KImageEffect::gradient(titleBuffer->size(), c1, c2,
                                     KImageEffect::HorizontalGradient);
 
-            titleBuffer->convertFromImage(image, Qt::OrderedDither);
+            titleBuffer->convertFromImage(image, TQt::OrderedDither);
         }
 
         TQPainter p2( titleBuffer, this );
@@ -688,7 +688,7 @@ TQValueList< RedmondDecoFactory::BorderSize > RedmondDecoFactory::borderSizes()
 
 }
 
-extern "C" KDE_EXPORT KDecorationFactory *create_factory()
+extern "C" TDE_EXPORT KDecorationFactory *create_factory()
 {
 	return new Redmond::RedmondDecoFactory();
 }
diff --git a/twin/clients/redmond/redmond.desktop b/twin/clients/redmond/redmond.desktop
index d6bf0a9b0..68a360be0 100644
--- a/twin/clients/redmond/redmond.desktop
+++ b/twin/clients/redmond/redmond.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Redmond
-X-TDE-Library=twin3_redmond
+X-TDE-Library=twin_redmond
diff --git a/twin/clients/redmond/redmond.h b/twin/clients/redmond/redmond.h
index 211763535..3ef7337fb 100644
--- a/twin/clients/redmond/redmond.h
+++ b/twin/clients/redmond/redmond.h
@@ -29,7 +29,7 @@ class RedmondDeco;
 
 class RedmondButton : public KCommonDecorationButton
 {
-	Q_OBJECT
+	TQ_OBJECT
 public:
 	RedmondButton(ButtonType type, RedmondDeco *parent, const char *name);
 	void setBitmap(const unsigned char *bitmap);
@@ -72,7 +72,7 @@ private:
 
 class RedmondDecoFactory : public TQObject, public KDecorationFactory
 {
-   Q_OBJECT
+   TQ_OBJECT
 public:
 	RedmondDecoFactory();
 	virtual ~RedmondDecoFactory();