From 973b82a5b271e07036dedbed227ff0592f0e18ad Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:13:21 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kttsd/filters/main.cpp | 4 ++-- kttsd/kcmkttsmgr/kcmkttsmgr.cpp | 8 ++++---- kttsd/kcmkttsmgr/kcmkttsmgr.h | 4 ++-- kttsd/kttsd/main.cpp | 4 ++-- kttsd/kttsjobmgr/kttsjobmgr.cpp | 10 +++++----- kttsd/kttsjobmgr/kttsjobmgr.h | 10 +++++----- kttsd/kttsmgr/kttsmgr.cpp | 4 ++-- 7 files changed, 22 insertions(+), 22 deletions(-) (limited to 'kttsd') diff --git a/kttsd/filters/main.cpp b/kttsd/filters/main.cpp index fa6b170..5ffdef9 100644 --- a/kttsd/filters/main.cpp +++ b/kttsd/filters/main.cpp @@ -59,10 +59,10 @@ static const KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutdata( + TDEAboutData aboutdata( "testfilter", I18N_NOOP("testfilter"), "0.1.0", I18N_NOOP("A utility for testing KTTSD filter plugins."), - KAboutData::License_GPL, "(C) 2005, Gary Cramblitt "); + TDEAboutData::License_GPL, "(C) 2005, Gary Cramblitt "); aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net"); TDECmdLineArgs::init( argc, argv, &aboutdata ); diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp index b07a885..2b8cd93 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.cpp +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.cpp @@ -1075,10 +1075,10 @@ TQString KCMKttsMgr::quickHelp() const{ "

Be sure to configure a default language for the language you are using as this will be the language used by most of the applications

"); } -const KAboutData* KCMKttsMgr::aboutData() const{ - KAboutData *about = - new KAboutData(I18N_NOOP("kttsd"), I18N_NOOP("KCMKttsMgr"), - 0, 0, KAboutData::License_GPL, +const TDEAboutData* KCMKttsMgr::aboutData() const{ + TDEAboutData *about = + new TDEAboutData(I18N_NOOP("kttsd"), I18N_NOOP("KCMKttsMgr"), + 0, 0, TDEAboutData::License_GPL, I18N_NOOP("(c) 2002, José Pablo Ezequiel Fernández")); about->addAuthor("José Pablo Ezequiel Fernández", I18N_NOOP("Author") , "pupeno@kde.org"); diff --git a/kttsd/kcmkttsmgr/kcmkttsmgr.h b/kttsd/kcmkttsmgr/kcmkttsmgr.h index e311a4e..be03565 100644 --- a/kttsd/kcmkttsmgr/kcmkttsmgr.h +++ b/kttsd/kcmkttsmgr/kcmkttsmgr.h @@ -40,7 +40,7 @@ class PlugInConf; class KttsFilterConf; class KListViewItem; -class KAboutData; +class TDEAboutData; class KConfig; class TQPopupMenu; @@ -115,7 +115,7 @@ class KCMKttsMgr : /** * Return the about information for this module */ - const KAboutData* aboutData() const; + const TDEAboutData* aboutData() const; public slots: /** diff --git a/kttsd/kttsd/main.cpp b/kttsd/kttsd/main.cpp index 1a5bb7e..db04012 100644 --- a/kttsd/kttsd/main.cpp +++ b/kttsd/kttsd/main.cpp @@ -33,9 +33,9 @@ int main (int argc, char *argv[]){ KLocale::setMainCatalogue("kttsd"); - KAboutData aboutdata("kttsd", I18N_NOOP("kttsd"), + TDEAboutData aboutdata("kttsd", I18N_NOOP("kttsd"), "0.3.5.2", I18N_NOOP("Text-to-speech synthesis deamon"), - KAboutData::License_GPL, "(C) 2002, José Pablo Ezequiel Fernández"); + TDEAboutData::License_GPL, "(C) 2002, José Pablo Ezequiel Fernández"); aboutdata.addAuthor("José Pablo Ezequiel Fernández",I18N_NOOP("Original Author"),"pupeno@pupeno.com"); aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net"); aboutdata.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Contributor"),"gunnar@schmi-dt.de"); diff --git a/kttsd/kttsjobmgr/kttsjobmgr.cpp b/kttsd/kttsjobmgr/kttsjobmgr.cpp index baf177f..abba6a4 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.cpp +++ b/kttsd/kttsjobmgr/kttsjobmgr.cpp @@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY( libkttsjobmgrpart, KttsJobMgrFactory ) * We need one static instance of the factory for our C 'main' * function */ -KInstance *KttsJobMgrFactory::s_instance = 0L; +TDEInstance *KttsJobMgrFactory::s_instance = 0L; KttsJobMgrFactory::~KttsJobMgrFactory() { @@ -73,16 +73,16 @@ TQObject *KttsJobMgrFactory::createObject(TQObject *parent, const char *name, co return obj; } -KInstance *KttsJobMgrFactory::instance() +TDEInstance *KttsJobMgrFactory::instance() { if ( !s_instance ) - s_instance = new KInstance( aboutData() ); + s_instance = new TDEInstance( aboutData() ); return s_instance; } -KAboutData *KttsJobMgrFactory::aboutData() +TDEAboutData *KttsJobMgrFactory::aboutData() { - KAboutData *about = new KAboutData("kttsjobmgr", I18N_NOOP("KttsJobMgr"), "1.99"); + TDEAboutData *about = new TDEAboutData("kttsjobmgr", I18N_NOOP("KttsJobMgr"), "1.99"); return about; } diff --git a/kttsd/kttsjobmgr/kttsjobmgr.h b/kttsd/kttsjobmgr/kttsjobmgr.h index f7c1a41..0a7a1d5 100644 --- a/kttsd/kttsjobmgr/kttsjobmgr.h +++ b/kttsd/kttsjobmgr/kttsjobmgr.h @@ -26,8 +26,8 @@ #include "kspeech_stub.h" #include "kspeechsink.h" -class KAboutData; -class KInstance; +class TDEAboutData; +class TDEInstance; class KttsJobMgrBrowserExtension; class KListView; class TQListViewItem; @@ -46,11 +46,11 @@ public: const char* classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList()); - static KInstance *instance(); - static KAboutData *aboutData(); + static TDEInstance *instance(); + static TDEAboutData *aboutData(); private: - static KInstance *s_instance; + static TDEInstance *s_instance; }; class KttsJobMgrPart: diff --git a/kttsd/kttsmgr/kttsmgr.cpp b/kttsd/kttsmgr/kttsmgr.cpp index 877c012..8fc8bd1 100644 --- a/kttsd/kttsmgr/kttsmgr.cpp +++ b/kttsd/kttsmgr/kttsmgr.cpp @@ -56,9 +56,9 @@ int main (int argc, char *argv[]) { KGlobal::locale()->setMainCatalogue("kttsd"); - KAboutData aboutdata("kttsmgr", I18N_NOOP("KTTSMgr"), + TDEAboutData aboutdata("kttsmgr", I18N_NOOP("KTTSMgr"), "0.3.5.2", I18N_NOOP("Text-to-Speech Manager"), - KAboutData::License_GPL, "(C) 2002, José Pablo Ezequiel Fernández"); + TDEAboutData::License_GPL, "(C) 2002, José Pablo Ezequiel Fernández"); aboutdata.addAuthor("José Pablo Ezequiel Fernández",I18N_NOOP("Original Author"),"pupeno@pupeno.com"); aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net"); aboutdata.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Contributor"),"gunnar@schmi-dt.de"); -- cgit v1.2.1