diff options
| -rw-r--r-- | dependencies.yaml | 6 | ||||
| -rw-r--r-- | examples/speech/hello_speak/mainwindow.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 6c6fc64..c61adeb 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,10 +1,10 @@ dependencies: ../qtbase: - ref: 8652c79df0a47264a2d525424484e15744e2462b + ref: e0b89899e3c505edbdece60d6a2d2368a7ef9a01 required: true ../qtdeclarative: - ref: d5dc3c4cbdc4455143626d7a3e0f9a9a211515a9 + ref: eb5aa8d9c18535ecd0aacc42fe3af954faf01c04 required: false ../qtmultimedia: - ref: cfcff5f42656409056ba19b87e3fee31505128c6 + ref: a7868de41810a1cc2653896ef2d788a74dccd586 required: false diff --git a/examples/speech/hello_speak/mainwindow.cpp b/examples/speech/hello_speak/mainwindow.cpp index 351249e..13ca29d 100644 --- a/examples/speech/hello_speak/mainwindow.cpp +++ b/examples/speech/hello_speak/mainwindow.cpp @@ -72,7 +72,7 @@ MainWindow::MainWindow(QWidget *parent) connect(ui.pitch, &QSlider::valueChanged, this, &MainWindow::setPitch); connect(ui.rate, &QSlider::valueChanged, this, &MainWindow::setRate); connect(ui.volume, &QSlider::valueChanged, this, &MainWindow::setVolume); - connect(ui.engine, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &MainWindow::engineSelected); + connect(ui.engine, &QComboBox::currentIndexChanged, this, &MainWindow::engineSelected); } void MainWindow::speak() @@ -123,7 +123,7 @@ void MainWindow::engineSelected(int index) m_speech = new QTextToSpeech(this); else m_speech = new QTextToSpeech(engineName, this); - disconnect(ui.language, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &MainWindow::languageSelected); + disconnect(ui.language, &QComboBox::currentIndexChanged, this, &MainWindow::languageSelected); ui.language->clear(); // Populate the languages combobox before connecting its signal. const QVector<QLocale> locales = m_speech->availableLocales(); @@ -147,7 +147,7 @@ void MainWindow::engineSelected(int index) connect(m_speech, &QTextToSpeech::stateChanged, this, &MainWindow::stateChanged); connect(m_speech, &QTextToSpeech::localeChanged, this, &MainWindow::localeChanged); - connect(ui.language, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &MainWindow::languageSelected); + connect(ui.language, &QComboBox::currentIndexChanged, this, &MainWindow::languageSelected); localeChanged(current); } @@ -167,7 +167,7 @@ void MainWindow::localeChanged(const QLocale &locale) QVariant localeVariant(locale); ui.language->setCurrentIndex(ui.language->findData(localeVariant)); - disconnect(ui.voice, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &MainWindow::voiceSelected); + disconnect(ui.voice, &QComboBox::currentIndexChanged, this, &MainWindow::voiceSelected); ui.voice->clear(); m_voices = m_speech->availableVoices(); @@ -179,5 +179,5 @@ void MainWindow::localeChanged(const QLocale &locale) if (voice.name() == currentVoice.name()) ui.voice->setCurrentIndex(ui.voice->count() - 1); } - connect(ui.voice, static_cast<void (QComboBox::*)(int)>(&QComboBox::currentIndexChanged), this, &MainWindow::voiceSelected); + connect(ui.voice, &QComboBox::currentIndexChanged, this, &MainWindow::voiceSelected); } |