From 337e27eb5364bea8fad6e7e3e12a0503c1dc1f4b Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 14 Jul 2023 08:30:32 +0200
Subject: [PATCH] Utils: Clean up {namevalue,environment}dialog.h

Change-Id: I84b959e4b78a39dfa421bc0f9cedcf33bc358984
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/libs/utils/environmentdialog.h  |  8 +++-----
 src/libs/utils/namevaluesdialog.cpp | 16 +++++++++++++++-
 src/libs/utils/namevaluesdialog.h   | 23 ++---------------------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/src/libs/utils/environmentdialog.h b/src/libs/utils/environmentdialog.h
index 5c60f3d2a09..335ba7ffe58 100644
--- a/src/libs/utils/environmentdialog.h
+++ b/src/libs/utils/environmentdialog.h
@@ -7,18 +7,16 @@
 
 #include "environmentfwd.h"
 #include "namevaluesdialog.h"
-#include <thread>
 
 namespace Utils {
 
 class QTCREATOR_UTILS_EXPORT EnvironmentDialog : public NameValuesDialog
 {
-    Q_OBJECT
 public:
     static std::optional<EnvironmentItems> getEnvironmentItems(QWidget *parent = nullptr,
-                                                                 const EnvironmentItems &initial = {},
-                                                                 const QString &placeholderText = {},
-                                                                 Polisher polish = {});
+                                                                const EnvironmentItems &initial = {},
+                                                                const QString &placeholderText = {},
+                                                                Polisher polish = {});
 };
 
 } // namespace Utils
diff --git a/src/libs/utils/namevaluesdialog.cpp b/src/libs/utils/namevaluesdialog.cpp
index dfd64370770..51403f534eb 100644
--- a/src/libs/utils/namevaluesdialog.cpp
+++ b/src/libs/utils/namevaluesdialog.cpp
@@ -15,7 +15,6 @@
 #include <QVBoxLayout>
 
 namespace Utils {
-
 namespace Internal {
 
 static EnvironmentItems cleanUp(const EnvironmentItems &items)
@@ -35,6 +34,20 @@ static EnvironmentItems cleanUp(const EnvironmentItems &items)
     return uniqueItems;
 }
 
+class NameValueItemsWidget : public QWidget
+{
+public:
+    explicit NameValueItemsWidget(QWidget *parent = nullptr);
+
+    void setEnvironmentItems(const EnvironmentItems &items);
+    EnvironmentItems environmentItems() const;
+
+    void setPlaceholderText(const QString &text);
+
+private:
+    QPlainTextEdit *m_editor;
+};
+
 NameValueItemsWidget::NameValueItemsWidget(QWidget *parent)
     : QWidget(parent)
 {
@@ -63,6 +76,7 @@ void NameValueItemsWidget::setPlaceholderText(const QString &text)
 {
     m_editor->setPlaceholderText(text);
 }
+
 } // namespace Internal
 
 NameValuesDialog::NameValuesDialog(const QString &windowTitle, const QString &helpText, QWidget *parent)
diff --git a/src/libs/utils/namevaluesdialog.h b/src/libs/utils/namevaluesdialog.h
index ad1795d503e..deb54b70538 100644
--- a/src/libs/utils/namevaluesdialog.h
+++ b/src/libs/utils/namevaluesdialog.h
@@ -13,32 +13,14 @@
 #include <memory>
 #include <optional>
 
-QT_BEGIN_NAMESPACE
-class QPlainTextEdit;
-QT_END_NAMESPACE
-
 namespace Utils {
 
-namespace Internal {
-class NameValueItemsWidget : public QWidget
-{
-    Q_OBJECT
-public:
-    explicit NameValueItemsWidget(QWidget *parent = nullptr);
-
-    void setEnvironmentItems(const EnvironmentItems &items);
-    EnvironmentItems environmentItems() const;
-
-    void setPlaceholderText(const QString &text);
-
-private:
-    QPlainTextEdit *m_editor;
-};
-} // namespace Internal
+namespace Internal { class NameValueItemsWidget; }
 
 class QTCREATOR_UTILS_EXPORT NameValuesDialog : public QDialog
 {
     Q_OBJECT
+
 public:
     void setNameValueItems(const NameValueItems &items);
     NameValueItems nameValueItems() const;
@@ -52,7 +34,6 @@ public:
                                                              Polisher polish = {},
                                                              const QString &windowTitle = {},
                                                              const QString &helpText = {});
-
 protected:
     explicit NameValuesDialog(const QString &windowTitle,
                               const QString &helpText,