From 5199cce73762771f593f12abbe326f8086142c0e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 7 Apr 2015 09:13:22 +0200 Subject: Rename private header qdebug_p.h to qxmldebug_p.h. Avoid conflicts with the newly introduced qdebug_p.h of QtCore. Change-Id: I04b83e159900d9d36fa96ae5112eb4cdf75c0551 Reviewed-by: Liang Qi Reviewed-by: Frederik Gladhorn --- src/xmlpatterns/acceltree/qacceltree.cpp | 2 +- src/xmlpatterns/api/qsourcelocation.cpp | 2 +- src/xmlpatterns/expr/qexpression_p.h | 2 +- src/xmlpatterns/expr/qexpressionfactory.cpp | 2 +- src/xmlpatterns/parser/qquerytransformparser.cpp | 2 +- src/xmlpatterns/utils/qdebug_p.h | 99 ---------------------- src/xmlpatterns/utils/qxmldebug_p.h | 99 ++++++++++++++++++++++ src/xmlpatterns/utils/utils.pri | 2 +- tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp | 2 +- tests/auto/xmlpatternssdk/TestBaseLine.cpp | 2 +- tests/auto/xmlpatternssdk/TestResult.cpp | 2 +- tests/auto/xmlpatternssdk/TestSuite.cpp | 2 +- 12 files changed, 109 insertions(+), 109 deletions(-) delete mode 100644 src/xmlpatterns/utils/qdebug_p.h create mode 100644 src/xmlpatterns/utils/qxmldebug_p.h diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp index 9c26c25..fca6b26 100644 --- a/src/xmlpatterns/acceltree/qacceltree.cpp +++ b/src/xmlpatterns/acceltree/qacceltree.cpp @@ -40,7 +40,7 @@ #include "qatomicstring_p.h" #include "qcommonvalues_p.h" #include "qcompressedwhitespace_p.h" -#include "qdebug_p.h" +#include "qxmldebug_p.h" #include "quntypedatomic_p.h" #include "qxpathhelper_p.h" diff --git a/src/xmlpatterns/api/qsourcelocation.cpp b/src/xmlpatterns/api/qsourcelocation.cpp index 988569e..1861409 100644 --- a/src/xmlpatterns/api/qsourcelocation.cpp +++ b/src/xmlpatterns/api/qsourcelocation.cpp @@ -31,7 +31,7 @@ ** ****************************************************************************/ -#include "qdebug_p.h" +#include "qxmldebug_p.h" #include "qsourcelocation.h" diff --git a/src/xmlpatterns/expr/qexpression_p.h b/src/xmlpatterns/expr/qexpression_p.h index e30d04b..c799725 100644 --- a/src/xmlpatterns/expr/qexpression_p.h +++ b/src/xmlpatterns/expr/qexpression_p.h @@ -48,7 +48,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/xmlpatterns/expr/qexpressionfactory.cpp b/src/xmlpatterns/expr/qexpressionfactory.cpp index 2c9c51a..2afa2cc 100644 --- a/src/xmlpatterns/expr/qexpressionfactory.cpp +++ b/src/xmlpatterns/expr/qexpressionfactory.cpp @@ -36,7 +36,7 @@ #include "qcalltemplate_p.h" #include "qcommonsequencetypes_p.h" -#include "qdebug_p.h" +#include "qxmldebug_p.h" #include "qexpression_p.h" #include "qgenericstaticcontext_p.h" #include "qoperandsiterator_p.h" diff --git a/src/xmlpatterns/parser/qquerytransformparser.cpp b/src/xmlpatterns/parser/qquerytransformparser.cpp index df612ad..0ef0c45 100644 --- a/src/xmlpatterns/parser/qquerytransformparser.cpp +++ b/src/xmlpatterns/parser/qquerytransformparser.cpp @@ -189,7 +189,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/xmlpatterns/utils/qdebug_p.h b/src/xmlpatterns/utils/qdebug_p.h deleted file mode 100644 index f70b3ad..0000000 --- a/src/xmlpatterns/utils/qdebug_p.h +++ /dev/null @@ -1,99 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtXmlPatterns module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. - -#ifndef Patternist_Debug_H -#define Patternist_Debug_H - -#include -/** - * @file - * @short Contains macros for debugging. - */ - -QT_BEGIN_NAMESPACE - -/** - * @short Enables detailed parser debug output. - * - * If this macro is defined, @em a @em lot of debugging information will be outputted. - * This is all the state transitions, token shifting, and rule reductions that - * the parser do. - * - * This is automatically disabled if @c QT_NO_DEBUG is defined. - */ -#define Patternist_DEBUG_PARSER - -/** - * @short Enables debug printing statements. - * - * Patternist does not use qDebug(), but pDebug() instead. It only output - * if this define is defined. - * - * It is automatically disabled if @c QT_NO_DEBUG is defined. - */ -#define Patternist_DEBUG - -#undef Patternist_DEBUG // disable it for now - -#ifdef QT_NO_DEBUG -# undef Patternist_DEBUG_PARSER -# undef Patternist_DEBUG -#endif - -namespace QPatternist -{ -#ifdef Patternist_DEBUG - inline QDebug pDebug() - { - return qDebug(); - } -#else - inline QNoDebug pDebug() - { - return QNoDebug(); - } -#endif -} - -QT_END_NAMESPACE -#endif diff --git a/src/xmlpatterns/utils/qxmldebug_p.h b/src/xmlpatterns/utils/qxmldebug_p.h new file mode 100644 index 0000000..f70b3ad --- /dev/null +++ b/src/xmlpatterns/utils/qxmldebug_p.h @@ -0,0 +1,99 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtXmlPatterns module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. + +#ifndef Patternist_Debug_H +#define Patternist_Debug_H + +#include +/** + * @file + * @short Contains macros for debugging. + */ + +QT_BEGIN_NAMESPACE + +/** + * @short Enables detailed parser debug output. + * + * If this macro is defined, @em a @em lot of debugging information will be outputted. + * This is all the state transitions, token shifting, and rule reductions that + * the parser do. + * + * This is automatically disabled if @c QT_NO_DEBUG is defined. + */ +#define Patternist_DEBUG_PARSER + +/** + * @short Enables debug printing statements. + * + * Patternist does not use qDebug(), but pDebug() instead. It only output + * if this define is defined. + * + * It is automatically disabled if @c QT_NO_DEBUG is defined. + */ +#define Patternist_DEBUG + +#undef Patternist_DEBUG // disable it for now + +#ifdef QT_NO_DEBUG +# undef Patternist_DEBUG_PARSER +# undef Patternist_DEBUG +#endif + +namespace QPatternist +{ +#ifdef Patternist_DEBUG + inline QDebug pDebug() + { + return qDebug(); + } +#else + inline QNoDebug pDebug() + { + return QNoDebug(); + } +#endif +} + +QT_END_NAMESPACE +#endif diff --git a/src/xmlpatterns/utils/utils.pri b/src/xmlpatterns/utils/utils.pri index 2db91c2..97da7e8 100644 --- a/src/xmlpatterns/utils/utils.pri +++ b/src/xmlpatterns/utils/utils.pri @@ -1,7 +1,7 @@ HEADERS += $$PWD/qautoptr_p.h \ $$PWD/qcommonnamespaces_p.h \ $$PWD/qcppcastinghelper_p.h \ - $$PWD/qdebug_p.h \ + $$PWD/qxmldebug_p.h \ $$PWD/qgenericnamespaceresolver_p.h \ $$PWD/qpatternistlocale_p.h \ $$PWD/qnamepool_p.h \ diff --git a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp index 895fc86..e5adb08 100644 --- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp +++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp @@ -40,7 +40,7 @@ #include "Global.h" #include -#include +#include #include #include "ExternalSourceLoader.h" diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.cpp b/tests/auto/xmlpatternssdk/TestBaseLine.cpp index 4086aa9..b9e24cd 100644 --- a/tests/auto/xmlpatternssdk/TestBaseLine.cpp +++ b/tests/auto/xmlpatternssdk/TestBaseLine.cpp @@ -40,7 +40,7 @@ #include #include -#include +#include #include "XMLWriter.h" #include "TestBaseLine.h" diff --git a/tests/auto/xmlpatternssdk/TestResult.cpp b/tests/auto/xmlpatternssdk/TestResult.cpp index 43db429..7f74009 100644 --- a/tests/auto/xmlpatternssdk/TestResult.cpp +++ b/tests/auto/xmlpatternssdk/TestResult.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include "Global.h" #include "XMLWriter.h" diff --git a/tests/auto/xmlpatternssdk/TestSuite.cpp b/tests/auto/xmlpatternssdk/TestSuite.cpp index 8bf437d..172f930 100644 --- a/tests/auto/xmlpatternssdk/TestSuite.cpp +++ b/tests/auto/xmlpatternssdk/TestSuite.cpp @@ -43,7 +43,7 @@ #include "XMLWriter.h" #include "XSLTTestSuiteHandler.h" #include "XSDTestSuiteHandler.h" -#include +#include #include "TestSuite.h" -- cgit v1.2.1