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/input | |
| parent | 9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff) | |
| download | tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/input')
| -rw-r--r-- | kcontrol/input/core/themepage.cpp | 6 | ||||
| -rw-r--r-- | kcontrol/input/logitechmouse.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/input/main.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/input/mouse.cpp | 2 | ||||
| -rw-r--r-- | kcontrol/input/mouse.h | 2 | ||||
| -rw-r--r-- | kcontrol/input/xcursor/previewwidget.cpp | 4 | ||||
| -rw-r--r-- | kcontrol/input/xcursor/themepage.cpp | 6 |
7 files changed, 14 insertions, 14 deletions
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp index bb8e7ca0c..24b43d829 100644 --- a/kcontrol/input/core/themepage.cpp +++ b/kcontrol/input/core/themepage.cpp @@ -19,14 +19,14 @@ * Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include <kstandarddirs.h> #include <kurl.h> #include <kprocess.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <tdelistview.h> #include <kdialog.h> diff --git a/kcontrol/input/logitechmouse.cpp b/kcontrol/input/logitechmouse.cpp index 39b8948ae..0e2f6f1d3 100644 --- a/kcontrol/input/logitechmouse.cpp +++ b/kcontrol/input/logitechmouse.cpp @@ -31,8 +31,8 @@ #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <config.h> diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp index 38bded500..254f2ee5c 100644 --- a/kcontrol/input/main.cpp +++ b/kcontrol/input/main.cpp @@ -25,8 +25,8 @@ # include <config.h> #endif -#include <klocale.h> -#include <kglobal.h> +#include <tdelocale.h> +#include <tdeglobal.h> #include <tdeconfig.h> #include <dcopref.h> #include <tqfile.h> diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp index 33409a422..49b67c98d 100644 --- a/kcontrol/input/mouse.cpp +++ b/kcontrol/input/mouse.cpp @@ -56,7 +56,7 @@ #include <tqtabwidget.h> #include <tqradiobutton.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdialog.h> #include <tdeconfig.h> #include <kstandarddirs.h> diff --git a/kcontrol/input/mouse.h b/kcontrol/input/mouse.h index 853a4e73a..01f6c1071 100644 --- a/kcontrol/input/mouse.h +++ b/kcontrol/input/mouse.h @@ -40,7 +40,7 @@ #include <tdeapplication.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <knuminput.h> #include <config.h> diff --git a/kcontrol/input/xcursor/previewwidget.cpp b/kcontrol/input/xcursor/previewwidget.cpp index 326178a7a..2f0ea6edc 100644 --- a/kcontrol/input/xcursor/previewwidget.cpp +++ b/kcontrol/input/xcursor/previewwidget.cpp @@ -16,7 +16,7 @@ * Boston, MA 02110-1301, USA. */ -#include <kglobal.h> +#include <tdeglobal.h> #include <tqwidget.h> #include <tqpainter.h> @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqcursor.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <X11/Xlib.h> #include <X11/Xutil.h> diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp index 72a25ce96..d84d470b1 100644 --- a/kcontrol/input/xcursor/themepage.cpp +++ b/kcontrol/input/xcursor/themepage.cpp @@ -20,14 +20,14 @@ # include <config.h> #endif -#include <klocale.h> +#include <tdelocale.h> #include <tdeaboutdata.h> #include <kstandarddirs.h> #include <tdelistview.h> #include <ksimpleconfig.h> -#include <kglobalsettings.h> +#include <tdeglobalsettings.h> #include <kdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kurlrequesterdlg.h> #include <tdeio/job.h> #include <tdeio/netaccess.h> |