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

---
 kcontrol/kfontinst/viewpart/FontViewerApp.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kcontrol/kfontinst/viewpart/FontViewerApp.cpp')

diff --git a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
index acfd96178..bbac01bc8 100644
--- a/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
+++ b/kcontrol/kfontinst/viewpart/FontViewerApp.cpp
@@ -112,8 +112,8 @@ static KCmdLineOptions options[] =
     KCmdLineLastOption
 };
 
-static KAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
-                            KAboutData::License_GPL,
+static TDEAboutData aboutData("kfontview", I18N_NOOP("Font Viewer"), 0, I18N_NOOP("Simple font viewer"),
+                            TDEAboutData::License_GPL,
                             I18N_NOOP("(c) Craig Drummond, 2004"));
 
 int main(int argc, char **argv)
-- 
cgit v1.2.1