summaryrefslogtreecommitdiffstats
path: root/tdecert
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:04:16 -0600
commit5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch)
tree9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tdecert
parentc17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff)
downloadtdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz
tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdecert')
-rw-r--r--tdecert/CMakeLists.txt12
-rw-r--r--tdecert/Makefile.am2
-rw-r--r--tdecert/tdecertpart.cc8
3 files changed, 11 insertions, 11 deletions
diff --git a/tdecert/CMakeLists.txt b/tdecert/CMakeLists.txt
index 045d77720..2a9c391e3 100644
--- a/tdecert/CMakeLists.txt
+++ b/tdecert/CMakeLists.txt
@@ -14,14 +14,14 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/tdecore
- ${CMAKE_BINARY_DIR}/kio/kssl
+ ${CMAKE_BINARY_DIR}/tdeio/kssl
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/tdecore
${CMAKE_SOURCE_DIR}/tdeui
- ${CMAKE_SOURCE_DIR}/kio
- ${CMAKE_SOURCE_DIR}/kio/kio
- ${CMAKE_SOURCE_DIR}/kio/kfile
- ${CMAKE_SOURCE_DIR}/kio/kssl
+ ${CMAKE_SOURCE_DIR}/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdeio
+ ${CMAKE_SOURCE_DIR}/tdeio/tdefile
+ ${CMAKE_SOURCE_DIR}/tdeio/kssl
)
link_directories(
@@ -45,6 +45,6 @@ set( ${target}_SRCS
tde_add_kpart( ${target} AUTOMOC
SOURCES ${${target}_SRCS}
- LINK kio-shared tdeparts-shared
+ LINK tdeio-shared tdeparts-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
index d43ce0f5b..a6f605f4a 100644
--- a/tdecert/Makefile.am
+++ b/tdecert/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(top_srcdir)/kio/kssl -I$(top_builddir)/kio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
+INCLUDES= -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl -I$(top_srcdir) $(SSL_INCLUDES) $(all_includes)
kde_module_LTLIBRARIES = libtdecertpart.la
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cc
index ebb6e77ad..08e3ec5e0 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cc
@@ -36,18 +36,18 @@
#include <ksslall.h>
#include <kopenssl.h>
#include <ksslpemcallback.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kprocess.h>
#include <tqtabwidget.h>
#include <kseparator.h>
#include <klistview.h>
-#include <kio/kmimemagic.h>
+#include <tdeio/kmimemagic.h>
#include <tqmultilineedit.h>
#include <tqregexp.h>
#include <kcombobox.h>
#include <tdeparts/browserextension.h>
#include <tdeparts/browserinterface.h>
-#include <kio/kservicetypefactory.h>
+#include <tdeio/kservicetypefactory.h>
K_EXPORT_COMPONENT_FACTORY( libtdecertpart, KParts::GenericFactory<KCertPart> )
@@ -774,7 +774,7 @@ void KCertPart::slotDone() {
void KCertPart::slotLaunch() {
KShellProcess p;
-p << "kcmshell" << "crypto";
+p << "tdecmshell" << "crypto";
p.start(TDEProcess::DontCare);
}