From 3e88ddfbc3df52c97d5354890fb9ac68af49bddd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:01:54 +0200 Subject: Additional k => tde renaming and fixes --- khelpcenter/DESIGN | 4 ++-- khelpcenter/Makefile.am | 6 +++--- khelpcenter/htmlsearch/Makefile.am | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'khelpcenter') diff --git a/khelpcenter/DESIGN b/khelpcenter/DESIGN index c5c961ae8..68d762a53 100644 --- a/khelpcenter/DESIGN +++ b/khelpcenter/DESIGN @@ -219,7 +219,7 @@ regexp' or 'Search case sensitive'. # We could show them in a listview on the Search tab, each found search engine # being represented by a checkable listview item. So, we just let the user # enter a term, replace the \{@} placeholder in the URIs specified in the -# selected .desktop files with that term, send out a request via KIO and show +# selected .desktop files with that term, send out a request via TDEIO and show # the results in our TDEHTMLPart (after all KHC::View is a TDEHTMLPart already). A # problem with this: How to display the multiple HTML pages returned by the # selected search engines? Using a QSplitter to split multiple TDEHTMLParts? @@ -237,7 +237,7 @@ regexp' or 'Search case sensitive'. # In additionl there could be a X-KHelpCenter-XSLT key which defines which .xslt # stylesheet to use for that particular search engine. We then query that search # engine by replacing the placeholder in the URI with whatever the user entered -# and hand it to KIO. All the HTML returned by the various search engines gets +# and hand it to TDEIO. All the HTML returned by the various search engines gets # then transformed into a custom, intermediate, XML dialect, using the XSLT # stylesheets define in the .desktop files. Using that intermediate step we # can nicely drop duplicate hits, for example, or create a list of hits in the diff --git a/khelpcenter/Makefile.am b/khelpcenter/Makefile.am index d00e24365..e9e3ac015 100644 --- a/khelpcenter/Makefile.am +++ b/khelpcenter/Makefile.am @@ -6,7 +6,7 @@ METASOURCES = AUTO bin_PROGRAMS = khc_indexbuilder lib_LTLIBRARIES = -khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +khc_indexbuilder_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor khc_indexbuilder_LDADD = $(LIB_TDECORE) khc_indexbuilder_SOURCES = khc_indexbuilder.cpp @@ -27,14 +27,14 @@ khelpcenter_la_SOURCES = navigator.cpp \ #kcm_helpcenter_la_LDFLAGS = $(KDE_RPATH) -module -avoid-version \ # $(all_libraries) -no-undefined -#kcm_helpcenter_la_LIBADD = $(LIB_KIO) +#kcm_helpcenter_la_LIBADD = $(LIB_TDEIO) #kcm_helpcenter_la_SOURCES = kcmhelpcenter.cpp docmetainfo.cpp \ # docentrytraverser.cpp docentry.cpp htmlsearch.cpp \ # htmlsearchconfig.cpp EXTRA_PROGRAMS = testmetainfo -testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +testmetainfo_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor testmetainfo_LDADD = $(LIB_TDECORE) docentry.lo docmetainfo.lo \ docentrytraverser.lo htmlsearch.lo testmetainfo_SOURCES = testmetainfo.cpp diff --git a/khelpcenter/htmlsearch/Makefile.am b/khelpcenter/htmlsearch/Makefile.am index 132be449b..d4d00fb5f 100644 --- a/khelpcenter/htmlsearch/Makefile.am +++ b/khelpcenter/htmlsearch/Makefile.am @@ -11,11 +11,11 @@ lib_LTLIBRARIES = libhtmlsearch.la libkcm_htmlsearch.la libhtmlsearch_la_SOURCES = htmlsearch.cpp progressdialog.cpp libhtmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libhtmlsearch_la_LIBADD = $(LIB_KIO) +libhtmlsearch_la_LIBADD = $(LIB_TDEIO) libkcm_htmlsearch_la_SOURCES = kcmhtmlsearch.cpp klangcombo.cpp ktagcombobox.cpp libkcm_htmlsearch_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined -libkcm_htmlsearch_la_LIBADD = $(LIB_KIO) +libkcm_htmlsearch_la_LIBADD = $(LIB_TDEIO) noinst_HEADERS = kcmhtmlsearch.h htmlsearch.h @@ -27,7 +27,7 @@ wrapperdir = $(kde_datadir)/khelpcenter/ wrapper_SCRIPTS = meinproc_wrapper tdehtmlindex_SOURCES = index.cpp -tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdehtmlindex_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdehtmlindex_LDADD = libhtmlsearch.la $(LIB_TDEUI) xpm_DATA = unchecked.xpm checked.xpm -- cgit v1.2.1