From 0a37ff4149080204778a1e0906b6eef2464d2dd2 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 21 Jul 2023 14:23:44 +0200 Subject: [PATCH] Utils: Move some more FilePath-only functions to FilePathAspect Change-Id: Id814e69339d510e88efbf95108c7573bcc53a87b Reviewed-by: Marcus Tillmanns --- src/libs/utils/aspects.cpp | 6 +++--- src/libs/utils/aspects.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 058b2a7bdc3..8e4da2794b0 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -998,21 +998,21 @@ void StringAspect::setHistoryCompleter(const QString &historyCompleterKey) \sa Utils::PathChooser::setExpectedKind() */ -void StringAspect::setExpectedKind(const PathChooser::Kind expectedKind) +void FilePathAspect::setExpectedKind(const PathChooser::Kind expectedKind) { d->m_expectedKind = expectedKind; if (d->m_pathChooserDisplay) d->m_pathChooserDisplay->setExpectedKind(expectedKind); } -void StringAspect::setEnvironment(const Environment &env) +void FilePathAspect::setEnvironment(const Environment &env) { d->m_environment = env; if (d->m_pathChooserDisplay) d->m_pathChooserDisplay->setEnvironment(env); } -void StringAspect::setBaseFileName(const FilePath &baseFileName) +void FilePathAspect::setBaseFileName(const FilePath &baseFileName) { d->m_baseFileName = baseFileName; if (d->m_pathChooserDisplay) diff --git a/src/libs/utils/aspects.h b/src/libs/utils/aspects.h index e8cafb79b30..e9e81936738 100644 --- a/src/libs/utils/aspects.h +++ b/src/libs/utils/aspects.h @@ -494,9 +494,6 @@ public: void setDisplayFilter(const std::function &displayFilter); void setPlaceHolderText(const QString &placeHolderText); void setHistoryCompleter(const QString &historyCompleterKey); - void setExpectedKind(const PathChooser::Kind expectedKind); - void setEnvironment(const Environment &env); - void setBaseFileName(const FilePath &baseFileName); void setUndoRedoEnabled(bool readOnly); void setAcceptRichText(bool acceptRichText); void setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider); @@ -561,6 +558,9 @@ public: void setAllowPathFromDevice(bool allowPathFromDevice); void setValidatePlaceHolder(bool validatePlaceHolder); void setOpenTerminalHandler(const std::function &openTerminal); + void setExpectedKind(const PathChooser::Kind expectedKind); + void setEnvironment(const Environment &env); + void setBaseFileName(const FilePath &baseFileName); PathChooser *pathChooser() const; // Avoid to use. };