From d7ae3b79f89f91f6b15f807b5c894da7e06c3013 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 4 Feb 2020 18:16:57 +0100
Subject: Core: Make IEditorFactory::createEditor use a function object

Also, replace or remove unneeded Q_OBJECTs, and make base
setters and adders protected.

Change-Id: I212257ef53984d8852dc8c478537199fc9483486
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/imageviewer/imageviewerfactory.cpp | 8 ++------
 src/plugins/imageviewer/imageviewerfactory.h   | 7 +------
 2 files changed, 3 insertions(+), 12 deletions(-)

(limited to 'src/plugins/imageviewer')

diff --git a/src/plugins/imageviewer/imageviewerfactory.cpp b/src/plugins/imageviewer/imageviewerfactory.cpp
index a09ede55a1..4dc37a4dcd 100644
--- a/src/plugins/imageviewer/imageviewerfactory.cpp
+++ b/src/plugins/imageviewer/imageviewerfactory.cpp
@@ -38,16 +38,12 @@ ImageViewerFactory::ImageViewerFactory()
 {
     setId(Constants::IMAGEVIEWER_ID);
     setDisplayName(QCoreApplication::translate("OpenWith::Editors", Constants::IMAGEVIEWER_DISPLAY_NAME));
+    setEditorCreator([] { return new ImageViewer; });
 
     const QList<QByteArray> supportedMimeTypes = QImageReader::supportedMimeTypes();
-    foreach (const QByteArray &format, supportedMimeTypes)
+    for (const QByteArray &format : supportedMimeTypes)
         addMimeType(format.constData());
 }
 
-Core::IEditor *ImageViewerFactory::createEditor()
-{
-    return new ImageViewer();
-}
-
 } // namespace Internal
 } // namespace ImageViewer
diff --git a/src/plugins/imageviewer/imageviewerfactory.h b/src/plugins/imageviewer/imageviewerfactory.h
index b0f45a0efa..816de2ffe6 100644
--- a/src/plugins/imageviewer/imageviewerfactory.h
+++ b/src/plugins/imageviewer/imageviewerfactory.h
@@ -27,19 +27,14 @@
 #pragma once
 
 #include <coreplugin/editormanager/ieditorfactory.h>
-#include <coreplugin/editormanager/ieditor.h>
-#include <coreplugin/idocument.h>
 
 namespace ImageViewer {
 namespace Internal {
 
-class ImageViewerFactory : public Core::IEditorFactory
+class ImageViewerFactory final : public Core::IEditorFactory
 {
-    Q_OBJECT
 public:
     ImageViewerFactory();
-
-    Core::IEditor *createEditor() override;
 };
 
 } // namespace Internal
-- 
cgit v1.2.3