Rename KInstance and KAboutData to avoid conflicts with KDE4

5 files changed, 13 insertions, 13 deletions

diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index 8f6be2b04..ae0d09658 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -63,7 +63,7 @@ void AboutDialog::addAboutPlugin( Kontact::Plugin *plugin )
 }
 
 void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
-                                const KAboutData *about )
+                                const TDEAboutData *about )
 {
   TQPixmap pixmap = KGlobal::iconLoader()->loadIcon( icon,
                                                     KIcon::Desktop, 48 );
@@ -155,7 +155,7 @@ TQString AboutDialog::formatPerson( const TQString &name, const TQString &email
   return text;
 }
 
-void AboutDialog::addLicenseText( const KAboutData *about )
+void AboutDialog::addLicenseText( const TDEAboutData *about )
 {
   if ( !about || about->license().isEmpty() )
     return;
diff --git a/kontact/src/aboutdialog.h b/kontact/src/aboutdialog.h
index c2d29a5ab..f407f46a6 100644
--- a/kontact/src/aboutdialog.h
+++ b/kontact/src/aboutdialog.h
@@ -25,7 +25,7 @@
 #define KONTACT_ABOUTDIALOG_H
 
 #include <kdialogbase.h>
-class KAboutData;
+class TDEAboutData;
 namespace Kontact {
 
 class Core;
@@ -43,9 +43,9 @@ class AboutDialog : public KDialogBase
     void addAboutPlugin( Kontact::Plugin *plugin );
 
     void addAboutData( const TQString &title, const TQString &icon,
-                       const KAboutData *about );
+                       const TDEAboutData *about );
 
-    void addLicenseText( const KAboutData *about );
+    void addLicenseText( const TDEAboutData *about );
 
     TQString formatPerson( const TQString &name, const TQString &email );
 
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 2f5849bf9..9e46eef2d 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -86,11 +86,11 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name )
   load();
 }
 
-const KAboutData* KcmKontact::aboutData() const
+const TDEAboutData* KcmKontact::aboutData() const
 {
-  KAboutData *about = new KAboutData( I18N_NOOP( "kontactconfig" ),
+  TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactconfig" ),
                                       I18N_NOOP( "TDE Kontact" ),
-                                      0, 0, KAboutData::License_GPL,
+                                      0, 0, TDEAboutData::License_GPL,
                                       I18N_NOOP( "(c), 2003 Cornelius Schumacher" ) );
 
   about->addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );
diff --git a/kontact/src/kcmkontact.h b/kontact/src/kcmkontact.h
index 0affd92d3..c15ecf048 100644
--- a/kontact/src/kcmkontact.h
+++ b/kontact/src/kcmkontact.h
@@ -33,7 +33,7 @@ class TQGroupBox;
 class TQComboBox;
 class TQListViewItem;
 
-class KAboutData;
+class TDEAboutData;
 class KListView;
 
 class KcmKontact : public KPrefsModule
@@ -44,7 +44,7 @@ class KcmKontact : public KPrefsModule
   public:
     KcmKontact( TQWidget *parent = 0, const char *name = 0 );
 
-    virtual const KAboutData* aboutData() const;
+    virtual const TDEAboutData* aboutData() const;
 };
 
 class PluginSelection : public KPrefsWid
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 54a586226..0fa50b213 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -74,7 +74,7 @@ class KontactApp : public KUniqueApplication {
 
 static void listPlugins()
 {
-  KInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
+  TDEInstance instance( "kontact" ); // Can't use KontactApp since it's too late for adding cmdline options
   KTrader::OfferList offers = KTrader::self()->query(
     TQString::fromLatin1( "Kontact/Plugin" ),
     TQString( "[X-TDE-KontactPluginVersion] == %1" ).arg( KONTACT_PLUGIN_VERSION ) );
@@ -144,8 +144,8 @@ int KontactApp::newInstance()
 
 int main( int argc, char **argv )
 {
-  KAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
-                    KAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" );
+  TDEAboutData about( "kontact", I18N_NOOP( "Kontact" ), version, description,
+                    TDEAboutData::License_GPL, I18N_NOOP("(C) 2008-2010 The Trinity Desktop Project\n(C) 2001-2008 The Kontact developers"), 0, "http://trinity.pearsoncomputing.net" );
   about.addAuthor( "Daniel Molkentin", 0, "molkentin@kde.org" );
   about.addAuthor( "Don Sanders", 0, "sanders@kde.org" );
   about.addAuthor( "Cornelius Schumacher", 0, "schumacher@kde.org" );