diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:48:17 -0600 |
| commit | 63f984a752aa6a6a73e3af795b05a5a042833eff (patch) | |
| tree | 89b2d1529273ebe59f8c41800aa6c53ee4c29bb1 /chalk/ui/kis_palette_view.cc | |
| parent | 3b6870c6e1177574772803b5b09416903ee40fc0 (diff) | |
| download | koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.tar.gz koffice-63f984a752aa6a6a73e3af795b05a5a042833eff.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'chalk/ui/kis_palette_view.cc')
| -rw-r--r-- | chalk/ui/kis_palette_view.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index 1a0de3db..2e17f651 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -39,12 +39,12 @@ #include <tdeapplication.h> #include <tdeconfig.h> -#include <kglobal.h> -#include <kglobalsettings.h> +#include <tdeglobal.h> +#include <tdeglobalsettings.h> #include <kiconloader.h> #include <tdelistbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kseparator.h> #include <kpalette.h> #include <kimageeffect.h> |