summaryrefslogtreecommitdiffstats
path: root/kttsd/players
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:57 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:53:57 -0600
commitc96f95eaac4e5415ddb92103a5c29ab55597408d (patch)
treed6b026edcb7e58f72fed333952a22f4c45fb01f8 /kttsd/players
parent127600d4f12c1787365edc471904f9732743c771 (diff)
downloadtdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.tar.gz
tdeaccessibility-c96f95eaac4e5415ddb92103a5c29ab55597408d.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kttsd/players')
-rw-r--r--kttsd/players/alsaplayer/alsaplayer.cpp4
-rw-r--r--kttsd/players/artsplayer/artsplayer.cpp4
-rw-r--r--kttsd/players/gstplayer/gstreamerplayer.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/kttsd/players/alsaplayer/alsaplayer.cpp b/kttsd/players/alsaplayer/alsaplayer.cpp
index 580da8c..4222ca6 100644
--- a/kttsd/players/alsaplayer/alsaplayer.cpp
+++ b/kttsd/players/alsaplayer/alsaplayer.cpp
@@ -47,8 +47,8 @@
#include <kdebug.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
// AlsaPlayer includes.
#include "alsaplayer.h"
diff --git a/kttsd/players/artsplayer/artsplayer.cpp b/kttsd/players/artsplayer/artsplayer.cpp
index 9629d29..49c9e26 100644
--- a/kttsd/players/artsplayer/artsplayer.cpp
+++ b/kttsd/players/artsplayer/artsplayer.cpp
@@ -32,9 +32,9 @@
#include <sys/wait.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kaudiomanagerplay.h>
-#include <klocale.h>
+#include <tdelocale.h>
////////////////////////////////////////////////////////////////////////////////
// public methods
diff --git a/kttsd/players/gstplayer/gstreamerplayer.cpp b/kttsd/players/gstplayer/gstreamerplayer.cpp
index a62a2e9..957aeda 100644
--- a/kttsd/players/gstplayer/gstreamerplayer.cpp
+++ b/kttsd/players/gstplayer/gstreamerplayer.cpp
@@ -18,7 +18,7 @@
// KDE includes.
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
// GStreamerPlayer includes.