Skip to content

Commit

Permalink
Bug 1547143 - Format the tree: Be prescriptive with the pointer style…
Browse files Browse the repository at this point in the history 
… (left) r=Ehsan

# ignore-this-changeset

Depends on D28954

Differential Revision: https://phabricator.services.mozilla.com/D28956

--HG--
extra : moz-landing-system : lando
  • Loading branch information
@sylvestre
sylvestre committed May 1, 2019
1 parent 130a9e0 commit e226046
Show file tree
Hide file tree
Showing 1,031 changed files with 26,916 additions and 26,999 deletions.
58 changes: 29 additions & 29 deletions accessible/atk/UtilInterface.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ typedef AtkUtilClass MaiUtilClass;

extern "C" {
static guint (*gail_add_global_event_listener)(GSignalEmissionHook listener,
const gchar *event_type);
const gchar* event_type);
static void (*gail_remove_global_event_listener)(guint remove_listener);
static void (*gail_remove_key_event_listener)(guint remove_listener);
static AtkObject *(*gail_get_root)();
static AtkObject* (*gail_get_root)();
}

struct MaiUtilListenerInfo {
Expand All @@ -41,13 +41,13 @@ struct MaiUtilListenerInfo {
guint gail_listenerid;
};

static GHashTable *sListener_list = nullptr;
static GHashTable* sListener_list = nullptr;
static gint sListener_idx = 1;

extern "C" {
static guint add_listener(GSignalEmissionHook listener,
const gchar *object_type, const gchar *signal,
const gchar *hook_data, guint gail_listenerid = 0) {
const gchar* object_type, const gchar* signal,
const gchar* hook_data, guint gail_listenerid = 0) {
GType type;
guint signal_id;
gint rc = 0;
Expand All @@ -56,12 +56,12 @@ static guint add_listener(GSignalEmissionHook listener,
if (type) {
signal_id = g_signal_lookup(signal, type);
if (signal_id > 0) {
MaiUtilListenerInfo *listener_info;
MaiUtilListenerInfo* listener_info;

rc = sListener_idx;

listener_info =
(MaiUtilListenerInfo *)g_malloc(sizeof(MaiUtilListenerInfo));
(MaiUtilListenerInfo*)g_malloc(sizeof(MaiUtilListenerInfo));
listener_info->key = sListener_idx;
listener_info->hook_id = g_signal_add_emission_hook(
signal_id, 0, listener, g_strdup(hook_data), (GDestroyNotify)g_free);
Expand All @@ -80,9 +80,9 @@ static guint add_listener(GSignalEmissionHook listener,
}

static guint mai_util_add_global_event_listener(GSignalEmissionHook listener,
const gchar *event_type) {
const gchar* event_type) {
guint rc = 0;
gchar **split_string;
gchar** split_string;

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

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

static void mai_util_remove_global_event_listener(guint remove_listener) {
if (remove_listener > 0) {
MaiUtilListenerInfo *listener_info;
MaiUtilListenerInfo* listener_info;
gint tmp_idx = remove_listener;

listener_info =
(MaiUtilListenerInfo *)g_hash_table_lookup(sListener_list, &tmp_idx);
(MaiUtilListenerInfo*)g_hash_table_lookup(sListener_list, &tmp_idx);

if (listener_info != nullptr) {
if (gail_remove_global_event_listener && listener_info->gail_listenerid) {
Expand Down Expand Up @@ -144,8 +144,8 @@ static void mai_util_remove_global_event_listener(guint remove_listener) {
}
}

static AtkKeyEventStruct *atk_key_event_from_gdk_event_key(GdkEventKey *key) {
AtkKeyEventStruct *event = g_new0(AtkKeyEventStruct, 1);
static AtkKeyEventStruct* atk_key_event_from_gdk_event_key(GdkEventKey* key) {
AtkKeyEventStruct* event = g_new0(AtkKeyEventStruct, 1);
switch (key->type) {
case GDK_KEY_PRESS:
event->type = ATK_KEY_EVENT_PRESS;
Expand Down Expand Up @@ -173,7 +173,7 @@ static AtkKeyEventStruct *atk_key_event_from_gdk_event_key(GdkEventKey *key) {
}

struct MaiKeyEventInfo {
AtkKeyEventStruct *key_event;
AtkKeyEventStruct* key_event;
gpointer func_data;
};

Expand All @@ -183,28 +183,28 @@ union AtkKeySnoopFuncPointer {
};

static gboolean notify_hf(gpointer key, gpointer value, gpointer data) {
MaiKeyEventInfo *info = (MaiKeyEventInfo *)data;
MaiKeyEventInfo* info = (MaiKeyEventInfo*)data;
AtkKeySnoopFuncPointer atkKeySnoop;
atkKeySnoop.data = value;
return (atkKeySnoop.func_ptr)(info->key_event, info->func_data) ? TRUE
: FALSE;
}

static void insert_hf(gpointer key, gpointer value, gpointer data) {
GHashTable *new_table = (GHashTable *)data;
GHashTable* new_table = (GHashTable*)data;
g_hash_table_insert(new_table, key, value);
}

static GHashTable *sKey_listener_list = nullptr;
static GHashTable* sKey_listener_list = nullptr;

static gint mai_key_snooper(GtkWidget *the_widget, GdkEventKey *event,
static gint mai_key_snooper(GtkWidget* the_widget, GdkEventKey* event,
gpointer func_data) {
/* notify each AtkKeySnoopFunc in turn... */

MaiKeyEventInfo *info = g_new0(MaiKeyEventInfo, 1);
MaiKeyEventInfo* info = g_new0(MaiKeyEventInfo, 1);
gint consumed = 0;
if (sKey_listener_list) {
GHashTable *new_hash = g_hash_table_new(nullptr, nullptr);
GHashTable* new_hash = g_hash_table_new(nullptr, nullptr);
g_hash_table_foreach(sKey_listener_list, insert_hf, new_hash);
info->key_event = atk_key_event_from_gdk_event_key(event);
info->func_data = func_data;
Expand Down Expand Up @@ -257,8 +257,8 @@ static void mai_util_remove_key_event_listener(guint remove_listener) {
}
}

static AtkObject *mai_util_get_root() {
ApplicationAccessible *app = ApplicationAcc();
static AtkObject* mai_util_get_root() {
ApplicationAccessible* app = ApplicationAcc();
if (app) return app->GetAtkObject();

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

static const gchar *mai_util_get_toolkit_name() { return MAI_NAME; }
static const gchar* mai_util_get_toolkit_name() { return MAI_NAME; }

static const gchar *mai_util_get_toolkit_version() { return MAI_VERSION; }
static const gchar* mai_util_get_toolkit_version() { return MAI_VERSION; }

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

static void window_added(AtkObject *atk_obj, guint index, AtkObject *child) {
static void window_added(AtkObject* atk_obj, guint index, AtkObject* child) {
if (!IS_MAI_OBJECT(child)) return;

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

static void window_removed(AtkObject *atk_obj, guint index, AtkObject *child) {
static void window_removed(AtkObject* atk_obj, guint index, AtkObject* child) {
if (!IS_MAI_OBJECT(child)) return;

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

static void UtilInterfaceInit(MaiUtilClass *klass) {
AtkUtilClass *atk_class;
static void UtilInterfaceInit(MaiUtilClass* klass) {
AtkUtilClass* atk_class;
gpointer data;

data = g_type_class_peek(ATK_TYPE_UTIL);
Expand All @@ -314,7 +314,7 @@ static void UtilInterfaceInit(MaiUtilClass *klass) {
sListener_list = g_hash_table_new_full(g_int_hash, g_int_equal, nullptr,
_listener_info_destroy);
// Keep track of added/removed windows.
AtkObject *root = atk_get_root();
AtkObject* root = atk_get_root();
g_signal_connect(root, "children-changed::add", (GCallback)window_added,
nullptr);
g_signal_connect(root, "children-changed::remove", (GCallback)window_removed,
Expand Down
72 changes: 36 additions & 36 deletions accessible/atk/nsMaiHyperlink.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ struct MaiAtkHyperlink {
* The MaiHyperlink whose properties and features are exported via this
* hyperlink instance.
*/
MaiHyperlink *maiHyperlink;
MaiHyperlink* maiHyperlink;
};

struct MaiAtkHyperlinkClass {
Expand All @@ -49,23 +49,23 @@ GType mai_atk_hyperlink_get_type(void);

G_BEGIN_DECLS
/* callbacks for AtkHyperlink */
static void classInitCB(AtkHyperlinkClass *aClass);
static void finalizeCB(GObject *aObj);
static void classInitCB(AtkHyperlinkClass* aClass);
static void finalizeCB(GObject* aObj);

/* callbacks for AtkHyperlink virtual functions */
static gchar *getUriCB(AtkHyperlink *aLink, gint aLinkIndex);
static AtkObject *getObjectCB(AtkHyperlink *aLink, gint aLinkIndex);
static gint getEndIndexCB(AtkHyperlink *aLink);
static gint getStartIndexCB(AtkHyperlink *aLink);
static gboolean isValidCB(AtkHyperlink *aLink);
static gint getAnchorCountCB(AtkHyperlink *aLink);
static gchar* getUriCB(AtkHyperlink* aLink, gint aLinkIndex);
static AtkObject* getObjectCB(AtkHyperlink* aLink, gint aLinkIndex);
static gint getEndIndexCB(AtkHyperlink* aLink);
static gint getStartIndexCB(AtkHyperlink* aLink);
static gboolean isValidCB(AtkHyperlink* aLink);
static gint getAnchorCountCB(AtkHyperlink* aLink);
G_END_DECLS

static gpointer parent_class = nullptr;

static MaiHyperlink *GetMaiHyperlink(AtkHyperlink *aHyperlink) {
static MaiHyperlink* GetMaiHyperlink(AtkHyperlink* aHyperlink) {
NS_ENSURE_TRUE(MAI_IS_ATK_HYPERLINK(aHyperlink), nullptr);
MaiHyperlink *maiHyperlink = MAI_ATK_HYPERLINK(aHyperlink)->maiHyperlink;
MaiHyperlink* maiHyperlink = MAI_ATK_HYPERLINK(aHyperlink)->maiHyperlink;
NS_ENSURE_TRUE(maiHyperlink != nullptr, nullptr);
NS_ENSURE_TRUE(maiHyperlink->GetAtkHyperlink() == aHyperlink, nullptr);
return maiHyperlink;
Expand Down Expand Up @@ -96,7 +96,7 @@ GType mai_atk_hyperlink_get_type(void) {

MaiHyperlink::MaiHyperlink(AccessibleOrProxy aHyperLink)
: mHyperlink(aHyperLink), mMaiAtkHyperlink(nullptr) {
mMaiAtkHyperlink = reinterpret_cast<AtkHyperlink *>(
mMaiAtkHyperlink = reinterpret_cast<AtkHyperlink*>(
g_object_new(mai_atk_hyperlink_get_type(), nullptr));
NS_ASSERTION(mMaiAtkHyperlink, "OUT OF MEMORY");
if (!mMaiAtkHyperlink) return;
Expand All @@ -113,8 +113,8 @@ MaiHyperlink::~MaiHyperlink() {

/* static functions for ATK callbacks */

void classInitCB(AtkHyperlinkClass *aClass) {
GObjectClass *gobject_class = G_OBJECT_CLASS(aClass);
void classInitCB(AtkHyperlinkClass* aClass) {
GObjectClass* gobject_class = G_OBJECT_CLASS(aClass);

parent_class = g_type_class_peek_parent(aClass);

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

void finalizeCB(GObject *aObj) {
void finalizeCB(GObject* aObj) {
NS_ASSERTION(MAI_IS_ATK_HYPERLINK(aObj), "Invalid MaiAtkHyperlink");
if (!MAI_IS_ATK_HYPERLINK(aObj)) return;

MaiAtkHyperlink *maiAtkHyperlink = MAI_ATK_HYPERLINK(aObj);
MaiAtkHyperlink* maiAtkHyperlink = MAI_ATK_HYPERLINK(aObj);
maiAtkHyperlink->maiHyperlink = nullptr;

/* call parent finalize function */
if (G_OBJECT_CLASS(parent_class)->finalize)
G_OBJECT_CLASS(parent_class)->finalize(aObj);
}

gchar *getUriCB(AtkHyperlink *aLink, gint aLinkIndex) {
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
gchar* getUriCB(AtkHyperlink* aLink, gint aLinkIndex) {
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
if (!maiLink) return nullptr;

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

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

AtkObject *getObjectCB(AtkHyperlink *aLink, gint aLinkIndex) {
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
AtkObject* getObjectCB(AtkHyperlink* aLink, gint aLinkIndex) {
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
if (!maiLink) {
return nullptr;
}

if (Accessible *hyperlink = maiLink->GetAccHyperlink()) {
Accessible *anchor = hyperlink->AnchorAt(aLinkIndex);
if (Accessible* hyperlink = maiLink->GetAccHyperlink()) {
Accessible* anchor = hyperlink->AnchorAt(aLinkIndex);
NS_ENSURE_TRUE(anchor, nullptr);

return AccessibleWrap::GetAtkObject(anchor);
}

ProxyAccessible *anchor = maiLink->Proxy()->AnchorAt(aLinkIndex);
ProxyAccessible* anchor = maiLink->Proxy()->AnchorAt(aLinkIndex);
return anchor ? GetWrapperFor(anchor) : nullptr;
}

gint getEndIndexCB(AtkHyperlink *aLink) {
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
gint getEndIndexCB(AtkHyperlink* aLink) {
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
if (!maiLink) return false;

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

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

gint getStartIndexCB(AtkHyperlink *aLink) {
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
gint getStartIndexCB(AtkHyperlink* aLink) {
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
if (!maiLink) return -1;

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

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

gboolean isValidCB(AtkHyperlink *aLink) {
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
gboolean isValidCB(AtkHyperlink* aLink) {
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
if (!maiLink) return false;

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

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

gint getAnchorCountCB(AtkHyperlink *aLink) {
MaiHyperlink *maiLink = GetMaiHyperlink(aLink);
gint getAnchorCountCB(AtkHyperlink* aLink) {
MaiHyperlink* maiLink = GetMaiHyperlink(aLink);
if (!maiLink) return -1;

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

bool valid = false;
Expand Down
Loading

0 comments on commit e226046

Please sign in to comment.