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

Do not mark env vars as modified if not needed.

Browse Source 
* Ignore steData calls that do not actually change any data
   in the EnvironmentEditorModel. This prevents all variables
   touched from getting marked up as changed.

Reviewed-By: con
This commit is contained in:
Tobias Hunger
2009-11-19 16:55:27 +01:00
parent 1d0758d8b1
commit e106e218d8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/projectexplorer/environmenteditmodel.cpp
View File

@@ -234,15 +234,21 @@ int EnvironmentModel::findInResultInsertPosition(const QString &name) const
bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (role == Qt::EditRole && index.isValid()) {
// ignore changes to already set values:
if (data(index, role) == value)
return true;
if (index.column() == 0) {
//fail if a variable with the same name already exists
#ifdef Q_OS_WIN
if (findInChanges(value.toString().toUpper()) != -1)
return false;
const QString &newName = value.toString().toUpper();
#else
if (findInChanges(value.toString()) != -1)
return false;
const QString &newName = value.toString();
#endif
if (findInChanges(newName) != -1)
return false;
EnvironmentItem old("", "");
if (m_mergedEnvironments) {
int pos = findInChanges(indexToVariable(index));
@@ -256,11 +262,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
} else {
old = m_items.at(index.row());
}
#ifdef Q_OS_WIN
const QString &newName = value.toString().toUpper();
#else
const QString &newName = value.toString();
#endif
if (changes(old.name))
removeVariable(old.name);
old.name = newName;