From 0b1a463c473ee8a6846b5703c4ff659822bf6c33 Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 6 Feb 2020 08:11:13 +0100 Subject: [PATCH] Core: Remove one IEditorFactory::addMimeType overload Not overly useful in the times of QT_RESTRICTED_CAST_FROM_ASCII Change-Id: I87032b1da9cc4e8205d2a9c8596bc9ba832acf30 Reviewed-by: Eike Ziller --- src/plugins/coreplugin/editormanager/ieditorfactory.h | 1 - src/plugins/imageviewer/imageviewerfactory.cpp | 2 +- src/plugins/vcsbase/basevcseditorfactory.cpp | 2 +- src/plugins/vcsbase/basevcssubmiteditorfactory.cpp | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/coreplugin/editormanager/ieditorfactory.h b/src/plugins/coreplugin/editormanager/ieditorfactory.h index fd0e43bd42c..20a0baa0e61 100644 --- a/src/plugins/coreplugin/editormanager/ieditorfactory.h +++ b/src/plugins/coreplugin/editormanager/ieditorfactory.h @@ -64,7 +64,6 @@ protected: void setId(Id id) { m_id = id; } void setDisplayName(const QString &displayName) { m_displayName = displayName; } void setMimeTypes(const QStringList &mimeTypes) { m_mimeTypes = mimeTypes; } - void addMimeType(const char *mimeType) { m_mimeTypes.append(QLatin1String(mimeType)); } void addMimeType(const QString &mimeType) { m_mimeTypes.append(mimeType); } void setEditorCreator(const std::function &creator); diff --git a/src/plugins/imageviewer/imageviewerfactory.cpp b/src/plugins/imageviewer/imageviewerfactory.cpp index 4dc37a4dcda..d0da540cfab 100644 --- a/src/plugins/imageviewer/imageviewerfactory.cpp +++ b/src/plugins/imageviewer/imageviewerfactory.cpp @@ -42,7 +42,7 @@ ImageViewerFactory::ImageViewerFactory() const QList supportedMimeTypes = QImageReader::supportedMimeTypes(); for (const QByteArray &format : supportedMimeTypes) - addMimeType(format.constData()); + addMimeType(QString::fromLatin1(format)); } } // namespace Internal diff --git a/src/plugins/vcsbase/basevcseditorfactory.cpp b/src/plugins/vcsbase/basevcseditorfactory.cpp index 5ba38b58eb6..7f28f031be1 100644 --- a/src/plugins/vcsbase/basevcseditorfactory.cpp +++ b/src/plugins/vcsbase/basevcseditorfactory.cpp @@ -59,7 +59,7 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters, setId(parameters->id); setDisplayName(QCoreApplication::translate("VCS", parameters->displayName)); if (QLatin1String(parameters->mimeType) != QLatin1String(DiffEditor::Constants::DIFF_EDITOR_MIMETYPE)) - addMimeType(parameters->mimeType); + addMimeType(QLatin1String(parameters->mimeType)); setEditorActionHandlers(TextEditorActionHandler::None); setDuplicatedSupported(false); diff --git a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp index e99637f32bc..b6d862a6e1e 100644 --- a/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp +++ b/src/plugins/vcsbase/basevcssubmiteditorfactory.cpp @@ -48,7 +48,7 @@ VcsSubmitEditorFactory::VcsSubmitEditorFactory { setId(parameters.id); setDisplayName(QLatin1String(parameters.displayName)); - addMimeType(parameters.mimeType); + addMimeType(QLatin1String(parameters.mimeType)); setEditorCreator([this, editorCreator, parameters] { VcsBaseSubmitEditor *editor = editorCreator();