diff --git a/src/plugins/coreplugin/fileiconprovider.cpp b/src/plugins/coreplugin/fileiconprovider.cpp index ee66a5777f5..b216b41248d 100644 --- a/src/plugins/coreplugin/fileiconprovider.cpp +++ b/src/plugins/coreplugin/fileiconprovider.cpp @@ -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. 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. */ -void registerIconOverlayForMimeType(const QIcon &icon, const char *mimeType) +void registerIconOverlayForMimeType(const QIcon &icon, const QString &mimeType) { Utils::MimeDatabase mdb; - instance()->registerIconOverlayForMimeType(icon, - mdb.mimeTypeForName(QString::fromLatin1(mimeType))); + instance()->registerIconOverlayForMimeType(icon, mdb.mimeTypeForName(mimeType)); } /*! * \overload */ -void registerIconOverlayForMimeType(const char *path, const char *mimeType) +void registerIconOverlayForMimeType(const QString &path, const QString &mimeType) { Utils::MimeDatabase mdb; - instance()->registerIconOverlayForMimeType(QIcon(QLatin1String(path)), - mdb.mimeTypeForName(QString::fromLatin1(mimeType))); + instance()->registerIconOverlayForMimeType(QIcon(path), mdb.mimeTypeForName(mimeType)); } -void registerIconOverlayForFilename(const char *path, const char *filename) +void registerIconOverlayForFilename(const QString &path, const QString &filename) { - instance()->registerIconOverlayForFilename(QIcon(QString::fromLatin1(path)), - QString::fromLatin1(filename)); + instance()->registerIconOverlayForFilename(QIcon(path), filename); } } // namespace FileIconProvider diff --git a/src/plugins/coreplugin/fileiconprovider.h b/src/plugins/coreplugin/fileiconprovider.h index c31ceae3352..dc7f57c2996 100644 --- a/src/plugins/coreplugin/fileiconprovider.h +++ b/src/plugins/coreplugin/fileiconprovider.h @@ -44,10 +44,10 @@ CORE_EXPORT QIcon icon(QFileIconProvider::IconType type); // Register additional overlay icons 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 void registerIconOverlayForSuffix(const char *path, const char *suffix); -CORE_EXPORT void registerIconOverlayForFilename(const char *path, const char *filename); -CORE_EXPORT void registerIconOverlayForMimeType(const char *path, const char *mimeType); -CORE_EXPORT void registerIconOverlayForMimeType(const QIcon &icon, const char *mimeType); +CORE_EXPORT void registerIconOverlayForSuffix(const QString &path, const QString &suffix); +CORE_EXPORT void registerIconOverlayForFilename(const QString &path, const QString &filename); +CORE_EXPORT void registerIconOverlayForMimeType(const QString &path, const QString &mimeType); +CORE_EXPORT void registerIconOverlayForMimeType(const QIcon &icon, const QString &mimeType); } // namespace FileIconProvider } // namespace Core diff --git a/src/plugins/qmakeprojectmanager/profileeditor.cpp b/src/plugins/qmakeprojectmanager/profileeditor.cpp index ac2b0f0e298..d9e12423598 100644 --- a/src/plugins/qmakeprojectmanager/profileeditor.cpp +++ b/src/plugins/qmakeprojectmanager/profileeditor.cpp @@ -195,11 +195,11 @@ ProFileEditorFactory::ProFileEditorFactory() const QString defaultOverlay = QLatin1String(ProjectExplorer::Constants::FILEOVERLAY_QT); Core::FileIconProvider::registerIconOverlayForSuffix( - creatorTheme()->imageFile(Theme::IconOverlayPro, defaultOverlay).toLatin1().data(), "pro"); + creatorTheme()->imageFile(Theme::IconOverlayPro, defaultOverlay), "pro"); Core::FileIconProvider::registerIconOverlayForSuffix( - creatorTheme()->imageFile(Theme::IconOverlayPri, defaultOverlay).toLatin1().data(), "pri"); + creatorTheme()->imageFile(Theme::IconOverlayPri, defaultOverlay), "pri"); Core::FileIconProvider::registerIconOverlayForSuffix( - creatorTheme()->imageFile(Theme::IconOverlayPrf, defaultOverlay).toLatin1().data(), "prf"); + creatorTheme()->imageFile(Theme::IconOverlayPrf, defaultOverlay), "prf"); } } // namespace Internal