diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-02 15:42:13 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-05-02 14:31:14 +0000 |
| commit | d9ed92790e472978e530036211f380c9d28fa1fa (patch) | |
| tree | d51c4231f0d65eab76d2490911a43f27858cf8fb | |
| parent | 1a254ab116f63b8188b9bc12cdd19e6d5696c3f2 (diff) | |
Tests: Fix Clang warnings about hiding overloaded virtual functions
Rename functions to fix:
tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp:127:tst_QSimpleXmlNodeModel::stringValue()::TypedModel::root' hides overloaded virtual function [-Woverloaded-virtual]
tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp:365:'tst_QAbstractXmlNodeModel::typedValue()::TypedModel::root' hides overloaded virtual function [-Woverloaded-virtual]
Change-Id: I8fe19ec51126383e5363636e8ae0ea3d3c65d578
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| -rw-r--r-- | tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp index 55bcef98..ccd534a6 100644 --- a/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp +++ b/tests/auto/qabstractxmlnodemodel/tst_qabstractxmlnodemodel.cpp @@ -362,7 +362,7 @@ void tst_QAbstractXmlNodeModel::typedValue() const return QVariant(); } - QXmlNodeModelIndex root() const + QXmlNodeModelIndex rootIndex() const { return createIndex(qint64(1)); } @@ -371,7 +371,7 @@ void tst_QAbstractXmlNodeModel::typedValue() const TypedModel model; QXmlQuery query; - query.bindVariable(QLatin1String("node"), model.root()); + query.bindVariable(QLatin1String("node"), model.rootIndex()); query.setQuery(QLatin1String("declare variable $node external;" "string($node), data($node)")); diff --git a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp index 73cc72b2..66fe7523 100644 --- a/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp +++ b/tests/auto/qsimplexmlnodemodel/tst_qsimplexmlnodemodel.cpp @@ -124,7 +124,7 @@ void tst_QSimpleXmlNodeModel::stringValue() const return QVariant(); } - QXmlNodeModelIndex root() const + QXmlNodeModelIndex rootIndex() const { return createIndex(qint64(1)); } @@ -134,7 +134,7 @@ void tst_QSimpleXmlNodeModel::stringValue() const TypedModel model(np); QXmlQuery query(np); - query.bindVariable(QLatin1String("node"), model.root()); + query.bindVariable(QLatin1String("node"), model.rootIndex()); query.setQuery(QLatin1String("declare variable $node external;" "string($node), data($node)")); |