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

QmlDesigner: Fixed issues with strings

Browse Source
This commit is contained in:
Christiaan Janssen
2010-02-04 13:30:05 +01:00
parent c64b202a2c
commit 095ff9e80a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
View File

@@ -58,14 +58,14 @@ void DesignDocumentControllerView::nodeOrderChanged(const NodeListProperty & /*l
static QStringList arrayToStringList(const QByteArray &byteArray) static QStringList arrayToStringList(const QByteArray &byteArray)
{ {
QString str(QString::fromLatin1(byteArray)); QString str(QString::fromLatin1(byteArray));
return str.split("\n"); return str.split('\n');
} }
static QByteArray stringListToArray(const QStringList &stringList) static QByteArray stringListToArray(const QStringList &stringList)
{ {
QString str; QString str;
foreach (const QString &subString, stringList) foreach (const QString &subString, stringList)
str += subString + "\n"; str += subString + '\n';
return str.toLatin1(); return str.toLatin1();
} }

2
src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp
View File

@@ -71,7 +71,7 @@ QVariant StatesEditorModel::data(const QModelIndex &index, int role) const
QVariant result; QVariant result;
switch (role) { switch (role) {
case StateNameRole: { case StateNameRole: {
if ((index.row()==0) && m_stateNames.at(index.row()).isEmpty()) if (index.row()==0)
result = QString("base state"); result = QString("base state");
else else
result = m_stateNames.at(index.row()); result = m_stateNames.at(index.row());

4
src/plugins/qmldesigner/core/model/modelmerger.cpp
View File

@@ -72,7 +72,7 @@ static void syncBindingProperties(ModelNode &outputNode, const ModelNode &inputN
static void syncId(ModelNode &outputNode, const ModelNode &inputNode, const QHash<QString, QString> &idRenamingHash) static void syncId(ModelNode &outputNode, const ModelNode &inputNode, const QHash<QString, QString> &idRenamingHash)
{ {
if (!inputNode.id().isNull() && !inputNode.id().isEmpty()) { if (!inputNode.id().isEmpty()) {
outputNode.setId(idRenamingHash.value(inputNode.id())); outputNode.setId(idRenamingHash.value(inputNode.id()));
} }
} }
@@ -82,7 +82,7 @@ static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QStri
QList<ModelNode> allNodes(modelNode.allSubModelNodes()); QList<ModelNode> allNodes(modelNode.allSubModelNodes());
allNodes.append(modelNode); allNodes.append(modelNode);
foreach (const ModelNode &node, allNodes) { foreach (const ModelNode &node, allNodes) {
if (!node.id().isNull() && !node.id().isEmpty()) { if (!node.id().isEmpty()) {
QString newId = node.id(); QString newId = node.id();
int i = 1; int i = 1;
while (view->hasId(newId) || idRenamingHash.contains(newId)) { while (view->hasId(newId) || idRenamingHash.contains(newId)) {

2
src/tools/qmldesigner/standalone/main.cpp
View File

@@ -95,7 +95,7 @@ static void parseArguments(const QStringList& argumentList, MainWindow& mainWind
qWarning() << " -f, --file open this file"; qWarning() << " -f, --file open this file";
qWarning() << " --no-resync disable rewriter"; qWarning() << " --no-resync disable rewriter";
exit(0); exit(0);
} else if (passArgumentList.contains(argumentList[i].split("=").first())) { } else if (passArgumentList.contains(argumentList[i].split('=').first())) {
} else { } else {
qWarning() << "bauhaus: unrecognized option "<< argumentList[i]; qWarning() << "bauhaus: unrecognized option "<< argumentList[i];
qWarning() << "Try `bauhaus --help'"; qWarning() << "Try `bauhaus --help'";