summaryrefslogtreecommitdiffstats
path: root/kode
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-22 20:22:15 -0600
commit5fc6f26e12b596addd235f87320c31761bd5a84d (patch)
tree0a1ff964c23fce07fc088017df4ad537d57e62e5 /kode
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kode')
-rw-r--r--kode/kodemain.cpp6
-rw-r--r--kode/kwsdl/kung/main.cpp4
-rw-r--r--kode/kwsdl/main.cpp4
-rw-r--r--kode/kwsdl/tests/google/main.cc2
-rw-r--r--kode/kxml_compiler/kxml_compiler.cpp6
5 files changed, 11 insertions, 11 deletions
diff --git a/kode/kodemain.cpp b/kode/kodemain.cpp
index d8a1113ee..5d2f3c62e 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 797186169..ab8bdcd68 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 97e7ad5af..0a6a1beba 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 01f54d28e..269c022f4 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 89be13aac..bb4b24252 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();