summaryrefslogtreecommitdiffstats
path: root/tdecore/kstartupinfo.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:21:02 -0600
commit8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a (patch)
tree19ff5ecf5e6b5168e5503677f18b85f3dfa91f95 /tdecore/kstartupinfo.cpp
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kstartupinfo.cpp')
-rw-r--r--tdecore/kstartupinfo.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tdecore/kstartupinfo.cpp b/tdecore/kstartupinfo.cpp
index 1cb8ce345..0a0d5d253 100644
--- a/tdecore/kstartupinfo.cpp
+++ b/tdecore/kstartupinfo.cpp
@@ -129,9 +129,9 @@ KStartupInfo::KStartupInfo( bool clean_on_cantdetect_P, TQObject* parent_P, cons
void KStartupInfo::init( int flags_P )
{
// d == NULL means "disabled"
- if( !KApplication::kApplication())
+ if( !TDEApplication::kApplication())
return;
- if( !KApplication::kApplication()->getDisplay())
+ if( !TDEApplication::kApplication()->getDisplay())
return;
d = new KStartupInfoPrivate( flags_P );
@@ -171,7 +171,7 @@ void KStartupInfo::got_message( const TQString& msg_P )
// if the application stops responding for a while, KWinModule may get
// the information about the already mapped window before KXMessages
// actually gets the info about the started application (depends
-// on their order in X11 event filter in KApplication)
+// on their order in X11 event filter in TDEApplication)
// simply delay info from KWinModule a bit
// SELI???
namespace
@@ -494,7 +494,7 @@ bool KStartupInfo::sendFinishX( Display* disp_P, const KStartupInfoId& id_P,
void KStartupInfo::appStarted()
{
- if( kapp != NULL ) // KApplication constructor unsets the env. variable
+ if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
appStarted( kapp->startupId());
else
appStarted( KStartupInfo::currentStartupIdEnv().id());