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

Utils: Move some FilePath specific functions

Browse Source 
... from StringAspect to FilePathAspect.

Task-number: QTCREATORBUG-29167
Change-Id: I6fc3bc22f905825443ebc31ebe44e7c27fdbcb56
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
This commit is contained in:
hjk
2023-07-06 14:53:26 +02:00
parent 9888e1982e
commit 04162ba291
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -923,35 +923,35 @@ void StringAspect::setPlaceHolderText(const QString &placeHolderText)
d->m_textEditDisplay->setPlaceholderText(placeHolderText); d->m_textEditDisplay->setPlaceholderText(placeHolderText);
} }
void StringAspect::setPromptDialogFilter(const QString &filter) void FilePathAspect::setPromptDialogFilter(const QString &filter)
{ {
d->m_prompDialogFilter = filter; d->m_prompDialogFilter = filter;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)
d->m_pathChooserDisplay->setPromptDialogFilter(filter); d->m_pathChooserDisplay->setPromptDialogFilter(filter);
} }
void StringAspect::setPromptDialogTitle(const QString &title) void FilePathAspect::setPromptDialogTitle(const QString &title)
{ {
d->m_prompDialogTitle = title; d->m_prompDialogTitle = title;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)
d->m_pathChooserDisplay->setPromptDialogTitle(title); d->m_pathChooserDisplay->setPromptDialogTitle(title);
} }
void StringAspect::setCommandVersionArguments(const QStringList &arguments) void FilePathAspect::setCommandVersionArguments(const QStringList &arguments)
{ {
d->m_commandVersionArguments = arguments; d->m_commandVersionArguments = arguments;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)
d->m_pathChooserDisplay->setCommandVersionArguments(arguments); d->m_pathChooserDisplay->setCommandVersionArguments(arguments);
} }
void StringAspect::setAllowPathFromDevice(bool allowPathFromDevice) void FilePathAspect::setAllowPathFromDevice(bool allowPathFromDevice)
{ {
d->m_allowPathFromDevice = allowPathFromDevice; d->m_allowPathFromDevice = allowPathFromDevice;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)
d->m_pathChooserDisplay->setAllowPathFromDevice(allowPathFromDevice); d->m_pathChooserDisplay->setAllowPathFromDevice(allowPathFromDevice);
} }
void StringAspect::setValidatePlaceHolder(bool validatePlaceHolder) void FilePathAspect::setValidatePlaceHolder(bool validatePlaceHolder)
{ {
d->m_validatePlaceHolder = validatePlaceHolder; d->m_validatePlaceHolder = validatePlaceHolder;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)
@@ -1047,7 +1047,7 @@ void StringAspect::setValidationFunction(const FancyLineEdit::ValidationFunction
d->m_pathChooserDisplay->setValidationFunction(*d->m_validator); 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; d->m_openTerminal = openTerminal;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)

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

@@ -464,9 +464,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 setPromptDialogFilter(const QString &filter);
void setPromptDialogTitle(const QString &title);
void setCommandVersionArguments(const QStringList &arguments);
void setHistoryCompleter(const QString &historyCompleterKey); void setHistoryCompleter(const QString &historyCompleterKey);
void setExpectedKind(const PathChooser::Kind expectedKind); void setExpectedKind(const PathChooser::Kind expectedKind);
void setEnvironment(const Environment &env); void setEnvironment(const Environment &env);
@@ -477,11 +474,8 @@ public:
void setUseGlobalMacroExpander(); void setUseGlobalMacroExpander();
void setUseResetButton(); void setUseResetButton();
void setValidationFunction(const FancyLineEdit::ValidationFunction &validator); void setValidationFunction(const FancyLineEdit::ValidationFunction &validator);
void setOpenTerminalHandler(const std::function<void()> &openTerminal);
void setAutoApplyOnEditingFinished(bool applyOnEditingFinished); void setAutoApplyOnEditingFinished(bool applyOnEditingFinished);
void setElideMode(Qt::TextElideMode elideMode); void setElideMode(Qt::TextElideMode elideMode);
void setAllowPathFromDevice(bool allowPathFromDevice);
void setValidatePlaceHolder(bool validatePlaceHolder);
void validateInput(); void validateInput();
@@ -527,6 +521,13 @@ public:
FilePath operator()() const { return filePath(); } FilePath operator()() const { return filePath(); }
void setValue(const FilePath &filePath); void setValue(const FilePath &filePath);
void setDefaultValue(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> class QTCREATOR_UTILS_EXPORT IntegerAspect : public TypedAspect<qint64>