diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:24:21 -0600 |
| commit | 8ba97103df12b002f6b2cf1d24a4b389a6379f61 (patch) | |
| tree | 583bb7f0c8a54d0d497abec2f95a692cda8c7b30 /kxsldbg | |
| parent | 0111fdc2a40580d418d365006c52845c320558b0 (diff) | |
| download | tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.tar.gz tdewebdev-8ba97103df12b002f6b2cf1d24a4b389a6379f61.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kxsldbg')
| -rw-r--r-- | kxsldbg/kxsldbgpart/kxsldbg_part.cpp | 4 | ||||
| -rw-r--r-- | kxsldbg/kxsldbgpart/kxsldbg_part.h | 4 | ||||
| -rw-r--r-- | kxsldbg/main.cpp | 2 | ||||
| -rw-r--r-- | kxsldbg/xsldbgmain.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp index 23e17790..a1cc5739 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.cpp +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.cpp @@ -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 // which the part's rc file is installed ('partrcdir' in the // 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"); return aboutData; } diff --git a/kxsldbg/kxsldbgpart/kxsldbg_part.h b/kxsldbg/kxsldbgpart/kxsldbg_part.h index ff420244..e8de28a7 100644 --- a/kxsldbg/kxsldbgpart/kxsldbg_part.h +++ b/kxsldbg/kxsldbgpart/kxsldbg_part.h @@ -33,7 +33,7 @@ class TQWidget; class TQPainter; class KURL; class TQMultiLineEdit; -class KAboutData; +class TDEAboutData; typedef TQDict<QXsldbgDoc> XsldbgDocDict; @@ -62,7 +62,7 @@ public: */ virtual ~KXsldbgPart(); - static KAboutData *createAboutData(); + static TDEAboutData *createAboutData(); /** Checks the debugger, if it is not ready then diff --git a/kxsldbg/main.cpp b/kxsldbg/main.cpp index 34f936c6..29b286c7 100644 --- a/kxsldbg/main.cpp +++ b/kxsldbg/main.cpp @@ -19,7 +19,7 @@ static const KCmdLineOptions options[] = 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" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); diff --git a/kxsldbg/xsldbgmain.cpp b/kxsldbg/xsldbgmain.cpp index cab2c838..5c1177b0 100644 --- a/kxsldbg/xsldbgmain.cpp +++ b/kxsldbg/xsldbgmain.cpp @@ -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 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" ); TDECmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::addCmdLineOptions( options ); |