summaryrefslogtreecommitdiffstats
path: root/nsplugins
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:02:02 -0600
commitde7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch)
treedbb3152c372f8620f9290137d461f3d9f9eba1cb /nsplugins
parent936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff)
downloadtdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz
tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'nsplugins')
-rw-r--r--nsplugins/CMakeLists.txt2
-rw-r--r--nsplugins/kcm_nsplugins.cpp2
-rw-r--r--nsplugins/nspluginloader.cpp2
-rw-r--r--nsplugins/plugin_part.cpp4
-rw-r--r--nsplugins/plugin_paths.cpp2
-rw-r--r--nsplugins/pluginscan.cpp4
-rw-r--r--nsplugins/tdehtml_plugins.desktop2
-rw-r--r--nsplugins/viewer/CMakeLists.txt2
-rw-r--r--nsplugins/viewer/nsplugin.cpp4
-rw-r--r--nsplugins/viewer/nsplugin.h2
-rw-r--r--nsplugins/viewer/viewer.cpp2
11 files changed, 14 insertions, 14 deletions
diff --git a/nsplugins/CMakeLists.txt b/nsplugins/CMakeLists.txt
index 9ed66c7b..278ac1f8 100644
--- a/nsplugins/CMakeLists.txt
+++ b/nsplugins/CMakeLists.txt
@@ -54,7 +54,7 @@ tde_add_kpart( kcm_nsplugins AUTOMOC
tde_add_executable( nspluginscan AUTOMOC
SOURCES pluginscan.cpp
- LINK pluginpaths-static kio-shared Xt
+ LINK pluginpaths-static tdeio-shared Xt
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/nsplugins/kcm_nsplugins.cpp b/nsplugins/kcm_nsplugins.cpp
index 16234c62..4613dc61 100644
--- a/nsplugins/kcm_nsplugins.cpp
+++ b/nsplugins/kcm_nsplugins.cpp
@@ -25,7 +25,7 @@
#include <kstandarddirs.h>
#include <klocale.h>
#include <kiconloader.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kurlrequester.h>
#include <tqwhatsthis.h>
diff --git a/nsplugins/nspluginloader.cpp b/nsplugins/nspluginloader.cpp
index 11549055..87191a5d 100644
--- a/nsplugins/nspluginloader.cpp
+++ b/nsplugins/nspluginloader.cpp
@@ -33,7 +33,7 @@
#include <kglobal.h>
#include <klocale.h>
#include <kstandarddirs.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <dcopclient.h>
#include <dcopstub.h>
#include <tqlayout.h>
diff --git a/nsplugins/plugin_part.cpp b/nsplugins/plugin_part.cpp
index 104619f2..97d56ad5 100644
--- a/nsplugins/plugin_part.cpp
+++ b/nsplugins/plugin_part.cpp
@@ -25,8 +25,8 @@
#include <kaction.h>
#include <kapplication.h>
#include <kdebug.h>
-#include <kfiledialog.h>
-#include <kio/netaccess.h>
+#include <tdefiledialog.h>
+#include <tdeio/netaccess.h>
#include <klocale.h>
#include <tdeparts/browserinterface.h>
#include <tdeparts/browserextension.h>
diff --git a/nsplugins/plugin_paths.cpp b/nsplugins/plugin_paths.cpp
index 121fc9d6..905d9055 100644
--- a/nsplugins/plugin_paths.cpp
+++ b/nsplugins/plugin_paths.cpp
@@ -25,7 +25,7 @@
#include "plugin_paths.h"
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <stdlib.h>
TQStringList getSearchPaths()
diff --git a/nsplugins/pluginscan.cpp b/nsplugins/pluginscan.cpp
index 867497ef..aa836c36 100644
--- a/nsplugins/pluginscan.cpp
+++ b/nsplugins/pluginscan.cpp
@@ -45,7 +45,7 @@
#include <kglobal.h>
#include <kstandarddirs.h>
#include <klibloader.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kcrash.h>
#include <kdesktopfile.h>
#include <kservicetype.h>
@@ -657,5 +657,5 @@ int main( int argc, char **argv )
if ( !dcc->isAttached() )
dcc->attach();
// Tel kded to update sycoca database.
- dcc->send("kded", "kbuildsycoca", "recreate()", TQByteArray());
+ dcc->send("kded", "tdebuildsycoca", "recreate()", TQByteArray());
}
diff --git a/nsplugins/tdehtml_plugins.desktop b/nsplugins/tdehtml_plugins.desktop
index b38c1616..b79fa310 100644
--- a/nsplugins/tdehtml_plugins.desktop
+++ b/nsplugins/tdehtml_plugins.desktop
@@ -2,7 +2,7 @@
Type=Application
DocPath=kcontrol/tdehtml/index.html#kbrowse-plugins
Icon=konqueror
-Exec=kcmshell tdehtml_plugins
+Exec=tdecmshell tdehtml_plugins
X-TDE-ModuleType=Library
X-TDE-Library=konqhtml
diff --git a/nsplugins/viewer/CMakeLists.txt b/nsplugins/viewer/CMakeLists.txt
index cfd95de6..14cd6913 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 535502a8..874ac53e 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 6eb5d6be..96bb1da1 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 af72ef6c..9e73c554 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"