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/misc | |
| parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
| download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'src/misc')
| -rw-r--r-- | src/misc/k3bblankingdialog.cpp | 4 | ||||
| -rw-r--r-- | src/misc/k3bcdcopydialog.cpp | 4 | ||||
| -rw-r--r-- | src/misc/k3bcdimagewritingdialog.cpp | 4 | ||||
| -rw-r--r-- | src/misc/k3bdvdcopydialog.cpp | 6 | ||||
| -rw-r--r-- | src/misc/k3bdvdformattingdialog.cpp | 4 | ||||
| -rw-r--r-- | src/misc/k3bisoimagewritingdialog.cpp | 4 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index 49534f1..0594f1c 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -26,8 +26,8 @@ #include <k3bcore.h> #include <k3bemptydiscwaiter.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdelistview.h> #include <kiconloader.h> #include <kguiitem.h> diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index dd8bec2..ae35f47 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -36,10 +36,10 @@ #include <k3bmediacache.h> #include <kguiitem.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstdguiitem.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kiconloader.h> diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 60e55c0..6ea61c2 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -42,8 +42,8 @@ #include <k3bcdtext.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurlrequester.h> #include <tdefiledialog.h> #include <kstdguiitem.h> diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index a7de882..b9a1459 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -45,13 +45,13 @@ #include <tqhbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kstandarddirs.h> #include <kiconloader.h> -#include <kmessagebox.h> -#include <kglobal.h> +#include <tdemessagebox.h> +#include <tdeglobal.h> diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 329e6bb..d6fc2af 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -24,8 +24,8 @@ #include <k3bwritingmodewidget.h> #include <k3bjobprogressdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index d4481d9..915e300 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -33,8 +33,8 @@ #include <k3bmediacache.h> #include <tdeapplication.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurlrequester.h> #include <tdefiledialog.h> #include <kstdguiitem.h> |