6 files changed, 18 insertions, 20 deletions
diff --git a/twin/clients/modernsystem/CMakeLists.txt b/twin/clients/modernsystem/CMakeLists.txt
index 5bb92031e..166e3aae5 100644
--- a/twin/clients/modernsystem/CMakeLists.txt
+++ b/twin/clients/modernsystem/CMakeLists.txt
@@ -31,9 +31,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_modernsys (module) ##################
+##### twin_modernsys (module) ##################
 
-tde_add_kpart( twin3_modernsys
+tde_add_kpart( twin_modernsys
   SOURCES modernsys.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/modernsystem/Makefile.am b/twin/clients/modernsystem/Makefile.am
index e4c21d7a3..902669685 100644
--- a/twin/clients/modernsystem/Makefile.am
+++ b/twin/clients/modernsystem/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = config
 
-kde_module_LTLIBRARIES = twin3_modernsys.la
+kde_module_LTLIBRARIES = twin_modernsys.la
 
-twin3_modernsys_la_SOURCES = modernsys.cpp
-twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
-twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_modernsys_la_SOURCES = modernsys.cpp
+twin_modernsys_la_LIBADD = ../../lib/libtdecorations.la
+twin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 
 METASOURCES = AUTO
 noinst_HEADERS = modernsys.h
diff --git a/twin/clients/modernsystem/config/config.cpp b/twin/clients/modernsystem/config/config.cpp
index 18d6870f7..4fba7538d 100644
--- a/twin/clients/modernsystem/config/config.cpp
+++ b/twin/clients/modernsystem/config/config.cpp
@@ -12,7 +12,7 @@
 
 extern "C"
 {
-	KDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent)
+	TDE_EXPORT TQObject* allocate_config(TDEConfig* conf, TQWidget* parent)
 	{
 		return(new ModernSysConfig(conf, parent));
 	}
@@ -44,15 +44,15 @@ ModernSysConfig::ModernSysConfig(TDEConfig* conf, TQWidget* parent) : TQObject(p
 			"easier, especially for trackballs and other mouse replacements "
 			"on laptops."));
         layout->addMultiCellWidget(cbShowHandle, 0, 0, 0, 1);
-	connect(cbShowHandle, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()));
+	connect(cbShowHandle, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotSelectionChanged()));
 
 	sliderBox = new TQVBox(handleBox);
-	handleSizeSlider = new TQSlider(0, 4, 1, 0, Qt::Horizontal, sliderBox);
+	handleSizeSlider = new TQSlider(0, 4, 1, 0, TQt::Horizontal, sliderBox);
 	TQWhatsThis::add(handleSizeSlider,
 			i18n("Here you can change the size of the resize handle."));
 	handleSizeSlider->setTickInterval(1);
 	handleSizeSlider->setTickmarks(TQSlider::Below);
-	connect(handleSizeSlider, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSelectionChanged()));
+	connect(handleSizeSlider, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSelectionChanged()));
 
 	hbox = new TQHBox(sliderBox);
 	hbox->setSpacing(6);
diff --git a/twin/clients/modernsystem/config/config.h b/twin/clients/modernsystem/config/config.h
index 20ce5539e..004dd9855 100644
--- a/twin/clients/modernsystem/config/config.h
+++ b/twin/clients/modernsystem/config/config.h
@@ -10,7 +10,7 @@
 
 class ModernSysConfig : public TQObject
 {
-	Q_OBJECT
+	TQ_OBJECT
 
 	public:
 		ModernSysConfig(TDEConfig* conf, TQWidget* parent);
diff --git a/twin/clients/modernsystem/modernsys.cpp b/twin/clients/modernsystem/modernsys.cpp
index 68c8716c4..3777df9d8 100644
--- a/twin/clients/modernsystem/modernsys.cpp
+++ b/twin/clients/modernsystem/modernsys.cpp
@@ -185,9 +185,9 @@ static void create_pixmaps()
 
 
     if(tqGray(btnColor.background().rgb()) < 150)
-        buttonFg = new TQColor(Qt::white);
+        buttonFg = new TQColor(TQt::white);
     else
-        buttonFg = new TQColor(Qt::black);
+        buttonFg = new TQColor(TQt::black);
 
     delete lcDark1;
     delete lcDark2;
@@ -342,7 +342,7 @@ void ModernButton::setBitmap(const unsigned char *bitmap)
         deco = TQBitmap(8, 8, bitmap, true);
     else {
         deco = TQBitmap(8,8);
-        deco.fill(Qt::color0);
+        deco.fill(TQt::color0);
     }
     deco.setMask(deco);
 }
@@ -631,7 +631,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
         p.drawLine(width()-hw, height()-hs-1, width()-4, height()-hs-1);
         p.drawLine(width()-hs-1, height()-hw, width()-hs-1, height()-4);
 
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
         p.drawRect(0, 0, w, h);
 
         // handle outline
@@ -640,7 +640,7 @@ void ModernSys::paintEvent( TQPaintEvent* )
         p.drawLine(width()-hs, height()-2, width()-2, height()-2);
         p.drawLine(width()-hs, height()-hw, width()-hs, height()-2);
     } else {
-        p.setPen(Qt::black);
+        p.setPen(TQt::black);
         p.drawRect(0, 0, w, h);
     }
 }
@@ -731,9 +731,7 @@ bool ModernSysFactory::supports( Ability ability )
 }
 
 // KWin extended plugin interface
-extern "C" KDE_EXPORT KDecorationFactory* create_factory()
+extern "C" TDE_EXPORT KDecorationFactory* create_factory()
 {
     return new ModernSystem::ModernSysFactory();
 }
-
-// vim:ts=4:sw=4
diff --git a/twin/clients/modernsystem/modernsystem.desktop b/twin/clients/modernsystem/modernsystem.desktop
index 85a301733..76601f9f2 100644
--- a/twin/clients/modernsystem/modernsystem.desktop
+++ b/twin/clients/modernsystem/modernsystem.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Modern System
-X-TDE-Library=twin3_modernsys
+X-TDE-Library=twin_modernsys