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

---
 plugins/upnp/upnpplugin.cpp     | 4 ++--
 plugins/upnp/upnpprefpage.cpp   | 4 ++--
 plugins/upnp/upnpprefwidget.cpp | 2 +-
 plugins/upnp/upnprouter.cpp     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/upnp')

diff --git a/plugins/upnp/upnpplugin.cpp b/plugins/upnp/upnpplugin.cpp
index aa5773a..a370966 100644
--- a/plugins/upnp/upnpplugin.cpp
+++ b/plugins/upnp/upnpplugin.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kstandarddirs.h>
 #include <kstdaction.h>
diff --git a/plugins/upnp/upnpprefpage.cpp b/plugins/upnp/upnpprefpage.cpp
index e360b3c..1d3a6da 100644
--- a/plugins/upnp/upnpprefpage.cpp
+++ b/plugins/upnp/upnpprefpage.cpp
@@ -17,8 +17,8 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include "upnpprefpage.h"
 #include "upnpprefwidget.h"
diff --git a/plugins/upnp/upnpprefwidget.cpp b/plugins/upnp/upnpprefwidget.cpp
index b44c43d..7d0bbb5 100644
--- a/plugins/upnp/upnpprefwidget.cpp
+++ b/plugins/upnp/upnpprefwidget.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <torrent/udptrackersocket.h>
 #include <torrent/globals.h>
diff --git a/plugins/upnp/upnprouter.cpp b/plugins/upnp/upnprouter.cpp
index d88995a..0e18e92 100644
--- a/plugins/upnp/upnprouter.cpp
+++ b/plugins/upnp/upnprouter.cpp
@@ -18,8 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
 #include <stdlib.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tqstringlist.h>
 #include <tdeio/netaccess.h>
-- 
cgit v1.2.1