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/rssfeed/rssfeed.cpp           | 2 +-
 plugins/rssfeed/rssfeedmanager.cpp    | 4 ++--
 plugins/rssfeed/rssfeedplugin.cpp     | 6 +++---
 plugins/rssfeed/rsslinkdownloader.cpp | 4 ++--
 plugins/rssfeed/rsslinkdownloader.h   | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'plugins/rssfeed')

diff --git a/plugins/rssfeed/rssfeed.cpp b/plugins/rssfeed/rssfeed.cpp
index 22289f1..5b45a4c 100644
--- a/plugins/rssfeed/rssfeed.cpp
+++ b/plugins/rssfeed/rssfeed.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 #include "rssfeed.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <krfcdate.h>
 #include <tdeio/netaccess.h>
diff --git a/plugins/rssfeed/rssfeedmanager.cpp b/plugins/rssfeed/rssfeedmanager.cpp
index 97c5b9c..8addd09 100644
--- a/plugins/rssfeed/rssfeedmanager.cpp
+++ b/plugins/rssfeed/rssfeedmanager.cpp
@@ -21,12 +21,12 @@
 
 #include <kdirlister.h>
 #include <tdefileitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/netaccess.h>
 #include <kstandarddirs.h>
 #include <keditlistbox.h>
 // #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <tqobject.h>
diff --git a/plugins/rssfeed/rssfeedplugin.cpp b/plugins/rssfeed/rssfeedplugin.cpp
index 051c8e2..4a60921 100644
--- a/plugins/rssfeed/rssfeedplugin.cpp
+++ b/plugins/rssfeed/rssfeedplugin.cpp
@@ -29,9 +29,9 @@
 #include <tqstring.h>
 #include <tqfile.h>
 
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "rssfeedmanager.h"
 #include "rssfeedplugin.h"
diff --git a/plugins/rssfeed/rsslinkdownloader.cpp b/plugins/rssfeed/rsslinkdownloader.cpp
index b17bec8..561ca27 100644
--- a/plugins/rssfeed/rsslinkdownloader.cpp
+++ b/plugins/rssfeed/rsslinkdownloader.cpp
@@ -19,9 +19,9 @@
  ***************************************************************************/
 #include "rsslinkdownloader.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqfile.h>
 
diff --git a/plugins/rssfeed/rsslinkdownloader.h b/plugins/rssfeed/rsslinkdownloader.h
index 6badd61..a496af7 100644
--- a/plugins/rssfeed/rsslinkdownloader.h
+++ b/plugins/rssfeed/rsslinkdownloader.h
@@ -21,7 +21,7 @@
 #define RSSLINKDOWNLOADER_H
 
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <interfaces/coreinterface.h>
 #include <torrent/globals.h>
-- 
cgit v1.2.1