Add help handbook, add DocPath, rename files.

34 files changed, 99 insertions, 101 deletions

diff --git a/Makefile.am b/Makefile.am
index d0665f9..dd66115 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = foreign 1.6
 
-SUBDIRS = lib src po
+SUBDIRS = lib src po doc
 
 package-messages:
 	$(MAKE) -f admin/Makefile.common package-messages
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..81fee21
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1 @@
+SUBDIRS = en
diff --git a/doc/en/Makefile.am b/doc/en/Makefile.am
new file mode 100644
index 0000000..72e7ae5
--- /dev/null
+++ b/doc/en/Makefile.am
@@ -0,0 +1,2 @@
+KDE_LANG = en
+KDE_DOCS = kchmviewer
diff --git a/doc/en/index.docbook b/doc/en/index.docbook
new file mode 100644
index 0000000..3226287
--- /dev/null
+++ b/doc/en/index.docbook
@@ -0,0 +1,61 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+  <!ENTITY kchmviewer "<application>KCHMViewer</application>">
+  <!ENTITY kappname "&kchmviewer;">
+  <!ENTITY % addindex "IGNORE">
+  <!ENTITY % English "INCLUDE">
+]>
+
+<article lang="&language;">
+<title>The &kappname; Handbook</title>
+
+<articleinfo>
+<title>The &kappname; Handbook</title>
+
+<authorgroup>
+<author>&tde-authors;</author>
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
+</authorgroup>
+
+<releaseinfo>&tde-release-version;</releaseinfo>
+<date>Reviewed: &tde-release-date;</date>
+
+<copyright>
+<year>&tde-copyright-date;</year>
+<holder>&tde-team;</holder>
+</copyright>
+
+<!-- <legalnotice>&FDLNotice;</legalnotice> -->
+
+<abstract>
+<para>
+&kappname; is a Microsoft help file (CHM) viewer.
+</para>
+</abstract>
+
+<keywordset>
+<keyword>TDE</keyword>
+<keyword>CHM</keyword>
+</keywordset>
+
+</articleinfo>
+
+<sect1 id="apologies">
+<title>We Apologize</title>
+<para>No documentation has yet been written for &kappname;.</para>
+
+<para>If you need help, please check <ulink url="http://www.trinitydesktop.org">The &tde;
+web site</ulink>, submit questions to the <ulink url="http://www.trinitydesktop.org/mailinglist.php">
+&tde; mail lists</ulink>, or file a bug report at the <ulink url="http://bugs.trinitydesktop.org/">
+&tde; bug tracker</ulink>.</para>
+
+<para>If you are interested in helping, please consider writing the help file.
+Submitting a basic text file is acceptable as the &tde-team; will convert the text.</para>
+
+<para>Thank you for helping and thank you for your patience.</para>
+
+&underFDL;
+
+</sect1>
+
+</article>
diff --git a/kchmviewer.kdevses b/kchmviewer.kdevses
deleted file mode 100644
index 47a0b2f..0000000
--- a/kchmviewer.kdevses
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE KDevPrjSession>
-<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="15" >
-  <Doc0 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmmainwindow.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc0>
-  <Doc1 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmsearchwindow.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc1>
-  <Doc2 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/libchmfile/libchmfile.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc2>
-  <Doc3 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/libchmfile/libchmfile.cpp" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc3>
-  <Doc4 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/libchmfile/libchmfileimpl.cpp" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc4>
-  <Doc5 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmmainwindow.cpp" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc5>
-  <Doc6 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmviewwindow_qtextbrowser.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc6>
-  <Doc7 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmsourcefactory.cpp" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc7>
-  <Doc8 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmviewwindow.cpp" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc8>
-  <Doc9 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmviewwindow.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc9>
-  <Doc10 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmviewwindowmgr.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc10>
-  <Doc11 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/tdeio-msits/msits.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc11>
-  <Doc12 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/libchmfile/lchmurlhandler.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc12>
-  <Doc13 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/lib/libchmfile/libchmurlfactory.h" >
-   <View0 Encoding="ISO 8859-1" Type="Source" />
-  </Doc13>
-  <Doc14 NumberOfViews="1" URL="file:///home/tim/work/kchmviewer/src/kchmviewwindow_qtextbrowser.cpp" >
-   <View0 Encoding="ISO 8859-1" line="224" Type="Source" />
-  </Doc14>
- </DocsAndViews>
- <pluginList>
-  <kdevdebugger>
-   <breakpointList>
-    <breakpoint0 location="/home/tim/work/kchmviewer/src/kchmmainwindow.cpp:329" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
-     <tracedExpressions/>
-    </breakpoint0>
-   </breakpointList>
-   <showInternalCommands value="0" />
-  </kdevdebugger>
-  <kdevastyle>
-   <Extensions ext="*.cpp *.h,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" />
-   <AStyle IndentPreprocessors="1" FillCount="4" PadParenthesesOut="1" IndentNamespaces="0" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="1" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="1" FStyle="UserDefined" IndentCases="1" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="1" />
-  </kdevastyle>
-  <kdevbookmarks>
-   <bookmarks/>
-  </kdevbookmarks>
-  <kdevvalgrind>
-   <executable path="" params="" />
-   <valgrind path="" params="" />
-   <calltree path="" params="" />
-   <tdecachegrind path="" />
-  </kdevvalgrind>
- </pluginList>
-</KDevPrjSession>
diff --git a/lib/tdeio-msits/kchmviewer.desktop b/lib/tdeio-msits/kchmviewer.desktop
index 31558d8..83dd1cc 100644
--- a/lib/tdeio-msits/kchmviewer.desktop
+++ b/lib/tdeio-msits/kchmviewer.desktop
@@ -9,3 +9,4 @@ Name=KchmViewer
 GenericName=CHM (MS-Help) Viewer
 Comment=A viewer for CHM (MS-Help) files
 MimeType=application/chm
+DocPath=kchmviewer/index.html
diff --git a/src/Makefile.am b/src/Makefile.am
index e14ed77..cd05f38 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,13 +1,13 @@
 if AMC_USE_KDE
-LIB_KDEEXTRADIR = kde
-LIB_KDEEXTRA = kde/libkdeextra.a
+LIB_KDEEXTRADIR = tde
+LIB_KDEEXTRA = tde/libkdeextra.a
 endif
 
 bin_PROGRAMS = kchmviewer
 kchmviewer_SOURCES = iconstorage.cpp kchmbookmarkwindow.cpp kchmconfig.cpp \
 			kchmindexwindow.cpp kchmmainwindow.cpp kchmsearchtoolbar.cpp kchmsearchwindow.cpp \
 			kchmsettings.cpp kchmsourcefactory.cpp kchmtreeviewitem.cpp kchmviewwindow.cpp main.cpp \
-			kchmdialogchooseurlfromlist.cpp kde-qt.cpp kchmviewwindow_qtextbrowser.cpp \
+			kchmdialogchooseurlfromlist.cpp tde-tqt.cpp kchmviewwindow_qtextbrowser.cpp \
 			kchmsetupdialog.ui kqtempfile.cpp kchmnavtoolbar.cpp kchmviewwindowmgr.cpp \
 			kchmkeyeventfilter.cpp kchmcontentswindow.cpp kchmsearchengine_impl.cpp \
 			kchmsearchengine.cpp
@@ -28,7 +28,7 @@ KDE_ICON = AUTO
 noinst_HEADERS = kchmsettings.h forwarddeclarations.h kchmsourcefactory.h \
 			iconstorage.h kchmbookmarkwindow.h kchmconfig.h kchmtreeviewitem.h \
 			kchmdialogchooseurlfromlist.h kchmviewwindow.h kchmindexwindow.h \
-			kchmmainwindow.h kchmviewwindow_qtextbrowser.h kchmsearchtoolbar.h kde-qt.h \
+			kchmmainwindow.h kchmviewwindow_qtextbrowser.h kchmsearchtoolbar.h tde-tqt.h \
 			kchmsearchwindow.h kqtempfile.h kqrunprocess.h kchmnavtoolbar.h kchmviewwindowmgr.h \
 			kchmkeyeventfilter.h kchmcontentswindow.h kchmlistitemtooltip.h kchmsearchengine_impl.h \
 			kchmsearchengine.h
diff --git a/src/kchmbookmarkwindow.h b/src/kchmbookmarkwindow.h
index ef57278..2a79b49 100644
--- a/src/kchmbookmarkwindow.h
+++ b/src/kchmbookmarkwindow.h
@@ -22,7 +22,7 @@
 #ifndef KCHMBOOKMARKWINDOW_H
 #define KCHMBOOKMARKWINDOW_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "forwarddeclarations.h"
 #include "kchmsettings.h"
 
diff --git a/src/kchmconfig.cpp b/src/kchmconfig.cpp
index 8f33057..c96acb0 100644
--- a/src/kchmconfig.cpp
+++ b/src/kchmconfig.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "kchmconfig.h"
 #include "kchmsettings.h"
 #include "kchmmainwindow.h"
diff --git a/src/kchmcontentswindow.cpp b/src/kchmcontentswindow.cpp
index b98b444..200df61 100644
--- a/src/kchmcontentswindow.cpp
+++ b/src/kchmcontentswindow.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "libchmfile.h"
 
diff --git a/src/kchmcontentswindow.h b/src/kchmcontentswindow.h
index e47b0fb..5c29956 100644
--- a/src/kchmcontentswindow.h
+++ b/src/kchmcontentswindow.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDE_KCHMCONTENTSWINDOW_H
 #define INCLUDE_KCHMCONTENTSWINDOW_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "kchmtreeviewitem.h"
 
 /**
diff --git a/src/kchmdialogchooseurlfromlist.cpp b/src/kchmdialogchooseurlfromlist.cpp
index 41bc64a..bb50a13 100644
--- a/src/kchmdialogchooseurlfromlist.cpp
+++ b/src/kchmdialogchooseurlfromlist.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "kchmdialogchooseurlfromlist.h"
 #include "kchmtreeviewitem.h"
diff --git a/src/kchmlistitemtooltip.h b/src/kchmlistitemtooltip.h
index 8bf43bf..1867900 100644
--- a/src/kchmlistitemtooltip.h
+++ b/src/kchmlistitemtooltip.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDE_KCHMLISTITEMTOOLTIP_H
 #define INCLUDE_KCHMLISTITEMTOOLTIP_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "forwarddeclarations.h"
 
 /**
diff --git a/src/kchmmainwindow.cpp b/src/kchmmainwindow.cpp
index da29e54..5aabdae 100644
--- a/src/kchmmainwindow.cpp
+++ b/src/kchmmainwindow.cpp
@@ -26,7 +26,7 @@
 #include <errno.h>
 #include <unistd.h>
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include <tqaccel.h>
 #include <tqevent.h>
diff --git a/src/kchmmainwindow.h b/src/kchmmainwindow.h
index 586e0ee..a4d1127 100644
--- a/src/kchmmainwindow.h
+++ b/src/kchmmainwindow.h
@@ -22,7 +22,7 @@
 #ifndef KCHMMAINWINDOW_H
 #define KCHMMAINWINDOW_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "libchmfile.h"
 
diff --git a/src/kchmnavtoolbar.cpp b/src/kchmnavtoolbar.cpp
index de42ece..7ebb6fc 100644
--- a/src/kchmnavtoolbar.cpp
+++ b/src/kchmnavtoolbar.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "kchmnavtoolbar.h"
 #include "kchmmainwindow.h"
 #include "kchmviewwindow.h"
diff --git a/src/kchmsearchtoolbar.h b/src/kchmsearchtoolbar.h
index cde8e95..f031cca 100644
--- a/src/kchmsearchtoolbar.h
+++ b/src/kchmsearchtoolbar.h
@@ -22,7 +22,7 @@
 #ifndef KCHMSEARCHTOOLBAR_H
 #define KCHMSEARCHTOOLBAR_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "forwarddeclarations.h"
 
diff --git a/src/kchmsearchwindow.h b/src/kchmsearchwindow.h
index e52066d..5a068a8 100644
--- a/src/kchmsearchwindow.h
+++ b/src/kchmsearchwindow.h
@@ -22,7 +22,7 @@
 #ifndef KCHMSEARCHWINDOW_H
 #define KCHMSEARCHWINDOW_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "kchmsettings.h"
 #include "forwarddeclarations.h"
diff --git a/src/kchmsetupdialog.cpp b/src/kchmsetupdialog.cpp
index c7e8b6b..592db23 100644
--- a/src/kchmsetupdialog.cpp
+++ b/src/kchmsetupdialog.cpp
@@ -23,6 +23,7 @@
 #include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
+#include <tdeapplication.h>
 
 /*
  *  Constructs a KCHMSetupDialog as a child of 'parent', with the
@@ -277,6 +278,7 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     clearWState( WState_Polished );
 
     // signals and slots connections
+    connect( buttonHelp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowHelp() ) );
     connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) );
     connect( buttonCancel, TQT_SIGNAL( clicked() ), this, TQT_SLOT( reject() ) );
     connect( m_radioUseTDEHTMLPart, TQT_SIGNAL( toggled(bool) ), groupKhtmlSecurity, TQT_SLOT( setEnabled(bool) ) );
@@ -311,6 +313,11 @@ KCHMSetupDialog::KCHMSetupDialog( TQWidget* parent, const char* name, bool modal
     setTabOrder( buttonOk, buttonCancel );
 }
 
+void KCHMSetupDialog::slotShowHelp()
+{
+  kapp->invokeHelp( TQString(), "kchmviewer" );
+}
+
 /*
  *  Destroys the object and frees any allocated resources
  */
diff --git a/src/kchmviewwindow.h b/src/kchmviewwindow.h
index fae779e..9a23a01 100644
--- a/src/kchmviewwindow.h
+++ b/src/kchmviewwindow.h
@@ -23,7 +23,7 @@
 #define KCHMVIEWWINDOW_H
 
 #include "forwarddeclarations.h"
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 /**
 @author Georgy Yunaev
diff --git a/src/kchmviewwindow_qtextbrowser.cpp b/src/kchmviewwindow_qtextbrowser.cpp
index dea8626..41db166 100644
--- a/src/kchmviewwindow_qtextbrowser.cpp
+++ b/src/kchmviewwindow_qtextbrowser.cpp
@@ -24,7 +24,7 @@
 #include <tqsimplerichtext.h>
 #include <tqpaintdevicemetrics.h>
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "kchmmainwindow.h"
 #include "kchmviewwindow_qtextbrowser.h"
 
diff --git a/src/kchmviewwindow_qtextbrowser.h b/src/kchmviewwindow_qtextbrowser.h
index df76985..15550cb 100644
--- a/src/kchmviewwindow_qtextbrowser.h
+++ b/src/kchmviewwindow_qtextbrowser.h
@@ -22,7 +22,7 @@
 #ifndef KCHMVIEWWINDOW_TQTEXTBROWSER_H
 #define KCHMVIEWWINDOW_TQTEXTBROWSER_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "kchmviewwindow.h"
 #include "kchmsourcefactory.h"
diff --git a/src/kchmviewwindowmgr.cpp b/src/kchmviewwindowmgr.cpp
index 6499951..bf2bc69 100644
--- a/src/kchmviewwindowmgr.cpp
+++ b/src/kchmviewwindowmgr.cpp
@@ -30,7 +30,7 @@
 #include "kchmviewwindow_qtextbrowser.h"
 
 #if defined (USE_KDE)
-	#include "kde/kchmviewwindow_tdehtmlpart.h"
+	#include "tde/kchmviewwindow_tdehtmlpart.h"
 #endif
 
 
diff --git a/src/kchmviewwindowmgr.h b/src/kchmviewwindowmgr.h
index 34d791f..eea46de 100644
--- a/src/kchmviewwindowmgr.h
+++ b/src/kchmviewwindowmgr.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDE_KCHMVIEWWINDOWMGR_H
 #define INCLUDE_KCHMVIEWWINDOWMGR_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "forwarddeclarations.h"
 #include "kchmsettings.h"
 
diff --git a/src/main.cpp b/src/main.cpp
index 8e84f20..35542f4 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "kchmmainwindow.h"
 #include "kchmconfig.h"
@@ -29,7 +29,7 @@
 	#include <tdeaboutdata.h>
 	#include <dcopclient.h>
 	
-	#include "kde/kchmdcopiface.h"
+	#include "tde/kchmdcopiface.h"
 #endif
 
 KCHMMainWindow * mainWindow;
diff --git a/src/kde-qt.cpp b/src/tde-tqt.cpp
index d12e01b..f668466 100644
--- a/src/kde-qt.cpp
+++ b/src/tde-tqt.cpp
@@ -19,7 +19,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #if defined (USE_KDE)
 KQListView::KQListView( TQWidget * parent, const char * name, int )
diff --git a/src/kde-qt.h b/src/tde-tqt.h
index f60c09e..f60c09e 100644
--- a/src/kde-qt.h
+++ b/src/tde-tqt.h
diff --git a/src/kde/Makefile.am b/src/tde/Makefile.am
index 8524867..8524867 100644
--- a/src/kde/Makefile.am
+++ b/src/tde/Makefile.am
diff --git a/src/kde/kchmdcopiface.cpp b/src/tde/kchmdcopiface.cpp
index d6a90da..d6a90da 100644
--- a/src/kde/kchmdcopiface.cpp
+++ b/src/tde/kchmdcopiface.cpp
diff --git a/src/kde/kchmdcopiface.h b/src/tde/kchmdcopiface.h
index 6922a82..6922a82 100644
--- a/src/kde/kchmdcopiface.h
+++ b/src/tde/kchmdcopiface.h
diff --git a/src/kde/kchmdcopiface_skel.cpp b/src/tde/kchmdcopiface_skel.cpp
index be1e994..be1e994 100644
--- a/src/kde/kchmdcopiface_skel.cpp
+++ b/src/tde/kchmdcopiface_skel.cpp
diff --git a/src/kde/kchmviewwindow_tdehtmlpart.cpp b/src/tde/kchmviewwindow_tdehtmlpart.cpp
index 73f136e..3a57e35 100644
--- a/src/kde/kchmviewwindow_tdehtmlpart.cpp
+++ b/src/tde/kchmviewwindow_tdehtmlpart.cpp
@@ -24,7 +24,7 @@
 #include <tdehtmlview.h>
 #include <kfinddialog.h>
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 #include "kchmmainwindow.h"
 #include "kchmconfig.h"
 #include "kchmviewwindow_tdehtmlpart.h"
diff --git a/src/kde/kchmviewwindow_tdehtmlpart.h b/src/tde/kchmviewwindow_tdehtmlpart.h
index 4bc45c7..0dcbe47 100644
--- a/src/kde/kchmviewwindow_tdehtmlpart.h
+++ b/src/tde/kchmviewwindow_tdehtmlpart.h
@@ -22,7 +22,7 @@
 #ifndef KCHMVIEWWINDOW_TDEHTMLPART_H
 #define KCHMVIEWWINDOW_TDEHTMLPART_H
 
-#include "kde-qt.h"
+#include "tde-tqt.h"
 
 #include "kchmviewwindow.h"
 #include "kchmsourcefactory.h"
diff --git a/subdirs b/subdirs
index 2841462..c73839a 100644
--- a/subdirs
+++ b/subdirs
@@ -1,4 +1,4 @@
-kchmviewer-3.1
+doc
 lib
 po
 src