diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:52:05 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:52:05 -0600 |
| commit | d796716f1dc9dd0b198863d974a03bf356f636e6 (patch) | |
| tree | 1bab87345ab25163397b8033b7e1910360bd94fb /libk3b/core | |
| 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 'libk3b/core')
| -rw-r--r-- | libk3b/core/k3bcore.cpp | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bexternalbinmanager.cpp | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bglobals.cpp | 6 | ||||
| -rw-r--r-- | libk3b/core/k3bglobals.h | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bglobalsettings.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index 4af572f..dde6c95 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -32,7 +32,7 @@ #include <k3bpluginmanager.h> #include <klocale.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kaboutdata.h> #include <kstandarddirs.h> #include <kapplication.h> diff --git a/libk3b/core/k3bexternalbinmanager.cpp b/libk3b/core/k3bexternalbinmanager.cpp index 83ec1b6..902025d 100644 --- a/libk3b/core/k3bexternalbinmanager.cpp +++ b/libk3b/core/k3bexternalbinmanager.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <kprocess.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tdeversion.h> #include <tqstring.h> diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index 42ccebc..6001072 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -29,11 +29,11 @@ #include <kglobal.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kapplication.h> #include <kdebug.h> -#include <kio/job.h> -#include <kio/netaccess.h> +#include <tdeio/job.h> +#include <tdeio/netaccess.h> #include <kurl.h> #include <dcopref.h> #include <kprocess.h> diff --git a/libk3b/core/k3bglobals.h b/libk3b/core/k3bglobals.h index 0964258..1a31696 100644 --- a/libk3b/core/k3bglobals.h +++ b/libk3b/core/k3bglobals.h @@ -23,7 +23,7 @@ #include <tqstring.h> #include <tqfile.h> -#include <kio/global.h> +#include <tdeio/global.h> #include <kurl.h> #include <k3bdevicetypes.h> #include "k3b_export.h" diff --git a/libk3b/core/k3bglobalsettings.cpp b/libk3b/core/k3bglobalsettings.cpp index 1301b8b..b4b4c20 100644 --- a/libk3b/core/k3bglobalsettings.cpp +++ b/libk3b/core/k3bglobalsettings.cpp @@ -15,7 +15,7 @@ #include "k3bglobalsettings.h" -#include <kconfig.h> +#include <tdeconfig.h> K3bGlobalSettings::K3bGlobalSettings() |