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

Core: Remove one IEditorFactory::addMimeType overload

Browse Source 
Not overly useful in the times of QT_RESTRICTED_CAST_FROM_ASCII

Change-Id: I87032b1da9cc4e8205d2a9c8596bc9ba832acf30
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-02-06 08:11:13 +01:00
parent 582b0216c6
commit 0b1a463c47
4 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/coreplugin/editormanager/ieditorfactory.h
View File

@@ -64,7 +64,6 @@ protected:
void setId(Id id) { m_id = id; } void setId(Id id) { m_id = id; }
void setDisplayName(const QString &displayName) { m_displayName = displayName; } void setDisplayName(const QString &displayName) { m_displayName = displayName; }
void setMimeTypes(const QStringList &mimeTypes) { m_mimeTypes = mimeTypes; } 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 addMimeType(const QString &mimeType) { m_mimeTypes.append(mimeType); }
void setEditorCreator(const std::function<IEditor *()> &creator); void setEditorCreator(const std::function<IEditor *()> &creator);

2
src/plugins/imageviewer/imageviewerfactory.cpp
View File

@@ -42,7 +42,7 @@ ImageViewerFactory::ImageViewerFactory()
const QList<QByteArray> supportedMimeTypes = QImageReader::supportedMimeTypes(); const QList<QByteArray> supportedMimeTypes = QImageReader::supportedMimeTypes();
for (const QByteArray &format : supportedMimeTypes) for (const QByteArray &format : supportedMimeTypes)
addMimeType(format.constData()); addMimeType(QString::fromLatin1(format));
} }
} // namespace Internal } // namespace Internal

2
src/plugins/vcsbase/basevcseditorfactory.cpp
View File

@@ -59,7 +59,7 @@ VcsEditorFactory::VcsEditorFactory(const VcsBaseEditorParameters *parameters,
setId(parameters->id); setId(parameters->id);
setDisplayName(QCoreApplication::translate("VCS", parameters->displayName)); setDisplayName(QCoreApplication::translate("VCS", parameters->displayName));
if (QLatin1String(parameters->mimeType) != QLatin1String(DiffEditor::Constants::DIFF_EDITOR_MIMETYPE)) if (QLatin1String(parameters->mimeType) != QLatin1String(DiffEditor::Constants::DIFF_EDITOR_MIMETYPE))
addMimeType(parameters->mimeType); addMimeType(QLatin1String(parameters->mimeType));
setEditorActionHandlers(TextEditorActionHandler::None); setEditorActionHandlers(TextEditorActionHandler::None);
setDuplicatedSupported(false); setDuplicatedSupported(false);

2
src/plugins/vcsbase/basevcssubmiteditorfactory.cpp
View File

@@ -48,7 +48,7 @@ VcsSubmitEditorFactory::VcsSubmitEditorFactory
{ {
setId(parameters.id); setId(parameters.id);
setDisplayName(QLatin1String(parameters.displayName)); setDisplayName(QLatin1String(parameters.displayName));
addMimeType(parameters.mimeType); addMimeType(QLatin1String(parameters.mimeType));
setEditorCreator([this, editorCreator, parameters] { setEditorCreator([this, editorCreator, parameters] {
VcsBaseSubmitEditor *editor = editorCreator(); VcsBaseSubmitEditor *editor = editorCreator();