TDE
/
tdeio-sword
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdeio-sword
0
0
Fork 0
Code Issues Releases Wiki Activity

Initial TDE conversion

Browse Source
pull/1/head
Slávek Banko 11 years ago
parent e03da7a558
commit 27a1284b96
46 changed files with 397 additions and 397 deletions
Show Stats Download Patch File Download Diff File

2
AUTHORS
Unescape View File

@ -5,7 +5,7 @@ in the relevant files:
o The SWORD Project, CrossWire Bible Society 2003 o The SWORD Project, CrossWire Bible Society 2003
o BibleTime, the BibleTime team o BibleTime, the BibleTime team
Inspiration from kio-apt, by Sylvain Joyeux <sylvain.joyeux@m4x.org> Inspiration from tdeio-apt, by Sylvain Joyeux <sylvain.joyeux@m4x.org>
Thanks go to the following people for bug reports and patches: Thanks go to the following people for bug reports and patches:
David Anderson David Anderson

2
ChangeLog
Unescape View File

@ -5,7 +5,7 @@
o removed some debug code o removed some debug code
o HTML/CSS changes: o HTML/CSS changes:
o if you've made a customised version of the o if you've made a customised version of the
kio_sword.css file, you'll need to remove tdeio_sword.css file, you'll need to remove
it or merge changes in by hand for things it or merge changes in by hand for things
to look right to look right
o added <div class='sword_text'> around o added <div class='sword_text'> around

10
INSTALL
Unescape View File

@ -4,7 +4,7 @@ Kio-Sword installation
In brief In brief
======== ========
./configure --prefix=`kde-config --prefix` && make && sudo make install ./configure --prefix=`tde-config --prefix` && make && sudo make install
(but see note about version compatibility below) (but see note about version compatibility below)
@ -13,17 +13,17 @@ Details
To compile, you will need header files for the following To compile, you will need header files for the following
libraries, as well as the libraries themselves: libraries, as well as the libraries themselves:
- kdelibs >= 3 - tdelibs >= 3
- sword >= 1.5.7 - sword >= 1.5.7
After unpacking the source, change to the base directory of the After unpacking the source, change to the base directory of the
kio-sword distribution. You will then need to find you KDE directory tdeio-sword distribution. You will then need to find you KDE directory
using this command if you don't know it already: using this command if you don't know it already:
kde-config --prefix tde-config --prefix
Then type: Then type:
export KDEDIR=<your KDE dir> export TDEDIR=<your KDE dir>
./configure --prefix=<your KDE DIR> ./configure --prefix=<your KDE DIR>
make make

4
README
Unescape View File

@ -8,7 +8,7 @@ Installation
============ ============
See file INSTALL. See file INSTALL.
Using kio-sword Using tdeio-sword
=============== ===============
Type 'sword:/' in a Konqueror window location bar, and Type 'sword:/' in a Konqueror window location bar, and
browse. Help files can be found at sword:/?help (currently browse. Help files can be found at sword:/?help (currently
@ -20,7 +20,7 @@ o KDE 3
o Sword 1.5.7 o Sword 1.5.7
o for compiling from source, the header files for the above o for compiling from source, the header files for the above
libraries are also needed. libraries are also needed.
o Sword modules installed (kio-sword isn't very useful o Sword modules installed (tdeio-sword isn't very useful
without them) without them)
License License

2
TODO
Unescape View File

@ -71,5 +71,5 @@ o clean up/optimise lots of code according to the 'KDE mistakes' tutorial
o improve docbook documentation o improve docbook documentation
o 'Bookmark' icon to make kio-sword pages appear with their own bookmark o 'Bookmark' icon to make tdeio-sword pages appear with their own bookmark

266
acinclude.m4
Unescape View File

@ -23,8 +23,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -103,41 +103,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -371,24 +371,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -547,11 +547,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -602,18 +602,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -710,7 +710,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -937,7 +937,7 @@ mips-sgi-irix6*)
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -1418,7 +1418,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include [ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
]) ])
@ -1459,7 +1459,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -1644,11 +1644,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
]) ])
@ -1785,16 +1785,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1805,8 +1805,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
@ -1824,7 +1824,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by tdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
@ -1839,7 +1839,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi fi
else dnl test -z $1, e.g. from kdelibs else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no" ac_cv_have_kde="have_kde=no"
@ -1979,20 +1979,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2030,7 +2030,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2064,48 +2064,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2170,7 +2170,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else else
case "$1" in case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes" kde_cv_proto_$1="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_$1=unknown kde_cv_proto_$1=unknown
@ -2489,7 +2489,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])
@ -2547,7 +2547,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3447,7 +3447,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -3457,29 +3457,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff=no tdelibsuff=no
fi fi
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]), [/lib directory suffix (64,32,none[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check # TODO: add an auto case that compiles a little C app to check
# where the glibc is # where the glibc is
if test "$kdelibsuff" = "no"; then if test "$tdelibsuff" = "no"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix]) AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi fi
]) ])
@ -3497,7 +3497,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2) AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS AM_KDE_WITH_NLS
@ -4504,7 +4504,7 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4892,14 +4892,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])dnl
dnl This sets the prefix, for arts and kdelibs dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module. dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4923,25 +4923,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -4950,7 +4950,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5607,7 +5607,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include [ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff ac_ssl_libraries="$withval"/lib$tdelibsuff
]) ])
want_ssl=yes want_ssl=yes
@ -5627,7 +5627,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir" ac_ssl_includes="$ssl_incdir"
ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi fi
@ -5864,9 +5864,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES($1,$2,$3,$4) PKG_CHECK_MODULES($1,$2,$3,$4)

266
aclocal.m4 vendored
Unescape View File

@ -35,8 +35,8 @@ dnl IMPORTANT NOTE:
dnl Please do not modify this file unless you expect your modifications to be dnl Please do not modify this file unless you expect your modifications to be
dnl carried into every other module in the repository. dnl carried into every other module in the repository.
dnl dnl
dnl Single-module modifications are best placed in configure.in for kdelibs dnl Single-module modifications are best placed in configure.in for tdelibs
dnl and kdebase or configure.in.in if present. dnl and tdebase or configure.in.in if present.
# KDE_PATH_X_DIRECT # KDE_PATH_X_DIRECT
dnl Internal subroutine of AC_PATH_X. dnl Internal subroutine of AC_PATH_X.
@ -115,41 +115,41 @@ ac_x_libraries=],
[LIBS="$ac_save_LIBS" [LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works. # First see if replacing the include by lib works.
# Check X11 before X11Rn because it is often a symlink to the current release. # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${kdelibsuff}/` \ for ac_dir in `echo "$ac_x_includes" | sed s/include/lib${tdelibsuff}/` \
/usr/X11/lib${kdelibsuff} \ /usr/X11/lib${tdelibsuff} \
/usr/X11R6/lib${kdelibsuff} \ /usr/X11R6/lib${tdelibsuff} \
/usr/X11R5/lib${kdelibsuff} \ /usr/X11R5/lib${tdelibsuff} \
/usr/X11R4/lib${kdelibsuff} \ /usr/X11R4/lib${tdelibsuff} \
\ \
/usr/lib${kdelibsuff}/X11 \ /usr/lib${tdelibsuff}/X11 \
/usr/lib${kdelibsuff}/X11R6 \ /usr/lib${tdelibsuff}/X11R6 \
/usr/lib${kdelibsuff}/X11R5 \ /usr/lib${tdelibsuff}/X11R5 \
/usr/lib${kdelibsuff}/X11R4 \ /usr/lib${tdelibsuff}/X11R4 \
\ \
/usr/local/X11/lib${kdelibsuff} \ /usr/local/X11/lib${tdelibsuff} \
/usr/local/X11R6/lib${kdelibsuff} \ /usr/local/X11R6/lib${tdelibsuff} \
/usr/local/X11R5/lib${kdelibsuff} \ /usr/local/X11R5/lib${tdelibsuff} \
/usr/local/X11R4/lib${kdelibsuff} \ /usr/local/X11R4/lib${tdelibsuff} \
\ \
/usr/local/lib${kdelibsuff}/X11 \ /usr/local/lib${tdelibsuff}/X11 \
/usr/local/lib${kdelibsuff}/X11R6 \ /usr/local/lib${tdelibsuff}/X11R6 \
/usr/local/lib${kdelibsuff}/X11R5 \ /usr/local/lib${tdelibsuff}/X11R5 \
/usr/local/lib${kdelibsuff}/X11R4 \ /usr/local/lib${tdelibsuff}/X11R4 \
\ \
/usr/X386/lib${kdelibsuff} \ /usr/X386/lib${tdelibsuff} \
/usr/x386/lib${kdelibsuff} \ /usr/x386/lib${tdelibsuff} \
/usr/XFree86/lib${kdelibsuff}/X11 \ /usr/XFree86/lib${tdelibsuff}/X11 \
\ \
/usr/lib${kdelibsuff} \ /usr/lib${tdelibsuff} \
/usr/local/lib${kdelibsuff} \ /usr/local/lib${tdelibsuff} \
/usr/unsupported/lib${kdelibsuff} \ /usr/unsupported/lib${tdelibsuff} \
/usr/athena/lib${kdelibsuff} \ /usr/athena/lib${tdelibsuff} \
/usr/local/x11r5/lib${kdelibsuff} \ /usr/local/x11r5/lib${tdelibsuff} \
/usr/lpp/Xamples/lib${kdelibsuff} \ /usr/lpp/Xamples/lib${tdelibsuff} \
/lib/usr/lib${kdelibsuff}/X11 \ /lib/usr/lib${tdelibsuff}/X11 \
\ \
/usr/openwin/lib${kdelibsuff} \ /usr/openwin/lib${tdelibsuff} \
/usr/openwin/share/lib${kdelibsuff} \ /usr/openwin/share/lib${tdelibsuff} \
; \ ; \
do do
dnl Don't even attempt the hair of trying to link an X program! dnl Don't even attempt the hair of trying to link an X program!
@ -383,24 +383,24 @@ AC_DEFUN([KDE_1_CHECK_PATHS],
fi fi
AC_MSG_CHECKING([for KDE libraries installed]) AC_MSG_CHECKING([for KDE libraries installed])
ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -lkdecore $LIBQT $KDE_TEST_RPATH 1>&5' ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS $all_libraries conftest.$ac_ext $LIBS -ltdecore $LIBQT $KDE_TEST_RPATH 1>&5'
if AC_TRY_EVAL(ac_link) && test -s conftest; then if AC_TRY_EVAL(ac_link) && test -s conftest; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
else else
AC_MSG_ERROR([your system fails at linking a small KDE application! AC_MSG_ERROR([your system fails at linking a small KDE application!
Check, if your compiler is installed correctly and if you have used the Check, if your compiler is installed correctly and if you have used the
same compiler to compile Qt and kdelibs as you did use now. same compiler to compile Qt and tdelibs as you did use now.
For more details about this problem, look at the end of config.log.]) For more details about this problem, look at the end of config.log.])
fi fi
if eval `KDEDIR= ./conftest 2>&5`; then if eval `TDEDIR= ./conftest 2>&5`; then
kde_result=done kde_result=done
else else
kde_result=problems kde_result=problems
fi fi
KDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log TDEDIR= ./conftest 2> /dev/null >&5 # make an echo for config.log
kde_have_all_paths=yes kde_have_all_paths=yes
KDE_SET_PATHS($kde_result) KDE_SET_PATHS($kde_result)
@ -559,11 +559,11 @@ Please check whether you installed aRts correctly or use
AC_DEFUN([KDE_SET_DEFAULT_BINDIRS], AC_DEFUN([KDE_SET_DEFAULT_BINDIRS],
[ [
kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin" kde_default_bindirs="/usr/bin /usr/local/bin /opt/local/bin /usr/X11R6/bin /opt/kde/bin /opt/kde3/bin /usr/kde/bin /usr/local/kde/bin"
test -n "$KDEDIR" && kde_default_bindirs="$KDEDIR/bin $kde_default_bindirs" test -n "$TDEDIR" && kde_default_bindirs="$TDEDIR/bin $kde_default_bindirs"
if test -n "$KDEDIRS"; then if test -n "$TDEDIRS"; then
kde_save_IFS=$IFS kde_save_IFS=$IFS
IFS=: IFS=:
for dir in $KDEDIRS; do for dir in $TDEDIRS; do
kde_default_bindirs="$dir/bin $kde_default_bindirs " kde_default_bindirs="$dir/bin $kde_default_bindirs "
done done
IFS=$kde_save_IFS IFS=$kde_save_IFS
@ -614,18 +614,18 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$kde32ornewer"; then if test -n "$kde32ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
fi fi
if test -n "$kde33ornewer"; then if test -n "$kde33ornewer"; then
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(maketdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(maketdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
fi fi
KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""]) KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share" kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs" test -n "$TDEDIR" && kde_sharedirs="$TDEDIR/share $kde_sharedirs"
AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET) AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
if test "$KDE_XSL_STYLESHEET" = "NO"; then if test "$KDE_XSL_STYLESHEET" = "NO"; then
KDE_XSL_STYLESHEET="" KDE_XSL_STYLESHEET=""
@ -722,7 +722,7 @@ AC_SUBST(kde_templatesdir)
AC_SUBST(kde_servicesdir) AC_SUBST(kde_servicesdir)
AC_SUBST(kde_servicetypesdir) AC_SUBST(kde_servicetypesdir)
AC_SUBST(kde_moduledir) AC_SUBST(kde_moduledir)
AC_SUBST(kdeinitdir, '$(kde_moduledir)') AC_SUBST(tdeinitdir, '$(kde_moduledir)')
AC_SUBST(kde_styledir) AC_SUBST(kde_styledir)
AC_SUBST(kde_widgetdir) AC_SUBST(kde_widgetdir)
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
@ -949,7 +949,7 @@ mips-sgi-irix6*)
ac_x_includes="." ac_x_includes="."
fi fi
if test -z "$ac_x_libraries"; then if test -z "$ac_x_libraries"; then
ac_x_libraries="/usr/lib${kdelibsuff}" ac_x_libraries="/usr/lib${tdelibsuff}"
fi fi
esac esac
#from now on we use our own again #from now on we use our own again
@ -1430,7 +1430,7 @@ qt_includes=""
AC_ARG_WITH(qt-dir, AC_ARG_WITH(qt-dir,
AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]), AC_HELP_STRING([--with-qt-dir=DIR],[where the root of Qt is installed ]),
[ ac_qt_includes="$withval"/include [ ac_qt_includes="$withval"/include
ac_qt_libraries="$withval"/lib${kdelibsuff} ac_qt_libraries="$withval"/lib${tdelibsuff}
ac_qt_bindir="$withval"/bin ac_qt_bindir="$withval"/bin
]) ])
@ -1471,7 +1471,7 @@ ac_qt_includes="$qt_incdir"
qt_libdirs="" qt_libdirs=""
for dir in $kde_qt_dirs; do for dir in $kde_qt_dirs; do
qt_libdirs="$qt_libdirs $dir/lib${kdelibsuff} $dir" qt_libdirs="$qt_libdirs $dir/lib${tdelibsuff} $dir"
done done
qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries" qt_libdirs="$QTLIB $qt_libdirs /usr/X11R6/lib /usr/lib /usr/local/qt/lib $x_libraries"
if test ! "$ac_qt_libraries" = "NO"; then if test ! "$ac_qt_libraries" = "NO"; then
@ -1656,11 +1656,11 @@ rm -f actest.ui actest.cpp
AC_MSG_RESULT([$kde_cv_uic_plugins]) AC_MSG_RESULT([$kde_cv_uic_plugins])
if test "$kde_cv_uic_plugins" != yes; then if test "$kde_cv_uic_plugins" != yes; then
AC_MSG_ERROR([ AC_MSG_ERROR([
you need to install kdelibs first. you need to install tdelibs first.
If you did install kdelibs, then the Qt version that is picked up by If you did install tdelibs, then the Qt version that is picked up by
this configure is not the same version you used to compile kdelibs. this configure is not the same version you used to compile tdelibs.
The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the The Qt Plugin installed by tdelibs is *ONLY* loadable if it is the
_same Qt version_, compiled with the _same compiler_ and the same Qt _same Qt version_, compiled with the _same compiler_ and the same Qt
configuration settings. configuration settings.
]) ])
@ -1797,16 +1797,16 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test "$kde_qtver" = 1; then if test "$kde_qtver" = 1; then
kde_check_header="ksock.h" kde_check_header="ksock.h"
kde_check_lib="libkdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes" kde_incdirs="$kde_libs_prefix/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/tde /usr/include /opt/kde3/include /opt/kde/include $x_includes $qt_includes"
test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs" test -n "$TDEDIR" && kde_incdirs="$TDEDIR/include $TDEDIR/include/tde $TDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs" kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir) AC_FIND_FILE($kde_check_header, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir" ac_kde_includes="$kde_incdir"
@ -1817,8 +1817,8 @@ in the prefix, you've chosen, are no KDE headers installed. This will fail.
So, check this please and use another prefix!]) So, check this please and use another prefix!])
fi fi
kde_libdirs="$kde_libs_prefix/lib${kdelibsuff} /usr/lib/kde/lib${kdelibsuff} /usr/local/kde/lib${kdelibsuff} /usr/kde/lib${kdelibsuff} /usr/lib${kdelibsuff}/kde /usr/lib${kdelibsuff}/kde3 /usr/lib${kdelibsuff} /usr/X11R6/lib${kdelibsuff} /usr/local/lib${kdelibsuff} /opt/kde3/lib${kdelibsuff} /opt/kde/lib${kdelibsuff} /usr/X11R6/kde/lib${kdelibsuff}" kde_libdirs="$kde_libs_prefix/lib${tdelibsuff} /usr/lib/kde/lib${tdelibsuff} /usr/local/kde/lib${tdelibsuff} /usr/kde/lib${tdelibsuff} /usr/lib${tdelibsuff}/kde /usr/lib${tdelibsuff}/kde3 /usr/lib${tdelibsuff} /usr/X11R6/lib${tdelibsuff} /usr/local/lib${tdelibsuff} /opt/kde3/lib${tdelibsuff} /opt/kde/lib${tdelibsuff} /usr/X11R6/kde/lib${tdelibsuff}"
test -n "$KDEDIR" && kde_libdirs="$KDEDIR/lib${kdelibsuff} $KDEDIR $kde_libdirs" test -n "$TDEDIR" && kde_libdirs="$TDEDIR/lib${tdelibsuff} $TDEDIR $kde_libdirs"
kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs" kde_libdirs="$ac_kde_libraries $libdir $kde_libdirs"
AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir) AC_FIND_FILE($kde_check_lib, $kde_libdirs, kde_libdir)
ac_kde_libraries="$kde_libdir" ac_kde_libraries="$kde_libdir"
@ -1836,7 +1836,7 @@ fi
if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then if test -n "$kde_widgetdir" && test ! -r "$kde_widgetdir/kde3/plugins/designer/kdewidgets.la"; then
AC_MSG_ERROR([ AC_MSG_ERROR([
I can't find the designer plugins. These are required and should have been installed I can't find the designer plugins. These are required and should have been installed
by kdelibs]) by tdelibs])
fi fi
if test -n "$kde_widgetdir"; then if test -n "$kde_widgetdir"; then
@ -1851,7 +1851,7 @@ else
ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries" ac_kde_includes=$ac_kde_includes ac_kde_libraries=$ac_kde_libraries"
fi fi
else dnl test -z $1, e.g. from kdelibs else dnl test -z $1, e.g. from tdelibs
ac_cv_have_kde="have_kde=no" ac_cv_have_kde="have_kde=no"
@ -1991,20 +1991,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2042,7 +2042,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
kde_cxxflags_safe="$CXXFLAGS" kde_cxxflags_safe="$CXXFLAGS"
LIBS="-lkde-qt-addon $LIBQT $LIBS" LIBS="-lkde-qt-addon $LIBQT $LIBS"
CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/kde $all_includes" CXXFLAGS="$CXXFLAGS -I$prefix/include -I$prefix/include/tde $all_includes"
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS" LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([ AC_TRY_LINK([
@ -2076,48 +2076,48 @@ AC_DEFUN([KDE_CREATE_LIBS_ALIASES],
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-lkdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
*) lib_kded="" ;; *) lib_kded="" ;;
esac esac
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-ltdeabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_TDEUTILS, "-ltdeutils")
AC_SUBST(LIB_KDEPIM, "-lkdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_TDEIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_TDEDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_TDEUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_TDESYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_KFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_KDECORE, "-lkdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_KDEUI, "-lkdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_TDEIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_TDESYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_KFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_TDESPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_TDEPARTS, "-ltdeparts")
AC_SUBST(LIB_KDEPRINT, "-lkdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_KDECORE, "-lkdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_KDEUI, "-lkdeui $(LIB_KDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_KDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_KDEUI)") AC_SUBST(LIB_KFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_KDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2182,7 +2182,7 @@ if test "x$kde_cv_func_$1" = xyes; then
else else
case "$1" in case "$1" in
setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat) setenv|unsetenv|usleep|random|srandom|seteuid|mkstemps|mkstemp|revoke|vsnprintf|strlcpy|strlcat)
kde_cv_proto_$1="yes - in libkdefakes" kde_cv_proto_$1="yes - in libtdefakes"
;; ;;
*) *)
kde_cv_proto_$1=unknown kde_cv_proto_$1=unknown
@ -2501,7 +2501,7 @@ if eval "test \"`echo $ac_cv_lib_gif`\" = yes"; then
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif]) AC_DEFINE_UNQUOTED(HAVE_LIBGIF, 1, [Define if you have libgif])
else else
AC_MSG_ERROR(You need giflib30. Please install the kdesupport package) AC_MSG_ERROR(You need giflib30. Please install the tdesupport package)
fi fi
]) ])
@ -2559,7 +2559,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3459,7 +3459,7 @@ LIBTOOL_SHELL="/bin/sh ./libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -3469,29 +3469,29 @@ AC_SUBST(AUTOCONF,'$(SHELL) $(top_srcdir)/admin/cvs.sh configure || touch config
AC_DEFUN([KDE_CHECK_LIB64], AC_DEFUN([KDE_CHECK_LIB64],
[ [
kdelibsuff="$kde_libs_suffix" tdelibsuff="$kde_libs_suffix"
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
kdelibsuff=no tdelibsuff=no
fi fi
AC_ARG_ENABLE(libsuffix, AC_ARG_ENABLE(libsuffix,
AC_HELP_STRING([--enable-libsuffix], AC_HELP_STRING([--enable-libsuffix],
[/lib directory suffix (64,32,none[=default])]), [/lib directory suffix (64,32,none[=default])]),
kdelibsuff=$enableval) tdelibsuff=$enableval)
# TODO: add an auto case that compiles a little C app to check # TODO: add an auto case that compiles a little C app to check
# where the glibc is # where the glibc is
if test "$kdelibsuff" = "no"; then if test "$tdelibsuff" = "no"; then
kdelibsuff= tdelibsuff=
fi fi
if test -z "$kdelibsuff"; then if test -z "$tdelibsuff"; then
AC_MSG_RESULT([not using lib directory suffix]) AC_MSG_RESULT([not using lib directory suffix])
AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories) AC_DEFINE(KDELIBSUFF, [""], Suffix for lib directories)
else else
if test "$libdir" = '${exec_prefix}/lib'; then if test "$libdir" = '${exec_prefix}/lib'; then
libdir="$libdir${kdelibsuff}" libdir="$libdir${tdelibsuff}"
AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms AC_SUBST([libdir], ["$libdir"]) dnl ugly hack for lib64 platforms
fi fi
AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${kdelibsuff}"], Suffix for lib directories) AC_DEFINE_UNQUOTED(KDELIBSUFF, ["${tdelibsuff}"], Suffix for lib directories)
AC_MSG_RESULT([using lib directory suffix $kdelibsuff]) AC_MSG_RESULT([using lib directory suffix $tdelibsuff])
fi fi
]) ])
@ -3509,7 +3509,7 @@ AC_CANONICAL_SYSTEM
AC_ARG_PROGRAM AC_ARG_PROGRAM
AM_INIT_AUTOMAKE($1, $2) AM_INIT_AUTOMAKE($1, $2)
AM_DISABLE_LIBRARIES AM_DISABLE_LIBRARIES
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
AC_CHECK_COMPILERS AC_CHECK_COMPILERS
KDE_PROG_LIBTOOL KDE_PROG_LIBTOOL
AM_KDE_WITH_NLS AM_KDE_WITH_NLS
@ -4516,7 +4516,7 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$kdelibsuff /usr/lib$kdelibsuff /usr/local /usr/lib$kdelibsuff $kde_extra_libs" python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -4904,14 +4904,14 @@ AC_DEFUN([KDE_CONF_FILES],
AC_SUBST(CONF_FILES) AC_SUBST(CONF_FILES)
])dnl ])dnl
dnl This sets the prefix, for arts and kdelibs dnl This sets the prefix, for arts and tdelibs
dnl Do NOT use in any other module. dnl Do NOT use in any other module.
dnl It only looks at --prefix, KDEDIR and falls back to /usr/local/kde dnl It only looks at --prefix, TDEDIR and falls back to /usr/local/kde
AC_DEFUN([KDE_SET_PREFIX_CORE], AC_DEFUN([KDE_SET_PREFIX_CORE],
[ [
unset CDPATH unset CDPATH
dnl make $KDEDIR the default for the installation dnl make $TDEDIR the default for the installation
AC_PREFIX_DEFAULT(${KDEDIR:-/usr/local/kde}) AC_PREFIX_DEFAULT(${TDEDIR:-/usr/local/kde})
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$ac_default_prefix prefix=$ac_default_prefix
@ -4935,25 +4935,25 @@ AC_DEFUN([KDE_SET_PREFIX],
unset CDPATH unset CDPATH
dnl We can't give real code to that macro, only a value. dnl We can't give real code to that macro, only a value.
dnl It only matters for --help, since we set the prefix in this function anyway. dnl It only matters for --help, since we set the prefix in this function anyway.
AC_PREFIX_DEFAULT(${KDEDIR:-the kde prefix}) AC_PREFIX_DEFAULT(${TDEDIR:-the kde prefix})
KDE_SET_DEFAULT_BINDIRS KDE_SET_DEFAULT_BINDIRS
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
dnl no prefix given: look for kde-config in the PATH and deduce the prefix from it dnl no prefix given: look for tde-config in the PATH and deduce the prefix from it
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
else else
dnl prefix given: look for kde-config, preferrably in prefix, otherwise in PATH dnl prefix given: look for tde-config, preferrably in prefix, otherwise in PATH
kde_save_PATH="$PATH" kde_save_PATH="$PATH"
PATH="$exec_prefix/bin:$prefix/bin:$PATH" PATH="$exec_prefix/bin:$prefix/bin:$PATH"
KDE_FIND_PATH(kde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kde-config)], [], prepend) KDE_FIND_PATH(tde-config, KDECONFIG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tde-config)], [], prepend)
PATH="$kde_save_PATH" PATH="$kde_save_PATH"
fi fi
kde_libs_prefix=`$KDECONFIG --prefix` kde_libs_prefix=`$KDECONFIG --prefix`
if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then if test -z "$kde_libs_prefix" || test ! -x "$kde_libs_prefix"; then
AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for kdelibs. AC_MSG_ERROR([$KDECONFIG --prefix outputed the non existant prefix '$kde_libs_prefix' for tdelibs.
This means it has been moved since you installed it. This means it has been moved since you installed it.
This won't work. Please recompile kdelibs for the new prefix. This won't work. Please recompile tdelibs for the new prefix.
]) ])
fi fi
kde_libs_htmldir=`$KDECONFIG --install html --expandvars` kde_libs_htmldir=`$KDECONFIG --install html --expandvars`
@ -4962,7 +4962,7 @@ AC_DEFUN([KDE_SET_PREFIX],
AC_MSG_CHECKING([where to install]) AC_MSG_CHECKING([where to install])
if test "x$prefix" = "xNONE"; then if test "x$prefix" = "xNONE"; then
prefix=$kde_libs_prefix prefix=$kde_libs_prefix
AC_MSG_RESULT([$prefix (as returned by kde-config)]) AC_MSG_RESULT([$prefix (as returned by tde-config)])
else else
dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different dnl --prefix was given. Compare prefixes and warn (in configure.in.bot.end) if different
given_prefix=$prefix given_prefix=$prefix
@ -5619,7 +5619,7 @@ ssl_includes=""
AC_ARG_WITH(ssl-dir, AC_ARG_WITH(ssl-dir,
AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]), AC_HELP_STRING([--with-ssl-dir=DIR],[where the root of OpenSSL is installed]),
[ ac_ssl_includes="$withval"/include [ ac_ssl_includes="$withval"/include
ac_ssl_libraries="$withval"/lib$kdelibsuff ac_ssl_libraries="$withval"/lib$tdelibsuff
]) ])
want_ssl=yes want_ssl=yes
@ -5639,7 +5639,7 @@ AC_CACHE_VAL(ac_cv_have_ssl,
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir) AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
ac_ssl_includes="$ssl_incdir" ac_ssl_includes="$ssl_incdir"
ssl_libdirs="/usr/lib$kdelibsuff /usr/local/lib$kdelibsuff /usr/ssl/lib$kdelibsuff /usr/local/ssl/lib$kdelibsuff $libdir $prefix/lib$kdelibsuff $exec_prefix/lib$kdelibsuff $kde_extra_libs" ssl_libdirs="/usr/lib$tdelibsuff /usr/local/lib$tdelibsuff /usr/ssl/lib$tdelibsuff /usr/local/ssl/lib$tdelibsuff $libdir $prefix/lib$tdelibsuff $exec_prefix/lib$tdelibsuff $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then if test ! "$ac_ssl_libraries" = "NO"; then
ssl_libdirs="$ac_ssl_libraries $ssl_libdirs" ssl_libdirs="$ac_ssl_libraries $ssl_libdirs"
fi fi
@ -5876,9 +5876,9 @@ dnl defines KSTUFF_LIBS, KSTUFF_CFLAGS, see pkg-config man page
dnl also defines KSTUFF_PKG_ERRORS on error dnl also defines KSTUFF_PKG_ERRORS on error
AC_DEFUN([KDE_PKG_CHECK_MODULES], [ AC_DEFUN([KDE_PKG_CHECK_MODULES], [
PKG_CONFIG_PATH="$prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
if test "$prefix" != "$kde_libs_prefix"; then if test "$prefix" != "$kde_libs_prefix"; then
PKG_CONFIG_PATH="$kde_libs_prefix/lib${kdelibsuff}/pkgconfig:$PKG_CONFIG_PATH" PKG_CONFIG_PATH="$kde_libs_prefix/lib${tdelibsuff}/pkgconfig:$PKG_CONFIG_PATH"
fi fi
export PKG_CONFIG_PATH export PKG_CONFIG_PATH
PKG_CHECK_MODULES($1,$2,$3,$4) PKG_CHECK_MODULES($1,$2,$3,$4)

8
configure.in
Unescape View File

@ -40,7 +40,7 @@ dnl Perform program name transformation
AC_ARG_PROGRAM AC_ARG_PROGRAM
dnl Automake doc recommends to do this only here. (Janos) dnl Automake doc recommends to do this only here. (Janos)
AM_INIT_AUTOMAKE(kio_sword, 0.3) dnl searches for some needed programs AM_INIT_AUTOMAKE(tdeio_sword, 0.3) dnl searches for some needed programs
KDE_SET_PREFIX KDE_SET_PREFIX
@ -71,7 +71,7 @@ AC_CHECK_KDEMAXPATHLEN
AC_CHECK_SWORD(1.5.7, [$ac_use_static]) AC_CHECK_SWORD(1.5.7, [$ac_use_static])
AC_CONFIG_FILES([ src/data/kio_sword.css ]) AC_CONFIG_FILES([ src/data/tdeio_sword.css ])
KDE_CREATE_SUBDIRSLIST KDE_CREATE_SUBDIRSLIST
AC_CONFIG_FILES([ Makefile ]) AC_CONFIG_FILES([ Makefile ])
AC_CONFIG_FILES([ doc/Makefile ]) AC_CONFIG_FILES([ doc/Makefile ])
@ -86,13 +86,13 @@ if test -n "$kde_libs_prefix" -a -n "$given_prefix"; then
# And if so, warn when they don't match # And if so, warn when they don't match
if test "$kde_libs_prefix" != "$given_prefix"; then if test "$kde_libs_prefix" != "$given_prefix"; then
# And if kde doesn't know about the prefix yet # And if kde doesn't know about the prefix yet
echo ":"`kde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null echo ":"`tde-config --path exe`":" | grep ":$given_prefix/bin/:" 2>&1 >/dev/null
if test $? -ne 0; then if test $? -ne 0; then
echo "" echo ""
echo "Warning: you chose to install this package in $given_prefix," echo "Warning: you chose to install this package in $given_prefix,"
echo "but KDE was found in $kde_libs_prefix." echo "but KDE was found in $kde_libs_prefix."
echo "For this to work, you will need to tell KDE about the new prefix, by ensuring" echo "For this to work, you will need to tell KDE about the new prefix, by ensuring"
echo "that KDEDIRS contains it, e.g. export KDEDIRS=$given_prefix:$kde_libs_prefix" echo "that TDEDIRS contains it, e.g. export TDEDIRS=$given_prefix:$kde_libs_prefix"
echo "Then restart KDE." echo "Then restart KDE."
echo "" echo ""
fi fi

4
configure.in.in
Unescape View File

@ -1,9 +1,9 @@
#MIN_CONFIG(3.0.0) #MIN_CONFIG(3.0.0)
AM_INIT_AUTOMAKE(kio_sword, 0.3) AM_INIT_AUTOMAKE(tdeio_sword, 0.3)
AC_C_BIGENDIAN AC_C_BIGENDIAN
AC_CHECK_KDEMAXPATHLEN AC_CHECK_KDEMAXPATHLEN
AC_CHECK_SWORD(1.5.8, [$ac_use_static]) AC_CHECK_SWORD(1.5.8, [$ac_use_static])
AC_CONFIG_FILES([ src/data/kio_sword.css ]) AC_CONFIG_FILES([ src/data/tdeio_sword.css ])

2
doc/Makefile.am
Unescape View File

@ -2,5 +2,5 @@
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
KDE_LANG = en KDE_LANG = en
KDE_DOCS = kio_sword KDE_DOCS = tdeio_sword
SUBDIRS = $(AUTODIRS) SUBDIRS = $(AUTODIRS)

2
doc/en/Makefile.am
Unescape View File

@ -1,2 +1,2 @@
KDE_DOCS = kio_sword KDE_DOCS = tdeio_sword
KDE_LANG = en KDE_LANG = en

4
doc/en/compilation.html
Unescape View File

@ -1,9 +1,9 @@
<html><head><title>Compilation and Installation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="previous" href="requirements.html" title="Requirements"><link rel="next" href="configuration.html" title="Configuration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Compilation and Installation</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="requirements.html">Prev</a></td><td align="center" class="navCenter" width="34%">Installation</td><td align="right" class="navRight" width="33%">  <html><head><title>Compilation and Installation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="previous" href="requirements.html" title="Requirements"><link rel="next" href="configuration.html" title="Configuration"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Compilation and Installation</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="requirements.html">Prev</a></td><td align="center" class="navCenter" width="34%">Installation</td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="configuration.html">Next</a></td></tr></tbody></table><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="compilation"></a>Compilation and Installation</h2></div></div><p>In order to compile and install Kio-Sword on your system, first <a accesskey="n" href="configuration.html">Next</a></td></tr></tbody></table><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="compilation"></a>Compilation and Installation</h2></div></div><p>In order to compile and install Kio-Sword on your system, first
unpack the source code. Then type the following in the base directory unpack the source code. Then type the following in the base directory
of the Kio-Sword distribution:</p><pre class="screen"><tt>%</tt> <b><tt><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>./configure</b></span></tt></b> of the Kio-Sword distribution:</p><pre class="screen"><tt>%</tt> <b><tt><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>./configure</b></span></tt></b>
<tt>%</tt> <b><tt><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>make</b></span></tt></b> <tt>%</tt> <b><tt><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>make</b></span></tt></b>
<tt>%</tt> <b><tt><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>make</b></span> install</tt></b> <tt>%</tt> <b><tt><span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>make</b></span> install</tt></b>
</pre><p>You will need the header files for kdelibs4 and SWORD installed on your system.</p><p>You will need to be root before doing the 'make install' step.</p><p>Since Kio-Sword uses <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>autoconf</b></span> and </pre><p>You will need the header files for tdelibs4 and SWORD installed on your system.</p><p>You will need to be root before doing the 'make install' step.</p><p>Since Kio-Sword uses <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>autoconf</b></span> and
<span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>automake</b></span> you should have no trouble compiling it. Should you <span xmlns:doc="http://nwalsh.com/xsl/documentation/1.0" class="command"><b>automake</b></span> you should have no trouble compiling it. Should you
run into problems please report them to the author.</p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="requirements.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="configuration.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Requirements </td><td width="34%" align="center" class="navCenter"><a href="installation.html">Up</a></td><td width="33%" align="right" class="navRight"> Configuration</td></tr></table></body></html> run into problems please report them to the author.</p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="requirements.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="configuration.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Requirements </td><td width="34%" align="center" class="navCenter"><a href="installation.html">Up</a></td><td width="33%" align="right" class="navRight"> Configuration</td></tr></table></body></html>

2
doc/en/configuration.html
Unescape View File

@ -1,2 +1,2 @@
<html><head><title>Configuration</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="previous" href="compilation.html" title="Compilation and Installation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Configuration</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="compilation.html">Prev</a></td><td align="center" class="navCenter" width="34%">Installation</td><td align="right" class="navRight" width="33%">  <html><head><title>Configuration</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="previous" href="compilation.html" title="Compilation and Installation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Configuration</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="compilation.html">Prev</a></td><td align="center" class="navCenter" width="34%">Installation</td><td align="right" class="navRight" width="33%"> 
</td></tr></tbody></table><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="configuration"></a>Configuration</h2></div></div><p>You will need to install SWORD modules before using Kio-Sword.</p><p>User settings can be saved via the 'Settings' page.</p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="compilation.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"></td></tr><tr><td width="33%" align="left" class="navLeft">Compilation and Installation </td><td width="34%" align="center" class="navCenter"><a href="installation.html">Up</a></td><td width="33%" align="right" class="navRight"> </td></tr></table></body></html> </td></tr></tbody></table><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="configuration"></a>Configuration</h2></div></div><p>You will need to install SWORD modules before using Kio-Sword.</p><p>User settings can be saved via the 'Settings' page.</p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="compilation.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"></td></tr><tr><td width="33%" align="left" class="navLeft">Compilation and Installation </td><td width="34%" align="center" class="navCenter"><a href="installation.html">Up</a></td><td width="33%" align="right" class="navRight"> </td></tr></table></body></html>

2
doc/en/credits.html
Unescape View File

@ -1,4 +1,4 @@
<html><head><title>Chapter 4. Credits and License</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="faq.html" title="Chapter 3. Questions and Answers"><link rel="next" href="installation.html" title="Appendix A. Installation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Credits and License</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="faq.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%">  <html><head><title>Chapter 4. Credits and License</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="faq.html" title="Chapter 3. Questions and Answers"><link rel="next" href="installation.html" title="Appendix A. Installation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Credits and License</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="faq.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="installation.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="credits"></a>Chapter 4. Credits and License</h2></div></div><p> <a accesskey="n" href="installation.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="credits"></a>Chapter 4. Credits and License</h2></div></div><p>
Program and documentation copyright 2004-2006 Luke Plant <tt>&lt;<a href="mailto:L.Plant.98@cantab.net">L.Plant.98@cantab.net</a>&gt;</tt> Program and documentation copyright 2004-2006 Luke Plant <tt>&lt;<a href="mailto:L.Plant.98@cantab.net">L.Plant.98@cantab.net</a>&gt;</tt>
</p><p>This program is licensed under the terms of the <a href="common/gpl-license.html" target="_top">GNU General Public License</a>.</p><p>The code also draws ideas, methods and some code from <a href="http://www.bibletime.info" target="_top">BibleTime</a> </p><p>This program is licensed under the terms of the <a href="common/gpl-license.html" target="_top">GNU General Public License</a>.</p><p>The code also draws ideas, methods and some code from <a href="http://www.bibletime.info" target="_top">BibleTime</a>

4
doc/en/faq.html
Unescape View File

@ -1,7 +1,7 @@
<html><head><title>Chapter 3. Questions and Answers</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="using-kio_sword.html" title="Chapter 2. Using Kio-Sword"><link rel="next" href="credits.html" title="Chapter 4. Credits and License"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Questions and Answers</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="using-kio_sword.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%">  <html><head><title>Chapter 3. Questions and Answers</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="using-tdeio_sword.html" title="Chapter 2. Using Kio-Sword"><link rel="next" href="credits.html" title="Chapter 4. Credits and License"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Questions and Answers</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="using-tdeio_sword.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="credits.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="faq"></a>Chapter 3. Questions and Answers</h2></div></div><p>This document may have been updated since your installation. <a accesskey="n" href="credits.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="faq"></a>Chapter 3. Questions and Answers</h2></div></div><p>This document may have been updated since your installation.
You can find the latest version at <a href="http://docs.kde.org/current/kde-module/" target="_top">http://docs.kde.org/current/kde-module/</a>.</p><div class="qandaset"><dl><dt>3.1. <a href="faq.html#id2456316">I get the message 'No modules installed!'</a></dt></dl><table border="0"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="id2456390"></a><a name="id2456316"></a><b>3.1. </b></td><td align="left" valign="top"><p>I get the message 'No modules installed!'</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>Kio-Sword uses the SWORD modules already installed on your system. You can find the latest version at <a href="http://docs.kde.org/current/kde-module/" target="_top">http://docs.kde.org/current/kde-module/</a>.</p><div class="qandaset"><dl><dt>3.1. <a href="faq.html#id2456316">I get the message 'No modules installed!'</a></dt></dl><table border="0"><col align="left" width="1%"><tbody><tr class="question"><td align="left" valign="top"><a name="id2456390"></a><a name="id2456316"></a><b>3.1. </b></td><td align="left" valign="top"><p>I get the message 'No modules installed!'</p></td></tr><tr class="answer"><td align="left" valign="top"><b></b></td><td align="left" valign="top"><p>Kio-Sword uses the SWORD modules already installed on your system.
You need to install some modules from <a href="http://www.crosswire.org" target="_top">Crosswire.org</a> You need to install some modules from <a href="http://www.crosswire.org" target="_top">Crosswire.org</a>
or use a SWORD frontend such as <a href="http://www.bibletime.info" target="_top">BibleTime</a> to install the or use a SWORD frontend such as <a href="http://www.bibletime.info" target="_top">BibleTime</a> to install the
modules you want. You may need to edit your sword configuration in ~/.sword/ or /etc/sword as per modules you want. You may need to edit your sword configuration in ~/.sword/ or /etc/sword as per
the instructions on crosswire.org</p></td></tr></tbody></table></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="using-kio_sword.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="credits.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Using Kio-Sword </td><td width="34%" align="center" class="navCenter"><a href="index.html">Up</a></td><td width="33%" align="right" class="navRight"> Credits and License</td></tr></table></body></html> the instructions on crosswire.org</p></td></tr></tbody></table></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="using-tdeio_sword.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="credits.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Using Kio-Sword </td><td width="34%" align="center" class="navCenter"><a href="index.html">Up</a></td><td width="33%" align="right" class="navRight"> Credits and License</td></tr></table></body></html>

44
doc/en/index.docbook
Unescape View File

@ -1,8 +1,8 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [ <!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
<!ENTITY kio_sword "<application>Kio-Sword</application>"> <!ENTITY tdeio_sword "<application>Kio-Sword</application>">
<!ENTITY kappname "&kio_sword;"><!-- Do *not* replace kappname--> <!ENTITY kappname "&tdeio_sword;"><!-- Do *not* replace kappname-->
<!ENTITY package "kde-module"><!-- kdebase, kdeadmin, etc --> <!ENTITY package "kde-module"><!-- tdebase, tdeadmin, etc -->
<!ENTITY % addindex "IGNORE"> <!ENTITY % addindex "IGNORE">
<!ENTITY % English "INCLUDE"><!-- change language only here --> <!ENTITY % English "INCLUDE"><!-- change language only here -->
@ -16,7 +16,7 @@
<book lang="&language;"> <book lang="&language;">
<bookinfo> <bookinfo>
<title>The &kio_sword; Handbook</title> <title>The &tdeio_sword; Handbook</title>
<authorgroup> <authorgroup>
<author> <author>
@ -58,7 +58,7 @@ Do NOT change these in the translation. -->
<abstract> <abstract>
<para> <para>
&kio_sword; is a Bible reading tool written for the &kde; environment. It is a &tdeio_sword; is a Bible reading tool written for the &kde; environment. It is a
front-end for the SWORD Bible system, and enables you to view, browse and search front-end for the SWORD Bible system, and enables you to view, browse and search
your SWORD modules from the web browser (Konqueror). your SWORD modules from the web browser (Konqueror).
</para> </para>
@ -66,14 +66,14 @@ Do NOT change these in the translation. -->
<keywordset> <keywordset>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>kio_sword</keyword> <keyword>tdeio_sword</keyword>
<keyword>kio-sword</keyword> <keyword>tdeio-sword</keyword>
<keyword>Kio-Sword</keyword> <keyword>Kio-Sword</keyword>
<keyword>kiosword</keyword> <keyword>kiosword</keyword>
<keyword>sword</keyword> <keyword>sword</keyword>
<keyword>SWORD</keyword> <keyword>SWORD</keyword>
<keyword>Bible</keyword> <keyword>Bible</keyword>
<keyword>kio</keyword> <keyword>tdeio</keyword>
</keywordset> </keywordset>
</bookinfo> </bookinfo>
@ -82,7 +82,7 @@ Do NOT change these in the translation. -->
<title>Introduction</title> <title>Introduction</title>
<para> <para>
&kio_sword; is a Bible reading tool written for the &kde; environment. It is a &tdeio_sword; is a Bible reading tool written for the &kde; environment. It is a
front-end for the SWORD Bible system, and enables you to view, browse and search front-end for the SWORD Bible system, and enables you to view, browse and search
your SWORD modules from the web browser (Konqueror). It is intended to your SWORD modules from the web browser (Konqueror). It is intended to
be a lightweight companion to programs like BibleTime (for the KDE environment) be a lightweight companion to programs like BibleTime (for the KDE environment)
@ -93,10 +93,10 @@ Do NOT change these in the translation. -->
</para> </para>
</chapter> </chapter>
<chapter id="using-kio_sword"> <chapter id="using-tdeio_sword">
<title>Using &kio_sword;</title> <title>Using &tdeio_sword;</title>
<para>To start using &kio_sword; simply type <ulink url="sword:/">sword:/</ulink> <para>To start using &tdeio_sword; simply type <ulink url="sword:/">sword:/</ulink>
in the location bar in Konqueror, and start browsing your SWORD modules. in the location bar in Konqueror, and start browsing your SWORD modules.
To go directly to a section of a module, use a URL like this: To go directly to a section of a module, use a URL like this:
<userinput>sword:/[modulename]/[reference]</userinput> <userinput>sword:/[modulename]/[reference]</userinput>
@ -151,7 +151,7 @@ application work. -->
<para>I get the message 'No modules installed!'</para> <para>I get the message 'No modules installed!'</para>
</question> </question>
<answer> <answer>
<para>&kio_sword; uses the SWORD modules already installed on your system. <para>&tdeio_sword; uses the SWORD modules already installed on your system.
You need to install some modules from <ulink url="http://www.crosswire.org">Crosswire.org</ulink> You need to install some modules from <ulink url="http://www.crosswire.org">Crosswire.org</ulink>
or use a SWORD frontend such as <ulink url="http://www.bibletime.info">BibleTime</ulink> to install the or use a SWORD frontend such as <ulink url="http://www.bibletime.info">BibleTime</ulink> to install the
modules you want. You may need to edit your sword configuration in ~/.sword/ or /etc/sword as per modules you want. You may need to edit your sword configuration in ~/.sword/ or /etc/sword as per
@ -177,9 +177,9 @@ Program and documentation copyright 2004-2006 Luke Plant <email>L&#46;Plant&#46;
&underGPL; <!-- GPL License --> &underGPL; <!-- GPL License -->
<para>The code also draws ideas, methods and some code from <ulink url="http://www.bibletime.info">BibleTime</ulink> <para>The code also draws ideas, methods and some code from <ulink url="http://www.bibletime.info">BibleTime</ulink>
Diatheke (included in the SWORD source distribution) and the SWORD libraries themselves (all of which are GPL software). See also the AUTHORS file distributed with &kio_sword; for other contributions.</para> Diatheke (included in the SWORD source distribution) and the SWORD libraries themselves (all of which are GPL software). See also the AUTHORS file distributed with &tdeio_sword; for other contributions.</para>
<para>This &kio_sword; handbook is part of &kio_sword; and is licensed under the same terms. <para>This &tdeio_sword; handbook is part of &tdeio_sword; and is licensed under the same terms.
</para> </para>
<!-- TRANS:CREDIT_FOR_TRANSLATORS --> <!-- TRANS:CREDIT_FOR_TRANSLATORS -->
@ -196,10 +196,10 @@ Program and documentation copyright 2004-2006 Luke Plant <email>L&#46;Plant&#46;
<appendix id="installation"> <appendix id="installation">
<title>Installation</title> <title>Installation</title>
<sect1 id="getting-kio_sword"> <sect1 id="getting-tdeio_sword">
<title>How to obtain &kio_sword;</title> <title>How to obtain &tdeio_sword;</title>
<para>Download from <ulink url="http://lukeplant.me.uk/kio-sword/">The &kio_sword; home page</ulink> </para> <para>Download from <ulink url="http://lukeplant.me.uk/kio-sword/">The &tdeio_sword; home page</ulink> </para>
<!-- This first entity contains boiler plate for applications that are <!-- This first entity contains boiler plate for applications that are
part of KDE CVS. You should remove it if you are releasing your part of KDE CVS. You should remove it if you are releasing your
application --> application -->
@ -212,8 +212,8 @@ application -->
<title>Requirements</title> <title>Requirements</title>
<!-- <!--
List any special requirements for your application here. This should include: List any special requirements for your application here. This should include:
.Libraries or other software that is not included in kdesupport, .Libraries or other software that is not included in tdesupport,
kdelibs, or kdebase. tdelibs, or tdebase.
.Hardware requirements like amount of RAM, disk space, graphics card .Hardware requirements like amount of RAM, disk space, graphics card
capabilities, screen resolution, special expansion cards, etc. capabilities, screen resolution, special expansion cards, etc.
.Operating systems the app will run on. If your app is designed only for a .Operating systems the app will run on. If your app is designed only for a
@ -248,7 +248,7 @@ url="http://apps.kde.org/kio_sword">http://apps.kde.org/kio_sword</ulink>.
<prompt>%</prompt> <userinput><command>make</command> install</userinput> <prompt>%</prompt> <userinput><command>make</command> install</userinput>
</screen> </screen>
<para>You will need the header files for kdelibs4 and SWORD installed on your system.</para> <para>You will need the header files for tdelibs4 and SWORD installed on your system.</para>
<para>You will need to be root before doing the 'make install' step.</para> <para>You will need to be root before doing the 'make install' step.</para>
@ -261,7 +261,7 @@ run into problems please report them to the author.</para>
<sect1 id="configuration"> <sect1 id="configuration">
<title>Configuration</title> <title>Configuration</title>
<para>You will need to install SWORD modules before using &kio_sword;.</para> <para>You will need to install SWORD modules before using &tdeio_sword;.</para>
<para>User settings can be saved via the 'Settings' page.</para> <para>User settings can be saved via the 'Settings' page.</para>
</sect1> </sect1>

4
doc/en/index.html
Unescape View File

@ -1,6 +1,6 @@
<html><head><title>The Kio-Sword Handbook</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>The Kio-Sword Handbook</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%">  <html><head><title>The Kio-Sword Handbook</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="next" href="introduction.html" title="Chapter 1. Introduction"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>The Kio-Sword Handbook</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="introduction.html">Next</a></td></tr></tbody></table><div class="book"><div class="titlepage"><div><h1 class="title"><a name="id2369976"></a>The Kio-Sword Handbook</h1></div><div><p class="author"> Luke Plant <tt>&lt;L.Plant.98@cantab.net&gt;</tt></p></div><div>Revision <span class="releaseinfo">0.3.0 (<span class="date">2006-12-16</span>)</span></div><div><p class="copyright">Copyright © 2004-2006 Luke Plant</p></div><div><div><div class="abstract"><p> <a accesskey="n" href="introduction.html">Next</a></td></tr></tbody></table><div class="book"><div class="titlepage"><div><h1 class="title"><a name="id2369976"></a>The Kio-Sword Handbook</h1></div><div><p class="author"> Luke Plant <tt>&lt;L.Plant.98@cantab.net&gt;</tt></p></div><div>Revision <span class="releaseinfo">0.3.0 (<span class="date">2006-12-16</span>)</span></div><div><p class="copyright">Copyright © 2004-2006 Luke Plant</p></div><div><div><div class="abstract"><p>
Kio-Sword is a Bible reading tool written for the KDE environment. It is a Kio-Sword is a Bible reading tool written for the KDE environment. It is a
front-end for the SWORD Bible system, and enables you to view, browse and search front-end for the SWORD Bible system, and enables you to view, browse and search
your SWORD modules from the web browser (Konqueror). your SWORD modules from the web browser (Konqueror).
</p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="introduction.html">Introduction</a></dt><dt>2. <a href="using-kio_sword.html">Using Kio-Sword</a></dt><dt>3. <a href="faq.html">Questions and Answers</a></dt><dt>4. <a href="credits.html">Credits and License</a></dt><dt>A. <a href="installation.html">Installation</a></dt><dd><dl><dt><a href="installation.html#getting-kio_sword">How to obtain Kio-Sword</a></dt><dt><a href="requirements.html">Requirements</a></dt><dt><a href="compilation.html">Compilation and Installation</a></dt><dt><a href="configuration.html">Configuration</a></dt></dl></dd></dl></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"></td><td width="34%" align="center" valign="top" class="navCenter"> </td><td width="33%" align="right" valign="top" class="navRight"><a href="introduction.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft"> </td><td width="34%" align="center" class="navCenter"> </td><td width="33%" align="right" class="navRight"> Introduction</td></tr></table></body></html> </p></div></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt>1. <a href="introduction.html">Introduction</a></dt><dt>2. <a href="using-tdeio_sword.html">Using Kio-Sword</a></dt><dt>3. <a href="faq.html">Questions and Answers</a></dt><dt>4. <a href="credits.html">Credits and License</a></dt><dt>A. <a href="installation.html">Installation</a></dt><dd><dl><dt><a href="installation.html#getting-tdeio_sword">How to obtain Kio-Sword</a></dt><dt><a href="requirements.html">Requirements</a></dt><dt><a href="compilation.html">Compilation and Installation</a></dt><dt><a href="configuration.html">Configuration</a></dt></dl></dd></dl></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"></td><td width="34%" align="center" valign="top" class="navCenter"> </td><td width="33%" align="right" valign="top" class="navRight"><a href="introduction.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft"> </td><td width="34%" align="center" class="navCenter"> </td><td width="33%" align="right" class="navRight"> Introduction</td></tr></table></body></html>

4
doc/en/installation.html
Unescape View File

@ -1,2 +1,2 @@
<html><head><title>Appendix A. Installation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="credits.html" title="Chapter 4. Credits and License"><link rel="next" href="requirements.html" title="Requirements"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Installation</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="credits.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%">  <html><head><title>Appendix A. Installation</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="credits.html" title="Chapter 4. Credits and License"><link rel="next" href="requirements.html" title="Requirements"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Installation</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="credits.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="requirements.html">Next</a></td></tr></tbody></table><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="installation"></a>Appendix A. Installation</h2></div></div><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="getting-kio_sword"></a>How to obtain Kio-Sword</h2></div></div><p>Download from <a href="http://lukeplant.me.uk/kio-sword/" target="_top">The Kio-Sword home page</a> </p></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="credits.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="requirements.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Credits and License </td><td width="34%" align="center" class="navCenter"><a href="index.html">Up</a></td><td width="33%" align="right" class="navRight"> Requirements</td></tr></table></body></html> <a accesskey="n" href="requirements.html">Next</a></td></tr></tbody></table><div class="appendix"><div class="titlepage"><div><h2 class="title"><a name="installation"></a>Appendix A. Installation</h2></div></div><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="getting-tdeio_sword"></a>How to obtain Kio-Sword</h2></div></div><p>Download from <a href="http://lukeplant.me.uk/kio-sword/" target="_top">The Kio-Sword home page</a> </p></div></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="credits.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="requirements.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Credits and License </td><td width="34%" align="center" class="navCenter"><a href="index.html">Up</a></td><td width="33%" align="right" class="navRight"> Requirements</td></tr></table></body></html>

6
doc/en/introduction.html
Unescape View File

@ -1,9 +1,9 @@
<html><head><title>Chapter 1. Introduction</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="index.html" title="The Kio-Sword Handbook"><link rel="next" href="using-kio_sword.html" title="Chapter 2. Using Kio-Sword"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Introduction</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="index.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%">  <html><head><title>Chapter 1. Introduction</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="index.html" title="The Kio-Sword Handbook"><link rel="next" href="using-tdeio_sword.html" title="Chapter 2. Using Kio-Sword"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Introduction</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="index.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="using-kio_sword.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="introduction"></a>Chapter 1. Introduction</h2></div></div><p> <a accesskey="n" href="using-tdeio_sword.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="introduction"></a>Chapter 1. Introduction</h2></div></div><p>
Kio-Sword is a Bible reading tool written for the KDE environment. It is a Kio-Sword is a Bible reading tool written for the KDE environment. It is a
front-end for the SWORD Bible system, and enables you to view, browse and search front-end for the SWORD Bible system, and enables you to view, browse and search
your SWORD modules from the web browser (Konqueror). It is intended to your SWORD modules from the web browser (Konqueror). It is intended to
be a lightweight companion to programs like BibleTime (for the KDE environment) be a lightweight companion to programs like BibleTime (for the KDE environment)
and other SWORD programs. and other SWORD programs.
</p><p> Please report any problems or feature requests to the author. </p><p> Please report any problems or feature requests to the author.
</p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="index.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="using-kio_sword.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">The Kio-Sword Handbook </td><td width="34%" align="center" class="navCenter"><a href="index.html">Up</a></td><td width="33%" align="right" class="navRight"> Using Kio-Sword</td></tr></table></body></html> </p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="index.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="using-tdeio_sword.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">The Kio-Sword Handbook </td><td width="34%" align="center" class="navCenter"><a href="index.html">Up</a></td><td width="33%" align="right" class="navRight"> Using Kio-Sword</td></tr></table></body></html>

2
doc/en/requirements.html
Unescape View File

@ -1,4 +1,4 @@
<html><head><title>Requirements</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="previous" href="installation.html" title="Appendix A. Installation"><link rel="next" href="compilation.html" title="Compilation and Installation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Requirements</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="installation.html">Prev</a></td><td align="center" class="navCenter" width="34%">Installation</td><td align="right" class="navRight" width="33%">  <html><head><title>Requirements</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="installation.html" title="Appendix A. Installation"><link rel="previous" href="installation.html" title="Appendix A. Installation"><link rel="next" href="compilation.html" title="Compilation and Installation"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Requirements</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="installation.html">Prev</a></td><td align="center" class="navCenter" width="34%">Installation</td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="compilation.html">Next</a></td></tr></tbody></table><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="requirements"></a>Requirements</h2></div></div><p>The following libraries are required:</p><p>SWORD 1.5.8 or greater</p><p>KDE 3 or greater</p><p> <a accesskey="n" href="compilation.html">Next</a></td></tr></tbody></table><div class="sect1"><div class="titlepage"><div><h2 class="title" style="clear: both"><a name="requirements"></a>Requirements</h2></div></div><p>The following libraries are required:</p><p>SWORD 1.5.8 or greater</p><p>KDE 3 or greater</p><p>
You can find a list of changes at <a href="http://apps.kde.org/kio_sword" target="_top">http://apps.kde.org/kio_sword</a>. You can find a list of changes at <a href="http://apps.kde.org/kio_sword" target="_top">http://apps.kde.org/kio_sword</a>.
</p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="installation.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="compilation.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Installation </td><td width="34%" align="center" class="navCenter"><a href="installation.html">Up</a></td><td width="33%" align="right" class="navRight"> Compilation and Installation</td></tr></table></body></html> </p></div><table width="100%" class="bottom-nav"><tr><td width="33%" align="left" valign="top" class="navLeft"><a href="installation.html">Prev</a></td><td width="34%" align="center" valign="top" class="navCenter"><a href="index.html">Home</a></td><td width="33%" align="right" valign="top" class="navRight"><a href="compilation.html">Next</a></td></tr><tr><td width="33%" align="left" class="navLeft">Installation </td><td width="34%" align="center" class="navCenter"><a href="installation.html">Up</a></td><td width="33%" align="right" class="navRight"> Compilation and Installation</td></tr></table></body></html>

4
doc/en/using-kio_sword.html → doc/en/using-tdeio_sword.html
Unescape View File

@ -1,5 +1,5 @@
<html><head><title>Chapter 2. Using Kio-Sword</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, kio_sword, kio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, kio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="faq.html" title="Chapter 3. Questions and Answers"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Using Kio-Sword</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="introduction.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%">  <html><head><title>Chapter 2. Using Kio-Sword</title><link rel="stylesheet" href="help:/common/kde-default.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.48"><meta name="keywords" content="KDE, tdeio_sword, tdeio-sword, Kio-Sword, kiosword, sword, SWORD, Bible, tdeio"><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"><meta name="GENERATOR" content="KDE XSL Stylesheet V1.13 using libxslt"><link rel="home" href="index.html" title="The Kio-Sword Handbook"><link rel="up" href="index.html" title="The Kio-Sword Handbook"><link rel="previous" href="introduction.html" title="Chapter 1. Introduction"><link rel="next" href="faq.html" title="Chapter 3. Questions and Answers"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><table border="0" cellpadding="0" cellspacing="0" width="100%"><tr class="header"><td colspan="2"> </td></tr><tr id="logo"><td valign="top"><img src="help:/common/kde_logo.png" alt="KDE - The K Desktop Environment" width="296" height="79" border="0"></td><td valign="middle" align="center" id="location"><h1>Using Kio-Sword</h1></td></tr></table><table width="100%" class="header"><tbody><tr><td align="left" class="navLeft" width="33%"><a accesskey="p" href="introduction.html">Prev</a></td><td align="center" class="navCenter" width="34%"> </td><td align="right" class="navRight" width="33%"> 
<a accesskey="n" href="faq.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="using-kio_sword"></a>Chapter 2. Using Kio-Sword</h2></div></div><p>To start using Kio-Sword simply type <a href="sword:/" target="_top">sword:/</a> <a accesskey="n" href="faq.html">Next</a></td></tr></tbody></table><div class="chapter"><div class="titlepage"><div><h2 class="title"><a name="using-tdeio_sword"></a>Chapter 2. Using Kio-Sword</h2></div></div><p>To start using Kio-Sword simply type <a href="sword:/" target="_top">sword:/</a>
in the location bar in Konqueror, and start browsing your SWORD modules. in the location bar in Konqueror, and start browsing your SWORD modules.
To go directly to a section of a module, use a URL like this: To go directly to a section of a module, use a URL like this:
<b><tt>sword:/[modulename]/[reference]</tt></b> <b><tt>sword:/[modulename]/[reference]</tt></b>

12
src/Makefile.am
Unescape View File

@ -4,20 +4,20 @@ INCLUDES = -I/usr/include/qt3 $(all_includes)
CXXFLAGS += $(USE_EXCEPTIONS) CXXFLAGS += $(USE_EXCEPTIONS)
kde_module_LTLIBRARIES = kio_sword.la kde_module_LTLIBRARIES = tdeio_sword.la
kio_sword_la_SOURCES = kio_sword.cpp renderer.cpp ks_osishtml.cpp ks_gbfhtml.cpp \ tdeio_sword_la_SOURCES = tdeio_sword.cpp renderer.cpp ks_osishtml.cpp ks_gbfhtml.cpp \
ks_thmlhtml.cpp utils.cpp swordutils.cpp swordoptions.cpp filter.cpp template.cpp ks_thmlhtml.cpp utils.cpp swordutils.cpp swordoptions.cpp filter.cpp template.cpp
kio_sword_la_LIBADD = $(LIB_QT) $(LIB_KDECORE) $(LIB_KIO) $(LIB_SWORD) tdeio_sword_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEIO) $(LIB_SWORD)
kio_sword_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN) tdeio_sword_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_PLUGIN)
protocol_DATA = sword.protocol protocol_DATA = sword.protocol
protocoldir = $(kde_servicesdir) protocoldir = $(kde_servicesdir)
messages: rc.cpp messages: rc.cpp
$(XGETTEXT) *.cpp -o $(podir)/kio_sword.pot $(XGETTEXT) *.cpp -o $(podir)/tdeio_sword.pot
noinst_HEADERS = kio_sword.h renderer.h swordoptions.h ks_osishtml.h \ noinst_HEADERS = tdeio_sword.h renderer.h swordoptions.h ks_osishtml.h \
ks_gbfhtml.h ks_thmlhtml.h utils.h swordutils.h option.h filter.h template.h ks_gbfhtml.h ks_thmlhtml.h utils.h swordutils.h option.h filter.h template.h

4
src/data/Makefile.am
Unescape View File

@ -1,4 +1,4 @@
kiosworddatadir = $(kde_datadir)/kio_sword kiosworddatadir = $(kde_datadir)/tdeio_sword
kiosworddata_DATA = kio_sword.css swordvertical.png kiosworddata_DATA = tdeio_sword.css swordvertical.png
EXTRA_DIST = $(kiosworddata_DATA) EXTRA_DIST = $(kiosworddata_DATA)

2
src/data/kio_sword.css → src/data/tdeio_sword.css
Unescape View File

@ -17,7 +17,7 @@ div.content
margin: 0px; margin: 0px;
background: #ffffff; background: #ffffff;
border: solid #808080 1px; border: solid #808080 1px;
/* background-image: url('file:///usr/share/apps/kio_sword/swordvertical.png'); /* background-image: url('file:///usr/share/apps/tdeio_sword/swordvertical.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 50% 50%; */ background-position: 50% 50%; */
} }

2
src/data/kio_sword.css.in → src/data/tdeio_sword.css.in
Unescape View File

@ -17,7 +17,7 @@ div.content
margin: 0px; margin: 0px;
background: #ffffff; background: #ffffff;
border: solid #808080 1px; border: solid #808080 1px;
/* background-image: url('file://@prefix@/share/apps/kio_sword/swordvertical.png'); /* background-image: url('file://@prefix@/share/apps/tdeio_sword/swordvertical.png');
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: 50% 50%; */ background-position: 50% 50%; */
} }

2
src/filter.h
Unescape View File

@ -1,6 +1,6 @@
/*************************************************************************** /***************************************************************************
File: filter.h File: filter.h
Project: kio-sword -- An ioslave for SWORD and KDE Project: tdeio-sword -- An ioslave for SWORD and KDE
Copyright: Copyright (C) 2005 Luke Plant Copyright: Copyright (C) 2005 Luke Plant
***************************************************************************/ ***************************************************************************/

20
src/option.h
Unescape View File

@ -24,7 +24,7 @@
#ifndef option_h #ifndef option_h
#define option_h #define option_h
#include <kconfig.h> #include <tdeconfig.h>
#include <ntqstring.h> #include <ntqstring.h>
#include <ntqmap.h> #include <ntqmap.h>
@ -36,8 +36,8 @@ namespace KioSword
public: public:
virtual void readFromQueryString(TQMap<TQString, TQString> params, bool allowPropagating) = 0; virtual void readFromQueryString(TQMap<TQString, TQString> params, bool allowPropagating) = 0;
virtual void getQueryStringPair(TQString& name, TQString& val) = 0; virtual void getQueryStringPair(TQString& name, TQString& val) = 0;
virtual void readFromConfig(const KConfig* config) = 0; virtual void readFromConfig(const TDEConfig* config) = 0;
virtual void saveToConfig(KConfig* config) = 0; virtual void saveToConfig(TDEConfig* config) = 0;
virtual void copy(const OptionBase* other) = 0; virtual void copy(const OptionBase* other) = 0;
virtual ~OptionBase() {}; virtual ~OptionBase() {};
@ -75,7 +75,7 @@ namespace KioSword
} }
/** return the config setting */ /** return the config setting */
T readConfigSetting(const KConfig* config) T readConfigSetting(const TDEConfig* config)
{ {
// We will specialise this later // We will specialise this later
T result; T result;
@ -186,7 +186,7 @@ namespace KioSword
} }
/** read and set the value from the config file, or set to default if no config setting */ /** read and set the value from the config file, or set to default if no config setting */
virtual void readFromConfig(const KConfig* config) virtual void readFromConfig(const TDEConfig* config)
{ {
if (!m_configName.isEmpty()) if (!m_configName.isEmpty())
{ {
@ -200,11 +200,11 @@ namespace KioSword
} }
/** save the value to the config file */ /** save the value to the config file */
virtual void saveToConfig(KConfig* config) virtual void saveToConfig(TDEConfig* config)
{ {
if (!m_configName.isEmpty()) if (!m_configName.isEmpty())
{ {
// overloads for KConfig::writeEntry cater // overloads for TDEConfig::writeEntry cater
// for everything we need so far // for everything we need so far
if (m_value != m_default_value) // keep settings file tidy if (m_value != m_default_value) // keep settings file tidy
{ {
@ -279,19 +279,19 @@ namespace KioSword
// readConfigSetting specialisations // readConfigSetting specialisations
template<> template<>
inline bool Option<bool>::readConfigSetting(const KConfig* config) inline bool Option<bool>::readConfigSetting(const TDEConfig* config)
{ {
return config->readBoolEntry(m_configName, m_default_value); return config->readBoolEntry(m_configName, m_default_value);
} }
template<> template<>
inline TQString Option<TQString>::readConfigSetting(const KConfig* config) inline TQString Option<TQString>::readConfigSetting(const TDEConfig* config)
{ {
return config->readEntry(m_configName, m_default_value); return config->readEntry(m_configName, m_default_value);
} }
template<> template<>
inline int Option<int>::readConfigSetting(const KConfig* config) inline int Option<int>::readConfigSetting(const TDEConfig* config)
{ {
return config->readNumEntry(m_configName, m_default_value); return config->readNumEntry(m_configName, m_default_value);
} }

20
src/pics/Makefile.am
Unescape View File

@ -1,11 +1,11 @@
KDE_ICON = kio_sword KDE_ICON = tdeio_sword
EXTRA_DIST = kio_sword_everything.svg \ EXTRA_DIST = tdeio_sword_everything.svg \
kio_sword_borders.xcf \ tdeio_sword_borders.xcf \
hisc-app-kio_sword.svgz \ hisc-app-tdeio_sword.svgz \
hi128-app-kio_sword.png \ hi128-app-tdeio_sword.png \
hi64-app-kio_sword.png \ hi64-app-tdeio_sword.png \
hi48-app-kio_sword.png \ hi48-app-tdeio_sword.png \
hi32-app-kio_sword.png \ hi32-app-tdeio_sword.png \
hi22-app-kio_sword.png \ hi22-app-tdeio_sword.png \
hi16-app-kio_sword.png hi16-app-tdeio_sword.png

0
src/pics/hi128-app-kio_sword.png → src/pics/hi128-app-tdeio_sword.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

0
src/pics/hi16-app-kio_sword.png → src/pics/hi16-app-tdeio_sword.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 679 B

After

Width:  |  Height:  |  Size: 679 B

0
src/pics/hi22-app-kio_sword.png → src/pics/hi22-app-tdeio_sword.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1011 B

After

Width:  |  Height:  |  Size: 1011 B

0
src/pics/hi32-app-kio_sword.png → src/pics/hi32-app-tdeio_sword.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

0
src/pics/hi48-app-kio_sword.png → src/pics/hi48-app-tdeio_sword.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.7 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

0
src/pics/hi64-app-kio_sword.png → src/pics/hi64-app-tdeio_sword.png
Unescape View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

0
src/pics/hisc-app-kio_sword.svgz → src/pics/hisc-app-tdeio_sword.svgz
Unescape View File

0
src/pics/kio_sword_borders.xcf → src/pics/tdeio_sword_borders.xcf
Unescape View File

8
src/pics/kio_sword_everything.svg → src/pics/tdeio_sword_everything.svg
Unescape View File

@ -10,8 +10,8 @@
id="svg574" id="svg574"
sodipodi:version="0.32" sodipodi:version="0.32"
inkscape:version="0.39cvs" inkscape:version="0.39cvs"
sodipodi:docname="kio_sword_everything.svg" sodipodi:docname="tdeio_sword_everything.svg"
sodipodi:docbase="/home/luke/my_devel/kio_sword/src/pics" sodipodi:docbase="/home/luke/my_devel/tdeio_sword/src/pics"
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@ -1689,7 +1689,7 @@
<tspan <tspan
x="-211.79260" x="-211.79260"
y="-233.36720" y="-233.36720"
id="tspan1083">KIO-SWORD</tspan> id="tspan1083">TDEIO-SWORD</tspan>
</text> </text>
<text <text
@ -1703,7 +1703,7 @@
<tspan <tspan
x="-209.93480" x="-209.93480"
y="-234.89661" y="-234.89661"
id="tspan1095">KIO-SWORD</tspan> id="tspan1095">TDEIO-SWORD</tspan>
</text> </text>
<text <text
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 56 KiB

After

Width:  |  Height:  |  Size: 56 KiB

2
src/renderer.cpp
Unescape View File

@ -45,7 +45,7 @@
// KDE // KDE
#include <klocale.h> #include <tdelocale.h>
// QT // QT
#include <ntqstring.h> #include <ntqstring.h>

8
src/sword.protocol
Unescape View File

@ -1,13 +1,13 @@
[Protocol] [Protocol]
exec=kio_sword exec=tdeio_sword
protocol=sword protocol=sword
input=none input=none
output=filesystem output=filesystem
reading=true reading=true
defaultMimetype=text/html defaultMimetype=text/html
Icon=kio_sword Icon=tdeio_sword
Description=A kioslave for quick access to Bible texts within Konqueror Description=A tdeioslave for quick access to Bible texts within Konqueror
DocPath=kio_sword/index.html DocPath=tdeio_sword/index.html
determineMimetypeFromExtension=false determineMimetypeFromExtension=false
Class=:local Class=:local
URIMode=uri URIMode=uri

4
src/swordoptions.cpp
Unescape View File

@ -127,7 +127,7 @@ namespace KioSword
/** Read all options in from the config file/defaults */ /** Read all options in from the config file/defaults */
void SwordOptions::readFromConfig(const KConfig* config) void SwordOptions::readFromConfig(const TDEConfig* config)
{ {
vector<OptionBase*>::const_iterator it; vector<OptionBase*>::const_iterator it;
vector<OptionBase*>::const_iterator it_end = m_optionList.end(); vector<OptionBase*>::const_iterator it_end = m_optionList.end();
@ -139,7 +139,7 @@ namespace KioSword
} }
/** Save all options to the config file */ /** Save all options to the config file */
void SwordOptions::saveToConfig(KConfig* config) void SwordOptions::saveToConfig(TDEConfig* config)
{ {
vector<OptionBase*>::const_iterator it; vector<OptionBase*>::const_iterator it;
vector<OptionBase*>::const_iterator it_end = m_optionList.end(); vector<OptionBase*>::const_iterator it_end = m_optionList.end();

6
src/swordoptions.h
Unescape View File

@ -28,7 +28,7 @@
#include "option.h" #include "option.h"
// KDE // KDE
#include <kglobal.h> #include <tdeglobal.h>
// TQt // TQt
#include <ntqstring.h> #include <ntqstring.h>
@ -84,8 +84,8 @@ namespace KioSword {
SwordOptions(const SwordOptions& copyFrom); SwordOptions(const SwordOptions& copyFrom);
virtual ~SwordOptions(); virtual ~SwordOptions();
void readFromConfig(const KConfig* config); void readFromConfig(const TDEConfig* config);
void saveToConfig(KConfig* config); void saveToConfig(TDEConfig* config);
TQMap<TQString, TQString> getQueryStringParams() const; TQMap<TQString, TQString> getQueryStringParams() const;
void readFromQueryString(TQMap<TQString, TQString> params); void readFromQueryString(TQMap<TQString, TQString> params);

30
src/kio_sword.cpp → src/tdeio_sword.cpp
Unescape View File

@ -1,5 +1,5 @@
/*************************************************************************** /***************************************************************************
File: kio_sword.cpp File: tdeio_sword.cpp
Project: Kio-Sword -- An ioslave for SWORD and KDE Project: Kio-Sword -- An ioslave for SWORD and KDE
Copyright: Copyright (C) 2004-2005 Luke Plant Copyright: Copyright (C) 2004-2005 Luke Plant
@ -25,15 +25,15 @@
// Mine // Mine
#include "renderer.h" #include "renderer.h"
#include "kio_sword.h" #include "tdeio_sword.h"
#include "utils.h" #include "utils.h"
#include "template.h" #include "template.h"
#include "option.h" #include "option.h"
// KDE // KDE
#include <kdebug.h> #include <kdebug.h>
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
#include <kurl.h> #include <kurl.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
@ -45,7 +45,7 @@
#include <list> #include <list>
#include <stdlib.h> #include <stdlib.h>
using namespace KIO; using namespace TDEIO;
using std::list; using std::list;
using std::vector; using std::vector;
@ -53,13 +53,13 @@ using std::vector;
// main -------------------------------------------------------------------------------------------------------- // main --------------------------------------------------------------------------------------------------------
extern "C" { extern "C" {
int kdemain(int argc, char **argv) { int kdemain(int argc, char **argv) {
KInstance instance("kio_sword"); TDEInstance instance("tdeio_sword");
kdDebug(7101) << "*** Starting kio_sword " << endl; kdDebug(7101) << "*** Starting tdeio_sword " << endl;
if (argc != 4) { if (argc != 4) {
kdDebug(7101) << kdDebug(7101) <<
"Usage: kio_sword protocol domain-socket1 domain-socket2" "Usage: tdeio_sword protocol domain-socket1 domain-socket2"
<< endl; << endl;
exit(-1); exit(-1);
} }
@ -67,7 +67,7 @@ extern "C" {
KioSword::SwordProtocol slave(argv[2], argv[3]); KioSword::SwordProtocol slave(argv[2], argv[3]);
slave.dispatchLoop(); slave.dispatchLoop();
kdDebug(7101) << "*** kio_sword Done" << endl; kdDebug(7101) << "*** tdeio_sword Done" << endl;
return 0; return 0;
} }
} }
@ -84,10 +84,10 @@ namespace KioSword
SwordProtocol::SwordProtocol(const TQCString & pool_socket, SwordProtocol::SwordProtocol(const TQCString & pool_socket,
const TQCString & app_socket) const TQCString & app_socket)
: SlaveBase("kio_sword", pool_socket, app_socket) : SlaveBase("tdeio_sword", pool_socket, app_socket)
{ {
kdDebug() << "SwordProtocol::SwordProtocol()" << endl; kdDebug() << "SwordProtocol::SwordProtocol()" << endl;
m_config = KGlobal::config(); m_config = TDEGlobal::config();
} }
@ -569,8 +569,8 @@ namespace KioSword
output += i18n("<hr><h1>Stylesheet</h1>" output += i18n("<hr><h1>Stylesheet</h1>"
"<p>To further customise the appearance of the Kio-Sword page, you can make your own modified " "<p>To further customise the appearance of the Kio-Sword page, you can make your own modified "
"version of the style sheet. " "version of the style sheet. "
"Simply copy the file '%1kio_sword/kio_sword.css' to $HOME/.kde/share/apps/kio_sword/ and modify it as desired. You may want to use the 'simplepage' option above to make the most of this.</p>") "Simply copy the file '%1kio_sword/tdeio_sword.css' to $HOME/.kde/share/apps/tdeio_sword/ and modify it as desired. You may want to use the 'simplepage' option above to make the most of this.</p>")
.arg(KGlobal::dirs()->findResourceDir("data", "kio_sword/kio_sword.css")); // FIXME - this must always return the system dir, not users dir. .arg(TDEGlobal::dirs()->findResourceDir("data", "tdeio_sword/tdeio_sword.css")); // FIXME - this must always return the system dir, not users dir.
return output; return output;
@ -579,7 +579,7 @@ namespace KioSword
TQString SwordProtocol::helpPage() { TQString SwordProtocol::helpPage() {
if (help_page.isEmpty()) { if (help_page.isEmpty()) {
help_page += i18n("<h1>Help</h1>" help_page += i18n("<h1>Help</h1>"
"<p>For full documentation, see <a href=\"help:/kio_sword\">installed help files</a>.</p>" "<p>For full documentation, see <a href=\"help:/tdeio_sword\">installed help files</a>.</p>"
"<p>Kio-Sword allows you to view SWORD modules (such as Bibles and commentaries) from Konqueror.\n" "<p>Kio-Sword allows you to view SWORD modules (such as Bibles and commentaries) from Konqueror.\n"
" These modules must already be installed - you can download them from <a href=\"http://www.crosswire.org/\">" " These modules must already be installed - you can download them from <a href=\"http://www.crosswire.org/\">"
"crosswire.org</a> or you can use a program such as <a href=\"http:/www.bibletime.info\">BibleTime</a> to help" "crosswire.org</a> or you can use a program such as <a href=\"http:/www.bibletime.info\">BibleTime</a> to help"
@ -611,7 +611,7 @@ namespace KioSword
"</ul>\n" "</ul>\n"
"<p>Problems, comments, feature requests? Email the author. " "<p>Problems, comments, feature requests? Email the author. "
"<p>Author: <a href=\"mailto:L.Plant.98@cantab.net\">L.Plant.98@cantab.net</a>" "<p>Author: <a href=\"mailto:L.Plant.98@cantab.net\">L.Plant.98@cantab.net</a>"
"<p>Website: <a href=\"http://lukeplant.me.uk/kio-sword/\">http://lukeplant.me.uk/kio-sword/</a>."); "<p>Website: <a href=\"http://lukeplant.me.uk/tdeio-sword/\">http://lukeplant.me.uk/tdeio-sword/</a>.");
} }
return help_page; return help_page;
} }

8
src/kio_sword.h → src/tdeio_sword.h
Unescape View File

@ -26,8 +26,8 @@
#include "renderer.h" #include "renderer.h"
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kio/slavebase.h> #include <tdeio/slavebase.h>
#include <ntqstring.h> #include <ntqstring.h>
#include <ntqcstring.h> #include <ntqcstring.h>
@ -35,7 +35,7 @@
namespace KioSword { namespace KioSword {
class Template; class Template;
class SwordProtocol : public KIO::SlaveBase { class SwordProtocol : public TDEIO::SlaveBase {
public: public:
SwordProtocol(const TQCString & pool_socket, SwordProtocol(const TQCString & pool_socket,
@ -85,7 +85,7 @@ namespace KioSword {
TQString module; TQString module;
} m_redirect; } m_redirect;
KConfig *m_config; TDEConfig *m_config;
}; };
} }

6
src/kio_sword.lsm → src/tdeio_sword.lsm
Unescape View File

@ -1,5 +1,5 @@
Begin3 Begin3
Title: kio_sword -- Some description Title: tdeio_sword -- Some description
Version: 0.1 Version: 0.1
Entered-date: Entered-date:
Description: Description:
@ -9,8 +9,8 @@ Maintained-by: Luke Plant <L.Plant.98@cantab.net>
Home-page: Home-page:
Alternate-site: Alternate-site:
Primary-site: ftp://ftp.kde.org/pub/kde/unstable/apps/utils Primary-site: ftp://ftp.kde.org/pub/kde/unstable/apps/utils
xxxxxx kio_sword-0.1.tar.gz xxxxxx tdeio_sword-0.1.tar.gz
xxx kio_sword-0.1.lsm xxx tdeio_sword-0.1.lsm
Platform: Linux. Needs KDE Platform: Linux. Needs KDE
Copying-policy: GPL Copying-policy: GPL
End End

8
src/template.cpp
Unescape View File

@ -25,8 +25,8 @@
#include "utils.h" #include "utils.h"
#include "swordoptions.h" #include "swordoptions.h"
#include <kglobal.h> #include <tdeglobal.h>
#include <klocale.h> #include <tdelocale.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <ntqstring.h> #include <ntqstring.h>
@ -85,7 +85,7 @@ namespace KioSword {
TQCString Template::render(const SwordOptions& options) const TQCString Template::render(const SwordOptions& options) const
{ {
TQString cssdir = KGlobal::dirs()->findResourceDir("data", "kio_sword/kio_sword.css") + "kio_sword/"; TQString cssdir = TDEGlobal::dirs()->findResourceDir("data", "tdeio_sword/tdeio_sword.css") + "tdeio_sword/";
TQString output = html_page; TQString output = html_page;
output = output output = output
@ -97,7 +97,7 @@ namespace KioSword {
.replace(SETTINGSLINKCAPTION, i18n("Settings")) .replace(SETTINGSLINKCAPTION, i18n("Settings"))
.replace(HELPLINK, swordUrlForPage("help", options)) .replace(HELPLINK, swordUrlForPage("help", options))
.replace(HELPLINKCAPTION, i18n("Help")) .replace(HELPLINKCAPTION, i18n("Help"))
.replace(BASECSS, cssdir + "kio_sword.css") .replace(BASECSS, cssdir + "tdeio_sword.css")
.replace(PAGETITLE, m_title) .replace(PAGETITLE, m_title)
.replace(CONTENT, m_content); .replace(CONTENT, m_content);
if (!m_nav.isEmpty()) if (!m_nav.isEmpty())

8
kio_sword.kdevelop → tdeio_sword.tdevelop
Unescape View File

@ -1,5 +1,5 @@
<?xml version = '1.0'?> <?xml version = '1.0'?>
<kdevelop> <tdevelop>
<general> <general>
<author>Luke Plant</author> <author>Luke Plant</author>
<email>L.Plant.98@cantab.net</email> <email>L.Plant.98@cantab.net</email>
@ -11,7 +11,7 @@
<keyword>Code</keyword> <keyword>Code</keyword>
<keyword>Qt</keyword> <keyword>Qt</keyword>
<keyword>KDE</keyword> <keyword>KDE</keyword>
<keyword>kioslave</keyword> <keyword>tdeioslave</keyword>
</keywords> </keywords>
<projectdirectory>.</projectdirectory> <projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath> <absoluteprojectpath>false</absoluteprojectpath>
@ -26,7 +26,7 @@
</general> </general>
<kdevautoproject> <kdevautoproject>
<general> <general>
<activetarget>src/kio_sword.la</activetarget> <activetarget>src/tdeio_sword.la</activetarget>
<useconfiguration>default</useconfiguration> <useconfiguration>default</useconfiguration>
</general> </general>
<configurations> <configurations>
@ -211,4 +211,4 @@
<graphicFilter>-f0</graphicFilter> <graphicFilter>-f0</graphicFilter>
<scaling>-1</scaling> <scaling>-1</scaling>
</kdevvisualadvance> </kdevvisualadvance>
</kdevelop> </tdevelop>
Write Preview
Loading…
Cancel
Save