From c993792efaad10faa57b30a480d68fe86f1c7b66 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Fri, 4 Mar 2011 15:17:00 +0100 Subject: [PATCH] QmlDesigner: single-char QString operations for efficiency --- .../components/propertyeditor/propertyeditor.cpp | 4 ++-- .../propertyeditor/qmlanchorbindingproxy.cpp | 16 ++++++++-------- .../propertyeditor/siblingcombobox.cpp | 2 +- .../designercore/metainfo/nodemetainfo.cpp | 16 ++++++++-------- .../designercore/model/qmltextgenerator.cpp | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index baf96dfafa1..d65a3f7d359 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -316,7 +316,7 @@ PropertyEditor::~PropertyEditor() static inline QString fixTypeNameForPanes(const QString &typeName) { QString fixedTypeName = typeName; - fixedTypeName.replace(".", "/"); + fixedTypeName.replace('.', '/'); fixedTypeName.replace("QtQuick/", "Qt/"); return fixedTypeName; } @@ -891,7 +891,7 @@ void PropertyEditor::reloadQml() QString PropertyEditor::qmlFileName(const NodeMetaInfo &nodeInfo) const { if (nodeInfo.typeName().split('.').last() == "QDeclarativeItem") - return "Qt/ItemPane.qml"; + return "Qt/ItemPane.qml"; const QString fixedTypeName = fixTypeNameForPanes(nodeInfo.typeName()); return fixedTypeName + QLatin1String("Pane.qml"); } diff --git a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp index 20c08d2d9e7..85b8e6cfdce 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp @@ -486,8 +486,8 @@ void QmlAnchorBindingProxy::removeTopAnchor() { m_fxItemNode.anchors().removeAnchor(AnchorLine::Top); m_fxItemNode.anchors().removeMargin(AnchorLine::Top); - if (qFuzzyCompare(m_fxItemNode.instancePosition().y(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "y")) - m_fxItemNode.setVariantProperty("y", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "y")); + if (qFuzzyCompare(m_fxItemNode.instancePosition().y(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + 'y')) + m_fxItemNode.setVariantProperty('y', m_fxItemNode.modelNode().auxiliaryData(auxDataString + 'y')); if (qFuzzyCompare(m_fxItemNode.instanceSize().height(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "height")) m_fxItemNode.setVariantProperty("height", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "height")); @@ -509,8 +509,8 @@ void QmlAnchorBindingProxy::removeLeftAnchor() { m_fxItemNode.anchors().removeAnchor(AnchorLine::Left); m_fxItemNode.anchors().removeMargin(AnchorLine::Left); - if (qFuzzyCompare(m_fxItemNode.instancePosition().x(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "x")) - m_fxItemNode.setVariantProperty("x", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "x")); + if (qFuzzyCompare(m_fxItemNode.instancePosition().x(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + 'x')) + m_fxItemNode.setVariantProperty('x', m_fxItemNode.modelNode().auxiliaryData(auxDataString + 'x')); if (qFuzzyCompare(m_fxItemNode.instanceSize().width(), 0.0) && m_fxItemNode.modelNode().hasAuxiliaryData(auxDataString + "width")) m_fxItemNode.setVariantProperty("width", m_fxItemNode.modelNode().auxiliaryData(auxDataString + "width")); } @@ -588,10 +588,10 @@ void QmlAnchorBindingProxy::fill() RewriterTransaction transaction = m_fxItemNode.modelNode().view()->beginRewriterTransaction(); - m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "x", m_fxItemNode.instancePosition().x()); - m_fxItemNode.removeVariantProperty("x"); - m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "y", m_fxItemNode.instancePosition().y()); - m_fxItemNode.removeVariantProperty("y"); + m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + 'x', m_fxItemNode.instancePosition().x()); + m_fxItemNode.removeVariantProperty('x'); + m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + 'y', m_fxItemNode.instancePosition().y()); + m_fxItemNode.removeVariantProperty('y'); m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "width", m_fxItemNode.instanceSize().width()); m_fxItemNode.removeVariantProperty("width"); m_fxItemNode.modelNode().setAuxiliaryData(auxDataString + "height", m_fxItemNode.instanceSize().height()); diff --git a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp index 00dc0aecacc..d0d0174264d 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp @@ -100,7 +100,7 @@ void SiblingComboBox::setup() parentString += parent.simplifiedTypeName(); else parentString += parent.id(); - parentString += ")"; + parentString += ')'; insertItem(0, parentString); } setCurrentIndex(m_itemList.indexOf(m_selectedItemNode)); diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 09bc25ad80e..9eb16d5923f 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -104,8 +104,8 @@ public: type = ref->ast()->memberType->asString(); m_properties.append(qMakePair(name, type)); } else { - if (const Interpreter::QmlObjectValue * ov = dynamic_cast(value)) { - QString qualifiedTypeName = ov->packageName().isEmpty() ? ov->className() : ov->packageName() + "." + ov->className(); + if (const Interpreter::QmlObjectValue * ov = dynamic_cast(value)) { + QString qualifiedTypeName = ov->packageName().isEmpty() ? ov->className() : ov->packageName() + '.' + ov->className(); m_properties.append(qMakePair(name, qualifiedTypeName)); } else { Interpreter::TypeId typeId; @@ -158,9 +158,9 @@ QStringList prototypes(const Interpreter::ObjectValue *ov, LookupContext::Ptr co const Interpreter::QmlObjectValue * qmlValue = dynamic_cast(ov); if (qmlValue) { if (versions) { - list << qmlValue->packageName() + "." + qmlValue->className() + - " " + QString::number(qmlValue->version().majorVersion()) + - "." + QString::number(qmlValue->version().minorVersion()); + list << qmlValue->packageName() + '.' + qmlValue->className() + + ' ' + QString::number(qmlValue->version().majorVersion()) + + '.' + QString::number(qmlValue->version().minorVersion()); } else { list << qmlValue->packageName() + "." + qmlValue->className(); } @@ -662,7 +662,7 @@ bool NodeMetaInfoPrivate::cleverCheckType(const QString &otherType) const typeName = split.at(1); } if (packageName() == package) - return QString(package + "." + typeName) == qualfiedTypeName(); + return QString(package + '.' + typeName) == qualfiedTypeName(); const LanguageUtils::FakeMetaObject::Export exp = getQmlObjectValue()->metaObject()->exportInPackage(package); @@ -770,7 +770,7 @@ QString NodeMetaInfoPrivate::lookupName() const QStringList NodeMetaInfoPrivate::lookupNameComponent() const { QString tempString = m_qualfiedTypeName; - return tempString.split("."); + return tempString.split('.'); } bool NodeMetaInfoPrivate::isValid() const @@ -801,7 +801,7 @@ void NodeMetaInfoPrivate::setupPrototypes() description.minorVersion = qmlValue->version().minorVersion(); description.majorVersion = qmlValue->version().majorVersion(); if (!qmlValue->packageName().isEmpty()) - description.className = qmlValue->packageName() + "." + description.className; + description.className = qmlValue->packageName() + '.' + description.className; m_prototypes.append(description); } else { if (lookupContext()->context()->lookupType(document(), QStringList() << ov->className())) diff --git a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp index b6c4e3d0988..b50d2914fe1 100644 --- a/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp +++ b/src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp @@ -138,7 +138,7 @@ QString QmlTextGenerator::toQml(const ModelNode &node, int indentDepth) const QString type = node.type(); QString url; if (type.contains('.')) { - QStringList nameComponents = type.split("."); + QStringList nameComponents = type.split('.'); url = nameComponents.first(); type = nameComponents.last(); }