feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Silence warning about unnecessary use of the containing namespace

Browse Source 
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>
This commit is contained in:
Thiago Macieira
2012-05-20 21:06:31 +02:00
parent 5444738c32
commit ae09c64f80
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
View File

@@ -56,8 +56,8 @@ class CORESHARED_EXPORT ItemLibraryEntry
{ {
//friend class QmlDesigner::MetaInfo; //friend class QmlDesigner::MetaInfo;
//friend class QmlDesigner::Internal::MetaInfoParser; //friend class QmlDesigner::Internal::MetaInfoParser;
friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry); friend CORESHARED_EXPORT QDataStream& operator<<(QDataStream& stream, const ItemLibraryEntry &itemLibraryEntry);
friend CORESHARED_EXPORT QDataStream& QmlDesigner::operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry); friend CORESHARED_EXPORT QDataStream& operator>>(QDataStream& stream, ItemLibraryEntry &itemLibraryEntry);
public: public:
ItemLibraryEntry(); ItemLibraryEntry();

2
src/plugins/qmldesigner/designercore/include/modelnode.h
View File

@@ -77,7 +77,7 @@ class CORESHARED_EXPORT ModelNode
friend CORESHARED_EXPORT uint qHash(const ModelNode & node); friend CORESHARED_EXPORT uint qHash(const ModelNode & node);
friend CORESHARED_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode); friend CORESHARED_EXPORT QDebug operator<<(QDebug debug, const ModelNode &modelNode);
friend CORESHARED_EXPORT bool operator <(const ModelNode &firstNode, const ModelNode &secondNode); 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::Model;
friend class QmlDesigner::AbstractView; friend class QmlDesigner::AbstractView;
friend class QmlDesigner::NodeListProperty; friend class QmlDesigner::NodeListProperty;

4
src/plugins/qmldesigner/designercore/include/propertycontainer.h
View File

@@ -49,8 +49,8 @@ CORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer
class CORESHARED_EXPORT PropertyContainer class CORESHARED_EXPORT PropertyContainer
{ {
friend CORESHARED_EXPORT QDataStream &QmlDesigner::operator<<(QDataStream &stream, const PropertyContainer &propertyContainer); friend CORESHARED_EXPORT QDataStream &operator<<(QDataStream &stream, const PropertyContainer &propertyContainer);
friend CORESHARED_EXPORT QDataStream &QmlDesigner::operator>>(QDataStream &stream, PropertyContainer &propertyContainer); friend CORESHARED_EXPORT QDataStream &operator>>(QDataStream &stream, PropertyContainer &propertyContainer);
public: public:
PropertyContainer(); PropertyContainer();