From e8585949197fd7b5423328b0aeb8cceffa18f0db Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 14 Feb 2013 17:04:05 -0600 Subject: Rename common header files for consistency with class renaming --- k3bsetup/k3bsetup2.h | 2 +- libk3b/cddb/k3bcddblocalquery.cpp | 2 +- libk3b/cddb/k3bcddbquery.cpp | 4 ++-- libk3b/core/k3bcore.cpp | 4 ++-- libk3b/core/k3bglobals.cpp | 2 +- libk3b/core/k3bthreadjob.cpp | 2 +- libk3b/plugin/k3baudioserver.cpp | 2 +- libk3b/projects/audiocd/k3baudiodoc.cpp | 2 +- libk3b/projects/datacd/k3bdatadoc.cpp | 2 +- libk3b/projects/datacd/k3bdatajob.cpp | 2 +- libk3b/projects/datadvd/k3bdvdjob.cpp | 2 +- libk3b/projects/mixedcd/k3bmixeddoc.cpp | 2 +- libk3b/projects/movixcd/k3bmovixdoc.cpp | 2 +- libk3b/projects/videocd/k3bvcddoc.cpp | 2 +- libk3b/projects/videocd/k3bvcdoptions.cpp | 2 +- libk3b/projects/videocd/k3bvcdtrack.cpp | 2 +- libk3b/projects/videodvd/k3bvideodvdjob.cpp | 2 +- libk3b/tools/k3bmultichoicedialog.cpp | 2 +- libk3b/tools/k3bpushbutton.cpp | 2 +- libk3b/tools/k3btoolbutton.cpp | 2 +- libk3bdevice/k3bdevicemanager.cpp | 2 +- src/k3b.cpp | 2 +- src/k3b.h | 2 +- src/k3bapplication.cpp | 4 ++-- src/k3bdebuggingoutputdialog.cpp | 2 +- src/k3bdebuggingoutputfile.cpp | 2 +- src/k3bfiletreeview.cpp | 2 +- src/k3bjobprogressdialog.cpp | 2 +- src/k3bmediacache.cpp | 2 +- src/k3bmixedprojectinterface.cpp | 2 +- src/k3bpassivepopup.cpp | 2 +- src/k3bsplash.cpp | 4 ++-- src/k3bstatusbarmanager.cpp | 2 +- src/k3bsystemproblemdialog.cpp | 2 +- src/k3bwelcomewidget.cpp | 4 ++-- src/main.cpp | 4 ++-- src/misc/k3bcdcopydialog.cpp | 2 +- src/misc/k3bcdimagewritingdialog.cpp | 2 +- src/misc/k3bdvdcopydialog.cpp | 2 +- src/misc/k3bdvdformattingdialog.cpp | 2 +- src/misc/k3bisoimagewritingdialog.cpp | 2 +- src/option/k3bcddboptiontab.cpp | 2 +- src/option/k3bdeviceoptiontab.cpp | 2 +- src/option/k3bmiscoptiontab.cpp | 2 +- src/projects/k3baudiotrackview.cpp | 2 +- src/projects/k3baudioview.cpp | 2 +- src/projects/k3bdataview.cpp | 2 +- src/projects/k3bmixedburndialog.cpp | 2 +- src/projects/k3bmovixburndialog.cpp | 2 +- src/projects/k3bmovixdvdburndialog.cpp | 2 +- src/projects/k3bprojectburndialog.cpp | 2 +- src/projects/k3bvcdburndialog.cpp | 2 +- src/projects/k3bvcdview.cpp | 2 +- src/rip/k3baudiorippingdialog.cpp | 2 +- src/rip/k3bvideocdrippingdialog.cpp | 2 +- src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp | 2 +- src/rip/videodvd/k3bvideodvdrippingview.cpp | 2 +- 57 files changed, 63 insertions(+), 63 deletions(-) diff --git a/k3bsetup/k3bsetup2.h b/k3bsetup/k3bsetup2.h index 7b09b2b..bff71f0 100644 --- a/k3bsetup/k3bsetup2.h +++ b/k3bsetup/k3bsetup2.h @@ -18,7 +18,7 @@ #define _K3BSETUP2_H_ #include -#include +#include class base_K3bSetup2; diff --git a/libk3b/cddb/k3bcddblocalquery.cpp b/libk3b/cddb/k3bcddblocalquery.cpp index 21ad685..2f719c7 100644 --- a/libk3b/cddb/k3bcddblocalquery.cpp +++ b/libk3b/cddb/k3bcddblocalquery.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/cddb/k3bcddbquery.cpp b/libk3b/cddb/k3bcddbquery.cpp index ab6cb7f..e8ace1d 100644 --- a/libk3b/cddb/k3bcddbquery.cpp +++ b/libk3b/cddb/k3bcddbquery.cpp @@ -20,8 +20,8 @@ #include "k3bcddbresult.h" #include -#include -#include +#include +#include #include diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index dde6c95..40b4cbf 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -33,9 +33,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 47ec9ca..f1ac8f5 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/libk3b/core/k3bthreadjob.cpp b/libk3b/core/k3bthreadjob.cpp index 634aa91..67981c0 100644 --- a/libk3b/core/k3bthreadjob.cpp +++ b/libk3b/core/k3bthreadjob.cpp @@ -19,7 +19,7 @@ #include "k3bdataevent.h" #include -#include +#include diff --git a/libk3b/plugin/k3baudioserver.cpp b/libk3b/plugin/k3baudioserver.cpp index 4bda25b..353a3f1 100644 --- a/libk3b/plugin/k3baudioserver.cpp +++ b/libk3b/plugin/k3baudioserver.cpp @@ -22,7 +22,7 @@ #include "k3baudiooutputplugin.h" #include -#include +#include #include #include diff --git a/libk3b/projects/audiocd/k3baudiodoc.cpp b/libk3b/projects/audiocd/k3baudiodoc.cpp index 37fb7a8..56293f1 100644 --- a/libk3b/projects/audiocd/k3baudiodoc.cpp +++ b/libk3b/projects/audiocd/k3baudiodoc.cpp @@ -43,7 +43,7 @@ // KDE-includes #include #include -#include +#include #include #include #include diff --git a/libk3b/projects/datacd/k3bdatadoc.cpp b/libk3b/projects/datacd/k3bdatadoc.cpp index 8f0fee9..c0d1aa6 100644 --- a/libk3b/projects/datacd/k3bdatadoc.cpp +++ b/libk3b/projects/datacd/k3bdatadoc.cpp @@ -53,7 +53,7 @@ #include #include #include -#include +#include #include diff --git a/libk3b/projects/datacd/k3bdatajob.cpp b/libk3b/projects/datacd/k3bdatajob.cpp index c13cf75..d3f6049 100644 --- a/libk3b/projects/datacd/k3bdatajob.cpp +++ b/libk3b/projects/datacd/k3bdatajob.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/libk3b/projects/datadvd/k3bdvdjob.cpp b/libk3b/projects/datadvd/k3bdvdjob.cpp index 7e5a19d..e39cf84 100644 --- a/libk3b/projects/datadvd/k3bdvdjob.cpp +++ b/libk3b/projects/datadvd/k3bdvdjob.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include class K3bDvdJob::Private diff --git a/libk3b/projects/mixedcd/k3bmixeddoc.cpp b/libk3b/projects/mixedcd/k3bmixeddoc.cpp index 39334c7..b5d4451 100644 --- a/libk3b/projects/mixedcd/k3bmixeddoc.cpp +++ b/libk3b/projects/mixedcd/k3bmixeddoc.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include diff --git a/libk3b/projects/movixcd/k3bmovixdoc.cpp b/libk3b/projects/movixcd/k3bmovixdoc.cpp index 69c296a..7914b11 100644 --- a/libk3b/projects/movixcd/k3bmovixdoc.cpp +++ b/libk3b/projects/movixcd/k3bmovixdoc.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/libk3b/projects/videocd/k3bvcddoc.cpp b/libk3b/projects/videocd/k3bvcddoc.cpp index 2c5da16..e052a6c 100644 --- a/libk3b/projects/videocd/k3bvcddoc.cpp +++ b/libk3b/projects/videocd/k3bvcddoc.cpp @@ -26,7 +26,7 @@ // KDE-includes #include #include -#include +#include #include #include #include diff --git a/libk3b/projects/videocd/k3bvcdoptions.cpp b/libk3b/projects/videocd/k3bvcdoptions.cpp index e19e622..0beaaa7 100644 --- a/libk3b/projects/videocd/k3bvcdoptions.cpp +++ b/libk3b/projects/videocd/k3bvcdoptions.cpp @@ -14,7 +14,7 @@ */ // Kde Includes -#include +#include #include #include #include diff --git a/libk3b/projects/videocd/k3bvcdtrack.cpp b/libk3b/projects/videocd/k3bvcdtrack.cpp index 0f458b6..b736af1 100644 --- a/libk3b/projects/videocd/k3bvcdtrack.cpp +++ b/libk3b/projects/videocd/k3bvcdtrack.cpp @@ -13,7 +13,7 @@ * See the file "COPYING" for the exact licensing terms. */ -#include +#include #include #include diff --git a/libk3b/projects/videodvd/k3bvideodvdjob.cpp b/libk3b/projects/videodvd/k3bvideodvdjob.cpp index 2144a4c..42082d1 100644 --- a/libk3b/projects/videodvd/k3bvideodvdjob.cpp +++ b/libk3b/projects/videodvd/k3bvideodvdjob.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/libk3b/tools/k3bmultichoicedialog.cpp b/libk3b/tools/k3bmultichoicedialog.cpp index 5a1a175..9c7dcc5 100644 --- a/libk3b/tools/k3bmultichoicedialog.cpp +++ b/libk3b/tools/k3bmultichoicedialog.cpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/libk3b/tools/k3bpushbutton.cpp b/libk3b/tools/k3bpushbutton.cpp index 7a01caf..a80374d 100644 --- a/libk3b/tools/k3bpushbutton.cpp +++ b/libk3b/tools/k3bpushbutton.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include diff --git a/libk3b/tools/k3btoolbutton.cpp b/libk3b/tools/k3btoolbutton.cpp index cd931fc..f9b72ff 100644 --- a/libk3b/tools/k3btoolbutton.cpp +++ b/libk3b/tools/k3btoolbutton.cpp @@ -20,7 +20,7 @@ #include #include -#include +#include class K3bToolButton::Private diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp index dc94c9b..ab31a89 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/src/k3b.cpp b/src/k3b.cpp index 8b8ddd2..15c0a78 100644 --- a/src/k3b.cpp +++ b/src/k3b.cpp @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k3b.h b/src/k3b.h index 4b57559..6347268 100644 --- a/src/k3b.h +++ b/src/k3b.h @@ -29,7 +29,7 @@ #include // include files for KDE -#include +#include #include #include #include diff --git a/src/k3bapplication.cpp b/src/k3bapplication.cpp index 1055961..57749e5 100644 --- a/src/k3bapplication.cpp +++ b/src/k3bapplication.cpp @@ -47,8 +47,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/k3bdebuggingoutputdialog.cpp b/src/k3bdebuggingoutputdialog.cpp index 86e4d20..6b34e3b 100644 --- a/src/k3bdebuggingoutputdialog.cpp +++ b/src/k3bdebuggingoutputdialog.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/k3bdebuggingoutputfile.cpp b/src/k3bdebuggingoutputfile.cpp index 81df765..1af8b41 100644 --- a/src/k3bdebuggingoutputfile.cpp +++ b/src/k3bdebuggingoutputfile.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/src/k3bfiletreeview.cpp b/src/k3bfiletreeview.cpp index 8d32675..7e523da 100644 --- a/src/k3bfiletreeview.cpp +++ b/src/k3bfiletreeview.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/k3bjobprogressdialog.cpp b/src/k3bjobprogressdialog.cpp index 25551e5..84770bd 100644 --- a/src/k3bjobprogressdialog.cpp +++ b/src/k3bjobprogressdialog.cpp @@ -62,7 +62,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k3bmediacache.cpp b/src/k3bmediacache.cpp index 270f7c0..ae9d06c 100644 --- a/src/k3bmediacache.cpp +++ b/src/k3bmediacache.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/k3bmixedprojectinterface.cpp b/src/k3bmixedprojectinterface.cpp index 3b5004e..a49b61a 100644 --- a/src/k3bmixedprojectinterface.cpp +++ b/src/k3bmixedprojectinterface.cpp @@ -17,7 +17,7 @@ #include "k3bdataprojectinterface.h" #include "k3baudioprojectinterface.h" -#include +#include #include #include diff --git a/src/k3bpassivepopup.cpp b/src/k3bpassivepopup.cpp index a6329b1..8e669c0 100644 --- a/src/k3bpassivepopup.cpp +++ b/src/k3bpassivepopup.cpp @@ -21,7 +21,7 @@ #include "k3bthememanager.h" #include -#include +#include #include #include #include diff --git a/src/k3bsplash.cpp b/src/k3bsplash.cpp index bfe7b15..e90e3b9 100644 --- a/src/k3bsplash.cpp +++ b/src/k3bsplash.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include K3bSplash::K3bSplash( TQWidget* parent, const char* name ) diff --git a/src/k3bstatusbarmanager.cpp b/src/k3bstatusbarmanager.cpp index d3037bc..c84ab73 100644 --- a/src/k3bstatusbarmanager.cpp +++ b/src/k3bstatusbarmanager.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/k3bsystemproblemdialog.cpp b/src/k3bsystemproblemdialog.cpp index 43c6d1c..9375190 100644 --- a/src/k3bsystemproblemdialog.cpp +++ b/src/k3bsystemproblemdialog.cpp @@ -44,7 +44,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/k3bwelcomewidget.cpp b/src/k3bwelcomewidget.cpp index 8af0ec6..4f72e63 100644 --- a/src/k3bwelcomewidget.cpp +++ b/src/k3bwelcomewidget.cpp @@ -36,13 +36,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include diff --git a/src/main.cpp b/src/main.cpp index 3c03095..dfb9037 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,8 +14,8 @@ */ -#include -#include +#include +#include #include #include #include diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index 85b7d7c..dd8bec2 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 8770004..60e55c0 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index 92a3782..a7de882 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 4f6d5ee..329e6bb 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 63f552b..d4481d9 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 16a838d..fa8f73d 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index 0b5784e..6bbb4b0 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index af8e141..49c1f6c 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/projects/k3baudiotrackview.cpp b/src/projects/k3baudiotrackview.cpp index f59ec9e..b24c5f3 100644 --- a/src/projects/k3baudiotrackview.cpp +++ b/src/projects/k3baudiotrackview.cpp @@ -56,7 +56,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/projects/k3baudioview.cpp b/src/projects/k3baudioview.cpp index bddd065..de903e3 100644 --- a/src/projects/k3baudioview.cpp +++ b/src/projects/k3baudioview.cpp @@ -43,7 +43,7 @@ // KDE-includes #include -#include +#include #include #include diff --git a/src/projects/k3bdataview.cpp b/src/projects/k3bdataview.cpp index 474d799..63584f2 100644 --- a/src/projects/k3bdataview.cpp +++ b/src/projects/k3bdataview.cpp @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/projects/k3bmixedburndialog.cpp b/src/projects/k3bmixedburndialog.cpp index 3e4353b..b956e67 100644 --- a/src/projects/k3bmixedburndialog.cpp +++ b/src/projects/k3bmixedburndialog.cpp @@ -54,7 +54,7 @@ #include #include -#include +#include #include #include diff --git a/src/projects/k3bmovixburndialog.cpp b/src/projects/k3bmovixburndialog.cpp index 86a80d7..189ee4f 100644 --- a/src/projects/k3bmovixburndialog.cpp +++ b/src/projects/k3bmovixburndialog.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/projects/k3bmovixdvdburndialog.cpp b/src/projects/k3bmovixdvdburndialog.cpp index 6b6b706..0dddd81 100644 --- a/src/projects/k3bmovixdvdburndialog.cpp +++ b/src/projects/k3bmovixdvdburndialog.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/src/projects/k3bprojectburndialog.cpp b/src/projects/k3bprojectburndialog.cpp index 8c17340..52a9707 100644 --- a/src/projects/k3bprojectburndialog.cpp +++ b/src/projects/k3bprojectburndialog.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include diff --git a/src/projects/k3bvcdburndialog.cpp b/src/projects/k3bvcdburndialog.cpp index 1dd97f0..fa5a262 100644 --- a/src/projects/k3bvcdburndialog.cpp +++ b/src/projects/k3bvcdburndialog.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include "k3bvcdburndialog.h" #include "k3bvcddoc.h" diff --git a/src/projects/k3bvcdview.cpp b/src/projects/k3bvcdview.cpp index 2a42495..5c8a2ed 100644 --- a/src/projects/k3bvcdview.cpp +++ b/src/projects/k3bvcdview.cpp @@ -20,7 +20,7 @@ // KDE-includes #include -#include +#include #include #include diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index 20fbe15..bdac4f6 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index 5b6be84..8c6aac4 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -16,7 +16,7 @@ // kde include #include -#include +#include #include #include #include diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index e0ac27e..8caa60a 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include static TQString audioStreamString( const K3bVideoDVD::Title& title, unsigned int maxLines = 9999, bool includeExtInfo = true ) diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index cce8f09..873fd9f 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include -- cgit v1.2.1