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

Core: Use QString in FileIconProvider API

Browse Source 
Prefer "const QString &" over "const char *" in the API of FileIconProvider.

That makes no more sense, now that we no longer need QLatin1String around char arrays.

Change-Id: Iaf4af25d6e3b96529586032113297754d6c9d74e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2016-11-10 15:05:05 +01:00
parent b72d579ece
commit b782b98fef
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/plugins/coreplugin/fileiconprovider.cpp
View File

@@ -191,35 +191,32 @@ QPixmap overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlay, const
Registers an icon for a given suffix, overlaying the system file icon. Registers an icon for a given suffix, overlaying the system file icon.
See platform note in class documentation about recommended usage. See platform note in class documentation about recommended usage.
*/ */
void registerIconOverlayForSuffix(const char *path, const char *suffix) void registerIconOverlayForSuffix(const QString &path, const QString &suffix)
{ {
instance()->registerIconOverlayForSuffix(QIcon(QLatin1String(path)), QLatin1String(suffix)); instance()->registerIconOverlayForSuffix(QIcon(path), suffix);
} }
/*! /*!
Registers an icon for all the suffixes of a given mime type, overlaying the system file icon. Registers an icon for all the suffixes of a given mime type, overlaying the system file icon.
*/ */
void registerIconOverlayForMimeType(const QIcon &icon, const char *mimeType) void registerIconOverlayForMimeType(const QIcon &icon, const QString &mimeType)
{ {
Utils::MimeDatabase mdb; Utils::MimeDatabase mdb;
instance()->registerIconOverlayForMimeType(icon, instance()->registerIconOverlayForMimeType(icon, mdb.mimeTypeForName(mimeType));
mdb.mimeTypeForName(QString::fromLatin1(mimeType)));
} }
/*! /*!
* \overload * \overload
*/ */
void registerIconOverlayForMimeType(const char *path, const char *mimeType) void registerIconOverlayForMimeType(const QString &path, const QString &mimeType)
{ {
Utils::MimeDatabase mdb; Utils::MimeDatabase mdb;
instance()->registerIconOverlayForMimeType(QIcon(QLatin1String(path)), instance()->registerIconOverlayForMimeType(QIcon(path), mdb.mimeTypeForName(mimeType));
mdb.mimeTypeForName(QString::fromLatin1(mimeType)));
} }
void registerIconOverlayForFilename(const char *path, const char *filename) void registerIconOverlayForFilename(const QString &path, const QString &filename)
{ {
instance()->registerIconOverlayForFilename(QIcon(QString::fromLatin1(path)), instance()->registerIconOverlayForFilename(QIcon(path), filename);
QString::fromLatin1(filename));
} }
} // namespace FileIconProvider } // namespace FileIconProvider

8
src/plugins/coreplugin/fileiconprovider.h
View File

@@ -44,10 +44,10 @@ CORE_EXPORT QIcon icon(QFileIconProvider::IconType type);
// Register additional overlay icons // Register additional overlay icons
CORE_EXPORT QPixmap overlayIcon(const QPixmap &baseIcon, const QIcon &overlayIcon); CORE_EXPORT QPixmap overlayIcon(const QPixmap &baseIcon, const QIcon &overlayIcon);
CORE_EXPORT QPixmap overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size); CORE_EXPORT QPixmap overlayIcon(QStyle::StandardPixmap baseIcon, const QIcon &overlayIcon, const QSize &size);
CORE_EXPORT void registerIconOverlayForSuffix(const char *path, const char *suffix); CORE_EXPORT void registerIconOverlayForSuffix(const QString &path, const QString &suffix);
CORE_EXPORT void registerIconOverlayForFilename(const char *path, const char *filename); CORE_EXPORT void registerIconOverlayForFilename(const QString &path, const QString &filename);
CORE_EXPORT void registerIconOverlayForMimeType(const char *path, const char *mimeType); CORE_EXPORT void registerIconOverlayForMimeType(const QString &path, const QString &mimeType);
CORE_EXPORT void registerIconOverlayForMimeType(const QIcon &icon, const char *mimeType); CORE_EXPORT void registerIconOverlayForMimeType(const QIcon &icon, const QString &mimeType);
} // namespace FileIconProvider } // namespace FileIconProvider
} // namespace Core } // namespace Core

6
src/plugins/qmakeprojectmanager/profileeditor.cpp
View File

@@ -195,11 +195,11 @@ ProFileEditorFactory::ProFileEditorFactory()
const QString defaultOverlay = QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT); const QString defaultOverlay = QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT);
Core::FileIconProvider::registerIconOverlayForSuffix( Core::FileIconProvider::registerIconOverlayForSuffix(
creatorTheme()->imageFile(Theme::IconOverlayPro, defaultOverlay).toLatin1().data(), "pro"); creatorTheme()->imageFile(Theme::IconOverlayPro, defaultOverlay), "pro");
Core::FileIconProvider::registerIconOverlayForSuffix( Core::FileIconProvider::registerIconOverlayForSuffix(
creatorTheme()->imageFile(Theme::IconOverlayPri, defaultOverlay).toLatin1().data(), "pri"); creatorTheme()->imageFile(Theme::IconOverlayPri, defaultOverlay), "pri");
Core::FileIconProvider::registerIconOverlayForSuffix( Core::FileIconProvider::registerIconOverlayForSuffix(
creatorTheme()->imageFile(Theme::IconOverlayPrf, defaultOverlay).toLatin1().data(), "prf"); creatorTheme()->imageFile(Theme::IconOverlayPrf, defaultOverlay), "prf");
} }
} // namespace Internal } // namespace Internal