EditorFactory: Replace some virtual functions with data members

Change-Id: I014cb57460c4e3a36bf7403960908b5ffec867ff
Reviewed-by: David Schulz <david.schulz@digia.com>

2 files changed, 22 insertions, 39 deletions

diff --git a/src/plugins/imageviewer/imageviewerfactory.cpp b/src/plugins/imageviewer/imageviewerfactory.cpp
index d925ea6cc9..b77c468c1a 100644
--- a/src/plugins/imageviewer/imageviewerfactory.cpp
+++ b/src/plugins/imageviewer/imageviewerfactory.cpp
@@ -43,7 +43,6 @@ namespace Internal {
 
 struct ImageViewerFactoryPrivate
 {
-    QStringList mimeTypes;
     QPointer<ImageViewerActionHandler> actionHandler;
 };
 
@@ -51,30 +50,33 @@ ImageViewerFactory::ImageViewerFactory(QObject *parent) :
     Core::IEditorFactory(parent),
     d(new ImageViewerFactoryPrivate)
 {
+    setId(Constants::IMAGEVIEWER_ID);
+    setDisplayName(qApp->translate("OpenWith::Editors", Constants::IMAGEVIEWER_DISPLAY_NAME));
+
     d->actionHandler = new ImageViewerActionHandler(this);
 
-    QMap<QByteArray, QString> possibleMimeTypes;
-    possibleMimeTypes.insert("bmp", QLatin1String("image/bmp"));
-    possibleMimeTypes.insert("gif", QLatin1String("image/gif"));
-    possibleMimeTypes.insert("ico", QLatin1String("image/x-icon"));
-    possibleMimeTypes.insert("jpeg", QLatin1String("image/jpeg"));
-    possibleMimeTypes.insert("jpg", QLatin1String("image/jpeg"));
-    possibleMimeTypes.insert("mng", QLatin1String("video/x-mng"));
-    possibleMimeTypes.insert("pbm", QLatin1String("image/x-portable-bitmap"));
-    possibleMimeTypes.insert("pgm", QLatin1String("image/x-portable-graymap"));
-    possibleMimeTypes.insert("png", QLatin1String("image/png"));
-    possibleMimeTypes.insert("ppm", QLatin1String("image/x-portable-pixmap"));
-    possibleMimeTypes.insert("svg", QLatin1String("image/svg+xml"));
-    possibleMimeTypes.insert("tif", QLatin1String("image/tiff"));
-    possibleMimeTypes.insert("tiff", QLatin1String("image/tiff"));
-    possibleMimeTypes.insert("xbm", QLatin1String("image/xbm"));
-    possibleMimeTypes.insert("xpm", QLatin1String("image/xpm"));
+    QMap<QByteArray, const char *> possibleMimeTypes;
+    possibleMimeTypes.insert("bmp", "image/bmp");
+    possibleMimeTypes.insert("gif", "image/gif");
+    possibleMimeTypes.insert("ico", "image/x-icon");
+    possibleMimeTypes.insert("jpeg","image/jpeg");
+    possibleMimeTypes.insert("jpg", "image/jpeg");
+    possibleMimeTypes.insert("mng", "video/x-mng");
+    possibleMimeTypes.insert("pbm", "image/x-portable-bitmap");
+    possibleMimeTypes.insert("pgm", "image/x-portable-graymap");
+    possibleMimeTypes.insert("png", "image/png");
+    possibleMimeTypes.insert("ppm", "image/x-portable-pixmap");
+    possibleMimeTypes.insert("svg", "image/svg+xml");
+    possibleMimeTypes.insert("tif", "image/tiff");
+    possibleMimeTypes.insert("tiff","image/tiff");
+    possibleMimeTypes.insert("xbm", "image/xbm");
+    possibleMimeTypes.insert("xpm", "image/xpm");
 
     QList<QByteArray> supportedFormats = QImageReader::supportedImageFormats();
     foreach (const QByteArray &format, supportedFormats) {
-        const QString &value = possibleMimeTypes.value(format);
-        if (!value.isEmpty())
-            d->mimeTypes.append(value);
+        const char *value = possibleMimeTypes.value(format);
+        if (value)
+            addMimeType(value);
     }
 }
 
@@ -88,21 +90,6 @@ Core::IEditor *ImageViewerFactory::createEditor(QWidget *parent)
     return new ImageViewer(parent);
 }
 
-QStringList ImageViewerFactory::mimeTypes() const
-{
-    return d->mimeTypes;
-}
-
-Core::Id ImageViewerFactory::id() const
-{
-    return Core::Id(Constants::IMAGEVIEWER_ID);
-}
-
-QString ImageViewerFactory::displayName() const
-{
-    return qApp->translate("OpenWith::Editors", Constants::IMAGEVIEWER_DISPLAY_NAME);
-}
-
 void ImageViewerFactory::extensionsInitialized()
 {
     d->actionHandler->createActions();
diff --git a/src/plugins/imageviewer/imageviewerfactory.h b/src/plugins/imageviewer/imageviewerfactory.h
index 77d372a265..a4200013ca 100644
--- a/src/plugins/imageviewer/imageviewerfactory.h
+++ b/src/plugins/imageviewer/imageviewerfactory.h
@@ -47,10 +47,6 @@ public:
 
     Core::IEditor *createEditor(QWidget *parent);
 
-    QStringList mimeTypes() const;
-    Core::Id id() const;
-    QString displayName() const;
-
     void extensionsInitialized();
 
 private: