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 /libk3b/core | |
| parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
| download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libk3b/core')
| -rw-r--r-- | libk3b/core/k3bcore.cpp | 2 | ||||
| -rw-r--r-- | libk3b/core/k3bglobals.cpp | 4 | ||||
| -rw-r--r-- | libk3b/core/k3bjob.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libk3b/core/k3bcore.cpp b/libk3b/core/k3bcore.cpp index 40b4cbf..898b526 100644 --- a/libk3b/core/k3bcore.cpp +++ b/libk3b/core/k3bcore.cpp @@ -31,7 +31,7 @@ #include <k3bglobalsettings.h> #include <k3bpluginmanager.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <kstandarddirs.h> diff --git a/libk3b/core/k3bglobals.cpp b/libk3b/core/k3bglobals.cpp index f1ac8f5..e072571 100644 --- a/libk3b/core/k3bglobals.cpp +++ b/libk3b/core/k3bglobals.cpp @@ -26,8 +26,8 @@ #include <k3bhalconnection.h> #include <tdeversion.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/libk3b/core/k3bjob.cpp b/libk3b/core/k3bjob.cpp index 02697d6..0e169b1 100644 --- a/libk3b/core/k3bjob.cpp +++ b/libk3b/core/k3bjob.cpp @@ -18,7 +18,7 @@ #include <k3bglobals.h> #include <k3bcore.h> -#include <klocale.h> +#include <tdelocale.h> #include <kprocess.h> #include <tqstringlist.h> |