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

---
 kontact/src/aboutdialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kontact/src/aboutdialog.cpp')

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;
-- 
cgit v1.2.1