Browse Source

Initial TQt conversion

pull/1/head
Slávek Banko 8 years ago
parent
commit
e03da7a558
  1. 48
      acinclude.m4
  2. 48
      aclocal.m4
  3. 126
      src/kio_sword.cpp
  4. 32
      src/kio_sword.h
  5. 12
      src/ks_osishtml.cpp
  6. 6
      src/ks_thmlhtml.cpp
  7. 46
      src/option.h
  8. 226
      src/renderer.cpp
  9. 54
      src/renderer.h
  10. 14
      src/swordoptions.cpp
  11. 22
      src/swordoptions.h
  12. 20
      src/template.cpp
  13. 22
      src/template.h
  14. 50
      src/utils.cpp
  15. 18
      src/utils.h

48
acinclude.m4

@ -1060,7 +1060,7 @@ elif test "$kde_use_qt_emb" = "yes"; then
x_includes=""
x_libraries=""
elif test "$kde_use_qt_mac" = "yes"; then
dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to
dnl be included to get the information) --Sam
CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@ -1092,19 +1092,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],
AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <ntqglobal.h>
#include <ntqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <ntqevent.h>
#include <ntqstring.h>
#include <ntqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -1113,8 +1113,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <ntqcursor.h>
#include <ntqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -1201,22 +1201,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222"
kde_qt_verstring="TQT_VERSION >= 222"
else
kde_qt_verstring="QT_VERSION >= 200"
kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"
@ -1325,7 +1325,7 @@ AC_ARG_ENABLE(
USING_QT_MT=""
dnl ------------------------------------------------------------------------
dnl If we not get --disable-qt-mt then adjust some vars for the host.
dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS=
@ -1383,7 +1383,7 @@ dnl ------------------------------------------------------------
fi
dnl ------------------------------------------------------------------------
dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
@ -1449,9 +1449,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h
kde_qt_header=ntqstyle.h
else
kde_qt_header=qglobal.h
kde_qt_header=ntqglobal.h
fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@ -2034,7 +2034,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([
#include <qdom.h>
#include <ntqdom.h>
],
[
QDomDocument doc;
@ -2595,7 +2595,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(
[#include <qapplication.h>],
[#include <ntqapplication.h>],
[
int argc;
char** argv;
@ -3397,7 +3397,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
AC_TRY_COMPILE(
[
#include <qglobal.h>
#include <ntqglobal.h>
#if Q_EXPORT - 0 != 0
/* if this compiles, then Q_EXPORT is undefined */
/* if Q_EXPORT is nonempty, this will break compilation */
@ -4635,7 +4635,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl
[
#include <qimageio.h>
#include <qstring.h>
#include <ntqstring.h>
int main() {
QString t = "hallo";
t.fill('t');
@ -5480,7 +5480,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
@ -5501,7 +5501,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)

48
aclocal.m4

@ -1072,7 +1072,7 @@ elif test "$kde_use_qt_emb" = "yes"; then
x_includes=""
x_libraries=""
elif test "$kde_use_qt_mac" = "yes"; then
dnl We're using QT/Mac (I use QT_MAC so that qglobal.h doesn't *have* to
dnl We're using QT/Mac (I use QT_MAC so that ntqglobal.h doesn't *have* to
dnl be included to get the information) --Sam
CXXFLAGS="$CXXFLAGS -DQT_MAC -no-cpp-precomp"
CFLAGS="$CFLAGS -DQT_MAC -no-cpp-precomp"
@ -1104,19 +1104,19 @@ AC_DEFUN([KDE_PRINT_QT_PROGRAM],
AC_REQUIRE([KDE_USE_QT])
cat > conftest.$ac_ext <<EOF
#include "confdefs.h"
#include <qglobal.h>
#include <qapplication.h>
#include <ntqglobal.h>
#include <ntqapplication.h>
EOF
if test "$kde_qtver" = "2"; then
cat >> conftest.$ac_ext <<EOF
#include <qevent.h>
#include <qstring.h>
#include <qstyle.h>
#include <ntqevent.h>
#include <ntqstring.h>
#include <ntqstyle.h>
EOF
if test $kde_qtsubver -gt 0; then
cat >> conftest.$ac_ext <<EOF
#if QT_VERSION < 210
#if TQT_VERSION < 210
#error 1
#endif
EOF
@ -1125,8 +1125,8 @@ fi
if test "$kde_qtver" = "3"; then
cat >> conftest.$ac_ext <<EOF
#include <qcursor.h>
#include <qstylefactory.h>
#include <ntqcursor.h>
#include <ntqstylefactory.h>
#include <private/qucomextra_p.h>
EOF
fi
@ -1213,22 +1213,22 @@ fi
if test -z "$3"; then
if test $kde_qtver = 3; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 0x03@VER@00 && QT_VERSION < 0x040000"
kde_qt_verstring="TQT_VERSION >= 0x03@VER@00 && TQT_VERSION < 0x040000"
qtsubver=`echo "00$kde_qtsubver" | sed -e 's,.*\(..\)$,\1,'`
kde_qt_verstring=`echo $kde_qt_verstring | sed -e "s,@VER@,$qtsubver,"`
else
kde_qt_verstring="QT_VERSION >= 300 && QT_VERSION < 0x040000"
kde_qt_verstring="TQT_VERSION >= 300 && TQT_VERSION < 0x040000"
fi
fi
if test $kde_qtver = 2; then
if test $kde_qtsubver -gt 0; then
kde_qt_verstring="QT_VERSION >= 222"
kde_qt_verstring="TQT_VERSION >= 222"
else
kde_qt_verstring="QT_VERSION >= 200"
kde_qt_verstring="TQT_VERSION >= 200"
fi
fi
if test $kde_qtver = 1; then
kde_qt_verstring="QT_VERSION >= 142 && QT_VERSION < 200"
kde_qt_verstring="TQT_VERSION >= 142 && TQT_VERSION < 200"
fi
else
kde_qt_verstring="$3"
@ -1337,7 +1337,7 @@ AC_ARG_ENABLE(
USING_QT_MT=""
dnl ------------------------------------------------------------------------
dnl If we not get --disable-qt-mt then adjust some vars for the host.
dnl If we not get --disable-tqt-mt then adjust some vars for the host.
dnl ------------------------------------------------------------------------
KDE_MT_LDFLAGS=
@ -1395,7 +1395,7 @@ dnl ------------------------------------------------------------
fi
dnl ------------------------------------------------------------------------
dnl If we got --enable-qt-mt then adjust the Qt library name for the host.
dnl If we got --enable-tqt-mt then adjust the Qt library name for the host.
dnl ------------------------------------------------------------------------
if test "x$kde_use_qt_mt" = "xyes"; then
@ -1461,9 +1461,9 @@ if test ! "$ac_qt_includes" = "NO"; then
fi
if test "$kde_qtver" != "1"; then
kde_qt_header=qstyle.h
kde_qt_header=ntqstyle.h
else
kde_qt_header=qglobal.h
kde_qt_header=ntqglobal.h
fi
AC_FIND_FILE($kde_qt_header, $qt_incdirs, qt_incdir)
@ -2046,7 +2046,7 @@ AC_CACHE_VAL(kde_cv_have_kdeqtaddon,
LDFLAGS="$LDFLAGS $all_libraries $USER_LDFLAGS"
AC_TRY_LINK([
#include <qdom.h>
#include <ntqdom.h>
],
[
QDomDocument doc;
@ -2607,7 +2607,7 @@ LIBS=`echo $LIBS | sed "s/$LIBJPEG//"`
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES"
AC_TRY_LINK(
[#include <qapplication.h>],
[#include <ntqapplication.h>],
[
int argc;
char** argv;
@ -3409,7 +3409,7 @@ AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
AC_TRY_COMPILE(
[
#include <qglobal.h>
#include <ntqglobal.h>
#if Q_EXPORT - 0 != 0
/* if this compiles, then Q_EXPORT is undefined */
/* if Q_EXPORT is nonempty, this will break compilation */
@ -4647,7 +4647,7 @@ CXXFLAGS="$CXXFLAGS -I$qt_incdir $all_includes"
AC_TRY_RUN(dnl
[
#include <qimageio.h>
#include <qstring.h>
#include <ntqstring.h>
int main() {
QString t = "hallo";
t.fill('t');
@ -5492,7 +5492,7 @@ if test "${with_qt_dir+set}" = set; then
kde_qtdir="$with_qt_dir"
fi
AC_FIND_FILE(qsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
AC_FIND_FILE(ntqsql.html, [ $kde_qtdir/doc/html $QTDIR/doc/html /usr/share/doc/packages/qt3/html /usr/lib/qt/doc /usr/lib/qt3/doc /usr/lib/qt3/doc/html /usr/doc/qt3/html /usr/doc/qt3 /usr/share/doc/qt3-doc /usr/share/qt3/doc/html /usr/X11R6/share/doc/qt/html ], QTDOCDIR)
AC_MSG_RESULT($QTDOCDIR)
AC_SUBST(QTDOCDIR)
@ -5513,7 +5513,7 @@ AC_SUBST(DOXYGEN_PROJECT_NAME)
AC_SUBST(DOXYGEN_PROJECT_NUMBER)
KDE_HAS_DOXYGEN=no
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/qsql.html; then
if test -n "$DOXYGEN" && test -x "$DOXYGEN" && test -f $QTDOCDIR/ntqsql.html; then
KDE_HAS_DOXYGEN=yes
fi
AC_SUBST(KDE_HAS_DOXYGEN)

126
src/kio_sword.cpp

@ -37,9 +37,9 @@
#include <kurl.h>
#include <kstandarddirs.h>
// Qt
#include <qcstring.h>
#include <qmap.h>
// TQt
#include <ntqcstring.h>
#include <ntqmap.h>
// Standard C++ /C
#include <list>
@ -77,13 +77,13 @@ namespace KioSword
class SwordOptions;
// HTML fragments that will be initialised at run time -------------------------------------------------------------------------
static QString search_form;
static QString help_page;
static TQString search_form;
static TQString help_page;
SwordProtocol::SwordProtocol(const QCString & pool_socket,
const QCString & app_socket)
SwordProtocol::SwordProtocol(const TQCString & pool_socket,
const TQCString & app_socket)
: SlaveBase("kio_sword", pool_socket, app_socket)
{
kdDebug() << "SwordProtocol::SwordProtocol()" << endl;
@ -98,14 +98,14 @@ namespace KioSword
void SwordProtocol::get(const KURL & url)
{
QString modname;
QString query;
QString error;
TQString modname;
TQString query;
TQString error;
kdDebug() << "SwordProtocol::get(const KURL& url)" << endl;
/* kdDebug() << "Seconds: " << url.query() << endl;
QString remoteServer = url.host();
TQString remoteServer = url.host();
int remotePort = url.port();
kdDebug() << "myURL: " << url.prettyURL() << endl; */
@ -141,8 +141,8 @@ namespace KioSword
}
else
{
modname = m_path.section('/', 0, 0, QString::SectionSkipEmpty);
query = m_path.section('/', 1, -1, QString::SectionSkipEmpty);
modname = m_path.section('/', 0, 0, TQString::SectionSkipEmpty);
query = m_path.section('/', 1, -1, TQString::SectionSkipEmpty);
}
}
@ -206,7 +206,7 @@ namespace KioSword
if (!modname.isEmpty()) {
m_renderer.moduleQuery(modname, query, m_options, tmplt);
} else {
QString body;
TQString body;
tmplt->setTitle(i18n("Modules - Kio-Sword"));
if (!error.isEmpty()) {
body = error;
@ -255,16 +255,16 @@ namespace KioSword
finished();
}
/* redefine data for QCStrings so we don't send the trailing
/* redefine data for TQCStrings so we don't send the trailing
null */
void SwordProtocol::data(const QCString& text) {
QByteArray nonull;
void SwordProtocol::data(const TQCString& text) {
TQByteArray nonull;
nonull.setRawData(text.data(), text.size()-1);
SlaveBase::data(nonull);
nonull.resetRawData(text.data(), text.size()-1);
}
void SwordProtocol::data(const QByteArray& array) {
void SwordProtocol::data(const TQByteArray& array) {
SlaveBase::data(array);
}
@ -273,9 +273,9 @@ namespace KioSword
m_options.readFromConfig(m_config);
}
QString SwordProtocol::saveUserConfig()
TQString SwordProtocol::saveUserConfig()
{
QString message;
TQString message;
m_options.saveToConfig(m_config);
m_config->sync();
// search form depends on settings, so force it to be recreated
@ -295,11 +295,11 @@ namespace KioSword
// Reset data members that should always be
// retrieved from URL
m_action = QUERY;
m_path = QString::null;
m_redirect.module = QString::null;
m_redirect.query = QString::null;
m_previous.module = QString::null;
m_previous.query = QString::null;
m_path = TQString::null;
m_redirect.module = TQString::null;
m_redirect.query = TQString::null;
m_previous.module = TQString::null;
m_previous.query = TQString::null;
m_moduletype = DEFMODULETYPE_NONE;
if (url.hasPath())
@ -310,10 +310,10 @@ namespace KioSword
// URLs will be encoded in UTF-8 since they are sometimes
// generated from the search form, and the browser will
// encode in UTF-8 since the whole page has UTF-8 charset
QMap<QString, QString> items = url.queryItems(KURL::CaseInsensitiveKeys, 106);
QMap<QString, QString>::const_iterator it;
QMap<QString, QString>::const_iterator it_end = items.end();
QString val;
TQMap<TQString, TQString> items = url.queryItems(KURL::CaseInsensitiveKeys, 106);
TQMap<TQString, TQString>::const_iterator it;
TQMap<TQString, TQString>::const_iterator it_end = items.end();
TQString val;
const char *key;
for(it = items.begin(); it != it_end; it++) {
@ -366,8 +366,8 @@ namespace KioSword
else ENUM_OPTION(m_action, "testsettings", REDIRECT_QUERY)
else if (!strcasecmp(key, "previouspath")) {
m_previous.module = val.section('/', 0, 0, QString::SectionSkipEmpty);
m_previous.query = val.section('/', 1, -1, QString::SectionSkipEmpty);
m_previous.module = val.section('/', 0, 0, TQString::SectionSkipEmpty);
m_previous.query = val.section('/', 1, -1, TQString::SectionSkipEmpty);
}
}
@ -382,16 +382,16 @@ namespace KioSword
void SwordProtocol::sendPage(const Template* tplt) {
data(tplt->render(m_options));
data(QByteArray()); // empty array means we're done sending the data
data(TQByteArray()); // empty array means we're done sending the data
finished();
}
/** Returns a string representing notes about an option for the settings page
*/
template <class T>
QString optionNotes(const Option<T>& option)
TQString optionNotes(const Option<T>& option)
{
QString output;
TQString output;
if (!option.m_propagate)
{
output += "<sup>1</sup>";
@ -409,8 +409,8 @@ namespace KioSword
/** HTML for a boolean option */
QString settingsBooleanOptionRow(const QString& description, const Option<bool>& option) {
static const QString boolean_option_row(
TQString settingsBooleanOptionRow(const TQString& description, const Option<bool>& option) {
static const TQString boolean_option_row(
"<tr><td>%1</td><td><nobr><input type='radio' name='%2' value='1' %3>%4 &nbsp;&nbsp;<input type='radio' name='%2' value='0' %5>%6</nobr></td><td>%2, %7</td></tr>");
return boolean_option_row
.arg(description + optionNotes(option))
@ -432,10 +432,10 @@ namespace KioSword
* @param optionList HTML containing the <option>s
* @return
*/
QString settingsGeneralOptionRow(const QString& description, const Option<QString>& option,
const QString& optionList)
TQString settingsGeneralOptionRow(const TQString& description, const Option<TQString>& option,
const TQString& optionList)
{
static const QString general_option_row(
static const TQString general_option_row(
"<tr><td>%1</td><td><select name='%2'>%3</select></td><td>%4, %5</td></tr>");
return general_option_row
.arg(description + optionNotes(option))
@ -445,13 +445,13 @@ namespace KioSword
.arg(option.m_qsLongName);
}
QString SwordProtocol::settingsForm() {
QString output;
QStringList modules;
QStringList::Iterator it;
QString temp;
TQString SwordProtocol::settingsForm() {
TQString output;
TQStringList modules;
TQStringList::Iterator it;
TQString temp;
static const QString separator_row(
static const TQString separator_row(
"<tr><td class='settingscategory' colspan='3'>%1</td></tr>");
@ -461,7 +461,7 @@ namespace KioSword
" save these settings to your own configuration file. 'Test settings' will return "
" you to the previous page with the options you have specified. <br>");
output += QString(
output += TQString(
"<form action='sword:/' method='GET'>"
"<table class='settings' border=0 cellspacing=0>"
" <tr><th>%1</th><th>%2</th><th>%4</th></tr>")
@ -480,11 +480,11 @@ namespace KioSword
output += separator_row.arg(i18n("Language"));
// Locale
QStringList locales = m_renderer.availableLocales();
TQStringList locales = m_renderer.availableLocales();
temp = "";
for (int i = 0; i < locales.size(); i++)
{
temp += QString("<option value='%1' %3>%2</option>")
temp += TQString("<option value='%1' %3>%2</option>")
.arg(locales[i])
.arg(locales[i])
.arg((m_options.locale() == locales[i]) ? "selected" : "");
@ -513,9 +513,9 @@ namespace KioSword
output += separator_row.arg(i18n("Default modules"));
modules = m_renderer.moduleList();
vector<QString> dm_desc;
vector<Option<QString> > dm_options;
vector<QString>::size_type i;
vector<TQString> dm_desc;
vector<Option<TQString> > dm_options;
vector<TQString>::size_type i;
dm_desc.push_back(i18n("Default Bible"));
dm_options.push_back(m_options.defaultBible);
@ -532,11 +532,11 @@ namespace KioSword
dm_options.push_back(m_options.defaultHebrewMorph);
for (i = 0; i < dm_options.size(); i++) {
temp = QString("<option value='' %1> </option>")
temp = TQString("<option value='' %1> </option>")
.arg(dm_options[i]().stripWhiteSpace().isEmpty() ? "selected" : "");
for (it = modules.begin(); it != modules.end(); ++it ) {
temp += QString("<option value='%1' %3>%2</option>")
temp += TQString("<option value='%1' %3>%2</option>")
.arg(*it)
.arg(*it)
.arg(((*it) == dm_options[i]() ? "selected" : ""));
@ -549,13 +549,13 @@ namespace KioSword
output += settingsBooleanOptionRow(i18n("Make formatting options propagate. This makes Kio-Sword remember formatting settings that you have set, by propagating them in the links. (Some navigation options are always excluded from this behaviour)."),
m_options.propagate);
output += QString("</table>");
output += TQString("</table>");
output += i18n("<p>Notes:<br/>"
"1) These options never propagate<br/>"
"2) These options are never saved<br/></p>");
output += QString(
output += TQString(
"<br><input type='hidden' name='module' value='%1'>" // redirection path
"<input type='hidden' name='query' value='%2'>" // redirection path
"<input type='submit' name='testsettings' value='%3'>&nbsp;" // "Test settings"
@ -576,7 +576,7 @@ namespace KioSword
return output;
}
QString SwordProtocol::helpPage() {
TQString SwordProtocol::helpPage() {
if (help_page.isEmpty()) {
help_page += i18n("<h1>Help</h1>"
"<p>For full documentation, see <a href=\"help:/kio_sword\">installed help files</a>.</p>"
@ -616,8 +616,8 @@ namespace KioSword
return help_page;
}
QString SwordProtocol::searchForm(const SwordOptions& options) {
static const QString search_form_tmpl(
TQString SwordProtocol::searchForm(const SwordOptions& options) {
static const TQString search_form_tmpl(
"<h1 class='searchform'>%1</h1>" // title
"<div class='searchform'>"
"<form action='sword:/' method='GET'>"
@ -646,13 +646,13 @@ namespace KioSword
"</div>");
if (search_form.isEmpty()) { // avoid calculating this twice
QStringList modules = m_renderer.moduleList();
QString temp;
QStringList::Iterator it;
TQStringList modules = m_renderer.moduleList();
TQString temp;
TQStringList::Iterator it;
temp = "<option value=''></option>";
for (it = modules.begin(); it != modules.end(); ++it ) {
temp += QString("<option value='%1' %3>%2</option>")
temp += TQString("<option value='%1' %3>%2</option>")
.arg(*it)
.arg(*it)
.arg((*it == m_options.defaultBible()) ? "selected='selected'" : "");
@ -670,7 +670,7 @@ namespace KioSword
}
// search_form is generated once, but we need to modify
// form each time to include propagated values
QString output(search_form);
TQString output(search_form);
return output.replace("</form>", optionsAsHiddenFields(options) + "</form>");
}
}

32
src/kio_sword.h

@ -29,8 +29,8 @@
#include <kconfig.h>
#include <kio/slavebase.h>
#include <qstring.h>
#include <qcstring.h>
#include <ntqstring.h>
#include <ntqcstring.h>
namespace KioSword {
class Template;
@ -38,26 +38,26 @@ namespace KioSword {
class SwordProtocol : public KIO::SlaveBase {
public:
SwordProtocol(const QCString & pool_socket,
const QCString & app_socket);
SwordProtocol(const TQCString & pool_socket,
const TQCString & app_socket);
virtual ~SwordProtocol();
virtual void mimetype(const KURL & url);
virtual void get(const KURL & url);
protected:
void data(const QCString& text);
void data(const QByteArray& text);
void data(const TQCString& text);
void data(const TQByteArray& text);
void parseURL(const KURL & url);
void readUserConfig();
QString saveUserConfig();
TQString saveUserConfig();
void sendPage(const Template* tmplt);
QString helpPage();
QString pageLinks(const SwordOptions& options);
QString searchForm(const SwordOptions& options);
QString settingsForm();
TQString helpPage();
TQString pageLinks(const SwordOptions& options);
TQString searchForm(const SwordOptions& options);
TQString settingsForm();
typedef enum { QUERY,
REDIRECT_QUERY,
@ -71,18 +71,18 @@ namespace KioSword {
SwordOptions m_options;
ActionType m_action;
DefModuleType m_moduletype;
QString m_path;
TQString m_path;
Renderer::SearchType m_stype;
KURL m_baseurl;
struct {
QString query;
QString module;
TQString query;
TQString module;
} m_previous;
struct {
QString query;
QString module;
TQString query;
TQString module;
} m_redirect;
KConfig *m_config;

12
src/ks_osishtml.cpp

@ -30,7 +30,7 @@
#include <versekey.h>
#include <swmodule.h>
#include <qstring.h>
#include <ntqstring.h>
#include <stdlib.h>
@ -100,12 +100,12 @@ namespace KioSword {
val = strchr(attrib, ':');
val = (val) ? (val + 1) : attrib;
if (*val == 'G') {
buf.append(QString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span> ")
buf.append(TQString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span> ")
.arg(val+1)
.arg(swordUrlForSearch(GREEKSTRONGS, val+1, m_swordoptions))
.utf8());
} else if (*val == 'H') {
buf.append(QString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span> ")
buf.append(TQString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span> ")
.arg(val+1)
.arg(swordUrlForSearch(HEBREWSTRONGS, val+1, m_swordoptions))
.utf8());
@ -121,18 +121,18 @@ namespace KioSword {
val = strchr(attrib, ':');
val = (val) ? (val + 1) : attrib;
if (!strncmp(attrib, "x-Robinson",10)) { //robinson codes
buf.append(QString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span> ")
buf.append(TQString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span> ")
.arg(val)
.arg(swordUrlForSearch(GREEKMORPH, val, m_swordoptions))
.utf8());
} else if ((*val == 'T')) {
if (val[1] == 'G') {
buf.append(QString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span> ")
buf.append(TQString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span> ")
.arg(val+1)
.arg(swordUrlForSearch(GREEKMORPH, val+1, m_swordoptions))
.utf8());
} else if (val[1] == 'H') {
buf.append(QString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span> ")
buf.append(TQString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span> ")
.arg(val+1)
.arg(swordUrlForSearch(HEBREWMORPH, val+1, m_swordoptions))
.utf8());

6
src/ks_thmlhtml.cpp

@ -74,7 +74,7 @@ namespace KioSword {
} else if (tag.getAttribute("type") && !strcasecmp(tag.getAttribute("type"), "morph")) { // Morph
const char *value = tag.getAttribute("value");
if (value) {
buf.append(QString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span>")
buf.append(TQString(" <span class='morph'>(<a href=\"%2\">%1</a>)</span>")
.arg(value)
.arg(swordUrlForSearch(GREEKMORPH, value, m_swordoptions))
.utf8());
@ -84,13 +84,13 @@ namespace KioSword {
tag.getAttribute("value");
if (value && value[0] == 'H') { // hewbrew strongs number
// value + 1 => skip the H
buf.append(QString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span>")
buf.append(TQString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span>")
.arg(value + 1)
.arg(swordUrlForSearch(HEBREWSTRONGS, value + 1, m_swordoptions))
.utf8());
} else if (value && value[0] == 'G') { //greek strongs number
// value + 1 => skip the G
buf.append(QString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span>")
buf.append(TQString(" <span class='strongs'>&lt;<a href=\"%2\">%1</a>&gt;</span>")
.arg(value + 1)
.arg(swordUrlForSearch(GREEKSTRONGS, value + 1, m_swordoptions))
.utf8());

46
src/option.h

@ -26,16 +26,16 @@
#include <kconfig.h>
#include <qstring.h>
#include <qmap.h>
#include <ntqstring.h>
#include <ntqmap.h>
namespace KioSword
{
class OptionBase
{
public:
virtual void readFromQueryString(QMap<QString, QString> params, bool allowPropagating) = 0;
virtual void getQueryStringPair(QString& name, QString& val) = 0;
virtual void readFromQueryString(TQMap<TQString, TQString> params, bool allowPropagating) = 0;
virtual void getQueryStringPair(TQString& name, TQString& val) = 0;
virtual void readFromConfig(const KConfig* config) = 0;
virtual void saveToConfig(KConfig* config) = 0;
virtual void copy(const OptionBase* other) = 0;
@ -58,7 +58,7 @@ namespace KioSword
T m_config_value; // User's default
/** Convert a value from a string to the option's type */
static const T fromString(const QString& val)
static const T fromString(const TQString& val)
{
// We will specialise this function later
// to work correctly
@ -67,10 +67,10 @@ namespace KioSword
}
/** Convert the option to a string for use in query strings */
QString toString(T val)
TQString toString(T val)
{
// Will specialise this later
QString result;
TQString result;
return result;
}
@ -83,10 +83,10 @@ namespace KioSword
}
public:
QString m_qsShortName; // short name in querystring
QString m_qsLongName; // long name in querystring
TQString m_qsShortName; // short name in querystring
TQString m_qsLongName; // long name in querystring
bool m_propagate; // true if this option can be propagated
QString m_configName; // name of config setting in config file
TQString m_configName; // name of config setting in config file
Option()
{
@ -109,7 +109,7 @@ namespace KioSword
* @param qsLongName the long name for the option when use in a query string
* @param propagate true if this parameter can be propagated in generated query strings
*/
void setup(const T& default_value, const QString& configName, const QString& qsShortName, const QString& qsLongName, bool propagate)
void setup(const T& default_value, const TQString& configName, const TQString& qsShortName, const TQString& qsLongName, bool propagate)
{
m_value = default_value;
m_default_value = default_value;
@ -135,7 +135,7 @@ namespace KioSword
}
/** read and set the option from the querystring */
virtual void readFromQueryString(QMap<QString, QString> params, bool allowPropagating)
virtual void readFromQueryString(TQMap<TQString, TQString> params, bool allowPropagating)
{
T newval;
bool found = false;
@ -146,7 +146,7 @@ namespace KioSword
m_propagate_value = m_config_value;*/
// Search for short name
QMap<QString, QString>::const_iterator it = params.find(m_qsShortName);
TQMap<TQString, TQString>::const_iterator it = params.find(m_qsShortName);
if (it != params.end())
{
newval = fromString(it.data());
@ -170,7 +170,7 @@ namespace KioSword
}
/** set the name and value of a query string pair */
virtual void getQueryStringPair(QString& name, QString& val)
virtual void getQueryStringPair(TQString& name, TQString& val)
{
// To keep things tidy, we don't propagate in the
// query string values that wouldn't make a difference
@ -238,7 +238,7 @@ namespace KioSword
// fromString specialisations
template<>
inline const bool Option<bool>::fromString(const QString& val)
inline const bool Option<bool>::fromString(const TQString& val)
{
if (val == "0")
return false;
@ -247,34 +247,34 @@ namespace KioSword
}
template<>
inline const QString Option<QString>::fromString(const QString& val)
inline const TQString Option<TQString>::fromString(const TQString& val)
{
return val;
}
template<>
inline const int Option<int>::fromString(const QString& val)
inline const int Option<int>::fromString(const TQString& val)
{
return val.toInt();
}
// toString specialisations
template<>
inline QString Option<bool>::toString(bool val)
inline TQString Option<bool>::toString(bool val)
{
return val ? QString("1"): QString("0");
return val ? TQString("1"): TQString("0");
}
template<>
inline QString Option<QString>::toString(QString val)
inline TQString Option<TQString>::toString(TQString val)
{
return val;
}
template<>
inline QString Option<int>::toString(int val)
inline TQString Option<int>::toString(int val)
{
return QString::number(val);
return TQString::number(val);
}
// readConfigSetting specialisations
@ -285,7 +285,7 @@ namespace KioSword
}
template<>
inline QString Option<QString>::readConfigSetting(const KConfig* config)
inline TQString Option<TQString>::readConfigSetting(const KConfig* config)
{
return config->readEntry(m_configName, m_default_value);
}

226
src/renderer.cpp

@ -48,8 +48,8 @@
#include <klocale.h>
// QT
#include <qstring.h>
#include <qstringlist.h>
#include <ntqstring.h>
#include <ntqstringlist.h>
// Standard C/C++
#include <vector>
@ -66,32 +66,32 @@ using namespace sword;
namespace KioSword
{
static const QString prev(" <li><a href=\"%2\" accesskey=\"p\">&laquo %1</a>");
static QString makePrevLink(const QString& caption, const QString& url)
static const TQString prev(" <li><a href=\"%2\" accesskey=\"p\">&laquo %1</a>");
static TQString makePrevLink(const TQString& caption, const TQString& url)
{
return prev.arg(caption).arg(url);
}
static const QString next(" <li><a href=\"%2\" accesskey=\"n\">%1 &raquo</a>");
static QString makeNextLink(const QString& caption, const QString& url)
static const TQString next(" <li><a href=\"%2\" accesskey=\"n\">%1 &raquo</a>");
static TQString makeNextLink(const TQString& caption, const TQString& url)
{
return next.arg(caption).arg(url);
}
static const QString treeup(" <li><a href=\"%3\" accesskey=\"u\">%1 %2</a>");
static QString makeTreeUpLink(const QString& caption1, const QString& caption2, const QString& url)
static const TQString treeup(" <li><a href=\"%3\" accesskey=\"u\">%1 %2</a>");
static TQString makeTreeUpLink(const TQString& caption1, const TQString& caption2, const TQString& url)
{
return treeup.arg(caption1).arg(caption2).arg(url);
}
static const QString bibleup(" <li><a href=\"%2\" accesskey=\"u\">%1</a>");
static QString makeBibleUpLink(const QString& caption, const QString& url)
static const TQString bibleup(" <li><a href=\"%2\" accesskey=\"u\">%1</a>");
static TQString makeBibleUpLink(const TQString& caption, const TQString& url)
{
return bibleup.arg(caption).arg(url);
}
static const QString genlink(" <li><a href=\"%2\">%1</a>");
static QString makeGeneralLink(const QString& caption, const QString& url)
static const TQString genlink(" <li><a href=\"%2\">%1</a>");
static TQString makeGeneralLink(const TQString& caption, const TQString& url)
{
return genlink.arg(caption).arg(url);
}
@ -106,7 +106,7 @@ namespace KioSword
{
for (int i = 0; i < NUM_MODULE_TYPES; i++) {
m_moduleTypes.push_back("");
m_moduleTypeNames.push_back(QString(""));
m_moduleTypeNames.push_back(TQString(""));
}
m_moduleTypes[BIBLE] = "Biblical Texts";
@ -156,9 +156,9 @@ namespace KioSword
/** Return an HTML hyperlinked list of all modules,
* categorised, and including descriptions
*/
QString Renderer::listModules(const SwordOptions &options) {
QString output;
QString temp;
TQString Renderer::listModules(const SwordOptions &options) {
TQString output;
TQString temp;
ModMap::iterator it;
vector<const char *>::size_type i;
SWModule *curMod;
@ -170,16 +170,16 @@ namespace KioSword
return output;
}
output += QString("<div class='moduleslist'><h1>%1</h1>")
output += TQString("<div class='moduleslist'><h1>%1</h1>")
.arg(i18n("Modules"));
for (i = 0; i < m_moduleTypes.size(); i++) {
output += QString("<h2 class='moduletype'>%1</h2>\n"
output += TQString("<h2 class='moduletype'>%1</h2>\n"
"<ul>\n").arg(m_moduleTypeNames[i]);
for (it = Modules.begin(); it != Modules.end(); it++) {
curMod = (*it).second;
if (!strcmp(curMod->Type(), m_moduleTypes[i])) {
output += QString("<li class='module'><a class='module' href=\"%3\">%1</a> : %2\n")
output += TQString("<li class='module'><a class='module' href=\"%3\">%1</a> : %2\n")
.arg(curMod->Name())
.arg(curMod->Description())
.arg(swordUrl(curMod->Name(), options));
@ -194,14 +194,14 @@ namespace KioSword
/** Return a sorted list of all module names
*
*/
QStringList Renderer::moduleList() {
QStringList output;
TQStringList Renderer::moduleList() {
TQStringList output;
ModMap::iterator it;
SWModule *curMod;
for (it = Modules.begin(); it != Modules.end(); it++) {
curMod = (*it).second;
output += QString(curMod->Name());
output += TQString(curMod->Name());
}
output.sort();
return output;
@ -318,8 +318,8 @@ namespace KioSword
}
void Renderer::moduleQuery(const QString &modname, const QString &ref, const SwordOptions &options, Template* tmplt) {
QString nav;
void Renderer::moduleQuery(const TQString &modname, const TQString &ref, const SwordOptions &options, Template* tmplt) {
TQString nav;
SWModule *module = 0;
SWKey *skey = 0;
KeyType keyt = SWKEY;
@ -335,7 +335,7 @@ namespace KioSword
module = getModule(modname.latin1());
if (module == 0) {
QString output;
TQString output;
output += "<p><span class='error'>"
+ i18n("The module '%1' could not be found.").arg(modname)
+ "</span></p><hr/>";
@ -360,7 +360,7 @@ namespace KioSword
}
modtype = getModuleType(module);
nav += QString("<li class='first'>%1 <a href=\"%3\">%2</a></li>")
nav += TQString("<li class='first'>%1 <a href=\"%3\">%2</a></li>")
.arg(i18n("Module:"))
.arg(modname)
.arg(swordUrl(modname, options));
@ -378,12 +378,12 @@ namespace KioSword
return;
}
QString Renderer::search(const QString &modname, const QString &query, const SearchType searchType, const SwordOptions &options) {
TQString Renderer::search(const TQString &modname, const TQString &query, const SearchType searchType, const SwordOptions &options) {
SWModule *module = 0;
QString output;
TQString output;
ListKey lk;
int stype = SEARCH_WORDS;
QString stypename;
TQString stypename;
ModuleType modtype;
setOptions(options);
@ -413,7 +413,7 @@ namespace KioSword
}
output += "<div class='searchresults'><h1>" + i18n("Search results:") + "</h1>";
output += QString("<table><tr><td>%1</td><td><b>%2</b></td></tr><tr><td>%3</td><td><b>%4</b></td></tr><tr><td>%5</td><td><b>%6</b></td></tr></table>")
output += TQString("<table><tr><td>%1</td><td><b>%2</b></td></tr><tr><td>%3</td><td><b>%4</b></td></tr><tr><td>%5</td><td><b>%6</b></td></tr></table>")
.arg(i18n("Module:"))
.arg(modname)
.arg(i18n("Query:"))
@ -429,17 +429,17 @@ namespace KioSword
output += "<p>" + i18n("1 match returned:", "%1 matches returned:", lk.Count()).arg(lk.Count());
output += "<ul>";
for (int i = 0; i < lk.Count(); ++i) {
QString ref;
ref = QString::fromUtf8(lk.getElement(i)->getText());
TQString ref;
ref = TQString::fromUtf8(lk.getElement(i)->getText());
if (modtype == BIBLE) {
module->setKey(lk.getElement(i));
output += QString("<li><a href=\"%3\">%1</a>: %2</li>")
output += TQString("<li><a href=\"%3\">%1</a>: %2</li>")
.arg(ref)
.arg(renderText(module))
.arg(swordUrl(modname, ref, options));
} else {
output += QString("<li><a href=\"%2\">%1</a></li>")
output += TQString("<li><a href=\"%2\">%1</a></li>")
.arg(ref)
.arg(swordUrl(modname, ref, options));
}
@ -450,17 +450,17 @@ namespace KioSword
return output;
}
QString Renderer::renderText(SWModule *module) {
return QString::fromUtf8(module->RenderText());
TQString Renderer::renderText(SWModule *module) {
return TQString::fromUtf8(module->RenderText());
}
/** Fill in template with formatted text for the query of a verse based module
* Links are appended to navlinks.
*/
void Renderer::verseQuery(SWModule *module, const QString &ref, const SwordOptions &options,
ModuleType modtype, Template* tmplt, QString &navlinks) {
QString modname(module->Name());
QString text;
void Renderer::verseQuery(SWModule *module, const TQString &ref, const SwordOptions &options,
ModuleType modtype, Template* tmplt, TQString &navlinks) {
TQString modname(module->Name());
TQString text;
bool doindex = false;
const char* modtextdir; // text direction of the module
@ -505,13 +505,13 @@ namespace KioSword
// List books and link for viewing entire book
SwordOptions options_wholebook(options);
options_wholebook.wholeBook.set(true); // set just for creating the URL
text += QString("<h2>%1</h2>"
text += TQString("<h2>%1</h2>"
"<p>%2</p>"
"<p class='chapterlist'>%3</p>")
.arg(element->getBookName())
.arg(i18n("Chapters:"))
.arg(chapterList(modname, element, options))
+ QString("<p><a href=\"%2\">%1</a></p>")
+ TQString("<p><a href=\"%2\">%1</a></p>")
.arg(i18n("View entire book."))
.arg(swordUrl(module->Name(), element->getBookName(), options_wholebook));
if (!upToBookListShown)
@ -558,7 +558,7 @@ namespace KioSword
text += "</div>";
inDirectionedDiv = false;
}
text += "<h2>" + QString(curvk->getBookName()) + "</h2>";
text += "<h2>" + TQString(curvk->getBookName()) + "</h2>";
chapter = 0;
}
if (curvk->Chapter() != chapter) {
@ -572,12 +572,12 @@ namespace KioSword
}
if (!inDirectionedDiv) {
text += QString("<div dir='%1'>").arg(modtextdir);
text += TQString("<div dir='%1'>").arg(modtextdir);
inDirectionedDiv = true;
}
if (options.verseNumbers() && modtype == BIBLE) {
text += QString("<a class=\"versenumber\" href=\"%2\">%1</a> ")
text += TQString("<a class=\"versenumber\" href=\"%2\">%1</a> ")
.arg(curvk->Verse())
.arg(swordUrl(module->Name(), module->KeyText(), options));
}
@ -617,8 +617,8 @@ namespace KioSword
// Single verse
module->Key(*lk.GetElement(i));
element = dynamic_cast<VerseKey*>(module->getKey());
text += QString("<h3>%1</h3>").arg(module->KeyText());
text += QString("<div dir='%1'>").arg(modtextdir);
text += TQString("<h3>%1</h3>").arg(module->KeyText());
text += TQString("<div dir='%1'>").arg(modtextdir);
text += renderText(module);
text += "</div>";
if (lk.Count() == 1)
@ -631,27 +631,27 @@ namespace KioSword
} while (false);
// Title: depends on what got printed above
QString title;
TQString title;
if (doindex) {
if (!text.isEmpty()) { // an error message was printed
text = QString("<h1 class=\"moduletitle\">%1</h1>").arg(module->Description()).arg(ref)
text = TQString("<h1 class=\"moduletitle\">%1</h1>").arg(module->Description()).arg(ref)
+ text;
title = "Error - Kio-Sword";
}
else
{
title = QString("%1 - Kio-Sword").arg(module->Name());
title = TQString("%1 - Kio-Sword").arg(module->Name());
}
} else {
if (modtype == COMMENTARY) {
text = QString("<h1 class=\"moduletitle\">%1</h1>").arg(module->Description())
text = TQString("<h1 class=\"moduletitle\">%1</h1>").arg(module->Description())
+ text;
title = QString("%1 - %2 - Kio-Sword")
title = TQString("%1 - %2 - Kio-Sword")
.arg(lk.getShortText())
.arg(module->Name());
} else if (modtype == BIBLE) {
text += QString("<div class=\"biblename\">(%1)</div>").arg(module->Description());
title = QString("%1 - %2 - Kio-Sword")
text += TQString("<div class=\"biblename\">(%1)</div>").arg(module->Description());
title = TQString("%1 - %2 - Kio-Sword")
.arg(lk.getShortText())
.arg(module->Name());
}
@ -667,7 +667,7 @@ namespace KioSword
} else {
SwordOptions options_doindex(options);
options_doindex.doBibleIndex.set(true);
text += QString("<p><a href=\"%2\">%1</a></p>")
text += TQString("<p><a href=\"%2\">%1</a></p>")
.arg(i18n("Index of books"))
.arg(swordUrl(modname, options_doindex));
}
@ -675,17 +675,17 @@ namespace KioSword
tmplt->setContent(text);
}
void Renderer::treeQuery(SWModule *module, const QString &ref, const SwordOptions &options,
ModuleType modtype, Template* tmplt, QString &navlinks) {
QString output;
QString modname(module->Name());
void Renderer::treeQuery(SWModule *module, const TQString &ref, const SwordOptions &options,
ModuleType modtype, Template* tmplt, TQString &navlinks) {
TQString output;
TQString modname(module->Name());
bool doindex;
TreeKey *tk = dynamic_cast<TreeKey*>(module->getKey());
if (!tk)
return;
output += QString("<h1 class=\"moduletitle\">%1</h1>").arg(module->Description());
output += TQString("<h1 class=\"moduletitle\">%1</h1>").arg(module->Description());
if (ref.isEmpty()) {
doindex = true;
} else {
@ -697,17 +697,17 @@ namespace KioSword
output += "<hr/>";
doindex = true;
} else {
QString link;
TQString link;
output += renderText(module);
if (tk->previousSibling()) {
link = QString::fromUtf8(module->KeyText()); // FIXME ? local8Bit or utf8
link = TQString::fromUtf8(module->KeyText()); // FIXME ? local8Bit or utf8
navlinks += makePrevLink(shorten(link.section('/', -1, -1), 20),
swordUrl(modname, link, options));
tk->nextSibling();
}
SWKey *saved = tk->clone();
if (tk->parent()) {
link = QString::fromUtf8(module->KeyText());
link = TQString::fromUtf8(module->KeyText());
navlinks += makeTreeUpLink(i18n("Up:"),
shorten(link.section('/', -1, -1), 20),
swordUrl(modname, link, options));
@ -715,7 +715,7 @@ namespace KioSword
}
delete saved;
if (tk->nextSibling()) {
link = QString::fromUtf8(module->KeyText());
link = TQString::fromUtf8(module->KeyText());
navlinks += makeNextLink(shorten(link.section('/', -1, -1), 20),
swordUrl(modname, link, options));
tk->previousSibling();
@ -734,35 +734,35 @@ namespace KioSword
if (options.doFullTreeIndex()) {
options_doindex.doFullTreeIndex.set(false);
output += indexTree(module, options, true, -1);
output += QString("<p><a href=\"%2\">%1</a></p>")
output += TQString("<p><a href=\"%2\">%1</a></p>")
.arg(i18n("View simple index"))
.arg(swordUrl(modname, options_doindex));
} else {
options_doindex.doFullTreeIndex.set(true);