Rename KInstance and KAboutData to avoid conflicts with KDE4

6 files changed, 7 insertions, 7 deletions

diff --git a/kresources/featureplan/benchmarkfeaturelist.cpp b/kresources/featureplan/benchmarkfeaturelist.cpp
index 106d80013..f9f88c5cc 100644
--- a/kresources/featureplan/benchmarkfeaturelist.cpp
+++ b/kresources/featureplan/benchmarkfeaturelist.cpp
@@ -69,7 +69,7 @@ void displayCategory( const TQValueList<Category *> categories )
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "benchmarkfeaturelist",
+  TDEAboutData aboutData( "benchmarkfeaturelist",
                         "Benchmark for feature list XML parser",
                         "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kresources/featureplan/dumpfeaturelist.cpp b/kresources/featureplan/dumpfeaturelist.cpp
index efab2cae6..a007b70dc 100644
--- a/kresources/featureplan/dumpfeaturelist.cpp
+++ b/kresources/featureplan/dumpfeaturelist.cpp
@@ -69,7 +69,7 @@ void displayCategory( const TQValueList<Category *> categories )
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
+  TDEAboutData aboutData( "dumpfeaturelist", "Dump XML feature list to stdout",
                         "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kresources/groupwise/kioslave/groupwise.cpp b/kresources/groupwise/kioslave/groupwise.cpp
index e257ba71e..e22d95dd5 100644
--- a/kresources/groupwise/kioslave/groupwise.cpp
+++ b/kresources/groupwise/kioslave/groupwise.cpp
@@ -69,7 +69,7 @@ KDE_EXPORT int kdemain( int argc, char **argv );
 
 int kdemain( int argc, char **argv )
 {
-  KInstance instance( "kio_groupwise" );
+  TDEInstance instance( "kio_groupwise" );
   
   kdDebug(7000) << "Starting kio_groupwise(pid:  " << getpid() << ")" << endl;
   
diff --git a/kresources/groupwise/soap/soapdebug.cpp b/kresources/groupwise/soap/soapdebug.cpp
index e47dd7476..415021a78 100644
--- a/kresources/groupwise/soap/soapdebug.cpp
+++ b/kresources/groupwise/soap/soapdebug.cpp
@@ -46,7 +46,7 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
+  TDEAboutData aboutData( "soapdebug", I18N_NOOP("Groupwise Soap Debug"), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kresources/scalix/scalixadmin/main.cpp b/kresources/scalix/scalixadmin/main.cpp
index b455d963d..b317d90d1 100644
--- a/kresources/scalix/scalixadmin/main.cpp
+++ b/kresources/scalix/scalixadmin/main.cpp
@@ -34,8 +34,8 @@ static KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description,
-                        KAboutData::License_GPL, "(c) 2007, Tobias Koenig" );
+  TDEAboutData aboutData( "scalixadmin", I18N_NOOP("ScalixAdmin"), "1.0", description,
+                        TDEAboutData::License_GPL, "(c) 2007, Tobias Koenig" );
   aboutData.addAuthor( "Tobias Koenig",0, "tokoe@kde.org" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
diff --git a/kresources/slox/testsloxaccounts.cpp b/kresources/slox/testsloxaccounts.cpp
index 77a91d718..e173134c5 100644
--- a/kresources/slox/testsloxaccounts.cpp
+++ b/kresources/slox/testsloxaccounts.cpp
@@ -35,7 +35,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData( "textsloxaccounts",
+  TDEAboutData aboutData( "textsloxaccounts",
                         "SUSE LINUX Openexchange Server Configuration Wizard",
                         "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );