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

---
 kabc/frontend/main.cpp                           | 2 +-
 kabc/kabcdistlistupdater/kabcdistlistupdater.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'kabc')

diff --git a/kabc/frontend/main.cpp b/kabc/frontend/main.cpp
index 169e52a37..f98f7ee97 100644
--- a/kabc/frontend/main.cpp
+++ b/kabc/frontend/main.cpp
@@ -8,7 +8,7 @@
 
 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;
diff --git a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
index 78fa54ee7..d8f5e9969 100644
--- a/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
+++ b/kabc/kabcdistlistupdater/kabcdistlistupdater.cpp
@@ -72,7 +72,7 @@ int main( int argc, char **argv )
 {
   TDEApplication::disableAutoDcopRegistration();
 
-  KAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
+  TDEAboutData aboutData( "kabcdistlistupdater", "Converter tool for distribution lists", "0.1" );
   aboutData.addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
 
   TDECmdLineArgs::init( argc, argv, &aboutData );
-- 
cgit v1.2.1