3 files changed, 8 insertions, 8 deletions
diff --git a/tqt3integration/libqtkde/qtkde.cpp b/tqt3integration/libqtkde/qtkde.cpp
index a3c95cb67..a2f93b48f 100644
--- a/tqt3integration/libqtkde/qtkde.cpp
+++ b/tqt3integration/libqtkde/qtkde.cpp
@@ -31,7 +31,7 @@
 
 #include <X11/Xlib.h>
 
-extern Time qt_x_time;
+extern Time tqt_x_time;
 
 static TQString convertFileFilter( const TQString& filter )
     {
@@ -98,7 +98,7 @@ static DCOPClient* dcopClient()
 
 // defined in qapplication_x11.cpp
 typedef int (*QX11EventFilter) (XEvent*);
-extern QX11EventFilter qt_set_x11_event_filter (QX11EventFilter filter);
+extern QX11EventFilter tqt_set_x11_event_filter (QX11EventFilter filter);
 
 static QX11EventFilter old_filter;
 
@@ -125,9 +125,9 @@ static int input_filter( XEvent* e )
 void qtkde_EventLoop::block( bool b )
     {
     if( b )
-        old_filter = qt_set_x11_event_filter( input_filter );
+        old_filter = tqt_set_x11_event_filter( input_filter );
     else
-        qt_set_x11_event_filter( old_filter );
+        tqt_set_x11_event_filter( old_filter );
     }
 
 // duped in kded module
diff --git a/tqt3integration/module/module.cpp b/tqt3integration/module/module.cpp
index fd1f8c8bd..fffa62124 100644
--- a/tqt3integration/module/module.cpp
+++ b/tqt3integration/module/module.cpp
@@ -52,7 +52,7 @@ static void prepareDialog( TQWidget* w, long parent, const TQCString& wmclass1,
     XClassHint hints;
     hints.res_name = ( char* ) ( const char* ) wmclass1;
     hints.res_class = ( char* ) ( const char* ) wmclass2;
-    XSetClassHint( qt_xdisplay(), w->winId(), &hints );
+    XSetClassHint( tqt_xdisplay(), w->winId(), &hints );
     KWin::setMainWindow( w, parent );
     KWin::setState( w->winId(), NET::Modal );
     KWin::WindowInfo info = KWin::windowInfo( parent, (unsigned long)NET::WMGeometry );
diff --git a/tqt3integration/utils/gen.cpp b/tqt3integration/utils/gen.cpp
index 5406cb1aa..85507573e 100644
--- a/tqt3integration/utils/gen.cpp
+++ b/tqt3integration/utils/gen.cpp
@@ -500,8 +500,8 @@ void generateTQtKde()
         stream << "\n";
         stream <<
 "    {\n"
-"    if( qt_xdisplay() != NULL )\n"
-"        XSync( qt_xdisplay(), False );\n";
+"    if( tqt_xdisplay() != NULL )\n"
+"        XSync( tqt_xdisplay(), False );\n";
         TQString parent_arg;
         for( TQValueList< Arg >::ConstIterator it2 = function.args.begin();
              it2 != function.args.end();
@@ -519,7 +519,7 @@ void generateTQtKde()
         if( !parent_arg.isEmpty())
             {
             stream << "    if( " << parent_arg << " == 0 )\n";
-            stream << "        DCOPRef( \"kded\", \"MainApplication-Interface\" ).call( \"updateUserTimestamp\", qt_x_time );\n";
+            stream << "        DCOPRef( \"kded\", \"MainApplication-Interface\" ).call( \"updateUserTimestamp\", tqt_x_time );\n";
             }
         stream <<
 "    TQByteArray data, replyData;\n"