summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-10-27 14:55:02 (GMT)
committer Michele Calgaro <michele.calgaro@yahoo.it>2018-10-27 14:55:02 (GMT)
commit0614be092185ccde33cd70fe6076f19970ebe571 (patch)
treef2f066387e6f3b76630ed20610675f8fe6e04a30
parent03814b8bdda4b7f5cde4386f0aaef1119750fd10 (diff)
downloadqt3-0614be09.zip
qt3-0614be09.tar.gz
Removed obsolete CHECK_PTR and replaced CHECK_PTR/Q_CHECK_PTR with TQ_CHECK_PTR.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--doc/html/porting.html1
-rw-r--r--doc/html/qglobal-h.html6
-rw-r--r--doc/porting3.doc1
-rw-r--r--src/tools/qglobal.h6
4 files changed, 0 insertions, 14 deletions
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 4b5a5d0..9722c7c 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -220,7 +220,6 @@ previously disabled, please check these macro variables:
<p> The name of some debugging macro functions has been changed:
<p> <ul>
<li> <tt>ASSERT</tt> becomes <tt>Q_ASSERT</tt>
-<li> <tt>CHECK_PTR</tt> becomes <tt>Q_CHECK_PTR</tt>
</ul>
<p> For the record, undocumented macro variables that are not part of the API
have been changed:
diff --git a/doc/html/qglobal-h.html b/doc/html/qglobal-h.html
index dd8d61a..a43fb73 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -1040,12 +1040,6 @@ Q_EXPORT bool qt_check_pointer( bool c, const char *, int );
# define Q_CHECK_PTR(p)
#endif
-#if !defined(QT_NO_COMPAT) // compatibility with Qt 2
-# if !defined(CHECK_PTR)
-# define CHECK_PTR(x) Q_CHECK_PTR(x)
-# endif
-#endif // QT_NO_COMPAT
-
enum QtMsgType { QtDebugMsg, QtWarningMsg, QtFatalMsg };
typedef void (*QtMsgHandler)(QtMsgType, const char *);
diff --git a/doc/porting3.doc b/doc/porting3.doc
index 29f1e2e..30717e3 100644
--- a/doc/porting3.doc
+++ b/doc/porting3.doc
@@ -169,7 +169,6 @@ The name of some debugging macro functions has been changed:
\list
\i \c ASSERT becomes \c Q_ASSERT
-\i \c CHECK_PTR becomes \c Q_CHECK_PTR
\endlist
For the record, undocumented macro variables that are not part of the API
diff --git a/src/tools/qglobal.h b/src/tools/qglobal.h
index 27f784e..fac387c 100644
--- a/src/tools/qglobal.h
+++ b/src/tools/qglobal.h
@@ -1007,12 +1007,6 @@ Q_EXPORT bool qt_check_pointer( bool c, const char *, int );
# define Q_CHECK_PTR(p)
#endif
-#if !defined(QT_NO_COMPAT) // compatibility with Qt 2
-# if !defined(CHECK_PTR)
-# define CHECK_PTR(x) Q_CHECK_PTR(x)
-# endif
-#endif // QT_NO_COMPAT
-
enum QtMsgType { QtDebugMsg, QtWarningMsg, QtFatalMsg };
typedef void (*QtMsgHandler)(QtMsgType, const char *);