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

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

(limited to 'kworldwatch/main.cpp')

diff --git a/kworldwatch/main.cpp b/kworldwatch/main.cpp
index 03d2f2c..edcad2a 100644
--- a/kworldwatch/main.cpp
+++ b/kworldwatch/main.cpp
@@ -175,7 +175,7 @@ static KCmdLineOptions options[] =
 
 int main(int argc, char *argv[])
 {
-  KAboutData about("kworldclock", I18N_NOOP("TDE World Clock"), "1.5");
+  TDEAboutData about("kworldclock", I18N_NOOP("TDE World Clock"), "1.5");
   TDECmdLineArgs::init(argc, argv, &about);
   TDECmdLineArgs::addCmdLineOptions(options);
   KUniqueApplication::addCmdLineOptions();
@@ -183,7 +183,7 @@ int main(int argc, char *argv[])
   TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();
   if (args->isSet("themes"))
   {
-    KInstance app(&about);
+    TDEInstance app(&about);
     listThemes();
     return 0;
   }
-- 
cgit v1.2.1