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

QmlDesinger: Fix typo in RewriterView function

Browse Source 
* Fix typo in RewriterView function
* Update source with clang format

Change-Id: Ic0b6f2a28120e04980a99fbacaa72f6897c513aa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Henning Gruendl
2024-06-12 13:08:53 +02:00
committed by Henning Gründl
parent 980305ff15
commit 1750aab9b4
3 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/componentcore/viewmanager.cpp
View File

@@ -161,7 +161,7 @@ void ViewManager::attachRewriterView()
}); });
currentModel()->setRewriterView(view); currentModel()->setRewriterView(view);
view->reactivateTextMofifierChangeSignals(); view->reactivateTextModifierChangeSignals();
view->restoreAuxiliaryData(); view->restoreAuxiliaryData();
} }
@@ -171,7 +171,7 @@ void ViewManager::attachRewriterView()
void ViewManager::detachRewriterView() void ViewManager::detachRewriterView()
{ {
if (RewriterView *view = currentDesignDocument()->rewriterView()) { if (RewriterView *view = currentDesignDocument()->rewriterView()) {
view->deactivateTextMofifierChangeSignals(); view->deactivateTextModifierChangeSignals();
currentModel()->setRewriterView(nullptr); currentModel()->setRewriterView(nullptr);
} }
} }

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

@@ -90,8 +90,8 @@ public:
void setTextModifier(TextModifier *textModifier); void setTextModifier(TextModifier *textModifier);
QString textModifierContent() const; QString textModifierContent() const;
void reactivateTextMofifierChangeSignals(); void reactivateTextModifierChangeSignals();
void deactivateTextMofifierChangeSignals(); void deactivateTextModifierChangeSignals();
void auxiliaryDataChanged(const ModelNode &node, void auxiliaryDataChanged(const ModelNode &node,
AuxiliaryDataKeyView key, AuxiliaryDataKeyView key,

177
src/plugins/qmldesigner/designercore/model/rewriterview.cpp
View File

@@ -3,9 +3,9 @@
#include "rewriterview.h" #include "rewriterview.h"
#include "texttomodelmerger.h"
#include "modeltotextmerger.h"
#include "model_p.h" #include "model_p.h"
#include "modeltotextmerger.h"
#include "texttomodelmerger.h"
#include <bindingproperty.h> #include <bindingproperty.h>
#include <customnotifications.h> #include <customnotifications.h>
@@ -36,9 +36,9 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QSet> #include <QSet>
#include <algorithm>
#include <utility> #include <utility>
#include <vector> #include <vector>
#include <algorithm>
using namespace QmlDesigner::Internal; using namespace QmlDesigner::Internal;
using namespace Qt::StringLiterals; using namespace Qt::StringLiterals;
@@ -68,12 +68,21 @@ RewriterView::RewriterView(ExternalDependenciesInterface &externalDependencies,
connect(&m_amendTimer, &QTimer::timeout, this, &RewriterView::amendQmlText); connect(&m_amendTimer, &QTimer::timeout, this, &RewriterView::amendQmlText);
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance(); QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
connect(modelManager, &QmlJS::ModelManagerInterface::libraryInfoUpdated, connect(modelManager,
this, &RewriterView::handleLibraryInfoUpdate, Qt::QueuedConnection); &QmlJS::ModelManagerInterface::libraryInfoUpdated,
connect(modelManager, &QmlJS::ModelManagerInterface::projectInfoUpdated, this,
this, &RewriterView::handleProjectUpdate, Qt::DirectConnection); &RewriterView::handleLibraryInfoUpdate,
connect(this, &RewriterView::modelInterfaceProjectUpdated, Qt::QueuedConnection);
this, &RewriterView::handleLibraryInfoUpdate, Qt::QueuedConnection); connect(modelManager,
&QmlJS::ModelManagerInterface::projectInfoUpdated,
this,
&RewriterView::handleProjectUpdate,
Qt::DirectConnection);
connect(this,
&RewriterView::modelInterfaceProjectUpdated,
this,
&RewriterView::handleLibraryInfoUpdate,
Qt::QueuedConnection);
} }
RewriterView::~RewriterView() = default; RewriterView::~RewriterView() = default;
@@ -104,7 +113,7 @@ void RewriterView::modelAttached(Model *model)
if (hasIncompleteTypeInformation()) { if (hasIncompleteTypeInformation()) {
m_modelAttachPending = true; m_modelAttachPending = true;
QTimer::singleShot(1000, this, [this, model](){ QTimer::singleShot(1000, this, [this, model]() {
modelAttached(model); modelAttached(model);
restoreAuxiliaryData(); restoreAuxiliaryData();
}); });
@@ -129,7 +138,9 @@ void RewriterView::nodeCreated(const ModelNode &createdNode)
applyChanges(); applyChanges();
} }
void RewriterView::nodeRemoved(const ModelNode &removedNode, const NodeAbstractProperty &parentProperty, PropertyChangeFlags propertyChange) void RewriterView::nodeRemoved(const ModelNode &removedNode,
const NodeAbstractProperty &parentProperty,
PropertyChangeFlags propertyChange)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -153,13 +164,14 @@ void RewriterView::propertiesAboutToBeRemoved(const QList<AbstractProperty> &pro
if (!m_removeDefaultPropertyTransaction.isValid()) { if (!m_removeDefaultPropertyTransaction.isValid()) {
m_removeDefaultPropertyTransaction = beginRewriterTransaction( m_removeDefaultPropertyTransaction = beginRewriterTransaction(
QByteArrayLiteral("RewriterView::propertiesAboutToBeRemoved")); QByteArrayLiteral("RewriterView::propertiesAboutToBeRemoved"));
} }
if (property.isNodeListProperty()) { if (property.isNodeListProperty()) {
const auto nodeList = property.toNodeListProperty().toModelNodeList(); const auto nodeList = property.toNodeListProperty().toModelNodeList();
for (const ModelNode &node : nodeList) { for (const ModelNode &node : nodeList) {
modelToTextMerger()->nodeRemoved(node, property.toNodeAbstractProperty(), modelToTextMerger()->nodeRemoved(node,
property.toNodeAbstractProperty(),
AbstractView::NoAdditionalChanges); AbstractView::NoAdditionalChanges);
} }
} else if (property.isBindingProperty() || property.isVariantProperty() } else if (property.isBindingProperty() || property.isVariantProperty()
@@ -172,7 +184,7 @@ void RewriterView::propertiesAboutToBeRemoved(const QList<AbstractProperty> &pro
} }
} }
void RewriterView::propertiesRemoved(const QList<AbstractProperty>& propertyList) void RewriterView::propertiesRemoved(const QList<AbstractProperty> &propertyList)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -187,7 +199,8 @@ void RewriterView::propertiesRemoved(const QList<AbstractProperty>& propertyList
applyChanges(); applyChanges();
} }
void RewriterView::variantPropertiesChanged(const QList<VariantProperty>& propertyList, PropertyChangeFlags propertyChange) void RewriterView::variantPropertiesChanged(const QList<VariantProperty> &propertyList,
PropertyChangeFlags propertyChange)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -203,7 +216,8 @@ void RewriterView::variantPropertiesChanged(const QList<VariantProperty>& proper
applyChanges(); applyChanges();
} }
void RewriterView::bindingPropertiesChanged(const QList<BindingProperty>& propertyList, PropertyChangeFlags propertyChange) void RewriterView::bindingPropertiesChanged(const QList<BindingProperty> &propertyList,
PropertyChangeFlags propertyChange)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -219,7 +233,8 @@ void RewriterView::bindingPropertiesChanged(const QList<BindingProperty>& proper
applyChanges(); applyChanges();
} }
void RewriterView::signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList, AbstractView::PropertyChangeFlags propertyChange) void RewriterView::signalHandlerPropertiesChanged(const QVector<SignalHandlerProperty> &propertyList,
AbstractView::PropertyChangeFlags propertyChange)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -235,7 +250,8 @@ void RewriterView::signalHandlerPropertiesChanged(const QVector<SignalHandlerPro
applyChanges(); applyChanges();
} }
void RewriterView::signalDeclarationPropertiesChanged(const QVector<SignalDeclarationProperty> &propertyList, PropertyChangeFlags propertyChange) void RewriterView::signalDeclarationPropertiesChanged(
const QVector<SignalDeclarationProperty> &propertyList, PropertyChangeFlags propertyChange)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -251,7 +267,10 @@ void RewriterView::signalDeclarationPropertiesChanged(const QVector<SignalDeclar
applyChanges(); applyChanges();
} }
void RewriterView::nodeReparented(const ModelNode &node, const NodeAbstractProperty &newPropertyParent, const NodeAbstractProperty &oldPropertyParent, AbstractView::PropertyChangeFlags propertyChange) void RewriterView::nodeReparented(const ModelNode &node,
const NodeAbstractProperty &newPropertyParent,
const NodeAbstractProperty &oldPropertyParent,
AbstractView::PropertyChangeFlags propertyChange)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -293,7 +312,7 @@ void RewriterView::importsRemoved(const Imports &imports)
applyChanges(); applyChanges();
} }
void RewriterView::nodeIdChanged(const ModelNode& node, const QString& newId, const QString& oldId) void RewriterView::nodeIdChanged(const ModelNode &node, const QString &newId, const QString &oldId)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -340,7 +359,7 @@ void RewriterView::nodeOrderChanged(const NodeListProperty &listProperty)
void RewriterView::rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion) void RewriterView::rootNodeTypeChanged(const QString &type, int majorVersion, int minorVersion)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
return; return;
@@ -350,7 +369,10 @@ void RewriterView::rootNodeTypeChanged(const QString &type, int majorVersion, in
applyChanges(); applyChanges();
} }
void RewriterView::nodeTypeChanged(const ModelNode &node, const TypeName &type, int majorVersion, int minorVersion) void RewriterView::nodeTypeChanged(const ModelNode &node,
const TypeName &type,
int majorVersion,
int minorVersion)
{ {
Q_ASSERT(textModifier()); Q_ASSERT(textModifier());
if (textToModelMerger()->isActive()) if (textToModelMerger()->isActive())
@@ -362,7 +384,10 @@ void RewriterView::nodeTypeChanged(const ModelNode &node, const TypeName &type,
applyChanges(); applyChanges();
} }
void RewriterView::customNotification(const AbstractView * /*view*/, const QString &identifier, const QList<ModelNode> & /* nodeList */, const QList<QVariant> & /*data */) void RewriterView::customNotification(const AbstractView * /*view*/,
const QString &identifier,
const QList<ModelNode> & /* nodeList */,
const QList<QVariant> & /*data */)
{ {
if (identifier == StartRewriterAmend || identifier == EndRewriterAmend) if (identifier == StartRewriterAmend || identifier == EndRewriterAmend)
return; // we emitted this ourselves, so just ignore these notifications. return; // we emitted this ourselves, so just ignore these notifications.
@@ -378,8 +403,7 @@ void RewriterView::rewriterEndTransaction()
{ {
transactionLevel--; transactionLevel--;
Q_ASSERT(transactionLevel >= 0); Q_ASSERT(transactionLevel >= 0);
if (transactionLevel == 0) if (transactionLevel == 0) {
{
setModificationGroupActive(false); setModificationGroupActive(false);
applyModificationGroupChanges(); applyModificationGroupChanges();
} }
@@ -419,13 +443,13 @@ QString RewriterView::textModifierContent() const
return QString(); return QString();
} }
void RewriterView::reactivateTextMofifierChangeSignals() void RewriterView::reactivateTextModifierChangeSignals()
{ {
if (textModifier()) if (textModifier())
textModifier()->reactivateChangeSignals(); textModifier()->reactivateChangeSignals();
} }
void RewriterView::deactivateTextMofifierChangeSignals() void RewriterView::deactivateTextModifierChangeSignals()
{ {
if (textModifier()) if (textModifier())
textModifier()->deactivateChangeSignals(); textModifier()->deactivateChangeSignals();
@@ -455,9 +479,14 @@ void RewriterView::applyChanges()
if (inErrorState()) { if (inErrorState()) {
const QString content = textModifierContent(); const QString content = textModifierContent();
qDebug().noquote() << "RewriterView::applyChanges() got called while in error state. Will do a quick-exit now."; qDebug().noquote() << "RewriterView::applyChanges() got called while in error state. Will "
"do a quick-exit now.";
qDebug().noquote() << "Content: " << content; qDebug().noquote() << "Content: " << content;
throw RewritingException(__LINE__, __FUNCTION__, __FILE__, "RewriterView::applyChanges() already in error state", content); throw RewritingException(__LINE__,
__FUNCTION__,
__FILE__,
"RewriterView::applyChanges() already in error state",
content);
} }
m_differenceHandling = Validate; m_differenceHandling = Validate;
@@ -481,13 +510,16 @@ void RewriterView::applyChanges()
qDebug().noquote() << "Content: " << content; qDebug().noquote() << "Content: " << content;
if (!errors().isEmpty()) if (!errors().isEmpty())
qDebug().noquote() << "Error:" << errors().constFirst().description(); qDebug().noquote() << "Error:" << errors().constFirst().description();
throw RewritingException(__LINE__, __FUNCTION__, __FILE__, qPrintable(m_rewritingErrorMessage), content); throw RewritingException(__LINE__,
__FUNCTION__,
__FILE__,
qPrintable(m_rewritingErrorMessage),
content);
} }
} }
void RewriterView::amendQmlText() void RewriterView::amendQmlText()
{ {
if (!model()->rewriterView()) if (!model()->rewriterView())
return; return;
@@ -518,38 +550,15 @@ static QString replaceIllegalPropertyNameChars(const QString &str)
return ret; return ret;
} }
static bool idIsQmlKeyWord(const QString& id) static bool idIsQmlKeyWord(const QString &id)
{ {
static const QSet<QString> keywords = { static const QSet<QString> keywords = {"as", "break", "case", "catch",
"as", "continue", "debugger", "default", "delete",
"break", "do", "else", "finally", "for",
"case", "function", "if", "import", "in",
"catch", "instanceof", "new", "return", "switch",
"continue", "this", "throw", "try", "typeof",
"debugger", "var", "void", "while", "with"};
"default",
"delete",
"do",
"else",
"finally",
"for",
"function",
"if",
"import",
"in",
"instanceof",
"new",
"return",
"switch",
"this",
"throw",
"try",
"typeof",
"var",
"void",
"while",
"with"
};
return keywords.contains(id); return keywords.contains(id);
} }
@@ -598,8 +607,7 @@ QString RewriterView::auxiliaryDataAsQML() const
auto metaType = static_cast<QMetaType::Type>(value.type()); auto metaType = static_cast<QMetaType::Type>(value.type());
if (metaType == QMetaType::QString if (metaType == QMetaType::QString || metaType == QMetaType::QColor) {
|| metaType == QMetaType::QColor) {
strValue.replace("\\"_L1, "\\\\"_L1); strValue.replace("\\"_L1, "\\\\"_L1);
strValue.replace("\""_L1, "\\\""_L1); strValue.replace("\""_L1, "\\\""_L1);
strValue.replace("\t"_L1, "\\t"_L1); strValue.replace("\t"_L1, "\\t"_L1);
@@ -650,7 +658,8 @@ void RewriterView::sanitizeModel()
QList<ModelNode> danglingNodes; QList<ModelNode> danglingNodes;
const auto danglingStates = root.allInvalidStateOperations(); const auto danglingStates = root.allInvalidStateOperations();
const auto danglingKeyframeGroups = QmlTimelineKeyframeGroup::allInvalidTimelineKeyframeGroups(this); const auto danglingKeyframeGroups = QmlTimelineKeyframeGroup::allInvalidTimelineKeyframeGroups(
this);
std::transform(danglingStates.begin(), std::transform(danglingStates.begin(),
danglingStates.end(), danglingStates.end(),
@@ -811,7 +820,7 @@ int RewriterView::firstDefinitionInsideOffset(const ModelNode &node) const
int RewriterView::firstDefinitionInsideLength(const ModelNode &node) const int RewriterView::firstDefinitionInsideLength(const ModelNode &node) const
{ {
FirstDefinitionFinder firstDefinitionFinder(m_textModifier->text()); FirstDefinitionFinder firstDefinitionFinder(m_textModifier->text());
const int offset = firstDefinitionFinder(nodeOffset(node)); const int offset = firstDefinitionFinder(nodeOffset(node));
ObjectLengthCalculator objectLengthCalculator; ObjectLengthCalculator objectLengthCalculator;
unsigned length; unsigned length;
@@ -833,7 +842,7 @@ static bool isInNodeDefinition(int nodeTextOffset, int nodeTextLength, int curso
ModelNode RewriterView::nodeAtTextCursorPositionHelper(const ModelNode &root, int cursorPosition) const ModelNode RewriterView::nodeAtTextCursorPositionHelper(const ModelNode &root, int cursorPosition) const
{ {
using myPair = std::pair<ModelNode,int>; using myPair = std::pair<ModelNode, int>;
std::vector<myPair> data; std::vector<myPair> data;
for (const ModelNode &node : allModelNodes()) { for (const ModelNode &node : allModelNodes()) {
@@ -842,9 +851,7 @@ ModelNode RewriterView::nodeAtTextCursorPositionHelper(const ModelNode &root, in
data.emplace_back(std::make_pair(node, offset)); data.emplace_back(std::make_pair(node, offset));
} }
std::sort(data.begin(), data.end(), [](myPair a, myPair b) { std::sort(data.begin(), data.end(), [](myPair a, myPair b) { return a.second < b.second; });
return a.second < b.second;
});
ModelNode lastNode = root; ModelNode lastNode = root;
@@ -852,7 +859,8 @@ ModelNode RewriterView::nodeAtTextCursorPositionHelper(const ModelNode &root, in
ModelNode node = pair.first; ModelNode node = pair.first;
const int nodeTextOffset = nodeOffset(node); const int nodeTextOffset = nodeOffset(node);
const int nodeTextLength = m_textModifier->text().indexOf("}", nodeTextOffset) - nodeTextOffset - 1; const int nodeTextLength = m_textModifier->text().indexOf("}", nodeTextOffset)
- nodeTextOffset - 1;
if (isInNodeDefinition(nodeTextOffset, nodeTextLength, cursorPosition)) if (isInNodeDefinition(nodeTextOffset, nodeTextLength, cursorPosition))
lastNode = node; lastNode = node;
@@ -868,7 +876,7 @@ void RewriterView::setupCanonicalHashes() const
m_canonicalIntModelNode.clear(); m_canonicalIntModelNode.clear();
m_canonicalModelNodeInt.clear(); m_canonicalModelNodeInt.clear();
using myPair = std::pair<ModelNode,int>; using myPair = std::pair<ModelNode, int>;
std::vector<myPair> data; std::vector<myPair> data;
for (const ModelNode &node : allModelNodes()) { for (const ModelNode &node : allModelNodes()) {
@@ -877,9 +885,7 @@ void RewriterView::setupCanonicalHashes() const
data.emplace_back(std::make_pair(node, offset)); data.emplace_back(std::make_pair(node, offset));
} }
std::sort(data.begin(), data.end(), [](myPair a, myPair b) { std::sort(data.begin(), data.end(), [](myPair a, myPair b) { return a.second < b.second; });
return a.second < b.second;
});
int i = 0; int i = 0;
for (const myPair &pair : data) { for (const myPair &pair : data) {
@@ -909,26 +915,28 @@ ModelNode RewriterView::nodeAtTextCursorPosition(int cursorPosition) const
return nodeAtTextCursorPositionHelper(rootModelNode(), cursorPosition); return nodeAtTextCursorPositionHelper(rootModelNode(), cursorPosition);
} }
bool RewriterView::renameId(const QString& oldId, const QString& newId) bool RewriterView::renameId(const QString &oldId, const QString &newId)
{ {
if (textModifier()) { if (textModifier()) {
PropertyName propertyName = oldId.toUtf8(); PropertyName propertyName = oldId.toUtf8();
bool hasAliasExport = rootModelNode().isValid() bool hasAliasExport = rootModelNode().isValid()
&& rootModelNode().hasBindingProperty(propertyName) && rootModelNode().hasBindingProperty(propertyName)
&& rootModelNode().bindingProperty(propertyName).isAliasExport(); && rootModelNode().bindingProperty(propertyName).isAliasExport();
bool instant = m_instantQmlTextUpdate; bool instant = m_instantQmlTextUpdate;
m_instantQmlTextUpdate = true; m_instantQmlTextUpdate = true;
bool refactoring = textModifier()->renameId(oldId, newId); bool refactoring = textModifier()->renameId(oldId, newId);
m_instantQmlTextUpdate = instant; m_instantQmlTextUpdate = instant;
if (refactoring && hasAliasExport) { //Keep export alias properties if (refactoring && hasAliasExport) { //Keep export alias properties
rootModelNode().removeProperty(propertyName); rootModelNode().removeProperty(propertyName);
PropertyName newPropertyName = newId.toUtf8(); PropertyName newPropertyName = newId.toUtf8();
rootModelNode().bindingProperty(newPropertyName).setDynamicTypeNameAndExpression("alias", QString::fromUtf8(newPropertyName)); rootModelNode()
.bindingProperty(newPropertyName)
.setDynamicTypeNameAndExpression("alias", QString::fromUtf8(newPropertyName));
} }
return refactoring; return refactoring;
} }
@@ -1002,7 +1010,7 @@ QStringList RewriterView::importDirectories() const
return Utils::transform(list, [](const Utils::FilePath &p) { return p.toString(); }); return Utils::transform(list, [](const Utils::FilePath &p) { return p.toString(); });
} }
QSet<QPair<QString, QString> > RewriterView::qrcMapping() const QSet<QPair<QString, QString>> RewriterView::qrcMapping() const
{ {
return m_textToModelMerger->qrcMapping(); return m_textToModelMerger->qrcMapping();
} }
@@ -1116,8 +1124,7 @@ QList<QmlTypeData> RewriterView::getQMLTypes() const
for (const QmlJS::ModelManagerInterface::CppData &cppData : for (const QmlJS::ModelManagerInterface::CppData &cppData :
QmlJS::ModelManagerInterface::instance()->cppData()) QmlJS::ModelManagerInterface::instance()->cppData())
for (const LanguageUtils::FakeMetaObject::ConstPtr &fakeMetaObject : cppData.exportedTypes) { for (const LanguageUtils::FakeMetaObject::ConstPtr &fakeMetaObject : cppData.exportedTypes) {
for (const LanguageUtils::FakeMetaObject::Export &exportItem : for (const LanguageUtils::FakeMetaObject::Export &exportItem : fakeMetaObject->exports()) {
fakeMetaObject->exports()) {
QmlTypeData qmlData; QmlTypeData qmlData;
qmlData.cppClassName = fakeMetaObject->className(); qmlData.cppClassName = fakeMetaObject->className();
qmlData.typeName = exportItem.type; qmlData.typeName = exportItem.type;
@@ -1134,7 +1141,7 @@ QList<QmlTypeData> RewriterView::getQMLTypes() const
return qmlDataList; return qmlDataList;
} }
void RewriterView::setWidgetStatusCallback(std::function<void (bool)> setWidgetStatusCallback) void RewriterView::setWidgetStatusCallback(std::function<void(bool)> setWidgetStatusCallback)
{ {
m_setWidgetStatusCallback = setWidgetStatusCallback; m_setWidgetStatusCallback = setWidgetStatusCallback;
} }
@@ -1303,4 +1310,4 @@ void RewriterView::restoreAuxiliaryData()
m_restoringAuxData = false; m_restoringAuxData = false;
} }
} //QmlDesigner } // namespace QmlDesigner