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

---
 nsplugins/kcm_nsplugins.cpp       | 2 +-
 nsplugins/nspluginloader.cpp      | 4 ++--
 nsplugins/plugin_part.cpp         | 2 +-
 nsplugins/pluginscan.cpp          | 4 ++--
 nsplugins/viewer/nsplugin.cpp     | 8 ++++----
 nsplugins/viewer/qxteventloop.cpp | 2 +-
 nsplugins/viewer/viewer.cpp       | 6 +++---
 7 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'nsplugins')

diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 84284ae5b..037798cb2 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -23,7 +23,7 @@
 #include <tqregexp.h>
 #include <tqlayout.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <kurlrequester.h>
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 65a7e48a9..8c9e6fe2c 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -30,8 +30,8 @@
 #include <tdeapplication.h>
 #include <kprocess.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <dcopclient.h>
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index f7404b34f..99cbc780f 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -27,7 +27,7 @@
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/browserinterface.h>
 #include <tdeparts/browserextension.h>
 
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index f8731a6c7..0b6855c42 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -42,7 +42,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <klibloader.h>
 #include <tdeconfig.h>
@@ -52,7 +52,7 @@
 #include <kmimetype.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "sdk/npupp.h"
 #include <X11/Intrinsic.h>
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 00f98921a..d6327be35 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -46,14 +46,14 @@
 #include <dcopclient.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include <X11/Intrinsic.h>
diff --git a/nsplugins/viewer/qxteventloop.cpp b/nsplugins/viewer/qxteventloop.cpp
index 2c79bc6ec..1f112ba08 100644
--- a/nsplugins/viewer/qxteventloop.cpp
+++ b/nsplugins/viewer/qxteventloop.cpp
@@ -41,7 +41,7 @@
 
 #include <tqapplication.h>
 #include <tqwidgetintdict.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 // resolve the conflict between X11's FocusIn and TQEvent::FocusIn
 const int XFocusOut = FocusOut;
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index 682a11997..a7469b4f7 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -31,9 +31,9 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tqptrlist.h>
 #include <tqsocketnotifier.h>
 #include <stdlib.h>
-- 
cgit v1.2.3