summaryrefslogtreecommitdiffstats
path: root/tdecore/kuniqueapplication.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/kuniqueapplication.cpp
parent5bca2e3e42d02f8fed9ffc399ea14f8a05694cb0 (diff)
downloadtdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.tar.gz
tdelibs-8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'tdecore/kuniqueapplication.cpp')
-rw-r--r--tdecore/kuniqueapplication.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 271264e95..97a8eec1b 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -187,7 +187,7 @@ KUniqueApplication::start()
#ifdef Q_WS_X11
// say we're up and running ( probably no new window will appear )
KStartupInfoId id;
- if( kapp != NULL ) // KApplication constructor unsets the env. variable
+ if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
id.initId( kapp->startupId());
else
id = KStartupInfo::currentStartupIdEnv();
@@ -211,7 +211,7 @@ KUniqueApplication::start()
{
#ifdef Q_WS_X11
KStartupInfoId id;
- if( kapp != NULL ) // KApplication constructor unsets the env. variable
+ if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
id.initId( kapp->startupId());
else
id = KStartupInfo::currentStartupIdEnv();
@@ -274,7 +274,7 @@ KUniqueApplication::start()
TQCString new_asn_id;
#if defined Q_WS_X11
KStartupInfoId id;
- if( kapp != NULL ) // KApplication constructor unsets the env. variable
+ if( kapp != NULL ) // TDEApplication constructor unsets the env. variable
id.initId( kapp->startupId());
else
id = KStartupInfo::currentStartupIdEnv();
@@ -315,7 +315,7 @@ KUniqueApplication::start()
KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool configUnique)
- : KApplication( allowStyles, GUIenabled, initHack( configUnique )),
+ : TDEApplication( allowStyles, GUIenabled, initHack( configUnique )),
DCOPObject(TDECmdLineArgs::about->appName())
{
d = new KUniqueApplicationPrivate;
@@ -331,7 +331,7 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
#ifdef Q_WS_X11
KUniqueApplication::KUniqueApplication(Display *display, Qt::HANDLE visual,
Qt::HANDLE colormap, bool allowStyles, bool configUnique)
- : KApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
+ : TDEApplication( display, visual, colormap, allowStyles, initHack( configUnique )),
DCOPObject(TDECmdLineArgs::about->appName())
{
d = new KUniqueApplicationPrivate;
@@ -489,7 +489,7 @@ void KUniqueApplication::setHandleAutoStarted()
}
void KUniqueApplication::virtual_hook( int id, void* data )
-{ KApplication::virtual_hook( id, data );
+{ TDEApplication::virtual_hook( id, data );
DCOPObject::virtual_hook( id, data ); }
#include "kuniqueapplication.moc"