From kde-commits Tue Jul 31 01:32:36 2018 From: Friedrich W. H. Kossebau Date: Tue, 31 Jul 2018 01:32:36 +0000 To: kde-commits Subject: [kdev-embedded] /: Use nullptr Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=153300076921156 Git commit 312f983bcebe7ee29d6e2d3c40ee79170d870308 by Friedrich W. H. Koss= ebau. Committed on 31/07/2018 at 01:30. Pushed by kossebau into branch 'master'. Use nullptr M +1 -1 firsttimewizard.cpp M +1 -1 firsttimewizard.h M +2 -2 launcher/embeddedlauncher.cpp M +1 -1 launcher/executeplugin.cpp https://commits.kde.org/kdev-embedded/312f983bcebe7ee29d6e2d3c40ee79170d870= 308 diff --git a/firsttimewizard.cpp b/firsttimewizard.cpp index 9cf81bf..2b99a5b 100644 --- a/firsttimewizard.cpp +++ b/firsttimewizard.cpp @@ -84,7 +84,7 @@ using namespace KDevelop; FirstTimeWizard::FirstTimeWizard(QWidget *parent) : QWizard(parent), m_mDownloadManager(new QNetworkAccessManager), - m_reply(NULL), + m_reply(nullptr), m_downloadFinished(false), m_installFinished(false), m_avrdudeProcess(new QProcess(parent)), diff --git a/firsttimewizard.h b/firsttimewizard.h index a0ad7d2..df963ff 100644 --- a/firsttimewizard.h +++ b/firsttimewizard.h @@ -45,7 +45,7 @@ class FirstTimeWizard : public QWizard, Ui::FirstTimeWiza= rd Q_OBJECT = public: - explicit FirstTimeWizard(QWidget *parent =3D NULL); + explicit FirstTimeWizard(QWidget *parent =3D nullptr); ~FirstTimeWizard(); = QNetworkAccessManager *m_mDownloadManager; diff --git a/launcher/embeddedlauncher.cpp b/launcher/embeddedlauncher.cpp index 1edcdeb..477a803 100644 --- a/launcher/embeddedlauncher.cpp +++ b/launcher/embeddedlauncher.cpp @@ -90,7 +90,7 @@ void EmbeddedLauncherConfigPage::loadFromConfiguration(co= nst KConfigGroup& cfg, qCDebug(ElMsg) << "EmbeddedLauncherConfigPage::loadFromConfiguration" = << cfg.groupList() << cfg.keyList() << cfg.entryMap(); = bool b =3D blockSignals(true); - projectTarget->setBaseItem(project ? project->projectItem() : 0, true); + projectTarget->setBaseItem(project ? project->projectItem() : nullptr,= true); projectTarget->setCurrentItemPath(cfg.readEntry(ExecutePlugin::project= TargetEntry, QStringList())); = QUrl exe =3D cfg.readEntry(ExecutePlugin::executableEntry, QUrl()); @@ -231,7 +231,7 @@ EmbeddedLauncherConfigPage::EmbeddedLauncherConfigPage(= QWidget* parent) KConfigGroup settings =3D ICore::self()->activeSession()->config()->gr= oup("Embedded"); if (settings.readEntry("arduinoFolder", "").isEmpty()) { - QMessageBox::warning(0, i18n("kdev-embedded"), i18n("Please run th= e first time wizard.")); + QMessageBox::warning(nullptr, i18n("kdev-embedded"), i18n("Please = run the first time wizard.")); FirstTimeWizard *embeddedWindow =3D new FirstTimeWizard(parent); embeddedWindow->setAttribute(Qt::WA_DeleteOnClose); embeddedWindow->show(); diff --git a/launcher/executeplugin.cpp b/launcher/executeplugin.cpp index 846e432..e19ddd9 100644 --- a/launcher/executeplugin.cpp +++ b/launcher/executeplugin.cpp @@ -88,7 +88,7 @@ void ExecutePlugin::unload() { core()->runController()->removeConfigurationType(m_configType); delete m_configType; - m_configType =3D 0; + m_configType =3D nullptr; } = QStringList ExecutePlugin::arguments(KDevelop::ILaunchConfiguration* cfg, = QString& err_) const