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/option | |
| 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/option')
| -rw-r--r-- | src/option/k3bburningoptiontab.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bcddboptiontab.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bdeviceoptiontab.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bdevicewidget.cpp | 4 | ||||
| -rw-r--r-- | src/option/k3bmiscoptiontab.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3boptiondialog.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bpluginoptiontab.cpp | 2 | ||||
| -rw-r--r-- | src/option/k3bthemeoptiontab.cpp | 8 |
8 files changed, 12 insertions, 12 deletions
diff --git a/src/option/k3bburningoptiontab.cpp b/src/option/k3bburningoptiontab.cpp index 97a5aaf..02d680c 100644 --- a/src/option/k3bburningoptiontab.cpp +++ b/src/option/k3bburningoptiontab.cpp @@ -33,7 +33,7 @@ #include <tqwhatsthis.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <klocale.h> #include <klineedit.h> diff --git a/src/option/k3bcddboptiontab.cpp b/src/option/k3bcddboptiontab.cpp index 1db1ba2..b0d845e 100644 --- a/src/option/k3bcddboptiontab.cpp +++ b/src/option/k3bcddboptiontab.cpp @@ -36,7 +36,7 @@ #include <klineedit.h> #include <klocale.h> #include <knuminput.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <tdeversion.h> diff --git a/src/option/k3bdeviceoptiontab.cpp b/src/option/k3bdeviceoptiontab.cpp index 1218c60..0b5784e 100644 --- a/src/option/k3bdeviceoptiontab.cpp +++ b/src/option/k3bdeviceoptiontab.cpp @@ -28,7 +28,7 @@ #include <kapplication.h> #include <kdialog.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/src/option/k3bdevicewidget.cpp b/src/option/k3bdevicewidget.cpp index bcc890d..acaf3f2 100644 --- a/src/option/k3bdevicewidget.cpp +++ b/src/option/k3bdevicewidget.cpp @@ -25,11 +25,11 @@ #include <knuminput.h> #include <kdialog.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <ksimpleconfig.h> #include <kiconloader.h> #include <kstandarddirs.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <tqgroupbox.h> #include <tqpushbutton.h> diff --git a/src/option/k3bmiscoptiontab.cpp b/src/option/k3bmiscoptiontab.cpp index 884291f..1da6f17 100644 --- a/src/option/k3bmiscoptiontab.cpp +++ b/src/option/k3bmiscoptiontab.cpp @@ -30,7 +30,7 @@ #include <kapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialog.h> #include <kstandarddirs.h> #include <kmessagebox.h> diff --git a/src/option/k3boptiondialog.cpp b/src/option/k3boptiondialog.cpp index d222134..d6f2df3 100644 --- a/src/option/k3boptiondialog.cpp +++ b/src/option/k3boptiondialog.cpp @@ -33,7 +33,7 @@ #include <klocale.h> #include <kiconloader.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include "k3bnotifyoptiontab.h" diff --git a/src/option/k3bpluginoptiontab.cpp b/src/option/k3bpluginoptiontab.cpp index 37a66c8..6a7e4ec 100644 --- a/src/option/k3bpluginoptiontab.cpp +++ b/src/option/k3bpluginoptiontab.cpp @@ -26,7 +26,7 @@ #include <kmessagebox.h> #include <kdebug.h> #include <kdialogbase.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kglobalsettings.h> #include <tdeversion.h> diff --git a/src/option/k3bthemeoptiontab.cpp b/src/option/k3bthemeoptiontab.cpp index ebb92be..edf3f64 100644 --- a/src/option/k3bthemeoptiontab.cpp +++ b/src/option/k3bthemeoptiontab.cpp @@ -20,13 +20,13 @@ #include <k3bapplication.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kmessagebox.h> #include <kurlrequester.h> #include <klistview.h> -#include <kio/global.h> -#include <kio/netaccess.h> -#include <kio/job.h> +#include <tdeio/global.h> +#include <tdeio/netaccess.h> +#include <tdeio/job.h> #include <kstandarddirs.h> #include <ktar.h> #include <kurlrequesterdlg.h> |