summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/gui/selectiveinstallwidget.cpp')
-rw-r--r--rbutil/rbutilqt/gui/selectiveinstallwidget.cpp24
1 files changed, 12 insertions, 12 deletions
diff --git a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
index 805a432877..fafe79c8f7 100644
--- a/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
+++ b/rbutil/rbutilqt/gui/selectiveinstallwidget.cpp
@@ -45,9 +45,9 @@ SelectiveInstallWidget::SelectiveInstallWidget(QWidget* parent) : QWidget(parent
45 RockboxInfo info(m_mountpoint); 45 RockboxInfo info(m_mountpoint);
46 ui.bootloaderCheckbox->setChecked(!info.success()); 46 ui.bootloaderCheckbox->setChecked(!info.success());
47 47
48 m_logger = NULL; 48 m_logger = nullptr;
49 m_zipinstaller = NULL; 49 m_zipinstaller = nullptr;
50 m_themesinstaller = NULL; 50 m_themesinstaller = nullptr;
51 51
52 connect(ui.installButton, SIGNAL(clicked()), this, SLOT(startInstall())); 52 connect(ui.installButton, SIGNAL(clicked()), this, SLOT(startInstall()));
53 connect(this, SIGNAL(installSkipped(bool)), this, SLOT(continueInstall(bool))); 53 connect(this, SIGNAL(installSkipped(bool)), this, SLOT(continueInstall(bool)));
@@ -84,9 +84,9 @@ void SelectiveInstallWidget::updateVersion(void)
84 m_blmethod = SystemInfo::platformValue( 84 m_blmethod = SystemInfo::platformValue(
85 SystemInfo::BootloaderMethod, m_target).toString(); 85 SystemInfo::BootloaderMethod, m_target).toString();
86 86
87 if(m_logger != NULL) { 87 if(m_logger != nullptr) {
88 delete m_logger; 88 delete m_logger;
89 m_logger = NULL; 89 m_logger = nullptr;
90 } 90 }
91 91
92 // re-populate all version items 92 // re-populate all version items
@@ -166,7 +166,7 @@ void SelectiveInstallWidget::startInstall(void)
166 saveSettings(); 166 saveSettings();
167 167
168 m_installStage = 0; 168 m_installStage = 0;
169 if(m_logger != NULL) delete m_logger; 169 if(m_logger != nullptr) delete m_logger;
170 m_logger = new ProgressLoggerGui(this); 170 m_logger = new ProgressLoggerGui(this);
171 QString warning = Utils::checkEnvironment(false); 171 QString warning = Utils::checkEnvironment(false);
172 if(!warning.isEmpty()) 172 if(!warning.isEmpty())
@@ -238,7 +238,7 @@ void SelectiveInstallWidget::installBootloader(void)
238 BootloaderInstallBase *bl = 238 BootloaderInstallBase *bl =
239 BootloaderInstallHelper::createBootloaderInstaller(this, 239 BootloaderInstallHelper::createBootloaderInstaller(this,
240 SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString()); 240 SystemInfo::platformValue(SystemInfo::BootloaderMethod).toString());
241 if(bl == NULL) { 241 if(bl == nullptr) {
242 m_logger->addItem(tr("No install method known."), LOGERROR); 242 m_logger->addItem(tr("No install method known."), LOGERROR);
243 m_logger->setFinished(); 243 m_logger->setFinished();
244 return; 244 return;
@@ -393,7 +393,7 @@ void SelectiveInstallWidget::installRockbox(void)
393 ServerInfo::RelCandidateUrl, m_target).toString(); 393 ServerInfo::RelCandidateUrl, m_target).toString();
394 394
395 //! install build 395 //! install build
396 if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); 396 if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater();
397 m_zipinstaller = new ZipInstaller(this); 397 m_zipinstaller = new ZipInstaller(this);
398 m_zipinstaller->setUrl(url); 398 m_zipinstaller->setUrl(url);
399 m_zipinstaller->setLogSection("Rockbox (Base)"); 399 m_zipinstaller->setLogSection("Rockbox (Base)");
@@ -437,7 +437,7 @@ void SelectiveInstallWidget::installFonts(void)
437 fontsurl.replace("%RELEASEVER%", relversion); 437 fontsurl.replace("%RELEASEVER%", relversion);
438 438
439 // create new zip installer 439 // create new zip installer
440 if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); 440 if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater();
441 m_zipinstaller = new ZipInstaller(this); 441 m_zipinstaller = new ZipInstaller(this);
442 m_zipinstaller->setUrl(fontsurl); 442 m_zipinstaller->setUrl(fontsurl);
443 m_zipinstaller->setLogSection("Fonts"); 443 m_zipinstaller->setLogSection("Fonts");
@@ -460,7 +460,7 @@ void SelectiveInstallWidget::installFonts(void)
460 460
461void SelectiveInstallWidget::customizeThemes(void) 461void SelectiveInstallWidget::customizeThemes(void)
462{ 462{
463 if(m_themesinstaller == NULL) 463 if(m_themesinstaller == nullptr)
464 m_themesinstaller = new ThemesInstallWindow(this); 464 m_themesinstaller = new ThemesInstallWindow(this);
465 465
466 m_themesinstaller->setSelectOnly(true); 466 m_themesinstaller->setSelectOnly(true);
@@ -472,7 +472,7 @@ void SelectiveInstallWidget::installThemes(void)
472{ 472{
473 if(ui.themesCheckbox->isChecked()) { 473 if(ui.themesCheckbox->isChecked()) {
474 LOG_INFO() << "installing themes"; 474 LOG_INFO() << "installing themes";
475 if(m_themesinstaller == NULL) 475 if(m_themesinstaller == nullptr)
476 m_themesinstaller = new ThemesInstallWindow(this); 476 m_themesinstaller = new ThemesInstallWindow(this);
477 477
478 connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool))); 478 connect(m_themesinstaller, SIGNAL(done(bool)), this, SLOT(continueInstall(bool)));
@@ -526,7 +526,7 @@ void SelectiveInstallWidget::installGamefiles(void)
526 LOG_INFO() << "installing gamefiles"; 526 LOG_INFO() << "installing gamefiles";
527 527
528 // create new zip installer 528 // create new zip installer
529 if(m_zipinstaller != NULL) m_zipinstaller->deleteLater(); 529 if(m_zipinstaller != nullptr) m_zipinstaller->deleteLater();
530 m_zipinstaller = new ZipInstaller(this); 530 m_zipinstaller = new ZipInstaller(this);
531 531
532 m_zipinstaller->setUrl(gameUrls); 532 m_zipinstaller->setUrl(gameUrls);