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

Fix id naming for pasting

Browse Source
This commit is contained in:
Marco Bubke
2010-02-10 15:15:04 +01:00
parent 6ac458418b
commit a426ddada6
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,16 +81,20 @@ static void syncId(ModelNode &outputNode, const ModelNode &inputNode, const QHas
static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int *number) static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int *number)
{ {
QRegExp regularExpression("(.*)(\\d*)");
// regularExpression.setMinimal(true);
regularExpression.setPatternSyntax(QRegExp::RegExp2);
regularExpression.indexIn(id);
QStringList splitedList = regularExpression.capturedTexts();
*baseId = regularExpression.cap(1); int counter = 0;
while(counter < id.count()) {
bool canConvertToInteger = false;
int newNumber = id.right(counter +1).toInt(&canConvertToInteger);
if (canConvertToInteger)
*number = newNumber;
else
break;
counter++;
}
qDebug() <<splitedList; *baseId = id.left(id.count() - counter);
} }
static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QString> &idRenamingHash, AbstractView *view) static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QString> &idRenamingHash, AbstractView *view)
@@ -105,10 +109,10 @@ static void setupIdRenamingHash(const ModelNode &modelNode, QHash<QString, QStri
splitIdInBaseNameAndNumber(newId, &baseId, &number); splitIdInBaseNameAndNumber(newId, &baseId, &number);
while (view->hasId(newId) || idRenamingHash.contains(newId)) { while (view->hasId(newId) || idRenamingHash.contains(newId)) {
newId = baseId + QString::number(number);
newId = baseId + QString::number(number).toLower();
number++; number++;
} }
idRenamingHash.insert(node.id(), newId); idRenamingHash.insert(node.id(), newId);
} }
} }