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/joystick | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/joystick')
| -rw-r--r-- | kcontrol/joystick/caldialog.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/joystick/joydevice.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/joystick/joystick.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/joystick/joywidget.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/kcontrol/joystick/caldialog.cpp b/kcontrol/joystick/caldialog.cpp index 978919caf..877befb62 100644 --- a/kcontrol/joystick/caldialog.cpp +++ b/kcontrol/joystick/caldialog.cpp @@ -27,8 +27,8 @@ #include <tqapplication.h> #include <tqvbox.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kdebug.h> //-------------------------------------------------------------- diff --git a/kcontrol/joystick/joydevice.cpp b/kcontrol/joystick/joydevice.cpp index 6453bdf6f..3c4aeac3f 100644 --- a/kcontrol/joystick/joydevice.cpp +++ b/kcontrol/joystick/joydevice.cpp @@ -21,7 +21,7 @@ #include "joydevice.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <sys/types.h> diff --git a/kcontrol/joystick/joystick.cpp b/kcontrol/joystick/joystick.cpp index 853169443..009795db0 100644 --- a/kcontrol/joystick/joystick.cpp +++ b/kcontrol/joystick/joystick.cpp @@ -21,8 +21,8 @@ #include <tdeaboutdata.h> #include <kgenericfactory.h> -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include "joystick.h" #include "joywidget.h" diff --git a/kcontrol/joystick/joywidget.cpp b/kcontrol/joystick/joywidget.cpp index d6533aefb..8e1ff5586 100644 --- a/kcontrol/joystick/joywidget.cpp +++ b/kcontrol/joystick/joywidget.cpp @@ -34,9 +34,9 @@ #include <tqfontmetrics.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> //-------------------------------------------------------------- |