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

---
 arts/kde/kaudioplaystream.cpp   | 2 +-
 arts/kde/kaudiorecordstream.cpp | 2 +-
 arts/kde/kconverttest.cc        | 2 +-
 arts/kde/kiotest.cc             | 2 +-
 arts/kde/kiotestslow.cc         | 2 +-
 arts/kde/kvideowidget.cpp       | 2 +-
 arts/kde/mcop-dcop/kmcop.cpp    | 2 +-
 arts/knotify/knotify.cpp        | 6 +++---
 arts/message/artsmessage.cc     | 6 +++---
 9 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'arts')

diff --git a/arts/kde/kaudioplaystream.cpp b/arts/kde/kaudioplaystream.cpp
index 52743a67e..0ef5b8332 100644
--- a/arts/kde/kaudioplaystream.cpp
+++ b/arts/kde/kaudioplaystream.cpp
@@ -26,7 +26,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/arts/kde/kaudiorecordstream.cpp b/arts/kde/kaudiorecordstream.cpp
index 0d180d1f1..0c11bcf04 100644
--- a/arts/kde/kaudiorecordstream.cpp
+++ b/arts/kde/kaudiorecordstream.cpp
@@ -29,7 +29,7 @@
 #include <artsflow.h>
 #include <soundserver.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 
 #include <tqstring.h>
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cc
index 70c4b7918..647c2f320 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cc
@@ -3,7 +3,7 @@
 #include <tqfile.h>
 #include <tqobject.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cc
index 01ce8f3f1..ed9a3fadf 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cc
@@ -2,7 +2,7 @@
 #include <kmedia2.h>
 #include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include "qiomanager.h"
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cc
index df6ed645f..93bfac388 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cc
@@ -2,7 +2,7 @@
 #include <kmedia2.h>
 #include <tdecmdlineargs.h>
 #include <connect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
 #include <stdsynthmodule.h>
diff --git a/arts/kde/kvideowidget.cpp b/arts/kde/kvideowidget.cpp
index 389228d99..c03a18c21 100644
--- a/arts/kde/kvideowidget.cpp
+++ b/arts/kde/kvideowidget.cpp
@@ -27,7 +27,7 @@
 #endif
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "kvideowidget.h"
 
 
diff --git a/arts/kde/mcop-dcop/kmcop.cpp b/arts/kde/mcop-dcop/kmcop.cpp
index d134aeca4..d5e8c8642 100644
--- a/arts/kde/mcop-dcop/kmcop.cpp
+++ b/arts/kde/mcop-dcop/kmcop.cpp
@@ -20,7 +20,7 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 
 #include <tqvaluelist.h>
diff --git a/arts/knotify/knotify.cpp b/arts/knotify/knotify.cpp
index 3d0e45d02..313a7a993 100644
--- a/arts/knotify/knotify.cpp
+++ b/arts/knotify/knotify.cpp
@@ -52,9 +52,9 @@
 #include <tdecmdlineargs.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassivepopup.h>
 #include <kiconloader.h>
 #include <kmacroexpander.h>
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cc
index 4eb62f1fb..eaa5c8e2c 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cc
@@ -31,11 +31,11 @@ Gnome, etc. and used instead.
 
 #include <tqregexp.h>
 
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <tdeapplication.h>
 #include <tdeaboutdata.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 
 // command line options
-- 
cgit v1.2.1