diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:55:37 -0600 |
| commit | 77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch) | |
| tree | a1cce95474892add7cb970b8e9fbdb16e12bc2d7 /tdeinit | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeinit')
| -rw-r--r-- | tdeinit/displayconfig.cpp | 2 | ||||
| -rw-r--r-- | tdeinit/phase1.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tdeinit/displayconfig.cpp b/tdeinit/displayconfig.cpp index bc19cbd8a..db0ae5b9b 100644 --- a/tdeinit/displayconfig.cpp +++ b/tdeinit/displayconfig.cpp @@ -27,7 +27,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> diff --git a/tdeinit/phase1.cpp b/tdeinit/phase1.cpp index 14767248f..054df8838 100644 --- a/tdeinit/phase1.cpp +++ b/tdeinit/phase1.cpp @@ -27,7 +27,7 @@ #include <tdeaboutdata.h> #include <tdecmdlineargs.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <tdeconfig.h> |