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

Utils: Wrap MimeDatabase into static functions

Browse Source 
To avoid repeating the 'MimeDatabase mdb; mdb.something(); ' mantra
all over the place.

Change-Id: I4bfef62e73275a991455141671d6071162788e9d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2017-03-02 12:07:11 +01:00
parent 2cd8378148
commit 3f5caf4cdc
51 changed files with 238 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
View File

@@ -511,9 +511,8 @@ bool QmakePriFile::addFiles(const QStringList &filePaths, QStringList *notAdded)
typedef QMap<QString, QStringList> TypeFileMap;
// Split into lists by file type and bulk-add them.
TypeFileMap typeFileMap;
Utils::MimeDatabase mdb;
foreach (const QString &file, filePaths) {
const Utils::MimeType mt = mdb.mimeTypeForFile(file);
const Utils::MimeType mt = Utils::mimeTypeForFile(file);
typeFileMap[mt.name()] << file;
}
@@ -559,9 +558,8 @@ bool QmakePriFile::removeFiles(const QStringList &filePaths,
typedef QMap<QString, QStringList> TypeFileMap;
// Split into lists by file type and bulk-add them.
TypeFileMap typeFileMap;
Utils::MimeDatabase mdb;
foreach (const QString &file, filePaths) {
const Utils::MimeType mt = mdb.mimeTypeForFile(file);
const Utils::MimeType mt = Utils::mimeTypeForFile(file);
typeFileMap[mt.name()] << file;
}
foreach (const QString &type, typeFileMap.keys()) {
@@ -587,9 +585,8 @@ bool QmakePriFile::canRenameFile(const QString &filePath, const QString &newFile
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
if (changeProFileOptional)
return true;
Utils::MimeDatabase mdb;
const Utils::MimeType mt = mdb.mimeTypeForFile(newFilePath);
const Utils::MimeType mt = Utils::mimeTypeForFile(newFilePath);
return renameFile(filePath, newFilePath, mt.name(), Change::TestOnly);
}
@@ -599,8 +596,7 @@ bool QmakePriFile::renameFile(const QString &filePath, const QString &newFilePat
return false;
bool changeProFileOptional = deploysFolder(QFileInfo(filePath).absolutePath());
Utils::MimeDatabase mdb;
const Utils::MimeType mt = mdb.mimeTypeForFile(newFilePath);
const Utils::MimeType mt = Utils::mimeTypeForFile(newFilePath);
if (renameFile(filePath, newFilePath, mt.name()))
return true;