Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 10 years ago
parent f2240fa06f
commit 78f8b2d68b

@ -18,7 +18,7 @@
int main(int argc, char *argv[])
{
KAboutData about("blinken", I18N_NOOP("blinKen"), "0.1.1", I18N_NOOP("A memory enhancement game"), KAboutData::License_GPL, "© 2005 Albert Astals Cid\n© 2005 Danny Allen");
TDEAboutData about("blinken", I18N_NOOP("blinKen"), "0.1.1", I18N_NOOP("A memory enhancement game"), TDEAboutData::License_GPL, "© 2005 Albert Astals Cid\n© 2005 Danny Allen");
about.addAuthor("Albert Astals Cid", I18N_NOOP("Coding"), "tsdgeos@terra.es");
about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and Sounds"), "danny@dannyallen.co.uk");
about.addCredit("Steve Jordi", I18N_NOOP("GPL'ed his 'Steve' font so that we could use it"), "steve@sjordi.com");

@ -49,8 +49,8 @@ int main(int argc, char **argv)
caml_startup(argv);
#endif
KAboutData about("kalzium", I18N_NOOP("Kalzium"), version, description,
KAboutData::License_GPL, "(C) 2002-2005 Carsten Niehaus", 0, "http://edu.kde.org/kalzium");
TDEAboutData about("kalzium", I18N_NOOP("Kalzium"), version, description,
TDEAboutData::License_GPL, "(C) 2002-2005 Carsten Niehaus", 0, "http://edu.kde.org/kalzium");
about.addAuthor( "Carsten Niehaus", 0, "cniehaus@kde.org" );
about.addCredit( "Pino Toscano", I18N_NOOP("Code contributions" ));
about.addCredit( "Martin Pfeiffer", I18N_NOOP("Tooltip, some other small things" ));

@ -29,7 +29,7 @@
int main(int argc, char *argv[])
{
KAboutData about("kanagram", I18N_NOOP("Kanagram"), "0.1", I18N_NOOP("An anagram game"), KAboutData::License_GPL, "© 2005 Joshua Keel\n© 2005 Danny Allen");
TDEAboutData about("kanagram", I18N_NOOP("Kanagram"), "0.1", I18N_NOOP("An anagram game"), TDEAboutData::License_GPL, "© 2005 Joshua Keel\n© 2005 Danny Allen");
about.addAuthor("Joshua Keel", I18N_NOOP("Coding"), "joshuakeel@gmail.com");
about.addAuthor("Danny Allen", I18N_NOOP("Design, Graphics and many Vocabularies"), "danny@dannyallen.co.uk");
about.addCredit("Artemiy Pavlov", I18N_NOOP("Sound effects"), 0, "http://artemiolabs.com");

@ -36,11 +36,11 @@ int main(int argc, char * argv[])
/* fill the about data; the common KDE about dialog will show it to the
* user */
KAboutData aboutData( "kbruch",
TDEAboutData aboutData( "kbruch",
description,
KBRUCH_VERSION,
I18N_NOOP("Learn calculating with fractions"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2002-2005, Sebastian Stein", 0, "http://edu.kde.org/kbruch/",
"seb.kde@hpfsc.de");
aboutData.addAuthor("Sebastian Stein",0, "seb.kde@hpfsc.de");

@ -54,11 +54,11 @@ KEducaPart::~KEducaPart()
{
}
KAboutData* KEducaPart::createAboutData()
TDEAboutData* KEducaPart::createAboutData()
{
KAboutData *data = new KAboutData( "keduca", I18N_NOOP( "KEducaPart" ),
TDEAboutData *data = new TDEAboutData( "keduca", I18N_NOOP( "KEducaPart" ),
"0.2", I18N_NOOP( "KEduca KParts Component" ),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2004, Henrique Pinto <henrique.pinto@kdemail.net>"
);
return data;

@ -27,7 +27,7 @@
#include <kparts/part.h>
class KEducaView;
class KAboutData;
class TDEAboutData;
/**
* KPart component for KEduca
@ -52,7 +52,7 @@ class KEducaPart : public KParts::ReadOnlyPart
/*
* Returns information about this part.
*/
static KAboutData* createAboutData();
static TDEAboutData* createAboutData();
protected:
/*

@ -33,8 +33,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
version, description, KAboutData::License_GPL,
TDEAboutData aboutData( "keduca", I18N_NOOP("KEduca"),
version, description, TDEAboutData::License_GPL,
"(c) 2001, Javier Campos", 0, "http://keduca.sourceforge.net", "submit@bugs.kde.org");
aboutData.addAuthor("Javier Campos",I18N_NOOP( "Original Author" ), "javi@asyris.org");
aboutData.addAuthor("Klas Kalass",I18N_NOOP( "Maintainer 2002-2004" ), "klas@kde.org");

@ -34,8 +34,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
version, description, KAboutData::License_GPL,
TDEAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"),
version, description, TDEAboutData::License_GPL,
"(c) 2001, Javier Campos", 0, "http://keduca.sourceforge.net", "submit@bugs.kde.org");
aboutData.addAuthor("Javier Campos",I18N_NOOP("Original Author"), "javi@asyris.org");
aboutData.addAuthor("Klas Kalass",I18N_NOOP("Maintainer 2002-2004"), "klas@kde.org");

@ -16,7 +16,7 @@
int main(int argc, char *argv[])
{
KAboutData about("kgeography", I18N_NOOP("KGeography"), "0.4.4", I18N_NOOP("A geography learning program"), KAboutData::License_GPL, "© 2004-2005 Albert Astals Cid", 0, "http://kgeography.berlios.de");
TDEAboutData about("kgeography", I18N_NOOP("KGeography"), "0.4.4", I18N_NOOP("A geography learning program"), TDEAboutData::License_GPL, "© 2004-2005 Albert Astals Cid", 0, "http://kgeography.berlios.de");
about.addAuthor("Albert Astals Cid", I18N_NOOP("Programmer and designer"), "tsdgeos@terra.es");
about.addCredit("Danny Allen", I18N_NOOP("Small refinements"), "danny@dannyallen.co.uk");
about.addCredit("Giuseppe Caruso", I18N_NOOP("Italy flags and Italy by provinces map"), "caruso@pietrobo.com");

@ -41,8 +41,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
KHM_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "khangman", I18N_NOOP("KHangMan"),
KHM_VERSION, description, TDEAboutData::License_GPL,
"(c) 2001-2006, Anne-Marie Mahfouf", 0,
"http://edu.kde.org/khangman");
aboutData.addAuthor("Primoz Anzur", I18N_NOOP("Previous maintainer"), "zerokode@gmx.net");

@ -385,7 +385,7 @@
* Add all the constructible regular polygons actions to
kigpartui.rc.
* Remove the call to KAboutData::setTranslator in kig/aboutdata.h,
* Remove the call to TDEAboutData::setTranslator in kig/aboutdata.h,
since Scripty generate automatically the two strings.
2004-10-24 Dominique Devriese <devriese@kde.org>
@ -893,7 +893,7 @@
* Improve Kig embedded in Konqueror experience: make translations
and icons work by using the correct instanceName(), and using the
iconLoader we get from our KInstance instead of from KGlobal ( so
iconLoader we get from our TDEInstance instead of from KGlobal ( so
that the kig specific dirs are checked for icons as well ).
2004-04-10 Dominique Devriese <devriese@kde.org>

@ -20,13 +20,13 @@
#include "config.h"
inline KAboutData* kigAboutData( const char* name, const char* iname )
inline TDEAboutData* kigAboutData( const char* name, const char* iname )
{
const char* version = "v" KIGVERSION;
const char* description = I18N_NOOP( "TDE Interactive Geometry" );
KAboutData* tmp = new KAboutData( name, iname, version,
description, KAboutData::License_GPL,
TDEAboutData* tmp = new TDEAboutData( name, iname, version,
description, TDEAboutData::License_GPL,
I18N_NOOP( "(C) 2002-2005, The Kig developers" ),
0, "http://edu.kde.org/kig" );
tmp->addAuthor("Dominique Devriese",

@ -77,7 +77,7 @@ static const TQString typesFile = "macros.kigt";
typedef KParts::GenericFactory<KigPart> KigPartFactory;
K_EXPORT_COMPONENT_FACTORY ( libkigpart, KigPartFactory )
KAboutData* KigPart::createAboutData()
TDEAboutData* KigPart::createAboutData()
{
return kigAboutData( "kig", I18N_NOOP( "KigPart" ) );
}

@ -28,7 +28,7 @@
#include "../objects/common.h"
class KAboutData;
class TDEAboutData;
class KActionMenu;
class KCommandHistory;
class KPrinter;
@ -166,7 +166,7 @@ protected:
bool internalSaveAs();
public:
static KAboutData* createAboutData();
static TDEAboutData* createAboutData();
protected:
void setupActions();
void setupTypes();

@ -103,7 +103,7 @@ static int convertToNative( const KURL& file, const TQCString& outfile )
int main(int argc, char **argv)
{
KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
TDEAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") );
TDECmdLineArgs::init(argc, argv, about);
TDECmdLineArgs::addCmdLineOptions( options );

@ -40,8 +40,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
tqInstallMsgHandler(noMessageOutput);
KAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
"1.2", I18N_NOOP("Japanese Reference Tool"), KAboutData::License_GPL,
TDEAboutData aboutData( "kiten", I18N_NOOP("Kiten"),
"1.2", I18N_NOOP("Japanese Reference Tool"), TDEAboutData::License_GPL,
"(c) 2001-2004, Jason Katz-Brown", 0, "http://www.katzbrown.com/kiten");
aboutData.addAuthor("Jason Katz-Brown", I18N_NOOP("Original author"), "jason@katzbrown.com");

@ -32,8 +32,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
"0.9", description, KAboutData::License_GPL,
TDEAboutData aboutData( "klatin", I18N_NOOP("KLatin"),
"0.9", description, TDEAboutData::License_GPL,
"(C) 2001-2004, George Wright", 0, "http://edu.kde.org/klatin", "submit@bugs.kde.org");
aboutData.addAuthor("George Wright",I18N_NOOP("Author and Maintainer"), "gwright@kde.org");

@ -45,8 +45,8 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
TDEAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description,
TDEAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");
about.addAuthor( "Anne-Marie Mahfouf", 0, "annma AT kde.org");
about.addCredit("Ludovic Grossard",
I18N_NOOP("French sounds"), "grossard AT kde.org");

@ -766,12 +766,12 @@ void MainDlg::resetZoom()
}
// It's usually safe to leave the factory code alone.. with the
// notable exception of the KAboutData data
// notable exception of the TDEAboutData data
#include <kaboutdata.h>
#include <klocale.h>
KInstance* KmPlotPartFactory::s_instance = 0L;
KAboutData* KmPlotPartFactory::s_about = 0L;
TDEInstance* KmPlotPartFactory::s_instance = 0L;
TDEAboutData* KmPlotPartFactory::s_about = 0L;
KmPlotPartFactory::KmPlotPartFactory()
: KParts::Factory()
@ -795,12 +795,12 @@ KParts::Part* KmPlotPartFactory::createPartObject( TQWidget *parentWidget, const
return obj;
}
KInstance* KmPlotPartFactory::instance()
TDEInstance* KmPlotPartFactory::instance()
{
if( !s_instance )
{
s_about = new KAboutData("kmplot",I18N_NOOP( "KmPlotPart" ), "1");
s_instance = new KInstance(s_about);
s_about = new TDEAboutData("kmplot",I18N_NOOP( "KmPlotPart" ), "1");
s_instance = new TDEInstance(s_about);
}
return s_instance;
}

@ -224,11 +224,11 @@ public:
virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName,
TQObject *parent, const char *name,
const char *classname, const TQStringList &args );
static KInstance* instance();
static TDEInstance* instance();
private:
static KInstance* s_instance;
static KAboutData* s_about;
static TDEInstance* s_instance;
static TDEAboutData* s_about;
};
class BrowserExtension : public KParts::BrowserExtension

@ -52,10 +52,10 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv )
{
KAboutData aboutData(
TDEAboutData aboutData(
"kmplot",
I18N_NOOP( "KmPlot" ),
KP_VERSION, description, KAboutData::License_GPL,
KP_VERSION, description, TDEAboutData::License_GPL,
"(c) 2000-2002, Klaus-Dieter Möller",
0,
"http://edu.kde.org/kmplot/" );

@ -36,11 +36,11 @@ static KCmdLineOptions options[] =
int main( int argc, char *argv[] )
{
KAboutData aboutData
TDEAboutData aboutData
(
"kpercentage",
I18N_NOOP( "KPercentage" ),
KPERCENTAGE_VERSION, description, KAboutData::License_GPL,
KPERCENTAGE_VERSION, description, TDEAboutData::License_GPL,
"(c) 2001-2007, Matthias Messmer",
0, 0,
"submit@bugs.kde.org"

@ -51,8 +51,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData( "kstars", I18N_NOOP("KStars"),
KSTARS_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kstars", I18N_NOOP("KStars"),
KSTARS_VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2001-2003, The KStars Team"), notice, "http://edu.kde.org/kstars");
aboutData.addAuthor("Jason Harris",0, "jharris@30doradus.org", "http://www.30doradus.org");
aboutData.addAuthor("Heiko Evermann",0, "heiko@evermann.de", "http://www.evermann.de");

@ -28,11 +28,11 @@ static KCmdLineOptions options[] = {
int main(int argc, char **argv)
{
KAboutData about("ktouch",
TDEAboutData about("ktouch",
I18N_NOOP("KTouch"),
version,
description,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"Copyright (C) 2000-2006 by Håvard Frøiland and Andreas Nicolai",
0,
"http://edu.kde.org/ktouch",

@ -45,7 +45,7 @@ static KCmdLineOptions options[] =
int main(int argc, char **argv)
{
KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, KAboutData::License_GPL, copyright, 0, website);
TDEAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, TDEAboutData::License_GPL, copyright, 0, website);
about.addAuthor("Cies Breijs",
I18N_NOOP("Main developer and initiator"),
"cies # kde.nl");

@ -35,8 +35,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"),
VERSION, description, TDEAboutData::License_GPL,
"(c) 2001, Arnold Kraschinski", 0, 0, "arnold.k67@gmx.de");
aboutData.addAuthor("Arnold Kraschinski",0, "arnold.k67@gmx.de");
aboutData.addCredit("David Vignoni", I18N_NOOP("svg icon"), "david80v@tin.it");

@ -40,11 +40,11 @@ static KCmdLineOptions options[] =
static const char description[] = I18N_NOOP("Vocabulary Trainer");
static const char version[] = KVOCTRAIN_VERSION_STRING;
KAboutData aboutData("kvoctrain",
TDEAboutData aboutData("kvoctrain",
I18N_NOOP("KVocTrain"),
version,
description,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP("© 1999-2002\tEwald Arnold\n"
"© 2001-2002\tThe KDE team\n"
"© 2004-2007\tPeter Hedlund\n"

@ -35,11 +35,11 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData("kwordquiz",
TDEAboutData aboutData("kwordquiz",
I18N_NOOP("KWordQuiz"),
KWTQ_VERSION,
description,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2003-2005, Peter Hedlund",
0,
"http://edu.kde.org/kwordquiz",

@ -13,8 +13,8 @@ static KCmdLineOptions options[] =
int main( int argc, char *argv[] )
{
KAboutData aboutData( "test_extdatepicker", I18N_NOOP("Test ExtDatePicker"),
"0.1", description, KAboutData::License_GPL,
TDEAboutData aboutData( "test_extdatepicker", I18N_NOOP("Test ExtDatePicker"),
"0.1", description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 2004, Jason Harris"), notice,
"http://30doradus.org");
aboutData.addAuthor("Jason Harris", 0,

Loading…
Cancel
Save