wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 784739 - Switch from NULL to nullptr in accessible/; r=ehsan

Browse Source 
--HG--
extra : rebase_source : 1adb3db25645398b42222553330fba0feaf1ed9f
This commit is contained in:
matekm 2013-04-02 20:33:43 -04:00
parent 28a817ffc4
commit 3a78a38ab2
31 changed files with 207 additions and 207 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accessible/build/nsAccessibilityFactory.cpp
View File

@ -32,14 +32,14 @@ NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aRes
NS_DEFINE_NAMED_CID(NS_ACCESSIBILITY_SERVICE_CID);
static const mozilla::Module::CIDEntry kA11yCIDs[] = {
{ &kNS_ACCESSIBILITY_SERVICE_CID, false, NULL, NS_ConstructAccessibilityService },
{ NULL }
{ &kNS_ACCESSIBILITY_SERVICE_CID, false, nullptr, NS_ConstructAccessibilityService },
{ nullptr }
};
static const mozilla::Module::ContractIDEntry kA11yContracts[] = {
{ "@mozilla.org/accessibilityService;1", &kNS_ACCESSIBILITY_SERVICE_CID },
{ "@mozilla.org/accessibleRetrieval;1", &kNS_ACCESSIBILITY_SERVICE_CID },
{ NULL }
{ nullptr }
};
static const mozilla::Module kA11yModule = {

78
accessible/src/atk/AccessibleWrap.cpp
View File

@ -98,27 +98,27 @@ static const char* kNonUserInputEvent = ":system";
static const GInterfaceInfo atk_if_infos[] = {
{(GInterfaceInitFunc)componentInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)actionInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)valueInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)editableTextInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)hypertextInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)hyperlinkImplInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)selectionInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)tableInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)textInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)documentInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL},
(GInterfaceFinalizeFunc) nullptr, nullptr},
{(GInterfaceInitFunc)imageInterfaceInitCB,
(GInterfaceFinalizeFunc) NULL, NULL}
(GInterfaceFinalizeFunc) nullptr, nullptr}
};
/**
@ -197,7 +197,7 @@ G_END_DECLS
static GType GetMaiAtkType(uint16_t interfacesBits);
static const char * GetUniqueMaiAtkTypeName(uint16_t interfacesBits);
static gpointer parent_class = NULL;
static gpointer parent_class = nullptr;
static GQuark quark_mai_hyperlink = 0;
@ -209,15 +209,15 @@ mai_atk_object_get_type(void)
if (!type) {
static const GTypeInfo tinfo = {
sizeof(MaiAtkObjectClass),
(GBaseInitFunc)NULL,
(GBaseFinalizeFunc)NULL,
(GBaseInitFunc)nullptr,
(GBaseFinalizeFunc)nullptr,
(GClassInitFunc)classInitCB,
(GClassFinalizeFunc)NULL,
NULL, /* class data */
(GClassFinalizeFunc)nullptr,
nullptr, /* class data */
sizeof(MaiAtkObject), /* instance size */
0, /* nb preallocs */
(GInstanceInitFunc)NULL,
NULL /* value table */
(GInstanceInitFunc)nullptr,
nullptr /* value table */
};
type = g_type_register_static(ATK_TYPE_OBJECT,
@ -310,7 +310,7 @@ AccessibleWrap::GetNativeInterface(void** aOutAccessible)
NS_ENSURE_TRUE(type, NS_ERROR_FAILURE);
mAtkObject =
reinterpret_cast<AtkObject *>
(g_object_new(type, NULL));
(g_object_new(type, nullptr));
NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY);
atk_object_initialize(mAtkObject, this);
@ -401,15 +401,15 @@ GetMaiAtkType(uint16_t interfacesBits)
GType type;
static const GTypeInfo tinfo = {
sizeof(MaiAtkObjectClass),
(GBaseInitFunc) NULL,
(GBaseFinalizeFunc) NULL,
(GClassInitFunc) NULL,
(GClassFinalizeFunc) NULL,
NULL, /* class data */
(GBaseInitFunc) nullptr,
(GBaseFinalizeFunc) nullptr,
(GClassInitFunc) nullptr,
(GClassFinalizeFunc) nullptr,
nullptr, /* class data */
sizeof(MaiAtkObject), /* instance size */
0, /* nb preallocs */
(GInstanceInitFunc) NULL,
NULL /* value table */
(GInstanceInitFunc) nullptr,
nullptr /* value table */
};
/*
@ -497,7 +497,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
mai_atk_object_signals [CREATE] =
@ -505,7 +505,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
mai_atk_object_signals [DEACTIVATE] =
@ -513,7 +513,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
mai_atk_object_signals [DESTROY] =
@ -521,7 +521,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
mai_atk_object_signals [MAXIMIZE] =
@ -529,7 +529,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
mai_atk_object_signals [MINIMIZE] =
@ -537,7 +537,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
mai_atk_object_signals [RESIZE] =
@ -545,7 +545,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
mai_atk_object_signals [RESTORE] =
@ -553,7 +553,7 @@ classInitCB(AtkObjectClass *aClass)
MAI_TYPE_ATK_OBJECT,
G_SIGNAL_RUN_LAST,
0, /* default signal handler */
NULL, NULL,
nullptr, nullptr,
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE, 0);
@ -617,7 +617,7 @@ getDescriptionCB(AtkObject *aAtkObj)
if (!accWrap || accWrap->IsDefunct())
return nullptr;
/* nsIAccessible is responsible for the non-NULL description */
/* nsIAccessible is responsible for the non-nullptr description */
nsAutoString uniDesc;
accWrap->Description(uniDesc);
@ -1219,13 +1219,13 @@ AccessibleWrap::FireAtkTextChangedEvent(AccEvent* aEvent,
// see bug 619002
signal_name = g_strconcat(isInserted ? "text_changed::insert" :
"text_changed::delete",
isFromUserInput ? "" : kNonUserInputEvent, NULL);
isFromUserInput ? "" : kNonUserInputEvent, nullptr);
g_signal_emit_by_name(aObject, signal_name, start, length);
} else {
nsAutoString text;
event->GetModifiedText(text);
signal_name = g_strconcat(isInserted ? "text-insert" : "text-remove",
isFromUserInput ? "" : "::system", NULL);
isFromUserInput ? "" : "::system", nullptr);
g_signal_emit_by_name(aObject, signal_name, start, length,
NS_ConvertUTF16toUTF8(text).get());
}
@ -1244,8 +1244,8 @@ AccessibleWrap::FireAtkShowHideEvent(AccEvent* aEvent,
bool isFromUserInput = aEvent->IsFromUserInput();
char *signal_name = g_strconcat(aIsAdded ? "children_changed::add" : "children_changed::remove",
isFromUserInput ? "" : kNonUserInputEvent, NULL);
g_signal_emit_by_name(parentObject, signal_name, indexInParent, aObject, NULL);
isFromUserInput ? "" : kNonUserInputEvent, nullptr);
g_signal_emit_by_name(parentObject, signal_name, indexInParent, aObject, nullptr);
g_free(signal_name);
return NS_OK;

10
accessible/src/atk/ApplicationAccessibleWrap.cpp
View File

@ -69,7 +69,7 @@ toplevel_event_watcher(GSignalInvocationHint* ihint,
(g_object_get_qdata(G_OBJECT(child), sQuark_gecko_acc_obj));
if (windowAcc) {
GetAccService()->RemoveNativeRootAccessible(windowAcc);
g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, NULL);
g_object_set_qdata(G_OBJECT(child), sQuark_gecko_acc_obj, nullptr);
}
}
@ -97,7 +97,7 @@ ApplicationAccessibleWrap::GetNativeInterface(void** aOutAccessible)
if (!mAtkObject) {
mAtkObject =
reinterpret_cast<AtkObject *>
(g_object_new(MAI_TYPE_ATK_OBJECT, NULL));
(g_object_new(MAI_TYPE_ATK_OBJECT, nullptr));
NS_ENSURE_TRUE(mAtkObject, NS_ERROR_OUT_OF_MEMORY);
atk_object_initialize(mAtkObject, this);
@ -119,7 +119,7 @@ gboolean fireRootAccessibleAddedCB(gpointer data)
{
AtkRootAccessibleAddedEvent* eventData = (AtkRootAccessibleAddedEvent*)data;
g_signal_emit_by_name(eventData->app_accessible, "children_changed::add",
eventData->index, eventData->root_accessible, NULL);
eventData->index, eventData->root_accessible, nullptr);
g_object_unref(eventData->app_accessible);
g_object_unref(eventData->root_accessible);
free(data);
@ -160,9 +160,9 @@ ApplicationAccessibleWrap::RemoveChild(Accessible* aChild)
int32_t index = aChild->IndexInParent();
AtkObject* atkAccessible = AccessibleWrap::GetAtkObject(aChild);
atk_object_set_parent(atkAccessible, NULL);
atk_object_set_parent(atkAccessible, nullptr);
g_signal_emit_by_name(mAtkObject, "children_changed::remove", index,
atkAccessible, NULL);
atkAccessible, nullptr);
return ApplicationAccessible::RemoveChild(aChild);
}

8
accessible/src/atk/AtkSocketAccessible.cpp
View File

@ -13,7 +13,7 @@
using namespace mozilla::a11y;
AtkSocketEmbedType AtkSocketAccessible::g_atk_socket_embed = NULL;
AtkSocketEmbedType AtkSocketAccessible::g_atk_socket_embed = nullptr;
GType AtkSocketAccessible::g_atk_socket_type = G_TYPE_INVALID;
const char* AtkSocketAccessible::sATKSocketEmbedSymbol = "atk_socket_embed";
const char* AtkSocketAccessible::sATKSocketGetTypeSymbol = "atk_socket_get_type";
@ -69,11 +69,11 @@ mai_atk_socket_init(MaiAtkSocket* aAcc)
static AtkObject*
mai_atk_socket_new(AccessibleWrap* aAccWrap)
{
NS_ENSURE_TRUE(aAccWrap, NULL);
NS_ENSURE_TRUE(aAccWrap, nullptr);
MaiAtkSocket* acc = nullptr;
acc = static_cast<MaiAtkSocket*>(g_object_new(MAI_TYPE_ATK_SOCKET, NULL));
NS_ENSURE_TRUE(acc, NULL);
acc = static_cast<MaiAtkSocket*>(g_object_new(MAI_TYPE_ATK_SOCKET, nullptr));
NS_ENSURE_TRUE(acc, nullptr);
acc->accWrap = aAccWrap;
return ATK_OBJECT(acc);

32
accessible/src/atk/Platform.cpp
View File

@ -53,18 +53,18 @@ struct GnomeAccessibilityModule
static GnomeAccessibilityModule sAtkBridge = {
#ifdef AIX
"libatk-bridge.a(libatk-bridge.so.0)", NULL,
"libatk-bridge.a(libatk-bridge.so.0)", nullptr,
#else
"libatk-bridge.so", NULL,
"libatk-bridge.so", nullptr,
#endif
"gnome_accessibility_module_init", NULL,
"gnome_accessibility_module_shutdown", NULL
"gnome_accessibility_module_init", nullptr,
"gnome_accessibility_module_shutdown", nullptr
};
static GnomeAccessibilityModule sGail = {
"libgail.so", NULL,
"gnome_accessibility_module_init", NULL,
"gnome_accessibility_module_shutdown", NULL
"libgail.so", nullptr,
"gnome_accessibility_module_init", nullptr,
"gnome_accessibility_module_shutdown", nullptr
};
static nsresult
@ -112,7 +112,7 @@ LoadGtkModule(GnomeAccessibilityModule& aModule)
//fail, :(
PR_UnloadLibrary(aModule.lib);
aModule.lib = NULL;
aModule.lib = nullptr;
return NS_ERROR_FAILURE;
}
return NS_OK;
@ -165,12 +165,12 @@ a11y::PlatformInit()
g_signal_add_emission_hook(g_signal_lookup("show", GTK_TYPE_WINDOW),
0, toplevel_event_watcher,
reinterpret_cast<gpointer>(nsIAccessibleEvent::EVENT_SHOW),
NULL);
nullptr);
sToplevel_hide_hook =
g_signal_add_emission_hook(g_signal_lookup("hide", GTK_TYPE_WINDOW), 0,
toplevel_event_watcher,
reinterpret_cast<gpointer>(nsIAccessibleEvent::EVENT_HIDE),
NULL);
nullptr);
}
}
@ -191,9 +191,9 @@ a11y::PlatformShutdown()
// if (sAtkBridge.shutdown)
// (*sAtkBridge.shutdown)();
// PR_UnloadLibrary(sAtkBridge.lib);
sAtkBridge.lib = NULL;
sAtkBridge.init = NULL;
sAtkBridge.shutdown = NULL;
sAtkBridge.lib = nullptr;
sAtkBridge.init = nullptr;
sAtkBridge.shutdown = nullptr;
}
if (sGail.lib) {
// Do not shutdown gail because
@ -202,9 +202,9 @@ a11y::PlatformShutdown()
// if (sGail.shutdown)
// (*sGail.shutdown)();
// PR_UnloadLibrary(sGail.lib);
sGail.lib = NULL;
sGail.init = NULL;
sGail.shutdown = NULL;
sGail.lib = nullptr;
sGail.init = nullptr;
sGail.shutdown = nullptr;
}
// if (sATKLib) {
// PR_UnloadLibrary(sATKLib);

30
accessible/src/atk/UtilInterface.cpp
View File

@ -42,7 +42,7 @@ struct MaiUtilListenerInfo
guint gail_listenerid;
};
static GHashTable* sListener_list = NULL;
static GHashTable* sListener_list = nullptr;
static gint sListener_idx = 1;
extern "C" {
@ -129,7 +129,7 @@ mai_util_remove_global_event_listener(guint remove_listener)
listener_info = (MaiUtilListenerInfo *)
g_hash_table_lookup(sListener_list, &tmp_idx);
if (listener_info != NULL) {
if (listener_info != nullptr) {
if (gail_remove_global_event_listener &&
listener_info->gail_listenerid) {
gail_remove_global_event_listener(listener_info->gail_listenerid);
@ -178,7 +178,7 @@ atk_key_event_from_gdk_event_key (GdkEventKey *key)
break;
default:
g_assert_not_reached ();
return NULL;
return nullptr;
}
event->state = key->state;
event->keyval = key->keyval;
@ -226,7 +226,7 @@ insert_hf(gpointer key, gpointer value, gpointer data)
g_hash_table_insert (new_table, key, value);
}
static GHashTable* sKey_listener_list = NULL;
static GHashTable* sKey_listener_list = nullptr;
static gint
mai_key_snooper(GtkWidget *the_widget, GdkEventKey *event, gpointer func_data)
@ -236,7 +236,7 @@ mai_key_snooper(GtkWidget *the_widget, GdkEventKey *event, gpointer func_data)
MaiKeyEventInfo *info = g_new0(MaiKeyEventInfo, 1);
gint consumed = 0;
if (sKey_listener_list) {
GHashTable *new_hash = g_hash_table_new(NULL, NULL);
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;
@ -260,7 +260,7 @@ mai_util_add_key_event_listener (AtkKeySnoopFunc listener,
static guint key=0;
if (!sKey_listener_list) {
sKey_listener_list = g_hash_table_new(NULL, NULL);
sKey_listener_list = g_hash_table_new(nullptr, nullptr);
sKey_snooper_id = gtk_key_snooper_install(mai_key_snooper, data);
}
AtkKeySnoopFuncPointer atkKeySnoop;
@ -368,12 +368,12 @@ UtilInterfaceInit(MaiUtilClass* klass)
atk_class->get_toolkit_name = mai_util_get_toolkit_name;
atk_class->get_toolkit_version = mai_util_get_toolkit_version;
sListener_list = g_hash_table_new_full(g_int_hash, g_int_equal, NULL,
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 ();
g_signal_connect (root, "children-changed::add", (GCallback) window_added, NULL);
g_signal_connect (root, "children-changed::remove", (GCallback) window_removed, NULL);
g_signal_connect (root, "children-changed::add", (GCallback) window_added, nullptr);
g_signal_connect (root, "children-changed::remove", (GCallback) window_removed, nullptr);
}
}
@ -385,15 +385,15 @@ mai_util_get_type()
if (!type) {
static const GTypeInfo tinfo = {
sizeof(MaiUtilClass),
(GBaseInitFunc) NULL, /* base init */
(GBaseFinalizeFunc) NULL, /* base finalize */
(GBaseInitFunc) nullptr, /* base init */
(GBaseFinalizeFunc) nullptr, /* base finalize */
(GClassInitFunc) UtilInterfaceInit, /* class init */
(GClassFinalizeFunc) NULL, /* class finalize */
NULL, /* class data */
(GClassFinalizeFunc) nullptr, /* class finalize */
nullptr, /* class data */
sizeof(MaiUtil), /* instance size */
0, /* nb preallocs */
(GInstanceInitFunc) NULL, /* instance init */
NULL /* value table */
(GInstanceInitFunc) nullptr, /* instance init */
nullptr /* value table */
};
type = g_type_register_static(ATK_TYPE_UTIL,

16
accessible/src/atk/nsMaiHyperlink.cpp
View File

@ -60,7 +60,7 @@ static gboolean isValidCB(AtkHyperlink *aLink);
static gint getAnchorCountCB(AtkHyperlink *aLink);
G_END_DECLS
static gpointer parent_class = NULL;
static gpointer parent_class = nullptr;
static Accessible*
get_accessible_hyperlink(AtkHyperlink *aHyperlink);
@ -72,15 +72,15 @@ mai_atk_hyperlink_get_type(void)
if (!type) {
static const GTypeInfo tinfo = {
sizeof(MaiAtkHyperlinkClass),
(GBaseInitFunc)NULL,
(GBaseFinalizeFunc)NULL,
(GBaseInitFunc)nullptr,
(GBaseFinalizeFunc)nullptr,
(GClassInitFunc)classInitCB,
(GClassFinalizeFunc)NULL,
NULL, /* class data */
(GClassFinalizeFunc)nullptr,
nullptr, /* class data */
sizeof(MaiAtkHyperlink), /* instance size */
0, /* nb preallocs */
(GInstanceInitFunc)NULL,
NULL /* value table */
(GInstanceInitFunc)nullptr,
nullptr /* value table */
};
type = g_type_register_static(ATK_TYPE_HYPERLINK,
@ -117,7 +117,7 @@ MaiHyperlink::GetAtkHyperlink(void)
mMaiAtkHyperlink =
reinterpret_cast<AtkHyperlink *>
(g_object_new(mai_atk_hyperlink_get_type(), NULL));
(g_object_new(mai_atk_hyperlink_get_type(), nullptr));
NS_ASSERTION(mMaiAtkHyperlink, "OUT OF MEMORY");
NS_ENSURE_TRUE(mMaiAtkHyperlink, nullptr);

2
accessible/src/base/nsAccCache.h
View File

@ -21,7 +21,7 @@ template <class T>
static PLDHashOperator
ClearCacheEntry(const void* aKey, nsRefPtr<T>& aAccessible, void* aUserArg)
{
NS_ASSERTION(aAccessible, "Calling ClearCacheEntry with a NULL pointer!");
NS_ASSERTION(aAccessible, "Calling ClearCacheEntry with a nullptr pointer!");
if (aAccessible)
aAccessible->Shutdown();

2
accessible/src/generic/Accessible.cpp
View File

@ -843,7 +843,7 @@ Accessible::ChildAtPoint(int32_t aX, int32_t aY,
DocAccessible* contentDocAcc = GetAccService()->
GetDocAccessible(content->OwnerDoc());
// contentDocAcc in some circumstances can be NULL. See bug 729861
// contentDocAcc in some circumstances can be nullptr. See bug 729861
NS_ASSERTION(contentDocAcc, "could not get the document accessible");
if (!contentDocAcc)
return fallbackAnswer;

10
accessible/src/windows/ia2/ia2AccessibleAction.cpp
View File

@ -18,7 +18,7 @@ using namespace mozilla::a11y;
STDMETHODIMP
ia2AccessibleAction::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleAction == iid) {
*ppv = static_cast<IAccessibleAction*>(this);
@ -72,7 +72,7 @@ ia2AccessibleAction::get_description(long aActionIndex, BSTR *aDescription)
{
A11Y_TRYBLOCK_BEGIN
*aDescription = NULL;
*aDescription = nullptr;
AccessibleWrap* acc = static_cast<AccessibleWrap*>(this);
if (acc->IsDefunct())
@ -103,7 +103,7 @@ ia2AccessibleAction::get_keyBinding(long aActionIndex, long aNumMaxBinding,
if (!aKeyBinding)
return E_INVALIDARG;
*aKeyBinding = NULL;
*aKeyBinding = nullptr;
if (!aNumBinding)
return E_INVALIDARG;
@ -149,7 +149,7 @@ ia2AccessibleAction::get_name(long aActionIndex, BSTR *aName)
{
A11Y_TRYBLOCK_BEGIN
*aName = NULL;
*aName = nullptr;
AccessibleWrap* acc = static_cast<AccessibleWrap*>(this);
if (acc->IsDefunct())
@ -175,7 +175,7 @@ ia2AccessibleAction::get_localizedName(long aActionIndex, BSTR *aLocalizedName)
{
A11Y_TRYBLOCK_BEGIN
*aLocalizedName = NULL;
*aLocalizedName = nullptr;
return E_NOTIMPL;
A11Y_TRYBLOCK_END

2
accessible/src/windows/ia2/ia2AccessibleComponent.cpp
View File

@ -21,7 +21,7 @@ using namespace mozilla::a11y;
STDMETHODIMP
ia2AccessibleComponent::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleComponent == iid) {
*ppv = static_cast<IAccessibleComponent*>(this);

4
accessible/src/windows/ia2/ia2AccessibleHyperlink.cpp
View File

@ -18,7 +18,7 @@ using namespace mozilla::a11y;
STDMETHODIMP
ia2AccessibleHyperlink::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleHyperlink == iid) {
if (!static_cast<AccessibleWrap*>(this)->IsLink())
@ -56,7 +56,7 @@ ia2AccessibleHyperlink::get_anchor(long aIndex, VARIANT* aAnchor)
if (!anchor)
return S_FALSE;
void* instancePtr = NULL;
void* instancePtr = nullptr;
HRESULT result = anchor->QueryInterface(IID_IUnknown, &instancePtr);
if (FAILED(result))
return result;

2
accessible/src/windows/ia2/ia2AccessibleHypertext.cpp
View File

@ -38,7 +38,7 @@ ia2AccessibleHypertext::get_hyperlink(long aLinkIndex,
{
A11Y_TRYBLOCK_BEGIN
*aHyperlink = NULL;
*aHyperlink = nullptr;
HyperTextAccessibleWrap* hyperText = static_cast<HyperTextAccessibleWrap*>(this);
if (hyperText->IsDefunct())

4
accessible/src/windows/ia2/ia2AccessibleImage.cpp
View File

@ -26,7 +26,7 @@ using namespace mozilla::a11y;
STDMETHODIMP
ia2AccessibleImage::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleImage == iid) {
*ppv = static_cast<IAccessibleImage*>(this);
@ -44,7 +44,7 @@ ia2AccessibleImage::get_description(BSTR* aDescription)
{
A11Y_TRYBLOCK_BEGIN
*aDescription = NULL;
*aDescription = nullptr;
ImageAccessibleWrap* acc = static_cast<ImageAccessibleWrap*>(this);
if (acc->IsDefunct())

6
accessible/src/windows/ia2/ia2AccessibleRelation.cpp
View File

@ -32,7 +32,7 @@ ia2AccessibleRelation::QueryInterface(REFIID iid, void** ppv)
if (!ppv)
return E_INVALIDARG;
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleRelation == iid || IID_IUnknown == iid) {
*ppv = static_cast<IAccessibleRelation*>(this);
@ -70,7 +70,7 @@ ia2AccessibleRelation::get_relationType(BSTR *aRelationType)
if (!aRelationType)
return E_INVALIDARG;
*aRelationType = NULL;
*aRelationType = nullptr;
switch (mType) {
case nsIAccessibleRelation::RELATION_CONTROLLED_BY:
@ -135,7 +135,7 @@ ia2AccessibleRelation::get_localizedRelationType(BSTR *aLocalizedRelationType)
if (!aLocalizedRelationType)
return E_INVALIDARG;
*aLocalizedRelationType = NULL;
*aLocalizedRelationType = nullptr;
return E_NOTIMPL;
A11Y_TRYBLOCK_END

24
accessible/src/windows/ia2/ia2AccessibleTable.cpp
View File

@ -25,7 +25,7 @@ using namespace mozilla::a11y;
STDMETHODIMP
ia2AccessibleTable::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleTable == iid) {
statistics::IAccessibleTableUsed();
@ -58,7 +58,7 @@ ia2AccessibleTable::get_caption(IUnknown** aAccessible)
{
A11Y_TRYBLOCK_BEGIN
*aAccessible = NULL;
*aAccessible = nullptr;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
@ -98,7 +98,7 @@ ia2AccessibleTable::get_columnDescription(long aColIdx, BSTR* aDescription)
{
A11Y_TRYBLOCK_BEGIN
*aDescription = NULL;
*aDescription = nullptr;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
@ -143,7 +143,7 @@ ia2AccessibleTable::get_columnHeader(IAccessibleTable** aAccessibleTable,
{
A11Y_TRYBLOCK_BEGIN
*aAccessibleTable = NULL;
*aAccessibleTable = nullptr;
*aStartingRowIndex = -1;
return E_NOTIMPL;
@ -241,7 +241,7 @@ ia2AccessibleTable::get_rowDescription(long aRowIdx, BSTR* aDescription)
{
A11Y_TRYBLOCK_BEGIN
*aDescription = NULL;
*aDescription = nullptr;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
@ -285,7 +285,7 @@ ia2AccessibleTable::get_rowHeader(IAccessibleTable** aAccessibleTable,
{
A11Y_TRYBLOCK_BEGIN
*aAccessibleTable = NULL;
*aAccessibleTable = nullptr;
*aStartingColumnIndex = -1;
return E_NOTIMPL;
@ -317,7 +317,7 @@ ia2AccessibleTable::get_selectedChildren(long aMaxChildren, long** aChildren,
{
A11Y_TRYBLOCK_BEGIN
*aChildren = NULL;
*aChildren = nullptr;
*aNChildren = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
@ -370,7 +370,7 @@ ia2AccessibleTable::get_summary(IUnknown** aAccessible)
// in nsIAccessibleTable::summary to get a summary as a string which is not
// mapped directly to IAccessible2.
*aAccessible = NULL;
*aAccessible = nullptr;
return S_FALSE;
A11Y_TRYBLOCK_END
@ -549,7 +549,7 @@ ia2AccessibleTable::get_cellAt(long aRowIdx, long aColIdx, IUnknown** aCell)
{
A11Y_TRYBLOCK_BEGIN
*aCell = NULL;
*aCell = nullptr;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
@ -585,7 +585,7 @@ ia2AccessibleTable::get_selectedCells(IUnknown*** aCells, long* aNSelectedCells)
{
A11Y_TRYBLOCK_BEGIN
*aCells = NULL;
*aCells = nullptr;
*aNSelectedCells = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
@ -618,7 +618,7 @@ ia2AccessibleTable::get_selectedColumns(long** aColumns, long* aNColumns)
{
A11Y_TRYBLOCK_BEGIN
*aColumns = NULL;
*aColumns = nullptr;
*aNColumns = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
@ -645,7 +645,7 @@ ia2AccessibleTable::get_selectedRows(long** aRows, long* aNRows)
{
A11Y_TRYBLOCK_BEGIN
*aRows = NULL;
*aRows = nullptr;
*aNRows = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;

8
accessible/src/windows/ia2/ia2AccessibleTableCell.cpp
View File

@ -25,7 +25,7 @@ using namespace mozilla::a11y;
STDMETHODIMP
ia2AccessibleTableCell::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleTableCell == iid) {
*ppv = static_cast<IAccessibleTableCell*>(this);
@ -44,7 +44,7 @@ ia2AccessibleTableCell::get_table(IUnknown** aTable)
{
A11Y_TRYBLOCK_BEGIN
*aTable = NULL;
*aTable = nullptr;
if (!mTableCell)
return CO_E_OBJNOTCONNECTED;
@ -82,7 +82,7 @@ ia2AccessibleTableCell::get_columnHeaderCells(IUnknown*** aCellAccessibles,
{
A11Y_TRYBLOCK_BEGIN
*aCellAccessibles = NULL;
*aCellAccessibles = nullptr;
*aNColumnHeaderCells = 0;
if (!mTableCell)
return CO_E_OBJNOTCONNECTED;
@ -145,7 +145,7 @@ ia2AccessibleTableCell::get_rowHeaderCells(IUnknown*** aCellAccessibles,
{
A11Y_TRYBLOCK_BEGIN
*aCellAccessibles = NULL;
*aCellAccessibles = nullptr;
*aNRowHeaderCells = 0;
if (!mTableCell)
return CO_E_OBJNOTCONNECTED;

10
accessible/src/windows/ia2/ia2AccessibleText.cpp
View File

@ -44,7 +44,7 @@ ia2AccessibleText::get_attributes(long aOffset, long *aStartOffset,
*aStartOffset = 0;
*aEndOffset = 0;
*aTextAttributes = NULL;
*aTextAttributes = nullptr;
HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
if (textAcc->IsDefunct())
@ -210,7 +210,7 @@ ia2AccessibleText::get_text(long aStartOffset, long aEndOffset, BSTR *aText)
{
A11Y_TRYBLOCK_BEGIN
*aText = NULL;
*aText = nullptr;
HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
if (textAcc->IsDefunct())
@ -240,7 +240,7 @@ ia2AccessibleText::get_textBeforeOffset(long aOffset,
*aStartOffset = 0;
*aEndOffset = 0;
*aText = NULL;
*aText = nullptr;
HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
if (textAcc->IsDefunct())
@ -287,7 +287,7 @@ ia2AccessibleText::get_textAfterOffset(long aOffset,
*aStartOffset = 0;
*aEndOffset = 0;
*aText = NULL;
*aText = nullptr;
HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
if (textAcc->IsDefunct())
@ -334,7 +334,7 @@ ia2AccessibleText::get_textAtOffset(long aOffset,
*aStartOffset = 0;
*aEndOffset = 0;
*aText = NULL;
*aText = nullptr;
HyperTextAccessible* textAcc = static_cast<HyperTextAccessibleWrap*>(this);
if (textAcc->IsDefunct())

2
accessible/src/windows/ia2/ia2AccessibleValue.cpp
View File

@ -19,7 +19,7 @@ using namespace mozilla::a11y;
STDMETHODIMP
ia2AccessibleValue::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleValue == iid) {
AccessibleWrap* valueAcc = static_cast<AccessibleWrap*>(this);

58
accessible/src/windows/msaa/AccessibleWrap.cpp
View File

@ -64,7 +64,7 @@ static const int32_t kIEnumVariantDisconnected = -1;
// AccessibleWrap
////////////////////////////////////////////////////////////////////////////////
ITypeInfo* AccessibleWrap::gTypeInfo = NULL;
ITypeInfo* AccessibleWrap::gTypeInfo = nullptr;
NS_IMPL_ISUPPORTS_INHERITED0(AccessibleWrap, Accessible)
@ -78,7 +78,7 @@ AccessibleWrap::QueryInterface(REFIID iid, void** ppv)
{
A11Y_TRYBLOCK_BEGIN
*ppv = NULL;
*ppv = nullptr;
if (IID_IUnknown == iid || IID_IDispatch == iid || IID_IAccessible == iid)
*ppv = static_cast<IAccessible*>(this);
@ -99,25 +99,25 @@ AccessibleWrap::QueryInterface(REFIID iid, void** ppv)
*ppv = new sdnAccessible(GetNode());
}
if (NULL == *ppv) {
if (nullptr == *ppv) {
HRESULT hr = ia2AccessibleComponent::QueryInterface(iid, ppv);
if (SUCCEEDED(hr))
return hr;
}
if (NULL == *ppv) {
if (nullptr == *ppv) {
HRESULT hr = ia2AccessibleHyperlink::QueryInterface(iid, ppv);
if (SUCCEEDED(hr))
return hr;
}
if (NULL == *ppv) {
if (nullptr == *ppv) {
HRESULT hr = ia2AccessibleValue::QueryInterface(iid, ppv);
if (SUCCEEDED(hr))
return hr;
}
if (NULL == *ppv)
if (nullptr == *ppv)
return E_NOINTERFACE;
(reinterpret_cast<IUnknown*>(*ppv))->AddRef();
@ -135,7 +135,7 @@ AccessibleWrap::get_accParent( IDispatch __RPC_FAR *__RPC_FAR *ppdispParent)
{
A11Y_TRYBLOCK_BEGIN
*ppdispParent = NULL;
*ppdispParent = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -195,7 +195,7 @@ AccessibleWrap::get_accChild(
{
A11Y_TRYBLOCK_BEGIN
*ppdispChild = NULL;
*ppdispChild = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -224,7 +224,7 @@ AccessibleWrap::get_accName(
{
A11Y_TRYBLOCK_BEGIN
*pszName = NULL;
*pszName = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -261,7 +261,7 @@ AccessibleWrap::get_accValue(
{
A11Y_TRYBLOCK_BEGIN
*pszValue = NULL;
*pszValue = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -299,7 +299,7 @@ AccessibleWrap::get_accDescription(VARIANT varChild,
{
A11Y_TRYBLOCK_BEGIN
*pszDescription = NULL;
*pszDescription = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -461,7 +461,7 @@ AccessibleWrap::get_accHelp(
{
A11Y_TRYBLOCK_BEGIN
*pszHelp = NULL;
*pszHelp = nullptr;
return S_FALSE;
A11Y_TRYBLOCK_END
@ -475,7 +475,7 @@ AccessibleWrap::get_accHelpTopic(
{
A11Y_TRYBLOCK_BEGIN
*pszHelpFile = NULL;
*pszHelpFile = nullptr;
*pidTopic = 0;
return S_FALSE;
@ -491,7 +491,7 @@ AccessibleWrap::get_accKeyboardShortcut(
if (!pszKeyboardShortcut)
return E_INVALIDARG;
*pszKeyboardShortcut = NULL;
*pszKeyboardShortcut = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -600,7 +600,7 @@ AccessibleEnumerator::QueryInterface(REFIID iid, void ** ppvObject)
return S_OK;
}
*ppvObject = NULL;
*ppvObject = nullptr;
return E_NOINTERFACE;
A11Y_TRYBLOCK_END
@ -742,7 +742,7 @@ AccessibleWrap::get_accDefaultAction(
{
A11Y_TRYBLOCK_BEGIN
*pszDefaultAction = NULL;
*pszDefaultAction = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -1066,7 +1066,7 @@ AccessibleWrap::get_relation(long aRelationIndex,
if (!aRelation)
return E_INVALIDARG;
*aRelation = NULL;
*aRelation = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -1280,7 +1280,7 @@ AccessibleWrap::get_extendedRole(BSTR *aExtendedRole)
{
A11Y_TRYBLOCK_BEGIN
*aExtendedRole = NULL;
*aExtendedRole = nullptr;
return E_NOTIMPL;
A11Y_TRYBLOCK_END
@ -1291,7 +1291,7 @@ AccessibleWrap::get_localizedExtendedRole(BSTR *aLocalizedExtendedRole)
{
A11Y_TRYBLOCK_BEGIN
*aLocalizedExtendedRole = NULL;
*aLocalizedExtendedRole = nullptr;
return E_NOTIMPL;
A11Y_TRYBLOCK_END
@ -1315,7 +1315,7 @@ AccessibleWrap::get_extendedStates(long aMaxExtendedStates,
{
A11Y_TRYBLOCK_BEGIN
*aExtendedStates = NULL;
*aExtendedStates = nullptr;
*aNExtendedStates = 0;
return E_NOTIMPL;
@ -1329,7 +1329,7 @@ AccessibleWrap::get_localizedExtendedStates(long aMaxLocalizedExtendedStates,
{
A11Y_TRYBLOCK_BEGIN
*aLocalizedExtendedStates = NULL;
*aLocalizedExtendedStates = nullptr;
*aNLocalizedExtendedStates = 0;
return E_NOTIMPL;
@ -1438,7 +1438,7 @@ AccessibleWrap::get_attributes(BSTR *aAttributes)
// The format is name:value;name:value; with \ for escaping these
// characters ":;=,\".
*aAttributes = NULL;
*aAttributes = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -1462,7 +1462,7 @@ AccessibleWrap::GetTypeInfoCount(UINT *pctinfo)
STDMETHODIMP
AccessibleWrap::GetTypeInfo(UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo)
{
*ppTInfo = NULL;
*ppTInfo = nullptr;
if (iTInfo != 0)
return DISP_E_BADINDEX;
@ -1647,7 +1647,7 @@ HRESULT
AccessibleWrap::ConvertToIA2Attributes(nsIPersistentProperties *aAttributes,
BSTR *aIA2Attributes)
{
*aIA2Attributes = NULL;
*aIA2Attributes = nullptr;
// The format is name:value;name:value; with \ for escaping these
// characters ":;=,\".
@ -1711,7 +1711,7 @@ AccessibleWrap::NativeAccessible(nsIAccessible* aAccessible)
{
if (!aAccessible) {
NS_WARNING("Not passing in an aAccessible");
return NULL;
return nullptr;
}
IAccessible* msaaAccessible = nullptr;
@ -1789,7 +1789,7 @@ AccessibleWrap::UpdateSystemCaret()
// Create invisible bitmap for caret, otherwise its appearance interferes
// with Gecko caret
HBITMAP caretBitMap = CreateBitmap(1, caretRect.height, 1, 1, NULL);
HBITMAP caretBitMap = CreateBitmap(1, caretRect.height, 1, 1, nullptr);
if (::CreateCaret(caretWnd, caretBitMap, 1, caretRect.height)) { // Also destroys the last caret
::ShowCaret(caretWnd);
RECT windowRect;
@ -1805,16 +1805,16 @@ AccessibleWrap::GetTI(LCID lcid)
if (gTypeInfo)
return gTypeInfo;
ITypeLib *typeLib = NULL;
ITypeLib *typeLib = nullptr;
HRESULT hr = LoadRegTypeLib(LIBID_Accessibility, 1, 0, lcid, &typeLib);
if (FAILED(hr))
return NULL;
return nullptr;
hr = typeLib->GetTypeInfoOfGuid(IID_IAccessible, &gTypeInfo);
typeLib->Release();
if (FAILED(hr))
return NULL;
return nullptr;
return gTypeInfo;
}

2
accessible/src/windows/msaa/AccessibleWrap.h
View File

@ -46,7 +46,7 @@ Class::QueryInterface(REFIID aIID, void** aInstancePtr) \
A11Y_TRYBLOCK_BEGIN \
if (!aInstancePtr) \
return E_INVALIDARG; \
*aInstancePtr = NULL; \
*aInstancePtr = nullptr; \
\
HRESULT hr = E_NOINTERFACE;

8
accessible/src/windows/msaa/ApplicationAccessibleWrap.cpp
View File

@ -47,7 +47,7 @@ ApplicationAccessibleWrap::NativeAttributes()
STDMETHODIMP
ApplicationAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_IAccessibleApplication == iid) {
*ppv = static_cast<IAccessibleApplication*>(this);
@ -66,7 +66,7 @@ ApplicationAccessibleWrap::get_appName(BSTR* aName)
{
A11Y_TRYBLOCK_BEGIN
*aName = NULL;
*aName = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -90,7 +90,7 @@ ApplicationAccessibleWrap::get_appVersion(BSTR* aVersion)
{
A11Y_TRYBLOCK_BEGIN
*aVersion = NULL;
*aVersion = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -136,7 +136,7 @@ ApplicationAccessibleWrap::get_toolkitVersion(BSTR* aVersion)
{
A11Y_TRYBLOCK_BEGIN
*aVersion = NULL;
*aVersion = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;

2
accessible/src/windows/msaa/Compatibility.cpp
View File

@ -30,7 +30,7 @@ IsModuleVersionLessThan(HMODULE aModuleHandle, DWORD aMajor, DWORD aMinor)
::GetFileVersionInfoW(fileName, 0, length, versionInfo);
UINT uLen;
VS_FIXEDFILEINFO* fixedFileInfo = NULL;
VS_FIXEDFILEINFO* fixedFileInfo = nullptr;
::VerQueryValueW(versionInfo, L"\\", (LPVOID*)&fixedFileInfo, &uLen);
DWORD dwFileVersionMS = fixedFileInfo->dwFileVersionMS;
DWORD dwFileVersionLS = fixedFileInfo->dwFileVersionLS;

18
accessible/src/windows/msaa/DocAccessibleWrap.cpp
View File

@ -38,7 +38,7 @@ using namespace mozilla::a11y;
DocAccessibleWrap::
DocAccessibleWrap(nsIDocument* aDocument, nsIContent* aRootContent,
nsIPresShell* aPresShell) :
DocAccessible(aDocument, aRootContent, aPresShell), mHWND(NULL)
DocAccessible(aDocument, aRootContent, aPresShell), mHWND(nullptr)
{
}
@ -64,7 +64,7 @@ STDMETHODIMP_(ULONG) DocAccessibleWrap::Release()
STDMETHODIMP
DocAccessibleWrap::QueryInterface(REFIID iid, void** ppv)
{
*ppv = NULL;
*ppv = nullptr;
if (IID_ISimpleDOMDocument != iid)
return HyperTextAccessibleWrap::QueryInterface(iid, ppv);
@ -80,7 +80,7 @@ DocAccessibleWrap::get_URL(/* [out] */ BSTR __RPC_FAR *aURL)
{
A11Y_TRYBLOCK_BEGIN
*aURL = NULL;
*aURL = nullptr;
nsAutoString URL;
nsresult rv = GetURL(URL);
@ -101,7 +101,7 @@ DocAccessibleWrap::get_title( /* [out] */ BSTR __RPC_FAR *aTitle)
{
A11Y_TRYBLOCK_BEGIN
*aTitle = NULL;
*aTitle = nullptr;
nsAutoString title;
nsresult rv = GetTitle(title);
@ -119,7 +119,7 @@ DocAccessibleWrap::get_mimeType(/* [out] */ BSTR __RPC_FAR *aMimeType)
{
A11Y_TRYBLOCK_BEGIN
*aMimeType = NULL;
*aMimeType = nullptr;
nsAutoString mimeType;
nsresult rv = GetMimeType(mimeType);
@ -140,7 +140,7 @@ DocAccessibleWrap::get_docType(/* [out] */ BSTR __RPC_FAR *aDocType)
{
A11Y_TRYBLOCK_BEGIN
*aDocType = NULL;
*aDocType = nullptr;
nsAutoString docType;
nsresult rv = GetDocType(docType);
@ -162,7 +162,7 @@ DocAccessibleWrap::get_nameSpaceURIForID(/* [in] */ short aNameSpaceID,
{
A11Y_TRYBLOCK_BEGIN
*aNameSpaceURI = NULL;
*aNameSpaceURI = nullptr;
if (aNameSpaceID < 0)
return E_INVALIDARG; // -1 is kNameSpaceID_Unknown
@ -188,7 +188,7 @@ DocAccessibleWrap::put_alternateViewMediaTypes( /* [in] */ BSTR __RPC_FAR *aComm
{
A11Y_TRYBLOCK_BEGIN
*aCommaSeparatedMediaTypes = NULL;
*aCommaSeparatedMediaTypes = nullptr;
return E_NOTIMPL;
A11Y_TRYBLOCK_END
@ -200,7 +200,7 @@ DocAccessibleWrap::get_accValue(
/* [retval][out] */ BSTR __RPC_FAR *pszValue)
{
// For backwards-compat, we still support old MSAA hack to provide URL in accValue
*pszValue = NULL;
*pszValue = nullptr;
// Check for real value first
HRESULT hr = AccessibleWrap::get_accValue(varChild, pszValue);
if (FAILED(hr) || *pszValue || varChild.lVal != CHILDID_SELF)

2
accessible/src/windows/msaa/HyperTextAccessibleWrap.cpp
View File

@ -30,7 +30,7 @@ HyperTextAccessibleWrap::QueryInterface(REFIID aIID, void** aInstancePtr)
if (!aInstancePtr)
return E_FAIL;
*aInstancePtr = NULL;
*aInstancePtr = nullptr;
if (IsTextRole()) {
if (aIID == IID_IAccessibleText)

2
accessible/src/windows/msaa/ServiceProvider.cpp
View File

@ -37,7 +37,7 @@ ServiceProvider::QueryService(REFGUID aGuidService, REFIID aIID,
if (!aInstancePtr)
return E_INVALIDARG;
*aInstancePtr = NULL;
*aInstancePtr = nullptr;
// UIA IAccessibleEx
if (aGuidService == IID_IAccessibleEx &&

4
accessible/src/windows/msaa/TextLeafAccessibleWrap.cpp
View File

@ -64,7 +64,7 @@ TextLeafAccessibleWrap::get_domText(
{
A11Y_TRYBLOCK_BEGIN
*aDomText = NULL;
*aDomText = nullptr;
if (IsDefunct())
return E_FAIL;
@ -246,7 +246,7 @@ TextLeafAccessibleWrap::get_fontFamily(
{
A11Y_TRYBLOCK_BEGIN
*aFontFamily = NULL;
*aFontFamily = nullptr;
nsIFrame* frame = GetFrame();
if (!frame) {

2
accessible/src/windows/msaa/nsAccessNodeWrap.cpp
View File

@ -90,7 +90,7 @@ nsAccessNodeWrap::WindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
if (lParam == OBJID_CLIENT) {
DocAccessible* document = sHWNDCache.GetWeak(static_cast<void*>(hWnd));
if (document) {
IAccessible* msaaAccessible = NULL;
IAccessible* msaaAccessible = nullptr;
document->GetNativeInterface((void**)&msaaAccessible); // does an addref
if (msaaAccessible) {
LRESULT result = ::LresultFromObject(IID_IAccessible, wParam,

20
accessible/src/windows/msaa/nsWinUtils.cpp
View File

@ -65,7 +65,7 @@ nsWinUtils::ShutdownWindowEmulation()
// Unregister window call that's used for document accessibles associated
// with tabs.
if (IsWindowEmulationStarted())
::UnregisterClassW(kClassNameTabContent, GetModuleHandle(NULL));
::UnregisterClassW(kClassNameTabContent, GetModuleHandle(nullptr));
}
bool
@ -82,11 +82,11 @@ nsWinUtils::RegisterNativeWindow(LPCWSTR aWindowClass)
wc.lpfnWndProc = nsAccessNodeWrap::WindowProc;
wc.cbClsExtra = 0;
wc.cbWndExtra = 0;
wc.hInstance = GetModuleHandle(NULL);
wc.hIcon = NULL;
wc.hCursor = NULL;
wc.hbrBackground = NULL;
wc.lpszMenuName = NULL;
wc.hInstance = GetModuleHandle(nullptr);
wc.hIcon = nullptr;
wc.hCursor = nullptr;
wc.hbrBackground = nullptr;
wc.lpszMenuName = nullptr;
wc.lpszClassName = aWindowClass;
::RegisterClassW(&wc);
}
@ -101,9 +101,9 @@ nsWinUtils::CreateNativeWindow(LPCWSTR aWindowClass, HWND aParentWnd,
WS_CHILD | (aIsActive ? WS_VISIBLE : 0),
aX, aY, aWidth, aHeight,
aParentWnd,
NULL,
GetModuleHandle(NULL),
NULL);
nullptr,
GetModuleHandle(nullptr),
nullptr);
if (hwnd) {
// Mark this window so that ipc related code can identify it.
::SetPropW(hwnd, kPropNameTabContent, (HANDLE)1);
@ -120,7 +120,7 @@ nsWinUtils::ShowNativeWindow(HWND aWnd)
void
nsWinUtils::HideNativeWindow(HWND aWnd)
{
::SetWindowPos(aWnd, NULL, 0, 0, 0, 0,
::SetWindowPos(aWnd, nullptr, 0, 0, 0, 0,
SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE |
SWP_NOZORDER | SWP_NOACTIVATE);
}

28
accessible/src/windows/sdn/sdnAccessible.cpp
View File

@ -31,7 +31,7 @@ sdnAccessible::QueryInterface(REFIID aREFIID, void** aInstancePtr)
if (!aInstancePtr)
return E_FAIL;
*aInstancePtr = NULL;
*aInstancePtr = nullptr;
if (aREFIID == IID_ISimpleDOMNode) {
*aInstancePtr = this;
@ -70,9 +70,9 @@ sdnAccessible::get_nodeInfo(BSTR __RPC_FAR* aNodeName,
!aUniqueID || !aNodeType)
return E_INVALIDARG;
*aNodeName = NULL;
*aNodeName = nullptr;
*aNameSpaceID = 0;
*aNodeValue = NULL;
*aNodeValue = nullptr;
*aNumChildren = 0;
*aUniqueID = 0;
*aNodeType = 0;
@ -143,7 +143,7 @@ sdnAccessible::get_attributes(unsigned short aMaxAttribs,
for (uint32_t index = 0; index < numAttribs; index++) {
aNameSpaceIDs[index] = 0;
aAttribValues[index] = aAttribNames[index] = NULL;
aAttribValues[index] = aAttribNames[index] = nullptr;
nsAutoString attributeValue;
const nsAttrName* name = elm->GetAttrNameAt(index);
@ -181,7 +181,7 @@ sdnAccessible::get_attributesForNames(unsigned short aMaxAttribs,
int32_t index = 0;
for (index = 0; index < aMaxAttribs; index++) {
aAttribValues[index] = NULL;
aAttribValues[index] = nullptr;
if (aAttribNames[index]) {
nsAutoString attributeValue, nameSpaceURI;
nsAutoString attributeName(nsDependentString(
@ -321,7 +321,7 @@ sdnAccessible::get_parentNode(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
if (!aNode)
return E_INVALIDARG;
*aNode = NULL;
*aNode = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -344,7 +344,7 @@ sdnAccessible::get_firstChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
if (!aNode)
return E_INVALIDARG;
*aNode = NULL;
*aNode = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -367,7 +367,7 @@ sdnAccessible::get_lastChild(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
if (!aNode)
return E_INVALIDARG;
*aNode = NULL;
*aNode = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -390,7 +390,7 @@ sdnAccessible::get_previousSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
if (!aNode)
return E_INVALIDARG;
*aNode = NULL;
*aNode = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -413,7 +413,7 @@ sdnAccessible::get_nextSibling(ISimpleDOMNode __RPC_FAR *__RPC_FAR* aNode)
if (!aNode)
return E_INVALIDARG;
*aNode = NULL;
*aNode = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -437,7 +437,7 @@ sdnAccessible::get_childAt(unsigned aChildIndex,
if (!aNode)
return E_INVALIDARG;
*aNode = NULL;
*aNode = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -461,7 +461,7 @@ sdnAccessible::get_innerHTML(BSTR __RPC_FAR* aInnerHTML)
if (!aInnerHTML)
return E_INVALIDARG;
*aInnerHTML = NULL;
*aInnerHTML = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -491,7 +491,7 @@ sdnAccessible::get_localInterface(void __RPC_FAR *__RPC_FAR* aLocalInterface)
if (!aLocalInterface)
return E_INVALIDARG;
*aLocalInterface = NULL;
*aLocalInterface = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;
@ -511,7 +511,7 @@ sdnAccessible::get_language(BSTR __RPC_FAR* aLanguage)
if (!aLanguage)
return E_INVALIDARG;
*aLanguage = NULL;
*aLanguage = nullptr;
if (IsDefunct())
return CO_E_OBJNOTCONNECTED;

12
accessible/src/windows/uia/uiaRawElmProvider.cpp
View File

@ -33,7 +33,7 @@ uiaRawElmProvider::GetObjectForChild(long aIdChild,
if (!aAccEx)
return E_INVALIDARG;
*aAccEx = NULL;
*aAccEx = nullptr;
return mAcc->IsDefunct() ? CO_E_OBJNOTCONNECTED : S_OK;
@ -49,7 +49,7 @@ uiaRawElmProvider::GetIAccessiblePair(__RPC__deref_out_opt IAccessible** aAcc,
if (!aAcc || !aIdChild)
return E_INVALIDARG;
*aAcc = NULL;
*aAcc = nullptr;
*aIdChild = 0;
if (mAcc->IsDefunct())
@ -94,9 +94,9 @@ uiaRawElmProvider::ConvertReturnedElement(__RPC__in_opt IRawElementProviderSimpl
if (!aRawElmProvider || !aAccEx)
return E_INVALIDARG;
*aAccEx = NULL;
*aAccEx = nullptr;
void* instancePtr = NULL;
void* instancePtr = nullptr;
HRESULT hr = aRawElmProvider->QueryInterface(IID_IAccessibleEx, &instancePtr);
if (SUCCEEDED(hr))
*aAccEx = static_cast<IAccessibleEx*>(instancePtr);
@ -133,7 +133,7 @@ uiaRawElmProvider::GetPatternProvider(PATTERNID aPatternId,
if (!aPatternProvider)
return E_INVALIDARG;
*aPatternProvider = NULL;
*aPatternProvider = nullptr;
return S_OK;
A11Y_TRYBLOCK_END
@ -239,7 +239,7 @@ uiaRawElmProvider::get_HostRawElementProvider(__RPC__deref_out_opt IRawElementPr
return E_INVALIDARG;
// This method is not used with IAccessibleEx implementations.
*aRawElmProvider = NULL;
*aRawElmProvider = nullptr;
return S_OK;
A11Y_TRYBLOCK_END