Skip to content

Commit 4354953

Browse files
author
Ehsan Akhgari
committed
Bug 1118486 - Part 1: Use = delete instead of MOZ_DELETE directly; r=Waldo
Most of this patch (with the exception of dom/bindings/Codegen.py) was generated by the following bash script: #!/bin/bash function convert() { echo "Converting $1 to $2..." find . ! -wholename "*nsprpub*" \ ! -wholename "*security/nss*" \ ! -wholename "*/.hg*" \ ! -wholename "*/.git*" \ ! -wholename "obj-*" \ -type f \ \( -iname "*.cpp" \ -o -iname "*.h" \ -o -iname "*.cc" \ -o -iname "*.idl" \ -o -iname "*.ipdl" \ -o -iname "*.ipdlh" \ -o -iname "*.mm" \) | \ xargs -n 1 sed -i -e "s/\b$1\b/$2/g" } convert MOZ_DELETE '= delete'
1 parent 74817b5 commit 4354953

File tree

238 files changed

+882
-882
lines changed

Some content is hidden

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

238 files changed

+882
-882
lines changed

accessible/base/ARIAMap.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -243,9 +243,9 @@ class AttrIterator
243243
bool Next(nsAString& aAttrName, nsAString& aAttrValue);
244244

245245
private:
246-
AttrIterator() MOZ_DELETE;
247-
AttrIterator(const AttrIterator&) MOZ_DELETE;
248-
AttrIterator& operator= (const AttrIterator&) MOZ_DELETE;
246+
AttrIterator() = delete;
247+
AttrIterator(const AttrIterator&) = delete;
248+
AttrIterator& operator= (const AttrIterator&) = delete;
249249

250250
nsIContent* mContent;
251251
uint32_t mAttrIdx;

accessible/base/AccGroupInfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ class AccGroupInfo
7878
AccGroupInfo(Accessible* aItem, a11y::role aRole);
7979

8080
private:
81-
AccGroupInfo() MOZ_DELETE;
82-
AccGroupInfo(const AccGroupInfo&) MOZ_DELETE;
83-
AccGroupInfo& operator =(const AccGroupInfo&) MOZ_DELETE;
81+
AccGroupInfo() = delete;
82+
AccGroupInfo(const AccGroupInfo&) = delete;
83+
AccGroupInfo& operator =(const AccGroupInfo&) = delete;
8484

8585
static mozilla::a11y::role BaseRole(mozilla::a11y::role aRole)
8686
{

accessible/base/AccIterator.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -281,9 +281,9 @@ class ItemIterator : public AccIterable
281281
virtual Accessible* Next();
282282

283283
private:
284-
ItemIterator() MOZ_DELETE;
285-
ItemIterator(const ItemIterator&) MOZ_DELETE;
286-
ItemIterator& operator = (const ItemIterator&) MOZ_DELETE;
284+
ItemIterator() = delete;
285+
ItemIterator(const ItemIterator&) = delete;
286+
ItemIterator& operator = (const ItemIterator&) = delete;
287287

288288
Accessible* mContainer;
289289
Accessible* mAnchor;
@@ -303,9 +303,9 @@ class XULTreeItemIterator : public AccIterable
303303
virtual Accessible* Next();
304304

305305
private:
306-
XULTreeItemIterator() MOZ_DELETE;
307-
XULTreeItemIterator(const XULTreeItemIterator&) MOZ_DELETE;
308-
XULTreeItemIterator& operator = (const XULTreeItemIterator&) MOZ_DELETE;
306+
XULTreeItemIterator() = delete;
307+
XULTreeItemIterator(const XULTreeItemIterator&) = delete;
308+
XULTreeItemIterator& operator = (const XULTreeItemIterator&) = delete;
309309

310310
XULTreeAccessible* mXULTree;
311311
nsITreeView* mTreeView;

accessible/base/EventQueue.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ class EventQueue
3232
void ProcessEventQueue();
3333

3434
private:
35-
EventQueue(const EventQueue&) MOZ_DELETE;
36-
EventQueue& operator = (const EventQueue&) MOZ_DELETE;
35+
EventQueue(const EventQueue&) = delete;
36+
EventQueue& operator = (const EventQueue&) = delete;
3737

3838
// Event queue processing
3939
/**

accessible/base/Relation.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ class Relation
9595
}
9696

9797
private:
98-
Relation& operator = (const Relation&) MOZ_DELETE;
99-
Relation(const Relation&) MOZ_DELETE;
98+
Relation& operator = (const Relation&) = delete;
99+
Relation(const Relation&) = delete;
100100

101101
nsAutoPtr<AccIterable> mFirstIter;
102102
AccIterable* mLastIter;

accessible/base/StyleInfo.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ class StyleInfo
3232
static void FormatTextDecorationStyle(uint8_t aValue, nsAString& aFormattedValue);
3333

3434
private:
35-
StyleInfo() MOZ_DELETE;
36-
StyleInfo(const StyleInfo&) MOZ_DELETE;
37-
StyleInfo& operator = (const StyleInfo&) MOZ_DELETE;
35+
StyleInfo() = delete;
36+
StyleInfo(const StyleInfo&) = delete;
37+
StyleInfo& operator = (const StyleInfo&) = delete;
3838

3939
void Margin(Side aSide, nsAString& aValue);
4040

accessible/base/TextRange.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ class TextRange MOZ_FINAL
218218
{ mStartContainer = aContainer; mStartOffset = aOffset; }
219219

220220
private:
221-
TextRange(const TextRange& aRange) MOZ_DELETE;
222-
TextRange& operator=(const TextRange& aRange) MOZ_DELETE;
221+
TextRange(const TextRange& aRange) = delete;
222+
TextRange& operator=(const TextRange& aRange) = delete;
223223

224224
friend class HyperTextAccessible;
225225
friend class xpcAccessibleTextRange;

accessible/base/nsAccessiblePivot.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ class nsAccessiblePivot MOZ_FINAL : public nsIAccessiblePivot
3939

4040
private:
4141
~nsAccessiblePivot();
42-
nsAccessiblePivot() MOZ_DELETE;
43-
nsAccessiblePivot(const nsAccessiblePivot&) MOZ_DELETE;
44-
void operator = (const nsAccessiblePivot&) MOZ_DELETE;
42+
nsAccessiblePivot() = delete;
43+
nsAccessiblePivot(const nsAccessiblePivot&) = delete;
44+
void operator = (const nsAccessiblePivot&) = delete;
4545

4646
/*
4747
* Notify all observers on a pivot change. Return true if it has changed and

accessible/generic/Accessible.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1112,9 +1112,9 @@ class Accessible : public nsISupports
11121112
nsRoleMapEntry* mRoleMapEntry;
11131113

11141114
private:
1115-
Accessible() MOZ_DELETE;
1116-
Accessible(const Accessible&) MOZ_DELETE;
1117-
Accessible& operator =(const Accessible&) MOZ_DELETE;
1115+
Accessible() = delete;
1116+
Accessible(const Accessible&) = delete;
1117+
Accessible& operator =(const Accessible&) = delete;
11181118

11191119
};
11201120

accessible/windows/msaa/EnumVariant.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class ChildrenEnumVariant MOZ_FINAL : public IEnumVARIANT
4040
/* [out] */ IEnumVARIANT** aEnumVaraint);
4141

4242
private:
43-
ChildrenEnumVariant() MOZ_DELETE;
44-
ChildrenEnumVariant& operator =(const ChildrenEnumVariant&) MOZ_DELETE;
43+
ChildrenEnumVariant() = delete;
44+
ChildrenEnumVariant& operator =(const ChildrenEnumVariant&) = delete;
4545

4646
ChildrenEnumVariant(const ChildrenEnumVariant& aEnumVariant) :
4747
mAnchorAcc(aEnumVariant.mAnchorAcc), mCurAcc(aEnumVariant.mCurAcc),

0 commit comments

Comments
 (0)