summaryrefslogtreecommitdiffstats
path: root/kcontrol/input/xcursor
diff options
context:
space:
mode:
authorAutomated System <[email protected]>2013-02-15 22:07:52 -0600
committerAutomated System <[email protected]>2013-02-15 22:07:52 -0600
commit0e1016601a881a8e4bbe62c0beee3bd23d19ab5f (patch)
tree8bf0f0cfd87710f857e4ed060c5c33af10b8d3c2 /kcontrol/input/xcursor
parentb2502b94cf23298f676853d91188b2cacc6ab0bd (diff)
parent77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (diff)
downloadtdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.tar.gz
tdebase-0e1016601a881a8e4bbe62c0beee3bd23d19ab5f.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'kcontrol/input/xcursor')
-rw-r--r--kcontrol/input/xcursor/previewwidget.cpp4
-rw-r--r--kcontrol/input/xcursor/themepage.cpp6
2 files changed, 5 insertions, 5 deletions
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>