summaryrefslogtreecommitdiffstats
path: root/kcontrol/input
diff options
context:
space:
mode:
Diffstat (limited to 'kcontrol/input')
-rw-r--r--kcontrol/input/CMakeLists.txt2
-rw-r--r--kcontrol/input/Makefile.am2
-rw-r--r--kcontrol/input/core/themepage.cpp6
-rw-r--r--kcontrol/input/logitechmouse.h2
-rw-r--r--kcontrol/input/main.cpp10
-rw-r--r--kcontrol/input/mouse.cpp2
-rw-r--r--kcontrol/input/mouse.desktop2
-rw-r--r--kcontrol/input/xcursor/themepage.cpp4
8 files changed, 15 insertions, 15 deletions
diff --git a/kcontrol/input/CMakeLists.txt b/kcontrol/input/CMakeLists.txt
index 1ebd92184..0382a17ea 100644
--- a/kcontrol/input/CMakeLists.txt
+++ b/kcontrol/input/CMakeLists.txt
@@ -53,7 +53,7 @@ tde_add_kpart( kcm_input AUTOMOC
SOURCES
mouse.cpp kmousedlg.ui main.cpp logitechmouse.cpp
logitechmouse_base.ui
- LINK themepage-static kio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES}
+ LINK themepage-static tdeio-shared ${XCURSOR_LIBRARIES} ${LIBUSB_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kcontrol/input/Makefile.am b/kcontrol/input/Makefile.am
index 7ac995b97..840029c26 100644
--- a/kcontrol/input/Makefile.am
+++ b/kcontrol/input/Makefile.am
@@ -37,7 +37,7 @@ EXTRA_DIST = $(font_DATA)
update_DATA = mouse_cursor_theme.upd
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
install-data-hook:
$(mkinstalldirs) $(DESTDIR)$(datadir)/fonts/override
diff --git a/kcontrol/input/core/themepage.cpp b/kcontrol/input/core/themepage.cpp
index dcef9b85e..558998b4e 100644
--- a/kcontrol/input/core/themepage.cpp
+++ b/kcontrol/input/core/themepage.cpp
@@ -23,11 +23,11 @@
#include <kstandarddirs.h>
#include <kurl.h>
#include <kprocess.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
#include <kmessagebox.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <klistview.h>
#include <kdialog.h>
diff --git a/kcontrol/input/logitechmouse.h b/kcontrol/input/logitechmouse.h
index 60780758a..e50838b72 100644
--- a/kcontrol/input/logitechmouse.h
+++ b/kcontrol/input/logitechmouse.h
@@ -28,7 +28,7 @@
#include <tqradiobutton.h>
#include <tqbuttongroup.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <config.h>
diff --git a/kcontrol/input/main.cpp b/kcontrol/input/main.cpp
index 0ab009ec9..38bded500 100644
--- a/kcontrol/input/main.cpp
+++ b/kcontrol/input/main.cpp
@@ -27,7 +27,7 @@
#include <klocale.h>
#include <kglobal.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <dcopref.h>
#include <tqfile.h>
@@ -80,13 +80,13 @@ extern "C"
XDefineCursor(tqt_xdisplay(), tqt_xrootwin(), handle);
XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor
- // Tell klauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
+ // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment
// variables when launching applications.
- DCOPRef klauncher("klauncher");
+ DCOPRef tdelauncher("tdelauncher");
if( !theme.isEmpty())
- klauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), theme);
if( !size.isEmpty())
- klauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
+ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size);
#endif
delete config;
diff --git a/kcontrol/input/mouse.cpp b/kcontrol/input/mouse.cpp
index 9253a1910..14d5787fa 100644
--- a/kcontrol/input/mouse.cpp
+++ b/kcontrol/input/mouse.cpp
@@ -58,7 +58,7 @@
#include <klocale.h>
#include <kdialog.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kaboutdata.h>
diff --git a/kcontrol/input/mouse.desktop b/kcontrol/input/mouse.desktop
index c8a7c1e96..5873eb523 100644
--- a/kcontrol/input/mouse.desktop
+++ b/kcontrol/input/mouse.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=kcmshell mouse
+Exec=tdecmshell mouse
Icon=mouse
Type=Application
DocPath=kcontrol/mouse/index.html
diff --git a/kcontrol/input/xcursor/themepage.cpp b/kcontrol/input/xcursor/themepage.cpp
index a0f0ef0cf..0aa1224ec 100644
--- a/kcontrol/input/xcursor/themepage.cpp
+++ b/kcontrol/input/xcursor/themepage.cpp
@@ -29,8 +29,8 @@
#include <kdialog.h>
#include <kmessagebox.h>
#include <kurlrequesterdlg.h>
-#include <kio/job.h>
-#include <kio/netaccess.h>
+#include <tdeio/job.h>
+#include <tdeio/netaccess.h>
#include <ktar.h>
#include <tqlayout.h>