summaryrefslogtreecommitdiffstats
path: root/kdoctools
diff options
context:
space:
mode:
Diffstat (limited to 'kdoctools')
-rw-r--r--kdoctools/customization/entities/general.entities2
-rw-r--r--kdoctools/customization/obsolete/general.entities3
-rw-r--r--kdoctools/main.cpp6
-rw-r--r--kdoctools/main_ghelp.cpp6
-rw-r--r--kdoctools/meinproc.cpp6
-rw-r--r--kdoctools/tdeio_help.cpp4
-rw-r--r--kdoctools/template.docbook23
-rw-r--r--kdoctools/xslt.cpp6
8 files changed, 22 insertions, 34 deletions
diff --git a/kdoctools/customization/entities/general.entities b/kdoctools/customization/entities/general.entities
index 83efffc56..1d47eb40f 100644
--- a/kdoctools/customization/entities/general.entities
+++ b/kdoctools/customization/entities/general.entities
@@ -76,7 +76,7 @@
<!ENTITY documentation.index "<index id='doc-index'></index>">
]]>
<!ENTITY documentation.index "">
-<!--ENTITY kapp "(Oops - someone forgot to fill in the application name here)" -->
+<!--ENTITY tdeApp "(Oops - someone forgot to fill in the application name here)" -->
<!-- Entities to fill in slots in docbook version of FDL notice -->
<!ENTITY % FDLIS "IGNORE">
diff --git a/kdoctools/customization/obsolete/general.entities b/kdoctools/customization/obsolete/general.entities
index 32b528910..9d930b034 100644
--- a/kdoctools/customization/obsolete/general.entities
+++ b/kdoctools/customization/obsolete/general.entities
@@ -81,7 +81,7 @@
<!ENTITY documentation.index "<index></index>">
]]>
<!ENTITY documentation.index "">
-<!--ENTITY kapp "(Oops - someone forgot to fill in the application name here)" -->
+<!--ENTITY tdeApp "(Oops - someone forgot to fill in the application name here)" -->
<!-- Entities to fill in slots in docbook version of FDL notice -->
<!ENTITY % FDLIS "IGNORE">
@@ -356,6 +356,7 @@
<!ENTITY SGI "<trademark>SGI</trademark>">
<!ENTITY Solaris "<trademark>Solaris</trademark>">
<!ENTITY SuSE '<acronym><trademark class="registered">SuSE</trademark></acronym>'>
+<!ENTITY TQt "<trademark>TQt</trademark>">
<!ENTITY ThreeCom '<trademark class="registered">3Com</trademark>'>
<!ENTITY ttdemidi "<application>ttdemidi</application>">
<!ENTITY TrueType '<trademark class="registered">TrueType</trademark>'>
diff --git a/kdoctools/main.cpp b/kdoctools/main.cpp
index 57a44156c..af629aec8 100644
--- a/kdoctools/main.cpp
+++ b/kdoctools/main.cpp
@@ -12,8 +12,8 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#include <tqstring.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdestandarddirs.h>
+#include <tdeinstance.h>
#include <kdebug.h>
#include <stdlib.h>
#include "tdeio_help.h"
@@ -23,7 +23,7 @@ extern int xmlLoadExtDtdDefaultValue;
extern "C"
{
- KDE_EXPORT int kdemain( int argc, char **argv )
+ TDE_EXPORT int kdemain( int argc, char **argv )
{
TDEInstance instance( "tdeio_help" );
fillInstance(instance);
diff --git a/kdoctools/main_ghelp.cpp b/kdoctools/main_ghelp.cpp
index 94bcc60dd..cca632d2d 100644
--- a/kdoctools/main_ghelp.cpp
+++ b/kdoctools/main_ghelp.cpp
@@ -12,8 +12,8 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#include <tqstring.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdestandarddirs.h>
+#include <tdeinstance.h>
#include <kdebug.h>
#include <stdlib.h>
#include "tdeio_help.h"
@@ -23,7 +23,7 @@ extern int xmlLoadExtDtdDefaultValue;
extern "C"
{
- KDE_EXPORT int kdemain( int argc, char **argv )
+ TDE_EXPORT int kdemain( int argc, char **argv )
{
TDEInstance instance( "tdeio_ghelp" );
fillInstance(instance);
diff --git a/kdoctools/meinproc.cpp b/kdoctools/meinproc.cpp
index 1cf57660f..df8cdbb77 100644
--- a/kdoctools/meinproc.cpp
+++ b/kdoctools/meinproc.cpp
@@ -16,8 +16,8 @@
#include <libxslt/transform.h>
#include <libxslt/xsltutils.h>
#include <tqstring.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdestandarddirs.h>
+#include <tdeinstance.h>
#include <xslt.h>
#include <tqfile.h>
#include <tqdir.h>
@@ -28,7 +28,7 @@
#include <kdebug.h>
#include <tqtextcodec.h>
#include <tqfileinfo.h>
-#include <kprocess.h>
+#include <tdeprocess.h>
#include <tqvaluevector.h>
extern int xmlLoadExtDtdDefaultValue;
diff --git a/kdoctools/tdeio_help.cpp b/kdoctools/tdeio_help.cpp
index cdff9bd86..7c33fafb1 100644
--- a/kdoctools/tdeio_help.cpp
+++ b/kdoctools/tdeio_help.cpp
@@ -27,8 +27,8 @@
#include <kurl.h>
#include <tdeglobal.h>
#include <tdelocale.h>
-#include <kstandarddirs.h>
-#include <kinstance.h>
+#include <tdestandarddirs.h>
+#include <tdeinstance.h>
#include "tdeio_help.h"
#include <libxslt/xsltutils.h>
diff --git a/kdoctools/template.docbook b/kdoctools/template.docbook
index ccd768abc..c5c601fe2 100644
--- a/kdoctools/template.docbook
+++ b/kdoctools/template.docbook
@@ -108,7 +108,7 @@ Please at least include TDE, the TDE package it is in, the name
<keywordset>
<keyword>TDE</keyword>
<keyword>tdeutils</keyword>
-<keyword>Kapp</keyword>
+<keyword>tdeapp</keyword>
<keyword>nothing</keyword>
<keyword>nothing else</keyword>
</keywordset>
@@ -138,7 +138,7 @@ any problems or feature requests to the &tde; mailing lists.
</para>
</chapter>
-<chapter id="using-kapp">
+<chapter id="using-tdeApp">
<title>Using &kmyapplication;</title>
<!-- This chapter should tell the user how to use your app. You should use as
@@ -167,7 +167,7 @@ patent issues. -->
</para>
-<sect1 id="kapp-features">
+<sect1 id="tdeApp-features">
<title>More &kmyapplication; features</title>
<para>It slices! It dices! and it comes with a free toaster!</para>
@@ -198,7 +198,7 @@ Also include any keys that have a special function but have no equivalent in the
menus or toolbars. This may not be necessary for small apps or apps with no tool
or menu bars. -->
-<sect1 id="kapp-mainwindow">
+<sect1 id="tdeApp-mainwindow">
<title>The main &kmyapplication; window</title>
<sect2>
@@ -486,7 +486,7 @@ Documentation Copyright &copy; 1999 George N. Ugnacious <email>gnu@kde.org</emai
<appendix id="installation">
<title>Installation</title>
-<sect1 id="getting-kapp">
+<sect1 id="getting-tdeApp">
<title>How to obtain &kmyapplication;</title>
<!-- This first entity contains boiler plate for applications that are
@@ -518,19 +518,6 @@ about 5 megs of memory to run, but this may vary depending on your
platform and configuration.
</para>
-<para>
-All required libraries as well as &kmyapplication; itself can be found
-on <ulink url="ftp://ftp.kapp.org">The &kmyapplication; home page</ulink>.
-</para>
-
-<!-- For a list of updates, you may refer to the application web site
-or the ChangeLog file, or ... -->
-<para>
-You can find a list of changes at <ulink
-url="http://apps.kde.org/kapp">http://apps.kde.org/kapp</ulink>.
-</para>
-</sect1>
-
<sect1 id="compilation">
<title>Compilation and Installation</title>
diff --git a/kdoctools/xslt.cpp b/kdoctools/xslt.cpp
index 94c66ff6a..582828529 100644
--- a/kdoctools/xslt.cpp
+++ b/kdoctools/xslt.cpp
@@ -6,11 +6,11 @@
#include <libxml/parserInternals.h>
#include <libxml/catalog.h>
#include <kdebug.h>
-#include <kstandarddirs.h>
+#include <tdestandarddirs.h>
#include <tqdir.h>
#include <tqregexp.h>
#include <xslt.h>
-#include <kinstance.h>
+#include <tdeinstance.h>
#include "tdeio_help.h"
#include <tdelocale.h>
#include <assert.h>
@@ -205,7 +205,7 @@ static TQIODevice *getBZip2device(const TQString &fileName )
if ( base )
{
- base->setDevice(TQT_TQIODEVICE(f), true);
+ base->setDevice(f, true);
return new KFilterDev(base, true);
}
return 0;