feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Move some more FilePath-only functions to FilePathAspect

Browse Source 
Change-Id: Id814e69339d510e88efbf95108c7573bcc53a87b
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-07-21 14:23:44 +02:00
parent d08a6070b9
commit 0a37ff4149
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/libs/utils/aspects.cpp
View File

@@ -998,21 +998,21 @@ void StringAspect::setHistoryCompleter(const QString &historyCompleterKey)
\sa Utils::PathChooser::setExpectedKind() \sa Utils::PathChooser::setExpectedKind()
*/ */
void StringAspect::setExpectedKind(const PathChooser::Kind expectedKind) void FilePathAspect::setExpectedKind(const PathChooser::Kind expectedKind)
{ {
d->m_expectedKind = expectedKind; d->m_expectedKind = expectedKind;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)
d->m_pathChooserDisplay->setExpectedKind(expectedKind); d->m_pathChooserDisplay->setExpectedKind(expectedKind);
} }
void StringAspect::setEnvironment(const Environment &env) void FilePathAspect::setEnvironment(const Environment &env)
{ {
d->m_environment = env; d->m_environment = env;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)
d->m_pathChooserDisplay->setEnvironment(env); d->m_pathChooserDisplay->setEnvironment(env);
} }
void StringAspect::setBaseFileName(const FilePath &baseFileName) void FilePathAspect::setBaseFileName(const FilePath &baseFileName)
{ {
d->m_baseFileName = baseFileName; d->m_baseFileName = baseFileName;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)

6
src/libs/utils/aspects.h
View File

@@ -494,9 +494,6 @@ public:
void setDisplayFilter(const std::function<QString (const QString &)> &displayFilter); void setDisplayFilter(const std::function<QString (const QString &)> &displayFilter);
void setPlaceHolderText(const QString &placeHolderText); void setPlaceHolderText(const QString &placeHolderText);
void setHistoryCompleter(const QString &historyCompleterKey); 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 setUndoRedoEnabled(bool readOnly);
void setAcceptRichText(bool acceptRichText); void setAcceptRichText(bool acceptRichText);
void setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider); void setMacroExpanderProvider(const MacroExpanderProvider &expanderProvider);
@@ -561,6 +558,9 @@ public:
void setAllowPathFromDevice(bool allowPathFromDevice); void setAllowPathFromDevice(bool allowPathFromDevice);
void setValidatePlaceHolder(bool validatePlaceHolder); void setValidatePlaceHolder(bool validatePlaceHolder);
void setOpenTerminalHandler(const std::function<void()> &openTerminal); void setOpenTerminalHandler(const std::function<void()> &openTerminal);
void setExpectedKind(const PathChooser::Kind expectedKind);
void setEnvironment(const Environment &env);
void setBaseFileName(const FilePath &baseFileName);
PathChooser *pathChooser() const; // Avoid to use. PathChooser *pathChooser() const; // Avoid to use.
}; };