devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

rbutil: Modernize connect() calls.

Browse source 
Auto fixed by clazy.

Change-Id: Iea16d892fd81c151f0081f7476acc5eda62afc25
This commit is contained in:
Dominik Riebeling 2021-12-26 19:50:19 +01:00
parent 9f3d6e47e7
commit 1ad4faa334
9 changed files with 33 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
utils/rbutilqt/gui/backupdialog.cpp
View file

@ -60,7 +60,6 @@ BackupDialog::BackupDialog(QWidget* parent) : QDialog(parent)
m_thread = new BackupSizeThread();
connect(m_thread, &QThread::finished, this, &BackupDialog::updateSizeInfo);
connect(m_thread, SIGNAL(terminated()), this, SLOT(updateSizeInfo()));
connect(ui.buttonCancel, &QAbstractButton::clicked, this, &QWidget::close);
connect(ui.buttonCancel, &QAbstractButton::clicked, m_thread, &QThread::quit);
@ -135,8 +134,8 @@ void BackupDialog::backup(void)
// create backup
ZipUtil zip(this);
connect(&zip, SIGNAL(logProgress(int, int)), m_logger, SLOT(setProgress(int, int)));
connect(&zip, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(&zip, &ZipUtil::logProgress, m_logger, &ProgressLoggerGui::setProgress);
connect(&zip, &ZipUtil::logItem, m_logger, &ProgressLoggerGui::addItem);
zip.open(m_backupName, QuaZip::mdCreate);
QString mp = m_mountpoint + "/.rockbox";

2
utils/rbutilqt/gui/changelog.cpp
View file

@ -28,7 +28,7 @@ Changelog::Changelog(QWidget *parent) : QDialog(parent)
ui.browserChangelog->setHtml(parseChangelogFile(":/docs/changelog.txt"));
ui.browserChangelog->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
ui.checkBoxShowAlways->setChecked(RbSettings::value(RbSettings::ShowChangelog).toBool());
connect(ui.buttonOk, SIGNAL(clicked()), this, SLOT(accept()));
connect(ui.buttonOk, &QAbstractButton::clicked, this, &Changelog::accept);
}

24
utils/rbutilqt/gui/selectiveinstallwidget.cpp
View file

@ -292,9 +292,9 @@ void SelectiveInstallWidget::installBootloader(void)
// the bootloader install class does NOT use any GUI stuff.
// All messages are passed via signals.
connect(bl, SIGNAL(done(bool)), m_logger, SLOT(setFinished()));
connect(bl, &BootloaderInstallBase::done, m_logger, &ProgressLoggerGui::setFinished);
connect(bl, &BootloaderInstallBase::done, this, &SelectiveInstallWidget::continueInstall);
connect(bl, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(bl, &BootloaderInstallBase::logItem, m_logger, &ProgressLoggerGui::addItem);
connect(bl, &BootloaderInstallBase::logProgress, m_logger, &ProgressLoggerGui::setProgress);
// pass Abort button click signal to current installer
connect(m_logger, SIGNAL(aborted()), bl, SLOT(progressAborted()));
@ -447,9 +447,9 @@ void SelectiveInstallWidget::installRockbox(void)
connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall);
connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem);
connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress);
connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort()));
connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort);
m_zipinstaller->install();
}
@ -488,9 +488,9 @@ void SelectiveInstallWidget::installFonts(void)
m_zipinstaller->setCache(true);
connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall);
connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem);
connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress);
connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort()));
connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort);
m_zipinstaller->install();
}
else {
@ -527,9 +527,9 @@ void SelectiveInstallWidget::installVoicefile(void)
m_zipinstaller->setCache(true);
connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall);
connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem);
connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress);
connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort()));
connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort);
m_zipinstaller->install();
}
else {
@ -572,9 +572,9 @@ void SelectiveInstallWidget::installManual(void)
m_zipinstaller->setUnzip(mantype == "html");
connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall);
connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem);
connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress);
connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort()));
connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort);
m_zipinstaller->install();
}
else {
@ -667,9 +667,9 @@ void SelectiveInstallWidget::installPluginData(void)
if(!RbSettings::value(RbSettings::CacheDisabled).toBool())
m_zipinstaller->setCache(true);
connect(m_zipinstaller, &ZipInstaller::done, this, &SelectiveInstallWidget::continueInstall);
connect(m_zipinstaller, SIGNAL(logItem(QString, int)), m_logger, SLOT(addItem(QString, int)));
connect(m_zipinstaller, &ZipInstaller::logItem, m_logger, &ProgressLoggerGui::addItem);
connect(m_zipinstaller, &ZipInstaller::logProgress, m_logger, &ProgressLoggerGui::setProgress);
connect(m_logger, SIGNAL(aborted()), m_zipinstaller, SLOT(abort()));
connect(m_logger, &ProgressLoggerGui::aborted, m_zipinstaller, &ZipInstaller::abort);
m_zipinstaller->install();
}
else {