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

---
 kview/kviewviewer/config/CMakeLists.txt | 2 +-
 kview/kviewviewer/config/Makefile.am    | 2 +-
 kview/kviewviewer/kviewviewer.cpp       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'kview/kviewviewer')

diff --git a/kview/kviewviewer/config/CMakeLists.txt b/kview/kviewviewer/config/CMakeLists.txt
index d3640df6..10b5b05f 100644
--- a/kview/kviewviewer/config/CMakeLists.txt
+++ b/kview/kviewviewer/config/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 
 install( FILES
     kviewviewerpluginsconfig.desktop
-  DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog )
+  DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog )
 
 
 ##### kcm_kviewviewerpluginsconfig (module) #####
diff --git a/kview/kviewviewer/config/Makefile.am b/kview/kviewviewer/config/Makefile.am
index fe65e613..dfa55d4c 100644
--- a/kview/kviewviewer/config/Makefile.am
+++ b/kview/kviewviewer/config/Makefile.am
@@ -11,7 +11,7 @@ kcm_kviewviewerpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 kcm_kviewviewerpluginsconfig_la_LIBADD = $(LIB_KUTILS)
 
 kcm_kviewviewerpluginsconfig_DATA = kviewviewerpluginsconfig.desktop
-kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog
+kcm_kviewviewerpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog
 
 messages: rc.cpp
 	$(XGETTEXT) *.cpp *.h -o $(podir)/kcm_kviewviewerpluginsconfig.pot
diff --git a/kview/kviewviewer/kviewviewer.cpp b/kview/kviewviewer/kviewviewer.cpp
index 3e3c7085..4e318342 100644
--- a/kview/kviewviewer/kviewviewer.cpp
+++ b/kview/kviewviewer/kviewviewer.cpp
@@ -37,9 +37,9 @@
 #include <kpushbutton.h>
 #include <kpassivepopup.h>
 #include <kdebug.h>
-#include <kio/job.h>
+#include <tdeio/job.h>
 #include <kxmlguifactory.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
 #include <tdeparts/componentfactory.h>
 #include <tdeparts/plugin.h>
-- 
cgit v1.2.3