Remove traces of deprecated Assistant and AssistantClient.

6 files changed, 92 insertions, 101 deletions

diff --git a/doc/src/deployment/deployment.qdoc b/doc/src/deployment/deployment.qdoc
index 2acc69b92b..d8a03d61ce 100644
--- a/doc/src/deployment/deployment.qdoc
+++ b/doc/src/deployment/deployment.qdoc
@@ -87,29 +87,30 @@
     \header
         \o {4,1} Qt's Libraries
     \row
-        \o \l {QtAssistant}
         \o \l {QAxContainer}
         \o \l {QAxServer}
         \o \l {QtCore}
-    \row
         \o \l {QtDBus}
+    \row
         \o \l {QtDesigner}
         \o \l {QtGui}
         \o \l {QtHelp}
-    \row
         \o \l {QtNetwork}
+    \row
         \o \l {QtOpenGL}
         \o \l {QtScript}
         \o \l {QtScriptTools}
-    \row
         \o \l {QtSql}
+    \row
         \o \l {QtSvg}
         \o \l {QtWebKit}
         \o \l {QtXml}
-    \row
         \o \l {QtXmlPatterns}
+    \row
         \o \l {Phonon Module}{Phonon}
         \o \l {Qt3Support}
+        \o \l {}
+        \o \l {}
     \endtable
 
     Since Qt is not a system library, it has to be redistributed along
diff --git a/doc/src/modules.qdoc b/doc/src/modules.qdoc
index 05ff6bc10e..c2222683cb 100644
--- a/doc/src/modules.qdoc
+++ b/doc/src/modules.qdoc
@@ -288,33 +288,33 @@
 */
 
 /*!
-	\module QtScript
-	\title QtScript Module
-	\since 4.3
-	\contentspage All Qt Modules
-	\previouspage QtOpenVG
-	\nextpage QtScriptTools
-	\ingroup modules
+    \module QtScript
+    \title QtScript Module
+    \since 4.3
+    \contentspage All Qt Modules
+    \previouspage QtOpenVG
+    \nextpage QtScriptTools
+    \ingroup modules
 
-	\brief The QtScript module provides classes for making Qt applications scriptable.
+    \brief The QtScript module provides classes for making Qt applications scriptable.
 
-	The QtScript module only provides core scripting facilities; the
-	QtScriptTools module provides additional Qt Script-related
-	components that application developers may find useful.
+    The QtScript module only provides core scripting facilities; the
+    QtScriptTools module provides additional Qt Script-related
+    components that application developers may find useful.
 
-	\tableofcontents
+    \tableofcontents
 
-	To include the definitions of the module's classes, use the
-	following directive:
+    To include the definitions of the module's classes, use the
+    following directive:
 
-	\snippet doc/src/snippets/code/doc_src_qtscript.qdoc 0
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 0
 
-	To link against the module, add this line to your \l qmake \c .pro file:
+    To link against the module, add this line to your \l qmake \c .pro file:
 
-	\snippet doc/src/snippets/code/doc_src_qtscript.qdoc 1
+    \snippet doc/src/snippets/code/doc_src_qtscript.qdoc 1
 
-	The QtScript module is part of the \l{Qt Full Framework Edition} and the
-	\l{Open Source Versions of Qt}.
+    The QtScript module is part of the \l{Qt Full Framework Edition} and the
+    \l{Open Source Versions of Qt}.
 */
 
 /*!
@@ -370,59 +370,59 @@
 */
 
 /*!
-	\module QtSvg
-	\title QtSvg Module
-	\since 4.1
-	\contentspage All Qt Modules
-	\previouspage QtSql
-	\nextpage QtWebKit
-	\ingroup modules
-
-	\brief The QtSvg module provides classes for displaying the contents of SVG
-	files.
-
-	To include the definitions of the module's classes, use the
-	following directive:
-
-	\snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 0
-
-	To link against the module, add this line to your \l qmake \c
-	.pro file:
-
-	\snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 1
-
-	The QtSvg module is part of the \l{Qt Full Framework Edition} and the
-	\l{Open Source Versions of Qt}.
-
-	\section1 License Information
-
-	Some code for arc handling in this module is derived from code with
-	the following license:
-
-	\legalese
-	Copyright  2002 USC/Information Sciences Institute
-
-	Permission to use, copy, modify, distribute, and sell this software
-	and its documentation for any purpose is hereby granted without
-	fee, provided that the above copyright notice appear in all copies
-	and that both that copyright notice and this permission notice
-	appear in supporting documentation, and that the name of
-	Information Sciences Institute not be used in advertising or
-	publicity pertaining to distribution of the software without
-	specific, written prior permission.  Information Sciences Institute
-	makes no representations about the suitability of this software for
-	any purpose.  It is provided "as is" without express or implied
-	warranty.
-
-	INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD
-	TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
-	MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES
-	INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-	DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
-	OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-	TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-	PERFORMANCE OF THIS SOFTWARE.
-	\endlegalese
+    \module QtSvg
+    \title QtSvg Module
+    \since 4.1
+    \contentspage All Qt Modules
+    \previouspage QtSql
+    \nextpage QtWebKit
+    \ingroup modules
+
+    \brief The QtSvg module provides classes for displaying the contents of SVG
+    files.
+
+    To include the definitions of the module's classes, use the
+    following directive:
+
+    \snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 0
+
+    To link against the module, add this line to your \l qmake \c
+    .pro file:
+
+    \snippet doc/src/snippets/code/doc_src_qtsvg.qdoc 1
+
+    The QtSvg module is part of the \l{Qt Full Framework Edition} and the
+    \l{Open Source Versions of Qt}.
+
+    \section1 License Information
+
+    Some code for arc handling in this module is derived from code with
+    the following license:
+
+    \legalese
+    Copyright  2002 USC/Information Sciences Institute
+
+    Permission to use, copy, modify, distribute, and sell this software
+    and its documentation for any purpose is hereby granted without
+    fee, provided that the above copyright notice appear in all copies
+    and that both that copyright notice and this permission notice
+    appear in supporting documentation, and that the name of
+    Information Sciences Institute not be used in advertising or
+    publicity pertaining to distribution of the software without
+    specific, written prior permission.  Information Sciences Institute
+    makes no representations about the suitability of this software for
+    any purpose.  It is provided "as is" without express or implied
+    warranty.
+
+    INFORMATION SCIENCES INSTITUTE DISCLAIMS ALL WARRANTIES WITH REGARD
+    TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL INFORMATION SCIENCES
+    INSTITUTE BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+    DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA
+    OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+    TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+    PERFORMANCE OF THIS SOFTWARE.
+    \endlegalese
 */
 
 /*!
@@ -1000,13 +1000,3 @@
     ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
     \endlegalese
 */
-
-/*!
-    \page qtassistant.html
-    \title QtAssistant
-
-    This module is no longer needed. Use the QtHelp module to integrate documentation
-    into your application.
-
-    \sa {QtHelp}
-*/
diff --git a/doc/src/qt4-intro.qdoc b/doc/src/qt4-intro.qdoc
index 13e57bc2fe..789deab9b5 100644
--- a/doc/src/qt4-intro.qdoc
+++ b/doc/src/qt4-intro.qdoc
@@ -225,9 +225,9 @@
     \row    \o \l{Qt3Support}   \o Qt 3 support classes
     \row    \o \l{QAxContainer} \o ActiveQt client extension
     \row    \o \l{QAxServer}    \o ActiveQt server extension
-    \row    \o \l{QtAssistant}  \o Classes for launching Qt Assistant
+    \row    \o \l{QtHelp}       \o Classes for integrating online documentation in applications 
     \row    \o \l{QtDesigner}   \o Classes for extending and embedding Qt Designer
-    \row    \o \l{QtUiTools}       \o Classes for dynamic GUI generation
+    \row    \o \l{QtUiTools}    \o Classes for dynamic GUI generation
     \row    \o \l{QtTest}       \o Tool classes for unit testing
     \endtable
 
diff --git a/tools/qdoc3/test/qt-build-docs.qdocconf b/tools/qdoc3/test/qt-build-docs.qdocconf
index 70e3b4f9a1..d8a9057466 100644
--- a/tools/qdoc3/test/qt-build-docs.qdocconf
+++ b/tools/qdoc3/test/qt-build-docs.qdocconf
@@ -10,10 +10,10 @@ url                     = http://qt.nokia.com/doc/4.6
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
                           QtXmlPatterns QtTest
-edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql QtSvg \
-                          QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
-                          QtDesigner QtAssistant QAxContainer Phonon \
-                          QAxServer QtUiTools QtTest QtDBus
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtSql \
+                          QtSvg QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
+                          QtDesigner QAxContainer Phonon QAxServer QtUiTools \
+                          QtTest QtDBus
 edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
 edition.DesktopLight.groups       = -graphicsview-api
 
diff --git a/tools/qdoc3/test/qt-inc.qdocconf b/tools/qdoc3/test/qt-inc.qdocconf
index 4ef32b806c..617a8ca4ae 100644
--- a/tools/qdoc3/test/qt-inc.qdocconf
+++ b/tools/qdoc3/test/qt-inc.qdocconf
@@ -6,9 +6,9 @@ description             = Qt Reference Documentation
 url                     = http://qt.nokia.com/doc/4.6
 
 edition.Console         = QtCore QtNetwork QtSql QtXml QtScript QtTest
-edition.Desktop         = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml QtScript \
-                          QtDesigner QtAssistant Qt3Support QAxContainer \
-                          QAxServer QtUiTools QtTest QtDBus
+edition.Desktop         = QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml \
+                          QtScript QtDesigner Qt3Support QAxContainer QAxServer \
+                          QtUiTools QtTest QtDBus
 edition.DesktopLight    = QtCore QtGui Qt3SupportLight QtTest
 
 language                = Cpp
@@ -100,8 +100,8 @@ Cpp.ignoretokens        = QAXFACTORY_EXPORT \
                           Q_TYPENAME \
                           Q_XML_EXPORT \
                           QDBUS_EXPORT \
-			  Q_GADGET \
-			  QWEBKIT_EXPORT
+              Q_GADGET \
+              QWEBKIT_EXPORT
 Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           Q_DECLARE_INTERFACE \
                           Q_DECLARE_METATYPE \
diff --git a/tools/qdoc3/test/qt.qdocconf b/tools/qdoc3/test/qt.qdocconf
index 942d02395f..43e69d57aa 100644
--- a/tools/qdoc3/test/qt.qdocconf
+++ b/tools/qdoc3/test/qt.qdocconf
@@ -12,9 +12,9 @@ url                     = http://qt.nokia.com/doc/4.6
 
 edition.Console.modules = QtCore QtDBus QtNetwork QtScript QtSql QtXml \
                           QtXmlPatterns QtTest
-edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript QtScriptTools QtSql QtSvg \
-                          QtWebKit QtXml QtXmlPatterns Qt3Support QtHelp \
-                          QtDesigner QtAssistant QAxContainer Phonon \
+edition.Desktop.modules = QtCore QtDBus QtGui QtNetwork QtOpenGL QtScript \
+                          QtScriptTools QtSql QtSvg QtWebKit QtXml QtXmlPatterns \
+                          Qt3Support QtHelp QtDesigner QAxContainer Phonon \
                           QAxServer QtUiTools QtTest QtDBus
 edition.DesktopLight.modules = QtCore QtDBus QtGui Qt3SupportLight QtTest
 edition.DesktopLight.groups       = -graphicsview-api