diff options
| author | hjk <hjk@qt.io> | 2023-05-15 18:32:01 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2023-05-17 05:51:17 +0000 |
| commit | 337497d990bbfb52f27b5ba7019cdd0fb9c6d5fe (patch) | |
| tree | fa66540f59633f787adba6aa07c8b03d7a6fca55 /src/plugins/cvs | |
| parent | 6c5fb656d63efddcdc7e98e58aae04f2ae718c50 (diff) | |
Vcs: Use new FilePathAspect in a few places
Change-Id: Idc23616dd3b7bc21301471cb48e2893116b83f0d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/cvs')
| -rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/cvs/cvssettings.cpp | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 076f2ad8b28..d9980328fc9 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -366,7 +366,7 @@ bool CvsPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &filePath) con bool CvsPluginPrivate::isConfigured() const { - const FilePath binary = settings().binaryPath.filePath(); + const FilePath binary = settings().binaryPath(); if (binary.isEmpty()) return false; QFileInfo fi = binary.toFileInfo(); @@ -439,7 +439,7 @@ VcsCommand *CvsPluginPrivate::createInitialCheckoutCommand(const QString &url, auto command = VcsBaseClient::createVcsCommand(baseDirectory, Environment::systemEnvironment()); command->setDisplayName(Tr::tr("CVS Checkout")); - command->addJob({settings().binaryPath.filePath(), settings().addOptions(args)}, -1); + command->addJob({settings().binaryPath(), settings().addOptions(args)}, -1); return command; } @@ -1321,7 +1321,7 @@ CommandResult CvsPluginPrivate::runCvs(const FilePath &workingDirectory, const QStringList &arguments, RunFlags flags, QTextCodec *outputCodec, int timeoutMultiplier) const { - const FilePath executable = settings().binaryPath.filePath(); + const FilePath executable = settings().binaryPath(); if (executable.isEmpty()) return CommandResult(ProcessResult::StartFailed, Tr::tr("No CVS executable specified.")); diff --git a/src/plugins/cvs/cvssettings.cpp b/src/plugins/cvs/cvssettings.cpp index f18feeed661..dbfd41e500c 100644 --- a/src/plugins/cvs/cvssettings.cpp +++ b/src/plugins/cvs/cvssettings.cpp @@ -35,7 +35,6 @@ CvsSettings::CvsSettings() registerAspect(&binaryPath); binaryPath.setDefaultValue("cvs" QTC_HOST_EXE_SUFFIX); - binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay); binaryPath.setExpectedKind(PathChooser::ExistingCommand); binaryPath.setHistoryCompleter(QLatin1String("Cvs.Command.History")); binaryPath.setDisplayName(Tr::tr("CVS Command")); |