From 364a3b12885530e39bc5fb8bf6a754ef46043468 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 15 Nov 2013 14:33:38 +0100 Subject: [PATCH] WIP: temporarily disable file icons Change-Id: I482fb6f3dec579f1022861e2ecd24fc52cf36bf1 --- src/plugins/coreplugin/fileiconprovider.cpp | 35 +++++++++++++++-------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index b136f82..2e20fb7 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -125,23 +125,24 @@ QFileIconProvider *iconProvider() QIcon FileIconProviderImplementation::icon(const QFileInfo &fileInfo) const { - if (debug) - qDebug() << "FileIconProvider::icon" << fileInfo.absoluteFilePath(); - // Check for cached overlay icons by file suffix. - if (!m_cache.isEmpty() && !fileInfo.isDir()) { - const QString suffix = fileInfo.suffix(); - if (!suffix.isEmpty()) { - for (int i = 0, n = m_cache.size(); i != n; ++i) - if (m_cache.at(i).first == suffix) - return m_cache[i].second; - } - } - // Get icon from OS. - if (HostOsInfo::isWindowsHost() || HostOsInfo::isMacHost()) - return QFileIconProvider::icon(fileInfo); - - // File icons are unknown on linux systems. - return fileInfo.isDir() ? QFileIconProvider::icon(fileInfo) : m_unknownFileIcon; + return QIcon(); +// if (debug) +// qDebug() << "FileIconProvider::icon" << fileInfo.absoluteFilePath(); +// // Check for cached overlay icons by file suffix. +// if (!m_cache.isEmpty() && !fileInfo.isDir()) { +// const QString suffix = fileInfo.suffix(); +// if (!suffix.isEmpty()) { +// for (int i = 0, n = m_cache.size(); i != n; ++i) +// if (m_cache.at(i).first == suffix) +// return m_cache[i].second; +// } +// } +// // Get icon from OS. +// if (HostOsInfo::isWindowsHost() || HostOsInfo::isMacHost()) +// return QFileIconProvider::icon(fileInfo); + +// // File icons are unknown on linux systems. +// return fileInfo.isDir() ? QFileIconProvider::icon(fileInfo) : m_unknownFileIcon; } /*! -- 1.8.3.4 (Apple Git-47)