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 /kcontrol/locale | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/locale')
| -rw-r--r-- | kcontrol/locale/klocalesample.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/locale/localeother.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/locale/toplevel.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kcontrol/locale/klocalesample.cpp b/kcontrol/locale/klocalesample.cpp index 91c978a6d..9903965e8 100644 --- a/kcontrol/locale/klocalesample.cpp +++ b/kcontrol/locale/klocalesample.cpp @@ -31,7 +31,7 @@ #include <stdio.h> -#include <klocale.h> +#include <tdelocale.h> #include "klocalesample.h" #include "klocalesample.moc" diff --git a/kcontrol/locale/localeother.cpp b/kcontrol/locale/localeother.cpp index 66b95e50c..6cb8e9a8d 100644 --- a/kcontrol/locale/localeother.cpp +++ b/kcontrol/locale/localeother.cpp @@ -27,7 +27,7 @@ #include <tqprinter.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/locale/toplevel.cpp b/kcontrol/locale/toplevel.cpp index e74330c30..a7a85e72f 100644 --- a/kcontrol/locale/toplevel.cpp +++ b/kcontrol/locale/toplevel.cpp @@ -32,7 +32,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kservice.h> |