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

---
 kommander/widgets/aboutdialog.cpp | 2 +-
 kommander/widgets/aboutdialog.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kommander/widgets')

diff --git a/kommander/widgets/aboutdialog.cpp b/kommander/widgets/aboutdialog.cpp
index 097d0d22..4560f871 100644
--- a/kommander/widgets/aboutdialog.cpp
+++ b/kommander/widgets/aboutdialog.cpp
@@ -119,7 +119,7 @@ void AboutDialog::initialize(const TQString& appName, const TQString &icon, cons
   m_appName = appName;
   m_icon = icon;
   m_copyright = copyright;
-  m_aboutData = new KAboutData(m_appName, m_appName, m_version);
+  m_aboutData = new TDEAboutData(m_appName, m_appName, m_version);
   m_aboutData->setCopyrightStatement(m_copyright);
   if (!m_icon.isEmpty())
     m_aboutData->setProgramLogo(KGlobal::iconLoader()->loadIcon(m_icon, KIcon::NoGroup, KIcon::SizeMedium).convertToImage());  
diff --git a/kommander/widgets/aboutdialog.h b/kommander/widgets/aboutdialog.h
index f7721103..079ef849 100644
--- a/kommander/widgets/aboutdialog.h
+++ b/kommander/widgets/aboutdialog.h
@@ -16,7 +16,7 @@
 #include <kommanderwidget.h>
 
 class KAboutApplication;
-class KAboutData;
+class TDEAboutData;
 
 /**
 	@author Andras Mantia <amantia@tdewebdev.org>
@@ -55,7 +55,7 @@ private:
   void setBugAddress(const TQString &bugAddress);
   void setLicense(const TQString &license);
 
-  KAboutData *m_aboutData;
+  TDEAboutData *m_aboutData;
   TQString m_version;
   TQString m_appName;
   TQString m_copyright;
-- 
cgit v1.2.1