summaryrefslogtreecommitdiffstats
path: root/knewsticker/common
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:59:01 -0600
commit0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch)
tree54cce3e6ae07c4fc8921244b1397c75cc21a2997 /knewsticker/common
parent5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff)
downloadtdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz
tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'knewsticker/common')
-rw-r--r--knewsticker/common/configaccess.cpp4
-rw-r--r--knewsticker/common/configaccess.h2
-rw-r--r--knewsticker/common/newsengine.cpp2
-rw-r--r--knewsticker/common/newsengine.h2
-rw-r--r--knewsticker/common/xmlnewsaccess.cpp2
5 files changed, 6 insertions, 6 deletions
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>