Copilot: Merge copilotoptionspagewidget.{h,cpp} into copilotoptionspage.cpp

Too small to be worth a translation unit. Also drop unnecessary Q_OBJECT.

Change-Id: Ife1bce6498eae81e2979c2798f8d4f19da16a11d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>

src/plugins/copilot/CMakeLists.txt

@@ -7,7 +7,6 @@ add_qtc_plugin(Copilot
     copilotclient.cpp copilotclient.h
     copilotsettings.cpp copilotsettings.h
     copilotoptionspage.cpp copilotoptionspage.h
-    copilotoptionspagewidget.cpp copilotoptionspagewidget.h
     documentwatcher.cpp documentwatcher.h
     requests/getcompletions.h
     requests/checkstatus.h

src/plugins/copilot/copilot.qbs

@@ -19,8 +19,6 @@ QtcPlugin {
         "copilotsettings.h",
         "copilotoptionspage.cpp",
         "copilotoptionspage.h",
-        "copilotoptionspagewidget.cpp",
-        "copilotoptionspagewidget.h",
         "documentwatcher.cpp",
         "documentwatcher.h",
         "requests/getcompletions.h",

src/plugins/copilot/copilotoptionspage.cpp

@@ -3,13 +3,41 @@
 
 #include "copilotoptionspage.h"
 
-#include "copilotoptionspagewidget.h"
+#include "authwidget.h"
+#include "copilotsettings.h"
 #include "copilotsettings.h"
 
 #include <coreplugin/icore.h>
 
+#include <utils/layoutbuilder.h>
+#include <utils/pathchooser.h>
+
+using namespace Utils;
+using namespace LanguageClient;
+
 namespace Copilot {
 
+class CopilotOptionsPageWidget : public QWidget
+{
+public:
+    CopilotOptionsPageWidget(QWidget *parent = nullptr)
+        : QWidget(parent)
+    {
+        using namespace Layouting;
+
+        auto authWidget = new AuthWidget();
+
+        // clang-format off
+        Column {
+            authWidget, br,
+            CopilotSettings::instance().nodeJsPath, br,
+            CopilotSettings::instance().distPath, br,
+            st
+        }.attachTo(this);
+        // clang-format on
+    }
+};
+
 CopilotOptionsPage::CopilotOptionsPage()
 {
     setId("Copilot.General");

src/plugins/copilot/copilotoptionspagewidget.cpp

@@ -1,36 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
-
-#include "copilotoptionspagewidget.h"
-
-#include "authwidget.h"
-#include "copilotsettings.h"
-
-#include <utils/layoutbuilder.h>
-#include <utils/pathchooser.h>
-
-using namespace Utils;
-using namespace LanguageClient;
-
-namespace Copilot {
-
-CopilotOptionsPageWidget::CopilotOptionsPageWidget(QWidget *parent)
-    : QWidget(parent)
-{
-    using namespace Layouting;
-
-    auto authWdgt = new AuthWidget();
-
-    // clang-format off
-    Column {
-        authWdgt, br,
-        CopilotSettings::instance().nodeJsPath, br,
-        CopilotSettings::instance().distPath, br,
-        st
-    }.attachTo(this);
-    // clang-format on
-}
-
-CopilotOptionsPageWidget::~CopilotOptionsPageWidget() = default;
-
-} // namespace Copilot

src/plugins/copilot/copilotoptionspagewidget.h

@@ -1,16 +0,0 @@
-// Copyright (C) 2023 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <QWidget>
-
-namespace Copilot {
-class CopilotOptionsPageWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    CopilotOptionsPageWidget(QWidget *parent = nullptr);
-    ~CopilotOptionsPageWidget() override;
-};
-} // namespace Copilot