diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kcontrol/tdefontinst/lib | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/tdefontinst/lib')
| -rw-r--r-- | kcontrol/tdefontinst/lib/FcEngine.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/tdefontinst/lib/KfiConstants.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kcontrol/tdefontinst/lib/FcEngine.cpp b/kcontrol/tdefontinst/lib/FcEngine.cpp index 8ac8f4fb4..ab89689d9 100644 --- a/kcontrol/tdefontinst/lib/FcEngine.cpp +++ b/kcontrol/tdefontinst/lib/FcEngine.cpp @@ -5,7 +5,7 @@ #include <tqtextstream.h> #include <kurl.h> #include <tdeconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <tdeio/netaccess.h> #include <math.h> #include "FcEngine.h" diff --git a/kcontrol/tdefontinst/lib/KfiConstants.h b/kcontrol/tdefontinst/lib/KfiConstants.h index d7f5ef03f..5e8633539 100644 --- a/kcontrol/tdefontinst/lib/KfiConstants.h +++ b/kcontrol/tdefontinst/lib/KfiConstants.h @@ -1,7 +1,7 @@ #ifndef __KFI_CONSTANTS_H__ #define __KFI_CONSTANTS_H__ -#include <klocale.h> +#include <tdelocale.h> #define KFI_CATALOGUE "tdefontinst" |