summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2018-10-27 23:55:03 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2018-10-27 23:55:03 +0900
commit7f4d09f20062c6b26342f91d5cec5d859c58d662 (patch)
treebfd1631a1641ef52fd3f7fdd11d8bfca31427538
parent23b535df5bc08e8f5e98270859c5dc5c73f4ebdd (diff)
downloadtqt3-7f4d09f20062c6b26342f91d5cec5d859c58d662.tar.gz
tqt3-7f4d09f20062c6b26342f91d5cec5d859c58d662.zip
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/ntqglobal.h6
4 files changed, 0 insertions, 14 deletions
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 78db2bc6..e8c24e74 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>TQ_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 c12d1134..491876c0 100644
--- a/doc/html/qglobal-h.html
+++ b/doc/html/qglobal-h.html
@@ -1040,12 +1040,6 @@ Q_EXPORT bool tqt_check_pointer( bool c, const char *, int );
# define TQ_CHECK_PTR(p)
#endif
-#if !defined(TQT_NO_COMPAT) // compatibility with TQt 2
-# if !defined(CHECK_PTR)
-# define CHECK_PTR(x) TQ_CHECK_PTR(x)
-# endif
-#endif // TQT_NO_COMPAT
-
enum TQtMsgType { TQtDebugMsg, TQtWarningMsg, TQtFatalMsg };
typedef void (*TQtMsgHandler)(TQtMsgType, const char *);
diff --git a/doc/porting3.doc b/doc/porting3.doc
index a85decf3..c3024625 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 TQ_CHECK_PTR
\endlist
For the record, undocumented macro variables that are not part of the API
diff --git a/src/tools/ntqglobal.h b/src/tools/ntqglobal.h
index e92c825f..11d6db8b 100644
--- a/src/tools/ntqglobal.h
+++ b/src/tools/ntqglobal.h
@@ -1009,12 +1009,6 @@ Q_EXPORT bool tqt_check_pointer( bool c, const char *, int );
# define TQ_CHECK_PTR(p)
#endif
-#if !defined(TQT_NO_COMPAT) // compatibility with TQt 2
-# if !defined(CHECK_PTR)
-# define CHECK_PTR(x) TQ_CHECK_PTR(x)
-# endif
-#endif // TQT_NO_COMPAT
-
enum TQtMsgType { TQtDebugMsg, TQtWarningMsg, TQtFatalMsg };
typedef void (*TQtMsgHandler)(TQtMsgType, const char *);