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/crypto/CMakeLists.txt | 2 +-
 kcontrol/crypto/certexport.cpp | 2 +-
 kcontrol/crypto/crypto.cpp     | 4 ++--
 kcontrol/crypto/crypto.desktop | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'kcontrol/crypto')

diff --git a/kcontrol/crypto/CMakeLists.txt b/kcontrol/crypto/CMakeLists.txt
index 1541c1ddb..414e6d605 100644
--- a/kcontrol/crypto/CMakeLists.txt
+++ b/kcontrol/crypto/CMakeLists.txt
@@ -44,6 +44,6 @@ install( FILES crypto.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 tde_add_kpart( kcm_crypto AUTOMOC
   SOURCES crypto.cpp certexport.cpp kdatetimedlg.cpp
-  LINK kio-shared ${SSL_LIBRARIES}
+  LINK tdeio-shared ${SSL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/kcontrol/crypto/certexport.cpp b/kcontrol/crypto/certexport.cpp
index 9c60d4f00..4a6bda892 100644
--- a/kcontrol/crypto/certexport.cpp
+++ b/kcontrol/crypto/certexport.cpp
@@ -26,7 +26,7 @@
 #include "certexport.h"
 #include <tqpushbutton.h>
 #include <klineedit.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tqradiobutton.h>
 #include <tqvbuttongroup.h>
 #include <tqlayout.h>
diff --git a/kcontrol/crypto/crypto.cpp b/kcontrol/crypto/crypto.cpp
index c718184ba..023799844 100644
--- a/kcontrol/crypto/crypto.cpp
+++ b/kcontrol/crypto/crypto.cpp
@@ -50,11 +50,11 @@
 
 #include <kaboutdata.h>
 #include <kcombobox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdatepicker.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <kgenericfactory.h>
 #include <kglobal.h>
 #include <klineedit.h>
diff --git a/kcontrol/crypto/crypto.desktop b/kcontrol/crypto/crypto.desktop
index 98025c9b6..e637ad5ff 100644
--- a/kcontrol/crypto/crypto.desktop
+++ b/kcontrol/crypto/crypto.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Icon=encrypted
 Type=Application
-Exec=kcmshell crypto
+Exec=tdecmshell crypto
 DocPath=kcontrol/crypto/index.html
 
 X-TDE-Library=crypto
-- 
cgit v1.2.1