summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/filemanager.cpp
diff options
context:
space:
mode:
authorwongk <kris.p.wong@gmail.com>2011-11-02 12:44:31 -0400
committerEike Ziller <eike.ziller@nokia.com>2011-11-03 14:17:36 +0100
commit00ce839d0366eaac9a2c28e6bff2a407e47cbdb1 (patch)
tree9983d9a69713da5f212d401222e90f5b49bb3deb /src/plugins/coreplugin/filemanager.cpp
parenta037609c3f88046276a4e1f9420c71226a9faa4a (diff)
downloadqt-creator-00ce839d0366eaac9a2c28e6bff2a407e47cbdb1.tar.gz
If user cancels save file prompt, cancel entire action.
Task-Number: QTCREATORBUG-6440 Change-Id: I8807de53b1a05a0abd57c140dab5ba8df441efd5 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/plugins/coreplugin/filemanager.cpp')
-rw-r--r--src/plugins/coreplugin/filemanager.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/filemanager.cpp b/src/plugins/coreplugin/filemanager.cpp
index 1aef4afdfe..22c0a79a8f 100644
--- a/src/plugins/coreplugin/filemanager.cpp
+++ b/src/plugins/coreplugin/filemanager.cpp
@@ -527,11 +527,12 @@ void FileManager::updateExpectedState(const QString &fileName)
/*!
\fn QList<IFile*> FileManager::saveModifiedFilesSilently(const QList<IFile*> &files)
- Tries to save the files listed in \a files . Returns the files that could not be saved.
+ Tries to save the files listed in \a files. The \a cancelled argument is set to true
+ if the user cancelled the dialog. Returns the files that could not be saved.
*/
-QList<IFile *> FileManager::saveModifiedFilesSilently(const QList<IFile *> &files)
+QList<IFile *> FileManager::saveModifiedFilesSilently(const QList<IFile *> &files, bool *cancelled)
{
- return saveModifiedFiles(files, 0, true, QString());
+ return saveModifiedFiles(files, cancelled, true, QString());
}
/*!