diff --git a/kbstateapplet/kbstate.cpp b/kbstateapplet/kbstate.cpp index 43a9fc4..91bea93 100644 --- a/kbstateapplet/kbstate.cpp +++ b/kbstateapplet/kbstate.cpp @@ -92,7 +92,7 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions, for (int i = 0; i < 8; i++) { icons[i] = 0; } - instance = new KInstance ("kbstateapplet"); + instance = new TDEInstance ("kbstateapplet"); loadConfig(); initMasks(); mouse = new MouseIcon (instance, this, "mouse"); @@ -712,8 +712,8 @@ void KbStateApplet::configureMouse() { } void KbStateApplet::about() { - KAboutData about("kbstateapplet", I18N_NOOP("Keyboard Status Applet"), "0.2", - I18N_NOOP("Panel applet that shows the state of the modifier keys"), KAboutData::License_GPL_V2, "(C) 2004 Gunnar Schmi Dt"); + TDEAboutData about("kbstateapplet", I18N_NOOP("Keyboard Status Applet"), "0.2", + I18N_NOOP("Panel applet that shows the state of the modifier keys"), TDEAboutData::License_GPL_V2, "(C) 2004 Gunnar Schmi Dt"); KAboutApplication a(&about, this); a.exec(); } @@ -746,7 +746,7 @@ void KbStateApplet::saveConfig() /********************************************************************/ -KeyIcon::KeyIcon (int keyId, KInstance *instance, +KeyIcon::KeyIcon (int keyId, TDEInstance *instance, TQWidget *parent, const char *name) : StatusIcon (modifierKeys[keyId].name, parent, name) { this->instance = instance; @@ -855,7 +855,7 @@ void KeyIcon::drawButton (TQPainter *p) { /********************************************************************/ -MouseIcon::MouseIcon (KInstance *instance, TQWidget *parent, const char *name) +MouseIcon::MouseIcon (TDEInstance *instance, TQWidget *parent, const char *name) : StatusIcon ("", parent, name) { this->instance = instance; @@ -886,7 +886,7 @@ void MouseIcon::resizeEvent( TQResizeEvent*e ) updateImages(); } -TQPixmap loadIcon(KInstance *instance, int size, TQColor color, TQString name) { +TQPixmap loadIcon(TDEInstance *instance, int size, TQColor color, TQString name) { KIconLoader *loader = instance->iconLoader(); TQPixmap result = loader->loadIcon(name, KIcon::NoGroup, size); @@ -956,7 +956,7 @@ void MouseIcon::drawButton (TQPainter *p) { /********************************************************************/ -TimeoutIcon::TimeoutIcon (KInstance *instance, const TQString &text, +TimeoutIcon::TimeoutIcon (TDEInstance *instance, const TQString &text, const TQString &featurename, TQWidget *parent, const char *name) : StatusIcon (text, parent, name) { diff --git a/kbstateapplet/kbstate.h b/kbstateapplet/kbstate.h index 26aa513..e910df2 100644 --- a/kbstateapplet/kbstate.h +++ b/kbstateapplet/kbstate.h @@ -48,7 +48,7 @@ class TimeoutIcon : public StatusIcon { Q_OBJECT public: - TimeoutIcon (KInstance *instance, const TQString &text, + TimeoutIcon (TDEInstance *instance, const TQString &text, const TQString &featurename, TQWidget *parent, const char *name=0); ~TimeoutIcon (); @@ -66,7 +66,7 @@ private: TQPixmap pixmap; TQPixmap image; TQTimer timer; - KInstance *instance; + TDEInstance *instance; private slots: void timeout (); @@ -76,7 +76,7 @@ class KeyIcon : public StatusIcon { Q_OBJECT public: - KeyIcon (int keyId, KInstance *instance, + KeyIcon (int keyId, TDEInstance *instance, TQWidget *parent, const char *name=0); ~KeyIcon (); void setState (bool latched, bool locked); @@ -100,14 +100,14 @@ private: bool isLocked; bool tristate; int keyId; - KInstance *instance; + TDEInstance *instance; }; class MouseIcon : public StatusIcon { Q_OBJECT public: - MouseIcon (KInstance *instance, TQWidget *parent, const char *name=0); + MouseIcon (TDEInstance *instance, TQWidget *parent, const char *name=0); ~MouseIcon (); void setState (int state); void setActiveKey (int activekey); @@ -129,7 +129,7 @@ class MouseIcon : public StatusIcon { TQPixmap middleDotSelected; TQPixmap rightDotSelected; int state, activekey; - KInstance *instance; + TDEInstance *instance; }; class KbStateApplet : public KPanelApplet { @@ -198,7 +198,7 @@ private: bool showModifiers, showLockkeys, showMouse, showAccessX; bool fillSpace; - KInstance *instance; + TDEInstance *instance; XkbDescPtr xkb; }; diff --git a/kmag/main.cpp b/kmag/main.cpp index 1111722..72784c1 100644 --- a/kmag/main.cpp +++ b/kmag/main.cpp @@ -42,9 +42,9 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { // about the application - KAboutData *aboutData = new KAboutData("kmag", I18N_NOOP("KMagnifier"), KMAG_VERSION, + TDEAboutData *aboutData = new TDEAboutData("kmag", I18N_NOOP("KMagnifier"), KMAG_VERSION, I18N_NOOP("Screen magnifier for the Trinity Desktop Environment (TDE)"), - KAboutData::License_GPL, + TDEAboutData::License_GPL, "(C) 2001-2003, Sarang Lakare","", "http://kmag.sourceforge.net"); diff --git a/kmousetool/kmousetool/main.cpp b/kmousetool/kmousetool/main.cpp index c0fe636..b836bcc 100644 --- a/kmousetool/kmousetool/main.cpp +++ b/kmousetool/kmousetool/main.cpp @@ -41,8 +41,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kmousetool", I18N_NOOP("KMouseTool"), - KMOUSETOOL_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kmousetool", I18N_NOOP("KMouseTool"), + KMOUSETOOL_VERSION, description, TDEAboutData::License_GPL, "(c) 2002-2003, Jeff Roush\n(c) 2003, Gunnar Schmi Dt", 0, "http://www.mousetool.com", "gunnar@schmi-dt.de"); aboutData.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Current maintainer"), "gunnar@schmi-dt.de", "http://www.schmi-dt.de"); diff --git a/kmouth/main.cpp b/kmouth/main.cpp index 66beff7..960018d 100644 --- a/kmouth/main.cpp +++ b/kmouth/main.cpp @@ -39,8 +39,8 @@ static KCmdLineOptions options[] = int main(int argc, char *argv[]) { - KAboutData aboutData( "kmouth", I18N_NOOP("KMouth"), - KMOUTH_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "kmouth", I18N_NOOP("KMouth"), + KMOUTH_VERSION, description, TDEAboutData::License_GPL, "(c) 2002/2003, Gunnar Schmi Dt", 0, "http://www.schmi-dt.de/kmouth/index.en.html", "kmouth@schmi-dt.de"); aboutData.addAuthor("Gunnar Schmi Dt",0, "kmouth@schmi-dt.de"); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp index dc0e132..02560b6 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.cpp @@ -37,13 +37,13 @@ extern "C" }; */ -KInstance *FreeverbPluginFactory::p_instance = 0L; +TDEInstance *FreeverbPluginFactory::p_instance = 0L; // Factory Constructor FreeverbPluginFactory::FreeverbPluginFactory(TQObject *parent, const char* name) { - p_instance = new KInstance("FreeverbPluginFactory"); + p_instance = new TDEInstance("FreeverbPluginFactory"); } diff --git a/ksayit/Freeverb_plugin/ksayitfreeverblib.h b/ksayit/Freeverb_plugin/ksayitfreeverblib.h index 8c224fc..44c9bf8 100644 --- a/ksayit/Freeverb_plugin/ksayitfreeverblib.h +++ b/ksayit/Freeverb_plugin/ksayitfreeverblib.h @@ -40,7 +40,7 @@ public: const TQStringList &args=TQStringList()); private: - static KInstance* p_instance; + static TDEInstance* p_instance; }; diff --git a/ksayit/src/main.cpp b/ksayit/src/main.cpp index c7c9b26..6b23aba 100644 --- a/ksayit/src/main.cpp +++ b/ksayit/src/main.cpp @@ -40,8 +40,8 @@ static const char *description = int main(int argc, char *argv[]) { - KAboutData aboutData( "ksayit", I18N_NOOP("KSayIt"), - KSAYIT_VERSION, description, KAboutData::License_GPL, + TDEAboutData aboutData( "ksayit", I18N_NOOP("KSayIt"), + KSAYIT_VERSION, description, TDEAboutData::License_GPL, "(c) 1996 - 2005, Robert Vogl", 0, 0, "voglrobe@web.de"); aboutData.addAuthor("Robert Vogl",0, "voglrobe@web.de"); TDECmdLineArgs::init( argc, argv, &aboutData ); 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");