From 4a179b7c73ec5390f2bdb2a7c222ef9a38700b07 Mon Sep 17 00:00:00 2001 From: Primrose Mbanefo Date: Wed, 2 Mar 2011 17:13:18 +0100 Subject: [PATCH] Ovi Store Wizard: minor change NULL -> 0 --- src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp | 2 +- .../qt-s60/s60publishingbuildsettingspageovi.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp index 41b24f16ebf..b1c1d3a6d78 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publisherovi.cpp @@ -292,7 +292,7 @@ void S60PublisherOvi::runQMake() "Running QMake", qmakepp->effectiveCommand() + ' ' + qmakepp->arguments(), m_qmakeProc, - NULL); + 0); } void S60PublisherOvi::runBuild(int result) diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp index 34150c35a1a..a72b790385b 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingbuildsettingspageovi.cpp @@ -71,7 +71,7 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe m_ui->chooseBuildConfigDropDown->addItem(qt4bc->displayName(), QVariant::fromValue(static_cast(qt4bc))); - m_bc = NULL; + m_bc = 0; // todo more intelligent selection? prefer newer versions? foreach (Qt4BuildConfiguration *qt4bc, list) @@ -92,7 +92,7 @@ S60PublishingBuildSettingsPageOvi::S60PublishingBuildSettingsPageOvi(S60Publishe bool S60PublishingBuildSettingsPageOvi::isComplete() const { - return (m_bc != NULL); + return (m_bc != 0); } void S60PublishingBuildSettingsPageOvi::buildConfigChosen()