From 281d226f744d70a826a3bffff1ee964ef5915d4f Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 15 Feb 2013 21:44:58 -0600 Subject: Rename additional header files to avoid conflicts with KDE4 --- libk3b/projects/audiocd/k3baudiocdtracksource.cpp | 2 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 4 ++-- libk3b/projects/audiocd/k3baudioimager.cpp | 2 +- libk3b/projects/audiocd/k3baudiojob.cpp | 4 ++-- libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp | 2 +- libk3b/projects/audiocd/k3baudionormalizejob.cpp | 2 +- libk3b/projects/audiocd/k3baudiozerodata.cpp | 2 +- libk3b/projects/datacd/k3bbootitem.cpp | 2 +- libk3b/projects/datacd/k3bdatadoc.cpp | 6 +++--- libk3b/projects/datacd/k3bdatajob.cpp | 4 ++-- libk3b/projects/datacd/k3bdatapreparationjob.cpp | 2 +- libk3b/projects/datacd/k3bisoimager.cpp | 4 ++-- libk3b/projects/datacd/k3bisooptions.cpp | 2 +- libk3b/projects/datacd/k3bmkisofshandler.cpp | 2 +- libk3b/projects/datacd/k3bmsinfofetcher.cpp | 2 +- libk3b/projects/datadvd/k3bdvdbooktypejob.cpp | 2 +- libk3b/projects/datadvd/k3bdvdjob.cpp | 2 +- libk3b/projects/datadvd/k3bdvdview.cpp | 2 +- libk3b/projects/k3babstractwriter.cpp | 4 ++-- libk3b/projects/k3bcdrdaowriter.cpp | 4 ++-- libk3b/projects/k3bcdrecordwriter.cpp | 4 ++-- libk3b/projects/k3bdoc.cpp | 2 +- libk3b/projects/k3bdvdrecordwriter.cpp | 2 +- libk3b/projects/k3bgrowisofshandler.cpp | 4 ++-- libk3b/projects/k3bgrowisofswriter.cpp | 4 ++-- libk3b/projects/k3bpipebuffer.cpp | 2 +- libk3b/projects/mixedcd/k3bmixeddoc.cpp | 4 ++-- libk3b/projects/mixedcd/k3bmixedjob.cpp | 4 ++-- libk3b/projects/movixcd/k3bmovixdoc.cpp | 4 ++-- libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 4 ++-- libk3b/projects/movixcd/k3bmovixjob.cpp | 2 +- libk3b/projects/movixcd/k3bmovixprogram.cpp | 2 +- libk3b/projects/movixdvd/k3bmovixdvdjob.cpp | 2 +- libk3b/projects/videocd/k3bvcddoc.cpp | 4 ++-- libk3b/projects/videocd/k3bvcdjob.cpp | 4 ++-- libk3b/projects/videocd/k3bvcdoptions.cpp | 2 +- libk3b/projects/videocd/k3bvcdtrack.cpp | 2 +- libk3b/projects/videocd/k3bvcdxmlview.h | 2 +- libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp | 2 +- libk3b/projects/videodvd/k3bvideodvdimager.cpp | 6 +++--- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 4 ++-- 41 files changed, 61 insertions(+), 61 deletions(-) (limited to 'libk3b/projects') diff --git a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp index 6ca0cd5..e4d2e0a 100644 --- a/libk3b/projects/audiocd/k3baudiocdtracksource.cpp +++ b/libk3b/projects/audiocd/k3baudiocdtracksource.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index 56293f1..c639574 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -44,9 +44,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/libk3b/projects/audiocd/k3baudioimager.cpp b/libk3b/projects/audiocd/k3baudioimager.cpp index 6917fe6..6d2449c 100644 --- a/libk3b/projects/audiocd/k3baudioimager.cpp +++ b/libk3b/projects/audiocd/k3baudioimager.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/audiocd/k3baudiojob.cpp b/libk3b/projects/audiocd/k3baudiojob.cpp index 2415962..8f59744 100644 --- a/libk3b/projects/audiocd/k3baudiojob.cpp +++ b/libk3b/projects/audiocd/k3baudiojob.cpp @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp index 2f8713b..3c07347 100644 --- a/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp +++ b/libk3b/projects/audiocd/k3baudiomaxspeedjob.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/audiocd/k3baudionormalizejob.cpp b/libk3b/projects/audiocd/k3baudionormalizejob.cpp index 89fdb99..0416f38 100644 --- a/libk3b/projects/audiocd/k3baudionormalizejob.cpp +++ b/libk3b/projects/audiocd/k3baudionormalizejob.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include K3bAudioNormalizeJob::K3bAudioNormalizeJob( K3bJobHandler* hdl, TQObject* parent, const char* name ) diff --git a/libk3b/projects/audiocd/k3baudiozerodata.cpp b/libk3b/projects/audiocd/k3baudiozerodata.cpp index aff0cf9..5ff4a32 100644 --- a/libk3b/projects/audiocd/k3baudiozerodata.cpp +++ b/libk3b/projects/audiocd/k3baudiozerodata.cpp @@ -16,7 +16,7 @@ #include "k3baudiozerodata.h" #include "k3baudiotrack.h" -#include +#include #include diff --git a/libk3b/projects/datacd/k3bbootitem.cpp b/libk3b/projects/datacd/k3bbootitem.cpp index f5a8725..768ca92 100644 --- a/libk3b/projects/datacd/k3bbootitem.cpp +++ b/libk3b/projects/datacd/k3bbootitem.cpp @@ -17,7 +17,7 @@ #include "k3bdatadoc.h" #include "k3bdiritem.h" -#include +#include #include diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index c0d1aa6..debc574 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -46,11 +46,11 @@ #include #include #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index d3f6049..356ab17 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -37,9 +37,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bdatapreparationjob.cpp b/libk3b/projects/datacd/k3bdatapreparationjob.cpp index 26a2b5b..a6b9e88 100644 --- a/libk3b/projects/datacd/k3bdatapreparationjob.cpp +++ b/libk3b/projects/datacd/k3bdatapreparationjob.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index 6420023..2f750c5 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index bd5167e..88f7d82 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/datacd/k3bmkisofshandler.cpp b/libk3b/projects/datacd/k3bmkisofshandler.cpp index 7b3270c..d367ccc 100644 --- a/libk3b/projects/datacd/k3bmkisofshandler.cpp +++ b/libk3b/projects/datacd/k3bmkisofshandler.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/datacd/k3bmsinfofetcher.cpp b/libk3b/projects/datacd/k3bmsinfofetcher.cpp index e81c98b..cfbe58b 100644 --- a/libk3b/projects/datacd/k3bmsinfofetcher.cpp +++ b/libk3b/projects/datacd/k3bmsinfofetcher.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp index cefafdf..058e195 100644 --- a/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp +++ b/libk3b/projects/datadvd/k3bdvdbooktypejob.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index e39cf84..c8cec08 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/datadvd/k3bdvdview.cpp b/libk3b/projects/datadvd/k3bdvdview.cpp index c245e04..7119a0e 100644 --- a/libk3b/projects/datadvd/k3bdvdview.cpp +++ b/libk3b/projects/datadvd/k3bdvdview.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include K3bDvdView::K3bDvdView( K3bDvdDoc* doc, TQWidget *parent, const char *name ) diff --git a/libk3b/projects/k3babstractwriter.cpp b/libk3b/projects/k3babstractwriter.cpp index e911a2f..26bf989 100644 --- a/libk3b/projects/k3babstractwriter.cpp +++ b/libk3b/projects/k3babstractwriter.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index 864fcae..863e2a8 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -38,11 +38,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/k3bcdrecordwriter.cpp b/libk3b/projects/k3bcdrecordwriter.cpp index 15047a1..ce29051 100644 --- a/libk3b/projects/k3bcdrecordwriter.cpp +++ b/libk3b/projects/k3bcdrecordwriter.cpp @@ -36,9 +36,9 @@ #include #include -#include +#include #include -#include +#include diff --git a/libk3b/projects/k3bdoc.cpp b/libk3b/projects/k3bdoc.cpp index ee70921..2ae4880 100644 --- a/libk3b/projects/k3bdoc.cpp +++ b/libk3b/projects/k3bdoc.cpp @@ -20,7 +20,7 @@ #include // include files for KDE -#include +#include #include // application specific includes diff --git a/libk3b/projects/k3bdvdrecordwriter.cpp b/libk3b/projects/k3bdvdrecordwriter.cpp index 46dc75a..1079533 100644 --- a/libk3b/projects/k3bdvdrecordwriter.cpp +++ b/libk3b/projects/k3bdvdrecordwriter.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include K3bDvdrecordWriter::K3bDvdrecordWriter( K3bDevice::Device* dev, TQObject* parent, const char* name ) diff --git a/libk3b/projects/k3bgrowisofshandler.cpp b/libk3b/projects/k3bgrowisofshandler.cpp index edaaa40..e25e758 100644 --- a/libk3b/projects/k3bgrowisofshandler.cpp +++ b/libk3b/projects/k3bgrowisofshandler.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/libk3b/projects/k3bgrowisofswriter.cpp b/libk3b/projects/k3bgrowisofswriter.cpp index f8b64a3..ebb26a4 100644 --- a/libk3b/projects/k3bgrowisofswriter.cpp +++ b/libk3b/projects/k3bgrowisofswriter.cpp @@ -29,9 +29,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/libk3b/projects/k3bpipebuffer.cpp b/libk3b/projects/k3bpipebuffer.cpp index 8e689c0..696ad4c 100644 --- a/libk3b/projects/k3bpipebuffer.cpp +++ b/libk3b/projects/k3bpipebuffer.cpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index b5d4451..1c7533e 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -24,10 +24,10 @@ #include #include -#include +#include #include #include -#include +#include diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index 885aa92..7d5858e 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -48,8 +48,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index 7914b11..5379ba1 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -22,11 +22,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index f4c9f2d..55d8be5 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -26,9 +26,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/libk3b/projects/movixcd/k3bmovixjob.cpp b/libk3b/projects/movixcd/k3bmovixjob.cpp index 70a639d..837fe0c 100644 --- a/libk3b/projects/movixcd/k3bmovixjob.cpp +++ b/libk3b/projects/movixcd/k3bmovixjob.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/movixcd/k3bmovixprogram.cpp b/libk3b/projects/movixcd/k3bmovixprogram.cpp index 24f7a98..aa5b8a5 100644 --- a/libk3b/projects/movixcd/k3bmovixprogram.cpp +++ b/libk3b/projects/movixcd/k3bmovixprogram.cpp @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp index 9c12741..dfe8061 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvdjob.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index e052a6c..eb40f16 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -27,9 +27,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/libk3b/projects/videocd/k3bvcdjob.cpp b/libk3b/projects/videocd/k3bvcdjob.cpp index e4ea8ee..d16e7e0 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -13,11 +13,11 @@ * See the file "COPYING" for the exact licensing terms. */ -#include +#include #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index 0beaaa7..b0d60cf 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include // TQt Includes diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index b736af1..2e92c4f 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include // K3b Includes #include "k3bvcdtrack.h" diff --git a/libk3b/projects/videocd/k3bvcdxmlview.h b/libk3b/projects/videocd/k3bvcdxmlview.h index 6368dec..aa1a189 100644 --- a/libk3b/projects/videocd/k3bvcdxmlview.h +++ b/libk3b/projects/videocd/k3bvcdxmlview.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp index 6192024..a4550f2 100644 --- a/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp +++ b/libk3b/projects/videocd/mpeginfo/k3bmpeginfo.cpp @@ -14,7 +14,7 @@ */ // kde includes -#include +#include // k3b includes #include "k3bmpeginfo.h" diff --git a/libk3b/projects/videodvd/k3bvideodvdimager.cpp b/libk3b/projects/videodvd/k3bvideodvdimager.cpp index 9d72448..2cf4965 100644 --- a/libk3b/projects/videodvd/k3bvideodvdimager.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdimager.cpp @@ -20,11 +20,11 @@ #include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index 42082d1..04728b5 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include -- cgit v1.2.3