diff options
| author | Timothy Pearson <[email protected]> | 2013-02-15 21:54:06 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-02-15 21:54:06 -0600 |
| commit | 71049a71c6648791e95cf421b19047415a2c4c84 (patch) | |
| tree | 4f75fdaee1cce5a44f58f1f54980099f50a82b10 /kicker-applets/kolourpicker | |
| parent | 6fe537d6dff11f4c638c51ed1f652765b63f8591 (diff) | |
| download | tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.tar.gz tdeaddons-71049a71c6648791e95cf421b19047415a2c4c84.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker-applets/kolourpicker')
| -rw-r--r-- | kicker-applets/kolourpicker/kolourpicker.cpp | 6 | ||||
| -rw-r--r-- | kicker-applets/kolourpicker/simplebutton.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp index ae4cb41..8f82fe2 100644 --- a/kicker-applets/kolourpicker/kolourpicker.cpp +++ b/kicker-applets/kolourpicker/kolourpicker.cpp @@ -30,14 +30,14 @@ $Id$ #include <tqtooltip.h> #include <tqcursor.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kinstance.h> #include <tdeconfig.h> #include <tdeaboutdata.h> #include <tdeaboutapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include "kolourpicker.h" diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp index e81abe4..d15ac36 100644 --- a/kicker-applets/kolourpicker/simplebutton.cpp +++ b/kicker-applets/kolourpicker/simplebutton.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kcursor.h> #include <kdialog.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kiconeffect.h> #include <kicontheme.h> #include <kipc.h> |