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/misc | |
| 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/misc')
| -rw-r--r-- | src/misc/k3bblankingdialog.cpp | 2 | ||||
| -rw-r--r-- | src/misc/k3bcdcopydialog.cpp | 2 | ||||
| -rw-r--r-- | src/misc/k3bcdcopydialog.h | 2 | ||||
| -rw-r--r-- | src/misc/k3bcdimagewritingdialog.cpp | 6 | ||||
| -rw-r--r-- | src/misc/k3bdvdcopydialog.cpp | 2 | ||||
| -rw-r--r-- | src/misc/k3bdvdcopydialog.h | 2 | ||||
| -rw-r--r-- | src/misc/k3bdvdformattingdialog.cpp | 2 | ||||
| -rw-r--r-- | src/misc/k3bisoimagewritingdialog.cpp | 6 |
8 files changed, 12 insertions, 12 deletions
diff --git a/src/misc/k3bblankingdialog.cpp b/src/misc/k3bblankingdialog.cpp index b9dc2a9..79c32db 100644 --- a/src/misc/k3bblankingdialog.cpp +++ b/src/misc/k3bblankingdialog.cpp @@ -32,7 +32,7 @@ #include <kiconloader.h> #include <kguiitem.h> #include <kstdguiitem.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqgroupbox.h> #include <tqpushbutton.h> diff --git a/src/misc/k3bcdcopydialog.cpp b/src/misc/k3bcdcopydialog.cpp index 3245906..8e9dd36 100644 --- a/src/misc/k3bcdcopydialog.cpp +++ b/src/misc/k3bcdcopydialog.cpp @@ -40,7 +40,7 @@ #include <kstdguiitem.h> #include <kstandarddirs.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kiconloader.h> diff --git a/src/misc/k3bcdcopydialog.h b/src/misc/k3bcdcopydialog.h index 4b17fa8..898a1de 100644 --- a/src/misc/k3bcdcopydialog.h +++ b/src/misc/k3bcdcopydialog.h @@ -21,7 +21,7 @@ #include <k3binteractiondialog.h> -#include <kio/global.h> +#include <tdeio/global.h> namespace K3bDevice { class Device; diff --git a/src/misc/k3bcdimagewritingdialog.cpp b/src/misc/k3bcdimagewritingdialog.cpp index 5c73381..f134104 100644 --- a/src/misc/k3bcdimagewritingdialog.cpp +++ b/src/misc/k3bcdimagewritingdialog.cpp @@ -45,12 +45,12 @@ #include <klocale.h> #include <kmessagebox.h> #include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kconfig.h> -#include <kio/global.h> +#include <tdeconfig.h> +#include <tdeio/global.h> #include <kurl.h> #include <kinputdialog.h> #include <kurldrag.h> diff --git a/src/misc/k3bdvdcopydialog.cpp b/src/misc/k3bdvdcopydialog.cpp index 729c4c7..c80c1e3 100644 --- a/src/misc/k3bdvdcopydialog.cpp +++ b/src/misc/k3bdvdcopydialog.cpp @@ -46,7 +46,7 @@ #include <kdebug.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kstandarddirs.h> #include <kiconloader.h> diff --git a/src/misc/k3bdvdcopydialog.h b/src/misc/k3bdvdcopydialog.h index 390ee2e..aad39a3 100644 --- a/src/misc/k3bdvdcopydialog.h +++ b/src/misc/k3bdvdcopydialog.h @@ -19,7 +19,7 @@ #include <k3binteractiondialog.h> -#include <kio/global.h> +#include <tdeio/global.h> namespace K3bDevice { diff --git a/src/misc/k3bdvdformattingdialog.cpp b/src/misc/k3bdvdformattingdialog.cpp index 6524d05..4f6d5ee 100644 --- a/src/misc/k3bdvdformattingdialog.cpp +++ b/src/misc/k3bdvdformattingdialog.cpp @@ -26,7 +26,7 @@ #include <klocale.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <tqgroupbox.h> diff --git a/src/misc/k3bisoimagewritingdialog.cpp b/src/misc/k3bisoimagewritingdialog.cpp index 32461df..e3eb2fc 100644 --- a/src/misc/k3bisoimagewritingdialog.cpp +++ b/src/misc/k3bisoimagewritingdialog.cpp @@ -36,12 +36,12 @@ #include <klocale.h> #include <kmessagebox.h> #include <kurlrequester.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include <kstdguiitem.h> #include <kguiitem.h> #include <kiconloader.h> -#include <kconfig.h> -#include <kio/global.h> +#include <tdeconfig.h> +#include <tdeio/global.h> #include <kurl.h> #include <kinputdialog.h> #include <kurldrag.h> |