From b2cd3bd823722fefd2e76cf6a94e4831f867f474 Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@nokia.com>
Date: Mon, 18 Jan 2010 16:00:09 +0100
Subject: [PATCH] Changed the rewriter action dumping.
---
.../core/model/modeltotextmerger.cpp | 9 +-
.../qmldesigner/core/model/rewriteaction.cpp | 94 ++++++-------------
.../qmldesigner/core/model/rewriteaction.h | 18 ++--
3 files changed, 44 insertions(+), 77 deletions(-)
diff --git a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
index 894d92008b9..04eac2cc3b1 100644
--- a/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
+++ b/src/plugins/qmldesigner/core/model/modeltotextmerger.cpp
@@ -42,7 +42,7 @@
#include <QDebug>
#define INDENT_DEPTH 4
-#undef DUMP_REWRITE_ACTIONS
+#define DUMP_REWRITE_ACTIONS
using namespace Qml;
using namespace QmlDesigner;
@@ -188,6 +188,9 @@ RewriterView *ModelToTextMerger::view()
void ModelToTextMerger::applyChanges()
{
+ if (m_rewriteActions.isEmpty())
+ return;
+
dumpRewriteActions(QLatin1String("Before compression"));
RewriteActionCompressor compress(getPropertyOrder());
compress(m_rewriteActions);
@@ -223,7 +226,7 @@ void ModelToTextMerger::applyChanges()
RewriteAction* action = m_rewriteActions.at(i);
#ifdef DUMP_REWRITE_ACTIONS
- action->dump("Next rewrite action:");
+ qDebug() << "Next rewrite action:" << qPrintable(action->info());
#endif // DUMP_REWRITE_ACTIONS
ModelNodePositionStorage *positionStore = m_rewriterView->positionStorage();
const bool success = action->execute(refactoring, *positionStore);
@@ -312,7 +315,7 @@ void ModelToTextMerger::dumpRewriteActions(const QString &msg)
qDebug() << "---->" << qPrintable(msg);
foreach (RewriteAction *action, m_rewriteActions) {
- action->dump("-----");
+ qDebug() << "-----" << qPrintable(action->info());
}
qDebug() << "<----" << qPrintable(msg);
diff --git a/src/plugins/qmldesigner/core/model/rewriteaction.cpp b/src/plugins/qmldesigner/core/model/rewriteaction.cpp
index 2a1a8652d93..5e0c333ea6f 100644
--- a/src/plugins/qmldesigner/core/model/rewriteaction.cpp
+++ b/src/plugins/qmldesigner/core/model/rewriteaction.cpp
@@ -60,13 +60,9 @@ bool AddPropertyRewriteAction::execute(QmlRefactoring &refactoring, ModelNodePos
return result;
}
-void AddPropertyRewriteAction::dump(const QString &prefix) const
+QString AddPropertyRewriteAction::info() const
{
- qDebug() << qPrintable(prefix)
- << "AddPropertyRewriteAction for property"
- << m_property.name()
- << "(" << qPrintable(toString(m_propertyType)) << ")"
- ;
+ return QString("AddPropertyRewriteAction for property \"%1\" (type: %2)").arg(m_property.name(), toString(m_propertyType));
}
bool ChangeIdRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
@@ -86,11 +82,9 @@ bool ChangeIdRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, Mo
return result;
}
-void ChangeIdRewriteAction::dump(const QString &prefix) const
+QString ChangeIdRewriteAction::info() const
{
- qDebug() << qPrintable(prefix)
- << "ChangeIdRewriteAction"
- ;
+ return QString("ChangeIdRewriteAction from \"%1\" to \"%2\"").arg(m_oldId, m_newId);
}
bool ChangePropertyRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
@@ -109,19 +103,14 @@ bool ChangePropertyRewriteAction::execute(QmlDesigner::QmlRefactoring &refactori
return result;
}
-void ChangePropertyRewriteAction::dump(const QString &prefix) const
+QString ChangePropertyRewriteAction::info() const
{
- qDebug() << qPrintable(prefix)
- << "ChangePropertyRewriteAction for property"
- << m_property.name()
- << "(" << qPrintable(toString(m_propertyType)) << ")"
- << "of node"
- << (m_property.parentModelNode().isValid() ? m_property.parentModelNode().id() : "(invalid)")
- << "with new value"
- << QString(m_valueText).replace('\n', "\\n")
- << "and contained object"
- << (m_containedModelNode.isValid() ? m_containedModelNode.id() : "(none)")
- ;
+ return QString("ChangePropertyRewriteAction for property \"%1\" (type: %2) of node \"%3\" with value >>%4<< and contained object \"%5\"")
+ .arg(m_property.name(),
+ toString(m_propertyType),
+ (m_property.parentModelNode().isValid() ? m_property.parentModelNode().id() : "(invalid)"),
+ QString(m_valueText).replace('\n', "\\n"),
+ (m_containedModelNode.isValid() ? m_containedModelNode.id() : "(none)"));
}
bool ChangeTypeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
@@ -140,11 +129,9 @@ bool ChangeTypeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring,
return result;
}
-void ChangeTypeRewriteAction::dump(const QString &prefix) const
+QString ChangeTypeRewriteAction::info() const
{
- qDebug() << qPrintable(prefix)
- << "ChangeTypeRewriteAction"
- ;
+ return QString("ChangeTypeRewriteAction");
}
bool RemoveNodeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
@@ -158,11 +145,9 @@ bool RemoveNodeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring,
return result;
}
-void RemoveNodeRewriteAction::dump(const QString &prefix) const
+QString RemoveNodeRewriteAction::info() const
{
- qDebug() << qPrintable(prefix)
- << "RemoveNodeRewriteAction"
- ;
+ return QString("RemoveNodeRewriteAction");
}
bool RemovePropertyRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
@@ -176,12 +161,9 @@ bool RemovePropertyRewriteAction::execute(QmlDesigner::QmlRefactoring &refactori
return result;
}
-void RemovePropertyRewriteAction::dump(const QString &prefix) const
+QString RemovePropertyRewriteAction::info() const
{
- qDebug() << qPrintable(prefix)
- << "RemovePropertyRewriteAction for property"
- << m_property.name()
- ;
+ return QString("RemovePropertyRewriteAction for property \"%1\"").arg(m_property.name());
}
bool ReparentNodeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore)
@@ -201,22 +183,15 @@ bool ReparentNodeRewriteAction::execute(QmlDesigner::QmlRefactoring &refactoring
return result;
}
-void ReparentNodeRewriteAction::dump(const QString &prefix) const
+QString ReparentNodeRewriteAction::info() const
{
- if (m_node.isValid()) {
- qDebug() << qPrintable(prefix)
- << "ReparentNodeRewriteAction for node"
- << m_node.id()
- << "into property"
- << m_targetProperty.name()
- << "of node"
- << m_targetProperty.parentModelNode().id()
- ;
- } else {
- qDebug() << qPrintable(prefix)
- << "reparentNodeRewriteAction for an invalid node"
- ;
- }
+ if (m_node.isValid())
+ return QString("ReparentNodeRewriteAction for node \"%1\" into property \"%2\" of node \"%3\"")
+ .arg(m_node.id(),
+ m_targetProperty.name(),
+ m_targetProperty.parentModelNode().id());
+ else
+ return QString("ReparentNodeRewriteAction for an invalid node");
}
bool MoveNodeRewriteAction::execute(QmlRefactoring &refactoring,
@@ -232,25 +207,14 @@ bool MoveNodeRewriteAction::execute(QmlRefactoring &refactoring,
return result;
}
-void MoveNodeRewriteAction::dump(const QString &prefix) const
+QString MoveNodeRewriteAction::info() const
{
if (m_movingNode.isValid()) {
if (m_newTrailingNode.isValid())
- qDebug() << qPrintable(prefix)
- << "MoveNodeRewriteAction for node"
- << m_movingNode.id()
- << "before node"
- << m_newTrailingNode.id()
- ;
+ return QString("MoveNodeRewriteAction for node \"%1\" before node \"%2\"").arg(m_movingNode.id(), m_newTrailingNode.id());
else
- qDebug() << qPrintable(prefix)
- << "MoveNodeRewriteAction for node"
- << m_movingNode.id()
- << "to the end of its containing property"
- ;
+ return QString("MoveNodeRewriteAction for node \"%1\" to the end of its containing property").arg(m_movingNode.id());
} else {
- qDebug() << qPrintable(prefix)
- << "MoveNodeRewriteAction for an invalid node"
- ;
+ return QString("MoveNodeRewriteAction for an invalid node");
}
}
diff --git a/src/plugins/qmldesigner/core/model/rewriteaction.h b/src/plugins/qmldesigner/core/model/rewriteaction.h
index 6afaf222923..84deabd68bb 100644
--- a/src/plugins/qmldesigner/core/model/rewriteaction.h
+++ b/src/plugins/qmldesigner/core/model/rewriteaction.h
@@ -51,7 +51,7 @@ class RewriteAction
{
public:
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore) = 0;
- virtual void dump(const QString &prefix) const = 0;
+ virtual QString info() const = 0;
virtual AddPropertyRewriteAction const *asAddPropertyRewriteAction() const { return 0; }
virtual ChangeIdRewriteAction const *asChangeIdRewriteAction() const { return 0; }
@@ -79,7 +79,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual AddPropertyRewriteAction const *asAddPropertyRewriteAction() const { return this; }
@@ -110,7 +110,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual ChangeIdRewriteAction const *asChangeIdRewriteAction() const { return this; }
@@ -131,7 +131,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual ChangePropertyRewriteAction const *asChangePropertyRewriteAction() const { return this; }
@@ -162,7 +162,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual ChangeTypeRewriteAction const *asChangeTypeRewriteAction() const { return this; }
@@ -181,7 +181,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual RemoveNodeRewriteAction const *asRemoveNodeRewriteAction() const { return this; }
@@ -200,7 +200,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual RemovePropertyRewriteAction const *asRemovePropertyRewriteAction() const { return this; }
@@ -219,7 +219,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual ReparentNodeRewriteAction const *asReparentNodeRewriteAction() const { return this; }
@@ -246,7 +246,7 @@ public:
{}
virtual bool execute(QmlDesigner::QmlRefactoring &refactoring, ModelNodePositionStorage &positionStore);
- virtual void dump(const QString &prefix) const;
+ virtual QString info() const;
virtual MoveNodeRewriteAction const *asMoveNodeRewriteAction() const { return this; }
--
GitLab