diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:57:54 -0600 |
| commit | ed99a30644c19b0a3cf0d2147243532df4daa16b (patch) | |
| tree | 7f3f2850e59824fdf100a642367a82b1e7f0204f /tdeioslave/file/file.cc | |
| parent | e5f2d46e9caf6942f365f1b454087dda71a340f7 (diff) | |
| download | tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.tar.gz tdelibs-ed99a30644c19b0a3cf0d2147243532df4daa16b.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeioslave/file/file.cc')
| -rw-r--r-- | tdeioslave/file/file.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cc index 477db8754..1caeaef3e 100644 --- a/tdeioslave/file/file.cc +++ b/tdeioslave/file/file.cc @@ -75,8 +75,8 @@ #include <kurl.h> #include <kinstance.h> #include <ksimpleconfig.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqstrlist.h> #include "file.h" @@ -93,7 +93,7 @@ #include <kstandarddirs.h> #include <tdeio/ioslave_defaults.h> #include <klargefile.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kmimetype.h> using namespace TDEIO; |