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/icons | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/icons')
| -rw-r--r-- | kcontrol/icons/icons.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/icons/iconthemes.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kcontrol/icons/icons.cpp b/kcontrol/icons/icons.cpp index f98aa270f..56df77a51 100644 --- a/kcontrol/icons/icons.cpp +++ b/kcontrol/icons/icons.cpp @@ -25,9 +25,9 @@ #include <kiconeffect.h> #include <kiconloader.h> #include <kipc.h> -#include <klocale.h> +#include <tdelocale.h> #include <kseparator.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <dcopclient.h> #include "icons.h" diff --git a/kcontrol/icons/iconthemes.cpp b/kcontrol/icons/iconthemes.cpp index 078224dc2..fe0a59ee7 100644 --- a/kcontrol/icons/iconthemes.cpp +++ b/kcontrol/icons/iconthemes.cpp @@ -30,14 +30,14 @@ #include <tdeapplication.h> #include <kstandarddirs.h> #include <kservice.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> #undef Unsorted #include <kipc.h> #include <tdelistview.h> #include <kurlrequesterdlg.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprogress.h> #include <kiconloader.h> |