summaryrefslogtreecommitdiffstats
path: root/doc/html/porting.html
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-02-13 17:43:39 -0600
committerTimothy Pearson <[email protected]>2012-02-13 17:43:39 -0600
commit359640943bcf155faa9a067dde9e00a123276290 (patch)
treefb3d55ea5e18949042fb0064123fb73d2b1eb932 /doc/html/porting.html
parenta829bcdc533e154000803d517200d32fe762e85c (diff)
downloadtqt3-359640943bcf155faa9a067dde9e00a123276290.tar.gz
tqt3-359640943bcf155faa9a067dde9e00a123276290.zip
Automated update from Qt3
Diffstat (limited to 'doc/html/porting.html')
-rw-r--r--doc/html/porting.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/html/porting.html b/doc/html/porting.html
index c5058a8be..39062649c 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -222,7 +222,7 @@ but source compatibility should not be affected if the macro variable
<tt>QT_CLEAN_NAMESPACE</tt> is not defined:
<p> <ul>
<li> <tt>ASSERT</tt> becomes <tt>Q_ASSERT</tt>
-<li> <tt>CHECK_PTR</tt> becomes <tt>Q_CHECK_PTR</tt>
+<li> <tt>CHECK_PTR</tt> becomes <tt>TQ_CHECK_PTR</tt>
</ul>
<p> For the record, undocumented macro variables that are not part of the API
have been changed:
@@ -386,10 +386,10 @@ new code.
</ul>
<p> Additionally, these preprocessor directives have been removed:
<p> <ul>
-<li> <tt>#define strlen qstrlen</tt>
+<li> <tt>#define strlen tqstrlen</tt>
<li> <tt>#define strcpy qstrcpy</tt>
<li> <tt>#define strcmp qstrcmp</tt>
-<li> <tt>#define strncmp qstrncmp</tt>
+<li> <tt>#define strncmp tqstrncmp</tt>
<li> <tt>#define stricmp qstricmp</tt>
<li> <tt>#define strnicmp qstrnicmp</tt>
</ul>