From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 27 Jan 2013 01:02:02 -0600
Subject: Rename a number of libraries and executables to avoid conflicts with
 KDE4

---
 kcontrol/access/CMakeLists.txt    | 2 +-
 kcontrol/access/kaccess.cpp       | 2 +-
 kcontrol/access/kcmaccess.cpp     | 2 +-
 kcontrol/access/kcmaccess.desktop | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kcontrol/access')

diff --git a/kcontrol/access/CMakeLists.txt b/kcontrol/access/CMakeLists.txt
index bc13f53cd..9764fa9c8 100644
--- a/kcontrol/access/CMakeLists.txt
+++ b/kcontrol/access/CMakeLists.txt
@@ -31,7 +31,7 @@ install( FILES eventsrc DESTINATION ${DATA_INSTALL_DIR}/kaccess )
 
 tde_add_kpart( kcm_access AUTOMOC
   SOURCES kcmaccess.cpp
-  LINK kio-shared
+  LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
 
diff --git a/kcontrol/access/kaccess.cpp b/kcontrol/access/kaccess.cpp
index 48c649c9a..7d66fa17f 100644
--- a/kcontrol/access/kaccess.cpp
+++ b/kcontrol/access/kaccess.cpp
@@ -14,7 +14,7 @@
 #include <kdebug.h>
 #include <kaudioplayer.h>
 #include <knotifyclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <netwm.h>
diff --git a/kcontrol/access/kcmaccess.cpp b/kcontrol/access/kcmaccess.cpp
index 218dbfbb4..3a7833c05 100644
--- a/kcontrol/access/kcmaccess.cpp
+++ b/kcontrol/access/kcmaccess.cpp
@@ -26,7 +26,7 @@
 #include <kcombobox.h>
 #include <kstandarddirs.h>
 #include <kcolorbutton.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kapplication.h>
 #include <kaboutdata.h>
 #include <kshortcut.h>
diff --git a/kcontrol/access/kcmaccess.desktop b/kcontrol/access/kcmaccess.desktop
index ec3d5d9a1..c748c636a 100644
--- a/kcontrol/access/kcmaccess.desktop
+++ b/kcontrol/access/kcmaccess.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=access
 Type=Application
-Exec=kcmshell kcmaccess
+Exec=tdecmshell kcmaccess
 DocPath=kcontrol/kcmaccess/index.html
 
 
-- 
cgit v1.2.3