diff options
Diffstat (limited to 'utils/rbutilqt/rbutilqt.cpp')
-rw-r--r-- | utils/rbutilqt/rbutilqt.cpp | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/utils/rbutilqt/rbutilqt.cpp b/utils/rbutilqt/rbutilqt.cpp index 91704db4b2..b425ed4d70 100644 --- a/utils/rbutilqt/rbutilqt.cpp +++ b/utils/rbutilqt/rbutilqt.cpp | |||
@@ -127,7 +127,7 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
127 | ui.selective->setLayout(selectivetablayout); | 127 | ui.selective->setLayout(selectivetablayout); |
128 | selectiveinstallwidget = new SelectiveInstallWidget(this); | 128 | selectiveinstallwidget = new SelectiveInstallWidget(this); |
129 | selectivetablayout->addWidget(selectiveinstallwidget); | 129 | selectivetablayout->addWidget(selectiveinstallwidget); |
130 | connect(ui.buttonChangeDevice, SIGNAL(clicked()), selectiveinstallwidget, SLOT(saveSettings())); | 130 | connect(ui.buttonChangeDevice, &QAbstractButton::clicked, selectiveinstallwidget, &SelectiveInstallWidget::saveSettings); |
131 | 131 | ||
132 | // info tab | 132 | // info tab |
133 | QGridLayout *infotablayout = new QGridLayout(this); | 133 | QGridLayout *infotablayout = new QGridLayout(this); |
@@ -135,28 +135,28 @@ RbUtilQt::RbUtilQt(QWidget *parent) : QMainWindow(parent) | |||
135 | info = new InfoWidget(this); | 135 | info = new InfoWidget(this); |
136 | infotablayout->addWidget(info); | 136 | infotablayout->addWidget(info); |
137 | 137 | ||
138 | connect(ui.tabWidget, SIGNAL(currentChanged(int)), this, SLOT(updateTabs(int))); | 138 | connect(ui.tabWidget, &QTabWidget::currentChanged, this, &RbUtilQt::updateTabs); |
139 | connect(ui.actionAbout_Qt, SIGNAL(triggered()), qApp, SLOT(aboutQt())); | 139 | connect(ui.actionAbout_Qt, SIGNAL(triggered()), qApp, SLOT(aboutQt())); |
140 | connect(ui.action_About, SIGNAL(triggered()), this, SLOT(about())); | 140 | connect(ui.action_About, &QAction::triggered, this, &RbUtilQt::about); |
141 | connect(ui.action_Help, SIGNAL(triggered()), this, SLOT(help())); | 141 | connect(ui.action_Help, &QAction::triggered, this, &RbUtilQt::help); |
142 | connect(ui.action_Configure, SIGNAL(triggered()), this, SLOT(configDialog())); | 142 | connect(ui.action_Configure, &QAction::triggered, this, &RbUtilQt::configDialog); |
143 | connect(ui.actionE_xit, SIGNAL(triggered()), this, SLOT(shutdown())); | 143 | connect(ui.actionE_xit, &QAction::triggered, this, &RbUtilQt::shutdown); |
144 | connect(ui.buttonChangeDevice, SIGNAL(clicked()), this, SLOT(configDialog())); | 144 | connect(ui.buttonChangeDevice, &QAbstractButton::clicked, this, &RbUtilQt::configDialog); |
145 | connect(ui.buttonEject, SIGNAL(clicked()), this, SLOT(eject())); | 145 | connect(ui.buttonEject, &QAbstractButton::clicked, this, &RbUtilQt::eject); |
146 | connect(ui.buttonTalk, SIGNAL(clicked()), this, SLOT(createTalkFiles())); | 146 | connect(ui.buttonTalk, &QAbstractButton::clicked, this, &RbUtilQt::createTalkFiles); |
147 | connect(ui.buttonCreateVoice, SIGNAL(clicked()), this, SLOT(createVoiceFile())); | 147 | connect(ui.buttonCreateVoice, &QAbstractButton::clicked, this, &RbUtilQt::createVoiceFile); |
148 | connect(ui.buttonRemoveRockbox, SIGNAL(clicked()), this, SLOT(uninstall())); | 148 | connect(ui.buttonRemoveRockbox, &QAbstractButton::clicked, this, &RbUtilQt::uninstall); |
149 | connect(ui.buttonRemoveBootloader, SIGNAL(clicked()), this, SLOT(uninstallBootloader())); | 149 | connect(ui.buttonRemoveBootloader, &QAbstractButton::clicked, this, &RbUtilQt::uninstallBootloader); |
150 | connect(ui.buttonBackup, SIGNAL(clicked()), this, SLOT(backup())); | 150 | connect(ui.buttonBackup, &QAbstractButton::clicked, this, &RbUtilQt::backup); |
151 | 151 | ||
152 | // actions accessible from the menu | 152 | // actions accessible from the menu |
153 | connect(ui.actionCreate_Voice_File, SIGNAL(triggered()), this, SLOT(createVoiceFile())); | 153 | connect(ui.actionCreate_Voice_File, &QAction::triggered, this, &RbUtilQt::createVoiceFile); |
154 | connect(ui.actionCreate_Talk_Files, SIGNAL(triggered()), this, SLOT(createTalkFiles())); | 154 | connect(ui.actionCreate_Talk_Files, &QAction::triggered, this, &RbUtilQt::createTalkFiles); |
155 | connect(ui.actionRemove_bootloader, SIGNAL(triggered()), this, SLOT(uninstallBootloader())); | 155 | connect(ui.actionRemove_bootloader, &QAction::triggered, this, &RbUtilQt::uninstallBootloader); |
156 | connect(ui.actionUninstall_Rockbox, SIGNAL(triggered()), this, SLOT(uninstall())); | 156 | connect(ui.actionUninstall_Rockbox, &QAction::triggered, this, &RbUtilQt::uninstall); |
157 | connect(ui.action_System_Info, SIGNAL(triggered()), this, SLOT(sysinfo())); | 157 | connect(ui.action_System_Info, &QAction::triggered, this, &RbUtilQt::sysinfo); |
158 | connect(ui.action_Trace, SIGNAL(triggered()), this, SLOT(trace())); | 158 | connect(ui.action_Trace, &QAction::triggered, this, &RbUtilQt::trace); |
159 | connect(ui.actionShow_Changelog, SIGNAL(triggered()), this, SLOT(changelog())); | 159 | connect(ui.actionShow_Changelog, &QAction::triggered, this, &RbUtilQt::changelog); |
160 | 160 | ||
161 | #if !defined(STATIC) | 161 | #if !defined(STATIC) |
162 | ui.actionInstall_Rockbox_Utility_on_player->setEnabled(false); | 162 | ui.actionInstall_Rockbox_Utility_on_player->setEnabled(false); |
@@ -205,8 +205,8 @@ void RbUtilQt::downloadInfo() | |||
205 | { | 205 | { |
206 | // try to get the current build information | 206 | // try to get the current build information |
207 | daily = new HttpGet(this); | 207 | daily = new HttpGet(this); |
208 | connect(daily, SIGNAL(done(bool)), this, SLOT(downloadDone(bool))); | 208 | connect(daily, &HttpGet::done, this, &RbUtilQt::downloadDone); |
209 | connect(qApp, SIGNAL(lastWindowClosed()), daily, SLOT(abort())); | 209 | connect(qApp, &QGuiApplication::lastWindowClosed, daily, &HttpGet::abort); |
210 | daily->setCache(false); | 210 | daily->setCache(false); |
211 | ui.statusbar->showMessage(tr("Downloading build information, please wait ...")); | 211 | ui.statusbar->showMessage(tr("Downloading build information, please wait ...")); |
212 | LOG_INFO() << "downloading build info"; | 212 | LOG_INFO() << "downloading build info"; |
@@ -327,7 +327,7 @@ void RbUtilQt::help() | |||
327 | void RbUtilQt::configDialog() | 327 | void RbUtilQt::configDialog() |
328 | { | 328 | { |
329 | Config *cw = new Config(this); | 329 | Config *cw = new Config(this); |
330 | connect(cw, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 330 | connect(cw, &Config::settingsUpdated, this, &RbUtilQt::updateSettings); |
331 | cw->show(); | 331 | cw->show(); |
332 | } | 332 | } |
333 | 333 | ||
@@ -429,7 +429,7 @@ void RbUtilQt::createTalkFiles(void) | |||
429 | { | 429 | { |
430 | if(chkConfig(this)) return; | 430 | if(chkConfig(this)) return; |
431 | InstallTalkWindow *installWindow = new InstallTalkWindow(this); | 431 | InstallTalkWindow *installWindow = new InstallTalkWindow(this); |
432 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 432 | connect(installWindow, &InstallTalkWindow::settingsUpdated, this, &RbUtilQt::updateSettings); |
433 | installWindow->show(); | 433 | installWindow->show(); |
434 | 434 | ||
435 | } | 435 | } |
@@ -439,7 +439,7 @@ void RbUtilQt::createVoiceFile(void) | |||
439 | if(chkConfig(this)) return; | 439 | if(chkConfig(this)) return; |
440 | CreateVoiceWindow *installWindow = new CreateVoiceWindow(this); | 440 | CreateVoiceWindow *installWindow = new CreateVoiceWindow(this); |
441 | 441 | ||
442 | connect(installWindow, SIGNAL(settingsUpdated()), this, SLOT(updateSettings())); | 442 | connect(installWindow, &CreateVoiceWindow::settingsUpdated, this, &RbUtilQt::updateSettings); |
443 | installWindow->show(); | 443 | installWindow->show(); |
444 | } | 444 | } |
445 | 445 | ||
@@ -503,7 +503,7 @@ void RbUtilQt::uninstallBootloader(void) | |||
503 | } | 503 | } |
504 | 504 | ||
505 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); | 505 | connect(bl, SIGNAL(logItem(QString, int)), logger, SLOT(addItem(QString, int))); |
506 | connect(bl, SIGNAL(logProgress(int, int)), logger, SLOT(setProgress(int, int))); | 506 | connect(bl, &BootloaderInstallBase::logProgress, logger, &ProgressLoggerGui::setProgress); |
507 | connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); | 507 | connect(bl, SIGNAL(done(bool)), logger, SLOT(setFinished())); |
508 | // pass Abort button click signal to current installer | 508 | // pass Abort button click signal to current installer |
509 | connect(logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); | 509 | connect(logger, SIGNAL(aborted()), bl, SLOT(progressAborted())); |
@@ -608,8 +608,8 @@ void RbUtilQt::checkUpdate(void) | |||
608 | #endif | 608 | #endif |
609 | 609 | ||
610 | update = new HttpGet(this); | 610 | update = new HttpGet(this); |
611 | connect(update, SIGNAL(done(bool)), this, SLOT(downloadUpdateDone(bool))); | 611 | connect(update, &HttpGet::done, this, &RbUtilQt::downloadUpdateDone); |
612 | connect(qApp, SIGNAL(lastWindowClosed()), update, SLOT(abort())); | 612 | connect(qApp, &QGuiApplication::lastWindowClosed, update, &HttpGet::abort); |
613 | 613 | ||
614 | ui.statusbar->showMessage(tr("Checking for update ...")); | 614 | ui.statusbar->showMessage(tr("Checking for update ...")); |
615 | update->getFile(QUrl(url)); | 615 | update->getFile(QUrl(url)); |