summaryrefslogtreecommitdiffstats
path: root/cervisia/main.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:32 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-20 00:23:32 -0600
commit94c9dc38220d50d037075127ad46add8a264ef26 (patch)
treeaf6ba5d26197827dac1b1901895dee7a7b62a9d6 /cervisia/main.cpp
parent479647c43c62fc50302342c8ac50a2fe024b4426 (diff)
downloadtdesdk-94c9dc38220d50d037075127ad46add8a264ef26.tar.gz
tdesdk-94c9dc38220d50d037075127ad46add8a264ef26.zip
Rename KApplication to TDEApplication to avoid conflicts with KDE4
Diffstat (limited to 'cervisia/main.cpp')
-rw-r--r--cervisia/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cervisia/main.cpp b/cervisia/main.cpp
index 4a5bb5ad..1290995b 100644
--- a/cervisia/main.cpp
+++ b/cervisia/main.cpp
@@ -43,7 +43,7 @@ static CvsService_stub* StartDCOPService(const TQString& directory)
// start the cvs DCOP service
TQString error;
TQCString appId;
- if( KApplication::startServiceByDesktopName("cvsservice", TQStringList(),
+ if( TDEApplication::startServiceByDesktopName("cvsservice", TQStringList(),
&error, &appId) )
{
std::cerr << "Starting cvsservice failed with message: "
@@ -167,7 +167,7 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options);
- KApplication app;
+ TDEApplication app;
TQString resolvefile = TDECmdLineArgs::parsedArgs()->getOption("resolve");
if (!resolvefile.isEmpty())