7 files changed, 15 insertions, 25 deletions
diff --git a/twin/clients/web/CMakeLists.txt b/twin/clients/web/CMakeLists.txt
index 6045bcbb0..5547dabe7 100644
--- a/twin/clients/web/CMakeLists.txt
+++ b/twin/clients/web/CMakeLists.txt
@@ -29,9 +29,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_web (module) ########################
+##### twin_web (module) ########################
 
-tde_add_kpart( twin3_web AUTOMOC
+tde_add_kpart( twin_web AUTOMOC
   SOURCES Web.cpp WebButton.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin/clients/web/Makefile.am b/twin/clients/web/Makefile.am
index 4855602ca..ba3efcb59 100644
--- a/twin/clients/web/Makefile.am
+++ b/twin/clients/web/Makefile.am
@@ -1,12 +1,12 @@
 INCLUDES                  = -I$(top_srcdir) $(all_includes)
-kde_module_LTLIBRARIES    = twin3_web.la
+kde_module_LTLIBRARIES    = twin_web.la
 
-twin3_web_la_SOURCES      = Web.cpp WebButton.cpp
+twin_web_la_SOURCES      = Web.cpp WebButton.cpp
 
 noinst_HEADERS            = Web.h WebButton.h
 
-twin3_web_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
-twin3_web_la_LIBADD       = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin_web_la_LDFLAGS      = $(all_libraries) $(KDE_PLUGIN) -module
+twin_web_la_LIBADD       = $(LIB_TDEUI) ../../lib/libtdecorations.la
 METASOURCES               = AUTO
 
 linkdir                   = $(kde_datadir)/twin/
diff --git a/twin/clients/web/Web.cpp b/twin/clients/web/Web.cpp
index 496187d3b..f40dc552b 100644
--- a/twin/clients/web/Web.cpp
+++ b/twin/clients/web/Web.cpp
@@ -29,7 +29,7 @@
 
 extern "C"
 {
-  KDE_EXPORT KDecorationFactory *create_factory()
+  TDE_EXPORT KDecorationFactory *create_factory()
   {
     return new Web::WebFactory();
   }
@@ -216,7 +216,7 @@ WebClient::reset( unsigned long changed )
 WebClient::paintEvent(TQPaintEvent * pe)
 {
   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);
@@ -230,7 +230,7 @@ WebClient::paintEvent(TQPaintEvent * pe)
 
   TQPainter p(widget());
 
-  p.setPen(Qt::black);
+  p.setPen(TQt::black);
   p.setBrush(options()->colorGroup(ColorFrame, isActive()).background());
 
   p.setClipRegion(pe->region() - titleRect);
@@ -381,5 +381,3 @@ TQValueList< WebFactory::BorderSize > WebFactory::borderSizes() const
 }
 
 #include "Web.moc"
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/Web.h b/twin/clients/web/Web.h
index ec1b08dc5..175928c91 100644
--- a/twin/clients/web/Web.h
+++ b/twin/clients/web/Web.h
@@ -69,7 +69,7 @@ namespace Web
 
   class WebFactory : public TQObject, public KDecorationFactory
   {
-    Q_OBJECT
+    TQ_OBJECT
 
     public:
 
@@ -83,5 +83,3 @@ namespace Web
 }
 
 #endif
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/WebButton.cpp b/twin/clients/web/WebButton.cpp
index 785abe699..eb6d8d530 100644
--- a/twin/clients/web/WebButton.cpp
+++ b/twin/clients/web/WebButton.cpp
@@ -170,7 +170,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
 
         p->drawLine(0, 0, width(), 0);
         p->drawLine(0, 1, 0, height() - 1);
@@ -207,7 +207,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
         p->drawLine(0, 0, width(), 0);
         p->drawLine(width() - 1, 1, width() - 1, height() - 1);
         if (shape_)
@@ -244,7 +244,7 @@ WebButton::drawButton(TQPainter *p)
       {
         // Draw edge.
 
-        p->setPen(Qt::black);
+        p->setPen(TQt::black);
         p->drawLine(0, 0, width(), 0);
 
         // Draw highlight.
@@ -266,7 +266,7 @@ WebButton::drawButton(TQPainter *p)
   int bhby2(bitmap_.height() / 2);   // Bitmap Height BY 2
 
   p->setBrush(NoBrush);
-  p->setPen(Qt::black);
+  p->setPen(TQt::black);
 
   p->drawPixmap(center.x() - bwby2 + 1, center.y() - bhby2 + 1, bitmap_);
 }
@@ -282,6 +282,3 @@ WebButton::setBitmap(const unsigned char *bitmap)
 }
 
 }
-
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/WebButton.h b/twin/clients/web/WebButton.h
index a5eb8867e..1dbb2faac 100644
--- a/twin/clients/web/WebButton.h
+++ b/twin/clients/web/WebButton.h
@@ -65,6 +65,3 @@ namespace Web
 }
 
 #endif
-
-// vim:ts=2:sw=2:tw=78:set et:
-// kate: indent-width 2; replace-tabs on; tab-width 2; space-indent on;
diff --git a/twin/clients/web/web.desktop b/twin/clients/web/web.desktop
index 10a05ccf1..e850418a4 100644
--- a/twin/clients/web/web.desktop
+++ b/twin/clients/web/web.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Web
-X-TDE-Library=twin3_web
+X-TDE-Library=twin_web