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

Utils: Drop deprecated Utils::FilePath::{setFilePath,filePath}

Browse Source 
Change-Id: I730dfb716f744bbcb62dedf611e93c0d2d358247
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2021-03-15 10:31:40 +01:00
parent 06a754cc74
commit 2756794b4f
6 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/utils/pathchooser.h
View File

@@ -153,8 +153,6 @@ public:
// Deprecated. Use filePath().toString() or better suitable conversions. // Deprecated. Use filePath().toString() or better suitable conversions.
QString path() const { return filePath().toString(); } QString path() const { return filePath().toString(); }
// Deprecated. Use filePath()
FilePath fileName() const { return filePath(); }
// this sets the placeHolderText to defaultValue and enables to use this as // this sets the placeHolderText to defaultValue and enables to use this as
// input value during validation if the real value is empty // input value during validation if the real value is empty
@@ -179,8 +177,6 @@ signals:
public slots: public slots:
void setPath(const QString &); void setPath(const QString &);
// Deprecated: Use setFilePath()
void setFileName(const FilePath &path) { setFilePath(path); }
void setFilePath(const FilePath &); void setFilePath(const FilePath &);
private: private:

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

@@ -600,7 +600,7 @@ void AndroidSettingsWidget::onSdkPathChanged()
FilePath currentOpenSslPath = m_androidConfig.openSslLocation(); FilePath currentOpenSslPath = m_androidConfig.openSslLocation();
if (currentOpenSslPath.isEmpty() || !currentOpenSslPath.exists()) if (currentOpenSslPath.isEmpty() || !currentOpenSslPath.exists())
currentOpenSslPath = sdkPath.pathAppended("android_openssl"); currentOpenSslPath = sdkPath.pathAppended("android_openssl");
m_ui.openSslPathChooser->setFileName(currentOpenSslPath); m_ui.openSslPathChooser->setFilePath(currentOpenSslPath);
// Package reload will trigger validateSdk. // Package reload will trigger validateSdk.
m_sdkManager.reloadPackages(); m_sdkManager.reloadPackages();
} }

2
src/plugins/cvs/settingspage.cpp
View File

@@ -64,7 +64,7 @@ CvsSettingsPageWidget::CvsSettingsPageWidget(const std::function<void()> &onAppl
m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command")); m_ui.commandPathChooser->setPromptDialogTitle(tr("CVS Command"));
const VcsBaseClientSettings &s = *settings; const VcsBaseClientSettings &s = *settings;
m_ui.commandPathChooser->setFileName(s.binaryPath()); m_ui.commandPathChooser->setFilePath(s.binaryPath());
m_ui.rootLineEdit->setText(s.stringValue(CvsSettings::cvsRootKey)); m_ui.rootLineEdit->setText(s.stringValue(CvsSettings::cvsRootKey));
m_ui.diffOptionsLineEdit->setText(s.stringValue(CvsSettings::diffOptionsKey)); m_ui.diffOptionsLineEdit->setText(s.stringValue(CvsSettings::diffOptionsKey));
m_ui.timeOutSpinBox->setValue(s.intValue(CvsSettings::timeoutKey)); m_ui.timeOutSpinBox->setValue(s.intValue(CvsSettings::timeoutKey));

2
src/plugins/mesonprojectmanager/settings/tools/toolitemsettings.cpp
View File

@@ -57,7 +57,7 @@ void ToolItemSettings::load(ToolTreeItem *item)
ui->mesonNameLineEdit->setDisabled(item->isAutoDetected()); ui->mesonNameLineEdit->setDisabled(item->isAutoDetected());
ui->mesonNameLineEdit->setText(item->name()); ui->mesonNameLineEdit->setText(item->name());
ui->mesonPathChooser->setDisabled(item->isAutoDetected()); ui->mesonPathChooser->setDisabled(item->isAutoDetected());
ui->mesonPathChooser->setFileName(item->executable()); ui->mesonPathChooser->setFilePath(item->executable());
m_currentId = item->id(); m_currentId = item->id();
} else { } else {
m_currentId = Utils::nullopt; m_currentId = Utils::nullopt;

4
src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp
View File

@@ -80,7 +80,7 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath,
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->exportPath->setFileName(exportPath); m_ui->exportPath->setFilePath(exportPath);
m_ui->exportPath->setPromptDialogTitle(tr("Choose Export Path")); m_ui->exportPath->setPromptDialogTitle(tr("Choose Export Path"));
m_ui->exportPath->lineEdit()->setReadOnly(true); m_ui->exportPath->lineEdit()->setReadOnly(true);
m_ui->exportPath->addButton(tr("Open"), this, [this]() { m_ui->exportPath->addButton(tr("Open"), this, [this]() {
@@ -153,7 +153,7 @@ void AssetExportDialog::onExport()
TaskHub::clearTasks(Constants::TASK_CATEGORY_ASSET_EXPORT); TaskHub::clearTasks(Constants::TASK_CATEGORY_ASSET_EXPORT);
m_exportLogs->clear(); m_exportLogs->clear();
m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPath->fileName(), m_assetExporter.exportQml(m_filePathModel.files(), m_ui->exportPath->filePath(),
m_exportAssetsCheck->isChecked(), m_exportAssetsCheck->isChecked(),
m_perComponentExportCheck->isChecked()); m_perComponentExportCheck->isChecked());
} }

2
src/plugins/subversion/settingspage.cpp
View File

@@ -69,7 +69,7 @@ SubversionSettingsPageWidget::SubversionSettingsPageWidget(const std::function<v
m_ui.pathChooser->setPromptDialogTitle(tr("Subversion Command")); m_ui.pathChooser->setPromptDialogTitle(tr("Subversion Command"));
SubversionSettings &s = *m_settings; SubversionSettings &s = *m_settings;
m_ui.pathChooser->setFileName(s.binaryPath()); m_ui.pathChooser->setFilePath(s.binaryPath());
m_ui.usernameLineEdit->setText(s.stringValue(SubversionSettings::userKey)); m_ui.usernameLineEdit->setText(s.stringValue(SubversionSettings::userKey));
m_ui.passwordLineEdit->setText(s.stringValue(SubversionSettings::passwordKey)); m_ui.passwordLineEdit->setText(s.stringValue(SubversionSettings::passwordKey));
m_ui.userGroupBox->setChecked(s.boolValue(SubversionSettings::useAuthenticationKey)); m_ui.userGroupBox->setChecked(s.boolValue(SubversionSettings::useAuthenticationKey));