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

QmlDesigner: single-char QString operations for efficiency

Browse Source
This commit is contained in:
Thomas Hartmann
2011-03-04 15:17:00 +01:00
parent df8affc87b
commit c993792efa
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
View File

@@ -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;
}

16
src/plugins/qmldesigner/components/propertyeditor/qmlanchorbindingproxy.cpp
View File

@@ -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());

2
src/plugins/qmldesigner/components/propertyeditor/siblingcombobox.cpp
View File

@@ -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));

14
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
View File

@@ -105,7 +105,7 @@ public:
m_properties.append(qMakePair(name, type));
} else {
if (const Interpreter::QmlObjectValue * ov = dynamic_cast<const Interpreter::QmlObjectValue *>(value)) {
QString qualifiedTypeName = ov->packageName().isEmpty() ? ov->className() : ov->packageName() + "." + ov->className();
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<const Interpreter::QmlObjectValue *>(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()))

2
src/plugins/qmldesigner/designercore/model/qmltextgenerator.cpp
View File

@@ -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();
}