From 0586baf9aeaeaf767711de960b0e020696a3c126 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:50:08 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- admin/kde.py | 2 +- kde.py | 2 +- src/addnewstreamimpl.cpp | 2 +- src/kstreamripper.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/admin/kde.py b/admin/kde.py index 646bed9..8547edf 100644 --- a/admin/kde.py +++ b/admin/kde.py @@ -382,7 +382,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt act=[] act.append('$QT_UIC $QT_UIC_HFLAGS -o '+target[0].path+' '+source[0].path) act.append('rm -f ' +target[1].path) - act.append('echo \'#include \' >> '+target[1].path) + act.append('echo \'#include \' >> '+target[1].path) act.append('echo \'#include \' >> '+target[1].path) act.append('$QT_UIC $QT_UIC_CFLAGS -impl '+target[0].path+' -o '+target[1].path+'.tmp '+source[0].path) act.append('cat '+target[1].path+'.tmp >> '+target[1].path) diff --git a/kde.py b/kde.py index cc963ba..589cffa 100644 --- a/kde.py +++ b/kde.py @@ -483,7 +483,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt act=[] act.append('$QT_UIC $QT_UIC_HFLAGS -o '+target[0].path+' '+source[0].path) act.append('rm -f ' +target[1].path) - act.append('echo \'#include \' >> '+target[1].path) + act.append('echo \'#include \' >> '+target[1].path) act.append('echo \'#include \' >> '+target[1].path) act.append('$QT_UIC $QT_UIC_CFLAGS -impl '+target[0].path+' -o '+target[1].path+'.tmp '+source[0].path) act.append('cat '+target[1].path+'.tmp >> '+target[1].path) diff --git a/src/addnewstreamimpl.cpp b/src/addnewstreamimpl.cpp index 5c0fc69..1fbbb1c 100644 --- a/src/addnewstreamimpl.cpp +++ b/src/addnewstreamimpl.cpp @@ -18,7 +18,7 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#include +#include #include #include diff --git a/src/kstreamripper.cpp b/src/kstreamripper.cpp index 9e3e1d4..74842b1 100644 --- a/src/kstreamripper.cpp +++ b/src/kstreamripper.cpp @@ -20,7 +20,7 @@ #include -#include +#include #include #include #include @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include -- cgit v1.2.1