Skip to content

Commit

Permalink
Remove unnecessary #undef about q{Debug,Info,Warning,Critical,Fatal}
Browse files Browse the repository at this point in the history
The ones in qlogging.cpp were copied to it from qglobal.cpp in commit
23688d8. They existed in qglobal.cpp
like in qdebug.cpp since the beginning of the public history. The one in
qdebug.cpp already made no sense in Qt 4 times, because qdebug.cpp was a
documentation-only source (no actual C++ code).

The #undefs from qglobal.cpp hadn't been necessary since commit
d394ca7, the global functions qDebug(),
qWarning(), qCritical(), etc. were replaced by member functions in
QMessageLogger whose names did not match the macros.

Pick-to: 6.7
Change-Id: I50e2158aeade4256ad1dfffd17b1c62f23eca4db
Reviewed-by: Kai Köhne <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
  • Loading branch information
thiagomacieira committed Mar 5, 2024
1 parent a6b4ff1 commit 5670d5f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 15 deletions.
8 changes: 0 additions & 8 deletions src/corelib/global/qlogging.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@ static void qt_message(QtMsgType msgType, const QMessageLogContext &context, con
qt_message_fatal(msgType, context, buf);
}

#undef qDebug
/*!
Logs a debug message specified with format \a msg. Additional
parameters, specified by \a msg, may be used.
Expand All @@ -389,8 +388,6 @@ void QMessageLogger::debug(const char *msg, ...) const
va_end(ap);
}


#undef qInfo
/*!
Logs an informational message specified with format \a msg. Additional
parameters, specified by \a msg, may be used.
Expand Down Expand Up @@ -619,7 +616,6 @@ QDebug QMessageLogger::info(QMessageLogger::CategoryFunction catFunc) const

#endif

#undef qWarning
/*!
Logs a warning message specified with format \a msg. Additional
parameters, specified by \a msg, may be used.
Expand Down Expand Up @@ -725,8 +721,6 @@ QDebug QMessageLogger::warning(QMessageLogger::CategoryFunction catFunc) const

#endif

#undef qCritical

/*!
Logs a critical message specified with format \a msg. Additional
parameters, specified by \a msg, may be used.
Expand Down Expand Up @@ -833,8 +827,6 @@ QDebug QMessageLogger::critical(QMessageLogger::CategoryFunction catFunc) const

#endif

#undef qFatal

/*!
Logs a fatal message specified with format \a msg for the context \a cat.
Additional parameters, specified by \a msg, may be used.
Expand Down
7 changes: 0 additions & 7 deletions src/corelib/io/qdebug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@
// Copyright (C) 2016 Intel Corporation.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only

#ifdef QT_NO_DEBUG
#undef QT_NO_DEBUG
#endif
#ifdef qDebug
#undef qDebug
#endif

#include "qdebug.h"
#include "private/qdebug_p.h"
#include "qmetaobject.h"
Expand Down

0 comments on commit 5670d5f

Please sign in to comment.