4 files changed, 7 insertions, 7 deletions
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.cpp b/tdeui/kdetrayproxy/kdetrayproxy.cpp
index d0e7a84cf..6791b4c38 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.cpp
+++ b/tdeui/kdetrayproxy/kdetrayproxy.cpp
@@ -32,14 +32,14 @@
 KDETrayProxy::KDETrayProxy()
     :   selection( makeSelectionAtom())
     {
-    connect( &selection, TQT_SIGNAL( newOwner( Window )), TQT_SLOT( newOwner( Window )));
-    connect( &module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( windowAdded( WId )));
+    connect( &selection, TQ_SIGNAL( newOwner( Window )), TQ_SLOT( newOwner( Window )));
+    connect( &module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( windowAdded( WId )));
     selection.owner();
     for( TQValueList< WId >::ConstIterator it = module.windows().begin();
          it != module.windows().end();
          ++it )
         windowAdded( *it );
-    kapp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule
+    tdeApp->installX11EventFilter( this ); // XSelectInput( StructureNotifyMask ) on windows is done by KWinModule
 //    kdDebug() << "Init done" << endl;
     }
 
@@ -143,7 +143,7 @@ void KDETrayProxy::dockWindow( Window w, Window owner )
     ev.xclient.window = owner;
     ev.xclient.message_type = atom;
     ev.xclient.format = 32;
-    ev.xclient.data.l[ 0 ] = GET_QT_X_TIME();
+    ev.xclient.data.l[ 0 ] = get_tqt_x_time();
     ev.xclient.data.l[ 1 ] = 0; // SYSTEM_TRAY_REQUEST_DOCK
     ev.xclient.data.l[ 2 ] = w;
     ev.xclient.data.l[ 3 ] = 0; // unused
diff --git a/tdeui/kdetrayproxy/kdetrayproxy.h b/tdeui/kdetrayproxy/kdetrayproxy.h
index 9331aad5c..2231be9ab 100644
--- a/tdeui/kdetrayproxy/kdetrayproxy.h
+++ b/tdeui/kdetrayproxy/kdetrayproxy.h
@@ -28,7 +28,7 @@
 class KDETrayProxy
     : public TQWidget
     {
-    Q_OBJECT
+    TQ_OBJECT
     public:
         KDETrayProxy();
     public slots:
diff --git a/tdeui/kdetrayproxy/module.cpp b/tdeui/kdetrayproxy/module.cpp
index 5da30bab8..5d5155670 100644
--- a/tdeui/kdetrayproxy/module.cpp
+++ b/tdeui/kdetrayproxy/module.cpp
@@ -25,7 +25,7 @@ KDETrayModule::KDETrayModule( const TQCString& obj )
     }
 
 extern "C" 
-KDE_EXPORT KDEDModule *create_kdetrayproxy( const TQCString& obj )
+TDE_EXPORT KDEDModule *create_kdetrayproxy( const TQCString& obj )
     {
     return new KDETrayModule( obj );
     }
diff --git a/tdeui/kdetrayproxy/module.h b/tdeui/kdetrayproxy/module.h
index 67ed1a29d..5ce759eb4 100644
--- a/tdeui/kdetrayproxy/module.h
+++ b/tdeui/kdetrayproxy/module.h
@@ -28,7 +28,7 @@
 class KDETrayModule
     : public KDEDModule
     {
-    Q_OBJECT
+    TQ_OBJECT
     K_DCOP
     public:
         KDETrayModule( const TQCString& obj );