From 98ed486e2f25cfd58e6cc036862bcac0e988f361 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 20 Jan 2013 00:14:36 -0600 Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4 --- kttsd/compat/interfaces/kspeech/kspeech.h | 2 +- kttsd/filters/main.cpp | 2 +- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 2 +- kttsd/kttsmgr/kttsmgr.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'kttsd') diff --git a/kttsd/compat/interfaces/kspeech/kspeech.h b/kttsd/compat/interfaces/kspeech/kspeech.h index fac9a7e..d217b89 100644 --- a/kttsd/compat/interfaces/kspeech/kspeech.h +++ b/kttsd/compat/interfaces/kspeech/kspeech.h @@ -219,7 +219,7 @@ client->attach(); if (!client->isApplicationRegistered("kttsd")) { TQString error; - if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) + if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) cout << "Starting KTTSD failed with message " << error << endl; } @endverbatim diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index 35cdb31..fa6b170 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -69,7 +69,7 @@ int main(int argc, char *argv[]) // Tell which options are supported TDECmdLineArgs::addCmdLineOptions( options ); - KApplication app( false, false ); + TDEApplication app( false, false ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index d6addf9..b07a885 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -1764,7 +1764,7 @@ void KCMKttsMgr::enableKttsdToggled(bool) { // kdDebug() << "KCMKttsMgr::enableKttsdToggled:: Starting KTTSD" << endl; TQString error; - if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) + if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error)) { kdDebug() << "Starting KTTSD failed with message " << error << endl; m_kttsmgrw->enableKttsdCheckBox->setChecked(false); diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index e4ceb7c..877c012 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -284,7 +284,7 @@ void KttsMgrTray::speakClipboardSelected() if (!isKttsdRunning()) { TQString error; - if (KApplication::startServiceByDesktopName("kttsd", TQStringList(), &error) != 0) + if (TDEApplication::startServiceByDesktopName("kttsd", TQStringList(), &error) != 0) kdError() << "Starting KTTSD failed with message " << error << endl; } speakClipboard(); -- cgit v1.2.1