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

---
 knewsticker/common/configaccess.cpp                   | 4 ++--
 knewsticker/common/configaccess.h                     | 2 +-
 knewsticker/common/newsengine.cpp                     | 2 +-
 knewsticker/common/newsengine.h                       | 2 +-
 knewsticker/common/xmlnewsaccess.cpp                  | 2 +-
 knewsticker/knewsticker.cpp                           | 4 ++--
 knewsticker/knewstickerconfig.cpp                     | 2 +-
 knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp | 4 ++--
 knewsticker/newsscroller.cpp                          | 2 +-
 knewsticker/newssourcedlgimpl.cpp                     | 2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'knewsticker')

diff --git a/knewsticker/common/configaccess.cpp b/knewsticker/common/configaccess.cpp
index 2de8990a..c8ad18f6 100644
--- a/knewsticker/common/configaccess.cpp
+++ b/knewsticker/common/configaccess.cpp
@@ -14,8 +14,8 @@
 #include <tqregexp.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 
 static NewsSourceBase::Data NewsSourceDefault[DEFAULT_NEWSSOURCES] = {
 	// Arts ---------------
diff --git a/knewsticker/common/configaccess.h b/knewsticker/common/configaccess.h
index b9be6d49..eab1b6fe 100644
--- a/knewsticker/common/configaccess.h
+++ b/knewsticker/common/configaccess.h
@@ -16,7 +16,7 @@
 
 #include <tdeconfig.h>
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqpixmap.h>
 #include <tqvaluelist.h>
diff --git a/knewsticker/common/newsengine.cpp b/knewsticker/common/newsengine.cpp
index d0c8c214..6f341c46 100644
--- a/knewsticker/common/newsengine.cpp
+++ b/knewsticker/common/newsengine.cpp
@@ -16,7 +16,7 @@
 
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <krun.h>
 #include <kstandarddirs.h>
diff --git a/knewsticker/common/newsengine.h b/knewsticker/common/newsengine.h
index 8015534b..81d2be81 100644
--- a/knewsticker/common/newsengine.h
+++ b/knewsticker/common/newsengine.h
@@ -23,7 +23,7 @@
 #include <tqpixmap.h>
 
 #include <tdeio/job.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ksharedptr.h>
 
 class ConfigAccess;
diff --git a/knewsticker/common/xmlnewsaccess.cpp b/knewsticker/common/xmlnewsaccess.cpp
index 742c1ad1..b9d2ef3a 100644
--- a/knewsticker/common/xmlnewsaccess.cpp
+++ b/knewsticker/common/xmlnewsaccess.cpp
@@ -12,7 +12,7 @@
 
 #include <kcharsets.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqbuffer.h>
 #include <tqdom.h>
diff --git a/knewsticker/knewsticker.cpp b/knewsticker/knewsticker.cpp
index 01b5c000..cca820eb 100644
--- a/knewsticker/knewsticker.cpp
+++ b/knewsticker/knewsticker.cpp
@@ -23,9 +23,9 @@
 #include <kiconloader.h>
 #include <knotifyclient.h>
 #include <kprocess.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 #include <kstandarddirs.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 
 #include <tqcursor.h>
 #include <tqlayout.h>
diff --git a/knewsticker/knewstickerconfig.cpp b/knewsticker/knewstickerconfig.cpp
index 77689310..0e558a1c 100644
--- a/knewsticker/knewstickerconfig.cpp
+++ b/knewsticker/knewstickerconfig.cpp
@@ -22,7 +22,7 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <tdepopupmenu.h>
 
diff --git a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
index 15ebe7f7..8076c304 100644
--- a/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
+++ b/knewsticker/kntsrcfilepropsdlg/kntsrcfilepropsdlg.cpp
@@ -19,11 +19,11 @@
 
 #include <tdeapplication.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurllabel.h>
 #include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqmultilineedit.h>
 #include <tqvbox.h>
diff --git a/knewsticker/newsscroller.cpp b/knewsticker/newsscroller.cpp
index cd9d9000..4c5f3861 100644
--- a/knewsticker/newsscroller.cpp
+++ b/knewsticker/newsscroller.cpp
@@ -18,7 +18,7 @@
 #include <kcursor.h>
 #include <kstandarddirs.h>
 #include <kurldrag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "configaccess.h"
 #include "newsscroller.h"
diff --git a/knewsticker/newssourcedlgimpl.cpp b/knewsticker/newssourcedlgimpl.cpp
index e5c50090..83fd6e04 100644
--- a/knewsticker/newssourcedlgimpl.cpp
+++ b/knewsticker/newssourcedlgimpl.cpp
@@ -15,7 +15,7 @@
 
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
 #include <kurlrequester.h>
 
-- 
cgit v1.2.1