summaryrefslogtreecommitdiffstats
path: root/src/common/global
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-01-20 00:00:28 -0600
committerTimothy Pearson <[email protected]>2013-01-20 00:00:28 -0600
commitb6e3f52ce53e6e9d5b1e3f40e14ac01c0c62f68c (patch)
tree2475b67e176738aaa12cbff7e405a5a3552f87cf /src/common/global
parent9ca7b92557f7d468f8d57838261f4bdddf6d70e0 (diff)
downloadpiklab-b6e3f52ce53e6e9d5b1e3f40e14ac01c0c62f68c.tar.gz
piklab-b6e3f52ce53e6e9d5b1e3f40e14ac01c0c62f68c.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'src/common/global')
-rw-r--r--src/common/global/about.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/global/about.cpp b/src/common/global/about.cpp
index 3b80abe..cd470b4 100644
--- a/src/common/global/about.cpp
+++ b/src/common/global/about.cpp
@@ -54,7 +54,7 @@ void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmd
Q_ASSERT( !gui );
#else
printf("%s: version %s (rev. %s)\n", about->appName(), VERSION, SVN_REVISION);
- if ( !gui ) KApplication::disableAutoDcopRegistration();
+ if ( !gui ) TDEApplication::disableAutoDcopRegistration();
#endif
TDECmdLineArgs::init(argc, argv, about);
TDECmdLineArgs::addCmdLineOptions(options);
@@ -65,7 +65,7 @@ void Piklab::init(KAboutData *about, int argc, char **argv, bool gui, const KCmd
(void)new TQCoreApplication(argc, argv);
# endif
#else
- (void)new KApplication(gui, gui);
+ (void)new TDEApplication(gui, gui);
#endif
}