From 04162ba29129e3e17711e7d078ac1d555e63d3b8 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 6 Jul 2023 14:53:26 +0200
Subject: [PATCH] Utils: Move some FilePath specific functions

... from StringAspect to FilePathAspect.

Task-number: QTCREATORBUG-29167
Change-Id: I6fc3bc22f905825443ebc31ebe44e7c27fdbcb56
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
---
 src/libs/utils/aspects.cpp | 12 ++++++------
 src/libs/utils/aspects.h   | 13 +++++++------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp
index a7007cccc5f..ab245890e84 100644
--- a/src/libs/utils/aspects.cpp
+++ b/src/libs/utils/aspects.cpp
@@ -923,35 +923,35 @@ void StringAspect::setPlaceHolderText(const QString &placeHolderText)
         d->m_textEditDisplay->setPlaceholderText(placeHolderText);
 }
 
-void StringAspect::setPromptDialogFilter(const QString &filter)
+void FilePathAspect::setPromptDialogFilter(const QString &filter)
 {
     d->m_prompDialogFilter = filter;
     if (d->m_pathChooserDisplay)
         d->m_pathChooserDisplay->setPromptDialogFilter(filter);
 }
 
-void StringAspect::setPromptDialogTitle(const QString &title)
+void FilePathAspect::setPromptDialogTitle(const QString &title)
 {
     d->m_prompDialogTitle = title;
     if (d->m_pathChooserDisplay)
         d->m_pathChooserDisplay->setPromptDialogTitle(title);
 }
 
-void StringAspect::setCommandVersionArguments(const QStringList &arguments)
+void FilePathAspect::setCommandVersionArguments(const QStringList &arguments)
 {
     d->m_commandVersionArguments = arguments;
     if (d->m_pathChooserDisplay)
         d->m_pathChooserDisplay->setCommandVersionArguments(arguments);
 }
 
-void StringAspect::setAllowPathFromDevice(bool allowPathFromDevice)
+void FilePathAspect::setAllowPathFromDevice(bool allowPathFromDevice)
 {
     d->m_allowPathFromDevice = allowPathFromDevice;
     if (d->m_pathChooserDisplay)
         d->m_pathChooserDisplay->setAllowPathFromDevice(allowPathFromDevice);
 }
 
-void StringAspect::setValidatePlaceHolder(bool validatePlaceHolder)
+void FilePathAspect::setValidatePlaceHolder(bool validatePlaceHolder)
 {
     d->m_validatePlaceHolder = validatePlaceHolder;
     if (d->m_pathChooserDisplay)
@@ -1047,7 +1047,7 @@ void StringAspect::setValidationFunction(const FancyLineEdit::ValidationFunction
         d->m_pathChooserDisplay->setValidationFunction(*d->m_validator);
 }
 
-void StringAspect::setOpenTerminalHandler(const std::function<void ()> &openTerminal)
+void FilePathAspect::setOpenTerminalHandler(const std::function<void ()> &openTerminal)
 {
     d->m_openTerminal = openTerminal;
     if (d->m_pathChooserDisplay)
diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h
index 0441c77399c..fc3500dd747 100644
--- a/src/libs/utils/aspects.h
+++ b/src/libs/utils/aspects.h
@@ -464,9 +464,6 @@ public:
 
     void setDisplayFilter(const std::function<QString (const QString &)> &displayFilter);
     void setPlaceHolderText(const QString &placeHolderText);
-    void setPromptDialogFilter(const QString &filter);
-    void setPromptDialogTitle(const QString &title);
-    void setCommandVersionArguments(const QStringList &arguments);
     void setHistoryCompleter(const QString &historyCompleterKey);
     void setExpectedKind(const PathChooser::Kind expectedKind);
     void setEnvironment(const Environment &env);
@@ -477,11 +474,8 @@ public:
     void setUseGlobalMacroExpander();
     void setUseResetButton();
     void setValidationFunction(const FancyLineEdit::ValidationFunction &validator);
-    void setOpenTerminalHandler(const std::function<void()> &openTerminal);
     void setAutoApplyOnEditingFinished(bool applyOnEditingFinished);
     void setElideMode(Qt::TextElideMode elideMode);
-    void setAllowPathFromDevice(bool allowPathFromDevice);
-    void setValidatePlaceHolder(bool validatePlaceHolder);
 
     void validateInput();
 
@@ -527,6 +521,13 @@ public:
     FilePath operator()() const { return filePath(); }
     void setValue(const FilePath &filePath);
     void setDefaultValue(const FilePath &filePath);
+
+    void setPromptDialogFilter(const QString &filter);
+    void setPromptDialogTitle(const QString &title);
+    void setCommandVersionArguments(const QStringList &arguments);
+    void setAllowPathFromDevice(bool allowPathFromDevice);
+    void setValidatePlaceHolder(bool validatePlaceHolder);
+    void setOpenTerminalHandler(const std::function<void()> &openTerminal);
 };
 
 class QTCREATOR_UTILS_EXPORT IntegerAspect : public TypedAspect<qint64>