From c96f95eaac4e5415ddb92103a5c29ab55597408d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:53:57 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- kttsd/players/alsaplayer/alsaplayer.cpp | 4 ++-- kttsd/players/artsplayer/artsplayer.cpp | 4 ++-- kttsd/players/gstplayer/gstreamerplayer.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'kttsd/players') 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 #include #include -#include -#include +#include +#include // 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 -#include +#include #include -#include +#include //////////////////////////////////////////////////////////////////////////////// // 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 #include -#include +#include #include // GStreamerPlayer includes. -- cgit v1.2.1