Commit 8d3aa026 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Utils: Rename PathChooser::changed() signal.



The name is overly generic, particularly with a pathChanged() signal
also present. Rename to "rawPathChanged", which adequately describes the
semantics.

Change-Id: Ia62b8b0a97a794cb6d5ad6b8ce0abcd36b5f5cdb
Reviewed-by: default avatarEike Ziller <eike.ziller@theqtcompany.com>
parent c2ef8499
......@@ -568,8 +568,8 @@ void JsonFieldPage::PathChooserField::setEnabled(bool e)
void JsonFieldPage::PathChooserField::setup(JsonFieldPage *page, const QString &name)
{
PathChooser *w = static_cast<PathChooser *>(m_widget);
page->registerFieldWithName(name, w, "path", SIGNAL(changed(QString)));
connect(w, &PathChooser::changed, page, [page](QString) { page->completeChanged(); });
page->registerFieldWithName(name, w, "path", SIGNAL(rawPathChanged(QString)));
connect(w, &PathChooser::rawPathChanged, page, [page](QString) { page->completeChanged(); });
}
bool JsonFieldPage::PathChooserField::validate(MacroExpander *expander, QString *message)
......
......@@ -74,7 +74,7 @@ SysRootInformationConfigWidget::SysRootInformationConfigWidget(Kit *k, const Kit
m_chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_chooser->setHistoryCompleter(QLatin1String("PE.SysRoot.History"));
m_chooser->setFileName(SysRootKitInformation::sysRoot(k));
connect(m_chooser, SIGNAL(changed(QString)), this, SLOT(pathWasChanged()));
connect(m_chooser, SIGNAL(rawPathChanged(QString)), this, SLOT(pathWasChanged()));
}
SysRootInformationConfigWidget::~SysRootInformationConfigWidget()
......
......@@ -254,9 +254,9 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step)
updateDetails();
connect(m_ui.command, SIGNAL(changed(QString)),
connect(m_ui.command, SIGNAL(rawPathChanged(QString)),
this, SLOT(commandLineEditTextEdited()));
connect(m_ui.workingDirectory, SIGNAL(changed(QString)),
connect(m_ui.workingDirectory, SIGNAL(rawPathChanged(QString)),
this, SLOT(workingDirectoryLineEditTextEdited()));
connect(m_ui.commandArgumentsLineEdit, SIGNAL(textEdited(QString)),
......
......@@ -191,7 +191,7 @@ void TargetSetupWidget::addBuildInfo(BuildInfo *info, bool isImport)
connect(checkbox, SIGNAL(toggled(bool)),
this, SLOT(checkBoxToggled(bool)));
connect(pathChooser, SIGNAL(changed(QString)),
connect(pathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(pathChanged()));
m_checkboxes.append(checkbox);
......
......@@ -70,7 +70,7 @@ QbsBuildConfigurationWidget::QbsBuildConfigurationWidget(QbsProjectManager::Inte
m_buildDirChooser->setEnvironment(bc->environment());
layout->addWidget(m_buildDirChooser, 0, 1);
connect(m_buildDirChooser, SIGNAL(changed(QString)), this, SLOT(buildDirEdited()));
connect(m_buildDirChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(buildDirEdited()));
buildDirectoryChanged();
}
......
......@@ -282,7 +282,8 @@ QbsInstallStepConfigWidget::QbsInstallStepConfigWidget(QbsInstallStep *step) :
m_ui->installRootChooser->setExpectedKind(Utils::PathChooser::Directory);
m_ui->installRootChooser->setHistoryCompleter(QLatin1String("Qbs.InstallRoot.History"));
connect(m_ui->installRootChooser, SIGNAL(changed(QString)), this, SLOT(changeInstallRoot()));
connect(m_ui->installRootChooser, SIGNAL(rawPathChanged(QString)), this,
SLOT(changeInstallRoot()));
connect(m_ui->removeFirstCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeRemoveFirst(bool)));
connect(m_ui->dryRunCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeDryRun(bool)));
connect(m_ui->keepGoingCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeKeepGoing(bool)));
......
......@@ -183,7 +183,7 @@ void ChooseDirectoryPage::initializePage()
"Android directory and the default files are overwritten."));
m_androidPackageSourceDir->setPath(m_wizard->node()->path().toFileInfo().absolutePath().append(QLatin1String("/android")));
connect(m_androidPackageSourceDir, SIGNAL(changed(QString)),
connect(m_androidPackageSourceDir, SIGNAL(rawPathChanged(QString)),
this, SLOT(checkPackageSourceDir()));
} else {
m_label->setText(tr("The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file."));
......
......@@ -252,7 +252,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
runConfigurationEnabledChange();
connect(m_workingDirectoryEdit, SIGNAL(changed(QString)),
connect(m_workingDirectoryEdit, SIGNAL(rawPathChanged(QString)),
this, SLOT(workDirectoryEdited()));
connect(resetButton, SIGNAL(clicked()),
......
......@@ -103,7 +103,7 @@ LibraryDetailsController::LibraryDetailsController(
if (creatorPlatform() != CreatorWindows)
setLinkageRadiosVisible(false);
connect(m_libraryDetailsWidget->includePathChooser, SIGNAL(changed(QString)),
connect(m_libraryDetailsWidget->includePathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(slotIncludePathChanged()));
connect(m_libraryDetailsWidget->frameworkRadio, SIGNAL(clicked(bool)),
this, SLOT(slotMacLibraryTypeChanged()));
......@@ -637,7 +637,7 @@ NonInternalLibraryDetailsController::NonInternalLibraryDetailsController(
connect(libraryDetailsWidget()->libraryPathChooser, SIGNAL(validChanged(bool)),
this, SIGNAL(completeChanged()));
connect(libraryDetailsWidget()->libraryPathChooser, SIGNAL(changed(QString)),
connect(libraryDetailsWidget()->libraryPathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(slotLibraryPathChanged()));
connect(libraryDetailsWidget()->removeSuffixCheckBox, SIGNAL(toggled(bool)),
this, SLOT(slotRemoveSuffixChanged(bool)));
......
......@@ -326,7 +326,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
updateDetails();
connect(m_ui->makePathChooser, SIGNAL(changed(QString)),
connect(m_ui->makePathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(makeEdited()));
connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(makeArgumentsLineEdited()));
......
......@@ -91,7 +91,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
connect(m_ui->shadowBuildDirEdit, SIGNAL(beforeBrowsing()),
this, SLOT(onBeforeBeforeShadowBuildDirBrowsed()));
connect(m_ui->shadowBuildDirEdit, SIGNAL(changed(QString)),
connect(m_ui->shadowBuildDirEdit, SIGNAL(rawPathChanged(QString)),
this, SLOT(shadowBuildEdited()));
QmakeProject *project = static_cast<QmakeProject *>(bc->target()->project());
......
......@@ -43,7 +43,7 @@ ComponentNameDialog::ComponentNameDialog(QWidget *parent) :
{
ui->setupUi(this);
connect(ui->pathEdit, SIGNAL(changed(QString)),
connect(ui->pathEdit, SIGNAL(rawPathChanged(QString)),
this, SLOT(validate()));
connect(ui->componentNameEdit, SIGNAL(textChanged(QString)),
this, SLOT(validate()));
......
......@@ -56,7 +56,7 @@ QnxBaseQtConfigWidget::QnxBaseQtConfigWidget(QnxQtVersion *version) :
m_sdkPathChooser->setHistoryCompleter(QLatin1String("Qnx.Sdk.History"));
m_sdkPathChooser->setPath(version->sdkPath());
connect(m_sdkPathChooser, &Utils::PathChooser::changed,
connect(m_sdkPathChooser, &Utils::PathChooser::rawPathChanged,
this, &QnxBaseQtConfigWidget::updateSdkPath);
}
......
......@@ -209,8 +209,8 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
m_mainLayout->addRow(tr("NDK/SDP path:"), m_ndkPath);
m_mainLayout->addRow(tr("&ABI:"), m_abiWidget);
connect(m_compilerCommand, SIGNAL(changed(QString)), this, SIGNAL(dirty()));
connect(m_ndkPath, SIGNAL(changed(QString)), this, SIGNAL(dirty()));
connect(m_compilerCommand, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty()));
connect(m_ndkPath, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty()));
connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty()));
}
......
......@@ -108,14 +108,14 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
changed();
if (mode == InstantApply) {
connect(m_executableChooser, SIGNAL(changed(QString)),
connect(m_executableChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(executableEdited()));
connect(m_workingDirectory, SIGNAL(changed(QString)),
connect(m_workingDirectory, SIGNAL(rawPathChanged(QString)),
this, SLOT(workingDirectoryEdited()));
} else {
connect(m_executableChooser, SIGNAL(changed(QString)),
connect(m_executableChooser, SIGNAL(rawPathChanged(QString)),
this, SIGNAL(validChanged()));
connect(m_workingDirectory, SIGNAL(changed(QString)),
connect(m_workingDirectory, SIGNAL(rawPathChanged(QString)),
this, SIGNAL(validChanged()));
}
......
......@@ -65,7 +65,7 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings,
updateUi();
connect(m_settings, &ValgrindBaseSettings::changed, this, &ValgrindConfigWidget::updateUi);
connect(m_ui->valgrindExeChooser, &Utils::PathChooser::changed,
connect(m_ui->valgrindExeChooser, &Utils::PathChooser::rawPathChanged,
m_settings, &ValgrindBaseSettings::setValgrindExecutable);
connect(m_settings, &ValgrindBaseSettings::valgrindExecutableChanged,
m_ui->valgrindExeChooser, &Utils::PathChooser::setPath);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment