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/kdiconview.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kdesktop/kdiconview.cc')

diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cc
index 68897eb94..e00fbada2 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cc
@@ -29,9 +29,9 @@
 #include <kdebug.h>
 #include <kdesktopfile.h>
 #include <kdirlister.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kpropertiesdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <konqbookmarkmanager.h>
 #include <konq_defaults.h>
 #include <konq_drag.h>
-- 
cgit v1.2.1