4 files changed, 13 insertions, 13 deletions

diff --git a/kwin/tools/decobenchmark/main.cpp b/kwin/tools/decobenchmark/main.cpp
index ca3ce11d2..d0d165005 100644
--- a/kwin/tools/decobenchmark/main.cpp
+++ b/kwin/tools/decobenchmark/main.cpp
@@ -40,7 +40,7 @@
 static KCmdLineOptions options[] =
 {
 	{ "+decoration", "Decoration library to use, such as kwin3_plastik.", 0 },
-	{ "+tests", "Which test should be executed ('all', 'tqrepaint', 'caption', 'resize', 'recreation')", 0 },
+	{ "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 },
 	{ "+repetitions", "Number of test repetitions.", 0 },
 	{ 0, 0, 0 }
 };
@@ -117,7 +117,7 @@ int main(int argc, char** argv)
 	Tests test;
 	if (t == "all")
 		test = AllTests;
-	else if (t == "tqrepaint")
+	else if (t == "repaint")
 		test = RepaintTest;
 	else if (t == "caption")
 		test = CaptionTest;
diff --git a/kwin/tools/decobenchmark/preview.cpp b/kwin/tools/decobenchmark/preview.cpp
index 69c85c140..3cbcdcb5f 100644
--- a/kwin/tools/decobenchmark/preview.cpp
+++ b/kwin/tools/decobenchmark/preview.cpp
@@ -61,12 +61,12 @@ KDecorationPreview::~KDecorationPreview()
 
 void KDecorationPreview::performRepaintTest(int n)
 {
-    kdDebug() << "start " << n << " tqrepaints..." << endl;
+    kdDebug() << "start " << n << " repaints..." << endl;
     bridge->setCaption("Deco Benchmark");
     deco->captionChange();
     positionPreviews(0);
     for (int i = 0; i < n; ++i) {
-        deco->widget()->tqrepaint();
+        deco->widget()->repaint();
         kapp->processEvents();
     }
 }
@@ -79,7 +79,7 @@ void KDecorationPreview::performCaptionTest(int n)
     for (int i = 0; i < n; ++i) {
         bridge->setCaption(caption.arg(i) );
         deco->captionChange();
-        deco->widget()->tqrepaint();
+        deco->widget()->repaint();
         kapp->processEvents();
     }
 }
@@ -127,10 +127,10 @@ void KDecorationPreview::positionPreviews(int shrink)
     if ( !deco )
         return;
 
-    TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->tqminimumSize()*/;
+    TQSize size = TQSize(width()-2*10-shrink, height()-2*10-shrink)/*.expandedTo(deco->minimumSize()*/;
 
-    TQRect tqgeometry(TQPoint(10, 10), size);
-    deco->widget()->setGeometry(tqgeometry);
+    TQRect geometry(TQPoint(10, 10), size);
+    deco->widget()->setGeometry(geometry);
 }
 
 void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode )
@@ -165,7 +165,7 @@ void KDecorationPreview::setPreviewMask( const TQRegion& reg, int mode )
 TQRect KDecorationPreview::windowGeometry( bool active ) const
 {
     TQWidget *widget = deco->widget();
-    return widget->tqgeometry();
+    return widget->geometry();
 }
 
 TQRegion KDecorationPreview::unobscuredRegion( bool active, const TQRegion& r ) const
@@ -309,7 +309,7 @@ bool KDecorationPreviewBridge::isPreview() const
     return false;
     }
 
-TQRect KDecorationPreviewBridge::tqgeometry() const
+TQRect KDecorationPreviewBridge::geometry() const
     {
     return preview->windowGeometry( active );
     }
diff --git a/kwin/tools/decobenchmark/preview.h b/kwin/tools/decobenchmark/preview.h
index aea4fe7ea..9f2445036 100644
--- a/kwin/tools/decobenchmark/preview.h
+++ b/kwin/tools/decobenchmark/preview.h
@@ -85,7 +85,7 @@ class KDecorationPreviewBridge
 	virtual void performWindowOperation( WindowOperation );
         virtual void setMask( const TQRegion&, int );
         virtual bool isPreview() const;
-        virtual TQRect tqgeometry() const;
+        virtual TQRect geometry() const;
         virtual TQRect iconGeometry() const;
         virtual TQRegion unobscuredRegion( const TQRegion& r ) const;
         virtual TQWidget* workspaceWidget() const;
diff --git a/kwin/tools/xreply/xreply.c b/kwin/tools/xreply/xreply.c
index 648961b80..ecdf6ebc3 100644
--- a/kwin/tools/xreply/xreply.c
+++ b/kwin/tools/xreply/xreply.c
@@ -33,7 +33,7 @@ __attribute((weak)) int ___xreply_reply_enabled = 1;
 extern long ___xreply_reply_count;
 extern int ___xreply_reply_enabled;
 
-typedef tqStatus (*xreply_ptr_t)(Display*,xReply*,int,Bool);
+typedef Status (*xreply_ptr_t)(Display*,xReply*,int,Bool);
 
 static xreply_ptr_t xreply_ptr = NULL;
 static int xreply_backtrace_set = 0;
@@ -163,7 +163,7 @@ static void xreply_backtrace()
     free (strings);
     }
 
-tqStatus
+Status
 _XReply (dpy, rep, extra, discard)
     register Display *dpy;
     register xReply *rep;