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/logviewer/logprefpage.cpp     | 4 ++--
 plugins/logviewer/logprefwidget.cpp   | 4 ++--
 plugins/logviewer/logviewer.cpp       | 2 +-
 plugins/logviewer/logviewerplugin.cpp | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/logviewer')

diff --git a/plugins/logviewer/logprefpage.cpp b/plugins/logviewer/logprefpage.cpp
index 4a2ca9b..34a2c3f 100644
--- a/plugins/logviewer/logprefpage.cpp
+++ b/plugins/logviewer/logprefpage.cpp
@@ -20,8 +20,8 @@
 #include "logprefpage.h"
 #include "logprefwidget.h"
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 namespace kt
diff --git a/plugins/logviewer/logprefwidget.cpp b/plugins/logviewer/logprefwidget.cpp
index 46ea88d..66a6cdb 100644
--- a/plugins/logviewer/logprefwidget.cpp
+++ b/plugins/logviewer/logprefwidget.cpp
@@ -21,8 +21,8 @@
 #include "logviewerpluginsettings.h"
 #include "logflags.h"
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 
 #include <tqwidget.h>
 #include <tqstring.h>
diff --git a/plugins/logviewer/logviewer.cpp b/plugins/logviewer/logviewer.cpp
index 343080f..8b1be8a 100644
--- a/plugins/logviewer/logviewer.cpp
+++ b/plugins/logviewer/logviewer.cpp
@@ -17,7 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.             *
  ***************************************************************************/
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeconfig.h>
 #include <tqapplication.h>
 #include "logviewer.h"
diff --git a/plugins/logviewer/logviewerplugin.cpp b/plugins/logviewer/logviewerplugin.cpp
index 4c11680..b586aad 100644
--- a/plugins/logviewer/logviewerplugin.cpp
+++ b/plugins/logviewer/logviewerplugin.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 <util/log.h>
 #include <torrent/globals.h>
-- 
cgit v1.2.1