Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent cfe9ce987a
commit 63bcbec9a0

@ -730,12 +730,12 @@ void CervisiaPart::aboutCervisia()
} }
KAboutData* CervisiaPart::createAboutData() TDEAboutData* CervisiaPart::createAboutData()
{ {
KAboutData* about = new KAboutData( TDEAboutData* about = new TDEAboutData(
"cervisiapart", I18N_NOOP("Cervisia Part"), "cervisiapart", I18N_NOOP("Cervisia Part"),
CERVISIA_VERSION, I18N_NOOP("A CVS frontend"), CERVISIA_VERSION, I18N_NOOP("A CVS frontend"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann"), 0, I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann"), 0,
"http://www.kde.org/apps/cervisia"); "http://www.kde.org/apps/cervisia");

@ -40,7 +40,7 @@ class TQSplitter;
class TQTimer; class TQTimer;
class UpdateView; class UpdateView;
class ProtocolView; class ProtocolView;
class KAboutData; class TDEAboutData;
class KListView; class KListView;
class KRecentFilesAction; class KRecentFilesAction;
class CvsService_stub; class CvsService_stub;
@ -67,7 +67,7 @@ public:
TQString sandBox() const { return sandbox; } TQString sandBox() const { return sandbox; }
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
public slots: public slots:
// unused because we overwrite the default behaviour of openURL() // unused because we overwrite the default behaviour of openURL()

@ -37,9 +37,9 @@ static KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain(int argc, char** argv) extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
{ {
KAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1", TDEAboutData about("cvsaskpass", I18N_NOOP("cvsaskpass"), "0.1",
I18N_NOOP("ssh-askpass for the CVS DCOP Service"), I18N_NOOP("ssh-askpass for the CVS DCOP Service"),
KAboutData::License_LGPL, TDEAboutData::License_LGPL,
I18N_NOOP("Copyright (c) 2003 Christian Loose")); I18N_NOOP("Copyright (c) 2003 Christian Loose"));
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);

@ -27,8 +27,8 @@
extern "C" KDE_EXPORT int kdemain(int argc, char** argv) extern "C" KDE_EXPORT int kdemain(int argc, char** argv)
{ {
KAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1", TDEAboutData about("cvsservice", I18N_NOOP("CVS DCOP service"), "0.1",
I18N_NOOP("DCOP service for CVS"), KAboutData::License_LGPL, I18N_NOOP("DCOP service for CVS"), TDEAboutData::License_LGPL,
"Copyright (c) 2002-2003 Christian Loose"); "Copyright (c) 2002-2003 Christian Loose");
about.addAuthor("Christian Loose", I18N_NOOP("Developer"), about.addAuthor("Christian Loose", I18N_NOOP("Developer"),
"christian.loose@hamburg.de"); "christian.loose@hamburg.de");

@ -146,8 +146,8 @@ extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{ "annotate <file>", I18N_NOOP("Show annotation dialog for the given file"), 0 }, { "annotate <file>", I18N_NOOP("Show annotation dialog for the given file"), 0 },
KCmdLineLastOption KCmdLineLastOption
}; };
KAboutData about("cervisia", I18N_NOOP("Cervisia"), CERVISIA_VERSION, TDEAboutData about("cervisia", I18N_NOOP("Cervisia"), CERVISIA_VERSION,
I18N_NOOP("A CVS frontend"), KAboutData::License_GPL, I18N_NOOP("A CVS frontend"), TDEAboutData::License_GPL,
I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann\n" I18N_NOOP("Copyright (c) 1999-2002 Bernd Gehrmann\n"
"Copyright (c) 2002-2007 the Cervisia authors"), 0, "Copyright (c) 2002-2007 the Cervisia authors"), 0,
"http://www.kde.org/apps/cervisia"); "http://www.kde.org/apps/cervisia");

@ -98,7 +98,7 @@ Oct-14-2000 - Malte Starostik (v0.7.2)
o Added option to not run ./configure on newly created project o Added option to not run ./configure on newly created project
Sep-26-2000 - Kurt Granroth (v0.7.1) Sep-26-2000 - Kurt Granroth (v0.7.1)
o Added hooks for more KAboutData information o Added hooks for more TDEAboutData information
o Now building moc files as moc.cpp instead of #including them o Now building moc files as moc.cpp instead of #including them
Jul-21-2000 - Kurt Granroth (v0.7) Jul-21-2000 - Kurt Granroth (v0.7)
@ -122,7 +122,7 @@ Feb-26-2000 - Kurt Granroth (v0.6)
o Converted to use the new XML UI framework (big change!) o Converted to use the new XML UI framework (big change!)
Jan-12-2000 - Kurt Granroth (v0.5.2) Jan-12-2000 - Kurt Granroth (v0.5.2)
o Use KAboutData and TDECmdLineArgs o Use TDEAboutData and TDECmdLineArgs
Dec-28-1999 - Kurt Granroth (v0.5.1) Dec-28-1999 - Kurt Granroth (v0.5.1)
o The po Makefile now uses the autogenerated rules. I don't know o The po Makefile now uses the autogenerated rules. I don't know

@ -20,7 +20,7 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); TDEAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, TDEAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);

@ -83,12 +83,12 @@ void ${APP_NAME}Part::setModified(bool modified)
ReadWritePart::setModified(modified); ReadWritePart::setModified(modified);
} }
KAboutData *${APP_NAME}Part::createAboutData() TDEAboutData *${APP_NAME}Part::createAboutData()
{ {
// the non-i18n name here must be the same as the directory in // the non-i18n name here must be the same as the directory in
// which the part's rc file is installed ('partrcdir' in the // which the part's rc file is installed ('partrcdir' in the
// Makefile) // Makefile)
KAboutData *aboutData = new KAboutData("${APP_NAME_LC}part", I18N_NOOP("${APP_NAME}Part"), "${APP_VERSION}"); TDEAboutData *aboutData = new TDEAboutData("${APP_NAME_LC}part", I18N_NOOP("${APP_NAME}Part"), "${APP_VERSION}");
aboutData->addAuthor("${AUTHOR}", 0, "${EMAIL}"); aboutData->addAuthor("${AUTHOR}", 0, "${EMAIL}");
return aboutData; return aboutData;
} }

@ -9,7 +9,7 @@ class TQWidget;
class TQPainter; class TQPainter;
class KURL; class KURL;
class TQMultiLineEdit; class TQMultiLineEdit;
class KAboutData; class TDEAboutData;
/** /**
* This is a "Part". It that does all the real work in a KPart * This is a "Part". It that does all the real work in a KPart
@ -47,7 +47,7 @@ public:
*/ */
virtual void setModified(bool modified); virtual void setModified(bool modified);
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
protected: protected:
/** /**

@ -19,7 +19,7 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}"); TDEAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, TDEAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" ); about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -183,8 +183,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KLocale::setMainCatalogue("kbabel"); KLocale::setMainCatalogue("kbabel");
KAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION, TDEAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION,
I18N_NOOP("An advanced catalog manager for KBabel"),KAboutData::License_GPL, I18N_NOOP("An advanced catalog manager for KBabel"),TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org"); I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org");
about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org");

@ -544,8 +544,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION, TDEAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION,
I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL, I18N_NOOP("An advanced PO file editor"),TDEAboutData::License_GPL,
I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org"); I18N_NOOP("(c) 1999,2000,2001,2002,2003,2004,2005,2006 The KBabel developers"),0,"http://kbabel.kde.org");
about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org");

@ -35,7 +35,7 @@
#include <kbugreport.h> #include <kbugreport.h>
#include <klocale.h> #include <klocale.h>
AboutModuleDlg::AboutModuleDlg(const KAboutData *aboutData, TQWidget *parent) AboutModuleDlg::AboutModuleDlg(const TDEAboutData *aboutData, TQWidget *parent)
: KAboutApplication(aboutData, parent) : KAboutApplication(aboutData, parent)
, _aboutData(aboutData) , _aboutData(aboutData)
{ {

@ -44,13 +44,13 @@ class AboutModuleDlg : public KAboutApplication
public: public:
AboutModuleDlg(const KAboutData *aboutData, TQWidget* parent=0); AboutModuleDlg(const TDEAboutData *aboutData, TQWidget* parent=0);
public slots: public slots:
virtual void helpClickedSlot(const TQString&); virtual void helpClickedSlot(const TQString&);
private: private:
const KAboutData *_aboutData; const TDEAboutData *_aboutData;
}; };
#endif #endif

@ -372,7 +372,7 @@ KBabelDictBox::KBabelDictBox( TQWidget* parent, const char* name, WFlags fl )
rcConfig.setGroup("SearchEngine"); rcConfig.setGroup("SearchEngine");
TQStringList appList = rcConfig.readListEntry("Applications"); TQStringList appList = rcConfig.readListEntry("Applications");
KInstance *inst = KGlobal::instance(); TDEInstance *inst = KGlobal::instance();
if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName())) if(inst && !appList.isEmpty() && !appList.contains(inst->instanceName()))
{ {
continue; continue;
@ -1230,7 +1230,7 @@ void KBabelDictBox::about()
{ {
KAboutContainer *page = aboutDlg->addScrolledContainerPage(e->name()); KAboutContainer *page = aboutDlg->addScrolledContainerPage(e->name());
const KAboutData *aboutData = e->about(); const TDEAboutData *aboutData = e->about();
if(aboutData) if(aboutData)
{ {

@ -111,8 +111,8 @@ int main(int argc, char **argv)
{ {
KLocale::setMainCatalogue("kbabel"); KLocale::setMainCatalogue("kbabel");
KAboutData about("kbabeldict",I18N_NOOP("KBabel - Dictionary"),VERSION, TDEAboutData about("kbabeldict",I18N_NOOP("KBabel - Dictionary"),VERSION,
I18N_NOOP("A dictionary for translators"),KAboutData::License_GPL, I18N_NOOP("A dictionary for translators"),TDEAboutData::License_GPL,
I18N_NOOP("(c) 2000,2001,2002,2003 The KBabeldict developers"),0,"http://kbabel.kde.org"); I18N_NOOP("(c) 2000,2001,2002,2003 The KBabeldict developers"),0,"http://kbabel.kde.org");
about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org"); about.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"),"kiefer@kde.org");

@ -1398,7 +1398,7 @@ KDBSearchEngine::scanFile ()
delete sca; delete sca;
} }
const KAboutData * const TDEAboutData *
KDBSearchEngine::about () const KDBSearchEngine::about () const
{ {

@ -196,7 +196,7 @@ public:
virtual PrefWidget *preferencesWidget(TQWidget *parent); virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const; virtual const TDEAboutData *about() const;
virtual TQString name() const; virtual TQString name() const;

@ -17,8 +17,8 @@ extern "C"
} }
KInstance *DbSeFactory::s_instance = 0; TDEInstance *DbSeFactory::s_instance = 0;
KAboutData *DbSeFactory::s_about = 0; TDEAboutData *DbSeFactory::s_about = 0;
DbSeFactory::DbSeFactory( TQObject *parent, const char *name) DbSeFactory::DbSeFactory( TQObject *parent, const char *name)
@ -58,22 +58,22 @@ TQObject *DbSeFactory::createObject( TQObject *parent, const char *name,
} }
KInstance *DbSeFactory::instance() TDEInstance *DbSeFactory::instance()
{ {
if(!s_instance) if(!s_instance)
{ {
s_about = new KAboutData( "kdbsearchengine", s_about = new TDEAboutData( "kdbsearchengine",
I18N_NOOP("Translation Database") I18N_NOOP("Translation Database")
, "0.3" , , "0.3" ,
I18N_NOOP("A fast translation search engine based on databases") I18N_NOOP("A fast translation search engine based on databases")
, KAboutData::License_GPL , TDEAboutData::License_GPL
, I18N_NOOP("Copyright 2000-2001 by Andrea Rizzi") , I18N_NOOP("Copyright 2000-2001 by Andrea Rizzi")
,0,0, "rizzi@kde.org"); ,0,0, "rizzi@kde.org");
s_about->addAuthor("Andrea Rizzi",0,"rizzi@kde.org"); s_about->addAuthor("Andrea Rizzi",0,"rizzi@kde.org");
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;

@ -2,8 +2,8 @@
#define DBSE_FACTORY_H #define DBSE_FACTORY_H
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class DbSeFactory : public KLibFactory class DbSeFactory : public KLibFactory
{ {
@ -17,11 +17,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();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_about; static TDEAboutData *s_about;
}; };
#endif #endif

@ -238,7 +238,7 @@ bool KDBSearchEngine2::init()
} }
} }
const KAboutData *KDBSearchEngine2::about() const const TDEAboutData *KDBSearchEngine2::about() const
{ {
return DbSe2Factory::instance()->aboutData(); return DbSe2Factory::instance()->aboutData();
} }

@ -83,7 +83,7 @@ class KDBSearchEngine2 : public SearchEngine
virtual PrefWidget* preferencesWidget(TQWidget *parent); virtual PrefWidget* preferencesWidget(TQWidget *parent);
/** @returns information about this SearchEngine */ /** @returns information about this SearchEngine */
virtual const KAboutData *about() const; virtual const TDEAboutData *about() const;
/** @returns the i18n name of this search engine */ /** @returns the i18n name of this search engine */
TQString name() const {return i18n("DB SearchEngine II");} TQString name() const {return i18n("DB SearchEngine II");}

@ -18,8 +18,8 @@ extern "C"
}; };
KInstance *DbSe2Factory::s_instance = 0; TDEInstance *DbSe2Factory::s_instance = 0;
KAboutData *DbSe2Factory::s_about = 0; TDEAboutData *DbSe2Factory::s_about = 0;
DbSe2Factory::DbSe2Factory( TQObject *parent, const char *name) DbSe2Factory::DbSe2Factory( TQObject *parent, const char *name)
@ -59,22 +59,22 @@ TQObject *DbSe2Factory::createObject( TQObject *parent, const char *name,
} }
KInstance *DbSe2Factory::instance() TDEInstance *DbSe2Factory::instance()
{ {
if(!s_instance) if(!s_instance)
{ {
s_about = new KAboutData( "kdbsearchengine2", s_about = new TDEAboutData( "kdbsearchengine2",
I18N_NOOP("Translation Database") I18N_NOOP("Translation Database")
, "1.99" , , "1.99" ,
I18N_NOOP("A fast translation search engine based on databases") I18N_NOOP("A fast translation search engine based on databases")
, KAboutData::License_GPL , TDEAboutData::License_GPL
, I18N_NOOP("Copyright 2000-2003 by Andrea Rizzi") , I18N_NOOP("Copyright 2000-2003 by Andrea Rizzi")
,0,0, "rizzi@kde.org"); ,0,0, "rizzi@kde.org");
s_about->addAuthor("Andrea Rizzi",0,"rizzi@kde.org"); s_about->addAuthor("Andrea Rizzi",0,"rizzi@kde.org");
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;

@ -2,8 +2,8 @@
#define DBSE2_FACTORY_H #define DBSE2_FACTORY_H
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class DbSe2Factory : public KLibFactory class DbSe2Factory : public KLibFactory
{ {
@ -17,11 +17,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();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_about; static TDEAboutData *s_about;
}; };
#endif #endif

@ -50,8 +50,8 @@ extern "C"
} }
KInstance *PaFactory::s_instance = 0; TDEInstance *PaFactory::s_instance = 0;
KAboutData *PaFactory::s_about = 0; TDEAboutData *PaFactory::s_about = 0;
PaFactory::PaFactory( TQObject *parent, const char *name) PaFactory::PaFactory( TQObject *parent, const char *name)
@ -88,20 +88,20 @@ TQObject *PaFactory::createObject( TQObject *parent, const char *name
} }
KInstance *PaFactory::instance() TDEInstance *PaFactory::instance()
{ {
if(!s_instance) if(!s_instance)
{ {
s_about = new KAboutData( "poauxiliary", I18N_NOOP("PO Auxiliary") s_about = new TDEAboutData( "poauxiliary", I18N_NOOP("PO Auxiliary")
, "1.0" , "1.0"
, I18N_NOOP("A simple module for exact searching in a PO file") , I18N_NOOP("A simple module for exact searching in a PO file")
, KAboutData::License_GPL , TDEAboutData::License_GPL
, "Copyright 2000, Matthias Kiefer" , "Copyright 2000, Matthias Kiefer"
,0,0, "kiefer@kde.org"); ,0,0, "kiefer@kde.org");
s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org"); s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org");
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;

@ -36,8 +36,8 @@
#define PA_FACTORY_H #define PA_FACTORY_H
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class PaFactory : public KLibFactory class PaFactory : public KLibFactory
{ {
@ -51,11 +51,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();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_about; static TDEAboutData *s_about;
}; };
#endif #endif

@ -136,7 +136,7 @@ PrefWidget *PoAuxiliary::preferencesWidget(TQWidget *parent)
return prefWidget; return prefWidget;
} }
const KAboutData *PoAuxiliary::about() const const TDEAboutData *PoAuxiliary::about() const
{ {
return PaFactory::instance()->aboutData(); return PaFactory::instance()->aboutData();
} }

@ -67,7 +67,7 @@ public:
virtual PrefWidget *preferencesWidget(TQWidget *parent); virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const; virtual const TDEAboutData *about() const;
virtual TQString name() const; virtual TQString name() const;

@ -50,8 +50,8 @@ extern "C"
} }
KInstance *PcFactory::s_instance = 0; TDEInstance *PcFactory::s_instance = 0;
KAboutData *PcFactory::s_about = 0; TDEAboutData *PcFactory::s_about = 0;
PcFactory::PcFactory( TQObject *parent, const char *name) PcFactory::PcFactory( TQObject *parent, const char *name)
@ -88,20 +88,20 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name
} }
KInstance *PcFactory::instance() TDEInstance *PcFactory::instance()
{ {
if(!s_instance) if(!s_instance)
{ {
s_about = new KAboutData( "pocompendium", I18N_NOOP("PO Compendium") s_about = new TDEAboutData( "pocompendium", I18N_NOOP("PO Compendium")
, "1.0" , "1.0"
, I18N_NOOP("A module for searching in a PO file") , I18N_NOOP("A module for searching in a PO file")
, KAboutData::License_GPL , TDEAboutData::License_GPL
, "Copyright 2000-2001, Matthias Kiefer" , "Copyright 2000-2001, Matthias Kiefer"
,0,0, "kiefer@kde.org"); ,0,0, "kiefer@kde.org");
s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org"); s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org");
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;

@ -36,8 +36,8 @@
#define PC_FACTORY_H #define PC_FACTORY_H
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class PcFactory : public KLibFactory class PcFactory : public KLibFactory
{ {
@ -51,11 +51,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();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_about; static TDEAboutData *s_about;
}; };
#endif #endif

@ -173,7 +173,7 @@ PrefWidget *PoCompendium::preferencesWidget(TQWidget *parent)
return prefWidget; return prefWidget;
} }
const KAboutData *PoCompendium::about() const const TDEAboutData *PoCompendium::about() const
{ {
return PcFactory::instance()->aboutData(); return PcFactory::instance()->aboutData();
} }

@ -70,7 +70,7 @@ public:
virtual PrefWidget *preferencesWidget(TQWidget *parent); virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const; virtual const TDEAboutData *about() const;
virtual TQString name() const; virtual TQString name() const;

@ -50,8 +50,8 @@ extern "C"
} }
KInstance *PcFactory::s_instance = 0; TDEInstance *PcFactory::s_instance = 0;
KAboutData *PcFactory::s_about = 0; TDEAboutData *PcFactory::s_about = 0;
PcFactory::PcFactory( TQObject *parent, const char *name) PcFactory::PcFactory( TQObject *parent, const char *name)
@ -88,21 +88,21 @@ TQObject *PcFactory::createObject( TQObject *parent, const char *name
} }
KInstance *PcFactory::instance() TDEInstance *PcFactory::instance()
{ {
if(!s_instance) if(!s_instance)
{ {
s_about = new KAboutData( "tmxcompendium", I18N_NOOP("TMX Compendium") s_about = new TDEAboutData( "tmxcompendium", I18N_NOOP("TMX Compendium")
, "1.0" , "1.0"
, I18N_NOOP("A module for searching in a TMX file") , I18N_NOOP("A module for searching in a TMX file")
, KAboutData::License_GPL , TDEAboutData::License_GPL
, "Copyright 2002, Stanislav Visnovsky" , "Copyright 2002, Stanislav Visnovsky"
,0,0, "visnovsky@kde.org"); ,0,0, "visnovsky@kde.org");
s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org"); s_about->addAuthor("Matthias Kiefer",0,"kiefer@kde.org");
s_about->addAuthor("Stanislav Visnovsky",0,"visnovsky@kde.org"); s_about->addAuthor("Stanislav Visnovsky",0,"visnovsky@kde.org");
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;

@ -38,8 +38,8 @@
#define PC_FACTORY_H #define PC_FACTORY_H
#include <klibloader.h> #include <klibloader.h>
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class PcFactory : public KLibFactory class PcFactory : public KLibFactory
{ {
@ -53,11 +53,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();
private: private:
static KInstance *s_instance; static TDEInstance *s_instance;
static KAboutData *s_about; static TDEAboutData *s_about;
}; };
#endif #endif

@ -164,7 +164,7 @@ PrefWidget *TmxCompendium::preferencesWidget(TQWidget *parent)
return prefWidget; return prefWidget;
} }
const KAboutData *TmxCompendium::about() const const TDEAboutData *TmxCompendium::about() const
{ {
return PcFactory::instance()->aboutData(); return PcFactory::instance()->aboutData();
} }

@ -68,7 +68,7 @@ public:
virtual PrefWidget *preferencesWidget(TQWidget *parent); virtual PrefWidget *preferencesWidget(TQWidget *parent);
virtual const KAboutData *about() const; virtual const TDEAboutData *about() const;
virtual TQString name() const; virtual TQString name() const;

@ -359,7 +359,7 @@ public:
virtual PrefWidget* preferencesWidget(TQWidget *parent)=0; virtual PrefWidget* preferencesWidget(TQWidget *parent)=0;
/** @returns information about this SearchEngine */ /** @returns information about this SearchEngine */
virtual const KAboutData *about() const= 0; virtual const TDEAboutData *about() const= 0;
/** @returns the i18n name of this search engine */ /** @returns the i18n name of this search engine */
virtual TQString name() const= 0; virtual TQString name() const= 0;

@ -44,8 +44,8 @@ static const KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ), TDEAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001,2002,2003 the KBugBuster authors") ); I18N_NOOP("(c) 2001,2002,2003 the KBugBuster authors") );
aboutData.addAuthor( "Martijn Klingens", 0, "klingens@kde.org" ); aboutData.addAuthor( "Martijn Klingens", 0, "klingens@kde.org" );
aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );

@ -1574,7 +1574,7 @@ void kio_svnProtocol::wc_resolve( const KURL& wc, bool recurse ) {
extern "C" extern "C"
{ {
KDE_EXPORT int kdemain(int argc, char **argv) { KDE_EXPORT int kdemain(int argc, char **argv) {
KInstance instance( "kio_svn" ); TDEInstance instance( "kio_svn" );
kdDebug(7128) << "*** Starting kio_svn " << endl; kdDebug(7128) << "*** Starting kio_svn " << endl;

@ -578,7 +578,7 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KInstance instance("kmtrace"); TDEInstance instance("kmtrace");
TDECmdLineArgs::init(argc, argv, "kmtrace", "KDE Memory leak tracer", "v1.0"); TDECmdLineArgs::init(argc, argv, "kmtrace", "KDE Memory leak tracer", "v1.0");

@ -659,8 +659,8 @@ KDirLVI::~KDirLVI()
} }
// part stuff // part stuff
KInstance* KompareNavTreePartFactory::s_instance = 0L; TDEInstance* KompareNavTreePartFactory::s_instance = 0L;
KAboutData* KompareNavTreePartFactory::s_about = 0L; TDEAboutData* KompareNavTreePartFactory::s_about = 0L;
KompareNavTreePartFactory::KompareNavTreePartFactory() KompareNavTreePartFactory::KompareNavTreePartFactory()
: KParts::Factory() : KParts::Factory()
@ -687,14 +687,14 @@ KParts::Part* KompareNavTreePartFactory::createPartObject( TQWidget* parentWidge
return obj; return obj;
} }
KInstance* KompareNavTreePartFactory::instance() TDEInstance* KompareNavTreePartFactory::instance()
{ {
if( !s_instance ) if( !s_instance )
{ {
s_about = new KAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1"); s_about = new TDEAboutData("komparenavtreepart", I18N_NOOP("KompareNavTreePart"), "1.1");
s_about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org"); s_about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org");
s_about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" ); s_about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" );
s_instance = new KInstance(s_about); s_instance = new TDEInstance(s_about);
} }
return s_instance; return s_instance;
} }

@ -170,8 +170,8 @@ private:
}; };
// part stuff // part stuff
class KInstance; class TDEInstance;
class KAboutData; class TDEAboutData;
class KompareNavTreePartFactory : public KParts::Factory class KompareNavTreePartFactory : public KParts::Factory
{ {
@ -183,11 +183,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name, TQObject *parent, const char *name,
const char *classname, const TQStringList &args ); const char *classname, const TQStringList &args );
static KInstance* instance(); static TDEInstance* instance();
private: private:
static KInstance* s_instance; static TDEInstance* s_instance;
static KAboutData* s_about; static TDEAboutData* s_about;
}; };
#endif #endif

@ -476,9 +476,9 @@ void KomparePart::saveDiff()
delete dlg; delete dlg;
} }
KAboutData *KomparePart::createAboutData() TDEAboutData *KomparePart::createAboutData()
{ {
KAboutData *about = new KAboutData("kompare", I18N_NOOP("KomparePart"), "3.2"); TDEAboutData *about = new TDEAboutData("kompare", I18N_NOOP("KomparePart"), "3.2");
about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org"); about->addAuthor("John Firebaugh", "Author", "jfirebaugh@kde.org");
about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" ); about->addAuthor("Otto Bruggeman", "Author", "otto.bruggeman@home.nl" );
return about; return about;

@ -87,7 +87,7 @@ public:
// Do we really want to expose this ??? // Do we really want to expose this ???
const Diff2::KompareModelList* model() const { return m_modelList; }; const Diff2::KompareModelList* model() const { return m_modelList; };
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public: public:
// Reimplemented from the KompareInterface // Reimplemented from the KompareInterface

@ -49,8 +49,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description, TDEAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description,
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001-2004, John Firebaugh and Otto Bruggeman"), 0, "http://bruggie.dnsalias.org/kompare/" ); I18N_NOOP("(c) 2001-2004, John Firebaugh and Otto Bruggeman"), 0, "http://bruggie.dnsalias.org/kompare/" );
aboutData.addAuthor( "John Firebaugh", I18N_NOOP("Author"), "jfirebaugh@kde.org" ); aboutData.addAuthor( "John Firebaugh", I18N_NOOP("Author"), "jfirebaugh@kde.org" );
aboutData.addAuthor( "Otto Bruggeman", I18N_NOOP("Author"), "otto.bruggeman@home.nl" ); aboutData.addAuthor( "Otto Bruggeman", I18N_NOOP("Author"), "otto.bruggeman@home.nl" );

@ -35,8 +35,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "spy", I18N_NOOP("Spy"), TDEAboutData aboutData( "spy", I18N_NOOP("Spy"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
"(c) 2001, Richard Moore", 0, 0, "rich@kde.org"); "(c) 2001, Richard Moore", 0, 0, "rich@kde.org");
aboutData.addAuthor("Richard Moore",0, "rich@kde.org"); aboutData.addAuthor("Richard Moore",0, "rich@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );

@ -71,9 +71,9 @@ TQString libkstartperf()
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"), TDEAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"),
"1.0", I18N_NOOP("Measures start up time of a TDE application"), "1.0", I18N_NOOP("Measures start up time of a TDE application"),
KAboutData::License_Artistic, TDEAboutData::License_Artistic,
"Copyright (c) 2000 Geert Jansen and libkmapnotify authors"); "Copyright (c) 2000 Geert Jansen and libkmapnotify authors");
aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"), aboutData.addAuthor("Geert Jansen", I18N_NOOP("Maintainer"),
"jansen@kde.org", "http://www.stack.nl/~geertj/"); "jansen@kde.org", "http://www.stack.nl/~geertj/");

@ -111,14 +111,14 @@ KUIViewerPart::~KUIViewerPart()
{ {
} }
KAboutData *KUIViewerPart::createAboutData() TDEAboutData *KUIViewerPart::createAboutData()
{ {
// the non-i18n name here must be the same as the directory in // the non-i18n name here must be the same as the directory in
// which the part's rc file is installed ('partrcdir' in the // which the part's rc file is installed ('partrcdir' in the
// Makefile) // Makefile)
KAboutData *aboutData = new KAboutData("kuiviewerpart", I18N_NOOP("KUIViewerPart"), "0.1", TDEAboutData *aboutData = new TDEAboutData("kuiviewerpart", I18N_NOOP("KUIViewerPart"), "0.1",
I18N_NOOP("Displays Designer's UI files"), I18N_NOOP("Displays Designer's UI files"),
KAboutData::License_LGPL ); TDEAboutData::License_LGPL );
aboutData->addAuthor("Richard Moore", 0, "rich@kde.org"); aboutData->addAuthor("Richard Moore", 0, "rich@kde.org");
aboutData->addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org"); aboutData->addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org");
return aboutData; return aboutData;

@ -28,7 +28,7 @@
class TQWidget; class TQWidget;
class KURL; class KURL;
class TQVBox; class TQVBox;
class KAboutData; class TDEAboutData;
class KListAction; class KListAction;
class KListView; class KListView;
@ -56,7 +56,7 @@ public:
*/ */
virtual ~KUIViewerPart(); virtual ~KUIViewerPart();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
bool openURL( const KURL& ); bool openURL( const KURL& );

@ -40,9 +40,9 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1", TDEAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1",
I18N_NOOP("Displays Designer's UI files"), I18N_NOOP("Displays Designer's UI files"),
KAboutData::License_LGPL ); TDEAboutData::License_LGPL );
about.addAuthor("Richard Moore", 0, "rich@kde.org"); about.addAuthor("Richard Moore", 0, "rich@kde.org");
about.addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org"); about.addAuthor("Ian Reinhart Geiser", 0, "geiseri@kde.org");
// Screenshot capability // Screenshot capability

@ -43,8 +43,8 @@ static KCmdLineOptions options[] =
int main( int argc, char** argv ) int main( int argc, char** argv )
{ {
KAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description, TDEAboutData about("SampleTests", I18N_NOOP("SampleTests"), version, description,
KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
"Jeroen.Wijnhout@kdemail.net"); "Jeroen.Wijnhout@kdemail.net");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);

@ -49,10 +49,10 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv ) int main( int argc, char **argv )
{ {
KInstance instance("modrunner"); TDEInstance instance("modrunner");
KAboutData about("KUnitTestModRunner", I18N_NOOP("KUnitTestModRunner"), version, description, TDEAboutData about("KUnitTestModRunner", I18N_NOOP("KUnitTestModRunner"), version, description,
KAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0, TDEAboutData::License_BSD, "(C) 2005 Jeroen Wijnhout", 0, 0,
"Jeroen.Wijnhout@kdemail.net"); "Jeroen.Wijnhout@kdemail.net");
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);

@ -36,8 +36,8 @@ $lastdir = '.';
'variable `QFile \S*\' has initializer but incomplete type' => "qfile", 'variable `QFile \S*\' has initializer but incomplete type' => "qfile",
'type `KConfigBase\' is not a base type for type `KConfig' => "kconfig", 'type `KConfigBase\' is not a base type for type `KConfig' => "kconfig",
'invalid use of undefined type `class QAccel' => "qaccel", 'invalid use of undefined type `class QAccel' => "qaccel",
'invalid use of undefined type `class KAboutData' => "kaboutdata", 'invalid use of undefined type `class TDEAboutData' => "kaboutdata",
'incomplete type `KAboutData\'' => "kaboutdata", 'incomplete type `TDEAboutData\'' => "kaboutdata",
'incomplete type `QGrid\'' => "qgrid", 'incomplete type `QGrid\'' => "qgrid",
'invalid use of undefined type `class QGrid\'' => "qgrid", 'invalid use of undefined type `class QGrid\'' => "qgrid",
'aggregate `class KConfig \S*\' has incomplete type' => "kconfig", 'aggregate `class KConfig \S*\' has incomplete type' => "kconfig",
@ -74,7 +74,7 @@ $lastdir = '.';
'implicit declaration of function `int UserIcon\(...\)\'' => "kiconloader", 'implicit declaration of function `int UserIcon\(...\)\'' => "kiconloader",
'`KIcon\' undeclared \(first use this function\)' => "kiconloader", '`KIcon\' undeclared \(first use this function\)' => "kiconloader",
'invalid use of undefined type `class KIconLoader' => "kiconloader", 'invalid use of undefined type `class KIconLoader' => "kiconloader",
'invalid use of undefined type `class KInstance' => "kinstance", 'invalid use of undefined type `class TDEInstance' => "kinstance",
'invalid use of undefined type `class DCOPClient' => "dcopclient", 'invalid use of undefined type `class DCOPClient' => "dcopclient",
'`DCOPClient\' undeclared \(first use this function\)' => "dcopclient", '`DCOPClient\' undeclared \(first use this function\)' => "dcopclient",
'invalid use of undefined type `class KStatusBar\'' => "kstatusbar", 'invalid use of undefined type `class KStatusBar\'' => "kstatusbar",

@ -42,11 +42,11 @@ static KCmdLineOptions options[] =
int main( int argc, char ** argv ) int main( int argc, char ** argv )
{ {
KAboutData aboutData("tdecachegrind", TDEAboutData aboutData("tdecachegrind",
I18N_NOOP("KCachegrind"), I18N_NOOP("KCachegrind"),
TDECACHEGRIND_VERSION, TDECACHEGRIND_VERSION,
I18N_NOOP("TDE Frontend for Cachegrind"), I18N_NOOP("TDE Frontend for Cachegrind"),
KAboutData::License_GPL, TDEAboutData::License_GPL,
I18N_NOOP("(C) 2002, 2003, 2004"), 0, I18N_NOOP("(C) 2002, 2003, 2004"), 0,
"http://tdecachegrind.sf.net"); "http://tdecachegrind.sf.net");
aboutData.addAuthor("Josef Weidendorfer", aboutData.addAuthor("Josef Weidendorfer",

@ -59,8 +59,8 @@ int main(int argc, char *argv[])
int nbparams = 0; int nbparams = 0;
params[nbparams] = NULL; params[nbparams] = NULL;
KAboutData aboutData( "umbodoc", I18N_NOOP("Umbrello UML Modeller autonomous code generator"), TDEAboutData aboutData( "umbodoc", I18N_NOOP("Umbrello UML Modeller autonomous code generator"),
UMBRELLO_VERSION, description, KAboutData::License_GPL, UMBRELLO_VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller Authors"), 0, I18N_NOOP("(c) 2006 Gael de Chalendar (aka Kleag), (c) 2002-2006 Umbrello UML Modeller Authors"), 0,
"http://uml.sf.net/"); "http://uml.sf.net/");
aboutData.addAuthor("Gael de Chalendar (aka Kleag)",0, "kleag@free.fr"); aboutData.addAuthor("Gael de Chalendar (aka Kleag)",0, "kleag@free.fr");

@ -90,8 +90,8 @@ extern "C" int flushEvents() {
} }
int main(int argc, char *argv[]) { int main(int argc, char *argv[]) {
KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"), TDEAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"),
UMBRELLO_VERSION, description, KAboutData::License_GPL, UMBRELLO_VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0, I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0,
"http://uml.sf.net/"); "http://uml.sf.net/");
aboutData.addAuthor("Paul Hensgen",0, "phensgen@users.sourceforge.net"); aboutData.addAuthor("Paul Hensgen",0, "phensgen@users.sourceforge.net");

@ -76,8 +76,8 @@ class PluginLoader;
* must not load GUI plugins. * must not load GUI plugins.
* *
* In order to provide application-like functionality, this class offers * In order to provide application-like functionality, this class offers
* support for accessing the configuration records of the KInstance object * support for accessing the configuration records of the TDEInstance object
* corresponding to the shared library. Because the KInstance object is * corresponding to the shared library. Because the TDEInstance object is
* only available within the scope of the shared library, the configuration * only available within the scope of the shared library, the configuration
* records must be set in the constructor of the derived plugin class. However, * records must be set in the constructor of the derived plugin class. However,
* because the construction name is passed to this constructor (as are the * because the construction name is passed to this constructor (as are the

Loading…
Cancel
Save