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 /libk3bdevice | |
| parent | e8585949197fd7b5423328b0aeb8cceffa18f0db (diff) | |
| download | k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.tar.gz k3b-281d226f744d70a826a3bffff1ee964ef5915d4f.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libk3bdevice')
| -rw-r--r-- | libk3bdevice/k3bdeviceglobals.cpp | 2 | ||||
| -rw-r--r-- | libk3bdevice/k3bdevicemanager.cpp | 2 | ||||
| -rw-r--r-- | libk3bdevice/k3bdiskinfo.cpp | 2 | ||||
| -rw-r--r-- | libk3bdevice/k3bhalconnection.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp index 4d36916..f334724 100644 --- a/libk3bdevice/k3bdeviceglobals.cpp +++ b/libk3bdevice/k3bdeviceglobals.cpp @@ -17,7 +17,7 @@ #include "k3bdiskinfo.h" #include "k3bdevice.h" -#include <klocale.h> +#include <tdelocale.h> #include <k3bdebug.h> #include <tqstringlist.h> diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp index ab31a89..3677f67 100644 --- a/libk3bdevice/k3bdevicemanager.cpp +++ b/libk3bdevice/k3bdevicemanager.cpp @@ -32,7 +32,7 @@ #include <kprocess.h> #include <tdeapplication.h> #include <tdeconfig.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <iostream> #include <limits.h> diff --git a/libk3bdevice/k3bdiskinfo.cpp b/libk3bdevice/k3bdiskinfo.cpp index 0709d28..0a67c6e 100644 --- a/libk3bdevice/k3bdiskinfo.cpp +++ b/libk3bdevice/k3bdiskinfo.cpp @@ -18,7 +18,7 @@ #include <k3bmsf.h> -#include <klocale.h> +#include <tdelocale.h> #include <k3bdebug.h> #include <tdeio/global.h> diff --git a/libk3bdevice/k3bhalconnection.cpp b/libk3bdevice/k3bhalconnection.cpp index dbb19a3..ca12457 100644 --- a/libk3bdevice/k3bhalconnection.cpp +++ b/libk3bdevice/k3bhalconnection.cpp @@ -17,7 +17,7 @@ #include "k3bdevice.h" #include <k3bdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> |