From c58bf7f5b84c0d0710563b38407b26714dc1f3d1 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 6 Jul 2023 12:54:28 +0200
Subject: [PATCH] Editor: avoid accessing the widget from the FontSettingsPage

Change-Id: I51dbf4d1c7384f460b84da9602c10667addabebb
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/texteditor/fontsettingspage.cpp   | 14 ++++++++------
 src/plugins/texteditor/texteditorsettings.cpp |  1 -
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugins/texteditor/fontsettingspage.cpp b/src/plugins/texteditor/fontsettingspage.cpp
index b57e23f35b8..44889864059 100644
--- a/src/plugins/texteditor/fontsettingspage.cpp
+++ b/src/plugins/texteditor/fontsettingspage.cpp
@@ -202,6 +202,8 @@ public:
                 this, &FontSettingsPageWidget::importScheme);
         connect(exportButton, &QPushButton::clicked,
                 this, &FontSettingsPageWidget::exportScheme);
+        connect(TextEditorSettings::instance(), &TextEditorSettings::fontSettingsChanged,
+                this, &FontSettingsPageWidget::updateFontZoom);
 
         updatePointSizes();
         refreshColorSchemeList();
@@ -226,6 +228,7 @@ public:
 
     void maybeSaveColorScheme();
     void updatePointSizes();
+    void updateFontZoom(const FontSettings &fontSettings);
     QList<int> pointSizesForSelectedFont() const;
     void refreshColorSchemeList();
 
@@ -449,6 +452,11 @@ void FontSettingsPageWidget::updatePointSizes()
         m_sizeComboBox->setCurrentIndex(idx);
 }
 
+void FontSettingsPageWidget::updateFontZoom(const FontSettings &fontSettings)
+{
+    m_zoomSpinBox->setValue(fontSettings.fontZoom());
+}
+
 QList<int> FontSettingsPageWidget::pointSizesForSelectedFont() const
 {
     QFontDatabase db;
@@ -774,10 +782,4 @@ FontSettingsPage::FontSettingsPage(FontSettings *fontSettings, const FormatDescr
     setWidgetCreator([this, fontSettings, fd] { return new FontSettingsPageWidget(this, fd, fontSettings); });
 }
 
-void FontSettingsPage::setFontZoom(int zoom)
-{
-    if (m_widget)
-        static_cast<FontSettingsPageWidget *>(m_widget.data())->m_zoomSpinBox->setValue(zoom);
-}
-
 } // TextEditor
diff --git a/src/plugins/texteditor/texteditorsettings.cpp b/src/plugins/texteditor/texteditorsettings.cpp
index 5e99fcf582f..6b3ee6e7b50 100644
--- a/src/plugins/texteditor/texteditorsettings.cpp
+++ b/src/plugins/texteditor/texteditorsettings.cpp
@@ -583,7 +583,6 @@ Utils::Id TextEditorSettings::languageId(const QString &mimeType)
 
 static void setFontZoom(int zoom)
 {
-    d->m_fontSettingsPage.setFontZoom(zoom);
     d->m_fontSettings.setFontZoom(zoom);
     d->m_fontSettings.toSettings(Core::ICore::settings());
     emit m_instance->fontSettingsChanged(d->m_fontSettings);