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

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
...@@ -228,7 +228,8 @@ PathChooser::PathChooser(QWidget *parent) : ...@@ -228,7 +228,8 @@ PathChooser::PathChooser(QWidget *parent) :
connect(d->m_lineEdit, &FancyLineEdit::customContextMenuRequested, this, &PathChooser::contextMenuRequested); connect(d->m_lineEdit, &FancyLineEdit::customContextMenuRequested, this, &PathChooser::contextMenuRequested);
connect(d->m_lineEdit, &FancyLineEdit::validReturnPressed, this, &PathChooser::returnPressed); connect(d->m_lineEdit, &FancyLineEdit::validReturnPressed, this, &PathChooser::returnPressed);
connect(d->m_lineEdit, &QLineEdit::textChanged, this, [this] { emit changed(rawPath()); }); connect(d->m_lineEdit, &QLineEdit::textChanged, this,
[this] { emit rawPathChanged(rawPath()); });
connect(d->m_lineEdit, &FancyLineEdit::validChanged, this, &PathChooser::validChanged); connect(d->m_lineEdit, &FancyLineEdit::validChanged, this, &PathChooser::validChanged);
connect(d->m_lineEdit, &QLineEdit::editingFinished, this, &PathChooser::editingFinished); connect(d->m_lineEdit, &QLineEdit::editingFinished, this, &PathChooser::editingFinished);
connect(d->m_lineEdit, &QLineEdit::textChanged, this, [this] { emit pathChanged(path()); }); connect(d->m_lineEdit, &QLineEdit::textChanged, this, [this] { emit pathChanged(path()); });
...@@ -306,7 +307,7 @@ void PathChooser::setEnvironment(const Environment &env) ...@@ -306,7 +307,7 @@ void PathChooser::setEnvironment(const Environment &env)
d->m_environment = env; d->m_environment = env;
if (path() != oldExpand) { if (path() != oldExpand) {
triggerChanged(); triggerChanged();
emit changed(rawPath()); emit rawPathChanged(rawPath());
} }
} }
......
...@@ -154,7 +154,7 @@ private: ...@@ -154,7 +154,7 @@ private:
signals: signals:
void validChanged(bool validState); void validChanged(bool validState);
void changed(const QString &text); void rawPathChanged(const QString &text);
void pathChanged(const QString &path); void pathChanged(const QString &path);
void editingFinished(); void editingFinished();
void beforeBrowsing(); void beforeBrowsing();
......
...@@ -97,7 +97,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) : ...@@ -97,7 +97,7 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
d->m_ui.projectComboBox->setVisible(d->m_forceSubProject); d->m_ui.projectComboBox->setVisible(d->m_forceSubProject);
d->m_ui.pathChooser->setDisabled(d->m_forceSubProject); d->m_ui.pathChooser->setDisabled(d->m_forceSubProject);
d->m_ui.projectsDirectoryCheckBox->setDisabled(d->m_forceSubProject); d->m_ui.projectsDirectoryCheckBox->setDisabled(d->m_forceSubProject);
connect(d->m_ui.pathChooser, &PathChooser::changed, connect(d->m_ui.pathChooser, &PathChooser::rawPathChanged,
this, &ProjectIntroPage::slotChanged); this, &ProjectIntroPage::slotChanged);
connect(d->m_ui.nameLineEdit, &QLineEdit::textChanged, connect(d->m_ui.nameLineEdit, &QLineEdit::textChanged,
this, &ProjectIntroPage::slotChanged); this, &ProjectIntroPage::slotChanged);
......
...@@ -186,10 +186,10 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent) ...@@ -186,10 +186,10 @@ AndroidSettingsWidget::AndroidSettingsWidget(QWidget *parent)
connect(&m_futureWatcher, SIGNAL(finished()), connect(&m_futureWatcher, SIGNAL(finished()),
this, SLOT(avdAdded())); this, SLOT(avdAdded()));
connect(m_ui->NDKLocationPathChooser, SIGNAL(changed(QString)), this, SLOT(ndkLocationEditingFinished())); connect(m_ui->NDKLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(ndkLocationEditingFinished()));
connect(m_ui->SDKLocationPathChooser, SIGNAL(changed(QString)), this, SLOT(sdkLocationEditingFinished())); connect(m_ui->SDKLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(sdkLocationEditingFinished()));
connect(m_ui->AntLocationPathChooser, SIGNAL(changed(QString)), this, SLOT(antLocationEditingFinished())); connect(m_ui->AntLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(antLocationEditingFinished()));
connect(m_ui->OpenJDKLocationPathChooser, SIGNAL(changed(QString)), this, SLOT(openJDKLocationEditingFinished())); connect(m_ui->OpenJDKLocationPathChooser, SIGNAL(rawPathChanged(QString)), this, SLOT(openJDKLocationEditingFinished()));
} }
......
...@@ -64,7 +64,7 @@ AutotoolsBuildSettingsWidget::AutotoolsBuildSettingsWidget(AutotoolsBuildConfigu ...@@ -64,7 +64,7 @@ AutotoolsBuildSettingsWidget::AutotoolsBuildSettingsWidget(AutotoolsBuildConfigu
m_pathChooser->setEnvironment(bc->environment()); m_pathChooser->setEnvironment(bc->environment());
m_pathChooser->setHistoryCompleter(QLatin1String("AutoTools.BuildDir.History")); m_pathChooser->setHistoryCompleter(QLatin1String("AutoTools.BuildDir.History"));
fl->addRow(tr("Build directory:"), m_pathChooser); fl->addRow(tr("Build directory:"), m_pathChooser);
connect(m_pathChooser, &Utils::PathChooser::changed, connect(m_pathChooser, &Utils::PathChooser::rawPathChanged,
this, &AutotoolsBuildSettingsWidget::buildDirectoryChanged); this, &AutotoolsBuildSettingsWidget::buildDirectoryChanged);
m_pathChooser->setBaseFileName(bc->target()->project()->projectDirectory()); m_pathChooser->setBaseFileName(bc->target()->project()->projectDirectory());
......
...@@ -101,7 +101,7 @@ BuildPathPage::BuildPathPage(AutotoolsOpenProjectWizard *wizard) ...@@ -101,7 +101,7 @@ BuildPathPage::BuildPathPage(AutotoolsOpenProjectWizard *wizard)
m_pc->setHistoryCompleter(QLatin1String("AutoTools.BuildDir.History")); m_pc->setHistoryCompleter(QLatin1String("AutoTools.BuildDir.History"));
m_pc->setBaseDirectory(m_wizard->sourceDirectory()); m_pc->setBaseDirectory(m_wizard->sourceDirectory());
m_pc->setPath(m_wizard->buildDirectory()); m_pc->setPath(m_wizard->buildDirectory());
connect(m_pc, &Utils::PathChooser::changed, this, &BuildPathPage::buildDirectoryChanged); connect(m_pc, &Utils::PathChooser::rawPathChanged, this, &BuildPathPage::buildDirectoryChanged);
fl->addRow(tr("Build directory:"), m_pc); fl->addRow(tr("Build directory:"), m_pc);
setTitle(tr("Build Location")); setTitle(tr("Build Location"));
} }
......
...@@ -296,11 +296,11 @@ OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget( ...@@ -296,11 +296,11 @@ OpenOcdGdbServerProviderConfigWidget::OpenOcdGdbServerProviderConfigWidget(
connect(m_hostWidget.data(), &HostWidget::dataChanged, connect(m_hostWidget.data(), &HostWidget::dataChanged,
this, &GdbServerProviderConfigWidget::dirty); this, &GdbServerProviderConfigWidget::dirty);
connect(m_executableFileChooser.data(), &Utils::PathChooser::changed, connect(m_executableFileChooser.data(), &Utils::PathChooser::rawPathChanged,
this, &GdbServerProviderConfigWidget::dirty); this, &GdbServerProviderConfigWidget::dirty);
connect(m_rootScriptsDirChooser.data(), &Utils::PathChooser::changed, connect(m_rootScriptsDirChooser.data(), &Utils::PathChooser::rawPathChanged,
this, &GdbServerProviderConfigWidget::dirty); this, &GdbServerProviderConfigWidget::dirty);
connect(m_configurationFileChooser.data(), &Utils::PathChooser::changed, connect(m_configurationFileChooser.data(), &Utils::PathChooser::rawPathChanged,
this, &GdbServerProviderConfigWidget::dirty); this, &GdbServerProviderConfigWidget::dirty);
connect(m_additionalArgumentsLineEdit.data(), &QLineEdit::textChanged, connect(m_additionalArgumentsLineEdit.data(), &QLineEdit::textChanged,
this, &GdbServerProviderConfigWidget::dirty); this, &GdbServerProviderConfigWidget::dirty);
......
...@@ -294,7 +294,7 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget ...@@ -294,7 +294,7 @@ StLinkUtilGdbServerProviderConfigWidget::StLinkUtilGdbServerProviderConfigWidget
connect(m_hostWidget.data(), &HostWidget::dataChanged, connect(m_hostWidget.data(), &HostWidget::dataChanged,
this, &GdbServerProviderConfigWidget::dirty); this, &GdbServerProviderConfigWidget::dirty);
connect(m_executableFileChooser.data(), &Utils::PathChooser::changed, connect(m_executableFileChooser.data(), &Utils::PathChooser::rawPathChanged,
this, &GdbServerProviderConfigWidget::dirty); this, &GdbServerProviderConfigWidget::dirty);
connect(m_verboseLevelSpinBox.data(), connect(m_verboseLevelSpinBox.data(),
......
...@@ -343,7 +343,7 @@ ShadowBuildPage::ShadowBuildPage(CMakeOpenProjectWizard *cmakeWizard, bool chang ...@@ -343,7 +343,7 @@ ShadowBuildPage::ShadowBuildPage(CMakeOpenProjectWizard *cmakeWizard, bool chang
m_pc->setPath(m_cmakeWizard->buildDirectory()); m_pc->setPath(m_cmakeWizard->buildDirectory());
m_pc->setExpectedKind(Utils::PathChooser::Directory); m_pc->setExpectedKind(Utils::PathChooser::Directory);
m_pc->setHistoryCompleter(QLatin1String("Cmake.BuildDir.History")); m_pc->setHistoryCompleter(QLatin1String("Cmake.BuildDir.History"));
connect(m_pc, SIGNAL(changed(QString)), this, SLOT(buildDirectoryChanged())); connect(m_pc, SIGNAL(rawPathChanged(QString)), this, SLOT(buildDirectoryChanged()));
fl->addRow(tr("Build directory:"), m_pc); fl->addRow(tr("Build directory:"), m_pc);
setTitle(tr("Build Location")); setTitle(tr("Build Location"));
} }
......
...@@ -266,7 +266,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration * ...@@ -266,7 +266,7 @@ CMakeRunConfigurationWidget::CMakeRunConfigurationWidget(CMakeRunConfiguration *
vbx->setMargin(0); vbx->setMargin(0);
vbx->addWidget(m_detailsContainer); vbx->addWidget(m_detailsContainer);
connect(m_workingDirectoryEdit, &Utils::PathChooser::changed, connect(m_workingDirectoryEdit, &Utils::PathChooser::rawPathChanged,
this, &CMakeRunConfigurationWidget::setWorkingDirectory); this, &CMakeRunConfigurationWidget::setWorkingDirectory);
connect(resetButton, &QToolButton::clicked, connect(resetButton, &QToolButton::clicked,
......
...@@ -340,7 +340,7 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model) ...@@ -340,7 +340,7 @@ CMakeToolItemConfigWidget::CMakeToolItemConfigWidget(CMakeToolItemModel *model)
formLayout->addRow(new QLabel(tr("Name:")), m_displayNameLineEdit); formLayout->addRow(new QLabel(tr("Name:")), m_displayNameLineEdit);
formLayout->addRow(new QLabel(tr("Path:")), m_binaryChooser); formLayout->addRow(new QLabel(tr("Path:")), m_binaryChooser);
connect(m_binaryChooser, &PathChooser::changed, connect(m_binaryChooser, &PathChooser::rawPathChanged,
this, &CMakeToolItemConfigWidget::store); this, &CMakeToolItemConfigWidget::store);
connect(m_displayNameLineEdit, &QLineEdit::textChanged, connect(m_displayNameLineEdit, &QLineEdit::textChanged,
this, &CMakeToolItemConfigWidget::store); this, &CMakeToolItemConfigWidget::store);
......
...@@ -382,7 +382,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) ...@@ -382,7 +382,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
updateDetails(); updateDetails();
connect(m_makePathChooser, &Utils::PathChooser::changed, this, &MakeStepConfigWidget::makeEdited); connect(m_makePathChooser, &Utils::PathChooser::rawPathChanged, this, &MakeStepConfigWidget::makeEdited);
connect(m_additionalArguments, &QLineEdit::textEdited, this, &MakeStepConfigWidget::additionalArgumentsEdited); connect(m_additionalArguments, &QLineEdit::textEdited, this, &MakeStepConfigWidget::additionalArgumentsEdited);
connect(m_buildTargetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged); connect(m_buildTargetsList, &QListWidget::itemChanged, this, &MakeStepConfigWidget::itemChanged);
connect(ProjectExplorer::ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged, connect(ProjectExplorer::ProjectExplorerPlugin::instance(), &ProjectExplorerPlugin::settingsChanged,
......
...@@ -316,7 +316,7 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent) ...@@ -316,7 +316,7 @@ StartApplicationDialog::StartApplicationDialog(QWidget *parent)
verticalLayout->addWidget(line); verticalLayout->addWidget(line);
verticalLayout->addWidget(d->buttonBox); verticalLayout->addWidget(d->buttonBox);
connect(d->localExecutablePathChooser, &PathChooser::changed, connect(d->localExecutablePathChooser, &PathChooser::rawPathChanged,
this, &StartApplicationDialog::updateState); this, &StartApplicationDialog::updateState);
connect(d->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(d->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
......
...@@ -249,7 +249,7 @@ DebuggerItemConfigWidget::DebuggerItemConfigWidget(DebuggerItemModel *model) ...@@ -249,7 +249,7 @@ DebuggerItemConfigWidget::DebuggerItemConfigWidget(DebuggerItemModel *model)
formLayout->addRow(new QLabel(tr("ABIs:")), m_abis); formLayout->addRow(new QLabel(tr("ABIs:")), m_abis);
formLayout->addRow(new QLabel(tr("Version:")), m_versionLabel); formLayout->addRow(new QLabel(tr("Version:")), m_versionLabel);
connect(m_binaryChooser, &PathChooser::changed, connect(m_binaryChooser, &PathChooser::rawPathChanged,
this, &DebuggerItemConfigWidget::binaryPathHasChanged); this, &DebuggerItemConfigWidget::binaryPathHasChanged);
connect(m_displayNameLineEdit, &QLineEdit::textChanged, connect(m_displayNameLineEdit, &QLineEdit::textChanged,
this, &DebuggerItemConfigWidget::store); this, &DebuggerItemConfigWidget::store);
......
...@@ -256,7 +256,7 @@ DebuggerSourcePathMappingWidget::DebuggerSourcePathMappingWidget(QWidget *parent ...@@ -256,7 +256,7 @@ DebuggerSourcePathMappingWidget::DebuggerSourcePathMappingWidget(QWidget *parent
m_targetChooser->setHistoryCompleter(QLatin1String("Debugger.MappingTarget.History")); m_targetChooser->setHistoryCompleter(QLatin1String("Debugger.MappingTarget.History"));
connect(m_sourceLineEdit, &QLineEdit::textChanged, connect(m_sourceLineEdit, &QLineEdit::textChanged,
this, &DebuggerSourcePathMappingWidget::slotEditSourceFieldChanged); this, &DebuggerSourcePathMappingWidget::slotEditSourceFieldChanged);
connect(m_targetChooser, &PathChooser::changed, connect(m_targetChooser, &PathChooser::rawPathChanged,
this, &DebuggerSourcePathMappingWidget::slotEditTargetFieldChanged); this, &DebuggerSourcePathMappingWidget::slotEditTargetFieldChanged);
auto editLayout = new QFormLayout; auto editLayout = new QFormLayout;
const QString sourceToolTip = tr("<p>The source path contained in the " const QString sourceToolTip = tr("<p>The source path contained in the "
......
...@@ -326,8 +326,8 @@ int AttachCoreDialog::exec() ...@@ -326,8 +326,8 @@ int AttachCoreDialog::exec()
{ {
connect(d->selectRemoteCoreButton, &QAbstractButton::clicked, this, &AttachCoreDialog::selectRemoteCoreFile); connect(d->selectRemoteCoreButton, &QAbstractButton::clicked, this, &AttachCoreDialog::selectRemoteCoreFile);
connect(d->remoteCoreFileName, &QLineEdit::textChanged, this, &AttachCoreDialog::coreFileChanged); connect(d->remoteCoreFileName, &QLineEdit::textChanged, this, &AttachCoreDialog::coreFileChanged);
connect(d->localExecFileName, &PathChooser::changed, this, &AttachCoreDialog::changed); connect(d->localExecFileName, &PathChooser::rawPathChanged, this, &AttachCoreDialog::changed);
connect(d->localCoreFileName, &PathChooser::changed, this, &AttachCoreDialog::coreFileChanged); connect(d->localCoreFileName, &PathChooser::rawPathChanged, this, &AttachCoreDialog::coreFileChanged);
connect(d->forceLocalCheckBox, &QCheckBox::stateChanged, this, &AttachCoreDialog::changed); connect(d->forceLocalCheckBox, &QCheckBox::stateChanged, this, &AttachCoreDialog::changed);
connect(d->kitChooser, &KitChooser::currentIndexChanged, this, &AttachCoreDialog::changed); connect(d->kitChooser, &KitChooser::currentIndexChanged, this, &AttachCoreDialog::changed);
connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(d->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
......
...@@ -217,7 +217,7 @@ GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericBuildConfiguration ...@@ -217,7 +217,7 @@ GenericBuildSettingsWidget::GenericBuildSettingsWidget(GenericBuildConfiguration
m_pathChooser->setHistoryCompleter(QLatin1String("Generic.BuildDir.History")); m_pathChooser->setHistoryCompleter(QLatin1String("Generic.BuildDir.History"));
m_pathChooser->setEnabled(true); m_pathChooser->setEnabled(true);
fl->addRow(tr("Build directory:"), m_pathChooser); fl->addRow(tr("Build directory:"), m_pathChooser);
connect(m_pathChooser, &Utils::PathChooser::changed, connect(m_pathChooser, &Utils::PathChooser::rawPathChanged,
this, &GenericBuildSettingsWidget::buildDirectoryChanged); this, &GenericBuildSettingsWidget::buildDirectoryChanged);
m_buildConfiguration = bc; m_buildConfiguration = bc;
......
...@@ -494,8 +494,8 @@ CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) : ...@@ -494,8 +494,8 @@ CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) :
m_predefinedDetails->updateSummaryText(); m_predefinedDetails->updateSummaryText();
m_headerDetails->updateSummaryText(); m_headerDetails->updateSummaryText();
connect(m_compilerCommand, SIGNAL(changed(QString)), this, SIGNAL(dirty())); connect(m_compilerCommand, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty()));
connect(m_makeCommand, SIGNAL(changed(QString)), this, SIGNAL(dirty())); connect(m_makeCommand, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty()));
connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty())); connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty()));
connect(m_predefinedMacros, SIGNAL(textChanged()), this, SLOT(updateSummaries())); connect(m_predefinedMacros, SIGNAL(textChanged()), this, SLOT(updateSummaries()));
connect(m_headerPaths, SIGNAL(textChanged()), this, SLOT(updateSummaries())); connect(m_headerPaths, SIGNAL(textChanged()), this, SLOT(updateSummaries()));
......
...@@ -257,9 +257,9 @@ QWidget *CustomWizardFieldPage::registerPathChooser(const QString &fieldName, ...@@ -257,9 +257,9 @@ QWidget *CustomWizardFieldPage::registerPathChooser(const QString &fieldName,
pathChooser->setExpectedKind(PathChooser::Any); pathChooser->setExpectedKind(PathChooser::Any);
pathChooser->setHistoryCompleter(QString::fromLatin1("PE.Custom.") + m_parameters->id.toString() + QLatin1Char('.') + field.name); pathChooser->setHistoryCompleter(QString::fromLatin1("PE.Custom.") + m_parameters->id.toString() + QLatin1Char('.') + field.name);
registerField(fieldName, pathChooser, "path", SIGNAL(changed(QString))); registerField(fieldName, pathChooser, "path", SIGNAL(rawPathChanged(QString)));
// Connect to completeChanged() for derived classes that reimplement isComplete() // Connect to completeChanged() for derived classes that reimplement isComplete()
connect(pathChooser, SIGNAL(changed(QString)), SIGNAL(completeChanged())); connect(pathChooser, SIGNAL(rawPathChanged(QString)), SIGNAL(completeChanged()));
const QString defaultText = field.controlAttributes.value(QLatin1String("defaulttext")); const QString defaultText = field.controlAttributes.value(QLatin1String("defaulttext"));
m_pathChoosers.push_back(PathChooserData(pathChooser, defaultText)); m_pathChoosers.push_back(PathChooserData(pathChooser, defaultText));
return pathChooser; return pathChooser;
......
...@@ -877,7 +877,7 @@ GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) : ...@@ -877,7 +877,7 @@ GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) :
setFromToolchain(); setFromToolchain();
connect(m_compilerCommand, SIGNAL(changed(QString)), this, SLOT(handleCompilerCommandChange())); connect(m_compilerCommand, SIGNAL(rawPathChanged(QString)), this, SLOT(handleCompilerCommandChange()));
connect(m_platformCodeGenFlagsLineEdit, SIGNAL(editingFinished()), this, SLOT(handlePlatformCodeGenFlagsChange())); connect(m_platformCodeGenFlagsLineEdit, SIGNAL(editingFinished()), this, SLOT(handlePlatformCodeGenFlagsChange()));
connect(m_platformLinkerFlagsLineEdit, SIGNAL(editingFinished()), this, SLOT(handlePlatformLinkerFlagsChange())); connect(m_platformLinkerFlagsLineEdit, SIGNAL(editingFinished()), this, SLOT(handlePlatformLinkerFlagsChange()));
connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty())); connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty()));
......
...@@ -568,8 +568,8 @@ void JsonFieldPage::PathChooserField::setEnabled(bool e) ...@@ -568,8 +568,8 @@ void JsonFieldPage::PathChooserField::setEnabled(bool e)
void JsonFieldPage::PathChooserField::setup(JsonFieldPage *page, const QString &name) void JsonFieldPage::PathChooserField::setup(JsonFieldPage *page, const QString &name)
{ {
PathChooser *w = static_cast<PathChooser *>(m_widget); PathChooser *w = static_cast<PathChooser *>(m_widget);
page->registerFieldWithName(name, w, "path", SIGNAL(changed(QString))); page->registerFieldWithName(name, w, "path", SIGNAL(rawPathChanged(QString)));
connect(w, &PathChooser::changed, page, [page](QString) { page->completeChanged(); }); connect(w, &PathChooser::rawPathChanged, page, [page](QString) { page->completeChanged(); });
} }
bool JsonFieldPage::PathChooserField::validate(MacroExpander *expander, QString *message) bool JsonFieldPage::PathChooserField::validate(MacroExpander *expander, QString *message)
......
...@@ -74,7 +74,7 @@ SysRootInformationConfigWidget::SysRootInformationConfigWidget(Kit *k, const Kit ...@@ -74,7 +74,7 @@ SysRootInformationConfigWidget::SysRootInformationConfigWidget(Kit *k, const Kit
m_chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory); m_chooser->setExpectedKind(Utils::PathChooser::ExistingDirectory);
m_chooser->setHistoryCompleter(QLatin1String("PE.SysRoot.History")); m_chooser->setHistoryCompleter(QLatin1String("PE.SysRoot.History"));
m_chooser->setFileName(SysRootKitInformation::sysRoot(k)); 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() SysRootInformationConfigWidget::~SysRootInformationConfigWidget()
......
...@@ -254,9 +254,9 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step) ...@@ -254,9 +254,9 @@ ProcessStepConfigWidget::ProcessStepConfigWidget(ProcessStep *step)
updateDetails(); updateDetails();
connect(m_ui.command, SIGNAL(changed(QString)), connect(m_ui.command, SIGNAL(rawPathChanged(QString)),
this, SLOT(commandLineEditTextEdited())); this, SLOT(commandLineEditTextEdited()));
connect(m_ui.workingDirectory, SIGNAL(changed(QString)), connect(m_ui.workingDirectory, SIGNAL(rawPathChanged(QString)),
this, SLOT(workingDirectoryLineEditTextEdited())); this, SLOT(workingDirectoryLineEditTextEdited()));
connect(m_ui.commandArgumentsLineEdit, SIGNAL(textEdited(QString)), connect(m_ui.commandArgumentsLineEdit, SIGNAL(textEdited(QString)),
......
...@@ -191,7 +191,7 @@ void TargetSetupWidget::addBuildInfo(BuildInfo *info, bool isImport) ...@@ -191,7 +191,7 @@ void TargetSetupWidget::addBuildInfo(BuildInfo *info, bool isImport)
connect(checkbox, SIGNAL(toggled(bool)), connect(checkbox, SIGNAL(toggled(bool)),
this, SLOT(checkBoxToggled(bool))); this, SLOT(checkBoxToggled(bool)));
connect(pathChooser, SIGNAL(changed(QString)), connect(pathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(pathChanged())); this, SLOT(pathChanged()));
m_checkboxes.append(checkbox); m_checkboxes.append(checkbox);
......
...@@ -70,7 +70,7 @@ QbsBuildConfigurationWidget::QbsBuildConfigurationWidget(QbsProjectManager::Inte ...@@ -70,7 +70,7 @@ QbsBuildConfigurationWidget::QbsBuildConfigurationWidget(QbsProjectManager::Inte
m_buildDirChooser->setEnvironment(bc->environment()); m_buildDirChooser->setEnvironment(bc->environment());
layout->addWidget(m_buildDirChooser, 0, 1); 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(); buildDirectoryChanged();
} }
......
...@@ -282,7 +282,8 @@ QbsInstallStepConfigWidget::QbsInstallStepConfigWidget(QbsInstallStep *step) : ...@@ -282,7 +282,8 @@ QbsInstallStepConfigWidget::QbsInstallStepConfigWidget(QbsInstallStep *step) :
m_ui->installRootChooser->setExpectedKind(Utils::PathChooser::Directory); m_ui->installRootChooser->setExpectedKind(Utils::PathChooser::Directory);
m_ui->installRootChooser->setHistoryCompleter(QLatin1String("Qbs.InstallRoot.History")); 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->removeFirstCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeRemoveFirst(bool)));
connect(m_ui->dryRunCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeDryRun(bool))); connect(m_ui->dryRunCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeDryRun(bool)));
connect(m_ui->keepGoingCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeKeepGoing(bool))); connect(m_ui->keepGoingCheckBox, SIGNAL(toggled(bool)), this, SLOT(changeKeepGoing(bool)));
......
...@@ -183,7 +183,7 @@ void ChooseDirectoryPage::initializePage() ...@@ -183,7 +183,7 @@ void ChooseDirectoryPage::initializePage()
"Android directory and the default files are overwritten.")); "Android directory and the default files are overwritten."));
m_androidPackageSourceDir->setPath(m_wizard->node()->path().toFileInfo().absolutePath().append(QLatin1String("/android"))); 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())); this, SLOT(checkPackageSourceDir()));
} else { } else {
m_label->setText(tr("The Android template files will be created in the ANDROID_PACKAGE_SOURCE_DIR set in the .pro file.")); 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 ...@@ -252,7 +252,7 @@ DesktopQmakeRunConfigurationWidget::DesktopQmakeRunConfigurationWidget(DesktopQm
runConfigurationEnabledChange(); runConfigurationEnabledChange();
connect(m_workingDirectoryEdit, SIGNAL(changed(QString)), connect(m_workingDirectoryEdit, SIGNAL(rawPathChanged(QString)),
this, SLOT(workDirectoryEdited())); this, SLOT(workDirectoryEdited()));
connect(resetButton, SIGNAL(clicked()), connect(resetButton, SIGNAL(clicked()),
......
...@@ -103,7 +103,7 @@ LibraryDetailsController::LibraryDetailsController( ...@@ -103,7 +103,7 @@ LibraryDetailsController::LibraryDetailsController(
if (creatorPlatform() != CreatorWindows) if (creatorPlatform() != CreatorWindows)
setLinkageRadiosVisible(false); setLinkageRadiosVisible(false);
connect(m_libraryDetailsWidget->includePathChooser, SIGNAL(changed(QString)), connect(m_libraryDetailsWidget->includePathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(slotIncludePathChanged())); this, SLOT(slotIncludePathChanged()));
connect(m_libraryDetailsWidget->frameworkRadio, SIGNAL(clicked(bool)), connect(m_libraryDetailsWidget->frameworkRadio, SIGNAL(clicked(bool)),
this, SLOT(slotMacLibraryTypeChanged())); this, SLOT(slotMacLibraryTypeChanged()));
...@@ -637,7 +637,7 @@ NonInternalLibraryDetailsController::NonInternalLibraryDetailsController( ...@@ -637,7 +637,7 @@ NonInternalLibraryDetailsController::NonInternalLibraryDetailsController(
connect(libraryDetailsWidget()->libraryPathChooser, SIGNAL(validChanged(bool)), connect(libraryDetailsWidget()->libraryPathChooser, SIGNAL(validChanged(bool)),
this, SIGNAL(completeChanged())); this, SIGNAL(completeChanged()));
connect(libraryDetailsWidget()->libraryPathChooser, SIGNAL(changed(QString)), connect(libraryDetailsWidget()->libraryPathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(slotLibraryPathChanged())); this, SLOT(slotLibraryPathChanged()));
connect(libraryDetailsWidget()->removeSuffixCheckBox, SIGNAL(toggled(bool)), connect(libraryDetailsWidget()->removeSuffixCheckBox, SIGNAL(toggled(bool)),
this, SLOT(slotRemoveSuffixChanged(bool))); this, SLOT(slotRemoveSuffixChanged(bool)));
......
...@@ -326,7 +326,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep) ...@@ -326,7 +326,7 @@ MakeStepConfigWidget::MakeStepConfigWidget(MakeStep *makeStep)
updateDetails(); updateDetails();
connect(m_ui->makePathChooser, SIGNAL(changed(QString)), connect(m_ui->makePathChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(makeEdited())); this, SLOT(makeEdited()));
connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(QString)), connect(m_ui->makeArgumentsLineEdit, SIGNAL(textEdited(QString)),
this, SLOT(makeArgumentsLineEdited())); this, SLOT(makeArgumentsLineEdited()));
......
...@@ -91,7 +91,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc) ...@@ -91,7 +91,7 @@ QmakeProjectConfigWidget::QmakeProjectConfigWidget(QmakeBuildConfiguration *bc)
connect(m_ui->shadowBuildDirEdit, SIGNAL(beforeBrowsing()), connect(m_ui->shadowBuildDirEdit, SIGNAL(beforeBrowsing()),
this, SLOT(onBeforeBeforeShadowBuildDirBrowsed())); this, SLOT(onBeforeBeforeShadowBuildDirBrowsed()));
connect(m_ui->shadowBuildDirEdit, SIGNAL(changed(QString)), connect(m_ui->shadowBuildDirEdit, SIGNAL(rawPathChanged(QString)),
this, SLOT(shadowBuildEdited())); this, SLOT(shadowBuildEdited()));
QmakeProject *project = static_cast<QmakeProject *>(bc->target()->project()); QmakeProject *project = static_cast<QmakeProject *>(bc->target()->project());
......
...@@ -43,7 +43,7 @@ ComponentNameDialog::ComponentNameDialog(QWidget *parent) : ...@@ -43,7 +43,7 @@ ComponentNameDialog::ComponentNameDialog(QWidget *parent) :
{ {
ui->setupUi(this); ui->setupUi(this);
connect(ui->pathEdit, SIGNAL(changed(QString)), connect(ui->pathEdit, SIGNAL(rawPathChanged(QString)),
this, SLOT(validate())); this, SLOT(validate()));
connect(ui->componentNameEdit, SIGNAL(textChanged(QString)), connect(ui->componentNameEdit, SIGNAL(textChanged(QString)),
this, SLOT(validate())); this, SLOT(validate()));
......
...@@ -56,7 +56,7 @@ QnxBaseQtConfigWidget::QnxBaseQtConfigWidget(QnxQtVersion *version) : ...@@ -56,7 +56,7 @@ QnxBaseQtConfigWidget::QnxBaseQtConfigWidget(QnxQtVersion *version) :
m_sdkPathChooser->setHistoryCompleter(QLatin1String("Qnx.Sdk.History")); m_sdkPathChooser->setHistoryCompleter(QLatin1String("Qnx.Sdk.History"));
m_sdkPathChooser->setPath(version->sdkPath()); m_sdkPathChooser->setPath(version->sdkPath());
connect(m_sdkPathChooser, &Utils::PathChooser::changed, connect(m_sdkPathChooser, &Utils::PathChooser::rawPathChanged,
this, &QnxBaseQtConfigWidget::updateSdkPath); this, &QnxBaseQtConfigWidget::updateSdkPath);
} }
......
...@@ -209,8 +209,8 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc) ...@@ -209,8 +209,8 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
m_mainLayout->addRow(tr("NDK/SDP path:"), m_ndkPath); m_mainLayout->addRow(tr("NDK/SDP path:"), m_ndkPath);
m_mainLayout->addRow(tr("&ABI:"), m_abiWidget); m_mainLayout->addRow(tr("&ABI:"), m_abiWidget);
connect(m_compilerCommand, SIGNAL(changed(QString)), this, SIGNAL(dirty())); connect(m_compilerCommand, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty()));
connect(m_ndkPath, SIGNAL(changed(QString)), this, SIGNAL(dirty())); connect(m_ndkPath, SIGNAL(rawPathChanged(QString)), this, SIGNAL(dirty()));
connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty())); connect(m_abiWidget, SIGNAL(abiChanged()), this, SIGNAL(dirty()));
} }
......
...@@ -108,14 +108,14 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE ...@@ -108,14 +108,14 @@ CustomExecutableConfigurationWidget::CustomExecutableConfigurationWidget(CustomE
changed(); changed();
if (mode == InstantApply) { if (mode == InstantApply) {
connect(m_executableChooser, SIGNAL(changed(QString)), connect(m_executableChooser, SIGNAL(rawPathChanged(QString)),
this, SLOT(executableEdited())); this, SLOT(executableEdited()));
connect(m_workingDirectory, SIGNAL(changed(QString)), connect(m_workingDirectory, SIGNAL(rawPathChanged(QString)),
this, SLOT(workingDirectoryEdited())); this, SLOT(workingDirectoryEdited()));
} else { } else {
connect(m_executableChooser, SIGNAL(changed(QString)), connect(m_executableChooser, SIGNAL(rawPathChanged(QString)),
this, SIGNAL(validChanged())); this, SIGNAL(validChanged()));
connect(m_workingDirectory, SIGNAL(changed(QString)), connect(m_workingDirectory, SIGNAL(rawPathChanged(QString)),
this, SIGNAL(validChanged())); this, SIGNAL(validChanged()));
} }
......
...@@ -65,7 +65,7 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings, ...@@ -65,7 +65,7 @@ ValgrindConfigWidget::ValgrindConfigWidget(ValgrindBaseSettings *settings,
updateUi(); updateUi();
connect(m_settings, &ValgrindBaseSettings::changed, this, &ValgrindConfigWidget::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); m_settings, &ValgrindBaseSettings::setValgrindExecutable);
connect(m_settings, &ValgrindBaseSettings::valgrindExecutableChanged, connect(m_settings, &ValgrindBaseSettings::valgrindExecutableChanged,
m_ui->valgrindExeChooser, &Utils::PathChooser::setPath); 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