OSDN Git Service

fix compiler warnings: hiding overloaded virtual functions
authorIvailo Monev <xakepa10@gmail.com>
Thu, 30 Jun 2016 14:35:51 +0000 (14:35 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 30 Jun 2016 14:35:51 +0000 (14:35 +0000)
upstream commits:
https://github.com/qt/qtxmlpatterns/commit/0c9f9c4528599f966e89074957bbf0593f983bd9

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/xmlpatterns/projection/qdocumentprojector.cpp
src/xmlpatterns/projection/qdocumentprojector_p.h

index b6c53c4..5aa9624 100644 (file)
@@ -58,7 +58,7 @@ DocumentProjector::DocumentProjector(const ProjectedExpression::Vector &paths,
     Q_ASSERT(m_receiver);
 }
 
-void DocumentProjector::startElement(const QXmlName name)
+void DocumentProjector::startElement(const QXmlName &name)
 {
     Q_UNUSED(name);
 
@@ -165,14 +165,14 @@ void DocumentProjector::endElement()
     }
 }
 
-void DocumentProjector::attribute(const QXmlName name,
-                                  const QString &value)
+void DocumentProjector::attribute(const QXmlName &name,
+                                  const QStringRef &value)
 {
     Q_UNUSED(name);
     Q_UNUSED(value);
 }
 
-void DocumentProjector::namespaceBinding(const QXmlName nb)
+void DocumentProjector::namespaceBinding(const QXmlName &nb)
 {
     Q_UNUSED(nb);
 }
@@ -184,12 +184,12 @@ void DocumentProjector::comment(const QString &value)
     Q_UNUSED(value);
 }
 
-void DocumentProjector::characters(const QString &value)
+void DocumentProjector::characters(const QStringRef &value)
 {
     Q_UNUSED(value);
 }
 
-void DocumentProjector::processingInstruction(const QXmlName name,
+void DocumentProjector::processingInstruction(const QXmlName &name,
                                               const QString &value)
 {
     Q_ASSERT_X(!value.contains(QLatin1String("?>")), Q_FUNC_INFO,
index ea8ed3d..1d26d05 100644 (file)
@@ -72,19 +72,19 @@ namespace QPatternist
         DocumentProjector(const ProjectedExpression::Vector &paths,
                           QAbstractXmlReceiver *const receiver);
 
-        virtual void namespaceBinding(const QXmlName nb);
+        virtual void namespaceBinding(const QXmlName &nb);
 
-        virtual void characters(const QString &value);
+        virtual void characters(const QStringRef &value);
         virtual void comment(const QString &value);
 
-        virtual void startElement(const QXmlName name);
+        virtual void startElement(const QXmlName &name);
 
         virtual void endElement();
 
-        virtual void attribute(const QXmlName name,
-                               const QString &value);
+        virtual void attribute(const QXmlName &name,
+                               const QStringRef &value);
 
-        virtual void processingInstruction(const QXmlName name,
+        virtual void processingInstruction(const QXmlName &name,
                                            const QString &value);
 
         virtual void item(const Item &item);