From 67ac950eb8660dc7f455640ffe77fd36b2fa44af Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:11:27 -0600 Subject: Undo prior accidental commit --- qtinterface/qt4/Qt/qdebug.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qtinterface/qt4/Qt/qdebug.h') diff --git a/qtinterface/qt4/Qt/qdebug.h b/qtinterface/qt4/Qt/qdebug.h index fc7887e..d788589 100644 --- a/qtinterface/qt4/Qt/qdebug.h +++ b/qtinterface/qt4/Qt/qdebug.h @@ -255,12 +255,12 @@ inline QDebug operator<<(QDebug debug, const QContiguousCache &cache) } #if !defined(QT_NO_DEBUG_STREAM) -Q_CORE_EXPORT_INLINE QDebug tqDebug() { return QDebug(QtDebugMsg); } +Q_CORE_EXPORT_INLINE QDebug qDebug() { return QDebug(QtDebugMsg); } #else // QT_NO_DEBUG_STREAM -#undef tqDebug -inline QNoDebug tqDebug() { return QNoDebug(); } -#define tqDebug QT_NO_QDEBUG_MACRO +#undef qDebug +inline QNoDebug qDebug() { return QNoDebug(); } +#define qDebug QT_NO_QDEBUG_MACRO #ifdef QT_NO_MEMBER_TEMPLATES template @@ -270,11 +270,11 @@ inline QNoDebug operator<<(QNoDebug debug, const T &) { return debug; } #endif #if !defined(QT_NO_WARNING_OUTPUT) -Q_CORE_EXPORT_INLINE QDebug tqWarning() { return QDebug(QtWarningMsg); } +Q_CORE_EXPORT_INLINE QDebug qWarning() { return QDebug(QtWarningMsg); } #else -#undef tqWarning -inline QNoDebug tqWarning() { return QNoDebug(); } -#define tqWarning QT_NO_QWARNING_MACRO +#undef qWarning +inline QNoDebug qWarning() { return QNoDebug(); } +#define qWarning QT_NO_QWARNING_MACRO #endif QT_END_NAMESPACE -- cgit v1.2.3