From b19ddece21e102b8e4b292037ca7578f60b128fe Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 20:20:05 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kabc/kab2kabc.cpp                  | 2 +-
 kabc/tests/bigread.cpp             | 2 +-
 kabc/tests/bigwrite.cpp            | 2 +-
 kabc/tests/kabcargl.cpp            | 2 +-
 kabc/tests/testaddressee.cpp       | 2 +-
 kabc/tests/testaddresseelist.cpp   | 2 +-
 kabc/tests/testaddressfmt.cpp      | 2 +-
 kabc/tests/testaddresslineedit.cpp | 2 +-
 kabc/tests/testdb.cpp              | 2 +-
 kabc/tests/testdistlist.cpp        | 2 +-
 kabc/tests/testkabc.cpp            | 2 +-
 kabc/tests/testkabcdlg.cpp         | 2 +-
 kabc/tests/testlock.cpp            | 2 +-
 kabc/vcard/testwrite.cpp           | 2 +-
 kabc/vcardparser/testread.cpp      | 2 +-
 kabc/vcardparser/testwrite.cpp     | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'kabc')

diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 417d62b8e..c23426260 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -432,7 +432,7 @@ void importKab( KABC::AddressBook *ab, bool override, bool quiet )
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
+  TDEAboutData aboutData( "kab2kabc", I18N_NOOP( "Kab to Kabc Converter" ), "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp
index c5a1a602f..bb19379bb 100644
--- a/kabc/tests/bigread.cpp
+++ b/kabc/tests/bigread.cpp
@@ -17,7 +17,7 @@ using namespace KABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("bigread","BigReadKabc","0.1");
+  TDEAboutData aboutData("bigread","BigReadKabc","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app( false, false );
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index 5d3d2bd6f..b1f705eb9 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -14,7 +14,7 @@ using namespace KABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
+  TDEAboutData aboutData("bigwrite","BigWriteKabc","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app( false, false );
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index b1116b2ea..62b1df25e 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -35,7 +35,7 @@ using namespace KABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
+  TDEAboutData aboutData("kabcargl","Fix broken pre3.0rc3 format","0.1");
   aboutData.addAuthor("Cornelius Schumacher", 0, "schumacher@kde.org");
 
   TDECmdLineArgs::init(argc,argv,&aboutData);
diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp
index 39536efbf..9b4993dcc 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/kabc/tests/testaddressee.cpp
@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testaddressee","TestAddressee","0.1");
+  TDEAboutData aboutData("testaddressee","TestAddressee","0.1");
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index 08d73b8db..98e5be506 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
 
 int main(int /*argc*/,char /* **argv*/)
 {
-/*  KAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
+/*  TDEAboutData aboutData("testaddresseelist","TestAddresseeList","0.1");
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp
index c9369d756..b66c7ad01 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/kabc/tests/testaddressfmt.cpp
@@ -19,7 +19,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
+  TDEAboutData aboutData("testaddressfmt","TestAddressFormat","0.1");
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp
index f46604dc5..474b5fc7a 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/kabc/tests/testaddresslineedit.cpp
@@ -10,7 +10,7 @@ using namespace KABC;
 
 int main( int argc,char **argv )
 {
-  KAboutData aboutData( "testaddresslineedit",
+  TDEAboutData aboutData( "testaddresslineedit",
                         I18N_NOOP( "Test Address LineEdit" ), "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp
index 2abedb9be..4759a4bd2 100644
--- a/kabc/tests/testdb.cpp
+++ b/kabc/tests/testdb.cpp
@@ -12,7 +12,7 @@ using namespace KABC;
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testdb","TestKabcDB","0.1");
+  TDEAboutData aboutData("testdb","TestKabcDB","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
 //  TDEApplication app( false, false );
diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp
index 3f4b67e0a..e46d90d78 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/kabc/tests/testdistlist.cpp
@@ -22,7 +22,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
+  TDEAboutData aboutData("testdistlist",I18N_NOOP("Test Distribution Lists"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp
index ee767e523..b8b9fe3b5 100644
--- a/kabc/tests/testkabc.cpp
+++ b/kabc/tests/testkabc.cpp
@@ -20,7 +20,7 @@ using namespace KABC;
 
 int main(int argc,char **argv)
 {
-    KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
+    TDEAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
     TDECmdLineArgs::init(argc, argv, &aboutData);
 
     TDEApplication app( false, false );
diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp
index b78fb4a5f..1d328f239 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/kabc/tests/testkabcdlg.cpp
@@ -18,7 +18,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
+  TDEAboutData aboutData("testkabcdlg",I18N_NOOP("TestKabc"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 31d053208..701b94481 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -165,7 +165,7 @@ static const KCmdLineOptions options[] =
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
+  TDEAboutData aboutData("testlock",I18N_NOOP("Test libkabc Lock"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index 8498fc6d0..fe218c0b1 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -8,7 +8,7 @@
 
 int main(int argc,char **argv)
 {
-  KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
+  TDEAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
   TDEApplication app;
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index 3fcbb851e..50ff8b09b 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -44,7 +44,7 @@ int main( int argc, char **argv )
 {
   TDEApplication::disableAutoDcopRegistration();
 
-  KAboutData aboutData( "testread", "vCard test reader", "0.1" );
+  TDEAboutData aboutData( "testread", "vCard test reader", "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index 11c3c7852..73d462d4a 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -35,7 +35,7 @@
 
 int main( int argc, char **argv )
 {
-  KAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
+  TDEAboutData aboutData( "testwrite", "vCard test writer", "0.1" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-- 
cgit v1.2.1