summaryrefslogtreecommitdiffstats
path: root/kode/kodemain.cpp
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/kodemain.cpp
parent12c8a23fe75817cb4bfcd604c1863266dd75e840 (diff)
downloadtdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.tar.gz
tdepim-5fc6f26e12b596addd235f87320c31761bd5a84d.zip
Rename KInstance and KAboutData to avoid conflicts with KDE4
Diffstat (limited to 'kode/kodemain.cpp')
-rw-r--r--kode/kodemain.cpp6
1 files changed, 3 insertions, 3 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 );