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

---
 knetattach/knetattach.ui | 6 +++---
 knetattach/main.cpp      | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'knetattach')

diff --git a/knetattach/knetattach.ui b/knetattach/knetattach.ui
index dd7f5d645..781643ff1 100644
--- a/knetattach/knetattach.ui
+++ b/knetattach/knetattach.ui
@@ -407,10 +407,10 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in implementation">tdeio/netaccess.h</include>
-    <include location="global" impldecl="in implementation">kmessagebox.h</include>
+    <include location="global" impldecl="in implementation">tdemessagebox.h</include>
     <include location="global" impldecl="in implementation">kiconloader.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
-    <include location="global" impldecl="in implementation">kglobalsettings.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
+    <include location="global" impldecl="in implementation">tdeglobalsettings.h</include>
     <include location="global" impldecl="in implementation">ksimpleconfig.h</include>
     <include location="global" impldecl="in implementation">tdeapplication.h</include>
     <include location="global" impldecl="in implementation">kstandarddirs.h</include>
diff --git a/knetattach/main.cpp b/knetattach/main.cpp
index 5c40741f7..b2cb63d08 100644
--- a/knetattach/main.cpp
+++ b/knetattach/main.cpp
@@ -20,8 +20,8 @@
 #include <tdeaboutdata.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include "knetattach.h"
 
-- 
cgit v1.2.3