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

Fix duplicate mime types in the user file

Browse Source 
Also avoid writing the file on every apply and do it
only when the dialog is finished.

Reset can still be improved to take effect immediately.

Reviewed-by: con
This commit is contained in:
Leandro Melo
2011-04-06 11:47:48 +02:00
parent cad1c094f5
commit dc25adbe67
2 changed files with 46 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/coreplugin/mimedatabase.cpp
View File

@@ -1554,9 +1554,15 @@ QList<MimeType> MimeDatabasePrivate::readUserModifiedMimeTypes()
void MimeDatabasePrivate::writeUserModifiedMimeTypes(const QList<MimeType> &mimeTypes)
{
// Keep mime types modified which are already on file.
// Keep mime types modified which are already on file, unless they are part of the current set.
QSet<QString> currentMimeTypes;
foreach (const MimeType &mimeType, mimeTypes)
currentMimeTypes.insert(mimeType.type());
const QList<MimeType> &inFileMimeTypes = readUserModifiedMimeTypes();
QList<MimeType> allModifiedMimeTypes = mimeTypes;
allModifiedMimeTypes.append(readUserModifiedMimeTypes());
foreach (const MimeType &mimeType, inFileMimeTypes)
if (!currentMimeTypes.contains(mimeType.type()))
allModifiedMimeTypes.append(mimeType);
if (QFile::exists(kModifiedMimeTypesPath) || QDir().mkpath(kModifiedMimeTypesPath)) {
QFile file(kModifiedMimeTypesPath + kModifiedMimeTypesFile);