Skip to content

Commit e226046

Browse files
sylvestresylvestre
committed
Bug 1547143 - Format the tree: Be prescriptive with the pointer style (left) r=Ehsan
# ignore-this-changeset Depends on D28954 Differential Revision: https://phabricator.services.mozilla.com/D28956 --HG-- extra : moz-landing-system : lando
1 parent 130a9e0 commit e226046

File tree

1,031 files changed

+26916
-26999
lines changed

Some content is hidden

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

1,031 files changed

+26916
-26999
lines changed

‎accessible/atk/UtilInterface.cpp

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ typedef AtkUtilClass MaiUtilClass;
2424

2525
extern "C" {
2626
static guint (*gail_add_global_event_listener)(GSignalEmissionHook listener,
27-
const gchar *event_type);
27+
const gchar* event_type);
2828
static void (*gail_remove_global_event_listener)(guint remove_listener);
2929
static void (*gail_remove_key_event_listener)(guint remove_listener);
30-
static AtkObject *(*gail_get_root)();
30+
static AtkObject* (*gail_get_root)();
3131
}
3232

3333
struct MaiUtilListenerInfo {
@@ -41,13 +41,13 @@ struct MaiUtilListenerInfo {
4141
guint gail_listenerid;
4242
};
4343

44-
static GHashTable *sListener_list = nullptr;
44+
static GHashTable* sListener_list = nullptr;
4545
static gint sListener_idx = 1;
4646

4747
extern "C" {
4848
static guint add_listener(GSignalEmissionHook listener,
49-
const gchar *object_type, const gchar *signal,
50-
const gchar *hook_data, guint gail_listenerid = 0) {
49+
const gchar* object_type, const gchar* signal,
50+
const gchar* hook_data, guint gail_listenerid = 0) {
5151
GType type;
5252
guint signal_id;
5353
gint rc = 0;
@@ -56,12 +56,12 @@ static guint add_listener(GSignalEmissionHook listener,
5656
if (type) {
5757
signal_id = g_signal_lookup(signal, type);
5858
if (signal_id > 0) {
59-
MaiUtilListenerInfo *listener_info;
59+
MaiUtilListenerInfo* listener_info;
6060

6161
rc = sListener_idx;
6262

6363
listener_info =
64-
(MaiUtilListenerInfo *)g_malloc(sizeof(MaiUtilListenerInfo));
64+
(MaiUtilListenerInfo*)g_malloc(sizeof(MaiUtilListenerInfo));
6565
listener_info->key = sListener_idx;
6666
listener_info->hook_id = g_signal_add_emission_hook(
6767
signal_id, 0, listener, g_strdup(hook_data), (GDestroyNotify)g_free);
@@ -80,9 +80,9 @@ static guint add_listener(GSignalEmissionHook listener,
8080
}
8181

8282
static guint mai_util_add_global_event_listener(GSignalEmissionHook listener,
83-
const gchar *event_type) {
83+
const gchar* event_type) {
8484
guint rc = 0;
85-
gchar **split_string;
85+
gchar** split_string;
8686

8787
split_string = g_strsplit(event_type, ":", 3);
8888

@@ -106,11 +106,11 @@ static guint mai_util_add_global_event_listener(GSignalEmissionHook listener,
106106

107107
static void mai_util_remove_global_event_listener(guint remove_listener) {
108108
if (remove_listener > 0) {
109-
MaiUtilListenerInfo *listener_info;
109+
MaiUtilListenerInfo* listener_info;
110110
gint tmp_idx = remove_listener;
111111

112112
listener_info =
113-
(MaiUtilListenerInfo *)g_hash_table_lookup(sListener_list, &tmp_idx);
113+
(MaiUtilListenerInfo*)g_hash_table_lookup(sListener_list, &tmp_idx);
114114

115115
if (listener_info != nullptr) {
116116
if (gail_remove_global_event_listener && listener_info->gail_listenerid) {
@@ -144,8 +144,8 @@ static void mai_util_remove_global_event_listener(guint remove_listener) {
144144
}
145145
}
146146

147-
static AtkKeyEventStruct *atk_key_event_from_gdk_event_key(GdkEventKey *key) {
148-
AtkKeyEventStruct *event = g_new0(AtkKeyEventStruct, 1);
147+
static AtkKeyEventStruct* atk_key_event_from_gdk_event_key(GdkEventKey* key) {
148+
AtkKeyEventStruct* event = g_new0(AtkKeyEventStruct, 1);
149149
switch (key->type) {
150150
case GDK_KEY_PRESS:
151151
event->type = ATK_KEY_EVENT_PRESS;
@@ -173,7 +173,7 @@ static AtkKeyEventStruct *atk_key_event_from_gdk_event_key(GdkEventKey *key) {
173173
}
174174

175175
struct MaiKeyEventInfo {
176-
AtkKeyEventStruct *key_event;
176+
AtkKeyEventStruct* key_event;
177177
gpointer func_data;
178178
};
179179

@@ -183,28 +183,28 @@ union AtkKeySnoopFuncPointer {
183183
};
184184

185185
static gboolean notify_hf(gpointer key, gpointer value, gpointer data) {
186-
MaiKeyEventInfo *info = (MaiKeyEventInfo *)data;
186+
MaiKeyEventInfo* info = (MaiKeyEventInfo*)data;
187187
AtkKeySnoopFuncPointer atkKeySnoop;
188188
atkKeySnoop.data = value;
189189
return (atkKeySnoop.func_ptr)(info->key_event, info->func_data) ? TRUE
190190
: FALSE;
191191
}
192192

193193
static void insert_hf(gpointer key, gpointer value, gpointer data) {
194-
GHashTable *new_table = (GHashTable *)data;
194+
GHashTable* new_table = (GHashTable*)data;
195195
g_hash_table_insert(new_table, key, value);
196196
}
197197

198-
static GHashTable *sKey_listener_list = nullptr;
198+
static GHashTable* sKey_listener_list = nullptr;
199199

200-
static gint mai_key_snooper(GtkWidget *the_widget, GdkEventKey *event,
200+
static gint mai_key_snooper(GtkWidget* the_widget, GdkEventKey* event,
201201
gpointer func_data) {
202202
/* notify each AtkKeySnoopFunc in turn... */
203203

204-
MaiKeyEventInfo *info = g_new0(MaiKeyEventInfo, 1);
204+
MaiKeyEventInfo* info = g_new0(MaiKeyEventInfo, 1);
205205
gint consumed = 0;
206206
if (sKey_listener_list) {
207-
GHashTable *new_hash = g_hash_table_new(nullptr, nullptr);
207+
GHashTable* new_hash = g_hash_table_new(nullptr, nullptr);
208208
g_hash_table_foreach(sKey_listener_list, insert_hf, new_hash);
209209
info->key_event = atk_key_event_from_gdk_event_key(event);
210210
info->func_data = func_data;
@@ -257,8 +257,8 @@ static void mai_util_remove_key_event_listener(guint remove_listener) {
257257
}
258258
}
259259

260-
static AtkObject *mai_util_get_root() {
261-
ApplicationAccessible *app = ApplicationAcc();
260+
static AtkObject* mai_util_get_root() {
261+
ApplicationAccessible* app = ApplicationAcc();
262262
if (app) return app->GetAtkObject();
263263

264264
// We've shutdown, try to use gail instead
@@ -269,28 +269,28 @@ static AtkObject *mai_util_get_root() {
269269
return nullptr;
270270
}
271271

272-
static const gchar *mai_util_get_toolkit_name() { return MAI_NAME; }
272+
static const gchar* mai_util_get_toolkit_name() { return MAI_NAME; }
273273

274-
static const gchar *mai_util_get_toolkit_version() { return MAI_VERSION; }
274+
static const gchar* mai_util_get_toolkit_version() { return MAI_VERSION; }
275275

276276
static void _listener_info_destroy(gpointer data) { g_free(data); }
277277

278-
static void window_added(AtkObject *atk_obj, guint index, AtkObject *child) {
278+
static void window_added(AtkObject* atk_obj, guint index, AtkObject* child) {
279279
if (!IS_MAI_OBJECT(child)) return;
280280

281281
static guint id = g_signal_lookup("create", MAI_TYPE_ATK_OBJECT);
282282
g_signal_emit(child, id, 0);
283283
}
284284

285-
static void window_removed(AtkObject *atk_obj, guint index, AtkObject *child) {
285+
static void window_removed(AtkObject* atk_obj, guint index, AtkObject* child) {
286286
if (!IS_MAI_OBJECT(child)) return;
287287

288288
static guint id = g_signal_lookup("destroy", MAI_TYPE_ATK_OBJECT);
289289
g_signal_emit(child, id, 0);
290290
}
291291

292-
static void UtilInterfaceInit(MaiUtilClass *klass) {
293-
AtkUtilClass *atk_class;
292+
static void UtilInterfaceInit(MaiUtilClass* klass) {
293+
AtkUtilClass* atk_class;
294294
gpointer data;
295295

296296
data = g_type_class_peek(ATK_TYPE_UTIL);
@@ -314,7 +314,7 @@ static void UtilInterfaceInit(MaiUtilClass *klass) {
314314
sListener_list = g_hash_table_new_full(g_int_hash, g_int_equal, nullptr,
315315
_listener_info_destroy);
316316
// Keep track of added/removed windows.
317-
AtkObject *root = atk_get_root();
317+
AtkObject* root = atk_get_root();
318318
g_signal_connect(root, "children-changed::add", (GCallback)window_added,
319319
nullptr);
320320
g_signal_connect(root, "children-changed::remove", (GCallback)window_removed,

‎accessible/atk/nsMaiHyperlink.cpp

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ struct MaiAtkHyperlink {
3838
* The MaiHyperlink whose properties and features are exported via this
3939
* hyperlink instance.
4040
*/
41-
MaiHyperlink *maiHyperlink;
41+
MaiHyperlink* maiHyperlink;
4242
};
4343

4444
struct MaiAtkHyperlinkClass {
@@ -49,23 +49,23 @@ GType mai_atk_hyperlink_get_type(void);
4949

5050
G_BEGIN_DECLS
5151
/* callbacks for AtkHyperlink */
52-
static void classInitCB(AtkHyperlinkClass *aClass);
53-
static void finalizeCB(GObject *aObj);
52+
static void classInitCB(AtkHyperlinkClass* aClass);
53+
static void finalizeCB(GObject* aObj);
5454

5555
/* callbacks for AtkHyperlink virtual functions */
56-
static gchar *getUriCB(AtkHyperlink *aLink, gint aLinkIndex);
57-
static AtkObject *getObjectCB(AtkHyperlink *aLink, gint aLinkIndex);
58-
static gint getEndIndexCB(AtkHyperlink *aLink);
59-
static gint getStartIndexCB(AtkHyperlink *aLink);
60-
static gboolean isValidCB(AtkHyperlink *aLink);
61-
static gint getAnchorCountCB(AtkHyperlink *aLink);
56+
static gchar* getUriCB(AtkHyperlink* aLink, gint aLinkIndex);
57+
static AtkObject* getObjectCB(AtkHyperlink* aLink, gint aLinkIndex);
58+
static gint getEndIndexCB(AtkHyperlink* aLink);
59+
static gint getStartIndexCB(AtkHyperlink* aLink);
60+
static gboolean isValidCB(AtkHyperlink* aLink);
61+
static gint getAnchorCountCB(AtkHyperlink* aLink);
6262
G_END_DECLS
6363

6464
static gpointer parent_class = nullptr;
6565

66-
static MaiHyperlink *GetMaiHyperlink(AtkHyperlink *aHyperlink) {
66+
static MaiHyperlink* GetMaiHyperlink(AtkHyperlink* aHyperlink) {
6767
NS_ENSURE_TRUE(MAI_IS_ATK_HYPERLINK(aHyperlink), nullptr);
68-
MaiHyperlink *maiHyperlink = MAI_ATK_HYPERLINK(aHyperlink)->maiHyperlink;
68+
MaiHyperlink* maiHyperlink = MAI_ATK_HYPERLINK(aHyperlink)->maiHyperlink;
6969
NS_ENSURE_TRUE(maiHyperlink != nullptr, nullptr);
7070
NS_ENSURE_TRUE(maiHyperlink->GetAtkHyperlink() == aHyperlink, nullptr);
7171
return maiHyperlink;
@@ -96,7 +96,7 @@ GType mai_atk_hyperlink_get_type(void) {
9696

9797
MaiHyperlink::MaiHyperlink(AccessibleOrProxy aHyperLink)
9898
: mHyperlink(aHyperLink), mMaiAtkHyperlink(nullptr) {
99-
mMaiAtkHyperlink = reinterpret_cast<AtkHyperlink *>(
99+
mMaiAtkHyperlink = reinterpret_cast<AtkHyperlink*>(
100100
g_object_new(mai_atk_hyperlink_get_type(), nullptr));
101101
NS_ASSERTION(mMaiAtkHyperlink, "OUT OF MEMORY");
102102
if (!mMaiAtkHyperlink) return;
@@ -113,8 +113,8 @@ MaiHyperlink::~MaiHyperlink() {
113113

114114
/* static functions for ATK callbacks */
115115

116-
void classInitCB(AtkHyperlinkClass *aClass) {
117-
GObjectClass *gobject_class = G_OBJECT_CLASS(aClass);
116+
void classInitCB(AtkHyperlinkClass* aClass) {
117+
GObjectClass* gobject_class = G_OBJECT_CLASS(aClass);
118118

119119
parent_class = g_type_class_peek_parent(aClass);
120120

@@ -128,24 +128,24 @@ void classInitCB(AtkHyperlinkClass *aClass) {
128128
gobject_class->finalize = finalizeCB;
129129
}
130130

131-
void finalizeCB(GObject *aObj) {
131+
void finalizeCB(GObject* aObj) {
132132
NS_ASSERTION(MAI_IS_ATK_HYPERLINK(aObj), "Invalid MaiAtkHyperlink");
133133
if (!MAI_IS_ATK_HYPERLINK(aObj)) return;
134134

135-
MaiAtkHyperlink *maiAtkHyperlink = MAI_ATK_HYPERLINK(aObj);
135+
MaiAtkHyperlink* maiAtkHyperlink = MAI_ATK_HYPERLINK(aObj);
136136
maiAtkHyperlink->maiHyperlink = nullptr;
137137

138138
/* call parent finalize function */
139139
if (G_OBJECT_CLASS(parent_class)->finalize)
140140
G_OBJECT_CLASS(parent_class)->finalize(aObj);
141141
}
142142

143-
gchar *getUriCB(AtkHyperlink *aLink, gint aLinkIndex) {
144-
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
143+
gchar* getUriCB(AtkHyperlink* aLink, gint aLinkIndex) {
144+
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
145145
if (!maiLink) return nullptr;
146146

147147
nsAutoCString cautoStr;
148-
if (Accessible *hyperlink = maiLink->GetAccHyperlink()) {
148+
if (Accessible* hyperlink = maiLink->GetAccHyperlink()) {
149149
nsCOMPtr<nsIURI> uri = hyperlink->AnchorURIAt(aLinkIndex);
150150
if (!uri) return nullptr;
151151

@@ -162,62 +162,62 @@ gchar *getUriCB(AtkHyperlink *aLink, gint aLinkIndex) {
162162
return g_strdup(cautoStr.get());
163163
}
164164

165-
AtkObject *getObjectCB(AtkHyperlink *aLink, gint aLinkIndex) {
166-
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
165+
AtkObject* getObjectCB(AtkHyperlink* aLink, gint aLinkIndex) {
166+
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
167167
if (!maiLink) {
168168
return nullptr;
169169
}
170170

171-
if (Accessible *hyperlink = maiLink->GetAccHyperlink()) {
172-
Accessible *anchor = hyperlink->AnchorAt(aLinkIndex);
171+
if (Accessible* hyperlink = maiLink->GetAccHyperlink()) {
172+
Accessible* anchor = hyperlink->AnchorAt(aLinkIndex);
173173
NS_ENSURE_TRUE(anchor, nullptr);
174174

175175
return AccessibleWrap::GetAtkObject(anchor);
176176
}
177177

178-
ProxyAccessible *anchor = maiLink->Proxy()->AnchorAt(aLinkIndex);
178+
ProxyAccessible* anchor = maiLink->Proxy()->AnchorAt(aLinkIndex);
179179
return anchor ? GetWrapperFor(anchor) : nullptr;
180180
}
181181

182-
gint getEndIndexCB(AtkHyperlink *aLink) {
183-
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
182+
gint getEndIndexCB(AtkHyperlink* aLink) {
183+
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
184184
if (!maiLink) return false;
185185

186-
if (Accessible *hyperlink = maiLink->GetAccHyperlink())
186+
if (Accessible* hyperlink = maiLink->GetAccHyperlink())
187187
return static_cast<gint>(hyperlink->EndOffset());
188188

189189
bool valid = false;
190190
uint32_t endIdx = maiLink->Proxy()->EndOffset(&valid);
191191
return valid ? static_cast<gint>(endIdx) : -1;
192192
}
193193

194-
gint getStartIndexCB(AtkHyperlink *aLink) {
195-
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
194+
gint getStartIndexCB(AtkHyperlink* aLink) {
195+
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
196196
if (!maiLink) return -1;
197197

198-
if (Accessible *hyperlink = maiLink->GetAccHyperlink())
198+
if (Accessible* hyperlink = maiLink->GetAccHyperlink())
199199
return static_cast<gint>(hyperlink->StartOffset());
200200

201201
bool valid = false;
202202
uint32_t startIdx = maiLink->Proxy()->StartOffset(&valid);
203203
return valid ? static_cast<gint>(startIdx) : -1;
204204
}
205205

206-
gboolean isValidCB(AtkHyperlink *aLink) {
207-
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
206+
gboolean isValidCB(AtkHyperlink* aLink) {
207+
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
208208
if (!maiLink) return false;
209209

210-
if (Accessible *hyperlink = maiLink->GetAccHyperlink())
210+
if (Accessible* hyperlink = maiLink->GetAccHyperlink())
211211
return static_cast<gboolean>(hyperlink->IsLinkValid());
212212

213213
return static_cast<gboolean>(maiLink->Proxy()->IsLinkValid());
214214
}
215215

216-
gint getAnchorCountCB(AtkHyperlink *aLink) {
217-
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
216+
gint getAnchorCountCB(AtkHyperlink* aLink) {
217+
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
218218
if (!maiLink) return -1;
219219

220-
if (Accessible *hyperlink = maiLink->GetAccHyperlink())
220+
if (Accessible* hyperlink = maiLink->GetAccHyperlink())
221221
return static_cast<gint>(hyperlink->AnchorCount());
222222

223223
bool valid = false;

0 commit comments

Comments
 (0)