Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3685)

Unified Diff: chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc

Issue 2707313002: Gtk: Change NULL to nullptr (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc
diff --git a/chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc b/chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc
index cfd6edec9c42abe451ebd15e10c3a89c281c5f90..f40654b966788f7cf7216a4c5258d5a3e658be35 100644
--- a/chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc
+++ b/chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.cc
@@ -31,8 +31,8 @@ X11InputMethodContextImplGtk2::X11InputMethodContextImplGtk2(
ui::LinuxInputMethodContextDelegate* delegate,
bool is_simple)
: delegate_(delegate),
- gtk_context_(NULL),
- gdk_last_set_client_window_(NULL) {
+ gtk_context_(nullptr),
+ gdk_last_set_client_window_(nullptr) {
CHECK(delegate_);
ResetXModifierKeycodesCache();
@@ -55,7 +55,7 @@ X11InputMethodContextImplGtk2::X11InputMethodContextImplGtk2(
X11InputMethodContextImplGtk2::~X11InputMethodContextImplGtk2() {
if (gtk_context_) {
g_object_unref(gtk_context_);
- gtk_context_ = NULL;
+ gtk_context_ = nullptr;
}
}
@@ -188,15 +188,15 @@ GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
}
if (!display) {
LOG(ERROR) << "Cannot get a GdkDisplay for a key event.";
- return NULL;
+ return nullptr;
}
// Get a keysym and group.
KeySym keysym = NoSymbol;
guint8 keyboard_group = 0;
- XLookupString(&xkey, NULL, 0, &keysym, NULL);
+ XLookupString(&xkey, nullptr, 0, &keysym, nullptr);
GdkKeymap* keymap = gdk_keymap_get_for_display(display);
- GdkKeymapKey* keys = NULL;
- guint* keyvals = NULL;
+ GdkKeymapKey* keys = nullptr;
+ guint* keyvals = nullptr;
gint n_entries = 0;
if (keymap && gdk_keymap_get_entries_for_keycode(keymap, xkey.keycode, &keys,
&keyvals, &n_entries)) {
@@ -208,9 +208,9 @@ GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
}
}
g_free(keys);
- keys = NULL;
+ keys = nullptr;
g_free(keyvals);
- keyvals = NULL;
+ keyvals = nullptr;
// Get a GdkWindow.
#if GTK_CHECK_VERSION(2, 24, 0)
GdkWindow* window = gdk_x11_window_lookup_for_display(display, xkey.window);
@@ -227,7 +227,7 @@ GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
#endif
if (!window) {
LOG(ERROR) << "Cannot get a GdkWindow for a key event.";
- return NULL;
+ return nullptr;
}
// Create a GdkEvent.
@@ -242,7 +242,7 @@ GdkEvent* X11InputMethodContextImplGtk2::GdkEventFromNativeEvent(
event->key.state = xkey.state;
event->key.keyval = keysym;
event->key.length = 0;
- event->key.string = NULL;
+ event->key.string = nullptr;
event->key.hardware_keycode = xkey.keycode;
event->key.group = keyboard_group;
event->key.is_modifier = IsKeycodeModifierKey(xkey.keycode);
@@ -292,8 +292,8 @@ void X11InputMethodContextImplGtk2::OnPreeditChanged(GtkIMContext* context) {
if (context != gtk_context_)
return;
- gchar* str = NULL;
- PangoAttrList* attrs = NULL;
+ gchar* str = nullptr;
+ PangoAttrList* attrs = nullptr;
gint cursor_pos = 0;
gtk_im_context_get_preedit_string(context, &str, &attrs, &cursor_pos);
ui::CompositionText composition_text;
« no previous file with comments | « chrome/browser/ui/libgtkui/x11_input_method_context_impl_gtk.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698