diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-22 20:16:43 -0600 |
| commit | 8f7ac92d27834427c1fa2a4a350d70d05529bbf4 (patch) | |
| tree | fc53a45a5d9693bfe8a156579b921e960351e31c /kjsembed | |
| parent | 427847240b11c1733dd9c259c613d68a6405fe68 (diff) | |
| download | tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.tar.gz tdebindings-8f7ac92d27834427c1fa2a4a350d70d05529bbf4.zip | |
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kjsembed')
| -rw-r--r-- | kjsembed/cpptests/jsaccess/jsaccess.cpp | 4 | ||||
| -rw-r--r-- | kjsembed/customobject_imp.cpp | 2 | ||||
| -rw-r--r-- | kjsembed/docs/embedding/simple-embed/main.cpp | 4 | ||||
| -rw-r--r-- | kjsembed/kjscmd.cpp | 4 | ||||
| -rw-r--r-- | kjsembed/testkjsembed.cpp | 4 | ||||
| -rw-r--r-- | kjsembed/tests/testkjsembed.cpp | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/kjsembed/cpptests/jsaccess/jsaccess.cpp b/kjsembed/cpptests/jsaccess/jsaccess.cpp index adfa2692..4df5666a 100644 --- a/kjsembed/cpptests/jsaccess/jsaccess.cpp +++ b/kjsembed/cpptests/jsaccess/jsaccess.cpp @@ -35,9 +35,9 @@ using namespace KJSEmbed; int main( int argc, char **argv ) { - KAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test For C++ access of variables and functions."), "0.1", + TDEAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test For C++ access of variables and functions."), "0.1", I18N_NOOP("Test"), - KAboutData::License_LGPL, I18N_NOOP("(c) 2004 Ian Reinhart Geiser") ); + TDEAboutData::License_LGPL, I18N_NOOP("(c) 2004 Ian Reinhart Geiser") ); TDECmdLineArgs::init( argc, argv, &about ); TDEApplication app; diff --git a/kjsembed/customobject_imp.cpp b/kjsembed/customobject_imp.cpp index 74f58c2f..04b20c68 100644 --- a/kjsembed/customobject_imp.cpp +++ b/kjsembed/customobject_imp.cpp @@ -1163,7 +1163,7 @@ return KJS::Null(); KJS::Value CustomObjectImp::ksystemtrayLoadIcon( KJS::ExecState *exec, KJS::Object&, const KJS::List &args ) { #ifndef QT_ONLY - // TODO: Support the 2 arg form of KSystemTray::loadIcon() when we support KInstance args + // TODO: Support the 2 arg form of KSystemTray::loadIcon() when we support TDEInstance args if ( args.size() != 1 ) return KJS::Value(); diff --git a/kjsembed/docs/embedding/simple-embed/main.cpp b/kjsembed/docs/embedding/simple-embed/main.cpp index b70bb61c..96e5b014 100644 --- a/kjsembed/docs/embedding/simple-embed/main.cpp +++ b/kjsembed/docs/embedding/simple-embed/main.cpp @@ -31,8 +31,8 @@ static const char version[] = "0.1"; int main(int argc, char **argv) { - KAboutData about("embedjs", I18N_NOOP("EmbedJS"), version, description, - KAboutData::License_LGPL, "(C) 2004 Ian Reinhart Geiser", 0, 0, "geiseri@kde.org"); + TDEAboutData about("embedjs", I18N_NOOP("EmbedJS"), version, description, + TDEAboutData::License_LGPL, "(C) 2004 Ian Reinhart Geiser", 0, 0, "geiseri@kde.org"); about.addAuthor( "Ian Reinhart Geiser", 0, "geiseri@kde.org" ); TDECmdLineArgs::init(argc, argv, &about); TDEApplication app; diff --git a/kjsembed/kjscmd.cpp b/kjsembed/kjscmd.cpp index 5e6ae15a..c54efa15 100644 --- a/kjsembed/kjscmd.cpp +++ b/kjsembed/kjscmd.cpp @@ -82,9 +82,9 @@ int main( int argc, char **argv ) } // Cmd Line - KAboutData about( appName.data(), I18N_NOOP("KJSCmd"), KJSEMBED_VERSION_STRING, + TDEAboutData about( appName.data(), I18N_NOOP("KJSCmd"), KJSEMBED_VERSION_STRING, I18N_NOOP("Runs KJS scripts from the command line."), - KAboutData::License_LGPL, I18N_NOOP("(c) 2001-2004 Richard Moore") ); + TDEAboutData::License_LGPL, I18N_NOOP("(c) 2001-2004 Richard Moore") ); about.addAuthor( "Richard Moore", 0, "rich@kde.org" ); about.addAuthor( "Ian Reinhart Geiser", 0, "geiser@kde.org" ); diff --git a/kjsembed/testkjsembed.cpp b/kjsembed/testkjsembed.cpp index 8cc4d222..69db4dc5 100644 --- a/kjsembed/testkjsembed.cpp +++ b/kjsembed/testkjsembed.cpp @@ -30,9 +30,9 @@ int main( int argc, char **argv ) { - KAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test"), "0.1", + TDEAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test"), "0.1", I18N_NOOP("Test"), - KAboutData::License_LGPL, I18N_NOOP("(c) 2001-2003 Richard Moore") ); + TDEAboutData::License_LGPL, I18N_NOOP("(c) 2001-2003 Richard Moore") ); TDECmdLineArgs::init( argc, argv, &about ); TDEApplication app; diff --git a/kjsembed/tests/testkjsembed.cpp b/kjsembed/tests/testkjsembed.cpp index cfc4fd2d..66691c9b 100644 --- a/kjsembed/tests/testkjsembed.cpp +++ b/kjsembed/tests/testkjsembed.cpp @@ -33,9 +33,9 @@ using namespace KJSEmbed; int main( int argc, char **argv ) { - KAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test"), "0.1", + TDEAboutData about( "test-kjsembed", I18N_NOOP("KJS Embed Test"), "0.1", I18N_NOOP("Test"), - KAboutData::License_LGPL, I18N_NOOP("(c) 2001-2002 Richard Moore") ); + TDEAboutData::License_LGPL, I18N_NOOP("(c) 2001-2002 Richard Moore") ); TDECmdLineArgs::init( argc, argv, &about ); TDEApplication app; |