forked from qt-creator/qt-creator
QmlDesigner: Test mode for qml puppet streams
Change-Id: I93128c60892900d6b4728569b84efb0ed835b51f Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
@@ -231,4 +231,15 @@ QDataStream &operator>>(QDataStream &in, ImageContainer &container)
|
||||
return in;
|
||||
}
|
||||
|
||||
bool operator ==(const ImageContainer &first, const ImageContainer &second)
|
||||
{
|
||||
return first.m_instanceId == second.m_instanceId
|
||||
&& first.m_image == second.m_image;
|
||||
}
|
||||
|
||||
bool operator <(const ImageContainer &first, const ImageContainer &second)
|
||||
{
|
||||
return first.m_instanceId < second.m_instanceId;
|
||||
}
|
||||
|
||||
} // namespace QmlDesigner
|
||||
|
||||
@@ -38,6 +38,9 @@ namespace QmlDesigner {
|
||||
class ImageContainer
|
||||
{
|
||||
friend QDataStream &operator>>(QDataStream &in, ImageContainer &container);
|
||||
friend bool operator ==(const ImageContainer &first, const ImageContainer &second);
|
||||
friend bool operator <(const ImageContainer &first, const ImageContainer &second);
|
||||
|
||||
public:
|
||||
ImageContainer();
|
||||
ImageContainer(qint32 instanceId, const QImage &image, qint32 keyNumber);
|
||||
@@ -59,6 +62,9 @@ private:
|
||||
QDataStream &operator<<(QDataStream &out, const ImageContainer &container);
|
||||
QDataStream &operator>>(QDataStream &in, ImageContainer &container);
|
||||
|
||||
bool operator ==(const ImageContainer &first, const ImageContainer &second);
|
||||
bool operator <(const ImageContainer &first, const ImageContainer &second);
|
||||
|
||||
} // namespace QmlDesigner
|
||||
|
||||
Q_DECLARE_METATYPE(QmlDesigner::ImageContainer)
|
||||
|
||||
@@ -98,4 +98,30 @@ QDataStream &operator>>(QDataStream &in, InformationContainer &container)
|
||||
return in;
|
||||
}
|
||||
|
||||
bool operator ==(const InformationContainer &first, const InformationContainer &second)
|
||||
{
|
||||
return first.m_instanceId == second.m_instanceId
|
||||
&& first.m_name == second.m_name
|
||||
&& first.m_information == second.m_information
|
||||
&& first.m_secondInformation == second.m_secondInformation
|
||||
&& first.m_thirdInformation == second.m_thirdInformation;
|
||||
}
|
||||
|
||||
static bool operator <(const QVariant &first, const QVariant &second)
|
||||
{
|
||||
if (first.userType() == second.userType()) {
|
||||
if (first.canConvert<QByteArray>())
|
||||
return first.value<QByteArray>() < second.value<QByteArray>();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool operator <(const InformationContainer &first, const InformationContainer &second)
|
||||
{
|
||||
return (first.m_instanceId < second.m_instanceId)
|
||||
|| (first.m_instanceId == second.m_instanceId && first.m_name < second.m_name)
|
||||
|| (first.m_instanceId == second.m_instanceId && first.m_name == second.m_name && first.m_information < second.m_information);
|
||||
}
|
||||
|
||||
} // namespace QmlDesigner
|
||||
|
||||
@@ -43,6 +43,8 @@ class InformationContainer
|
||||
{
|
||||
friend QDataStream &operator>>(QDataStream &in, InformationContainer &container);
|
||||
friend QDataStream &operator<<(QDataStream &out, const InformationContainer &container);
|
||||
friend bool operator ==(const InformationContainer &first, const InformationContainer &second);
|
||||
friend bool operator <(const InformationContainer &first, const InformationContainer &second);
|
||||
|
||||
public:
|
||||
InformationContainer();
|
||||
@@ -69,6 +71,9 @@ private:
|
||||
QDataStream &operator<<(QDataStream &out, const InformationContainer &container);
|
||||
QDataStream &operator>>(QDataStream &in, InformationContainer &container);
|
||||
|
||||
bool operator ==(const InformationContainer &first, const InformationContainer &second);
|
||||
bool operator <(const InformationContainer &first, const InformationContainer &second);
|
||||
|
||||
} // namespace QmlDesigner
|
||||
|
||||
Q_DECLARE_METATYPE(QmlDesigner::InformationContainer)
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
|
||||
#include "propertyvaluecontainer.h"
|
||||
|
||||
#include <QtDebug>
|
||||
|
||||
namespace QmlDesigner {
|
||||
|
||||
PropertyValueContainer::PropertyValueContainer()
|
||||
@@ -89,4 +91,19 @@ QDataStream &operator>>(QDataStream &in, PropertyValueContainer &container)
|
||||
return in;
|
||||
}
|
||||
|
||||
bool operator ==(const PropertyValueContainer &first, const PropertyValueContainer &second)
|
||||
{
|
||||
return first.m_instanceId == second.m_instanceId
|
||||
&& first.m_name == second.m_name
|
||||
&& first.m_value == second.m_value
|
||||
&& first.m_dynamicTypeName == second.m_dynamicTypeName;
|
||||
}
|
||||
|
||||
bool operator <(const PropertyValueContainer &first, const PropertyValueContainer &second)
|
||||
{
|
||||
return (first.m_instanceId < second.m_instanceId)
|
||||
|| (first.m_instanceId == second.m_instanceId && first.m_name < second.m_name);
|
||||
}
|
||||
|
||||
|
||||
} // namespace QmlDesigner
|
||||
|
||||
@@ -42,6 +42,8 @@ namespace QmlDesigner {
|
||||
class PropertyValueContainer
|
||||
{
|
||||
friend QDataStream &operator>>(QDataStream &in, PropertyValueContainer &container);
|
||||
friend bool operator ==(const PropertyValueContainer &first, const PropertyValueContainer &second);
|
||||
friend bool operator <(const PropertyValueContainer &first, const PropertyValueContainer &second);
|
||||
|
||||
public:
|
||||
PropertyValueContainer();
|
||||
@@ -63,6 +65,9 @@ private:
|
||||
QDataStream &operator<<(QDataStream &out, const PropertyValueContainer &container);
|
||||
QDataStream &operator>>(QDataStream &in, PropertyValueContainer &container);
|
||||
|
||||
bool operator ==(const PropertyValueContainer &first, const PropertyValueContainer &second);
|
||||
bool operator <(const PropertyValueContainer &first, const PropertyValueContainer &second);
|
||||
|
||||
} // namespace QmlDesigner
|
||||
|
||||
Q_DECLARE_METATYPE(QmlDesigner::PropertyValueContainer)
|
||||
|
||||
Reference in New Issue
Block a user