Rename TDEApplication::kApplication() to TDEApplication::tdeApplication() and kapp to tdeApp.

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 8 insertions, 8 deletions

diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 22f2b0bc6..e34964c25 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -124,9 +124,9 @@ TDEStartupInfo::TDEStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P,
 void TDEStartupInfo::init( int flags_P )
     {
     // d == NULL means "disabled"
-    if( !TDEApplication::kApplication())
+    if( !tdeApp)
         return;
-    if( !TDEApplication::kApplication()->getDisplay())
+    if( !tdeApp->getDisplay())
         return;
 
     d = new TDEStartupInfoPrivate( flags_P );
@@ -183,7 +183,7 @@ class DelayedWindowEvent
 
 void TDEStartupInfo::slot_window_added( WId w_P )
     {
-    kapp->postEvent( this, new DelayedWindowEvent( w_P ));
+    tdeApp->postEvent( this, new DelayedWindowEvent( w_P ));
     }
 
 void TDEStartupInfo::customEvent( TQCustomEvent* e_P )
@@ -489,8 +489,8 @@ bool TDEStartupInfo::sendFinishX( Display* disp_P, const TDEStartupInfoId& id_P,
 
 void TDEStartupInfo::appStarted()
     {
-    if( kapp != NULL )  // TDEApplication constructor unsets the env. variable
-        appStarted( kapp->startupId());
+    if( tdeApp != NULL )  // TDEApplication constructor unsets the env. variable
+        appStarted( tdeApp->startupId());
     else
         appStarted( TDEStartupInfo::currentStartupIdEnv().id());
     }
@@ -501,7 +501,7 @@ void TDEStartupInfo::appStarted( const TQCString& startup_id )
     id.initId( startup_id );
     if( id.none())
         return;
-    if( kapp != NULL )
+    if( tdeApp != NULL )
         TDEStartupInfo::sendFinish( id );
     else if( getenv( "DISPLAY" ) != NULL ) // don't rely on tqt_xdisplay()
         {
@@ -524,7 +524,7 @@ void TDEStartupInfo::disableAutoAppStartedSending( bool disable )
 void TDEStartupInfo::silenceStartup( bool silence )
     {
     TDEStartupInfoId id;
-    id.initId( kapp->startupId());
+    id.initId( tdeApp->startupId());
     if( id.none())
         return;
     TDEStartupInfoData data;
@@ -541,7 +541,7 @@ void TDEStartupInfo::handleAutoAppStartedSending()
 void TDEStartupInfo::setNewStartupId( TQWidget* window, const TQCString& startup_id )
     {
     bool activate = true;
-    kapp->setStartupId( startup_id );
+    tdeApp->setStartupId( startup_id );
     if( window != NULL )
         {
         if( !startup_id.isEmpty() && startup_id != "0" )