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

file manager: introduce saveFile() and remove blockFileChange() & unblockFileChange()

Browse Source 
this replaces the ever-repeating idiom block/save/unblock with a single
call.
This commit is contained in:
Oswald Buddenhagen
2011-03-30 12:38:12 +02:00
parent 9a89f573e0
commit e35fe2a770
10 changed files with 33 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/plugins/coreplugin/filemanager.cpp
View File

@@ -496,39 +496,6 @@ QList<IFile *> FileManager::modifiedFiles() const
return modifiedFiles;
}
/*!
\fn void FileManager::blockFileChange(IFile *file)
Blocks the monitoring of the file the \a file argument points to.
*/
void FileManager::blockFileChange(IFile *file)
{
// Nothing to do
Q_UNUSED(file);
}
/*!
\fn void FileManager::unblockFileChange(IFile *file)
Enables the monitoring of the file the \a file argument points to, and update the status of the corresponding IFile's.
*/
void FileManager::unblockFileChange(IFile *file)
{
// We are updating the lastUpdated time to the current modification time
// in changedFile we'll compare the modification time with the last updated
// time, and if they are the same, then we don't deliver that notification
// to corresponding IFile
//
// Also we are updating the expected time of the file
// in changedFile we'll check if the modification time
// is the same as the saved one here
// If so then it's a expected change
updateFileInfo(file);
foreach (const QString &fileName, d->m_filesWithWatch.value(file))
updateExpectedState(fileName);
}
/*!
\fn void FileManager::expectFileChange(const QString &fileName)
@@ -671,6 +638,26 @@ QList<IFile *> FileManager::saveModifiedFiles(const QList<IFile *> &files,
return notSaved;
}
bool FileManager::saveFile(IFile *file, const QString &fileName)
{
const bool success = file->save(fileName);
// We are updating the lastUpdated time to the current modification time
// in changedFile we'll compare the modification time with the last updated
// time, and if they are the same, then we don't deliver that notification
// to corresponding IFile
//
// Also we are updating the expected time of the file
// in changedFile we'll check if the modification time
// is the same as the saved one here
// If so then it's a expected change
updateFileInfo(file);
foreach (const QString &fileName, d->m_filesWithWatch.value(file))
updateExpectedState(fileName);
return success;
}
QString FileManager::getSaveFileName(const QString &title, const QString &pathIn,
const QString &filter, QString *selectedFilter)
{
@@ -1041,9 +1028,7 @@ void FileManager::checkForReload()
QMapIterator<IFile *, QString> it(filesToSave);
while (it.hasNext()) {
it.next();
blockFileChange(it.key());
it.key()->save(it.value());
unblockFileChange(it.key());
saveFile(it.key(), it.value());
it.key()->checkPermissions();
}