diff options
Diffstat (limited to 'tdecore/tdeuniqueapplication.cpp')
| -rw-r--r-- | tdecore/tdeuniqueapplication.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tdecore/tdeuniqueapplication.cpp b/tdecore/tdeuniqueapplication.cpp index 7db9f528e..1614ac3d7 100644 --- a/tdecore/tdeuniqueapplication.cpp +++ b/tdecore/tdeuniqueapplication.cpp @@ -187,8 +187,8 @@ TDEUniqueApplication::start() #ifdef TQ_WS_X11 // say we're up and running ( probably no new window will appear ) TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -211,8 +211,8 @@ TDEUniqueApplication::start() { #ifdef TQ_WS_X11 TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -274,8 +274,8 @@ TDEUniqueApplication::start() TQCString new_asn_id; #if defined TQ_WS_X11 TDEStartupInfoId id; - if( kapp != NULL ) // TDEApplication constructor unsets the env. variable - id.initId( kapp->startupId()); + if( tdeApp != NULL ) // TDEApplication constructor unsets the env. variable + id.initId( tdeApp->startupId()); else id = TDEStartupInfo::currentStartupIdEnv(); if( !id.none()) @@ -486,7 +486,7 @@ int TDEUniqueApplication::newInstance() // and what's important, it does it properly. If you reimplement newInstance(), // and don't call the inherited one, use this (but NOT when newInstance() // is called for the first time, like here). - TDEStartupInfo::setNewStartupId( mainWidget(), kapp->startupId()); + TDEStartupInfo::setNewStartupId( mainWidget(), tdeApp->startupId()); #endif } } |