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/screensaver/CMakeLists.txt      | 2 +-
 kcontrol/screensaver/advanceddialog.h    | 2 +-
 kcontrol/screensaver/screensaver.desktop | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'kcontrol/screensaver')

diff --git a/kcontrol/screensaver/CMakeLists.txt b/kcontrol/screensaver/CMakeLists.txt
index 825418e4f..e57bc1eca 100644
--- a/kcontrol/screensaver/CMakeLists.txt
+++ b/kcontrol/screensaver/CMakeLists.txt
@@ -32,6 +32,6 @@ tde_add_kpart( kcm_screensaver AUTOMOC
     advanceddialogimpl.ui scrnsave.cpp testwin.cpp
     saverlist.cpp saverconfig.cpp advanceddialog.cpp
     kswidget.cpp
-  LINK kio-shared ${GL_LIBRARY}
+  LINK tdeio-shared ${GL_LIBRARY}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/screensaver/advanceddialog.h b/kcontrol/screensaver/advanceddialog.h
index 8322dd3e2..87ee03a31 100644
--- a/kcontrol/screensaver/advanceddialog.h
+++ b/kcontrol/screensaver/advanceddialog.h
@@ -3,7 +3,7 @@
 
 #include <kdialogbase.h>
 #include <tqwidget.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
 #include <tqwhatsthis.h>
diff --git a/kcontrol/screensaver/screensaver.desktop b/kcontrol/screensaver/screensaver.desktop
index 566a8c506..821a445b5 100644
--- a/kcontrol/screensaver/screensaver.desktop
+++ b/kcontrol/screensaver/screensaver.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Exec=kcmshell screensaver
+Exec=tdecmshell screensaver
 Icon=tdescreensaver
 Type=Application
 DocPath=kcontrol/screensaver/index.html
-- 
cgit v1.2.1