Skip to content

Commit 6d75848

Browse files
jswaldenjswalden
committed
Bug 348748 - Replace all instances of NS_STATIC_CAST and friends with C++ casts (and simultaneously bitrot nearly every patch in existence). r=bsmedberg on the script that did this. Tune in next time for Macro Wars: Episode II: Attack on the LL_* Macros.
1 parent 1df32e6 commit 6d75848

File tree

934 files changed

+5429
-5468
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

934 files changed

+5429
-5468
lines changed

‎accessible/src/atk/nsAccessibleWrap.cpp‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -376,8 +376,8 @@ NS_IMETHODIMP nsAccessibleWrap::GetNativeInterface(void **aOutAccessible)
376376
GType type = GetMaiAtkType(CreateMaiInterfaces());
377377
NS_ENSURE_TRUE(type, NS_ERROR_FAILURE);
378378
mAtkObject =
379-
NS_REINTERPRET_CAST(AtkObject *,
380-
g_object_new(type, NULL));
379+
reinterpret_cast<AtkObject *>
380+
(g_object_new(type, NULL));
381381
NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY);
382382

383383
atk_object_initialize(mAtkObject, this);
@@ -394,7 +394,7 @@ nsAccessibleWrap::GetAtkObject(void)
394394
{
395395
void *atkObj = nsnull;
396396
GetNativeInterface(&atkObj);
397-
return NS_STATIC_CAST(AtkObject *, atkObj);
397+
return static_cast<AtkObject *>(atkObj);
398398
}
399399

400400
// Get AtkObject from nsIAccessible interface
@@ -690,7 +690,7 @@ initializeCB(AtkObject *aAtkObj, gpointer aData)
690690

691691
/* initialize object */
692692
MAI_ATK_OBJECT(aAtkObj)->accWrap =
693-
NS_STATIC_CAST(nsAccessibleWrap*, aData);
693+
static_cast<nsAccessibleWrap*>(aData);
694694

695695
#ifdef MAI_LOGGING
696696
++sMaiAtkObjCreated;
@@ -782,7 +782,7 @@ getRoleCB(AtkObject *aAtkObj)
782782
atkRole = atkRoleMap[accRole]; // map to the actual value
783783
NS_ASSERTION(atkRoleMap[nsIAccessibleRole::ROLE_LAST_ENTRY] ==
784784
kROLE_ATK_LAST_ENTRY, "ATK role map skewed");
785-
aAtkObj->role = NS_STATIC_CAST(AtkRole, atkRole);
785+
aAtkObj->role = static_cast<AtkRole>(atkRole);
786786
}
787787
return aAtkObj->role;
788788
}
@@ -967,7 +967,7 @@ getIndexInParentCB(AtkObject *aAtkObj)
967967

968968
PRInt32 currentIndex = 0;
969969

970-
while (sibling != NS_STATIC_CAST(nsIAccessible*, accWrap)) {
970+
while (sibling != static_cast<nsIAccessible*>(accWrap)) {
971971
NS_ASSERTION(sibling, "Never ran into the same child that we started from");
972972

973973
if (!sibling) {
@@ -1060,7 +1060,7 @@ refRelationSetCB(AtkObject *aAtkObj)
10601060
};
10611061

10621062
for (PRUint32 i = 0; i < NS_ARRAY_LENGTH(relationType); i++) {
1063-
relation = atk_relation_set_get_relation_by_type(relation_set, NS_STATIC_CAST(AtkRelationType, relationType[i]));
1063+
relation = atk_relation_set_get_relation_by_type(relation_set, static_cast<AtkRelationType>(relationType[i]));
10641064
if (relation) {
10651065
atk_relation_set_remove(relation_set, relation);
10661066
}
@@ -1070,7 +1070,7 @@ refRelationSetCB(AtkObject *aAtkObj)
10701070
if (NS_SUCCEEDED(rv) && accRelated) {
10711071
accessible_array[0] = nsAccessibleWrap::GetAtkObject(accRelated);
10721072
relation = atk_relation_new(accessible_array, 1,
1073-
NS_STATIC_CAST(AtkRelationType, relationType[i]));
1073+
static_cast<AtkRelationType>(relationType[i]));
10741074
atk_relation_set_add(relation_set, relation);
10751075
g_object_unref(relation);
10761076
}
@@ -1096,7 +1096,7 @@ nsAccessibleWrap *GetAccessibleWrap(AtkObject *aAtkObj)
10961096
nsRefPtr<nsApplicationAccessibleWrap> appAccWrap =
10971097
nsAccessNode::GetApplicationAccessible();
10981098
nsAccessibleWrap* tmpAppAccWrap =
1099-
NS_STATIC_CAST(nsAccessibleWrap*, appAccWrap.get());
1099+
static_cast<nsAccessibleWrap*>(appAccWrap.get());
11001100

11011101
if (tmpAppAccWrap != tmpAccWrap && !tmpAccWrap->IsValidObject())
11021102
return nsnull;
@@ -1118,7 +1118,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
11181118
rv = aEvent->GetEventType(&type);
11191119
NS_ENSURE_SUCCESS(rv, rv);
11201120

1121-
nsAccEvent *event = NS_REINTERPRET_CAST(nsAccEvent*, aEvent);
1121+
nsAccEvent *event = reinterpret_cast<nsAccEvent*>(aEvent);
11221122
void *eventData = event->mEventData;
11231123

11241124
AtkObject *atkObj = nsAccessibleWrap::GetAtkObject(accessible);
@@ -1215,7 +1215,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
12151215
if (!eventData)
12161216
break;
12171217

1218-
pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
1218+
pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
12191219

12201220
g_signal_emit_by_name(atkObj,
12211221
"row_inserted",
@@ -1231,7 +1231,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
12311231
if (!eventData)
12321232
break;
12331233

1234-
pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
1234+
pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
12351235

12361236
g_signal_emit_by_name(atkObj,
12371237
"row_deleted",
@@ -1252,7 +1252,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
12521252
if (!eventData)
12531253
break;
12541254

1255-
pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
1255+
pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
12561256

12571257
g_signal_emit_by_name(atkObj,
12581258
"column_inserted",
@@ -1268,7 +1268,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
12681268
if (!eventData)
12691269
break;
12701270

1271-
pAtkTableChange = NS_REINTERPRET_CAST(AtkTableChange *, eventData);
1271+
pAtkTableChange = reinterpret_cast<AtkTableChange *>(eventData);
12721272

12731273
g_signal_emit_by_name(atkObj,
12741274
"column_deleted",
@@ -1321,7 +1321,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
13211321
{
13221322
MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_ACTIVATED\n"));
13231323
nsDocAccessibleWrap *accDocWrap =
1324-
NS_STATIC_CAST(nsDocAccessibleWrap *, accessible.get());
1324+
static_cast<nsDocAccessibleWrap *>(accessible.get());
13251325
accDocWrap->mActivated = PR_TRUE;
13261326
guint id = g_signal_lookup ("activate", MAI_TYPE_ATK_OBJECT);
13271327
g_signal_emit(atkObj, id, 0);
@@ -1331,7 +1331,7 @@ nsAccessibleWrap::FireAccessibleEvent(nsIAccessibleEvent *aEvent)
13311331
{
13321332
MAI_LOG_DEBUG(("\n\nReceived: EVENT_WINDOW_DEACTIVATED\n"));
13331333
nsDocAccessibleWrap *accDocWrap =
1334-
NS_STATIC_CAST(nsDocAccessibleWrap *, accessible.get());
1334+
static_cast<nsDocAccessibleWrap *>(accessible.get());
13351335
accDocWrap->mActivated = PR_FALSE;
13361336
guint id = g_signal_lookup ("deactivate", MAI_TYPE_ATK_OBJECT);
13371337
g_signal_emit(atkObj, id, 0);
@@ -1457,9 +1457,9 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent,
14571457
AtkPropertyValues values = { NULL };
14581458
nsAccessibleWrap *oldAccWrap = nsnull, *newAccWrap = nsnull;
14591459

1460-
nsAccEvent *event = NS_REINTERPRET_CAST(nsAccEvent*, aEvent);
1460+
nsAccEvent *event = reinterpret_cast<nsAccEvent*>(aEvent);
14611461

1462-
pAtkPropChange = NS_REINTERPRET_CAST(AtkPropertyChange *, event->mEventData);
1462+
pAtkPropChange = reinterpret_cast<AtkPropertyChange *>(event->mEventData);
14631463
values.property_name = sAtkPropertyNameArray[pAtkPropChange->type];
14641464

14651465
NS_ASSERTION(pAtkPropChange, "Event needs event data");
@@ -1474,12 +1474,12 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent,
14741474
case PROP_TABLE_SUMMARY:
14751475

14761476
if (pAtkPropChange->oldvalue)
1477-
oldAccWrap = NS_REINTERPRET_CAST(nsAccessibleWrap *,
1478-
pAtkPropChange->oldvalue);
1477+
oldAccWrap = reinterpret_cast<nsAccessibleWrap *>
1478+
(pAtkPropChange->oldvalue);
14791479

14801480
if (pAtkPropChange->newvalue)
1481-
newAccWrap = NS_REINTERPRET_CAST(nsAccessibleWrap *,
1482-
pAtkPropChange->newvalue);
1481+
newAccWrap = reinterpret_cast<nsAccessibleWrap *>
1482+
(pAtkPropChange->newvalue);
14831483

14841484
if (oldAccWrap && newAccWrap) {
14851485
g_value_init(&values.old_value, G_TYPE_POINTER);
@@ -1497,8 +1497,8 @@ nsAccessibleWrap::FireAtkPropChangedEvent(nsIAccessibleEvent *aEvent,
14971497
case PROP_TABLE_ROW_DESCRIPTION:
14981498
g_value_init(&values.new_value, G_TYPE_INT);
14991499
g_value_set_int(&values.new_value,
1500-
*NS_REINTERPRET_CAST(gint *,
1501-
pAtkPropChange->newvalue));
1500+
*reinterpret_cast<gint *>
1501+
(pAtkPropChange->newvalue));
15021502
break;
15031503

15041504
//Perhaps need more cases in the future

‎accessible/src/atk/nsAppRootAccessible.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@ nsApplicationAccessibleWrap::GetNativeInterface(void **aOutAccessible)
569569

570570
if (!mAtkObject) {
571571
mAtkObject =
572-
NS_REINTERPRET_CAST(AtkObject *,
573-
g_object_new(MAI_TYPE_ATK_OBJECT, NULL));
572+
reinterpret_cast<AtkObject *>
573+
(g_object_new(MAI_TYPE_ATK_OBJECT, NULL));
574574
NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY);
575575

576576
atk_object_initialize(mAtkObject, this);

‎accessible/src/atk/nsMaiHyperlink.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ MaiHyperlink::GetAtkHyperlink(void)
150150
return nsnull;
151151

152152
mMaiAtkHyperlink =
153-
NS_REINTERPRET_CAST(AtkHyperlink *,
154-
g_object_new(mai_atk_hyperlink_get_type(), NULL));
153+
reinterpret_cast<AtkHyperlink *>
154+
(g_object_new(mai_atk_hyperlink_get_type(), NULL));
155155
NS_ASSERTION(mMaiAtkHyperlink, "OUT OF MEMORY");
156156
NS_ENSURE_TRUE(mMaiAtkHyperlink, nsnull);
157157

@@ -260,7 +260,7 @@ getEndIndexCB(AtkHyperlink *aLink)
260260
PRInt32 endIndex = -1;
261261
nsresult rv = accHyperlink->GetEndIndex(&endIndex);
262262

263-
return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, endIndex);
263+
return (NS_FAILED(rv)) ? -1 : static_cast<gint>(endIndex);
264264
}
265265

266266
gint
@@ -272,7 +272,7 @@ getStartIndexCB(AtkHyperlink *aLink)
272272
PRInt32 startIndex = -1;
273273
nsresult rv = accHyperlink->GetStartIndex(&startIndex);
274274

275-
return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, startIndex);
275+
return (NS_FAILED(rv)) ? -1 : static_cast<gint>(startIndex);
276276
}
277277

278278
gboolean
@@ -283,7 +283,7 @@ isValidCB(AtkHyperlink *aLink)
283283

284284
PRBool isValid = PR_FALSE;
285285
nsresult rv = accHyperlink->IsValid(&isValid);
286-
return (NS_FAILED(rv)) ? FALSE : NS_STATIC_CAST(gboolean, isValid);
286+
return (NS_FAILED(rv)) ? FALSE : static_cast<gboolean>(isValid);
287287
}
288288

289289
gint
@@ -294,7 +294,7 @@ getAnchorCountCB(AtkHyperlink *aLink)
294294

295295
PRInt32 count = -1;
296296
nsresult rv = accHyperlink->GetAnchors(&count);
297-
return (NS_FAILED(rv)) ? -1 : NS_STATIC_CAST(gint, count);
297+
return (NS_FAILED(rv)) ? -1 : static_cast<gint>(count);
298298
}
299299

300300
// Check if aHyperlink is a valid MaiHyperlink, and return the

‎accessible/src/atk/nsMaiInterfaceAction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ getActionCountCB(AtkAction *aAction)
7575

7676
PRUint8 num = 0;
7777
nsresult rv = accWrap->GetNumActions(&num);
78-
return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, num);
78+
return (NS_FAILED(rv)) ? 0 : static_cast<gint>(num);
7979
}
8080

8181
const gchar *

‎accessible/src/atk/nsMaiInterfaceTable.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ getIndexAtCB(AtkTable *aTable, gint aRow, gint aColumn)
108108
nsresult rv = accTable->GetIndexAt(aRow, aColumn, &index);
109109
NS_ENSURE_SUCCESS(rv, -1);
110110

111-
return NS_STATIC_CAST(gint, index);
111+
return static_cast<gint>(index);
112112
}
113113

114114
gint
@@ -127,7 +127,7 @@ getColumnAtIndexCB(AtkTable *aTable, gint aIndex)
127127
nsresult rv = accTable->GetColumnAtIndex(aIndex, &col);
128128
NS_ENSURE_SUCCESS(rv, -1);
129129

130-
return NS_STATIC_CAST(gint, col);
130+
return static_cast<gint>(col);
131131
}
132132

133133
gint
@@ -146,7 +146,7 @@ getRowAtIndexCB(AtkTable *aTable, gint aIndex)
146146
nsresult rv = accTable->GetRowAtIndex(aIndex, &row);
147147
NS_ENSURE_SUCCESS(rv, -1);
148148

149-
return NS_STATIC_CAST(gint, row);
149+
return static_cast<gint>(row);
150150
}
151151

152152
gint
@@ -165,7 +165,7 @@ getColumnCountCB(AtkTable *aTable)
165165
nsresult rv = accTable->GetColumns(&count);
166166
NS_ENSURE_SUCCESS(rv, -1);
167167

168-
return NS_STATIC_CAST(gint, count);
168+
return static_cast<gint>(count);
169169
}
170170

171171
gint
@@ -184,7 +184,7 @@ getRowCountCB(AtkTable *aTable)
184184
nsresult rv = accTable->GetRows(&count);
185185
NS_ENSURE_SUCCESS(rv, -1);
186186

187-
return NS_STATIC_CAST(gint, count);
187+
return static_cast<gint>(count);
188188
}
189189

190190
gint
@@ -204,7 +204,7 @@ getColumnExtentAtCB(AtkTable *aTable,
204204
nsresult rv = accTable->GetColumnExtentAt(aRow, aColumn, &extent);
205205
NS_ENSURE_SUCCESS(rv, -1);
206206

207-
return NS_STATIC_CAST(gint, extent);
207+
return static_cast<gint>(extent);
208208
}
209209

210210
gint
@@ -224,7 +224,7 @@ getRowExtentAtCB(AtkTable *aTable,
224224
nsresult rv = accTable->GetRowExtentAt(aRow, aColumn, &extent);
225225
NS_ENSURE_SUCCESS(rv, -1);
226226

227-
return NS_STATIC_CAST(gint, extent);
227+
return static_cast<gint>(extent);
228228
}
229229

230230
AtkObject*
@@ -375,7 +375,7 @@ getSelectedColumnsCB(AtkTable *aTable, gint **aSelected)
375375

376376
//copy
377377
for (PRUint32 index = 0; index < size; ++index)
378-
atkColumns[index] = NS_STATIC_CAST(gint, columns[index]);
378+
atkColumns[index] = static_cast<gint>(columns[index]);
379379
nsMemory::Free(columns);
380380

381381
*aSelected = atkColumns;
@@ -410,7 +410,7 @@ getSelectedRowsCB(AtkTable *aTable, gint **aSelected)
410410

411411
//copy
412412
for (PRUint32 index = 0; index < size; ++index)
413-
atkRows[index] = NS_STATIC_CAST(gint, rows[index]);
413+
atkRows[index] = static_cast<gint>(rows[index]);
414414
nsMemory::Free(rows);
415415

416416
*aSelected = atkRows;
@@ -431,7 +431,7 @@ isColumnSelectedCB(AtkTable *aTable, gint aColumn)
431431

432432
PRBool outValue;
433433
nsresult rv = accTable->IsColumnSelected(aColumn, &outValue);
434-
return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue);
434+
return NS_FAILED(rv) ? FALSE : static_cast<gboolean>(outValue);
435435
}
436436

437437
gboolean
@@ -448,7 +448,7 @@ isRowSelectedCB(AtkTable *aTable, gint aRow)
448448

449449
PRBool outValue;
450450
nsresult rv = accTable->IsRowSelected(aRow, &outValue);
451-
return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue);
451+
return NS_FAILED(rv) ? FALSE : static_cast<gboolean>(outValue);
452452
}
453453

454454
gboolean
@@ -465,5 +465,5 @@ isCellSelectedCB(AtkTable *aTable, gint aRow, gint aColumn)
465465

466466
PRBool outValue;
467467
nsresult rv = accTable->IsCellSelected(aRow, aColumn, &outValue);
468-
return NS_FAILED(rv) ? FALSE : NS_STATIC_CAST(gboolean, outValue);
468+
return NS_FAILED(rv) ? FALSE : static_cast<gboolean>(outValue);
469469
}

‎accessible/src/atk/nsMaiInterfaceText.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void ConvertTexttoAsterisks(nsAccessibleWrap* accWrap, nsAString& aString)
7979
// convert each char to "*" when it's "password text"
8080
PRUint32 accRole;
8181
accWrap->GetRole(&accRole);
82-
if (NS_STATIC_CAST(AtkRole, accRole) == ATK_ROLE_PASSWORD_TEXT) {
82+
if (static_cast<AtkRole>(accRole) == ATK_ROLE_PASSWORD_TEXT) {
8383
for (PRUint32 i = 0; i < aString.Length(); i++)
8484
aString.Replace(i, 1, NS_LITERAL_STRING("*"));
8585
}
@@ -187,11 +187,11 @@ getCharacterAtOffsetCB(AtkText *aText, gint aOffset)
187187
// convert char to "*" when it's "password text"
188188
PRUint32 accRole;
189189
accWrap->GetRole(&accRole);
190-
if (NS_STATIC_CAST(AtkRole, accRole) == ATK_ROLE_PASSWORD_TEXT) {
190+
if (static_cast<AtkRole>(accRole) == ATK_ROLE_PASSWORD_TEXT) {
191191
uniChar = '*';
192192
}
193193

194-
return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gunichar, uniChar);
194+
return (NS_FAILED(rv)) ? 0 : static_cast<gunichar>(uniChar);
195195
}
196196

197197
gchar *
@@ -237,7 +237,7 @@ getCaretOffsetCB(AtkText *aText)
237237

238238
PRInt32 offset;
239239
nsresult rv = accText->GetCaretOffset(&offset);
240-
return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, offset);
240+
return (NS_FAILED(rv)) ? 0 : static_cast<gint>(offset);
241241
}
242242

243243
AtkAttributeSet *
@@ -358,7 +358,7 @@ getCharacterCountCB(AtkText *aText)
358358

359359
PRInt32 count = 0;
360360
nsresult rv = accText->GetCharacterCount(&count);
361-
return (NS_FAILED(rv)) ? 0 : NS_STATIC_CAST(gint, count);
361+
return (NS_FAILED(rv)) ? 0 : static_cast<gint>(count);
362362
}
363363

364364
gint
@@ -383,7 +383,7 @@ getOffsetAtPointCB(AtkText *aText,
383383
geckoCoordType = nsIAccessibleCoordinateType::COORDTYPE_WINDOW_RELATIVE;
384384

385385
accText->GetOffsetAtPoint(aX, aY, geckoCoordType, &offset);
386-
return NS_STATIC_CAST(gint, offset);
386+
return static_cast<gint>(offset);
387387
}
388388

389389
gint

0 commit comments

Comments
 (0)