From 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:55:37 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kdesktop/main.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'kdesktop/main.cc')

diff --git a/kdesktop/main.cc b/kdesktop/main.cc
index 93b8d42c7..0cff73420 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cc
@@ -19,15 +19,15 @@
 
 #include <config.h>
 #include <kuniqueapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kopenwith.h>
 #include <kcrash.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <kmanagerselection.h>
 
-- 
cgit v1.2.1