diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:05 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:52:05 -0600 |
commit | d796716f1dc9dd0b198863d974a03bf356f636e6 (patch) | |
tree | 1bab87345ab25163397b8033b7e1910360bd94fb /src/rip | |
parent | 6f156aae95c8ea00b34ffb59e237df2f00cf8256 (diff) | |
download | k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.tar.gz k3b-d796716f1dc9dd0b198863d974a03bf356f636e6.zip |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'src/rip')
-rw-r--r-- | src/rip/k3baudiocdview.cpp | 2 | ||||
-rw-r--r-- | src/rip/k3baudioconvertingoptionwidget.cpp | 4 | ||||
-rw-r--r-- | src/rip/k3baudioconvertingoptionwidget.h | 2 | ||||
-rw-r--r-- | src/rip/k3baudioprojectconvertingdialog.cpp | 6 | ||||
-rw-r--r-- | src/rip/k3baudiorippingdialog.cpp | 6 | ||||
-rw-r--r-- | src/rip/k3bcddbpatternwidget.cpp | 2 | ||||
-rw-r--r-- | src/rip/k3bvideocdinfo.cpp | 2 | ||||
-rw-r--r-- | src/rip/k3bvideocdrip.cpp | 4 | ||||
-rw-r--r-- | src/rip/k3bvideocdrippingdialog.cpp | 2 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingdialog.cpp | 4 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingview.cpp | 2 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingwidget.cpp | 2 | ||||
-rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingwidget.h | 2 |
13 files changed, 20 insertions, 20 deletions
diff --git a/src/rip/k3baudiocdview.cpp b/src/rip/k3baudiocdview.cpp index 66b4820..7cdf686 100644 --- a/src/rip/k3baudiocdview.cpp +++ b/src/rip/k3baudiocdview.cpp @@ -40,7 +40,7 @@ #include <kaction.h> #include <kstdaction.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klineedit.h> #include <kcombobox.h> #include <kstandarddirs.h> diff --git a/src/rip/k3baudioconvertingoptionwidget.cpp b/src/rip/k3baudioconvertingoptionwidget.cpp index 15fa9fd..34d1de7 100644 --- a/src/rip/k3baudioconvertingoptionwidget.cpp +++ b/src/rip/k3baudioconvertingoptionwidget.cpp @@ -22,8 +22,8 @@ #include <kcombobox.h> #include <kurlrequester.h> -#include <kio/global.h> -#include <kconfig.h> +#include <tdeio/global.h> +#include <tdeconfig.h> #include <klocale.h> #include <kiconloader.h> diff --git a/src/rip/k3baudioconvertingoptionwidget.h b/src/rip/k3baudioconvertingoptionwidget.h index 9352e3f..4c702aa 100644 --- a/src/rip/k3baudioconvertingoptionwidget.h +++ b/src/rip/k3baudioconvertingoptionwidget.h @@ -19,7 +19,7 @@ #include "base_k3baudiorippingoptionwidget.h" #include <tqcheckbox.h> -#include <kio/global.h> +#include <tdeio/global.h> class K3bAudioEncoder; class TDEConfigBase; diff --git a/src/rip/k3baudioprojectconvertingdialog.cpp b/src/rip/k3baudioprojectconvertingdialog.cpp index 03c7db3..43fe621 100644 --- a/src/rip/k3baudioprojectconvertingdialog.cpp +++ b/src/rip/k3baudioprojectconvertingdialog.cpp @@ -33,11 +33,11 @@ #include <kcombobox.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kurlrequester.h> -#include <kfiledialog.h> -#include <kio/global.h> +#include <tdefiledialog.h> +#include <tdeio/global.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/src/rip/k3baudiorippingdialog.cpp b/src/rip/k3baudiorippingdialog.cpp index 4298532..aace387 100644 --- a/src/rip/k3baudiorippingdialog.cpp +++ b/src/rip/k3baudiorippingdialog.cpp @@ -32,11 +32,11 @@ #include <kcombobox.h> #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klistview.h> #include <kurlrequester.h> -#include <kfiledialog.h> -#include <kio/global.h> +#include <tdefiledialog.h> +#include <tdeio/global.h> #include <kiconloader.h> #include <kstdguiitem.h> #include <kdebug.h> diff --git a/src/rip/k3bcddbpatternwidget.cpp b/src/rip/k3bcddbpatternwidget.cpp index ae1191f..e8b533a 100644 --- a/src/rip/k3bcddbpatternwidget.cpp +++ b/src/rip/k3bcddbpatternwidget.cpp @@ -15,7 +15,7 @@ #include "k3bcddbpatternwidget.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include <kcombobox.h> #include <klineedit.h> diff --git a/src/rip/k3bvideocdinfo.cpp b/src/rip/k3bvideocdinfo.cpp index af29a37..2dea3f7 100644 --- a/src/rip/k3bvideocdinfo.cpp +++ b/src/rip/k3bvideocdinfo.cpp @@ -22,7 +22,7 @@ #include <tqdom.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include "k3bvideocdinfo.h" diff --git a/src/rip/k3bvideocdrip.cpp b/src/rip/k3bvideocdrip.cpp index b987e96..b6c033d 100644 --- a/src/rip/k3bvideocdrip.cpp +++ b/src/rip/k3bvideocdrip.cpp @@ -13,9 +13,9 @@ * See the file "COPYING" for the exact licensing terms. */ -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <klocale.h> #include <kstandarddirs.h> #include <ktempfile.h> diff --git a/src/rip/k3bvideocdrippingdialog.cpp b/src/rip/k3bvideocdrippingdialog.cpp index eeec3d5..8fe85f5 100644 --- a/src/rip/k3bvideocdrippingdialog.cpp +++ b/src/rip/k3bvideocdrippingdialog.cpp @@ -17,7 +17,7 @@ // kde include #include <klocale.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kurlrequester.h> #include <kdebug.h> #include <kmessagebox.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index 4aa571e..b5deed5 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -30,8 +30,8 @@ #include <kurlrequester.h> #include <kcombobox.h> #include <klineedit.h> -#include <kio/global.h> -#include <kconfig.h> +#include <tdeio/global.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <tqlayout.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index 763cbe0..ca9e467 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -34,7 +34,7 @@ #include <kmessagebox.h> #include <klocale.h> #include <kaction.h> -#include <kconfig.h> +#include <tdeconfig.h> K3bVideoDVDRippingView::K3bVideoDVDRippingView( TQWidget* parent, const char * name ) diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 51b74a2..5a229bf 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -23,7 +23,7 @@ #include <klistview.h> #include <klocale.h> #include <kurlrequester.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kurllabel.h> #include <kdialogbase.h> #include <klineedit.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.h b/src/rip/videodvd/k3bvideodvdrippingwidget.h index 1642bbc..812a5d8 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.h +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.h @@ -23,7 +23,7 @@ #include <tqvaluevector.h> #include <tqmap.h> -#include <kio/global.h> +#include <tdeio/global.h> class TQTimer; |