summaryrefslogtreecommitdiffstats
path: root/nsplugins
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:01:54 +0200
committerSlávek Banko <slavek.banko@axis.cz>2013-09-03 20:58:45 +0200
commit3e88ddfbc3df52c97d5354890fb9ac68af49bddd (patch)
treef6830215ebdc83e794a7a223042537595490265f /nsplugins
parent5607b4ae2272da03b692475c2f773f3e27e671b8 (diff)
downloadtdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.tar.gz
tdebase-3e88ddfbc3df52c97d5354890fb9ac68af49bddd.zip
Additional k => tde renaming and fixes
Diffstat (limited to 'nsplugins')
-rw-r--r--nsplugins/Makefile.am2
-rw-r--r--nsplugins/test/Makefile.am2
-rw-r--r--nsplugins/viewer/Makefile.am2
-rw-r--r--nsplugins/viewer/nsplugin.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/nsplugins/Makefile.am b/nsplugins/Makefile.am
index d23881b6..acb8be79 100644
--- a/nsplugins/Makefile.am
+++ b/nsplugins/Makefile.am
@@ -16,7 +16,7 @@ libnsplugin_la_LIBADD = -ltdeparts
bin_PROGRAMS = nspluginscan
nspluginscan_SOURCES = pluginscan.cpp
nspluginscan_LDFLAGS = $(KDE_RPATH) $(all_libraries) -export-dynamic
-nspluginscan_LDADD = $(LIB_TDEUI) $(LIB_KSYCOCA) -lXt libpluginpaths.la
+nspluginscan_LDADD = $(LIB_TDEUI) $(LIB_TDESYCOCA) -lXt libpluginpaths.la
kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp
kcm_nsplugins_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
diff --git a/nsplugins/test/Makefile.am b/nsplugins/test/Makefile.am
index 24985baa..af17ade4 100644
--- a/nsplugins/test/Makefile.am
+++ b/nsplugins/test/Makefile.am
@@ -4,7 +4,7 @@ noinst_HEADERS = testnsplugin.h
check_PROGRAMS = testnsplugin
testnsplugin_SOURCES = testnsplugin.cpp
-testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor
+testnsplugin_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
testnsplugin_LDADD = $(LIB_TDEUI) ../libnsplugin.la
$(srcdir)/testnsplugin.cpp: ../NSPluginClassIface_stub.h
diff --git a/nsplugins/viewer/Makefile.am b/nsplugins/viewer/Makefile.am
index 12a0301b..6b2bbb05 100644
--- a/nsplugins/viewer/Makefile.am
+++ b/nsplugins/viewer/Makefile.am
@@ -6,6 +6,6 @@ bin_PROGRAMS = nspluginviewer
nspluginviewer_SOURCES = NSPluginCallbackIface.stub NSPluginClassIface.skel \
nsplugin.cpp viewer.cpp kxt.cpp qxteventloop.cpp glibevents.cpp
nspluginviewer_LDFLAGS = $(all_libraries) $(KDE_RPATH) -export-dynamic `pkg-config --libs glib-2.0`
-nspluginviewer_LDADD = $(LIB_KIO) $(LIB_KPARTS) -lXt
+nspluginviewer_LDADD = $(LIB_TDEIO) $(LIB_TDEPARTS) -lXt
NSPluginCallbackIface_DIR = $(srcdir)/..
diff --git a/nsplugins/viewer/nsplugin.cpp b/nsplugins/viewer/nsplugin.cpp
index d6327be3..8d41f943 100644
--- a/nsplugins/viewer/nsplugin.cpp
+++ b/nsplugins/viewer/nsplugin.cpp
@@ -1895,7 +1895,7 @@ bool NSPluginStream::get( const TQString& url, const TQString& mimeType,
{
// create new stream
if ( create( url, mimeType, notify ) ) {
- // start the kio job
+ // start the tdeio job
_job = TDEIO::get(KURL( url ), false, false);
_job->addMetaData("errorPage", "false");
_job->addMetaData("AllowCompressedPage", "false");
@@ -1923,7 +1923,7 @@ bool NSPluginStream::post( const TQString& url, const TQByteArray& data,
{
// create new stream
if ( create( url, mimeType, notify ) ) {
- // start the kio job
+ // start the tdeio job
_job = TDEIO::http_post(KURL( url ), data, false);
_job->addMetaData("content-type", args.contentType());
_job->addMetaData("errorPage", "false");