summaryrefslogtreecommitdiffstats
path: root/arts
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:57:54 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:57:54 -0600
commited99a30644c19b0a3cf0d2147243532df4daa16b (patch)
tree7f3f2850e59824fdf100a642367a82b1e7f0204f /arts
parente5f2d46e9caf6942f365f1b454087dda71a340f7 (diff)
downloadtdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz
tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'arts')
-rw-r--r--arts/kde/kaudioplaystream.cpp2
-rw-r--r--arts/kde/kaudiorecordstream.cpp2
-rw-r--r--arts/kde/kconverttest.cc2
-rw-r--r--arts/kde/kiotest.cc2
-rw-r--r--arts/kde/kiotestslow.cc2
-rw-r--r--arts/kde/kvideowidget.cpp2
-rw-r--r--arts/kde/mcop-dcop/kmcop.cpp2
-rw-r--r--arts/knotify/knotify.cpp6
-rw-r--r--arts/message/artsmessage.cc6
9 files changed, 13 insertions, 13 deletions
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