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

Various FilePath::fromString -> fromUserInput changes

Browse Source 
Change-Id: Ic9c5e2f5c0375468651557f504b101572b72ac06
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Alessandro Portale
2021-09-23 17:38:58 +02:00
parent 3dd8831f14
commit fcf9537dc5
9 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1067,7 +1067,7 @@ void StringAspect::addToLayout(LayoutBuilder &builder)
d->m_pathChooserDisplay->setEnvironmentChange(d->m_environmentChange);
d->m_pathChooserDisplay->setBaseDirectory(d->m_baseFileName);
d->m_pathChooserDisplay->setOpenTerminalHandler(d->m_openTerminal);
d->m_pathChooserDisplay->setFilePath(FilePath::fromString(displayedString));
d->m_pathChooserDisplay->setFilePath(FilePath::fromUserInput(displayedString));
d->updateWidgetFromCheckStatus(this, d->m_pathChooserDisplay.data());
addLabeledItem(builder, d->m_pathChooserDisplay);
useMacroExpander(d->m_pathChooserDisplay->lineEdit());

2
src/libs/utils/pathchooser.cpp
View File

@@ -270,7 +270,7 @@ PathChooser::PathChooser(QWidget *parent) :
connect(d->m_lineEdit, &QLineEdit::textChanged, this, [this] {
const QString text = d->m_lineEdit->text();
emit pathChanged(text);
emit filePathChanged(FilePath::fromString(text));
emit filePathChanged(FilePath::fromUserInput(text));
});
d->m_lineEdit->setMinimumWidth(120);

2
src/plugins/android/avdmanageroutputparser.cpp
View File

@@ -79,7 +79,7 @@ static Utils::optional<AndroidDeviceInfo> parseAvd(const QStringList &deviceInfo
} else if (valueForKey(avdInfoNameKey, line, &value)) {
avd.avdname = value;
} else if (valueForKey(avdInfoPathKey, line, &value)) {
const Utils::FilePath avdPath = Utils::FilePath::fromString(value);
const Utils::FilePath avdPath = Utils::FilePath::fromUserInput(value);
if (avdPath.exists()) {
// Get ABI.
const Utils::FilePath configFile = avdPath.pathAppended("config.ini");

4
src/plugins/cmakeprojectmanager/cmaketoolsettingsaccessor.cpp
View File

@@ -78,8 +78,8 @@ static std::vector<std::unique_ptr<CMakeTool>> autoDetectCMakeTools()
for (auto envVar : {"ProgramFiles", "ProgramFiles(x86)", "ProgramW6432"}) {
if (qEnvironmentVariableIsSet(envVar)) {
const QString progFiles = qEnvironmentVariable(envVar);
path.append(FilePath::fromString(progFiles + "/CMake"));
path.append(FilePath::fromString(progFiles + "/CMake/bin"));
path.append(FilePath::fromUserInput(progFiles + "/CMake"));
path.append(FilePath::fromUserInput(progFiles + "/CMake/bin"));
}
}
}

4
src/plugins/git/gitgrep.cpp
View File

@@ -252,8 +252,8 @@ GitGrep::GitGrep(GitClient *client)
TextEditor::FindInFiles *findInFiles = TextEditor::FindInFiles::instance();
QTC_ASSERT(findInFiles, return);
connect(findInFiles, &TextEditor::FindInFiles::pathChanged,
m_widget, [this](const QString &path) {
setEnabled(isGitDirectory(FilePath::fromString(path)));
m_widget, [this](const FilePath &path) {
setEnabled(isGitDirectory(path));
});
connect(this, &SearchEngine::enabledChanged, m_widget, &QWidget::setEnabled);
findInFiles->addSearchEngine(this);

2
src/plugins/projectexplorer/buildaspects.cpp
View File

@@ -58,7 +58,7 @@ BuildDirectoryAspect::BuildDirectoryAspect(const BuildConfiguration *bc) : d(new
setDisplayStyle(PathChooserDisplay);
setExpectedKind(Utils::PathChooser::Directory);
setValidationFunction([this](FancyLineEdit *edit, QString *error) {
const FilePath fixedDir = fixupDir(FilePath::fromString(edit->text()));
const FilePath fixedDir = fixupDir(FilePath::fromUserInput(edit->text()));
if (!fixedDir.isEmpty())
edit->setText(fixedDir.toUserOutput());
return pathChooser() ? pathChooser()->defaultValidationFunction()(edit, error) : true;

2
src/plugins/projectexplorer/buildconfiguration.cpp
View File

@@ -247,7 +247,7 @@ BuildConfiguration::~BuildConfiguration()
FilePath BuildConfiguration::buildDirectory() const
{
FilePath path = FilePath::fromString(
FilePath path = FilePath::fromUserInput(
environment().expandVariables(d->m_buildDirectoryAspect->value().trimmed()));
path = macroExpander()->expand(path);
path = path.cleanPath();

2
src/plugins/texteditor/findinfiles.cpp
View File

@@ -170,7 +170,7 @@ QWidget *FindInFiles::createConfigWidget()
m_directory = new PathChooser;
m_directory->setExpectedKind(PathChooser::ExistingDirectory);
m_directory->setPromptDialogTitle(tr("Directory to Search"));
connect(m_directory.data(), &PathChooser::pathChanged,
connect(m_directory.data(), &PathChooser::filePathChanged,
this, &FindInFiles::pathChanged);
m_directory->setHistoryCompleter(QLatin1String(HistoryKey),
/*restoreLastItemFromHistory=*/ true);

2
src/plugins/texteditor/findinfiles.h
View File

@@ -63,7 +63,7 @@ public:
static FindInFiles *instance();
signals:
void pathChanged(const QString &directory);
void pathChanged(const Utils::FilePath &directory);
protected:
Utils::FileIterator *files(const QStringList &nameFilters,