7 files changed, 15 insertions, 22 deletions
diff --git a/twin/clients/quartz/CMakeLists.txt b/twin/clients/quartz/CMakeLists.txt
index 49d56d419..70d9fb49a 100644
--- a/twin/clients/quartz/CMakeLists.txt
+++ b/twin/clients/quartz/CMakeLists.txt
@@ -32,9 +32,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_quartz (module) #####################
+##### twin_quartz (module) #####################
 
-tde_add_kpart( twin3_quartz AUTOMOC
+tde_add_kpart( twin_quartz AUTOMOC
   SOURCES quartz.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/quartz/Makefile.am b/twin/clients/quartz/Makefile.am
index 3a5709773..ae69a53a6 100644
--- a/twin/clients/quartz/Makefile.am
+++ b/twin/clients/quartz/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_quartz.la
+kde_module_LTLIBRARIES = twin_quartz.la
 
-twin3_quartz_la_SOURCES = quartz.cpp
-twin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_quartz_la_LIBADD  = $(LIB_TDEUI)  ../../lib/libtdecorations.la
+twin_quartz_la_SOURCES = quartz.cpp
+twin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_quartz_la_LIBADD  = $(LIB_TDEUI)  ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = quartz.h
diff --git a/twin/clients/quartz/config/config.cpp b/twin/clients/quartz/config/config.cpp
index 3ce86239b..f6bd853b1 100644
--- a/twin/clients/quartz/config/config.cpp
+++ b/twin/clients/quartz/config/config.cpp
@@ -15,7 +15,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
+	TDE_EXPORT TQObject* allocate_config( TDEConfig* conf, TQWidget* parent )
 	{
 		return(new QuartzConfig(conf, parent));
 	}
@@ -49,8 +49,8 @@ QuartzConfig::QuartzConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
-	connect( cbExtraSmall,  TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbColorBorder, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) );
+	connect( cbExtraSmall,  TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()) );
 
 	// Make the widgets visible in twindecoration
 	gb->show();
@@ -101,4 +101,3 @@ void QuartzConfig::defaults()
 }
 
 #include "config.moc"
-// vim: ts=4
diff --git a/twin/clients/quartz/config/config.h b/twin/clients/quartz/config/config.h
index f68b9ef27..a468d8703 100644
--- a/twin/clients/quartz/config/config.h
+++ b/twin/clients/quartz/config/config.h
@@ -16,7 +16,7 @@
 
 class QuartzConfig: public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		QuartzConfig( TDEConfig* conf, TQWidget* parent );
@@ -43,5 +43,3 @@ class QuartzConfig: public TQObject
 
 
 #endif
-
-// vim: ts=4
diff --git a/twin/clients/quartz/quartz.cpp b/twin/clients/quartz/quartz.cpp
index 511fafa6f..31a0dbcf1 100644
--- a/twin/clients/quartz/quartz.cpp
+++ b/twin/clients/quartz/quartz.cpp
@@ -463,7 +463,7 @@ void QuartzButton::drawButton(TQPainter *p)
 	{
 		int xOff = (width()-10)/2;
 		int yOff = (height()-10)/2;
-		p->setPen( Qt::black );
+		p->setPen( TQt::black );
 		p->drawPixmap(isDown() ? xOff+2: xOff+1, isDown() ? yOff+2 : yOff+1, *deco);
 		p->setPen( KDecoration::options()->color(KDecoration::ColorButtonBg, decoration()->isActive()).light(150) );
 		p->drawPixmap(isDown() ? xOff+1: xOff, isDown() ? yOff+1 : yOff, *deco);
@@ -723,7 +723,7 @@ void QuartzClient::paintEvent( TQPaintEvent* )
     // Draw the title bar.
     // ===================
     int r_x, r_y, r_x2, r_y2;
-    TQT_TQRECT_OBJECT(widget()->rect()).coords(&r_x, &r_y, &r_x2, &r_y2);
+    widget()->rect().coords(&r_x, &r_y, &r_x2, &r_y2);
     const int titleEdgeLeft = layoutMetric(LM_TitleEdgeLeft);
     const int titleEdgeTop = layoutMetric(LM_TitleEdgeTop);
     const int titleEdgeRight = layoutMetric(LM_TitleEdgeRight);
@@ -783,7 +783,7 @@ void QuartzClient::paintEvent( TQPaintEvent* )
 /////////////////////////////////
 extern "C"
 {
-	KDE_EXPORT KDecorationFactory *create_factory()
+	TDE_EXPORT KDecorationFactory *create_factory()
 	{
 		Quartz::clientHandler = new Quartz::QuartzHandler();
 		return Quartz::clientHandler;
@@ -793,5 +793,3 @@ extern "C"
 
 
 #include "quartz.moc"
-// vim: ts=4
-// kate: space-indent off; tab-width 4;
diff --git a/twin/clients/quartz/quartz.desktop b/twin/clients/quartz/quartz.desktop
index 8083eec1f..ef69ddda3 100644
--- a/twin/clients/quartz/quartz.desktop
+++ b/twin/clients/quartz/quartz.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Quartz
-X-TDE-Library=twin3_quartz
+X-TDE-Library=twin_quartz
diff --git a/twin/clients/quartz/quartz.h b/twin/clients/quartz/quartz.h
index ddb68ced3..d0db8b103 100644
--- a/twin/clients/quartz/quartz.h
+++ b/twin/clients/quartz/quartz.h
@@ -30,7 +30,7 @@ class QuartzClient;
 
 class QuartzHandler: public TQObject, public KDecorationFactory
 {
-	Q_OBJECT
+	TQ_OBJECT
 	public:
 		QuartzHandler();
 		~QuartzHandler();
@@ -91,5 +91,3 @@ class QuartzClient : public KCommonDecoration
 }
 
 #endif
-// vim: ts=4
-// kate: space-indent off; tab-width 4;