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

QmlDesigner: Do not define extra stream operators for QList

Browse Source 
This is not required and creates issues with Qt 6.

Change-Id: I74e875fe785d5baa4d0688d0ef86a9151750e56c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Thomas Hartmann
2021-05-04 15:53:55 +02:00
parent f8d04c0732
commit 80f6f22061
2 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,8 +66,4 @@ private:
mutable QVariant m_value; mutable QVariant m_value;
}; };
QMLDESIGNERCORE_EXPORT QDataStream &operator<<(QDataStream &stream, const QList<PropertyContainer> &propertyContainerList);
QMLDESIGNERCORE_EXPORT QDataStream &operator>>(QDataStream &stream, QList<PropertyContainer> &propertyContainerList);
QMLDESIGNERCORE_EXPORT QDebug operator<<(QDebug debug, QList<PropertyContainer> &propertyContainerList);
} //namespace QmlDesigner } //namespace QmlDesigner

32
src/plugins/qmldesigner/designercore/model/propertycontainer.cpp
View File

@@ -113,37 +113,5 @@ QDebug operator<<(QDebug debug, const PropertyContainer &propertyContainer)
return debug.space(); return debug.space();
} }
QDataStream &operator<<(QDataStream &stream, const QList<PropertyContainer> &propertyContainerList)
{
stream << propertyContainerList.count();
foreach (const PropertyContainer &propertyContainer, propertyContainerList)
stream << propertyContainer;
return stream;
}
QDataStream &operator>>(QDataStream &stream, QList<PropertyContainer> &propertyContainerList)
{
int count;
stream >> count;
Q_ASSERT(count >= 0);
for ( int i = 0; i < count; i++) {
PropertyContainer propertyContainer;
stream >> propertyContainer;
propertyContainerList.append(propertyContainer);
}
return stream;
}
QDebug operator<<(QDebug debug, QList<PropertyContainer> &propertyContainerList)
{
foreach (const PropertyContainer &propertyContainer, propertyContainerList)
debug << propertyContainer;
return debug.space();
}
} //namespace QmlDesigner } //namespace QmlDesigner