From 5fc6f26e12b596addd235f87320c31761bd5a84d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 22 Jan 2013 20:22:15 -0600 Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4 --- kode/kodemain.cpp | 6 +++--- kode/kwsdl/kung/main.cpp | 4 ++-- kode/kwsdl/main.cpp | 4 ++-- kode/kwsdl/tests/google/main.cc | 2 +- kode/kxml_compiler/kxml_compiler.cpp | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) (limited to 'kode') diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp index d8a1113e..5d2f3c62 100644 --- a/kode/kodemain.cpp +++ b/kode/kodemain.cpp @@ -415,7 +415,7 @@ int create( TDECmdLineArgs *args ) main.addArgument( "char **argv" ); code.clear(); - code += "KAboutData aboutData(\"test\",\"Test\",\"0.1\");"; + code += "TDEAboutData aboutData(\"test\",\"Test\",\"0.1\");"; code += "TDECmdLineArgs::init(argc,argv,&aboutData);"; code += "TDECmdLineArgs::addCmdLineOptions( options );"; code += ""; @@ -490,7 +490,7 @@ int create( TDECmdLineArgs *args ) code.clear(); - code += "KInstance instance( \"kio_" + protocol + "\" );"; + code += "TDEInstance instance( \"kio_" + protocol + "\" );"; code += ""; code += "kdDebug(7000) << \"Starting kio_" + protocol + "(pid: \" << getpid() << \")\" << endl;"; code += ""; @@ -609,7 +609,7 @@ int create( TDECmdLineArgs *args ) int main(int argc,char **argv) { - KAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" ); + TDEAboutData aboutData( "kode", I18N_NOOP("TDE Code Generator"), "0.1" ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kode/kwsdl/kung/main.cpp b/kode/kwsdl/kung/main.cpp index 79718616..ab8bdcd6 100644 --- a/kode/kwsdl/kung/main.cpp +++ b/kode/kwsdl/kung/main.cpp @@ -37,9 +37,9 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1", + TDEAboutData aboutData( "kung", I18N_NOOP( "TDE WSDL Interpreter" ), "0.1", I18N_NOOP( "TDE WSDL Interpreter" ), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kode/kwsdl/main.cpp b/kode/kwsdl/main.cpp index 97e7ad5a..0a6a1beb 100644 --- a/kode/kwsdl/main.cpp +++ b/kode/kwsdl/main.cpp @@ -43,9 +43,9 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1", + TDEAboutData aboutData( "kwsdl_compiler", I18N_NOOP( "TDE wsdl compiler" ), "0.1", I18N_NOOP( "TDE WSDL Compiler" ), - KAboutData::License_LGPL ); + TDEAboutData::License_LGPL ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); diff --git a/kode/kwsdl/tests/google/main.cc b/kode/kwsdl/tests/google/main.cc index 01f54d28..269c022f 100644 --- a/kode/kwsdl/tests/google/main.cc +++ b/kode/kwsdl/tests/google/main.cc @@ -7,7 +7,7 @@ int main( int argc, char **argv ) { - KAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", KAboutData::License_GPL ); + TDEAboutData aboutData( "kgooglesearch", "TDE Google Search", "0.1", "", TDEAboutData::License_GPL ); aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); diff --git a/kode/kxml_compiler/kxml_compiler.cpp b/kode/kxml_compiler/kxml_compiler.cpp index 89be13aa..bb4b2425 100644 --- a/kode/kxml_compiler/kxml_compiler.cpp +++ b/kode/kxml_compiler/kxml_compiler.cpp @@ -57,14 +57,14 @@ static const KCmdLineOptions options[] = int main( int argc, char **argv ) { - KAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1", - I18N_NOOP("TDE XML Compiler") , KAboutData::License_LGPL ); + TDEAboutData aboutData( "kxml_compiler", I18N_NOOP("TDE xml compiler"), "0.1", + I18N_NOOP("TDE XML Compiler") , TDEAboutData::License_LGPL ); aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" ); TDECmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::addCmdLineOptions( options ); - KInstance app( &aboutData ); + TDEInstance app( &aboutData ); TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs(); -- cgit v1.2.3