Doc: corrected snippet issues

In multiple.qdoc: replace \snippet with \input
Replaced statement "snippet" with "input"
Replaced "*;" with "*\"
Replaced raw-endraw with code-endcode
Replaced "raw" with "code"
Put code-endcode around numbered paragraphs
Resolved conflict in simple-demo.qdocinc

Task-number: QTBUG-29101
Change-Id: Idceb971d56551bf9e8bdce410360d418747731fe
Reviewed-by: Martin Smith <martin.smith@digia.com>

8 files changed, 22 insertions, 20 deletions

diff --git a/examples/activeqt/multiple/doc/src/multiple.qdoc b/examples/activeqt/multiple/doc/src/multiple.qdoc
index fb7096b..607425d 100644
--- a/examples/activeqt/multiple/doc/src/multiple.qdoc
+++ b/examples/activeqt/multiple/doc/src/multiple.qdoc
@@ -66,5 +66,5 @@
     WebBrowser to support ActiveX controls, and scripting to be
     enabled.
 
-    \snippet examples/multiple-demo.qdocinc 0
+    \input  doc/src/examples/multiple-demo.qdocinc
 */
diff --git a/examples/activeqt/opengl/doc/src/opengl.qdoc b/examples/activeqt/opengl/doc/src/opengl.qdoc
index 0ae0f8f..e77fca0 100644
--- a/examples/activeqt/opengl/doc/src/opengl.qdoc
+++ b/examples/activeqt/opengl/doc/src/opengl.qdoc
@@ -127,5 +127,5 @@
     control should be allowed (the exact browser behaviour depends on the security
     settings in the Internet Options dialog).
 
-    \snippet doc/src/examples/opengl-demo.qdocinc 0
+    \input doc/src/examples/opengl-demo.qdocinc
 */
diff --git a/examples/activeqt/simple/doc/src/simple.qdoc b/examples/activeqt/simple/doc/src/simple.qdoc
index 3a781ae..77a45c5 100644
--- a/examples/activeqt/simple/doc/src/simple.qdoc
+++ b/examples/activeqt/simple/doc/src/simple.qdoc
@@ -99,18 +99,18 @@
 
     The simple ActiveX control is embedded using the \c <object> tag.
 
-    \snippet doc/src/examples/simple-demo.qdocinc 0
+    \input doc/src/examples/simple-demo.qdocinc 0
 
     A simple HTML button is connected to the ActiveQt's about() slot.
 
-    \snippet doc/src/examples/simple-demo.qdocinc 1
+    \input doc/src/examples/simple-demo.qdocinc 1
 
     A second ActiveX control - the standard Calendar Control - is instantiated
 
-    \snippet doc/src/examples/simple-demo.qdocinc 2
+    \input doc/src/examples/simple-demo.qdocinc 2
 
     Events from the ActiveX controls are handled using both Visual Basic Script
     and JavaScript.
 
-    \snippet doc/src/examples/simple-demo.qdocinc 3
+    \input doc/src/examples/simple-demo.qdocinc 3
 */
diff --git a/examples/activeqt/wrapper/doc/src/wrapper.qdoc b/examples/activeqt/wrapper/doc/src/wrapper.qdoc
index 910cb81..ba593df 100644
--- a/examples/activeqt/wrapper/doc/src/wrapper.qdoc
+++ b/examples/activeqt/wrapper/doc/src/wrapper.qdoc
@@ -30,7 +30,7 @@
 
     \title Standard Qt widgets in an HTML page
 
-    \input examples/wrapper-demo.qdocinc
+    \input doc/src/examples/examples/wrapper-demo.qdocinc
 */
 
 /*!
@@ -59,5 +59,5 @@
     web browser that supports ActiveX controls, and scripting to be
     enabled.
 
-    \snippet examples/wrapper-demo.qdocinc 0
+    \input examples/wrapper-demo.qdocinc 0
 */
diff --git a/src/activeqt/doc/src/examples/multiple-demo.qdocinc b/src/activeqt/doc/src/examples/multiple-demo.qdocinc
index 339fc20..aabdb6d 100644
--- a/src/activeqt/doc/src/examples/multiple-demo.qdocinc
+++ b/src/activeqt/doc/src/examples/multiple-demo.qdocinc
@@ -1,4 +1,4 @@
-\raw HTML
+\code
 //! [0]
 <script language="javascript">
 function setColor( form )
@@ -36,4 +36,4 @@ Line width: <input type="edit" ID="widthEdit" value = "1" />
 <input type="button" value = "Set" onClick="setWidth(this.form)" />
 </form>
 //! [0]
-\endraw
+\endcode
diff --git a/src/activeqt/doc/src/examples/opengl-demo.qdocinc b/src/activeqt/doc/src/examples/opengl-demo.qdocinc
index ccc1452..70bbf1b 100644
--- a/src/activeqt/doc/src/examples/opengl-demo.qdocinc
+++ b/src/activeqt/doc/src/examples/opengl-demo.qdocinc
@@ -1,5 +1,4 @@
-\raw HTML
-//! [0]
+\code
 <SCRIPT LANGUAGE="JavaScript">
 function setRot( form )
 {
@@ -23,5 +22,4 @@ Y:<input type="edit" name="YEdit" value="0" /><br />
 Z:<input type="edit" name="ZEdit" value="0" /><br />
 <input type="button" value="Set" onClick="setRot(this.form)" />
 </form>
-//! [0]
-\endraw
+\endcode
diff --git a/src/activeqt/doc/src/examples/simple-demo.qdocinc b/src/activeqt/doc/src/examples/simple-demo.qdocinc
index 5eee8bc..d8ad1e7 100644
--- a/src/activeqt/doc/src/examples/simple-demo.qdocinc
+++ b/src/activeqt/doc/src/examples/simple-demo.qdocinc
@@ -1,23 +1,28 @@
-\raw HTML
 //! [0]
+\code
 <object ID="QSimpleAX" CLASSID="CLSID:DF16845C-92CD-4AAB-A982-EB9840E74669"
 CODEBASE="http://qt.nokia.com/demos/simpleax.cab">
     <PARAM NAME="text" VALUE="A simple control" />
     <PARAM NAME="value" VALUE="1" />
 [Object not available! Did you forget to build and register the server?]
 </object>
+\endcode
 //! [0] //! [1]
+\code
 
 <FORM>
     <INPUT TYPE="BUTTON" VALUE="About..." onClick="QSimpleAX.about()" />
 </FORM>
+\endcode
 //! [1]
 
 //! [2]
+\code
 <object ID="Calendar" CLASSID="CLSID:8E27C92B-1264-101C-8A2F-040224009C02">
 [Standard Calendar control not available!]
     <PARAM NAME="day" VALUE="1" />
 </object>
+\endcode
 //! [2]
 
 <FORM>
@@ -25,6 +30,7 @@ CODEBASE="http://qt.nokia.com/demos/simpleax.cab">
 </FORM>
 
 //! [3]
+\code
 <SCRIPT LANGUAGE="VBScript">
 Sub Calendar_Click()
     MsgBox( "Calendar Clicked!" )
@@ -41,5 +47,5 @@ function QSimpleAX::ValueChanged( Newvalue )
     Calendar.Day = Newvalue;
 }
 </SCRIPT>
+\endcode
 //! [3]
-\endraw
diff --git a/src/activeqt/doc/src/examples/wrapper-demo.qdocinc b/src/activeqt/doc/src/examples/wrapper-demo.qdocinc
index a00c505..7431726 100644
--- a/src/activeqt/doc/src/examples/wrapper-demo.qdocinc
+++ b/src/activeqt/doc/src/examples/wrapper-demo.qdocinc
@@ -1,5 +1,4 @@
-\raw HTML
-//! [0]
+\code
 <SCRIPT LANGUAGE="VBScript">
 Sub ToolButton_Clicked()
     RadioButton.text = InputBox( "Enter something", "Wrapper Demo" )
@@ -47,5 +46,4 @@ CODEBASE="http://qt.nokia.com/demos/wrapperax.cab">
     <PARAM NAME="text" VALUE="Tune me!" />
 [Object not available! Did you forget to build and register the server?]
 </object><br />
-//! [0]
-\endraw
+\endcode