diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-06 20:21:19 +0100 |
| commit | 82621148de82d63a562163a72598e15ed98797a8 (patch) | |
| tree | 030d345ad4a4ae612995949bbbeec66b36e69854 /examples/multimedia/spectrum/app/tonegeneratordialog.cpp | |
| parent | 2fc515ea1eaa0f7ffb56c4dadee560095c3374bd (diff) | |
| parent | 7a3b8907060123fe5d487d4c9ba3a1e222f468bb (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.qmake.conf
Change-Id: I5acdc7e0bd3729b80522dfff0f388cf2507fb111
Diffstat (limited to 'examples/multimedia/spectrum/app/tonegeneratordialog.cpp')
| -rw-r--r-- | examples/multimedia/spectrum/app/tonegeneratordialog.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/examples/multimedia/spectrum/app/tonegeneratordialog.cpp b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp index 55f998417..76fe5d2e3 100644 --- a/examples/multimedia/spectrum/app/tonegeneratordialog.cpp +++ b/examples/multimedia/spectrum/app/tonegeneratordialog.cpp @@ -106,12 +106,12 @@ ToneGeneratorDialog::ToneGeneratorDialog(QWidget *parent) dialogLayout->addWidget(m_toneGeneratorControl); // Connect - CHECKED_CONNECT(m_toneGeneratorSweepCheckBox, SIGNAL(toggled(bool)), - this, SLOT(frequencySweepEnabled(bool))); - CHECKED_CONNECT(m_frequencySlider, SIGNAL(valueChanged(int)), - m_frequencySpinBox, SLOT(setValue(int))); - CHECKED_CONNECT(m_frequencySpinBox, SIGNAL(valueChanged(int)), - m_frequencySlider, SLOT(setValue(int))); + connect(m_toneGeneratorSweepCheckBox, &QCheckBox::toggled, + this, &ToneGeneratorDialog::frequencySweepEnabled); + connect(m_frequencySlider, &QSlider::valueChanged, + m_frequencySpinBox, &QSpinBox::setValue); + connect(m_frequencySpinBox, QOverload<int>::of(&QSpinBox::valueChanged), + m_frequencySlider, &QSlider::setValue); // Add standard buttons to layout QDialogButtonBox *buttonBox = new QDialogButtonBox(this); @@ -119,10 +119,10 @@ ToneGeneratorDialog::ToneGeneratorDialog(QWidget *parent) dialogLayout->addWidget(buttonBox); // Connect standard buttons - CHECKED_CONNECT(buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked()), - this, SLOT(accept())); - CHECKED_CONNECT(buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked()), - this, SLOT(reject())); + connect(buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked, + this, &ToneGeneratorDialog::accept); + connect(buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked, + this, &ToneGeneratorDialog::reject); setLayout(dialogLayout); } |