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 /kicker/applets/media | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kicker/applets/media')
| -rw-r--r-- | kicker/applets/media/mediaapplet.cpp | 4 | ||||
| -rw-r--r-- | kicker/applets/media/mediumbutton.cpp | 6 | ||||
| -rw-r--r-- | kicker/applets/media/preferencesdialog.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/kicker/applets/media/mediaapplet.cpp b/kicker/applets/media/mediaapplet.cpp index af1113f1b..c3b964ce1 100644 --- a/kicker/applets/media/mediaapplet.cpp +++ b/kicker/applets/media/mediaapplet.cpp @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <tdeaboutdata.h> diff --git a/kicker/applets/media/mediumbutton.cpp b/kicker/applets/media/mediumbutton.cpp index c85b50173..ce61cfbd6 100644 --- a/kicker/applets/media/mediumbutton.cpp +++ b/kicker/applets/media/mediumbutton.cpp @@ -27,12 +27,12 @@ #include <tqstyle.h> #include <tqtooltip.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmimetype.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdesktopfile.h> #include <krun.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kcursor.h> #include <tdeapplication.h> #include <kipc.h> diff --git a/kicker/applets/media/preferencesdialog.cpp b/kicker/applets/media/preferencesdialog.cpp index 8fbd958fa..3f1d27890 100644 --- a/kicker/applets/media/preferencesdialog.cpp +++ b/kicker/applets/media/preferencesdialog.cpp @@ -19,7 +19,7 @@ #include "preferencesdialog.h" -#include <klocale.h> +#include <tdelocale.h> #include <kmimetype.h> #include <tqvbox.h> #include <tqwhatsthis.h> |