1 files changed, 17 insertions, 17 deletions

diff --git a/kicker/applets/lockout/lockout.cpp b/kicker/applets/lockout/lockout.cpp
index 800c9f8a6..770a8431f 100644
--- a/kicker/applets/lockout/lockout.cpp
+++ b/kicker/applets/lockout/lockout.cpp
@@ -46,7 +46,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
+    TDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         TDEGlobal::locale()->insertCatalogue("lockout");
         return new Lockout(configFile, parent, "lockout");
@@ -82,25 +82,25 @@ Lockout::Lockout( const TQString& configFile, TQWidget *parent, const char *name
 
     bTransparent = conf->readBoolEntry( "Transparent", bTransparent );
 
-    connect( lockButton, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ));
-    connect( logoutButton, TQT_SIGNAL( clicked() ), TQT_SLOT( logout() ));
+    connect( lockButton, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ));
+    connect( logoutButton, TQ_SIGNAL( clicked() ), TQ_SLOT( logout() ));
 
     lockButton->installEventFilter( this );
     logoutButton->installEventFilter( this );
 
-    if (!kapp->authorize("lock_screen"))
+    if (!tdeApp->authorize("lock_screen"))
        lockButton->hide();
 
-    if (!kapp->authorize("logout"))
+    if (!tdeApp->authorize("logout"))
        logoutButton->hide();
 
     lockButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
     logoutButton->setSizePolicy(TQSizePolicy(TQSizePolicy::MinimumExpanding, TQSizePolicy::MinimumExpanding));
 
-    if ( !kapp->dcopClient()->isAttached() )
-        kapp->dcopClient()->attach();
+    if ( !tdeApp->dcopClient()->isAttached() )
+        tdeApp->dcopClient()->attach();
 
-    connect( kapp, TQT_SIGNAL( iconChanged(int) ), TQT_SLOT( slotIconChanged() ));
+    connect( tdeApp, TQ_SIGNAL( iconChanged(int) ), TQ_SLOT( slotIconChanged() ));
 }
 
 Lockout::~Lockout()
@@ -146,12 +146,12 @@ void Lockout::lock()
     int kicker_screen_number = tqt_xscreen();
     if ( kicker_screen_number )
         appname.sprintf("kdesktop-screen-%d", kicker_screen_number);
-    kapp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
+    tdeApp->dcopClient()->send(appname, "KScreensaverIface", "lock()", TQString(""));
 }
 
 void Lockout::logout()
 {
-    kapp->requestShutDown();
+    tdeApp->requestShutDown();
 }
 
 void Lockout::mousePressEvent(TQMouseEvent* e)
@@ -185,7 +185,7 @@ void Lockout::propagateMouseEvent(TQMouseEvent* e)
 
 bool Lockout::eventFilter( TQObject *o, TQEvent *e )
 {
-    if (!kapp->authorizeTDEAction("kicker_rmb"))
+    if (!tdeApp->authorizeTDEAction("kicker_rmb"))
         return false;     // Process event normally:
 
     if( e->type() == TQEvent::MouseButtonPress )
@@ -201,17 +201,17 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
                 TQPopupMenu *popup = new TQPopupMenu();
 
                 popup->insertItem( SmallIcon( "system-lock-screen" ), i18n("Lock Session"),
-                                   this, TQT_SLOT( lock() ) );
+                                   this, TQ_SLOT( lock() ) );
                 popup->insertSeparator();
                 
                 i18n("&Transparent");
                 //popup->insertItem( i18n( "&Transparent" ), 100 );
                 popup->insertItem( SmallIcon( "configure" ),
                                    i18n( "&Configure Screen Saver..." ),
-                                   this, TQT_SLOT( slotLockPrefs() ) );
+                                   this, TQ_SLOT( slotLockPrefs() ) );
 
                 //popup->setItemChecked( 100, bTransparent );
-                //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
+                //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) );
                 //if (conf->entryIsImmutable( "Transparent" ))
                 //    popup->setItemEnabled( 100, false );
                 popup->exec( me->globalPos() );
@@ -224,15 +224,15 @@ bool Lockout::eventFilter( TQObject *o, TQEvent *e )
                 TQPopupMenu *popup = new TQPopupMenu();
 
                 popup->insertItem( SmallIcon( "system-log-out" ), i18n("&Log Out..."),
-                                   this, TQT_SLOT( logout() ) );
+                                   this, TQ_SLOT( logout() ) );
                 popup->insertSeparator();
                 //popup->insertItem( i18n( "&Transparent" ), 100 );
                 popup->insertItem( SmallIcon( "configure" ),
                                    i18n( "&Configure Session Manager..." ),
-                                   this, TQT_SLOT( slotLogoutPrefs() ) );
+                                   this, TQ_SLOT( slotLogoutPrefs() ) );
 
                 //popup->setItemChecked( 100, bTransparent );
-                //popup->connectItem(100, this, TQT_SLOT( slotTransparent() ) );
+                //popup->connectItem(100, this, TQ_SLOT( slotTransparent() ) );
                 //if (conf->entryIsImmutable( "Transparent" ))
                 //    popup->setItemEnabled( 100, false );
                 popup->exec( me->globalPos() );