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

3
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -486,8 +486,7 @@ QList<ProjectExplorer::BuildInfo *> CMakeBuildConfigurationFactory::availableBui
int CMakeBuildConfigurationFactory::priority(const ProjectExplorer::Kit *k, const QString &projectPath) const
{
Utils::MimeDatabase mdb;
if (k && mdb.mimeTypeForFile(projectPath).matchesName(QLatin1String(Constants::CMAKEPROJECTMIMETYPE)))
if (k && Utils::mimeTypeForFile(projectPath).matchesName(Constants::CMAKEPROJECTMIMETYPE))
return 0;
return -1;
}

8
src/plugins/cmakeprojectmanager/treescanner.cpp
View File

@@ -170,14 +170,12 @@ void TreeScanner::scanForFiles(FutureInterface *fi, const Utils::FileName& direc
{
std::unique_ptr<FutureInterface> fip(fi);
fip->reportStarted();
Utils::MimeDatabase mdb;
Result nodes
= FileNode::scanForFiles(directory,
[&mdb,&filter,&factory](const Utils::FileName &fn) -> FileNode * {
Result nodes = FileNode::scanForFiles(directory,
[&filter, &factory](const Utils::FileName &fn) -> FileNode * {
QTC_ASSERT(!fn.isEmpty(), return nullptr);
const Utils::MimeType mimeType = mdb.mimeTypeForFile(fn.toString());
const Utils::MimeType mimeType = Utils::mimeTypeForFile(fn.toString());
// Skip some files during scan.
// Filter out nullptr records after.