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

minor optimization: QList::removeOne() returns a bool

Browse Source
This commit is contained in:
Oswald Buddenhagen
2011-04-14 20:13:08 +02:00
parent 9e7a4c7d4f
commit dc13acd5de
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -401,11 +401,8 @@ void FileManager::fileDestroyed(QObject *obj)
{
IFile *file = static_cast<IFile*>(obj);
// Check the special unwatched first:
if (d->m_filesWithoutWatch.contains(file)) {
d->m_filesWithoutWatch.removeOne(file);
return;
}
removeFileInfo(file);
if (!d->m_filesWithoutWatch.removeOne(file))
removeFileInfo(file);
}
/*!
@@ -420,14 +417,10 @@ void FileManager::removeFile(IFile *file)
QTC_ASSERT(file, return);
// Special casing unwatched files
if (d->m_filesWithoutWatch.contains(file)) {
disconnect(file, SIGNAL(destroyed(QObject *)), this, SLOT(fileDestroyed(QObject *)));
d->m_filesWithoutWatch.removeOne(file);
return;
if (!d->m_filesWithoutWatch.removeOne(file)) {
removeFileInfo(file);
disconnect(file, SIGNAL(changed()), this, SLOT(checkForNewFileName()));
}
removeFileInfo(file);
disconnect(file, SIGNAL(changed()), this, SLOT(checkForNewFileName()));
disconnect(file, SIGNAL(destroyed(QObject *)), this, SLOT(fileDestroyed(QObject *)));
}