Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

1 files changed, 22 insertions, 22 deletions

diff --git a/doc/html/ntqcolor.html b/doc/html/ntqcolor.html
index 465af1901..ba7d399fa 100644
--- a/doc/html/ntqcolor.html
+++ b/doc/html/ntqcolor.html
@@ -85,14 +85,14 @@ body { background: #ffffff; color: black; }
 <ul>
 <li class=fn>TQDataStream &amp; <a href="#operator-lt-lt"><b>operator&lt;&lt;</b></a> ( TQDataStream&nbsp;&amp;&nbsp;s, const&nbsp;TQColor&nbsp;&amp;&nbsp;c )</li>
 <li class=fn>TQDataStream &amp; <a href="#operator-gt-gt"><b>operator&gt;&gt;</b></a> ( TQDataStream&nbsp;&amp;&nbsp;s, TQColor&nbsp;&amp;&nbsp;c )</li>
-<li class=fn>int <a href="#qRed"><b>qRed</b></a> ( TQRgb&nbsp;rgb )</li>
-<li class=fn>int <a href="#qGreen"><b>qGreen</b></a> ( TQRgb&nbsp;rgb )</li>
-<li class=fn>int <a href="#qBlue"><b>qBlue</b></a> ( TQRgb&nbsp;rgb )</li>
-<li class=fn>int <a href="#qAlpha"><b>qAlpha</b></a> ( TQRgb&nbsp;rgba )</li>
-<li class=fn>TQRgb <a href="#qRgb"><b>qRgb</b></a> ( int&nbsp;r, int&nbsp;g, int&nbsp;b )</li>
-<li class=fn>TQRgb <a href="#qRgba"><b>qRgba</b></a> ( int&nbsp;r, int&nbsp;g, int&nbsp;b, int&nbsp;a )</li>
-<li class=fn>int <a href="#qGray"><b>qGray</b></a> ( int&nbsp;r, int&nbsp;g, int&nbsp;b )</li>
-<li class=fn>int <a href="#qGray-2"><b>qGray</b></a> ( tqRgb&nbsp;rgb )</li>
+<li class=fn>int <a href="#qRed"><b>tqRed</b></a> ( TQRgb&nbsp;rgb )</li>
+<li class=fn>int <a href="#qGreen"><b>tqGreen</b></a> ( TQRgb&nbsp;rgb )</li>
+<li class=fn>int <a href="#qBlue"><b>tqBlue</b></a> ( TQRgb&nbsp;rgb )</li>
+<li class=fn>int <a href="#qAlpha"><b>tqAlpha</b></a> ( TQRgb&nbsp;rgba )</li>
+<li class=fn>TQRgb <a href="#qRgb"><b>tqRgb</b></a> ( int&nbsp;r, int&nbsp;g, int&nbsp;b )</li>
+<li class=fn>TQRgb <a href="#qRgba"><b>tqRgba</b></a> ( int&nbsp;r, int&nbsp;g, int&nbsp;b, int&nbsp;a )</li>
+<li class=fn>int <a href="#qGray"><b>tqGray</b></a> ( int&nbsp;r, int&nbsp;g, int&nbsp;b )</li>
+<li class=fn>int <a href="#qGray-2"><b>tqGray</b></a> ( tqRgb&nbsp;rgb )</li>
 </ul>
 <hr><a name="details"></a><h2>Detailed Description</h2>
 
@@ -490,7 +490,7 @@ but the value is an arbitrary 32-bit value.
 <p> The return type <em>TQRgb</em> is equivalent to <tt>unsigned</tt> <tt>int</tt>.
 <p> For an invalid color, the alpha value of the returned color is
 unspecified.
-<p> <p>See also <a href="#setRgb">setRgb</a>(), <a href="#hsv">hsv</a>(), <a href="#qRed">qRed</a>(), <a href="#qBlue">qBlue</a>(), <a href="#qGreen">qGreen</a>(), and <a href="#isValid">isValid</a>().
+<p> <p>See also <a href="#setRgb">setRgb</a>(), <a href="#hsv">hsv</a>(), <a href="#qRed">tqRed</a>(), <a href="#qBlue">tqBlue</a>(), <a href="#qGreen">tqGreen</a>(), and <a href="#isValid">isValid</a>().
 
 <h3 class=fn>void <a name="rgb-2"></a>TQColor::rgb ( int&nbsp;*&nbsp;r, int&nbsp;*&nbsp;g, int&nbsp;*&nbsp;b ) const
 </h3> <b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
@@ -548,20 +548,20 @@ Writes a color object, <em>c</em> to the stream, <em>s</em>.
 Reads a color object, <em>c</em>, from the stream, <em>s</em>.
 <p> <p>See also <a href="datastreamformat.html">Format of the TQDataStream operators</a>.
 
-<h3 class=fn>int <a name="qAlpha"></a>qAlpha ( TQRgb&nbsp;rgba )
+<h3 class=fn>int <a name="qAlpha"></a>tqAlpha ( TQRgb&nbsp;rgba )
 </h3>
 
 
 <p> Returns the alpha component of the RGBA quadruplet <em>rgba</em>.
 
-<h3 class=fn>int <a name="qBlue"></a>qBlue ( TQRgb&nbsp;rgb )
+<h3 class=fn>int <a name="qBlue"></a>tqBlue ( TQRgb&nbsp;rgb )
 </h3>
 
 
 <p> Returns the blue component of the RGB triplet <em>rgb</em>.
-<p>See also <a href="#qRgb">qRgb</a>() and <a href="#blue">TQColor::blue</a>().
+<p>See also <a href="#qRgb">tqRgb</a>() and <a href="#blue">TQColor::blue</a>().
 
-<h3 class=fn>int <a name="qGray"></a>qGray ( int&nbsp;r, int&nbsp;g, int&nbsp;b )
+<h3 class=fn>int <a name="qGray"></a>tqGray ( int&nbsp;r, int&nbsp;g, int&nbsp;b )
 </h3>
 
 
@@ -569,41 +569,41 @@ Reads a color object, <em>c</em>, from the stream, <em>s</em>.
 <p> The gray value is calculated using the formula (r*11 + g*16 +
 b*5)/32.
 
-<h3 class=fn>int <a name="qGray-2"></a>qGray ( tqRgb&nbsp;rgb )
+<h3 class=fn>int <a name="qGray-2"></a>tqGray ( tqRgb&nbsp;rgb )
 </h3>
 This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
 <p> 
 <p> Returns a gray value 0..255 from the given <em>rgb</em> colour.
 
-<h3 class=fn>int <a name="qGreen"></a>qGreen ( TQRgb&nbsp;rgb )
+<h3 class=fn>int <a name="qGreen"></a>tqGreen ( TQRgb&nbsp;rgb )
 </h3>
 
 
 <p> Returns the green component of the RGB triplet <em>rgb</em>.
-<p>See also <a href="#qRgb">qRgb</a>() and <a href="#green">TQColor::green</a>().
+<p>See also <a href="#qRgb">tqRgb</a>() and <a href="#green">TQColor::green</a>().
 
-<h3 class=fn>int <a name="qRed"></a>qRed ( TQRgb&nbsp;rgb )
+<h3 class=fn>int <a name="qRed"></a>tqRed ( TQRgb&nbsp;rgb )
 </h3>
 
 
 <p> Returns the red component of the RGB triplet <em>rgb</em>.
-<p>See also <a href="#qRgb">qRgb</a>() and <a href="#red">TQColor::red</a>().
+<p>See also <a href="#qRgb">tqRgb</a>() and <a href="#red">TQColor::red</a>().
 
-<h3 class=fn>TQRgb <a name="qRgb"></a>qRgb ( int&nbsp;r, int&nbsp;g, int&nbsp;b )
+<h3 class=fn>TQRgb <a name="qRgb"></a>tqRgb ( int&nbsp;r, int&nbsp;g, int&nbsp;b )
 </h3>
 
 
 <p> Returns the RGB triplet <em>(r,g,b)</em>.
 <p> The return type TQRgb is equivalent to <tt>unsigned</tt> <tt>int</tt>.
-<p> <p>See also <a href="#qRgba">qRgba</a>(), <a href="#qRed">qRed</a>(), <a href="#qGreen">qGreen</a>(), and <a href="#qBlue">qBlue</a>().
+<p> <p>See also <a href="#qRgba">tqRgba</a>(), <a href="#qRed">tqRed</a>(), <a href="#qGreen">tqGreen</a>(), and <a href="#qBlue">tqBlue</a>().
 
-<h3 class=fn>TQRgb <a name="qRgba"></a>qRgba ( int&nbsp;r, int&nbsp;g, int&nbsp;b, int&nbsp;a )
+<h3 class=fn>TQRgb <a name="qRgba"></a>tqRgba ( int&nbsp;r, int&nbsp;g, int&nbsp;b, int&nbsp;a )
 </h3>
 
 
 <p> Returns the RGBA quadruplet <em>(r,g,b,a)</em>.
 <p> The return type TQRgba is equivalent to <tt>unsigned</tt> <tt>int</tt>.
-<p> <p>See also <a href="#qRgb">qRgb</a>(), <a href="#qRed">qRed</a>(), <a href="#qGreen">qGreen</a>(), and <a href="#qBlue">qBlue</a>().
+<p> <p>See also <a href="#qRgb">tqRgb</a>(), <a href="#qRed">tqRed</a>(), <a href="#qGreen">tqGreen</a>(), and <a href="#qBlue">tqBlue</a>().
 
 <!-- eof -->
 <hr><p>