Rename KInstance and KAboutData to avoid conflicts with KDE4

pull/1/head
Timothy Pearson 12 years ago
parent 0111fdc2a4
commit 8ba97103df

@ -507,13 +507,13 @@ void KFileReplacePart::resetActions()
} }
//PUBLIC METHODS //PUBLIC METHODS
KAboutData* KFileReplacePart::createAboutData() TDEAboutData* KFileReplacePart::createAboutData()
{ {
KAboutData * aboutData = new KAboutData("kfilereplacepart", TDEAboutData * aboutData = new TDEAboutData("kfilereplacepart",
I18N_NOOP("KFileReplacePart"), I18N_NOOP("KFileReplacePart"),
KFR_VERSION, KFR_VERSION,
I18N_NOOP( "Batch search and replace tool."), I18N_NOOP( "Batch search and replace tool."),
KAboutData::License_GPL_V2, TDEAboutData::License_GPL_V2,
"(C) 1999-2002 Fran<61>is Dupoux\n(C) 2003-2004 Andras Mantia\n(C) 2004 Emiliano Gulmini", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org"); "(C) 1999-2002 Fran<61>is Dupoux\n(C) 2003-2004 Andras Mantia\n(C) 2004 Emiliano Gulmini", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org");
aboutData->addAuthor("Fran<EFBFBD>is Dupoux", aboutData->addAuthor("Fran<EFBFBD>is Dupoux",
I18N_NOOP("Original author of the KFileReplace tool"), I18N_NOOP("Original author of the KFileReplace tool"),

@ -20,7 +20,7 @@
// KDE // KDE
#include <kparts/part.h> #include <kparts/part.h>
class KAboutApplication; class KAboutApplication;
class KAboutData; class TDEAboutData;
class KConfig; class KConfig;
// local // local
@ -86,7 +86,7 @@ class KFileReplacePart: public KParts::ReadOnlyPart
//METHODS //METHODS
public: public:
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
KConfig *config(){ return m_config; } KConfig *config(){ return m_config; }
protected: protected:

@ -34,8 +34,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description, TDEAboutData about("kfilereplace", I18N_NOOP("KFileReplace"), version, description,
KAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."), TDEAboutData::License_GPL_V2, "(C) 2004-2005 Andras Mantia\n(C) 2004-2005 Emiliano Gulmini\n(C) 1999-2002 Francois Dupoux", I18N_NOOP("Part of the KDEWebDev module."),
"http://www.tdewebdev.org"); "http://www.tdewebdev.org");
about.addAuthor("Andras Mantia", I18N_NOOP("Shell author, KPart creator, co-maintainer"), "amantia@kde.org"); about.addAuthor("Andras Mantia", I18N_NOOP("Shell author, KPart creator, co-maintainer"), "amantia@kde.org");

@ -252,12 +252,12 @@ void KImageMapEditor::init()
setImageActionsEnabled(false); setImageActionsEnabled(false);
} }
KAboutData* KImageMapEditor::createAboutData() TDEAboutData* KImageMapEditor::createAboutData()
{ {
KAboutData* aboutData = TDEAboutData* aboutData =
new KAboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"), new TDEAboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"),
"1.0", I18N_NOOP( "An HTML imagemap editor" ), "1.0", I18N_NOOP( "An HTML imagemap editor" ),
KAboutData::License_GPL, TDEAboutData::License_GPL,
"(c) 2001-2003 Jan Sch&auml;fer <janschaefer@users.sourceforge.net>"); "(c) 2001-2003 Jan Sch&auml;fer <janschaefer@users.sourceforge.net>");
return aboutData; return aboutData;
} }

@ -138,7 +138,7 @@ public :
TQObject *parent, const char *name, const TQStringList & args = TQStringList()); TQObject *parent, const char *name, const TQStringList & args = TQStringList());
virtual ~KImageMapEditor(); virtual ~KImageMapEditor();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
static KConfig *config(); static KConfig *config();
/** /**

@ -40,8 +40,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"), TDEAboutData aboutData( "kimagemapeditor", I18N_NOOP("KImageMapEditor"),
VERSION, description, KAboutData::License_GPL, VERSION, description, TDEAboutData::License_GPL,
"(C) 2001-2008 Jan Schaefer", 0, "http://www.nongnu.org/kimagemap/", "janschaefer@users.sourceforge.net"); "(C) 2001-2008 Jan Schaefer", 0, "http://www.nongnu.org/kimagemap/", "janschaefer@users.sourceforge.net");
aboutData.addAuthor("Jan Schaefer",0, "janschaefer@users.sourceforge.net"); aboutData.addAuthor("Jan Schaefer",0, "janschaefer@users.sourceforge.net");
aboutData.addCredit("Joerg Jaspert",I18N_NOOP("For helping me with the Makefiles, and creating the Debian package")); aboutData.addCredit("Joerg Jaspert",I18N_NOOP("For helping me with the Makefiles, and creating the Debian package"));

@ -177,15 +177,15 @@ void KLinkStatusPart::slotAbout()
void KLinkStatusPart::slotReportBug() void KLinkStatusPart::slotReportBug()
{ {
KAboutData aboutData("klinkstatus", I18N_NOOP("KLinkStatus"), version_); TDEAboutData aboutData("klinkstatus", I18N_NOOP("KLinkStatus"), version_);
KBugReport bugReportDlg(0, true, &aboutData); KBugReport bugReportDlg(0, true, &aboutData);
bugReportDlg.exec(); bugReportDlg.exec();
} }
KAboutData* KLinkStatusPart::createAboutData() TDEAboutData* KLinkStatusPart::createAboutData()
{ {
KAboutData * about = new KAboutData("klinkstatuspart", I18N_NOOP("KLinkStatus Part"), version_, TDEAboutData * about = new TDEAboutData("klinkstatuspart", I18N_NOOP("KLinkStatus Part"), version_,
description_, KAboutData::License_GPL_V2, description_, TDEAboutData::License_GPL_V2,
"(C) 2004 Paulo Moura Guedes", 0, 0, "moura@tdewebdev.org"); "(C) 2004 Paulo Moura Guedes", 0, 0, "moura@tdewebdev.org");
about->addAuthor("Paulo Moura Guedes", 0, "moura@tdewebdev.org"); about->addAuthor("Paulo Moura Guedes", 0, "moura@tdewebdev.org");

@ -30,7 +30,7 @@ class TQWidget;
class TQPainter; class TQPainter;
class KURL; class KURL;
class KAboutData; class TDEAboutData;
class KAboutApplication; class KAboutApplication;
class KAction; class KAction;
@ -47,7 +47,7 @@ public:
/** Reimplemented to disable and enable Save action */ /** Reimplemented to disable and enable Save action */
virtual void setModified(bool modified); virtual void setModified(bool modified);
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
protected: protected:
/** This must be implemented by each part */ /** This must be implemented by each part */

@ -45,8 +45,8 @@ int main(int argc, char *argv[])
{ {
//____________________________________________________ //____________________________________________________
KAboutData about("klinkstatus", I18N_NOOP("KLinkStatus"), version, description, TDEAboutData about("klinkstatus", I18N_NOOP("KLinkStatus"), version, description,
KAboutData::License_GPL_V2, "(C) 2004 Paulo Moura Guedes", 0, TDEAboutData::License_GPL_V2, "(C) 2004 Paulo Moura Guedes", 0,
"http://klinkstatus.tdewebdev.org"); "http://klinkstatus.tdewebdev.org");
about.addAuthor("Paulo Moura Guedes", 0, "moura@tdewebdev.org"); about.addAuthor("Paulo Moura Guedes", 0, "moura@tdewebdev.org");

@ -40,8 +40,8 @@ static KCmdLineOptions options[] =
int main( int argc, char *argv[] ) int main( int argc, char *argv[] )
{ {
KAboutData aboutData( "kommander", I18N_NOOP("Kommander"), TDEAboutData aboutData( "kommander", I18N_NOOP("Kommander"),
KOMMANDER_VERSION, description, KAboutData::License_GPL, KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
"(C) 2002-2005 Kommander authors", text); "(C) 2002-2005 Kommander authors", text);
aboutData.addAuthor("Eric Laffoon", I18N_NOOP("Project manager"), "eric@tdewebdev.org"); aboutData.addAuthor("Eric Laffoon", I18N_NOOP("Project manager"), "eric@tdewebdev.org");
aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org"); aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org");

@ -55,8 +55,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "kmdr-executor", I18N_NOOP("Kommander Executor"), TDEAboutData aboutData( "kmdr-executor", I18N_NOOP("Kommander Executor"),
KOMMANDER_VERSION, description, KAboutData::License_GPL, KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
"(c) 2002, Marc Britton, (C) 2008 Andras Mantia", 0, 0, "http://kommander.tdewebdev.org"); "(c) 2002, Marc Britton, (C) 2008 Andras Mantia", 0, 0, "http://kommander.tdewebdev.org");
aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org"); aboutData.addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org");
aboutData.addAuthor("Michal Rudolf", I18N_NOOP("Previous maintainer"), "mrudolf@tdewebdev.org"); aboutData.addAuthor("Michal Rudolf", I18N_NOOP("Previous maintainer"), "mrudolf@tdewebdev.org");

@ -49,10 +49,10 @@ KommanderPart::~KommanderPart()
delete m_instance; delete m_instance;
} }
KAboutData* KommanderPart::createAboutData() TDEAboutData* KommanderPart::createAboutData()
{ {
KAboutData * aboutData = new KAboutData("kommander_part", I18N_NOOP("Kommander Executor Part"), TDEAboutData * aboutData = new TDEAboutData("kommander_part", I18N_NOOP("Kommander Executor Part"),
KOMMANDER_VERSION, description, KAboutData::License_GPL, KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
"(c) 2008 Andras Mantia", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org"); "(c) 2008 Andras Mantia", I18N_NOOP("Part of the KDEWebDev module."), "http://www.tdewebdev.org");
aboutData->addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org"); aboutData->addAuthor("Andras Mantia", I18N_NOOP("Current maintainer"), "amantia@tdewebdev.org");

@ -31,7 +31,7 @@ public:
virtual ~KommanderPart(); virtual ~KommanderPart();
static KAboutData* createAboutData(); static TDEAboutData* createAboutData();
protected: protected:
virtual bool openFile(); virtual bool openFile();

@ -56,8 +56,8 @@ static KCmdLineOptions options[] =
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KLocale::setMainCatalogue("kommander"); KLocale::setMainCatalogue("kommander");
KAboutData aboutData( "kmdr-plugins", I18N_NOOP("Kommander Plugin Manager"), TDEAboutData aboutData( "kmdr-plugins", I18N_NOOP("Kommander Plugin Manager"),
KOMMANDER_VERSION, description, KAboutData::License_GPL, KOMMANDER_VERSION, description, TDEAboutData::License_GPL,
"(C) 2004-2005 Kommander authors"); "(C) 2004-2005 Kommander authors");
aboutData.addAuthor("Marc Britton", "Original author", "consume@optusnet.com.au"); aboutData.addAuthor("Marc Britton", "Original author", "consume@optusnet.com.au");
aboutData.addAuthor("Eric Laffoon", "Project manager", "eric@tdewebdev.org"); aboutData.addAuthor("Eric Laffoon", "Project manager", "eric@tdewebdev.org");

@ -119,7 +119,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
m_appName = appName; m_appName = appName;
m_icon = icon; m_icon = icon;
m_copyright = copyright; m_copyright = copyright;
m_aboutData = new KAboutData(m_appName, m_appName, m_version); m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
m_aboutData->setCopyrightStatement(m_copyright); m_aboutData->setCopyrightStatement(m_copyright);
if (!m_icon.isEmpty()) if (!m_icon.isEmpty())
m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage()); m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());

@ -16,7 +16,7 @@
#include <kommanderwidget.h> #include <kommanderwidget.h>
class KAboutApplication; class KAboutApplication;
class KAboutData; class TDEAboutData;
/** /**
@author Andras Mantia <amantia@tdewebdev.org> @author Andras Mantia <amantia@tdewebdev.org>
@ -55,7 +55,7 @@ private:
void setBugAddress(const TQString &bugAddress); void setBugAddress(const TQString &bugAddress);
void setLicense(const TQString &license); void setLicense(const TQString &license);
KAboutData *m_aboutData; TDEAboutData *m_aboutData;
TQString m_version; TQString m_version;
TQString m_appName; TQString m_appName;
TQString m_copyright; TQString m_copyright;

@ -269,12 +269,12 @@ void KXsldbgPart::quit()
} }
KAboutData *KXsldbgPart::createAboutData() TDEAboutData *KXsldbgPart::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("kxsldbgpart", I18N_NOOP("KXsldbgPart"), "0.1"); TDEAboutData *aboutData = new TDEAboutData("kxsldbgpart", I18N_NOOP("KXsldbgPart"), "0.1");
aboutData->addAuthor("Keith Isdale", 0L, "k_isdale@tpg.com.au"); aboutData->addAuthor("Keith Isdale", 0L, "k_isdale@tpg.com.au");
return aboutData; return aboutData;
} }

@ -33,7 +33,7 @@ class TQWidget;
class TQPainter; class TQPainter;
class KURL; class KURL;
class TQMultiLineEdit; class TQMultiLineEdit;
class KAboutData; class TDEAboutData;
typedef TQDict<QXsldbgDoc> XsldbgDocDict; typedef TQDict<QXsldbgDoc> XsldbgDocDict;
@ -62,7 +62,7 @@ public:
*/ */
virtual ~KXsldbgPart(); virtual ~KXsldbgPart();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
/** Checks the debugger, if it is not ready then /** Checks the debugger, if it is not ready then

@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
KAboutData about("kxsldbg", I18N_NOOP("KXSLDbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", 0, 0, "k_isdale@tpg.com.au"); TDEAboutData about("kxsldbg", I18N_NOOP("KXSLDbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", 0, 0, "k_isdale@tpg.com.au");
about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" ); about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -127,7 +127,7 @@ int main(int argc, char **argv)
TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion)); TQString libexsltCompileTimeInfo(i18n("libexslt %1 was compiled against libxml %2\n").arg(exsltLibexsltVersion).arg(exsltLibxmlVersion));
TQString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo; TQString freeFormText = xsldbgRunTimeInfo + libxmlCompileTimeInfo + libxsltCompileTimeInfo + libexsltCompileTimeInfo;
KAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, KAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au"); TDEAboutData about("xsldbg", I18N_NOOP("Xsldbg"), version, description, TDEAboutData::License_GPL, "(C) 2003 Keith Isdale", freeFormText, 0, "k_isdale@tpg.com.au");
about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" ); about.addAuthor( "Keith Isdale", 0, "k_isdale@tpg.com.au" );
TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
TDECmdLineArgs::addCmdLineOptions( options ); TDECmdLineArgs::addCmdLineOptions( options );

@ -66,9 +66,9 @@ int main(int argc, char *argv[])
char *copyright = new char[200]; //this should be enough char *copyright = new char[200]; //this should be enough
strcpy(copyright, "(C) 2000-2006 - "); strcpy(copyright, "(C) 2000-2006 - ");
strcat(copyright, developers); strcat(copyright, developers);
KAboutData TDEAboutData
aboutData( QUANTA_PACKAGE, I18N_NOOP("Quanta"), aboutData( QUANTA_PACKAGE, I18N_NOOP("Quanta"),
QUANTA_VERSION, description, KAboutData::License_GPL_V2, QUANTA_VERSION, description, TDEAboutData::License_GPL_V2,
copyright, copyright,
othertext, othertext,
"http://tdewebdev.org" "http://tdewebdev.org"

@ -4084,7 +4084,7 @@ TQString QuantaApp::saveCurrentFile()
void QuantaApp::slotReportBug() void QuantaApp::slotReportBug()
{ {
KAboutData aboutData( "quanta", I18N_NOOP("Quanta"), QUANTA_VERSION); TDEAboutData aboutData( "quanta", I18N_NOOP("Quanta"), QUANTA_VERSION);
KBugReport bugReportDlg(this, true, &aboutData); KBugReport bugReportDlg(this, true, &aboutData);
bugReportDlg.exec(); bugReportDlg.exec();
} }

Loading…
Cancel
Save