Skip to content

Commit f92b43a

Browse files
bobtistabobtista
committed
refactor: Convert NULL to nullptr in Tools directories via clang-tidy
1 parent 85e3cbb commit f92b43a

37 files changed

+557
-568
lines changed

‎Generals/Code/GameEngine/Source/GameLogic/Object/Weapon.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,15 +1479,10 @@ void WeaponStore::createAndFireTempWeapon(const WeaponTemplate* wt, const Object
14791479
//-------------------------------------------------------------------------------------------------
14801480
const WeaponTemplate *WeaponStore::findWeaponTemplate( const AsciiString& name ) const
14811481
{
1482-
<<<<<<< HEAD
14831482
if (name.compareNoCase("None") == 0)
1484-
return NULL;
1485-
=======
1486-
if (stricmp(name.str(), "None") == 0)
14871483
return nullptr;
1488-
>>>>>>> f312de3d3 (refactor: modernize NULL to nullptr with clang-tidy --fix-errors)
14891484
const WeaponTemplate * wt = findWeaponTemplatePrivate( TheNameKeyGenerator->nameToKey( name ) );
1490-
DEBUG_ASSERTCRASH(wt != NULL, ("Weapon %s not found!",name));
1485+
DEBUG_ASSERTCRASH(wt != nullptr, ("Weapon %s not found!",name));
14911486
return wt;
14921487
}
14931488

‎GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -127,14 +127,8 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
127127
{
128128

129129
// set keyboard focus to main parent
130-
<<<<<<< HEAD
131130
NameKeyType parentID = TheNameKeyGenerator->nameToKey( "WOLMapSelectMenu.wnd:WOLMapSelectMenuParent" );
132-
parent = TheWindowManager->winGetWindowFromId( NULL, parentID );
133-
=======
134-
AsciiString parentName( "WOLMapSelectMenu.wnd:WOLMapSelectMenuParent" );
135-
NameKeyType parentID = TheNameKeyGenerator->nameToKey( parentName );
136131
parent = TheWindowManager->winGetWindowFromId( nullptr, parentID );
137-
>>>>>>> f312de3d3 (refactor: modernize NULL to nullptr with clang-tidy --fix-errors)
138132

139133
TheWindowManager->winSetFocus( parent );
140134

‎GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsFalse.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
IMPLEMENT_DYNCREATE(ScriptActionsFalse, CPropertyPage)
3333

3434
ScriptActionsFalse::ScriptActionsFalse() : CPropertyPage(ScriptActionsFalse::IDD),
35-
m_falseAction(NULL),
35+
m_falseAction(nullptr),
3636
m_index(0)
3737
{
3838
//{{AFX_DATA_INIT(ScriptActionsFalse)
@@ -82,7 +82,7 @@ BOOL ScriptActionsFalse::OnInitDialog()
8282

8383
void ScriptActionsFalse::loadList(void)
8484
{
85-
m_falseAction = NULL;
85+
m_falseAction = nullptr;
8686
ScriptDialog::updateScriptWarning(m_script);
8787
CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
8888
Int count = 0;
@@ -111,7 +111,7 @@ void ScriptActionsFalse::loadList(void)
111111
void ScriptActionsFalse::OnEditAction()
112112
{
113113
CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
114-
if (m_falseAction == NULL) {
114+
if (m_falseAction == nullptr) {
115115
return;
116116
}
117117
EditAction cDlg;
@@ -126,13 +126,13 @@ void ScriptActionsFalse::OnEditAction()
126126
void ScriptActionsFalse::enableUI()
127127
{
128128
CWnd *pWnd = GetDlgItem(IDC_EDIT);
129-
pWnd->EnableWindow(m_falseAction!=NULL);
129+
pWnd->EnableWindow(m_falseAction!=nullptr);
130130

131131
pWnd = GetDlgItem(IDC_COPY);
132-
pWnd->EnableWindow(m_falseAction!=NULL);
132+
pWnd->EnableWindow(m_falseAction!=nullptr);
133133

134134
pWnd = GetDlgItem(IDC_DELETE);
135-
pWnd->EnableWindow(m_falseAction!=NULL);
135+
pWnd->EnableWindow(m_falseAction!=nullptr);
136136

137137
pWnd = GetDlgItem(IDC_MOVE_DOWN);
138138
pWnd->EnableWindow(m_falseAction && m_falseAction->getNext());
@@ -144,7 +144,7 @@ void ScriptActionsFalse::enableUI()
144144

145145
void ScriptActionsFalse::OnSelchangeActionList()
146146
{
147-
m_falseAction = NULL;
147+
m_falseAction = nullptr;
148148
CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
149149
if (pList) {
150150
Int count = pList->GetCurSel();
@@ -218,7 +218,7 @@ Bool ScriptActionsFalse::doMoveDown()
218218
if (m_falseAction && m_falseAction->getNext()) {
219219
ScriptAction *pNext = m_falseAction->getNext();
220220
ScriptAction *pCur = m_script->getFalseAction();
221-
ScriptAction *pPrev = NULL;
221+
ScriptAction *pPrev = nullptr;
222222
while (pCur != m_falseAction) {
223223
pPrev = pCur;
224224
pCur = pCur->getNext();

‎GeneralsMD/Code/Tools/WorldBuilder/src/ScriptActionsTrue.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
IMPLEMENT_DYNCREATE(ScriptActionsTrue, CPropertyPage)
3333

3434
ScriptActionsTrue::ScriptActionsTrue() : CPropertyPage(ScriptActionsTrue::IDD),
35-
m_action(NULL),
35+
m_action(nullptr),
3636
m_index(0)
3737
{
3838
//{{AFX_DATA_INIT(ScriptActionsTrue)
@@ -82,7 +82,7 @@ BOOL ScriptActionsTrue::OnInitDialog()
8282

8383
void ScriptActionsTrue::loadList(void)
8484
{
85-
m_action = NULL;
85+
m_action = nullptr;
8686
ScriptDialog::updateScriptWarning(m_script);
8787
CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
8888
Int count = 0;
@@ -111,7 +111,7 @@ void ScriptActionsTrue::loadList(void)
111111
void ScriptActionsTrue::OnEditAction()
112112
{
113113
CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
114-
if (m_action == NULL) {
114+
if (m_action == nullptr) {
115115
return;
116116
}
117117
EditAction cDlg;
@@ -126,13 +126,13 @@ void ScriptActionsTrue::OnEditAction()
126126
void ScriptActionsTrue::enableUI()
127127
{
128128
CWnd *pWnd = GetDlgItem(IDC_EDIT);
129-
pWnd->EnableWindow(m_action!=NULL);
129+
pWnd->EnableWindow(m_action!=nullptr);
130130

131131
pWnd = GetDlgItem(IDC_COPY);
132-
pWnd->EnableWindow(m_action!=NULL);
132+
pWnd->EnableWindow(m_action!=nullptr);
133133

134134
pWnd = GetDlgItem(IDC_DELETE);
135-
pWnd->EnableWindow(m_action!=NULL);
135+
pWnd->EnableWindow(m_action!=nullptr);
136136

137137
pWnd = GetDlgItem(IDC_MOVE_DOWN);
138138
pWnd->EnableWindow(m_action && m_action->getNext());
@@ -144,7 +144,7 @@ void ScriptActionsTrue::enableUI()
144144

145145
void ScriptActionsTrue::OnSelchangeActionList()
146146
{
147-
m_action = NULL;
147+
m_action = nullptr;
148148
CListBox *pList = (CListBox *)GetDlgItem(IDC_ACTION_LIST);
149149
if (pList) {
150150
Int count = pList->GetCurSel();
@@ -218,7 +218,7 @@ Bool ScriptActionsTrue::doMoveDown()
218218
if (m_action && m_action->getNext()) {
219219
ScriptAction *pNext = m_action->getNext();
220220
ScriptAction *pCur = m_script->getAction();
221-
ScriptAction *pPrev = NULL;
221+
ScriptAction *pPrev = nullptr;
222222
while (pCur != m_action) {
223223
pPrev = pCur;
224224
pCur = pCur->getNext();

‎GeneralsMD/Code/Tools/WorldBuilder/src/ScriptConditions.cpp‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
IMPLEMENT_DYNCREATE(ScriptConditionsDlg, CPropertyPage)
3333

3434
ScriptConditionsDlg::ScriptConditionsDlg() : CPropertyPage(ScriptConditionsDlg::IDD),
35-
m_condition(NULL),
36-
m_orCondition(NULL),
35+
m_condition(nullptr),
36+
m_orCondition(nullptr),
3737
m_index(0)
3838
{
3939
//{{AFX_DATA_INIT(ScriptConditionsDlg)
@@ -121,7 +121,7 @@ void ScriptConditionsDlg::loadList(void)
121121
void ScriptConditionsDlg::OnEditCondition()
122122
{
123123
CListBox *pList = (CListBox *)GetDlgItem(IDC_CONDITION_LIST);
124-
if (m_condition == NULL) {
124+
if (m_condition == nullptr) {
125125
return;
126126
}
127127
EditCondition cDlg;
@@ -143,26 +143,26 @@ void ScriptConditionsDlg::OnEditCondition()
143143
void ScriptConditionsDlg::enableUI()
144144
{
145145
CWnd *pWnd = GetDlgItem(IDC_EDIT_CONDITION);
146-
pWnd->EnableWindow(m_condition!=NULL);
146+
pWnd->EnableWindow(m_condition!=nullptr);
147147

148148
pWnd = GetDlgItem(IDC_COPY);
149-
pWnd->EnableWindow(m_condition!=NULL);
149+
pWnd->EnableWindow(m_condition!=nullptr);
150150

151151
pWnd = GetDlgItem(IDC_DELETE);
152152
pWnd->EnableWindow(m_condition || m_orCondition);
153153
}
154154

155155
void ScriptConditionsDlg::setSel(OrCondition *pOr, Condition *pCond)
156156
{
157-
m_orCondition = NULL;
158-
m_condition = NULL;
157+
m_orCondition = nullptr;
158+
m_condition = nullptr;
159159
CListBox *pList = (CListBox *)GetDlgItem(IDC_CONDITION_LIST);
160160
if (pList) {
161161
pList->SetCurSel(-1);
162162
Int count = 0;
163163
m_orCondition = m_script->getOrCondition();
164164
while (m_orCondition) {
165-
if (m_orCondition==pOr && pCond==NULL) {
165+
if (m_orCondition==pOr && pCond==nullptr) {
166166
pList->SetCurSel(count);
167167
enableUI();
168168
return;
@@ -186,8 +186,8 @@ void ScriptConditionsDlg::setSel(OrCondition *pOr, Condition *pCond)
186186

187187
void ScriptConditionsDlg::OnSelchangeConditionList()
188188
{
189-
m_orCondition = NULL;
190-
m_condition = NULL;
189+
m_orCondition = nullptr;
190+
m_condition = nullptr;
191191
CListBox *pList = (CListBox *)GetDlgItem(IDC_CONDITION_LIST);
192192
if (pList) {
193193
Int count = pList->GetCurSel();
@@ -232,7 +232,7 @@ void ScriptConditionsDlg::OnOr()
232232
m_script->setOrCondition(pOr);
233233
}
234234
loadList();
235-
setSel(pOr, NULL);
235+
setSel(pOr, nullptr);
236236
}
237237

238238
void ScriptConditionsDlg::OnNew()
@@ -246,7 +246,7 @@ void ScriptConditionsDlg::OnNew()
246246
pCond->setNextCondition(m_condition->getNext());
247247
m_condition->setNextCondition(pCond);
248248
} else {
249-
if (m_orCondition == NULL) {
249+
if (m_orCondition == nullptr) {
250250
OrCondition *pOr = newInstance( OrCondition);
251251
pOr->setNextOrCondition(m_script->getOrCondition());
252252
m_script->setOrCondition(pOr);
@@ -290,7 +290,7 @@ Int ScriptConditionsDlg::doMoveDown( OrCondition **outWhichNow )
290290
(*outWhichNow) = m_orCondition;
291291
if (m_condition && m_orCondition) {
292292
Condition *pNext = m_condition->getNext();
293-
if (pNext==NULL) {
293+
if (pNext==nullptr) {
294294
OrCondition *pNOr = m_orCondition->getNextOrCondition();
295295
if (!pNOr) {
296296
pNOr = newInstance( OrCondition);
@@ -306,7 +306,7 @@ Int ScriptConditionsDlg::doMoveDown( OrCondition **outWhichNow )
306306
}
307307

308308
Condition *pCur = m_orCondition->getFirstAndCondition();
309-
Condition *pPrev = NULL;
309+
Condition *pPrev = nullptr;
310310
while (pCur != m_condition) {
311311
pPrev = pCur;
312312
pCur = pCur->getNext();
@@ -326,9 +326,9 @@ Int ScriptConditionsDlg::doMoveDown( OrCondition **outWhichNow )
326326
return 1;
327327
} else if (m_orCondition) {
328328
OrCondition *pNext = m_orCondition->getNextOrCondition();
329-
if (pNext==NULL) return 0;
329+
if (pNext==nullptr) return 0;
330330
OrCondition *pCur = m_script->getOrCondition();
331-
OrCondition *pPrev = NULL;
331+
OrCondition *pPrev = nullptr;
332332
while (pCur != m_orCondition) {
333333
pPrev = pCur;
334334
pCur = pCur->getNextOrCondition();
@@ -356,14 +356,14 @@ Int ScriptConditionsDlg::doMoveUp( OrCondition **outWhichNow )
356356
if (m_condition && m_orCondition) {
357357
(*outWhichNow) = m_orCondition;
358358
Condition *pPrev = m_orCondition->findPreviousCondition(m_condition);
359-
if (pPrev == NULL) {
359+
if (pPrev == nullptr) {
360360
OrCondition *pNOr = m_script->findPreviousOrCondition(m_orCondition);
361361
if (!pNOr) {
362362
pNOr = newInstance( OrCondition);
363363
pNOr->setNextOrCondition(m_orCondition);
364364
m_script->setOrCondition(pNOr);
365365
}
366-
Condition *previous = pNOr->findPreviousCondition(NULL);
366+
Condition *previous = pNOr->findPreviousCondition(nullptr);
367367
if (previous) {
368368
m_orCondition->removeCondition(m_condition);
369369
previous->setNextCondition(m_condition);

0 commit comments

Comments
 (0)