From ae09c64f808cd64fb2de1f531ac37a15ee81b9dc Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Sun, 20 May 2012 21:06:31 +0200
Subject: [PATCH] Silence warning about unnecessary use of the containing
namespace
ICC complained:
src/plugins/qmldesigner/designercore/include/propertycontainer.h(52): warning #1098: the qualifier on this friend declaration is ignored
friend CORESHARED_EXPORT QDataStream &QmlDesigner::operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
^
The solution is to simply remove the namespace qualifier when the
class is already inside that namespace.
Change-Id: I2256ebe072b3f8db5288f72acb1388eabcb8325c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
---
.../qmldesigner/designercore/include/itemlibraryinfo.h | 4 ++--
src/plugins/qmldesigner/designercore/include/modelnode.h | 2 +-
.../qmldesigner/designercore/include/propertycontainer.h | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index 0ab37151b07..a8eefd08bbf 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -56,8 +56,8 @@ class CORESHARED_EXPORT ItemLibraryEntry
{
//friend class QmlDesigner::MetaInfo;
//friend class QmlDesigner::Internal::MetaInfoParser;
- friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
- friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
+ friend CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
+ friend CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
public:
ItemLibraryEntry();
diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index 635922f12b5..c848395b046 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -77,7 +77,7 @@ class CORESHARED_EXPORT ModelNode
friend CORESHARED_EXPORT uint qHash(const ModelNode & node);
friend CORESHARED_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode);
friend CORESHARED_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode);
- friend CORESHARED_EXPORT QList<Internal::InternalNodePointer> QmlDesigner::toInternalNodeList(const QList<ModelNode> &nodeList);
+ friend CORESHARED_EXPORT QList<Internal::InternalNodePointer> toInternalNodeList(const QList<ModelNode> &nodeList);
friend class QmlDesigner::Model;
friend class QmlDesigner::AbstractView;
friend class QmlDesigner::NodeListProperty;
diff --git a/src/plugins/qmldesigner/designercore/include/propertycontainer.h b/src/plugins/qmldesigner/designercore/include/propertycontainer.h
index ae8d465251b..3ebb65799c8 100644
--- a/src/plugins/qmldesigner/designercore/include/propertycontainer.h
+++ b/src/plugins/qmldesigner/designercore/include/propertycontainer.h
@@ -49,8 +49,8 @@ CORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer
class CORESHARED_EXPORT PropertyContainer
{
- friend CORESHARED_EXPORT QDataStream &QmlDesigner::operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
- friend CORESHARED_EXPORT QDataStream &QmlDesigner::operator>>(QDataStream &stream, PropertyContainer &propertyContainer);
+ friend CORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
+ friend CORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer &propertyContainer);
public:
PropertyContainer();
--
GitLab