From 5199cce73762771f593f12abbe326f8086142c0e Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Date: Tue, 7 Apr 2015 09:13:22 +0200
Subject: [PATCH] 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 <liang.qi@theqtcompany.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
---
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 => qxmldebug_p.h} | 0
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 +-
11 files changed, 10 insertions(+), 10 deletions(-)
rename src/xmlpatterns/utils/{qdebug_p.h => qxmldebug_p.h} (100%)
diff --git a/src/xmlpatterns/acceltree/qacceltree.cpp b/src/xmlpatterns/acceltree/qacceltree.cpp
index 9c26c256..fca6b264 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 988569ea..18614093 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 e30d04be..c7997253 100644
--- a/src/xmlpatterns/expr/qexpression_p.h
+++ b/src/xmlpatterns/expr/qexpression_p.h
@@ -48,7 +48,7 @@
#include <QSharedData>
#include <private/qcppcastinghelper_p.h>
-#include <private/qdebug_p.h>
+#include <private/qxmldebug_p.h>
#include <private/qdynamiccontext_p.h>
#include <private/qexpressiondispatch_p.h>
#include <private/qitem_p.h>
diff --git a/src/xmlpatterns/expr/qexpressionfactory.cpp b/src/xmlpatterns/expr/qexpressionfactory.cpp
index 2c9c51a6..2afa2ccc 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 df612ad9..0ef0c452 100644
--- a/src/xmlpatterns/parser/qquerytransformparser.cpp
+++ b/src/xmlpatterns/parser/qquerytransformparser.cpp
@@ -189,7 +189,7 @@
#include <private/qcontextitem_p.h>
#include <private/qcopyof_p.h>
#include <private/qcurrentitemstore_p.h>
-#include <private/qdebug_p.h>
+#include <private/qxmldebug_p.h>
#include <private/qdelegatingnamespaceresolver_p.h>
#include <private/qdocumentconstructor_p.h>
#include <private/qelementconstructor_p.h>
diff --git a/src/xmlpatterns/utils/qdebug_p.h b/src/xmlpatterns/utils/qxmldebug_p.h
similarity index 100%
rename from src/xmlpatterns/utils/qdebug_p.h
rename to src/xmlpatterns/utils/qxmldebug_p.h
diff --git a/src/xmlpatterns/utils/utils.pri b/src/xmlpatterns/utils/utils.pri
index 2db91c25..97da7e8d 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 895fc86f..e5adb080 100644
--- a/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
+++ b/tests/auto/xmlpatternssdk/ExternalSourceLoader.cpp
@@ -40,7 +40,7 @@
#include "Global.h"
#include <private/qcommonsequencetypes_p.h>
-#include <private/qdebug_p.h>
+#include <private/qxmldebug_p.h>
#include <private/qatomicstring_p.h>
#include "ExternalSourceLoader.h"
diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.cpp b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
index 4086aa95..b9e24cdf 100644
--- a/tests/auto/xmlpatternssdk/TestBaseLine.cpp
+++ b/tests/auto/xmlpatternssdk/TestBaseLine.cpp
@@ -40,7 +40,7 @@
#include <QXmlAttributes>
#include <QXmlSimpleReader>
-#include <private/qdebug_p.h>
+#include <private/qxmldebug_p.h>
#include "XMLWriter.h"
#include "TestBaseLine.h"
diff --git a/tests/auto/xmlpatternssdk/TestResult.cpp b/tests/auto/xmlpatternssdk/TestResult.cpp
index 43db429f..7f740090 100644
--- a/tests/auto/xmlpatternssdk/TestResult.cpp
+++ b/tests/auto/xmlpatternssdk/TestResult.cpp
@@ -34,7 +34,7 @@
#include <QXmlAttributes>
#include <QtDebug>
-#include <private/qdebug_p.h>
+#include <private/qxmldebug_p.h>
#include "Global.h"
#include "XMLWriter.h"
diff --git a/tests/auto/xmlpatternssdk/TestSuite.cpp b/tests/auto/xmlpatternssdk/TestSuite.cpp
index 8bf437d1..172f930a 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 <private/qdebug_p.h>
+#include <private/qxmldebug_p.h>
#include "TestSuite.h"
--
GitLab