Sun Aug 30 16:26:13 CEST 2009  Tobias Rautenkranz <tobias@rautenkranz.ch>
  * Multiple inheritance doc & expand tabs in programmlisting.
diff -rN -u old-doc/qt.xml new-doc/qt.xml
--- old-doc/qt.xml	2014-10-30 07:10:55.000000000 +0100
+++ new-doc/qt.xml	2014-10-30 07:10:55.000000000 +0100
@@ -6,21 +6,21 @@
 <para>
 Besides the <package>:qt</package> there are these modules: with
 <itemizedlist>
-	<listitem><para>
-	<package>:qt.uitools</package>
-	<ulink url="http://doc.trolltech.com/4.5/qtuitools.html">
-	QtUiTools</ulink></para></listitem>
-	<listitem><para><package>:qt.test</package>
-	<ulink url="http://doc.trolltech.com/4.5/qttest.html">
-	QtTest</ulink></para></listitem>
-	<listitem><para><package>:qt.webkit</package>
-	<ulink url="http://doc.trolltech.com/4.5/qtwebkit.html">
-	QtWebKit</ulink>
-	</para></listitem>
-	<listitem><para><package>:qt.phonon</package>
-	<ulink url="http://doc.trolltech.com/4.5/phonon.html">
-	Phonon</ulink>
-	</para></listitem>
+  <listitem><para>
+  <package>:qt.uitools</package>
+  <ulink url="http://doc.trolltech.com/4.5/qtuitools.html">
+  QtUiTools</ulink></para></listitem>
+  <listitem><para><package>:qt.test</package>
+  <ulink url="http://doc.trolltech.com/4.5/qttest.html">
+  QtTest</ulink></para></listitem>
+  <listitem><para><package>:qt.webkit</package>
+  <ulink url="http://doc.trolltech.com/4.5/qtwebkit.html">
+  QtWebKit</ulink>
+  </para></listitem>
+  <listitem><para><package>:qt.phonon</package>
+  <ulink url="http://doc.trolltech.com/4.5/phonon.html">
+  Phonon</ulink>
+  </para></listitem>
 </itemizedlist>
 which provide bindings for their Qt module. The class names of this modules are in
 the <package>:qt</package> package. (E.g. Phonon::VideoPlayer is <code>'qt:phonon.video-player</code>
@@ -42,13 +42,13 @@
 <screenshot>
 <mediaobject>
 <imageobject>
-	<imagedata fileref="hello-world.png" format="PNG"/>
+  <imagedata fileref="hello-world.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </screenshot>
 <programlisting language="lisp">
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../qt.examples/src/hello-world.lisp" parse="text" />
-</programlisting>	
+</programlisting> 
 </example>
 <para>
 Subclasses of <classname>qt:paint-device</classname> (e.g. <classname>qt:widget</classname>) can only be used when
@@ -108,8 +108,8 @@
 <informalexample>
 <programlisting language="lisp">
 (let ((object (make-instance '<classname>qt:object</classname>)))
-	(setf (<methodname>qt:property</methodname> object :object-name) "Foo")
-	(assert (string= "Foo" (<methodname>qt:property</methodname> object "objectName"))))
+  (setf (<methodname>qt:property</methodname> object :object-name) "Foo")
+  (assert (string= "Foo" (<methodname>qt:property</methodname> object "objectName"))))
 </programlisting>
 </informalexample>
 
@@ -132,7 +132,7 @@
 <screenshot>
 <mediaobject>
 <imageobject>
-	<imagedata fileref="i18n-hello-world.png" format="PNG"/>
+  <imagedata fileref="i18n-hello-world.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </screenshot>
@@ -140,14 +140,14 @@
 <programlisting language="lisp">
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
 href="../qt.examples/src/i18n-hello-world.lisp" parse="text" />
-</programlisting>	
+</programlisting> 
 
 <formalpara>
 <title><filename>hello-world_de.po</filename></title>
 <para>
 <programlisting language="po">
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../qt.examples/src/hello-world_de.po" parse="text" />
-</programlisting>	
+</programlisting> 
 </para>
 </formalpara>
 </example>
@@ -178,13 +178,13 @@
 <screenshot>
 <mediaobject>
 <imageobject>
-	<imagedata fileref="repl.png" format="PNG"/>
+  <imagedata fileref="repl.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </screenshot>
 <programlisting language="lisp">
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../qt.examples/src/repl.lisp" parse="text" />
-</programlisting>	
+</programlisting> 
 </example>
 
 <example>
@@ -196,13 +196,13 @@
 <screenshot>
 <mediaobject>
 <imageobject>
-	<imagedata fileref="class-browser.png" format="PNG"/>
+  <imagedata fileref="class-browser.png" format="PNG"/>
 </imageobject>
 </mediaobject>
 </screenshot>
 <programlisting language="lisp">
 <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="../qt.examples/src/class-browser.lisp" parse="text" />
-</programlisting>	
+</programlisting> 
 </example>
 
 </section>
@@ -244,7 +244,7 @@
 <screenshot>
 <mediaobject>
 <imageobject>
-	<imagedata fileref="commonqt-t14.png" format="PNG"/>
+  <imagedata fileref="commonqt-t14.png" format="PNG"/>
 </imageobject>
 <caption>
 <para>CommonQt tutorial 14
diff -rN -u old-doc/smoke.xml new-doc/smoke.xml
--- old-doc/smoke.xml	2014-10-30 07:10:55.000000000 +0100
+++ new-doc/smoke.xml	2014-10-30 07:10:55.000000000 +0100
@@ -30,14 +30,14 @@
 <informalexample>
 <programlisting language="lisp">
 (let ((parent (make-instance '<classname>qt:object</classname>)))
-	(make-instance '<classname>qt:object</classname> :args (list parent)))
+  (make-instance '<classname>qt:object</classname> :args (list parent)))
 </programlisting>
 </informalexample>
 or use <code>:arg0</code>, <code>:arg1</code> and <code>:arg2</code>.
 <informalexample>
 <programlisting language="lisp">
 (let ((parent (make-instance '<classname>qt:object</classname>)))
-	(make-instance '<classname>qt:object</classname> :arg0 parent))
+  (make-instance '<classname>qt:object</classname> :arg0 parent))
 </programlisting>
 </informalexample>
 </para>
@@ -46,8 +46,20 @@
 <informalexample>
 <programlisting language="lisp">
 (defclass my-object (<classname>qt:object</classname>)
-	()
-	(:metaclass <classname>cxx:class</classname>))
+  ()
+  (:metaclass <classname>cxx:class</classname>))
+
+(make-instance 'my-object)
+</programlisting>
+</informalexample>
+The first superclass must be a Smoke class. When you define a class that has several Smoke superclasses,
+they will be constructed with their default constructor. For the first Smoke superclass you can supply arguments
+with the <code>:args</code> and <code>:arg0</code> etc. keywords.
+<informalexample>
+<programlisting language="lisp">
+(defclass my-graphics-object (<classname>qt:object</classname> <classname>qt:graphics-item</classname>)
+  ()
+  (:metaclass <classname>cxx:class</classname>))
 </programlisting>
 </informalexample>
 </para>
@@ -109,12 +121,12 @@
 </para>
 <informalexample>
 <programlisting language="lisp">(defclass the-object-does-nothing (<classname>qt:object</classname>)
-	()
-	(:metaclass <classname>cxx:class</classname>))
+  ()
+  (:metaclass <classname>cxx:class</classname>))
 
 (defmethod <genericfunction>cxx:timer-event</genericfunction> ((object the-object-does-nothing) event)
-	(declare (ignore object event))
-	(call-next-method))
+  (declare (ignore object event))
+  (call-next-method))
 </programlisting>
 </informalexample>
 <para>
@@ -197,9 +209,9 @@
 
 <section id="constants"><title>Constants</title>
 <para>
-	C++ Class enums available as constants. E.g.:
-	<code>QColor::Rgb</code> is <constant>qt:color.+rgb+</constant>.
-	See <package>:cxx-support</package>.
+  C++ Class enums available as constants. E.g.:
+  <code>QColor::Rgb</code> is <constant>qt:color.+rgb+</constant>.
+  See <package>:cxx-support</package>.
 </para>
 </section>
 
@@ -215,7 +227,7 @@
 </para>
 <caution>
 <para>
-	Ownership transfer for non QObject instances is mostly unimplemented.
+  Ownership transfer for non QObject instances is mostly unimplemented.
 </para>
 </caution>
 </section>