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

Prohibit empty id in code style pool

Browse Source 
Task-number: QTCREATORBUG-6966

Change-Id: Ia4ce2f1085d3e683cbe0fa6adb38b56d4b5acb15
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
This commit is contained in:
Jarek Kobus
2012-03-02 13:47:04 +01:00
parent 399e1212a6
commit 58402cc7a9
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/texteditor/codestylepool.cpp
View File

@@ -69,7 +69,7 @@ public:
QString CodeStylePoolPrivate::generateUniqueId(const QString &id) const QString CodeStylePoolPrivate::generateUniqueId(const QString &id) const
{ {
if (!m_idToCodeStyle.contains(id)) if (!id.isEmpty() && !m_idToCodeStyle.contains(id))
return id; return id;
int idx = id.size(); int idx = id.size();
@@ -80,7 +80,7 @@ QString CodeStylePoolPrivate::generateUniqueId(const QString &id) const
} }
const QString baseName = id.left(idx); const QString baseName = id.left(idx);
QString newName = baseName; QString newName = baseName.isEmpty() ? QLatin1String("codestyle") : baseName;
int i = 2; int i = 2;
while (m_idToCodeStyle.contains(newName)) while (m_idToCodeStyle.contains(newName))
newName = baseName + QString::number(i++); newName = baseName + QString::number(i++);

1
src/plugins/texteditor/codestyleselectorwidget.cpp
View File

@@ -117,6 +117,7 @@ CodeStyleDialog::CodeStyleDialog(ICodeStylePreferencesFactory *factory,
m_codeStyle = factory->createCodeStyle(); m_codeStyle = factory->createCodeStyle();
m_codeStyle->setTabSettings(codeStyle->tabSettings()); m_codeStyle->setTabSettings(codeStyle->tabSettings());
m_codeStyle->setValue(codeStyle->value()); m_codeStyle->setValue(codeStyle->value());
m_codeStyle->setId(codeStyle->id());
m_codeStyle->setDisplayName(m_originalDisplayName); m_codeStyle->setDisplayName(m_originalDisplayName);
QWidget *editor = factory->createEditor(m_codeStyle, this); QWidget *editor = factory->createEditor(m_codeStyle, this);