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

Fix saving of xml files

Browse Source 
Do not save XML config files (profiles.xml, toolchains.xml, etc.)
if the file has not changed.

Change-Id: I5f0dea374b33a05e7c428f4031d53c83d92de595
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
This commit is contained in:
Tobias Hunger
2012-08-17 13:18:31 +02:00
parent 29ec32a531
commit 96d8009693
17 changed files with 214 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,8 +343,9 @@ void CodeStyleSelectorWidget::slotRemoveClicked()
void CodeStyleSelectorWidget::slotImportClicked()
{
const QString fileName = QFileDialog::getOpenFileName(this, tr("Import Code Style"), QString::null,
tr("Code styles (*.xml);;All files (*)"));
const Utils::FileName fileName =
Utils::FileName::fromString(QFileDialog::getOpenFileName(this, tr("Import Code Style"), QString::null,
tr("Code styles (*.xml);;All files (*)")));
if (!fileName.isEmpty()) {
CodeStylePool *codeStylePool = m_codeStyle->delegatingPool();
ICodeStylePreferences *importedStyle = codeStylePool->importCodeStyle(fileName);
@@ -352,7 +353,7 @@ void CodeStyleSelectorWidget::slotImportClicked()
m_codeStyle->setCurrentDelegate(importedStyle);
else
QMessageBox::warning(this, tr("Import Code Style"),
tr("Cannot import code style"));
tr("Cannot import code style from %1"), fileName.toUserOutput());
}
}
@@ -364,7 +365,7 @@ void CodeStyleSelectorWidget::slotExportClicked()
tr("Code styles (*.xml);;All files (*)"));
if (!fileName.isEmpty()) {
CodeStylePool *codeStylePool = m_codeStyle->delegatingPool();
codeStylePool->exportCodeStyle(fileName, currentPreferences);
codeStylePool->exportCodeStyle(Utils::FileName::fromString(fileName), currentPreferences);
}
}