TDE
/
tdeaccessibility
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeaccessibility
0
0
Fork 0
Code Issues Releases Wiki Activity

Rename KInstance and KAboutData to avoid conflicts with KDE4

Browse Source
pull/1/head
Timothy Pearson 12 years ago
parent d1366b97bc
commit 973b82a5b2
15 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File

14
kbstateapplet/kbstate.cpp
Unescape View File

@ -92,7 +92,7 @@ KbStateApplet::KbStateApplet(const TQString& configFile, Type t, int actions,
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
icons[i] = 0; icons[i] = 0;
} }
instance = new KInstance ("kbstateapplet"); instance = new TDEInstance ("kbstateapplet");
loadConfig(); loadConfig();
initMasks(); initMasks();
mouse = new MouseIcon (instance, this, "mouse"); mouse = new MouseIcon (instance, this, "mouse");
@ -712,8 +712,8 @@ void KbStateApplet::configureMouse() {
} }
void KbStateApplet::about() { void KbStateApplet::about() {
KAboutData about("kbstateapplet", I18N_NOOP("Keyboard Status Applet"), "0.2", TDEAboutData 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"); 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); KAboutApplication a(&about, this);
a.exec(); 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) TQWidget *parent, const char *name)
: StatusIcon (modifierKeys[keyId].name, parent, name) { : StatusIcon (modifierKeys[keyId].name, parent, name) {
this->instance = instance; 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) : StatusIcon ("", parent, name)
{ {
this->instance = instance; this->instance = instance;
@ -886,7 +886,7 @@ void MouseIcon::resizeEvent( TQResizeEvent*e )
updateImages(); 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(); KIconLoader *loader = instance->iconLoader();
TQPixmap result = loader->loadIcon(name, KIcon::NoGroup, size); 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, const TQString &featurename,
TQWidget *parent, const char *name) TQWidget *parent, const char *name)
: StatusIcon (text, parent, name) { : StatusIcon (text, parent, name) {

14
kbstateapplet/kbstate.h
Unescape View File

@ -48,7 +48,7 @@ class TimeoutIcon : public StatusIcon {
Q_OBJECT Q_OBJECT
public: public:
TimeoutIcon (KInstance *instance, const TQString &text, TimeoutIcon (TDEInstance *instance, const TQString &text,
const TQString &featurename, const TQString &featurename,
TQWidget *parent, const char *name=0); TQWidget *parent, const char *name=0);
~TimeoutIcon (); ~TimeoutIcon ();
@ -66,7 +66,7 @@ private:
TQPixmap pixmap; TQPixmap pixmap;
TQPixmap image; TQPixmap image;
TQTimer timer; TQTimer timer;
KInstance *instance; TDEInstance *instance;
private slots: private slots:
void timeout (); void timeout ();
@ -76,7 +76,7 @@ class KeyIcon : public StatusIcon {
Q_OBJECT Q_OBJECT
public: public:
KeyIcon (int keyId, KInstance *instance, KeyIcon (int keyId, TDEInstance *instance,
TQWidget *parent, const char *name=0); TQWidget *parent, const char *name=0);
~KeyIcon (); ~KeyIcon ();
void setState (bool latched, bool locked); void setState (bool latched, bool locked);
@ -100,14 +100,14 @@ private:
bool isLocked; bool isLocked;
bool tristate; bool tristate;
int keyId; int keyId;
KInstance *instance; TDEInstance *instance;
}; };
class MouseIcon : public StatusIcon { class MouseIcon : public StatusIcon {
Q_OBJECT Q_OBJECT
public: public:
MouseIcon (KInstance *instance, TQWidget *parent, const char *name=0); MouseIcon (TDEInstance *instance, TQWidget *parent, const char *name=0);
~MouseIcon (); ~MouseIcon ();
void setState (int state); void setState (int state);
void setActiveKey (int activekey); void setActiveKey (int activekey);
@ -129,7 +129,7 @@ class MouseIcon : public StatusIcon {
TQPixmap middleDotSelected; TQPixmap middleDotSelected;
TQPixmap rightDotSelected; TQPixmap rightDotSelected;
int state, activekey; int state, activekey;
KInstance *instance; TDEInstance *instance;
}; };
class KbStateApplet : public KPanelApplet { class KbStateApplet : public KPanelApplet {
@ -198,7 +198,7 @@ private:
bool showModifiers, showLockkeys, showMouse, showAccessX; bool showModifiers, showLockkeys, showMouse, showAccessX;
bool fillSpace; bool fillSpace;
KInstance *instance; TDEInstance *instance;
XkbDescPtr xkb; XkbDescPtr xkb;
}; };

4
kmag/main.cpp
Unescape View File

@ -42,9 +42,9 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// about the application // 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)"), I18N_NOOP("Screen magnifier for the Trinity Desktop Environment (TDE)"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(C) 2001-2003, Sarang Lakare","", "(C) 2001-2003, Sarang Lakare","",
"http://kmag.sourceforge.net"); "http://kmag.sourceforge.net");

4
kmousetool/kmousetool/main.cpp
Unescape View File

@ -41,8 +41,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "kmousetool", I18N_NOOP("KMouseTool"), TDEAboutData aboutData( "kmousetool", I18N_NOOP("KMouseTool"),
KMOUSETOOL_VERSION, description, KAboutData::License_GPL, 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"); "(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"); aboutData.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Current maintainer"), "gunnar@schmi-dt.de", "http://www.schmi-dt.de");

4
kmouth/main.cpp
Unescape View File

@ -39,8 +39,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "kmouth", I18N_NOOP("KMouth"), TDEAboutData aboutData( "kmouth", I18N_NOOP("KMouth"),
KMOUTH_VERSION, description, KAboutData::License_GPL, 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"); "(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"); aboutData.addAuthor("Gunnar Schmi Dt",0, "kmouth@schmi-dt.de");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

4
ksayit/Freeverb_plugin/ksayitfreeverblib.cpp
Unescape View File

@ -37,13 +37,13 @@ extern "C"
}; };
*/ */
KInstance *FreeverbPluginFactory::p_instance = 0L; TDEInstance *FreeverbPluginFactory::p_instance = 0L;
// Factory Constructor // Factory Constructor
FreeverbPluginFactory::FreeverbPluginFactory(TQObject *parent, const char* name) FreeverbPluginFactory::FreeverbPluginFactory(TQObject *parent, const char* name)
{ {
p_instance = new KInstance("FreeverbPluginFactory"); p_instance = new TDEInstance("FreeverbPluginFactory");
} }

2
ksayit/Freeverb_plugin/ksayitfreeverblib.h
Unescape View File

@ -40,7 +40,7 @@ public:
const TQStringList &args=TQStringList()); const TQStringList &args=TQStringList());
private: private:
static KInstance* p_instance; static TDEInstance* p_instance;
}; };

4
ksayit/src/main.cpp
Unescape View File

@ -40,8 +40,8 @@ static const char *description =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "ksayit", I18N_NOOP("KSayIt"), TDEAboutData aboutData( "ksayit", I18N_NOOP("KSayIt"),
KSAYIT_VERSION, description, KAboutData::License_GPL, KSAYIT_VERSION, description, TDEAboutData::License_GPL,
"(c) 1996 - 2005, Robert Vogl", 0, 0, "voglrobe@web.de"); "(c) 1996 - 2005, Robert Vogl", 0, 0, "voglrobe@web.de");
aboutData.addAuthor("Robert Vogl",0, "voglrobe@web.de"); aboutData.addAuthor("Robert Vogl",0, "voglrobe@web.de");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

4
kttsd/filters/main.cpp
Unescape View File

@ -59,10 +59,10 @@ static const KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutdata( TDEAboutData aboutdata(
"testfilter", I18N_NOOP("testfilter"), "testfilter", I18N_NOOP("testfilter"),
"0.1.0", I18N_NOOP("A utility for testing KTTSD filter plugins."), "0.1.0", I18N_NOOP("A utility for testing KTTSD filter plugins."),
KAboutData::License_GPL, "(C) 2005, Gary Cramblitt <garycramblitt@comcast.net>"); TDEAboutData::License_GPL, "(C) 2005, Gary Cramblitt <garycramblitt@comcast.net>");
aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net"); aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net");
TDECmdLineArgs::init( argc, argv, &aboutdata ); TDECmdLineArgs::init( argc, argv, &aboutdata );

8
kttsd/kcmkttsmgr/kcmkttsmgr.cpp
Unescape View File

@ -1075,10 +1075,10 @@ TQString KCMKttsMgr::quickHelp() const{
"<p>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</p>"); "<p>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</p>");
} }
const KAboutData* KCMKttsMgr::aboutData() const{ const TDEAboutData* KCMKttsMgr::aboutData() const{
KAboutData *about = TDEAboutData *about =
new KAboutData(I18N_NOOP("kttsd"), I18N_NOOP("KCMKttsMgr"), new TDEAboutData(I18N_NOOP("kttsd"), I18N_NOOP("KCMKttsMgr"),
0, 0, KAboutData::License_GPL, 0, 0, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2002, José Pablo Ezequiel Fernández")); I18N_NOOP("(c) 2002, José Pablo Ezequiel Fernández"));
about->addAuthor("José Pablo Ezequiel Fernández", I18N_NOOP("Author") , "pupeno@kde.org"); about->addAuthor("José Pablo Ezequiel Fernández", I18N_NOOP("Author") , "pupeno@kde.org");

4
kttsd/kcmkttsmgr/kcmkttsmgr.h
Unescape View File

@ -40,7 +40,7 @@
class PlugInConf; class PlugInConf;
class KttsFilterConf; class KttsFilterConf;
class KListViewItem; class KListViewItem;
class KAboutData; class TDEAboutData;
class KConfig; class KConfig;
class TQPopupMenu; class TQPopupMenu;
@ -115,7 +115,7 @@ class KCMKttsMgr :
/** /**
* Return the about information for this module * Return the about information for this module
*/ */
const KAboutData* aboutData() const; const TDEAboutData* aboutData() const;
public slots: public slots:
/** /**

4
kttsd/kttsd/main.cpp
Unescape View File

@ -33,9 +33,9 @@
int main (int argc, char *argv[]){ int main (int argc, char *argv[]){
KLocale::setMainCatalogue("kttsd"); 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"), "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("José Pablo Ezequiel Fernández",I18N_NOOP("Original Author"),"pupeno@pupeno.com");
aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net"); aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net");
aboutdata.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Contributor"),"gunnar@schmi-dt.de"); aboutdata.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Contributor"),"gunnar@schmi-dt.de");

10
kttsd/kttsjobmgr/kttsjobmgr.cpp
Unescape View File

@ -52,7 +52,7 @@ K_EXPORT_COMPONENT_FACTORY( libkttsjobmgrpart, KttsJobMgrFactory )
* We need one static instance of the factory for our C 'main' * We need one static instance of the factory for our C 'main'
* function * function
*/ */
KInstance *KttsJobMgrFactory::s_instance = 0L; TDEInstance *KttsJobMgrFactory::s_instance = 0L;
KttsJobMgrFactory::~KttsJobMgrFactory() KttsJobMgrFactory::~KttsJobMgrFactory()
{ {
@ -73,16 +73,16 @@ TQObject *KttsJobMgrFactory::createObject(TQObject *parent, const char *name, co
return obj; return obj;
} }
KInstance *KttsJobMgrFactory::instance() TDEInstance *KttsJobMgrFactory::instance()
{ {
if ( !s_instance ) if ( !s_instance )
s_instance = new KInstance( aboutData() ); s_instance = new TDEInstance( aboutData() );
return s_instance; 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; return about;
} }

10
kttsd/kttsjobmgr/kttsjobmgr.h
Unescape View File

@ -26,8 +26,8 @@
#include "kspeech_stub.h" #include "kspeech_stub.h"
#include "kspeechsink.h" #include "kspeechsink.h"
class KAboutData; class TDEAboutData;
class KInstance; class TDEInstance;
class KttsJobMgrBrowserExtension; class KttsJobMgrBrowserExtension;
class KListView; class KListView;
class TQListViewItem; class TQListViewItem;
@ -46,11 +46,11 @@ public:
const char* classname = TQOBJECT_OBJECT_NAME_STRING, const char* classname = TQOBJECT_OBJECT_NAME_STRING,
const TQStringList &args = TQStringList()); const TQStringList &args = TQStringList());
static KInstance *instance(); static TDEInstance *instance();
static KAboutData *aboutData(); static TDEAboutData *aboutData();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
}; };
class KttsJobMgrPart: class KttsJobMgrPart:

4
kttsd/kttsmgr/kttsmgr.cpp
Unescape View File

@ -56,9 +56,9 @@ int main (int argc, char *argv[])
{ {
KGlobal::locale()->setMainCatalogue("kttsd"); 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"), "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("José Pablo Ezequiel Fernández",I18N_NOOP("Original Author"),"pupeno@pupeno.com");
aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net"); aboutdata.addAuthor("Gary Cramblitt", I18N_NOOP("Maintainer"),"garycramblitt@comcast.net");
aboutdata.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Contributor"),"gunnar@schmi-dt.de"); aboutdata.addAuthor("Gunnar Schmi Dt", I18N_NOOP("Contributor"),"gunnar@schmi-dt.de");

Write Preview
Loading…
Cancel
Save