From 251f86a8cc0f7d8c9d9644c2e8f5e81ecb425da7 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 22 Jan 2013 19:52:42 -0600
Subject: Rename KInstance and KAboutData to avoid conflicts with KDE4

---
 kdialogd3/kdialogd.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kdialogd3/kdialogd.cpp b/kdialogd3/kdialogd.cpp
index 033545c..cc393f0 100644
--- a/kdialogd3/kdialogd.cpp
+++ b/kdialogd3/kdialogd.cpp
@@ -682,9 +682,9 @@ void KDialogDDirSelectDialog::slotOk()
 }
 
 #ifdef KDIALOGD_APP
-static KAboutData aboutData("kdialogd3", I18N_NOOP("KDialog Daemon"), VERSION,
+static TDEAboutData aboutData("kdialogd3", I18N_NOOP("KDialog Daemon"), VERSION,
                             I18N_NOOP("Use TDE dialogs from non-TDE apps."),
-                            KAboutData::License_GPL,
+                            TDEAboutData::License_GPL,
                             I18N_NOOP("(c) Craig Drummond, 2006-2007"));
 
 int main(int argc, char **argv)
-- 
cgit v1.2.1