From 8e7816b2f9f62a2df094c5b2a7aa5abb6bc1226a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 20 Jan 2013 00:21:02 -0600
Subject: Rename KApplication to TDEApplication to avoid conflicts with KDE4

---
 kabc/address.cpp                   | 4 ++--
 kabc/kab2kabc.cpp                  | 2 +-
 kabc/key.cpp                       | 2 +-
 kabc/phonenumber.cpp               | 2 +-
 kabc/scripts/addressee.src.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              | 4 ++--
 kabc/tests/testdistlist.cpp        | 2 +-
 kabc/tests/testkabc.cpp            | 2 +-
 kabc/tests/testkabcdlg.cpp         | 2 +-
 kabc/tests/testldapclient.cpp      | 4 ++--
 kabc/tests/testlock.cpp            | 2 +-
 kabc/vcard/testwrite.cpp           | 2 +-
 kabc/vcardparser/testread.cpp      | 4 ++--
 kabc/vcardparser/testwrite.cpp     | 2 +-
 21 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'kabc')

diff --git a/kabc/address.cpp b/kabc/address.cpp
index 0787bcc4e..9ecf8eb2d 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -37,13 +37,13 @@ static KStaticDeleter< TQMap<TQString, TQString> > isoMapDeleter;
 Address::Address() :
   mEmpty( true ), mType( 0 )
 {
-  mId = KApplication::randomString( 10 );
+  mId = TDEApplication::randomString( 10 );
 }
 
 Address::Address( int type ) :
   mEmpty( true ), mType( type )
 {
-  mId = KApplication::randomString( 10 );
+  mId = TDEApplication::randomString( 10 );
 }
 
 bool Address::operator==( const Address &a ) const
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp
index 20d7305b8..417d62b8e 100644
--- a/kabc/kab2kabc.cpp
+++ b/kabc/kab2kabc.cpp
@@ -438,7 +438,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kabc/key.cpp b/kabc/key.cpp
index 0d917595d..fadc89dce 100644
--- a/kabc/key.cpp
+++ b/kabc/key.cpp
@@ -28,7 +28,7 @@ using namespace KABC;
 Key::Key( const TQString &text, int type )
   : mTextData( text ), mIsBinary( false ), mType( type )
 {
-  mId = KApplication::randomString(8);
+  mId = TDEApplication::randomString(8);
 }
 
 Key::~Key()
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 31a99f9ea..0a58eeec2 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -45,7 +45,7 @@ PhoneNumber::~PhoneNumber()
 
 void PhoneNumber::init()
 {
-  mId = KApplication::randomString( 8 );
+  mId = TDEApplication::randomString( 8 );
 }
 
 void PhoneNumber::validateNumber( const TQString &number )
diff --git a/kabc/scripts/addressee.src.cpp b/kabc/scripts/addressee.src.cpp
index db956bc14..64e8f382a 100644
--- a/kabc/scripts/addressee.src.cpp
+++ b/kabc/scripts/addressee.src.cpp
@@ -105,7 +105,7 @@ void Addressee::detach()
     mData->empty = true;
     mData->changed = false;
     mData->resource = 0;
-    mData->uid = KApplication::randomString( 10 );
+    mData->uid = TDEApplication::randomString( 10 );
     return;
   } else if ( mData.count() == 1 ) return;
 
diff --git a/kabc/tests/bigread.cpp b/kabc/tests/bigread.cpp
index 110972b31..c5a1a602f 100644
--- a/kabc/tests/bigread.cpp
+++ b/kabc/tests/bigread.cpp
@@ -20,7 +20,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("bigread","BigReadKabc","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
   
   AddressBook ab; 
    
diff --git a/kabc/tests/bigwrite.cpp b/kabc/tests/bigwrite.cpp
index 6a5296f91..5d3d2bd6f 100644
--- a/kabc/tests/bigwrite.cpp
+++ b/kabc/tests/bigwrite.cpp
@@ -17,7 +17,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("bigwrite","BigWriteKabc","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   AddressBook ab;
   ResourceFile r( "my.kabc", "vcard" );
diff --git a/kabc/tests/kabcargl.cpp b/kabc/tests/kabcargl.cpp
index d0a0501b3..b1116b2ea 100644
--- a/kabc/tests/kabcargl.cpp
+++ b/kabc/tests/kabcargl.cpp
@@ -40,7 +40,7 @@ int main(int argc,char **argv)
 
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
 
   TQString filename = StdAddressBook::fileName();
   
diff --git a/kabc/tests/testaddressee.cpp b/kabc/tests/testaddressee.cpp
index cc91d29b1..39536efbf 100644
--- a/kabc/tests/testaddressee.cpp
+++ b/kabc/tests/testaddressee.cpp
@@ -26,7 +26,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs();
 
   kdDebug() << "Creating a" << endl;
diff --git a/kabc/tests/testaddresseelist.cpp b/kabc/tests/testaddresseelist.cpp
index 99cd1f3ab..08d73b8db 100644
--- a/kabc/tests/testaddresseelist.cpp
+++ b/kabc/tests/testaddresseelist.cpp
@@ -23,7 +23,7 @@ int main(int /*argc*/,char /* **argv*/)
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
   TDECmdLineArgs* args = TDECmdLineArgs::parsedArgs(); */
 
   kdDebug() << "Creating addressees" << endl;
diff --git a/kabc/tests/testaddressfmt.cpp b/kabc/tests/testaddressfmt.cpp
index 9f70a0eec..c9369d756 100644
--- a/kabc/tests/testaddressfmt.cpp
+++ b/kabc/tests/testaddressfmt.cpp
@@ -23,7 +23,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc, argv, &aboutData);
   TDECmdLineArgs::addCmdLineOptions(options);
 
-  KApplication app;
+  TDEApplication app;
 
   Address a;
   a.setStreet("Lummerlandstr. 1");
diff --git a/kabc/tests/testaddresslineedit.cpp b/kabc/tests/testaddresslineedit.cpp
index f74af6089..f46604dc5 100644
--- a/kabc/tests/testaddresslineedit.cpp
+++ b/kabc/tests/testaddresslineedit.cpp
@@ -14,7 +14,7 @@ int main( int argc,char **argv )
                         I18N_NOOP( "Test Address LineEdit" ), "0.1" );
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app;
+  TDEApplication app;
 
   AddressLineEdit *lineEdit = new AddressLineEdit( 0 );
 
diff --git a/kabc/tests/testdb.cpp b/kabc/tests/testdb.cpp
index 1c5454630..2abedb9be 100644
--- a/kabc/tests/testdb.cpp
+++ b/kabc/tests/testdb.cpp
@@ -15,8 +15,8 @@ int main(int argc,char **argv)
   KAboutData aboutData("testdb","TestKabcDB","0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-//  KApplication app( false, false );
-  KApplication app;
+//  TDEApplication app( false, false );
+  TDEApplication app;
 
   AddressBook ab;
   
diff --git a/kabc/tests/testdistlist.cpp b/kabc/tests/testdistlist.cpp
index 4323db30d..3f4b67e0a 100644
--- a/kabc/tests/testdistlist.cpp
+++ b/kabc/tests/testdistlist.cpp
@@ -26,7 +26,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("list")) {
diff --git a/kabc/tests/testkabc.cpp b/kabc/tests/testkabc.cpp
index 04a589eef..ee767e523 100644
--- a/kabc/tests/testkabc.cpp
+++ b/kabc/tests/testkabc.cpp
@@ -23,7 +23,7 @@ int main(int argc,char **argv)
     KAboutData aboutData("testkabc",I18N_NOOP("TestKabc"),"0.1");
     TDECmdLineArgs::init(argc, argv, &aboutData);
 
-    KApplication app( false, false );
+    TDEApplication app( false, false );
     AddressBook *ab = StdAddressBook::self();
 
 #define READ
diff --git a/kabc/tests/testkabcdlg.cpp b/kabc/tests/testkabcdlg.cpp
index 322bb1ca9..b78fb4a5f 100644
--- a/kabc/tests/testkabcdlg.cpp
+++ b/kabc/tests/testkabcdlg.cpp
@@ -22,7 +22,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("multiple")) {
diff --git a/kabc/tests/testldapclient.cpp b/kabc/tests/testldapclient.cpp
index 456bb64e3..bb52afd1a 100644
--- a/kabc/tests/testldapclient.cpp
+++ b/kabc/tests/testldapclient.cpp
@@ -29,9 +29,9 @@
 
 int main(int argc, char *argv[])
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
   TDECmdLineArgs::init(argc,argv,"testldapclient", 0, 0, 0, 0);
-  KApplication app;
+  TDEApplication app;
 
   TestLDAPClient test;
   test.setup();
diff --git a/kabc/tests/testlock.cpp b/kabc/tests/testlock.cpp
index 5c52e98ee..31d053208 100644
--- a/kabc/tests/testlock.cpp
+++ b/kabc/tests/testlock.cpp
@@ -169,7 +169,7 @@ int main(int argc,char **argv)
   TDECmdLineArgs::init(argc,argv,&aboutData);
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app;
+  TDEApplication app;
 
   TQString identifier;
 
diff --git a/kabc/vcard/testwrite.cpp b/kabc/vcard/testwrite.cpp
index 082ca480d..8498fc6d0 100644
--- a/kabc/vcard/testwrite.cpp
+++ b/kabc/vcard/testwrite.cpp
@@ -11,7 +11,7 @@ int main(int argc,char **argv)
   KAboutData aboutData("testwrite",I18N_NOOP("TestWritevCard"),"0.1");
   TDECmdLineArgs::init(argc,argv,&aboutData);
 
-  KApplication app;
+  TDEApplication app;
   
   kdDebug() << "Test Write VCard" << endl;
 
diff --git a/kabc/vcardparser/testread.cpp b/kabc/vcardparser/testread.cpp
index d3eada6c6..3fcbb851e 100644
--- a/kabc/vcardparser/testread.cpp
+++ b/kabc/vcardparser/testread.cpp
@@ -42,7 +42,7 @@ static const KCmdLineOptions options[] =
 
 int main( int argc, char **argv )
 {
-  KApplication::disableAutoDcopRegistration();
+  TDEApplication::disableAutoDcopRegistration();
 
   KAboutData aboutData( "testread", "vCard test reader", "0.1" );
   aboutData.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
@@ -50,7 +50,7 @@ int main( int argc, char **argv )
   TDECmdLineArgs::init( argc, argv, &aboutData );
   TDECmdLineArgs::addCmdLineOptions( options );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
 
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
 
diff --git a/kabc/vcardparser/testwrite.cpp b/kabc/vcardparser/testwrite.cpp
index d9d92e5aa..11c3c7852 100644
--- a/kabc/vcardparser/testwrite.cpp
+++ b/kabc/vcardparser/testwrite.cpp
@@ -39,7 +39,7 @@ int main( int argc, char **argv )
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
 
-  KApplication app( false, false );
+  TDEApplication app( false, false );
   
 
   KABC::Addressee addressee;
-- 
cgit v1.2.1