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

Revert "Utils: Move a few FilePath-only functions from String to FilePathAspect"

Browse Source 
This reverts commit e8617dc0c0.

Downstream AppManager still uses a combined String/FilePath aspect
version.

Change-Id: I9de08785120622d76daaa7c4be20fb5abb933095
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
hjk
2023-07-10 18:10:57 +02:00
parent a8a68b024a
commit ebda2068dd
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -854,7 +854,7 @@ FilePath StringAspect::filePath() const
return FilePath::fromUserInput(value()); return FilePath::fromUserInput(value());
} }
PathChooser *FilePathAspect::pathChooser() const PathChooser *StringAspect::pathChooser() const
{ {
return d->m_pathChooserDisplay.data(); return d->m_pathChooserDisplay.data();
} }
@@ -988,21 +988,21 @@ void StringAspect::setHistoryCompleter(const QString &historyCompleterKey)
\sa Utils::PathChooser::setExpectedKind() \sa Utils::PathChooser::setExpectedKind()
*/ */
void FilePathAspect::setExpectedKind(const PathChooser::Kind expectedKind) void StringAspect::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 FilePathAspect::setEnvironment(const Environment &env) void StringAspect::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 FilePathAspect::setBaseFileName(const FilePath &baseFileName) void StringAspect::setBaseFileName(const FilePath &baseFileName)
{ {
d->m_baseFileName = baseFileName; d->m_baseFileName = baseFileName;
if (d->m_pathChooserDisplay) if (d->m_pathChooserDisplay)

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

@@ -465,6 +465,9 @@ 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);
@@ -497,6 +500,8 @@ public:
FilePath filePath() const; FilePath filePath() const;
PathChooser *pathChooser() const; // Avoid to use.
signals: signals:
void checkedChanged(); void checkedChanged();
void validChanged(bool validState); void validChanged(bool validState);
@@ -523,11 +528,6 @@ 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.
}; };
class QTCREATOR_UTILS_EXPORT IntegerAspect : public TypedAspect<qint64> class QTCREATOR_UTILS_EXPORT IntegerAspect : public TypedAspect<qint64>