From d796716f1dc9dd0b198863d974a03bf356f636e6 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 00:52:05 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- libk3b/cddb/k3bcddb.cpp | 2 +- libk3b/cddb/k3bcddbhttpquery.cpp | 4 ++-- libk3b/core/k3bcore.cpp | 2 +- libk3b/core/k3bexternalbinmanager.cpp | 2 +- libk3b/core/k3bglobals.cpp | 6 +++--- libk3b/core/k3bglobals.h | 2 +- libk3b/core/k3bglobalsettings.cpp | 2 +- libk3b/jobs/k3bblankingjob.cpp | 6 +++--- libk3b/jobs/k3bcdcopyjob.cpp | 8 ++++---- libk3b/jobs/k3bdvdcopyjob.cpp | 2 +- libk3b/jobs/k3biso9660imagewritingjob.cpp | 4 ++-- libk3b/jobs/k3breadcdreader.cpp | 2 +- libk3b/jobs/k3bverificationjob.cpp | 6 +++--- libk3b/plugin/k3baudiodecoder.cpp | 2 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 4 ++-- libk3b/projects/audiocd/k3baudiotrack.h | 2 +- libk3b/projects/datacd/k3bdatadoc.cpp | 2 +- libk3b/projects/datacd/k3bdatadoc.h | 2 +- libk3b/projects/datacd/k3bdataitem.h | 2 +- libk3b/projects/datacd/k3bdatajob.cpp | 4 ++-- libk3b/projects/datacd/k3bdiritem.h | 2 +- libk3b/projects/datacd/k3bfilecompilationsizehandler.h | 2 +- libk3b/projects/datacd/k3bfileitem.h | 2 +- libk3b/projects/datacd/k3bisoimager.cpp | 6 +++--- libk3b/projects/datacd/k3bisooptions.cpp | 2 +- libk3b/projects/datacd/k3bspecialdataitem.h | 2 +- libk3b/projects/datadvd/k3bdvddoc.cpp | 2 +- libk3b/projects/k3bcdrdaowriter.cpp | 2 +- libk3b/projects/k3bdoc.h | 2 +- libk3b/projects/mixedcd/k3bmixeddoc.cpp | 2 +- libk3b/projects/mixedcd/k3bmixedjob.cpp | 4 ++-- libk3b/projects/movixcd/k3bmovixdoc.cpp | 2 +- libk3b/projects/movixcd/k3bmovixdocpreparer.cpp | 2 +- libk3b/projects/movixdvd/k3bmovixdvddoc.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/k3bvcdtrack.h | 2 +- libk3b/projects/videodvd/k3bvideodvddoc.cpp | 2 +- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 2 +- libk3b/tools/k3bdirsizejob.h | 2 +- libk3b/tools/k3bfilesplitter.h | 2 +- libk3b/tools/k3bmd5job.cpp | 2 +- 44 files changed, 62 insertions(+), 62 deletions(-) (limited to 'libk3b') diff --git a/libk3b/cddb/k3bcddb.cpp b/libk3b/cddb/k3bcddb.cpp index d1852a8..9007455 100644 --- a/libk3b/cddb/k3bcddb.cpp +++ b/libk3b/cddb/k3bcddb.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/cddb/k3bcddbhttpquery.cpp b/libk3b/cddb/k3bcddbhttpquery.cpp index 63e5581..20d92e5 100644 --- a/libk3b/cddb/k3bcddbhttpquery.cpp +++ b/libk3b/cddb/k3bcddbhttpquery.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include K3bCddbHttpQuery::K3bCddbHttpQuery( TQObject* parent, const char* name ) diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index 4af572f..dde6c95 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index 83ec1b6..902025d 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 42ccebc..6001072 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -29,11 +29,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h index 0964258..1a31696 100644 --- a/libk3b/core/k3bglobals.h +++ b/libk3b/core/k3bglobals.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include "k3b_export.h" diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp index 1301b8b..b4b4c20 100644 --- a/libk3b/core/k3bglobalsettings.cpp +++ b/libk3b/core/k3bglobalsettings.cpp @@ -15,7 +15,7 @@ #include "k3bglobalsettings.h" -#include +#include K3bGlobalSettings::K3bGlobalSettings() diff --git a/libk3b/jobs/k3bblankingjob.cpp b/libk3b/jobs/k3bblankingjob.cpp index aeab621..d023b58 100644 --- a/libk3b/jobs/k3bblankingjob.cpp +++ b/libk3b/jobs/k3bblankingjob.cpp @@ -21,10 +21,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff --git a/libk3b/jobs/k3bcdcopyjob.cpp b/libk3b/jobs/k3bcdcopyjob.cpp index 76bc7d3..91bcbcc 100644 --- a/libk3b/jobs/k3bcdcopyjob.cpp +++ b/libk3b/jobs/k3bcdcopyjob.cpp @@ -33,14 +33,14 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/libk3b/jobs/k3bdvdcopyjob.cpp b/libk3b/jobs/k3bdvdcopyjob.cpp index 6f36bf6..343f413 100644 --- a/libk3b/jobs/k3bdvdcopyjob.cpp +++ b/libk3b/jobs/k3bdvdcopyjob.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/jobs/k3biso9660imagewritingjob.cpp b/libk3b/jobs/k3biso9660imagewritingjob.cpp index e21e780..59a07c9 100644 --- a/libk3b/jobs/k3biso9660imagewritingjob.cpp +++ b/libk3b/jobs/k3biso9660imagewritingjob.cpp @@ -31,10 +31,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/libk3b/jobs/k3breadcdreader.cpp b/libk3b/jobs/k3breadcdreader.cpp index ed4aacd..afb9c9d 100644 --- a/libk3b/jobs/k3breadcdreader.cpp +++ b/libk3b/jobs/k3breadcdreader.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/jobs/k3bverificationjob.cpp b/libk3b/jobs/k3bverificationjob.cpp index e5333fe..b66ac89 100644 --- a/libk3b/jobs/k3bverificationjob.cpp +++ b/libk3b/jobs/k3bverificationjob.cpp @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/libk3b/plugin/k3baudiodecoder.cpp b/libk3b/plugin/k3baudiodecoder.cpp index b2d347b..915b8e7 100644 --- a/libk3b/plugin/k3baudiodecoder.cpp +++ b/libk3b/plugin/k3baudiodecoder.cpp @@ -21,7 +21,7 @@ #include "k3bpluginmanager.h" #include -#include +#include #include diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index c66e000..37fb7a8 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -45,10 +45,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/libk3b/projects/audiocd/k3baudiotrack.h b/libk3b/projects/audiocd/k3baudiotrack.h index 0970662..3f741be 100644 --- a/libk3b/projects/audiocd/k3baudiotrack.h +++ b/libk3b/projects/audiocd/k3baudiotrack.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index c48650e..8f0fee9 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include diff --git a/libk3b/projects/datacd/k3bdatadoc.h b/libk3b/projects/datacd/k3bdatadoc.h index 00312b6..4d9b58e 100644 --- a/libk3b/projects/datacd/k3bdatadoc.h +++ b/libk3b/projects/datacd/k3bdatadoc.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include "k3b_export.h" class K3bDataItem; diff --git a/libk3b/projects/datacd/k3bdataitem.h b/libk3b/projects/datacd/k3bdataitem.h index 1f68d68..7e59621 100644 --- a/libk3b/projects/datacd/k3bdataitem.h +++ b/libk3b/projects/datacd/k3bdataitem.h @@ -23,7 +23,7 @@ class K3bDataDoc; #include -#include +#include #include #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index 8eb7d11..c13cf75 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -40,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bdiritem.h b/libk3b/projects/datacd/k3bdiritem.h index c33610f..ba88c21 100644 --- a/libk3b/projects/datacd/k3bdiritem.h +++ b/libk3b/projects/datacd/k3bdiritem.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include "k3bdataitem.h" #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h index 4745264..d754e09 100644 --- a/libk3b/projects/datacd/k3bfilecompilationsizehandler.h +++ b/libk3b/projects/datacd/k3bfilecompilationsizehandler.h @@ -17,7 +17,7 @@ #define _K3B_FILECOMPILATION_SIZE_HANDLER_H_ -#include +#include #include class K3bDataItem; diff --git a/libk3b/projects/datacd/k3bfileitem.h b/libk3b/projects/datacd/k3bfileitem.h index 45e5b08..cfa553d 100644 --- a/libk3b/projects/datacd/k3bfileitem.h +++ b/libk3b/projects/datacd/k3bfileitem.h @@ -21,7 +21,7 @@ #include "k3bdataitem.h" #include -#include +#include #include #include "k3b_export.h" diff --git a/libk3b/projects/datacd/k3bisoimager.cpp b/libk3b/projects/datacd/k3bisoimager.cpp index dea41b6..6420023 100644 --- a/libk3b/projects/datacd/k3bisoimager.cpp +++ b/libk3b/projects/datacd/k3bisoimager.cpp @@ -34,9 +34,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bisooptions.cpp b/libk3b/projects/datacd/k3bisooptions.cpp index 91b6302..bd5167e 100644 --- a/libk3b/projects/datacd/k3bisooptions.cpp +++ b/libk3b/projects/datacd/k3bisooptions.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/datacd/k3bspecialdataitem.h b/libk3b/projects/datacd/k3bspecialdataitem.h index cb7f708..386f031 100644 --- a/libk3b/projects/datacd/k3bspecialdataitem.h +++ b/libk3b/projects/datacd/k3bspecialdataitem.h @@ -20,7 +20,7 @@ #include "k3bdataitem.h" #include "k3bdiritem.h" -#include +#include /** * This can be used to create fake items like the boot catalog diff --git a/libk3b/projects/datadvd/k3bdvddoc.cpp b/libk3b/projects/datadvd/k3bdvddoc.cpp index 2f8a87f..3eaeee4 100644 --- a/libk3b/projects/datadvd/k3bdvddoc.cpp +++ b/libk3b/projects/datadvd/k3bdvddoc.cpp @@ -19,7 +19,7 @@ #include -#include +#include K3bDvdDoc::K3bDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/k3bcdrdaowriter.cpp b/libk3b/projects/k3bcdrdaowriter.cpp index be7f38c..864fcae 100644 --- a/libk3b/projects/k3bcdrdaowriter.cpp +++ b/libk3b/projects/k3bcdrdaowriter.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/k3bdoc.h b/libk3b/projects/k3bdoc.h index 9d7474a..11d97c0 100644 --- a/libk3b/projects/k3bdoc.h +++ b/libk3b/projects/k3bdoc.h @@ -29,7 +29,7 @@ // include files for KDE #include -#include +#include #include "k3b_export.h" // forward declaration of the K3b classes diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 07e1fcf..39334c7 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/projects/mixedcd/k3bmixedjob.cpp b/libk3b/projects/mixedcd/k3bmixedjob.cpp index bcbe019..885aa92 100644 --- a/libk3b/projects/mixedcd/k3bmixedjob.cpp +++ b/libk3b/projects/mixedcd/k3bmixedjob.cpp @@ -50,8 +50,8 @@ #include #include #include -#include -#include +#include +#include #include diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index 06b1d31..69c296a 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp index 3ff3997..f4c9f2d 100644 --- a/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp +++ b/libk3b/projects/movixcd/k3bmovixdocpreparer.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp index 1672043..e366bac 100644 --- a/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp +++ b/libk3b/projects/movixdvd/k3bmovixdvddoc.cpp @@ -16,7 +16,7 @@ #include "k3bmovixdvddoc.h" #include "k3bmovixdvdjob.h" -#include +#include K3bMovixDvdDoc::K3bMovixDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index d28e942..2c5da16 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -28,10 +28,10 @@ #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 7b2d4ff..e4ea8ee 100644 --- a/libk3b/projects/videocd/k3bvcdjob.cpp +++ b/libk3b/projects/videocd/k3bvcdjob.cpp @@ -14,11 +14,11 @@ */ #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index f963be8..e19e622 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -15,7 +15,7 @@ // Kde Includes #include -#include +#include #include #include #include diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index 59d6387..0f458b6 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -14,7 +14,7 @@ */ #include -#include +#include #include #include diff --git a/libk3b/projects/videocd/k3bvcdtrack.h b/libk3b/projects/videocd/k3bvcdtrack.h index f36eb8c..f529275 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.h +++ b/libk3b/projects/videocd/k3bvcdtrack.h @@ -23,7 +23,7 @@ #include // Kde Includes -#include +#include // K3b Includes #include "mpeginfo/k3bmpeginfo.h" diff --git a/libk3b/projects/videodvd/k3bvideodvddoc.cpp b/libk3b/projects/videodvd/k3bvideodvddoc.cpp index 7ea3666..49f2479 100644 --- a/libk3b/projects/videodvd/k3bvideodvddoc.cpp +++ b/libk3b/projects/videodvd/k3bvideodvddoc.cpp @@ -21,7 +21,7 @@ #include -#include +#include K3bVideoDvdDoc::K3bVideoDvdDoc( TQObject* parent ) diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index e261c77..2144a4c 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include diff --git a/libk3b/tools/k3bdirsizejob.h b/libk3b/tools/k3bdirsizejob.h index 2acce4b..b33ce5b 100644 --- a/libk3b/tools/k3bdirsizejob.h +++ b/libk3b/tools/k3bdirsizejob.h @@ -17,7 +17,7 @@ #define _K3B_DIR_SIZE_JOB_H_ #include -#include +#include #include diff --git a/libk3b/tools/k3bfilesplitter.h b/libk3b/tools/k3bfilesplitter.h index 06cef32..7aaf25e 100644 --- a/libk3b/tools/k3bfilesplitter.h +++ b/libk3b/tools/k3bfilesplitter.h @@ -19,7 +19,7 @@ #include #include -#include +#include #include diff --git a/libk3b/tools/k3bmd5job.cpp b/libk3b/tools/k3bmd5job.cpp index 1d3d04c..394f94d 100644 --- a/libk3b/tools/k3bmd5job.cpp +++ b/libk3b/tools/k3bmd5job.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include -- cgit v1.2.1