From e0c76647cecb13d6afd054ec6e22cc9e66df43b2 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 28 Jan 2020 17:34:35 +0100
Subject: [PATCH] TextEditor: De-QObject-ify ICodeStylePreferences factories

Change-Id: I20fc5323c4192391ec6ac514a1b583ccb87b4796
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/plugins/nim/settings/nimcodestylepreferencesfactory.h | 2 +-
 src/plugins/texteditor/icodestylepreferencesfactory.cpp   | 3 +--
 src/plugins/texteditor/icodestylepreferencesfactory.h     | 8 +++++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/nim/settings/nimcodestylepreferencesfactory.h b/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
index e3d7ce3251b..80682156399 100644
--- a/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
+++ b/src/plugins/nim/settings/nimcodestylepreferencesfactory.h
@@ -31,7 +31,7 @@ namespace Nim {
 
 class NimCodeStylePreferencesFactory : public TextEditor::ICodeStylePreferencesFactory
 {
-    Q_OBJECT
+    Q_DECLARE_TR_FUNCTIONS(Nim::NimCodeStylePreferencesFactory)
 
 public:
     NimCodeStylePreferencesFactory();
diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.cpp b/src/plugins/texteditor/icodestylepreferencesfactory.cpp
index adeaaa6b3b4..e5efa95af05 100644
--- a/src/plugins/texteditor/icodestylepreferencesfactory.cpp
+++ b/src/plugins/texteditor/icodestylepreferencesfactory.cpp
@@ -29,8 +29,7 @@
 
 using namespace TextEditor;
 
-ICodeStylePreferencesFactory::ICodeStylePreferencesFactory(QObject *parent) :
-    QObject(parent)
+ICodeStylePreferencesFactory::ICodeStylePreferencesFactory()
 {
 }
 
diff --git a/src/plugins/texteditor/icodestylepreferencesfactory.h b/src/plugins/texteditor/icodestylepreferencesfactory.h
index f55d5913ab1..c2167d0b93d 100644
--- a/src/plugins/texteditor/icodestylepreferencesfactory.h
+++ b/src/plugins/texteditor/icodestylepreferencesfactory.h
@@ -46,11 +46,13 @@ public:
     virtual void apply() {}
 };
 
-class TEXTEDITOR_EXPORT ICodeStylePreferencesFactory : public QObject
+class TEXTEDITOR_EXPORT ICodeStylePreferencesFactory
 {
-    Q_OBJECT
+    ICodeStylePreferencesFactory(const ICodeStylePreferencesFactory &) = delete;
+    ICodeStylePreferencesFactory &operator=(const ICodeStylePreferencesFactory &) = delete;
+
 public:
-    explicit ICodeStylePreferencesFactory(QObject *parent = nullptr);
+    ICodeStylePreferencesFactory();
 
     virtual CodeStyleEditorWidget *createCodeStyleEditor(ICodeStylePreferences *codeStyle,
                                                          QWidget *parent = nullptr);