diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:44:58 -0600 |
| commit | 281d226f744d70a826a3bffff1ee964ef5915d4f (patch) | |
| tree | c42d5ae7840ea2a74f5f6c1b1a958569a8d2bf27 /src/rip/videodvd | |
| parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
| download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/rip/videodvd')
| -rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingdialog.cpp | 8 | ||||
| -rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingjob.cpp | 2 | ||||
| -rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp | 4 | ||||
| -rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingview.cpp | 4 | ||||
| -rw-r--r-- | src/rip/videodvd/k3bvideodvdrippingwidget.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp index f964a67..1025f30 100644 --- a/src/rip/videodvd/k3bvideodvdrippingdialog.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingdialog.cpp @@ -23,16 +23,16 @@ #include <k3bglobals.h> #include <k3bfilesysteminfo.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdelistview.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kurlrequester.h> #include <kcombobox.h> #include <klineedit.h> #include <tdeio/global.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlayout.h> #include <tqcheckbox.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingjob.cpp b/src/rip/videodvd/k3bvideodvdrippingjob.cpp index f17b6ff..b448fa0 100644 --- a/src/rip/videodvd/k3bvideodvdrippingjob.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingjob.cpp @@ -19,7 +19,7 @@ #include <k3bvideodvdtitledetectclippingjob.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> K3bVideoDVDRippingJob::TitleRipInfo::TitleRipInfo() diff --git a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp index 8caa60a..b0106a3 100644 --- a/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingtitlelistview.cpp @@ -31,8 +31,8 @@ #include <tqheader.h> #include <tqtooltip.h> -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <tdeapplication.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingview.cpp b/src/rip/videodvd/k3bvideodvdrippingview.cpp index 873fd9f..c524fa6 100644 --- a/src/rip/videodvd/k3bvideodvdrippingview.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingview.cpp @@ -31,8 +31,8 @@ #include <tqlabel.h> #include <tdeapplication.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeaction.h> #include <tdeconfig.h> diff --git a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp index 742a7f7..649ac7b 100644 --- a/src/rip/videodvd/k3bvideodvdrippingwidget.cpp +++ b/src/rip/videodvd/k3bvideodvdrippingwidget.cpp @@ -21,7 +21,7 @@ #include <k3bintmapcombobox.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <tdeio/global.h> #include <kurllabel.h> |