From 87620f47926a6451accfd82c57558a99d1c4d21e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 7 Feb 2013 11:11:11 -0600
Subject: [PATCH] Rename KAbout to avoid conflicts with KDE4

---
 kmailcvt/kmailcvt.cpp       |  2 +-
 kontact/src/aboutdialog.cpp | 12 ++++++------
 korn/boxcontaineritem.cpp   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index 4599fe25..6f886a0c 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -93,7 +93,7 @@ void KMailCVT::reject() {
 
 void KMailCVT::help()
 {
-	KAboutApplication a( this );
+	TDEAboutApplication a( this );
 	a.exec();
 }
 
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index faa2a244..f655ca69 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -106,11 +106,11 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
 
     text = "";
 
-    const TQValueList<KAboutPerson> authors = about->authors();
+    const TQValueList<TDEAboutPerson> authors = about->authors();
     if ( !authors.isEmpty() ) {
       text += i18n( "<p><b>Authors:</b></p>" );
 
-      TQValueList<KAboutPerson>::ConstIterator it;
+      TQValueList<TDEAboutPerson>::ConstIterator it;
       for ( it = authors.begin(); it != authors.end(); ++it ) {
         text += formatPerson( (*it).name(), (*it).emailAddress() );
         if ( !(*it).task().isEmpty() )
@@ -118,11 +118,11 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
       }
     }
 
-    const TQValueList<KAboutPerson> credits = about->credits();
+    const TQValueList<TDEAboutPerson> credits = about->credits();
     if ( !credits.isEmpty() ) {
       text += i18n( "<p><b>Thanks to:</b></p>" );
 
-      TQValueList<KAboutPerson>::ConstIterator it;
+      TQValueList<TDEAboutPerson>::ConstIterator it;
       for ( it = credits.begin(); it != credits.end(); ++it ) {
         text += formatPerson( (*it).name(), (*it).emailAddress() );
         if ( !(*it).task().isEmpty() )
@@ -130,11 +130,11 @@ void AboutDialog::addAboutData( const TQString &title, const TQString &icon,
       }
     }
 
-    const TQValueList<KAboutTranslator> translators = about->translators();
+    const TQValueList<TDEAboutTranslator> translators = about->translators();
     if ( !translators.isEmpty() ) {
       text += i18n("<p><b>Translators:</b></p>");
 
-      TQValueList<KAboutTranslator>::ConstIterator it;
+      TQValueList<TDEAboutTranslator>::ConstIterator it;
       for ( it = translators.begin(); it != translators.end(); ++it ) {
        text += formatPerson( (*it).name(), (*it).emailAddress() );
       }
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index fa6b266e..becf02c3 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -411,7 +411,7 @@ void BoxContainerItem::reportBug()
 
 void BoxContainerItem::about()
 {
-	KAboutApplication about( 0, "KOrn About", true );
+	TDEAboutApplication about( 0, "KOrn About", true );
 	about.exec();  //modal: it doesn't recheck anymore
 }