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

QmlDesigner: Add qdebugs for commands

Browse Source 
Change-Id: I60bdd5b36749be5092d4dabe486b101d62b3df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Marco Bubke
2013-07-16 17:00:07 +02:00
committed by Thomas Hartmann
parent 8f22b84016
commit 0ba2b9b37d
70 changed files with 427 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.cpp
View File

@@ -29,6 +29,8 @@
#include "changeauxiliarycommand.h"
#include <QDebug>
namespace QmlDesigner {
ChangeAuxiliaryCommand::ChangeAuxiliaryCommand()
@@ -59,4 +61,9 @@ QDataStream &operator>>(QDataStream &in, ChangeAuxiliaryCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command)
{
return debug.nospace() << "ChangeAuxiliaryCommand(auxiliaryChanges: " << command.m_auxiliaryChangeVector << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/changeauxiliarycommand.h
View File

@@ -40,6 +40,7 @@ namespace QmlDesigner {
class ChangeAuxiliaryCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeAuxiliaryCommand &command);
friend QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command);
public:
ChangeAuxiliaryCommand();
@@ -54,6 +55,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ChangeAuxiliaryCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeAuxiliaryCommand &command);
QDebug operator <<(QDebug debug, const ChangeAuxiliaryCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeAuxiliaryCommand)

8
share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.cpp
View File

@@ -29,6 +29,8 @@
#include "changebindingscommand.h"
#include <QDebug>
namespace QmlDesigner {
ChangeBindingsCommand::ChangeBindingsCommand()
@@ -58,4 +60,10 @@ QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command)
{
return debug.nospace() << "PropertyValueContainer(bindingChanges: " << command.m_bindingChangeVector << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/changebindingscommand.h
View File

@@ -40,6 +40,7 @@ namespace QmlDesigner {
class ChangeBindingsCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command);
friend QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
public:
ChangeBindingsCommand();
@@ -54,6 +55,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ChangeBindingsCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeBindingsCommand &command);
QDebug operator <<(QDebug debug, const ChangeBindingsCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeBindingsCommand)

8
share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.cpp
View File

@@ -28,7 +28,9 @@
****************************************************************************/
#include "changefileurlcommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -60,4 +62,10 @@ QDataStream &operator>>(QDataStream &in, ChangeFileUrlCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ChangeFileUrlCommand &command)
{
return debug.nospace() << "ChangeFileUrlCommand("
<< "fileUrl: " << command.fileUrl() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/commands/changefileurlcommand.h
View File

@@ -52,6 +52,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ChangeFileUrlCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeFileUrlCommand &command);
QDebug operator <<(QDebug debug, const ChangeFileUrlCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeFileUrlCommand)

7
share/qtcreator/qml/qmlpuppet/commands/changeidscommand.cpp
View File

@@ -29,6 +29,8 @@
#include "changeidscommand.h"
#include <QDebug>
namespace QmlDesigner {
ChangeIdsCommand::ChangeIdsCommand()
@@ -59,4 +61,9 @@ QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ChangeIdsCommand &command)
{
return debug.nospace() << "ChangeIdsCommand(ids: " << command.m_idVector << ")";
}
} // namespace QmlDesigner

4
share/qtcreator/qml/qmlpuppet/commands/changeidscommand.h
View File

@@ -41,6 +41,8 @@ namespace QmlDesigner {
class ChangeIdsCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command);
friend QDebug operator <<(QDebug debug, const ChangeIdsCommand &command);
public:
ChangeIdsCommand();
explicit ChangeIdsCommand(const QVector<IdContainer> &idVector);
@@ -54,6 +56,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ChangeIdsCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeIdsCommand &command);
QDebug operator <<(QDebug debug, const ChangeIdsCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeIdsCommand)

8
share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.cpp
View File

@@ -30,6 +30,7 @@
#include "changenodesourcecommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -68,4 +69,11 @@ QDataStream &operator>>(QDataStream &in, ChangeNodeSourceCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ChangeNodeSourceCommand &command)
{
return debug.nospace() << "ReparentInstancesCommand("
<< "instanceId: " << command.m_instanceId
<< "nodeSource: " << command.m_nodeSource << ")";
}
} // namespace QmlDesigner

4
share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
View File

@@ -39,6 +39,8 @@ namespace QmlDesigner {
class ChangeNodeSourceCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeNodeSourceCommand &command);
friend QDebug operator <<(QDebug debug, const ChangeNodeSourceCommand &command);
public:
ChangeNodeSourceCommand();
explicit ChangeNodeSourceCommand(qint32 instanceId, const QString &nodeSource);
@@ -53,6 +55,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ChangeNodeSourceCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeNodeSourceCommand &command);
QDebug operator <<(QDebug debug, const ChangeNodeSourceCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeNodeSourceCommand)

7
share/qtcreator/qml/qmlpuppet/commands/changestatecommand.cpp
View File

@@ -29,6 +29,8 @@
#include "changestatecommand.h"
#include <QDebug>
namespace QmlDesigner {
ChangeStateCommand::ChangeStateCommand()
@@ -60,4 +62,9 @@ QDataStream &operator>>(QDataStream &in, ChangeStateCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ChangeStateCommand &command)
{
return debug.nospace() << "ChangeStateCommand(stateInstanceId: " << command.m_stateInstanceId << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/changestatecommand.h
View File

@@ -40,6 +40,7 @@ namespace QmlDesigner {
class ChangeStateCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeStateCommand &command);
friend QDebug operator <<(QDebug debug, const ChangeStateCommand &command);
public:
ChangeStateCommand();
@@ -54,6 +55,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ChangeStateCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeStateCommand &command);
QDebug operator <<(QDebug debug, const ChangeStateCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeStateCommand)

7
share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.cpp
View File

@@ -29,6 +29,8 @@
#include "changevaluescommand.h"
#include <QDebug>
namespace QmlDesigner {
ChangeValuesCommand::ChangeValuesCommand()
@@ -59,4 +61,9 @@ QDataStream &operator>>(QDataStream &in, ChangeValuesCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ChangeValuesCommand &command)
{
return debug.nospace() << "ChangeValuesCommand(valueChanges: " << command.m_valueChangeVector << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/changevaluescommand.h
View File

@@ -40,6 +40,7 @@ namespace QmlDesigner {
class ChangeValuesCommand
{
friend QDataStream &operator>>(QDataStream &in, ChangeValuesCommand &command);
friend QDebug operator <<(QDebug debug, const ChangeValuesCommand &command);
public:
ChangeValuesCommand();
@@ -54,6 +55,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ChangeValuesCommand &command);
QDataStream &operator>>(QDataStream &in, ChangeValuesCommand &command);
QDebug operator <<(QDebug debug, const ChangeValuesCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ChangeValuesCommand)

10
share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.cpp
View File

@@ -29,6 +29,8 @@
#include "childrenchangedcommand.h"
#include <QDebug>
namespace QmlDesigner {
ChildrenChangedCommand::ChildrenChangedCommand()
@@ -88,4 +90,12 @@ bool operator ==(const ChildrenChangedCommand &first, const ChildrenChangedComma
&& first.m_informationVector == second.m_informationVector;
}
QDebug operator <<(QDebug debug, const ChildrenChangedCommand &command)
{
return debug.nospace() << "ChildrenChangedCommand("
<< "parentInstanceId: " << command.parentInstanceId() << ", "
<< "children: " << command.childrenInstances() << ", "
<< "informations: " << command.informations() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/commands/childrenchangedcommand.h
View File

@@ -61,6 +61,7 @@ QDataStream &operator<<(QDataStream &out, const ChildrenChangedCommand &command)
QDataStream &operator>>(QDataStream &in, ChildrenChangedCommand &command);
bool operator ==(const ChildrenChangedCommand &first, const ChildrenChangedCommand &second);
QDebug operator <<(QDebug debug, const ChildrenChangedCommand &command);
} // namespace QmlDesigner

7
share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.cpp
View File

@@ -29,6 +29,8 @@
#include "clearscenecommand.h"
#include <QDebug>
namespace QmlDesigner {
ClearSceneCommand::ClearSceneCommand()
@@ -45,4 +47,9 @@ QDataStream &operator>>(QDataStream &in, ClearSceneCommand &/*command*/)
return in;
}
QDebug operator <<(QDebug debug, const ClearSceneCommand &/*command*/)
{
return debug.nospace() << "ClearSceneCommand()";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/commands/clearscenecommand.h
View File

@@ -43,6 +43,8 @@ public:
QDataStream &operator<<(QDataStream &out, const ClearSceneCommand &command);
QDataStream &operator>>(QDataStream &in, ClearSceneCommand &command);
QDebug operator <<(QDebug debug, const ClearSceneCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ClearSceneCommand)

6
share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.cpp
View File

@@ -30,6 +30,7 @@
#include "completecomponentcommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -61,4 +62,9 @@ QDataStream &operator>>(QDataStream &in, CompleteComponentCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const CompleteComponentCommand &command)
{
return debug.nospace() << "CompleteComponentCommand(instances: " << command.m_instanceVector << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/completecomponentcommand.h
View File

@@ -39,6 +39,7 @@ namespace QmlDesigner {
class CompleteComponentCommand
{
friend QDataStream &operator>>(QDataStream &in, CompleteComponentCommand &command);
friend QDebug operator <<(QDebug debug, const CompleteComponentCommand &command);
public:
CompleteComponentCommand();
@@ -53,6 +54,8 @@ private:
QDataStream &operator<<(QDataStream &out, const CompleteComponentCommand &command);
QDataStream &operator>>(QDataStream &in, CompleteComponentCommand &command);
QDebug operator <<(QDebug debug, const CompleteComponentCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::CompleteComponentCommand)

7
share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.cpp
View File

@@ -30,6 +30,7 @@
#include "componentcompletedcommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -71,5 +72,11 @@ bool operator ==(const ComponentCompletedCommand &first, const ComponentComplete
return first.m_instanceVector == second.m_instanceVector;
}
QDebug operator <<(QDebug debug, const ComponentCompletedCommand &command)
{
return debug.nospace() << "ComponentCompletedCommand(" << command.instances() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/commands/componentcompletedcommand.h
View File

@@ -56,6 +56,7 @@ QDataStream &operator<<(QDataStream &out, const ComponentCompletedCommand &comma
QDataStream &operator>>(QDataStream &in, ComponentCompletedCommand &command);
bool operator ==(const ComponentCompletedCommand &first, const ComponentCompletedCommand &second);
QDebug operator <<(QDebug debug, const ComponentCompletedCommand &command);
} // namespace QmlDesigner

6
share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.cpp
View File

@@ -30,6 +30,7 @@
#include "createinstancescommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -61,4 +62,9 @@ QDataStream &operator>>(QDataStream &in, CreateInstancesCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const CreateInstancesCommand &command)
{
return debug.nospace() << "CreateInstancesCommand(" << command.instances() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/commands/createinstancescommand.h
View File

@@ -54,6 +54,8 @@ private:
QDataStream &operator<<(QDataStream &out, const CreateInstancesCommand &command);
QDataStream &operator>>(QDataStream &in, CreateInstancesCommand &command);
QDebug operator <<(QDebug debug, const CreateInstancesCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::CreateInstancesCommand)

15
share/qtcreator/qml/qmlpuppet/commands/createscenecommand.cpp
View File

@@ -29,6 +29,8 @@
#include "createscenecommand.h"
#include <QDebug>
namespace QmlDesigner {
CreateSceneCommand::CreateSceneCommand()
@@ -122,4 +124,17 @@ QDataStream &operator>>(QDataStream &in, CreateSceneCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const CreateSceneCommand &command)
{
return debug.nospace() << "CreateSceneCommand("
<< "instances: " << command.instances() << ", "
<< "reparentInstances: " << command.reparentInstances() << ", "
<< "ids: " << command.ids() << ", "
<< "valueChanges: " << command.valueChanges() << ", "
<< "bindingChanges: " << command.bindingChanges() << ", "
<< "auxiliaryChanges: " << command.auxiliaryChanges() << ", "
<< "imports: " << command.imports() << ", "
<< "fileUrl: " << command.fileUrl() << ")";
}
}

1
share/qtcreator/qml/qmlpuppet/commands/createscenecommand.h
View File

@@ -81,6 +81,7 @@ private:
QDataStream &operator<<(QDataStream &out, const CreateSceneCommand &command);
QDataStream &operator>>(QDataStream &in, CreateSceneCommand &command);
QDebug operator <<(QDebug debug, const CreateSceneCommand &command);
}
Q_DECLARE_METATYPE(QmlDesigner::CreateSceneCommand)

9
share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.cpp
View File

@@ -30,6 +30,8 @@
#include "debugoutputcommand.h"
#include <QtDebug>
namespace QmlDesigner {
DebugOutputCommand::DebugOutputCommand()
@@ -74,4 +76,11 @@ bool operator ==(const DebugOutputCommand &first, const DebugOutputCommand &seco
&& second.m_text == second.m_text;
}
QDebug operator <<(QDebug debug, const DebugOutputCommand &command)
{
return debug.nospace() << "DebugOutputCommand("
<< "type: " << command.type() << ", "
<< "text: " << command.text() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/commands/debugoutputcommand.h
View File

@@ -64,6 +64,7 @@ QDataStream &operator<<(QDataStream &out, const DebugOutputCommand &command);
QDataStream &operator>>(QDataStream &in, DebugOutputCommand &command);
bool operator ==(const DebugOutputCommand &first, const DebugOutputCommand &second);
QDebug operator <<(QDebug debug, const DebugOutputCommand &command);
} // namespace QmlDesigner

7
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
View File

@@ -29,6 +29,8 @@
#include "endpuppetcommand.h"
#include <QDebug>
namespace QmlDesigner {
EndPuppetCommand::EndPuppetCommand()
@@ -45,4 +47,9 @@ QDataStream &operator>>(QDataStream &in, EndPuppetCommand &/*command*/)
return in;
}
QDebug operator <<(QDebug debug, const EndPuppetCommand &/*command*/)
{
return debug.nospace() << "EndPuppetCommand()";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
View File

@@ -42,6 +42,8 @@ public:
QDataStream &operator<<(QDataStream &out, const EndPuppetCommand &command);
QDataStream &operator>>(QDataStream &in, EndPuppetCommand &command);
QDebug operator <<(QDebug debug, const EndPuppetCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::EndPuppetCommand)

7
share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.cpp
View File

@@ -30,6 +30,7 @@
#include "informationchangedcommand.h"
#include <QMetaType>
#include <QtDebug>
#include "propertyvaluecontainer.h"
@@ -73,4 +74,10 @@ bool operator ==(const InformationChangedCommand &first, const InformationChange
return first.m_informationVector == second.m_informationVector;
}
QDebug operator <<(QDebug debug, const InformationChangedCommand &command)
{
return debug.nospace() << "InformationChangedCommand(" << command.informations() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/commands/informationchangedcommand.h
View File

@@ -32,7 +32,6 @@
#include <QMetaType>
#include <QVector>
#include <QDebug>
#include "informationcontainer.h"
@@ -59,6 +58,7 @@ QDataStream &operator<<(QDataStream &out, const InformationChangedCommand &comma
QDataStream &operator>>(QDataStream &in, InformationChangedCommand &command);
bool operator ==(const InformationChangedCommand &first, const InformationChangedCommand &second);
QDebug operator <<(QDebug debug, const InformationChangedCommand &command);
} // namespace QmlDesigner

5
share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.cpp
View File

@@ -73,4 +73,9 @@ bool operator ==(const PixmapChangedCommand &first, const PixmapChangedCommand &
return first.m_imageVector == second.m_imageVector;
}
QDebug operator <<(QDebug debug, const PixmapChangedCommand &command)
{
return debug.nospace() << "PixmapChangedCommand(" << command.images() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/commands/pixmapchangedcommand.h
View File

@@ -56,6 +56,7 @@ QDataStream &operator<<(QDataStream &out, const PixmapChangedCommand &command);
QDataStream &operator>>(QDataStream &in, PixmapChangedCommand &command);
bool operator ==(const PixmapChangedCommand &first, const PixmapChangedCommand &second);
QDebug operator <<(QDebug debug, const PixmapChangedCommand &command);
} // namespace QmlDesigner

6
share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.cpp
View File

@@ -30,6 +30,7 @@
#include "removeinstancescommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -61,4 +62,9 @@ QDataStream &operator>>(QDataStream &in, RemoveInstancesCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const RemoveInstancesCommand &command)
{
return debug.nospace() << "RemoveInstancesCommand(instanceIdVector: " << command.m_instanceIdVector << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/removeinstancescommand.h
View File

@@ -41,6 +41,7 @@ namespace QmlDesigner {
class RemoveInstancesCommand
{
friend QDataStream &operator>>(QDataStream &in, RemoveInstancesCommand &command);
friend QDebug operator <<(QDebug debug, const RemoveInstancesCommand &command);
public:
RemoveInstancesCommand();
@@ -55,6 +56,8 @@ private:
QDataStream &operator<<(QDataStream &out, const RemoveInstancesCommand &command);
QDataStream &operator>>(QDataStream &in, RemoveInstancesCommand &command);
QDebug operator <<(QDebug debug, const RemoveInstancesCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::RemoveInstancesCommand)

7
share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.cpp
View File

@@ -29,6 +29,8 @@
#include "removepropertiescommand.h"
#include <QDebug>
namespace QmlDesigner {
RemovePropertiesCommand::RemovePropertiesCommand()
@@ -59,4 +61,9 @@ QDataStream &operator>>(QDataStream &in, RemovePropertiesCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const RemovePropertiesCommand &command)
{
return debug.nospace() << "RemovePropertiesCommand(properties: " << command.m_properties << ")";
}
}

4
share/qtcreator/qml/qmlpuppet/commands/removepropertiescommand.h
View File

@@ -40,6 +40,8 @@ namespace QmlDesigner {
class RemovePropertiesCommand
{
friend QDataStream &operator>>(QDataStream &in, RemovePropertiesCommand &command);
friend QDebug operator <<(QDebug debug, const RemovePropertiesCommand &command);
public:
RemovePropertiesCommand();
explicit RemovePropertiesCommand(const QVector<PropertyAbstractContainer> &properties);
@@ -53,6 +55,8 @@ private:
QDataStream &operator<<(QDataStream &out, const RemovePropertiesCommand &command);
QDataStream &operator>>(QDataStream &in, RemovePropertiesCommand &command);
QDebug operator <<(QDebug debug, const RemovePropertiesCommand &command);
}
Q_DECLARE_METATYPE(QmlDesigner::RemovePropertiesCommand)

8
share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.cpp
View File

@@ -31,6 +31,7 @@
#include "removesharedmemorycommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -70,4 +71,11 @@ QDataStream &operator>>(QDataStream &in, RemoveSharedMemoryCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const RemoveSharedMemoryCommand &command)
{
return debug.nospace() << "RemoveSharedMemoryCommand("
<< "typeName: " << command.m_typeName
<< "keyNumbers: " << command.m_keyNumberVector << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/removesharedmemorycommand.h
View File

@@ -40,6 +40,7 @@ namespace QmlDesigner {
class RemoveSharedMemoryCommand
{
friend QDataStream &operator>>(QDataStream &in, RemoveSharedMemoryCommand &command);
friend QDebug operator <<(QDebug debug, const RemoveSharedMemoryCommand &command);
public:
RemoveSharedMemoryCommand();
@@ -56,6 +57,8 @@ private:
QDataStream &operator<<(QDataStream &out, const RemoveSharedMemoryCommand &command);
QDataStream &operator>>(QDataStream &in, RemoveSharedMemoryCommand &command);
QDebug operator <<(QDebug debug, const RemoveSharedMemoryCommand &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::RemoveSharedMemoryCommand)

6
share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.cpp
View File

@@ -30,6 +30,7 @@
#include "reparentinstancescommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -62,4 +63,9 @@ QDataStream &operator>>(QDataStream &in, ReparentInstancesCommand &command)
return in;
}
QDebug operator <<(QDebug debug, const ReparentInstancesCommand &command)
{
return debug.nospace() << "ReparentInstancesCommand(reparentInstances: " << command.m_reparentInstanceVector << ")";
}
} // namespace QmlDesigner

3
share/qtcreator/qml/qmlpuppet/commands/reparentinstancescommand.h
View File

@@ -40,6 +40,7 @@ namespace QmlDesigner {
class ReparentInstancesCommand
{
friend QDataStream &operator>>(QDataStream &in, ReparentInstancesCommand &command);
friend QDebug operator <<(QDebug debug, const ReparentInstancesCommand &command);
public:
ReparentInstancesCommand();
@@ -54,6 +55,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ReparentInstancesCommand &command);
QDataStream &operator>>(QDataStream &in, ReparentInstancesCommand &command);
QDebug operator <<(QDebug debug, const ReparentInstancesCommand &command);
} //
Q_DECLARE_METATYPE(QmlDesigner::ReparentInstancesCommand)

8
share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.cpp
View File

@@ -29,6 +29,8 @@
#include "statepreviewimagechangedcommand.h"
#include <QDebug>
namespace QmlDesigner {
StatePreviewImageChangedCommand::StatePreviewImageChangedCommand()
@@ -69,4 +71,10 @@ bool operator ==(const StatePreviewImageChangedCommand &first, const StatePrevie
return first.m_previewVector == second.m_previewVector;
}
QDebug operator <<(QDebug debug, const StatePreviewImageChangedCommand &command)
{
return debug.nospace() << "StatePreviewImageChangedCommand(" << command.previews() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/commands/statepreviewimagechangedcommand.h
View File

@@ -57,6 +57,7 @@ QDataStream &operator<<(QDataStream &out, const StatePreviewImageChangedCommand
QDataStream &operator>>(QDataStream &in, StatePreviewImageChangedCommand &command);
bool operator ==(const StatePreviewImageChangedCommand &first, const StatePreviewImageChangedCommand &second);
QDebug operator <<(QDebug debug, const StatePreviewImageChangedCommand &command);
} // namespace QmlDesigner

7
share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.cpp
View File

@@ -29,6 +29,8 @@
#include "synchronizecommand.h"
#include <QDebug>
namespace QmlDesigner {
SynchronizeCommand::SynchronizeCommand()
@@ -66,4 +68,9 @@ bool operator ==(const SynchronizeCommand &first, const SynchronizeCommand &seco
return first.m_synchronizeId == second.m_synchronizeId;
}
QDebug operator <<(QDebug debug, const SynchronizeCommand &command)
{
return debug.nospace() << "SynchronizeCommand(synchronizeId: " << command.synchronizeId() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/commands/synchronizecommand.h
View File

@@ -56,6 +56,7 @@ QDataStream &operator<<(QDataStream &out, const SynchronizeCommand &command);
QDataStream &operator>>(QDataStream &in, SynchronizeCommand &command);
bool operator ==(const SynchronizeCommand &first, const SynchronizeCommand &second);
QDebug operator <<(QDebug debug, const SynchronizeCommand &command);
} // namespace QmlDesigner

9
share/qtcreator/qml/qmlpuppet/commands/tokencommand.cpp
View File

@@ -30,6 +30,7 @@
#include "tokencommand.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -89,4 +90,12 @@ bool operator ==(const TokenCommand &first, const TokenCommand &second)
&& first.m_instanceIdVector == second.m_instanceIdVector;
}
QDebug operator <<(QDebug debug, const TokenCommand &command)
{
return debug.nospace() << "TokenCommand("
<< "tokenName: " << command.tokenName() << ", "
<< "tokenNumber: " << command.tokenNumber() << ", "
<< "instances: " << command.instances() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
View File

@@ -63,6 +63,7 @@ QDataStream &operator<<(QDataStream &out, const TokenCommand &command);
QDataStream &operator>>(QDataStream &in, TokenCommand &command);
bool operator ==(const TokenCommand &first, const TokenCommand &second);
QDebug operator <<(QDebug debug, const TokenCommand &command);
} // namespace QmlDesigner

8
share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.cpp
View File

@@ -31,6 +31,7 @@
#include <QSharedMemory>
#include <QCache>
#include <QDebug>
#include <cstring>
@@ -152,4 +153,11 @@ bool operator ==(const ValuesChangedCommand &first, const ValuesChangedCommand &
return first.m_valueChangeVector == second.m_valueChangeVector;
}
QDebug operator <<(QDebug debug, const ValuesChangedCommand &command)
{
return debug.nospace() << "ValuesChangedCommand("
<< "keyNumber: " << command.keyNumber() << ", "
<< command.valueChanges() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/commands/valueschangedcommand.h
View File

@@ -63,7 +63,7 @@ QDataStream &operator<<(QDataStream &out, const ValuesChangedCommand &command);
QDataStream &operator>>(QDataStream &in, ValuesChangedCommand &command);
bool operator ==(const ValuesChangedCommand &first, const ValuesChangedCommand &second);
QDebug operator <<(QDebug debug, const ValuesChangedCommand &instance);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::ValuesChangedCommand)

29
share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp
View File

@@ -29,6 +29,8 @@
#include "addimportcontainer.h"
#include <QDebug>
namespace QmlDesigner {
AddImportContainer::AddImportContainer()
@@ -91,4 +93,31 @@ QDataStream &operator>>(QDataStream &in, AddImportContainer &command)
return in;
}
QDebug operator <<(QDebug debug, const AddImportContainer &container)
{
debug.nospace() << "AddImportContainer(";
if (!container.url().isEmpty())
debug.nospace() << "url: " << container.url() << ", ";
if (!container.fileName().isEmpty())
debug.nospace() << "fileName: " << container.fileName() << ", ";
if (!container.version().isEmpty())
debug.nospace() << "version: " << container.version() << ", ";
if (!container.alias().isEmpty())
debug.nospace() << "alias: " << container.alias() << ", ";
if (!container.alias().isEmpty())
debug.nospace() << "alias: " << container.alias() << ", ";
if (!container.alias().isEmpty())
debug.nospace() << "alias: " << container.alias() << ", ";
debug.nospace() << "importPaths: " << container.importPaths();
return debug.nospace() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/container/addimportcontainer.h
View File

@@ -61,6 +61,8 @@ private:
QDataStream &operator<<(QDataStream &out, const AddImportContainer &command);
QDataStream &operator>>(QDataStream &in, AddImportContainer &command);
QDebug operator <<(QDebug debug, const AddImportContainer &container);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::AddImportContainer)

10
share/qtcreator/qml/qmlpuppet/container/idcontainer.cpp
View File

@@ -29,6 +29,8 @@
#include "idcontainer.h"
#include <QDebug>
namespace QmlDesigner {
IdContainer::IdContainer()
@@ -67,4 +69,12 @@ QDataStream &operator>>(QDataStream &in, IdContainer &container)
return in;
}
QDebug operator <<(QDebug debug, const IdContainer &container)
{
return debug.nospace() << "IdContainer("
<< "instanceId: " << container.instanceId() << ", "
<< "id: " << container.id() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/container/idcontainer.h
View File

@@ -56,6 +56,8 @@ private:
QDataStream &operator<<(QDataStream &out, const IdContainer &container);
QDataStream &operator>>(QDataStream &in, IdContainer &container);
QDebug operator <<(QDebug debug, const IdContainer &container);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::IdContainer)

9
share/qtcreator/qml/qmlpuppet/container/imagecontainer.cpp
View File

@@ -31,6 +31,7 @@
#include <QSharedMemory>
#include <QCache>
#include <QDebug>
#include <cstring>
@@ -242,4 +243,12 @@ bool operator <(const ImageContainer &first, const ImageContainer &second)
return first.m_instanceId < second.m_instanceId;
}
QDebug operator <<(QDebug debug, const ImageContainer &container)
{
return debug.nospace() << "ImageContainer("
<< "instanceId: " << container.instanceId() << ", "
<< "size: " << container.image().size() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/container/imagecontainer.h
View File

@@ -64,6 +64,7 @@ QDataStream &operator>>(QDataStream &in, ImageContainer &container);
bool operator ==(const ImageContainer &first, const ImageContainer &second);
bool operator <(const ImageContainer &first, const ImageContainer &second);
QDebug operator <<(QDebug debug, const ImageContainer &container);
} // namespace QmlDesigner

18
share/qtcreator/qml/qmlpuppet/container/informationcontainer.cpp
View File

@@ -29,6 +29,8 @@
#include "informationcontainer.h"
#include <QtDebug>
namespace QmlDesigner {
InformationContainer::InformationContainer()
@@ -124,4 +126,20 @@ bool operator <(const InformationContainer &first, const InformationContainer &s
|| (first.m_instanceId == second.m_instanceId && first.m_name == second.m_name && first.m_information < second.m_information);
}
QDebug operator <<(QDebug debug, const InformationContainer &container)
{
debug.nospace() << "InformationContainer("
<< "instanceId: " << container.instanceId() << ", "
<< "name: " << container.name() << ", "
<< "information: " << container.information();
if (container.secondInformation().isValid())
debug.nospace() << ", " << "secondInformation: " << container.secondInformation();
if (container.thirdInformation().isValid())
debug.nospace() << ", " << "thirdInformation: " << container.thirdInformation();
return debug.nospace() << ")";
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/container/informationcontainer.h
View File

@@ -73,6 +73,7 @@ QDataStream &operator>>(QDataStream &in, InformationContainer &container);
bool operator ==(const InformationContainer &first, const InformationContainer &second);
bool operator <(const InformationContainer &first, const InformationContainer &second);
QDebug operator <<(QDebug debug, const InformationContainer &container);
} // namespace QmlDesigner

32
share/qtcreator/qml/qmlpuppet/container/instancecontainer.cpp
View File

@@ -30,6 +30,7 @@
#include "instancecontainer.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -122,4 +123,35 @@ QDataStream &operator>>(QDataStream &in, InstanceContainer &container)
return in;
}
QDebug operator <<(QDebug debug, const InstanceContainer &command)
{
debug.nospace() << "InstanceContainer("
<< "instanceId: " << command.instanceId() << ", "
<< "type: " << command.type() << ", "
<< "majorNumber: " << command.majorNumber() << ", "
<< "minorNumber: " << command.minorNumber() << ", ";
if (!command.componentPath().isEmpty())
debug.nospace() << "componentPath: " << command.componentPath() << ", ";
if (!command.nodeSource().isEmpty())
debug.nospace() << "nodeSource: " << command.nodeSource() << ", ";
if (command.nodeSourceType() == InstanceContainer::NoSource)
debug.nospace() << "nodeSourceType: NoSource, ";
else if (command.nodeSourceType() == InstanceContainer::CustomParserSource)
debug.nospace() << "nodeSourceType: CustomParserSource, ";
else
debug.nospace() << "nodeSourceType: ComponentSource, ";
if (command.metaType() == InstanceContainer::ObjectMetaType)
debug.nospace() << "metatype: ObjectMetaType";
else
debug.nospace() << "metatype: ItemMetaType";
return debug.nospace() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/container/instancecontainer.h
View File

@@ -82,6 +82,8 @@ private:
qint32 m_metaType;
};
QDebug operator <<(QDebug debug, const InstanceContainer &command);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::InstanceContainer)

17
share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.cpp
View File

@@ -29,6 +29,8 @@
#include "propertyabstractcontainer.h"
#include <QDebug>
namespace QmlDesigner {
PropertyAbstractContainer::PropertyAbstractContainer()
@@ -81,4 +83,19 @@ QDataStream &operator>>(QDataStream &in, PropertyAbstractContainer &container)
return in;
}
QDebug operator <<(QDebug debug, const PropertyAbstractContainer &container)
{
debug.nospace() << "PropertyAbstractContainer("
<< "instanceId: " << container.instanceId() << ", "
<< "name: " << container.name();
if (!container.dynamicTypeName().isEmpty())
debug.nospace() << ", " << "dynamicTypeName: " << container.dynamicTypeName();
debug.nospace() << ")";
return debug;
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/container/propertyabstractcontainer.h
View File

@@ -48,6 +48,7 @@ class PropertyAbstractContainer
friend QDataStream &operator<<(QDataStream &out, const PropertyAbstractContainer &container);
friend QDataStream &operator>>(QDataStream &in, PropertyAbstractContainer &container);
friend QDebug operator <<(QDebug debug, const PropertyAbstractContainer &container);
public:
PropertyAbstractContainer();
PropertyAbstractContainer(qint32 instanceId, const PropertyName &name, const QString &dynamicTypeName);
@@ -63,6 +64,7 @@ private:
QString m_dynamicTypeName;
};
QDebug operator <<(QDebug debug, const PropertyAbstractContainer &container);
} // namespace QmlDesigner

14
share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.cpp
View File

@@ -29,6 +29,7 @@
#include "propertybindingcontainer.h"
#include <QDebug>
namespace QmlDesigner {
@@ -90,4 +91,17 @@ QDataStream &operator>>(QDataStream &in, PropertyBindingContainer &container)
return in;
}
QDebug operator <<(QDebug debug, const PropertyBindingContainer &container)
{
debug.nospace() << "PropertyBindingContainer("
<< "instanceId: " << container.instanceId() << ", "
<< "name: " << container.name() << ", "
<< "expression: " << container.expression();
if (!container.dynamicTypeName().isEmpty())
debug.nospace() << ", " << "dynamicTypeName: " << container.dynamicTypeName();
return debug.nospace() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/container/propertybindingcontainer.h
View File

@@ -62,6 +62,8 @@ private:
QDataStream &operator<<(QDataStream &out, const PropertyBindingContainer &container);
QDataStream &operator>>(QDataStream &in, PropertyBindingContainer &container);
QDebug operator <<(QDebug debug, const PropertyBindingContainer &container);
} // namespace QmlDesigner
Q_DECLARE_METATYPE(QmlDesigner::PropertyBindingContainer)

14
share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.cpp
View File

@@ -105,5 +105,19 @@ bool operator <(const PropertyValueContainer &first, const PropertyValueContaine
|| (first.m_instanceId == second.m_instanceId && first.m_name < second.m_name);
}
QDebug operator <<(QDebug debug, const PropertyValueContainer &container)
{
debug.nospace() << "PropertyValueContainer("
<< "instanceId: " << container.instanceId() << ", "
<< "name: " << container.name() << ", "
<< "value: " << container.value();
if (!container.dynamicTypeName().isEmpty())
debug.nospace() << ", " << "dynamicTypeName: " << container.dynamicTypeName();
debug.nospace() << ")";
return debug;
}
} // namespace QmlDesigner

1
share/qtcreator/qml/qmlpuppet/container/propertyvaluecontainer.h
View File

@@ -67,6 +67,7 @@ QDataStream &operator>>(QDataStream &in, PropertyValueContainer &container);
bool operator ==(const PropertyValueContainer &first, const PropertyValueContainer &second);
bool operator <(const PropertyValueContainer &first, const PropertyValueContainer &second);
QDebug operator <<(QDebug debug, const PropertyValueContainer &container);
} // namespace QmlDesigner

21
share/qtcreator/qml/qmlpuppet/container/reparentcontainer.cpp
View File

@@ -30,6 +30,7 @@
#include "reparentcontainer.h"
#include <QDataStream>
#include <QDebug>
namespace QmlDesigner {
@@ -100,4 +101,24 @@ QDataStream &operator>>(QDataStream &in, ReparentContainer &container)
return in;
}
QDebug operator <<(QDebug debug, const ReparentContainer &container)
{
debug.nospace() << "ReparentContainer("
<< "instanceId: " << container.instanceId();
if (container.oldParentInstanceId() >= 0)
debug.nospace() << ", " << "oldParentInstanceId: " << container.oldParentInstanceId();
if (container.oldParentProperty().isEmpty())
debug.nospace() << ", " << "oldParentProperty: " << container.oldParentProperty();
if (container.newParentInstanceId() >= 0)
debug.nospace() << ", " << "newParentInstanceId: " << container.newParentInstanceId();
if (container.newParentProperty().isEmpty())
debug.nospace() << ", " << "newParentProperty: " << container.newParentProperty();
return debug.nospace() << ")";
}
} // namespace QmlDesigner

2
share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
View File

@@ -66,6 +66,8 @@ private:
QDataStream &operator<<(QDataStream &out, const ReparentContainer &container);
QDataStream &operator>>(QDataStream &in, ReparentContainer &container);
QDebug operator <<(QDebug debug, const ReparentContainer &container);
} // namespace QmlDesigner
#endif // REPARENTCONTAINER_H

6
share/qtcreator/qml/qmlpuppet/instances/nodeinstanceclientproxy.cpp
View File

@@ -141,7 +141,7 @@ bool compareCommands(const QVariant &command, const QVariant &controlCommand)
return command.value<InformationChangedCommand>() == controlCommand.value<InformationChangedCommand>();
else if (command.userType() == valuesChangedCommandType)
return command.value<ValuesChangedCommand>() == controlCommand.value<ValuesChangedCommand>();
else if (command.userType() == pixmapChangedCommandType)
else if (command.userType() == pixmapChangedCommandType)
return command.value<PixmapChangedCommand>() == controlCommand.value<PixmapChangedCommand>();
else if (command.userType() == childrenChangedCommandType)
return command.value<ChildrenChangedCommand>() == controlCommand.value<ChildrenChangedCommand>();
@@ -427,9 +427,9 @@ void NodeInstanceClientProxy::dispatchCommand(const QVariant &command)
static const int tokenCommandType = QMetaType::type("TokenCommand");
static const int endPuppetCommandType = QMetaType::type("EndPuppetCommand");
if (command.userType() == createInstancesCommandType) {
if (command.userType() == createInstancesCommandType)
createInstances(command.value<CreateInstancesCommand>());
} else if (command.userType() == changeFileUrlCommandType)
else if (command.userType() == changeFileUrlCommandType)
changeFileUrl(command.value<ChangeFileUrlCommand>());
else if (command.userType() == createSceneCommandType)
createScene(command.value<CreateSceneCommand>());

1
share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceserver.cpp
View File

@@ -42,6 +42,7 @@
#include <QAbstractAnimation>
#include <private/qabstractanimation_p.h>
#include <QMutableVectorIterator>
#include <QtDebug>
#include "servernodeinstance.h"
#include "objectnodeinstance.h"