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

---
 nsplugins/viewer/CMakeLists.txt | 2 +-
 nsplugins/viewer/nsplugin.cpp   | 4 ++--
 nsplugins/viewer/nsplugin.h     | 2 +-
 nsplugins/viewer/viewer.cpp     | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'nsplugins/viewer')

diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index cfd95de6c..14cd69135 100644
--- a/nsplugins/viewer/CMakeLists.txt
+++ b/nsplugins/viewer/CMakeLists.txt
@@ -30,6 +30,6 @@ tde_add_executable( nspluginviewer AUTOMOC
     ../NSPluginCallbackIface.stub NSPluginClassIface.skel
     nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp
     glibevents.cpp
-  LINK tdeparts-shared kio-shared ${GLIB2_LIBRARIES} Xt dl
+  LINK tdeparts-shared tdeio-shared ${GLIB2_LIBRARIES} Xt dl
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index 535502a87..874ac53ea 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -44,10 +44,10 @@
 #endif
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kglobal.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
 #include <klibloader.h>
 #include <klocale.h>
 #include <kprocess.h>
diff --git a/nsplugins/viewer/nsplugin.h b/nsplugins/viewer/nsplugin.h
index 6eb5d6be3..96bb1da15 100644
--- a/nsplugins/viewer/nsplugin.h
+++ b/nsplugins/viewer/nsplugin.h
@@ -42,7 +42,7 @@
 #include <tqguardedptr.h>
 
 #include <tdeparts/browserextension.h>  // for URLArgs
-#include <kio/job.h>
+#include <tdeio/job.h>
 
 
 #define XP_UNIX
diff --git a/nsplugins/viewer/viewer.cpp b/nsplugins/viewer/viewer.cpp
index af72ef6cc..9e73c5542 100644
--- a/nsplugins/viewer/viewer.cpp
+++ b/nsplugins/viewer/viewer.cpp
@@ -44,7 +44,7 @@
 #ifdef Bool
 #undef Bool
 #endif
-#include <kconfig.h>
+#include <tdeconfig.h>
 
 #if TQT_VERSION < 0x030100
 #include "kxt.h"
-- 
cgit v1.2.3