Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 11 years ago
parent 3f52288dea
commit c75428cb70

@ -36,11 +36,11 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData(
TDEAboutData aboutData(
"atlantik",
I18N_NOOP("Atlantik"), ATLANTIK_VERSION_STRING,
I18N_NOOP("The Atlantic board game"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
I18N_NOOP("(c) 1998-2004 Rob Kaper"),
I18N_NOOP("TDE client for playing Monopoly-like games on the monopd network."),
"http://unixcode.org/atlantik/"

@ -36,7 +36,7 @@ extern "C"
{
int LIBATLANTIC_EXPORT kdemain( int, char **argv )
{
KInstance instance( "kio_atlantik" );
TDEInstance instance( "kio_atlantik" );
AtlantikProtocol slave(argv[2], argv[3]);
slave.dispatchLoop();
return 0;

@ -23,8 +23,8 @@ static const char description[] =
int main( int argc, char *argv[] )
{
KAboutData aboutData( "kasteroids", I18N_NOOP("KAsteroids"),
KASTEROIDS_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kasteroids", I18N_NOOP("KAsteroids"),
KASTEROIDS_VERSION, description, TDEAboutData::License_GPL,
"(c) 1997, Martin R. Jones");
aboutData.addAuthor("Martin R. Jones",0, "mjones@kde.org");
TDECmdLineArgs::init( argc, argv, &aboutData );

@ -39,8 +39,8 @@ static const char version[] = "2.0";
int main(int argc, char **argv)
{
KAboutData aboutData( "katomic", I18N_NOOP("KAtomic"),
version, description, KAboutData::License_GPL,
TDEAboutData aboutData( "katomic", I18N_NOOP("KAtomic"),
version, description, TDEAboutData::License_GPL,
"(c) 1998, Andreas Wuest");
aboutData.addAuthor("Andreas Wuest", 0, "AndreasWuest@gmx.de");
aboutData.addAuthor("Stephan Kulow", 0, "coolo@kde.org");

@ -40,8 +40,8 @@ static const char notice[] = I18N_NOOP("This is a graphical backgammon prog
*/
int main(int argc, char *argv[])
{
KAboutData about(PROG_NAME, I18N_NOOP("KBackgammon"), PROG_VERSION, description,
KAboutData::License_GPL, "(C) 1999-2001 Jens Hoefkens", notice);
TDEAboutData about(PROG_NAME, I18N_NOOP("KBackgammon"), PROG_VERSION, description,
TDEAboutData::License_GPL, "(C) 1999-2001 Jens Hoefkens", notice);
about.addAuthor ("Jens Hoefkens", I18N_NOOP("Author & maintainer"),
"jens@hoefkens.com");

@ -31,7 +31,7 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[])
{
KAboutData aboutData("kbattleship", clientName, clientVersion, clientDescription, KAboutData::License_GPL, "(c) 2000-2005 Nikolas Zimmermann, Daniel Molkentin");
TDEAboutData aboutData("kbattleship", clientName, clientVersion, clientDescription, TDEAboutData::License_GPL, "(c) 2000-2005 Nikolas Zimmermann, Daniel Molkentin");
aboutData.addAuthor("Nikolas Zimmermann", I18N_NOOP("Project Founder, GUI Handling, Client/Server"), "wildfox@kde.org");
aboutData.addAuthor("Daniel Molkentin", I18N_NOOP("Dialog Stuff, Client/Server"), "molkentin@kde.org");

@ -26,8 +26,8 @@ static const char description[] = I18N_NOOP("TDE Blackbox Game");
int main( int argc, char **argv )
{
KAboutData aboutData( "kblackbox", I18N_NOOP("KBlackBox"),
KBVERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kblackbox", I18N_NOOP("KBlackBox"),
KBVERSION, description, TDEAboutData::License_GPL,
"(c) 1999-2000, Robert Cimrman");
aboutData.addAuthor("Robert Cimrman",0, "cimrman3@students.zcu.cz");
TDECmdLineArgs::init( argc, argv, &aboutData );

@ -44,8 +44,8 @@ int main(int argc, char **argv)
{
KHighscore::init("kbounce");
KAboutData aboutData( "kbounce", I18N_NOOP("KBounce"),
version, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kbounce", I18N_NOOP("KBounce"),
version, description, TDEAboutData::License_GPL,
"(c) 2000, Stefan Schimanski");
aboutData.addAuthor("Stefan Schimanski", I18N_NOOP("Original author"), "schimmi@kde.org");

@ -38,8 +38,8 @@ AbTop *create(TDECmdLineArgs *args)
int main(int argc, char *argv[])
{
KAboutData aboutData( "kenolaba", I18N_NOOP("Kenolaba"),
KENOLABA_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kenolaba", I18N_NOOP("Kenolaba"),
KENOLABA_VERSION, description, TDEAboutData::License_GPL,
"(c) 1997-2000, Josef Weidendorfer");
aboutData.addAuthor("Josef Weidendorfer",0, "Josef.Weidendorfer@gmx.de");
aboutData.addAuthor("Robert Williams");

@ -18,9 +18,9 @@ static const char version[] = "2.0";
int main (int argc, char **argv)
{
KAboutData about("kgoldrunner", I18N_NOOP("KGoldrunner" ),
TDEAboutData about("kgoldrunner", I18N_NOOP("KGoldrunner" ),
version, description,
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(C) 2003 Ian Wadham and Marco Krüger");
about.addAuthor( "Ian Wadham", I18N_NOOP("Current author"),
"ianw2@optusnet.com.au" );

@ -36,8 +36,8 @@ static const char dummy[] = I18N_NOOP2("Menu title", "&Move");
int main(int argc, char *argv[])
{
KAboutData aboutData( "kjumpingcube", I18N_NOOP("KJumpingCube"),
KJC_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kjumpingcube", I18N_NOOP("KJumpingCube"),
KJC_VERSION, description, TDEAboutData::License_GPL,
"(c) 1998-2000, Matthias Kiefer");
aboutData.addAuthor("Matthias Kiefer",0, "matthias.kiefer@gmx.de");
aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+kjumpingcube@meyerhome.net");

@ -36,8 +36,8 @@ static const char dummy[] = I18N_NOOP2("Menu title", "&Move");
int main( int argc, char **argv )
{
KAboutData aboutData("klines", I18N_NOOP("Kolor Lines"), LINESVERSION,
description, KAboutData::License_GPL);
TDEAboutData aboutData("klines", I18N_NOOP("Kolor Lines"), LINESVERSION,
description, TDEAboutData::License_GPL);
aboutData.addAuthor("Roman Merzlyakov", I18N_NOOP("Original author"), "roman@sbrf.barrt.ru");
aboutData.addAuthor("Roman Razilov", I18N_NOOP("Rewrite and Extension"), "Roman.Razilov@gmx.de");
TDECmdLineArgs::init(argc, argv, &aboutData);

@ -10,8 +10,8 @@ static const char description[] = I18N_NOOP("Mahjongg for TDE");
int main( int argc, char** argv )
{
KAboutData aboutData( "kmahjongg", I18N_NOOP("KMahjongg"),
KMAHJONGG_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kmahjongg", I18N_NOOP("KMahjongg"),
KMAHJONGG_VERSION, description, TDEAboutData::License_GPL,
"(c) 1997, Mathias Mueller");
aboutData.addAuthor("Mathias Mueller", I18N_NOOP("Original Author"), "in5y158@public.uni-hamburg.de");
aboutData.addAuthor("Albert Astals Cid", I18N_NOOP("Current maintainer"), "astals11@terra.es");

@ -198,7 +198,7 @@
* fix the pixmaps drawing so that they are not too bad in custom case sizes
2.0.0 (14 December 1999)
* use of KDialogBase and KAboutData/KAboutDialog
* use of KDialogBase and TDEAboutData/KAboutDialog
* unflagged mines are shown at game's end
* hack for focus handling in highscores dialog ...
* slightly better LCDs, message label and smiley button

@ -238,8 +238,8 @@ int main(int argc, char **argv)
{
KHighscore::init("kmines");
KAboutData aboutData("kmines", I18N_NOOP("KMines"), LONG_VERSION,
DESCRIPTION, KAboutData::License_GPL,
TDEAboutData aboutData("kmines", I18N_NOOP("KMines"), LONG_VERSION,
DESCRIPTION, TDEAboutData::License_GPL,
COPYLEFT, 0, HOMEPAGE);
aboutData.addAuthor("Nicolas Hadacek", 0, EMAIL);
aboutData.addCredit("Andreas Zehender", I18N_NOOP("Smiley pixmaps"));

@ -39,8 +39,8 @@ static KCmdLineOptions options[] =
int main(int argc, char ** argv)
{
KAboutData about("knetwalk", I18N_NOOP("knetwalk"), version, description,
KAboutData::License_GPL, I18N_NOOP("(C) 2004, 2005 Andi Peredri, ported to KDE by Thomas Nagy"), 0,
TDEAboutData about("knetwalk", I18N_NOOP("knetwalk"), version, description,
TDEAboutData::License_GPL, I18N_NOOP("(C) 2004, 2005 Andi Peredri, ported to KDE by Thomas Nagy"), 0,
"tnagyemail-mail@yahoo.fr");
about.addAuthor( "Andi Peredri", 0, "andi@ukr.net" );
about.addAuthor( "Thomas Nagy", 0, "tnagy2^8@yahoo.fr" );

@ -29,7 +29,7 @@ static KCmdLineOptions options[] =
extern "C" KDE_EXPORT int kdemain(int argc, char **argv)
{
KAboutData aboutData( "kolf", I18N_NOOP("Kolf"), version, description, KAboutData::License_GPL, "(c) 2002-2005, Jason Katz-Brown", 0, "http://www.katzbrown.com/kolf/");
TDEAboutData aboutData( "kolf", I18N_NOOP("Kolf"), version, description, TDEAboutData::License_GPL, "(c) 2002-2005, Jason Katz-Brown", 0, "http://www.katzbrown.com/kolf/");
aboutData.addAuthor("Jason Katz-Brown", I18N_NOOP("Main author"), "jason@katzbrown.com");
aboutData.addAuthor("Niklas Knutsson", I18N_NOOP("Advanced putting mode"), 0);

@ -12,8 +12,8 @@ static const char description[] = I18N_NOOP("Galactic Strategy TDE Game");
int
main(int argc, char **argv)
{
KAboutData aboutData( "konquest", I18N_NOOP("Konquest"),
KONQUEST_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "konquest", I18N_NOOP("Konquest"),
KONQUEST_VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("Copyright (c) 1999-2001, Developers"));
aboutData.addAuthor("Russ Steffen",0, "rsteffen@bayarea.net");
TDECmdLineArgs::init( argc, argv, &aboutData );

@ -33,8 +33,8 @@ static KCmdLineOptions options[] =
int main( int argc, char **argv )
{
KAboutData aboutData( "kpat", I18N_NOOP("KPatience"),
KPAT_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kpat", I18N_NOOP("KPatience"),
KPAT_VERSION, description, TDEAboutData::License_GPL,
"(c) 1995, Paul Olav Tvete\n"
"(c) 2000 Stephan Kulow");
aboutData.addAuthor("Paul Olav Tvete");

@ -26,8 +26,8 @@ static const char description[] = I18N_NOOP("TDE Poker Game");
int main( int argc, char *argv[] )
{
KAboutData aboutData("kpoker", I18N_NOOP("KPoker"),
KPOKER_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData("kpoker", I18N_NOOP("KPoker"),
KPOKER_VERSION, description, TDEAboutData::License_GPL,
"(c) 1997-2003 Jochen Tuchbreiter, Andreas Beckermann\n"
"(c) 2004 Jochen Tuchbreiter, Andreas Beckermann, Inge Wallin",
I18N_NOOP("For a full list of credits see helpfile\nAny suggestions, bug reports etc. are welcome"));

@ -54,8 +54,8 @@ int main(int argc, char **argv)
{
KHighscore::init("kreversi");
KAboutData aboutData( "kreversi", I18N_NOOP("KReversi"),
KREVERSI_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kreversi", I18N_NOOP("KReversi"),
KREVERSI_VERSION, description, TDEAboutData::License_GPL,
"(c) 1997-2000, Mario Weilguni");
aboutData.addAuthor("Mario Weilguni",0, "mweilguni@sime.com");
aboutData.addAuthor("Benjamin Meyer",0, "ben+kreversi@meyerhome.net");

@ -34,8 +34,8 @@ static const char description[] = I18N_NOOP("Same Game - a little game about bal
static const char copyright[] = "(c) 1997-1998 Marcus Kreutzberger";
int main( int argc, char **argv ) {
KAboutData aboutData("ksame", I18N_NOOP("SameGame"), KSAME_VERSION,
description, KAboutData::License_GPL, copyright);
TDEAboutData aboutData("ksame", I18N_NOOP("SameGame"), KSAME_VERSION,
description, TDEAboutData::License_GPL, copyright);
aboutData.addAuthor("Marcus Kreutzberger", 0, "kreutzbe@informatik.mu-luebeck.de");
TDECmdLineArgs::init(argc, argv, &aboutData);

@ -53,8 +53,8 @@ static const char dummy[] = I18N_NOOP2("Menu title", "&Move");
int main(int argc, char **argv)
{
KAboutData aboutData( "kshisen", I18N_NOOP("Shisen-Sho"),
KSHISEN_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kshisen", I18N_NOOP("Shisen-Sho"),
KSHISEN_VERSION, description, TDEAboutData::License_GPL,
"(c) 1997, Mario Weilguni");
aboutData.addAuthor("Dave Corrie", I18N_NOOP("Current Maintainer"), "kde@davecorrie.com");
aboutData.addAuthor("Mario Weilguni", I18N_NOOP("Original Author"), "mweilguni@sime.com");

@ -163,7 +163,7 @@
1.1.13 (7 February 2000)
* found bug in piece copying/random generation
* KAboutData
* TDEAboutData
* first modifications for the use of QCanvas
1.1.12 (14 December 1999)

@ -36,8 +36,8 @@ static const char description[] = I18N_NOOP("TDE SmileTris");
int main(int argc, char **argv)
{
KAboutData aboutData( "ksmiletris", I18N_NOOP("KSmileTris"),
VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "ksmiletris", I18N_NOOP("KSmileTris"),
VERSION, description, TDEAboutData::License_GPL,
"(c) 1998, Sandro Sigala");
aboutData.addAuthor("Sandro Sigala",0, "ssigala@globalnet.it");
TDECmdLineArgs::init( argc, argv, &aboutData );

@ -33,8 +33,8 @@ static const char description[] = I18N_NOOP("TDE Snake Race Game");
int main( int argc, char **argv )
{
KAboutData aboutData( "ksnake", I18N_NOOP("KSnakeRace"),
KSNAKE_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "ksnake", I18N_NOOP("KSnakeRace"),
KSNAKE_VERSION, description, TDEAboutData::License_GPL,
I18N_NOOP("(c) 1997-2000, Your Friendly KSnake Developers"));
aboutData.addAuthor("Michel Filippi",0, "mfilippi@sade.rhein-main.de");
aboutData.addAuthor("Robert Williams");

@ -42,8 +42,8 @@ static KCmdLineOptions options[] =
int
main (int argc, char **argv)
{
KAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
version, description, KAboutData::License_GPL,
TDEAboutData aboutData("ksokoban", I18N_NOOP("KSokoban"),
version, description, TDEAboutData::License_GPL,
"(c) 1998-2001 Anders Widell", 0,
"http://hem.passagen.se/awl/ksokoban/");
aboutData.addAuthor("Anders Widell", 0,

@ -9,8 +9,8 @@ static const char description[] = I18N_NOOP("TDE Space Game");
int main(int argc,char **argv)
{
KAboutData aboutData( "kspaceduel", I18N_NOOP("KSpaceDuel"),
KSPACEDUEL_VERSION, description, KAboutData::License_GPL,
TDEAboutData aboutData( "kspaceduel", I18N_NOOP("KSpaceDuel"),
KSPACEDUEL_VERSION, description, TDEAboutData::License_GPL,
"(c) 1998-2000, Andreas Zehender");
aboutData.addAuthor("Andreas Zehender",0, "az@azweb.de");
TDECmdLineArgs::init( argc, argv, &aboutData );

@ -34,8 +34,8 @@ static const char notice[] = I18N_NOOP("(c) 1998-2000, Matthias Kiefer\n\n"
int main(int argc, char* argv[])
{
KAboutData aboutData( "ktron", I18N_NOOP("KTron"),
KTRON_VERSION, description, KAboutData::License_GPL, notice);
TDEAboutData aboutData( "ktron", I18N_NOOP("KTron"),
KTRON_VERSION, description, TDEAboutData::License_GPL, notice);
aboutData.addAuthor("Matthias Kiefer",I18N_NOOP("Original author"), "matthias.kiefer@gmx.de");
aboutData.addAuthor("Benjamin Meyer",I18N_NOOP("Various improvements"), "ben+ktron@meyerhome.net");
TDECmdLineArgs::init( argc, argv, &aboutData );

@ -28,8 +28,8 @@ static const char version[] = "0.4";
int main(int argc, char *argv[])
{
KAboutData aboutData( "ktuberling", I18N_NOOP("KTuberling"),
version, description, KAboutData::License_GPL,
TDEAboutData aboutData( "ktuberling", I18N_NOOP("KTuberling"),
version, description, TDEAboutData::License_GPL,
"(c) 1999-2003, The KTuberling Developers", text);
aboutData.addAuthor("Eric Bischoff", I18N_NOOP("Developer"), "e.bischoff@noos.fr");
aboutData.addAuthor("John Calhoun", I18N_NOOP("Original concept and artwork"));

@ -17,8 +17,8 @@ BaseFactory::BaseFactory(const MainData &md, const BaseBoardInfo &bi)
Q_ASSERT( _self==0 );
_self = this;
_aboutData =
new KAboutData(md.appName, md.trName, md.longVersion, md.description,
KAboutData::License_GPL,
new TDEAboutData(md.appName, md.trName, md.longVersion, md.description,
TDEAboutData::License_GPL,
"(c) 1995, Eirik Eng\n(c) 1996-2004, Nicolas Hadacek",
0, md.homepage);
_aboutData->addAuthor("Nicolas Hadacek", 0, "hadacek@kde.org");

@ -27,7 +27,7 @@ struct BaseBoardInfo {
class BaseBoard;
class BaseInterface;
class TQWidget;
class KAboutData;
class TDEAboutData;
#define bfactory BaseFactory::self()
@ -51,7 +51,7 @@ class KDE_EXPORT BaseFactory
virtual TQWidget *createGameConfig() { return 0; }
protected:
KAboutData *_aboutData;
TDEAboutData *_aboutData;
private:
static BaseFactory *_self;

@ -30,10 +30,10 @@ int main(int argc, char *argv[])
{
global_debug=0;
KAboutData aboutData( "lskat", I18N_NOOP("Lieutenant Skat"),
TDEAboutData aboutData( "lskat", I18N_NOOP("Lieutenant Skat"),
"1.0",
I18N_NOOP("Card Game"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 2000, Martin Heni");
aboutData.addAuthor("Martin Heni",0, "martin@heni-online.de");
aboutData.addCredit("Laura", I18N_NOOP("Beta testing"), 0);

@ -36,10 +36,10 @@ int global_debug;
int main(int argc, char *argv[])
{
global_debug=0;
KAboutData aboutData( "twin4", I18N_NOOP("TWin4"),
TDEAboutData aboutData( "twin4", I18N_NOOP("TWin4"),
TWIN4_VERSION,
I18N_NOOP("TWin4: Two player network game"),
KAboutData::License_GPL,
TDEAboutData::License_GPL,
"(c) 1995-2000, Martin Heni");
aboutData.addAuthor("Martin Heni",0, "martin@heni-online.de");
aboutData.addCredit("Laura", I18N_NOOP("Beta testing"), 0);

Loading…
Cancel
Save