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

---
 kaddressbook/interfaces/xxport.cpp           | 2 +-
 kaddressbook/kabcore.cpp                     | 6 +++---
 kaddressbook/kabcore.h                       | 4 ++--
 kaddressbook/kaddressbook_part.cpp           | 2 +-
 kaddressbook/kaddressbook_part.h             | 6 +++---
 kaddressbook/kcmconfigs/kcmkabconfig.cpp     | 4 ++--
 kaddressbook/kcmconfigs/kcmkabldapconfig.cpp | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'kaddressbook')

diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index ea4a93ce..68b88312 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -45,7 +45,7 @@ XXPort::XXPort( KABC::AddressBook *ab, TQWidget *parent,
   : TQObject( parent, name ), mAddressBook( ab ), mParentWidget( parent ),
     d( new XXPortPrivate )
 {
-  setInstance( new KInstance( "kaddressbook" ) );
+  setInstance( new TDEInstance( "kaddressbook" ) );
 
   d->mExportMapper = new TQSignalMapper( this );
   d->mImportMapper = new TQSignalMapper( this );
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 6e3c3510..8d4dd2fd 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -310,11 +310,11 @@ TQWidget *KABCore::widget() const
   return mWidget;
 }
 
-KAboutData *KABCore::createAboutData()
+TDEAboutData *KABCore::createAboutData()
 {
-  KAboutData *about = new KAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ),
+  TDEAboutData *about = new TDEAboutData( "kaddressbook", I18N_NOOP( "KAddressBook" ),
                                       "3.5.13", I18N_NOOP( "The TDE Address Book" ),
-                                      KAboutData::License_GPL_V2,
+                                      TDEAboutData::License_GPL_V2,
                                       I18N_NOOP( "(c) 2008-2010, The Trinity Team\n(c) 1997-2005, The KDE PIM Team" ) );
   about->addAuthor( "Timothy Pearson", I18N_NOOP( "Current maintainer" ), "kb9vqf@pearsoncomputing.net" );
   about->addAuthor( "Tobias Koenig", I18N_NOOP( "Previous maintainer" ), "tokoe@kde.org" );
diff --git a/kaddressbook/kabcore.h b/kaddressbook/kabcore.h
index bba0ec9c..d3ce562b 100644
--- a/kaddressbook/kabcore.h
+++ b/kaddressbook/kabcore.h
@@ -46,7 +46,7 @@ class CategoryEditDialog;
 class CategorySelectDialog;
 }
 
-class KAboutData;
+class TDEAboutData;
 class KAction;
 class KActionCollection;
 class KConfig;
@@ -138,7 +138,7 @@ class KDE_EXPORT KABCore : public KAB::Core
      */
     TQWidget *widget() const;
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
     void setStatusBar( KStatusBar *statusBar );
 
diff --git a/kaddressbook/kaddressbook_part.cpp b/kaddressbook/kaddressbook_part.cpp
index 063c6e60..9ffe7375 100644
--- a/kaddressbook/kaddressbook_part.cpp
+++ b/kaddressbook/kaddressbook_part.cpp
@@ -77,7 +77,7 @@ KAddressbookPart::~KAddressbookPart()
   closeURL();
 }
 
-KAboutData *KAddressbookPart::createAboutData()
+TDEAboutData *KAddressbookPart::createAboutData()
 {
   return KABCore::createAboutData();
 }
diff --git a/kaddressbook/kaddressbook_part.h b/kaddressbook/kaddressbook_part.h
index 92ad97c9..5ab27d3a 100644
--- a/kaddressbook/kaddressbook_part.h
+++ b/kaddressbook/kaddressbook_part.h
@@ -29,8 +29,8 @@
 
 #include "kaddressbookiface.h"
 
-class KAboutData;
-class KInstance;
+class TDEAboutData;
+class TDEInstance;
 
 class KABCore;
 
@@ -44,7 +44,7 @@ class KAddressbookPart: public KParts::ReadOnlyPart, virtual public KAddressBook
                       TQObject *parent, const char *name, const TQStringList& );
     virtual ~KAddressbookPart();
 
-    static KAboutData *createAboutData();
+    static TDEAboutData *createAboutData();
 
     virtual void saveToProfile( const TQString& path ) const;
     virtual void loadProfile( const TQString& path );
diff --git a/kaddressbook/kcmconfigs/kcmkabconfig.cpp b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
index 823f24f7..296f7955 100644
--- a/kaddressbook/kcmconfigs/kcmkabconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabconfig.cpp
@@ -51,9 +51,9 @@ KCMKabConfig::KCMKabConfig( TQWidget *parent, const char *name )
 
   load();
 
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabconfig" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabconfig" ),
                                       I18N_NOOP( "KAddressBook Configure Dialog" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
diff --git a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
index a3a9ee1b..66fcde2f 100644
--- a/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
+++ b/kaddressbook/kcmconfigs/kcmkabldapconfig.cpp
@@ -52,9 +52,9 @@ KCMKabLdapConfig::KCMKabLdapConfig( TQWidget *parent, const char *name )
 
   load();
 
-  KAboutData *about = new KAboutData( I18N_NOOP( "kcmkabldapconfig" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kcmkabldapconfig" ),
                                       I18N_NOOP( "KAB LDAP Configure Dialog" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c), 2003 - 2004 Tobias Koenig" ) );
 
   about->addAuthor( "Tobias Koenig", 0, "tokoe@kde.org" );
-- 
cgit v1.2.3