nyje
/
medit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed compiler warnings

master
Yevgen Muntyan 2017-10-23 16:13:26 -07:00
parent 36ad5567a4
commit 1ef9c46d0a
40 changed files with 687 additions and 666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
m4/moo-flags.m4
View File

@ -91,8 +91,9 @@ MOO_COMPILER
_MOO_AC_CHECK_COMPILER_OPTIONS([dnl _MOO_AC_CHECK_COMPILER_OPTIONS([dnl
-Wall -Wextra -fexceptions -fno-strict-aliasing dnl -Wall -Wextra -fexceptions -fno-strict-aliasing dnl
-Wno-missing-field-initializers -Wno-overlength-strings dnl -Wno-missing-field-initializers dnl
-Wno-format-y2k -Wno-overlength-strings dnl -Wno-format-y2k -Wno-overlength-strings dnl
-Wno-deprecated-declarations dnl
]) ])
_MOO_AC_CHECK_CXX_COMPILER_OPTIONS([dnl _MOO_AC_CHECK_CXX_COMPILER_OPTIONS([dnl
-std=c++11 -fno-rtti dnl -std=c++11 -fno-rtti dnl

2
moo/medit-app/parse.h
View File

@ -191,7 +191,7 @@ parse_file (const char *string,
if (!*current_dir) if (!*current_dir)
*current_dir = g_get_current_dir (); *current_dir = g_get_current_dir ();
filename = g_build_filename (*current_dir, string, NULL); filename = g_build_filename (*current_dir, string, nullptr);
ret = parse_filename (filename); ret = parse_filename (filename);
g_free (filename); g_free (filename);

10
moo/mooapp/mooapp.cpp
View File

@ -972,26 +972,26 @@ install_common_actions (void)
"tooltip", GTK_STOCK_PREFERENCES, "tooltip", GTK_STOCK_PREFERENCES,
"stock-id", GTK_STOCK_PREFERENCES, "stock-id", GTK_STOCK_PREFERENCES,
"closure-callback", moo_app_prefs_dialog, "closure-callback", moo_app_prefs_dialog,
NULL); nullptr);
moo_window_class_new_action (klass, "About", NULL, moo_window_class_new_action (klass, "About", NULL,
"label", GTK_STOCK_ABOUT, "label", GTK_STOCK_ABOUT,
"no-accel", TRUE, "no-accel", TRUE,
"stock-id", GTK_STOCK_ABOUT, "stock-id", GTK_STOCK_ABOUT,
"closure-callback", moo_app_about_dialog, "closure-callback", moo_app_about_dialog,
NULL); nullptr);
moo_window_class_new_action (klass, "Help", NULL, moo_window_class_new_action (klass, "Help", NULL,
"label", GTK_STOCK_HELP, "label", GTK_STOCK_HELP,
"default-accel", MOO_APP_ACCEL_HELP, "default-accel", MOO_APP_ACCEL_HELP,
"stock-id", GTK_STOCK_HELP, "stock-id", GTK_STOCK_HELP,
"closure-callback", moo_app_help, "closure-callback", moo_app_help,
NULL); nullptr);
moo_window_class_new_action (klass, "ReportBug", NULL, moo_window_class_new_action (klass, "ReportBug", NULL,
"label", _("Report a Bug..."), "label", _("Report a Bug..."),
"closure-callback", moo_app_report_bug, "closure-callback", moo_app_report_bug,
NULL); nullptr);
moo_window_class_new_action (klass, "Quit", NULL, moo_window_class_new_action (klass, "Quit", NULL,
"display-name", GTK_STOCK_QUIT, "display-name", GTK_STOCK_QUIT,
@ -1001,7 +1001,7 @@ install_common_actions (void)
"default-accel", MOO_APP_ACCEL_QUIT, "default-accel", MOO_APP_ACCEL_QUIT,
"closure-callback", moo_app_quit, "closure-callback", moo_app_quit,
"closure-proxy-func", moo_app_instance, "closure-proxy-func", moo_app_instance,
NULL); nullptr);
g_type_class_unref (klass); g_type_class_unref (klass);
} }

217
moo/mooapp/moohtml.cpp
View File

@ -213,7 +213,7 @@ _moo_html_tag_class_init (MooHtmlTagClass *klass)
g_param_spec_string ("href", g_param_spec_string ("href",
"href", "href",
"href", "href",
NULL, nullptr,
(GParamFlags) G_PARAM_READWRITE)); (GParamFlags) G_PARAM_READWRITE));
} }
@ -221,9 +221,9 @@ _moo_html_tag_class_init (MooHtmlTagClass *klass)
static void static void
_moo_html_tag_init (MooHtmlTag *tag) _moo_html_tag_init (MooHtmlTag *tag)
{ {
tag->href = NULL; tag->href = nullptr;
tag->parent = NULL; tag->parent = nullptr;
tag->attr = NULL; tag->attr = nullptr;
} }
@ -309,7 +309,7 @@ _moo_html_class_init (MooHtmlClass *klass)
g_param_spec_string ("title", g_param_spec_string ("title",
"title", "title",
"title", "title",
NULL, nullptr,
(GParamFlags) G_PARAM_READWRITE)); (GParamFlags) G_PARAM_READWRITE));
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
@ -317,7 +317,7 @@ _moo_html_class_init (MooHtmlClass *klass)
g_param_spec_string ("markup", g_param_spec_string ("markup",
"markup", "markup",
"markup", "markup",
NULL, nullptr,
G_PARAM_WRITABLE)); G_PARAM_WRITABLE));
html_signals[LOAD_URL] = html_signals[LOAD_URL] =
@ -325,7 +325,7 @@ _moo_html_class_init (MooHtmlClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (MooHtmlClass, load_url), G_STRUCT_OFFSET (MooHtmlClass, load_url),
g_signal_accumulator_true_handled, NULL, g_signal_accumulator_true_handled, nullptr,
_moo_marshal_BOOLEAN__STRING, _moo_marshal_BOOLEAN__STRING,
G_TYPE_BOOLEAN, 1, G_TYPE_BOOLEAN, 1,
G_TYPE_STRING); G_TYPE_STRING);
@ -335,7 +335,7 @@ _moo_html_class_init (MooHtmlClass *klass)
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (MooHtmlClass, hover_link), G_STRUCT_OFFSET (MooHtmlClass, hover_link),
NULL, NULL, nullptr, nullptr,
_moo_marshal_VOID__STRING, _moo_marshal_VOID__STRING,
G_TYPE_NONE, 1, G_TYPE_NONE, 1,
G_TYPE_STRING); G_TYPE_STRING);
@ -348,15 +348,15 @@ moo_html_data_new (void)
MooHtmlData *data = g_new0 (MooHtmlData, 1); MooHtmlData *data = g_new0 (MooHtmlData, 1);
data->anchors = g_hash_table_new_full (g_str_hash, g_str_equal, data->anchors = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL); g_free, nullptr);
data->root_tags = g_hash_table_new_full (g_str_hash, g_str_equal, data->root_tags = g_hash_table_new_full (g_str_hash, g_str_equal,
g_free, NULL); g_free, nullptr);
data->href_tags = NULL; data->href_tags = nullptr;
data->doc = NULL; data->doc = nullptr;
data->filename = NULL; data->filename = nullptr;
data->basename = NULL; data->basename = nullptr;
data->dirname = NULL; data->dirname = nullptr;
data->font_sizes[0] = PANGO_SCALE_X_SMALL; data->font_sizes[0] = PANGO_SCALE_X_SMALL;
data->font_sizes[1] = PANGO_SCALE_SMALL; data->font_sizes[1] = PANGO_SCALE_SMALL;
@ -420,7 +420,7 @@ moo_html_get_data (GtkTextView* object)
data = moo_html_data_new (); data = moo_html_data_new ();
g_object_set_data_full(G_OBJECT(object), "moo-html-data", data, g_object_set_data_full(G_OBJECT(object), "moo-html-data", data,
(GDestroyNotify) moo_html_data_free); (GDestroyNotify) moo_html_data_free);
g_signal_connect (object, "size-allocate", G_CALLBACK (moo_html_size_allocate_cb), NULL); g_signal_connect (object, "size-allocate", G_CALLBACK (moo_html_size_allocate_cb), nullptr);
} }
return data; return data;
@ -437,7 +437,7 @@ _moo_html_init (MooHtml *html)
"editable", FALSE, "editable", FALSE,
"wrap-mode", GTK_WRAP_WORD, "wrap-mode", GTK_WRAP_WORD,
"pixels-below-lines", DEFAULT_PAR_SPACING, "pixels-below-lines", DEFAULT_PAR_SPACING,
NULL); nullptr);
} }
@ -476,7 +476,7 @@ moo_html_set_property (GObject *object,
if (!string) if (!string)
string = ""; string = "";
_moo_html_load_memory (GTK_TEXT_VIEW (html), string, -1, NULL, NULL); _moo_html_load_memory (GTK_TEXT_VIEW (html), string, -1, nullptr, nullptr);
break; break;
default: default:
@ -523,7 +523,7 @@ moo_html_load_url (GtkTextView *view,
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_return_val_if_fail (GTK_IS_TEXT_VIEW (view), FALSE); g_return_val_if_fail (GTK_IS_TEXT_VIEW (view), FALSE);
g_return_val_if_fail (url != NULL, FALSE); g_return_val_if_fail (url != nullptr, FALSE);
if (!moo_html_parse_url (url, &scheme, &base, &anchor)) if (!moo_html_parse_url (url, &scheme, &base, &anchor))
{ {
@ -537,7 +537,7 @@ moo_html_load_url (GtkTextView *view,
if (!strcmp (scheme, "mailto:") || if (!strcmp (scheme, "mailto:") ||
!strcmp (scheme, "mailto://")) !strcmp (scheme, "mailto://"))
{ {
result = moo_open_email (base, NULL, NULL); result = moo_open_email (base, nullptr, nullptr);
goto out; goto out;
} }
@ -555,9 +555,9 @@ moo_html_load_url (GtkTextView *view,
{ {
if (data->dirname) if (data->dirname)
{ {
char *filename = g_build_filename (data->dirname, base, NULL); char *filename = g_build_filename (data->dirname, base, nullptr);
result = _moo_html_load_file (view, filename, NULL); result = _moo_html_load_file (view, filename, nullptr);
if (result && anchor) if (result && anchor)
moo_html_goto_anchor (view, anchor); moo_html_goto_anchor (view, anchor);
@ -567,7 +567,7 @@ moo_html_load_url (GtkTextView *view,
} }
else else
{ {
result = _moo_html_load_file (view, base, NULL); result = _moo_html_load_file (view, base, nullptr);
if (result && anchor) if (result && anchor)
moo_html_goto_anchor (view, anchor); moo_html_goto_anchor (view, anchor);
@ -606,13 +606,13 @@ moo_html_clear (GtkTextView *view)
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_hash_table_destroy (data->anchors); g_hash_table_destroy (data->anchors);
data->anchors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL); data->anchors = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, nullptr);
buffer = gtk_text_view_get_buffer (view); buffer = gtk_text_view_get_buffer (view);
table = gtk_text_buffer_get_tag_table (buffer); table = gtk_text_buffer_get_tag_table (buffer);
g_slist_foreach (data->href_tags, (GFunc) remove_tag, table); g_slist_foreach (data->href_tags, (GFunc) remove_tag, table);
g_slist_free (data->href_tags); g_slist_free (data->href_tags);
data->href_tags = NULL; data->href_tags = nullptr;
gtk_text_buffer_get_bounds (buffer, &start, &end); gtk_text_buffer_get_bounds (buffer, &start, &end);
gtk_text_buffer_delete (buffer, &start, &end); gtk_text_buffer_delete (buffer, &start, &end);
@ -622,10 +622,10 @@ moo_html_clear (GtkTextView *view)
if (data->doc) if (data->doc)
xmlFreeDoc (data->doc); xmlFreeDoc (data->doc);
data->doc = NULL; data->doc = nullptr;
g_slist_free (data->rulers); g_slist_free (data->rulers);
data->rulers = NULL; data->rulers = nullptr;
} }
@ -634,8 +634,8 @@ moo_text_view_set_markup (GtkTextView *view,
const char *markup) const char *markup)
{ {
g_return_if_fail (GTK_IS_TEXT_VIEW (view)); g_return_if_fail (GTK_IS_TEXT_VIEW (view));
g_return_if_fail (markup != NULL); g_return_if_fail (markup != nullptr);
_moo_html_load_memory (view, markup, -1, NULL, NULL); _moo_html_load_memory (view, markup, -1, nullptr, nullptr);
} }
@ -650,7 +650,7 @@ _moo_html_load_memory (GtkTextView *view,
MooHtmlData *data; MooHtmlData *data;
g_return_val_if_fail (GTK_IS_TEXT_VIEW (view), FALSE); g_return_val_if_fail (GTK_IS_TEXT_VIEW (view), FALSE);
g_return_val_if_fail (buffer != NULL, FALSE); g_return_val_if_fail (buffer != nullptr, FALSE);
data = moo_html_get_data (view); data = moo_html_get_data (view);
@ -669,9 +669,9 @@ _moo_html_load_memory (GtkTextView *view,
g_free (data->filename); g_free (data->filename);
g_free (data->basename); g_free (data->basename);
g_free (data->dirname); g_free (data->dirname);
data->filename = NULL; data->filename = nullptr;
data->basename = NULL; data->basename = nullptr;
data->dirname = NULL; data->dirname = nullptr;
moo_html_set_doc (view, doc); moo_html_set_doc (view, doc);
@ -689,7 +689,7 @@ _moo_html_load_file (GtkTextView *view,
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_return_val_if_fail (GTK_IS_TEXT_VIEW (view), FALSE); g_return_val_if_fail (GTK_IS_TEXT_VIEW (view), FALSE);
g_return_val_if_fail (file != NULL, FALSE); g_return_val_if_fail (file != nullptr, FALSE);
doc = htmlReadFile (file, encoding, HTML_PARSE_NONET); doc = htmlReadFile (file, encoding, HTML_PARSE_NONET);
@ -717,7 +717,7 @@ moo_html_set_doc (GtkTextView *view,
{ {
MooHtmlData *data; MooHtmlData *data;
g_return_if_fail (doc != NULL); g_return_if_fail (doc != nullptr);
data = moo_html_get_data (view); data = moo_html_get_data (view);
g_return_if_fail (doc != data->doc); g_return_if_fail (doc != data->doc);
@ -743,7 +743,7 @@ attr_compose (MooHtmlAttr *dest,
static MooHtmlAttrMask font_face_mask = static MooHtmlAttrMask font_face_mask =
MOO_HTML_FONT_FACE | MOO_HTML_MONOSPACE; MOO_HTML_FONT_FACE | MOO_HTML_MONOSPACE;
g_return_if_fail (dest != NULL); g_return_if_fail (dest != nullptr);
if (!src) if (!src)
return; return;
@ -855,49 +855,49 @@ attr_apply (const MooHtmlAttr *attr,
{ {
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_return_if_fail (attr != NULL && tag != NULL); g_return_if_fail (attr != nullptr && tag != nullptr);
moo_html_attr_free (tag->attr); moo_html_attr_free (tag->attr);
tag->attr = moo_html_attr_copy (attr); tag->attr = moo_html_attr_copy (attr);
if (attr->mask & MOO_HTML_FG) if (attr->mask & MOO_HTML_FG)
g_object_set (tag, "foreground", attr->fg, NULL); g_object_set (tag, "foreground", attr->fg, nullptr);
if (attr->mask & MOO_HTML_BG) if (attr->mask & MOO_HTML_BG)
g_object_set (tag, "background", attr->bg, NULL); g_object_set (tag, "background", attr->bg, nullptr);
if (attr->mask & MOO_HTML_BOLD) if (attr->mask & MOO_HTML_BOLD)
g_object_set (tag, "weight", PANGO_WEIGHT_BOLD, NULL); g_object_set (tag, "weight", PANGO_WEIGHT_BOLD, nullptr);
if (attr->mask & MOO_HTML_ITALIC) if (attr->mask & MOO_HTML_ITALIC)
g_object_set (tag, "style", PANGO_STYLE_ITALIC, NULL); g_object_set (tag, "style", PANGO_STYLE_ITALIC, nullptr);
if (attr->mask & MOO_HTML_UNDERLINE) if (attr->mask & MOO_HTML_UNDERLINE)
g_object_set (tag, "underline", PANGO_UNDERLINE_SINGLE, NULL); g_object_set (tag, "underline", PANGO_UNDERLINE_SINGLE, nullptr);
if (attr->mask & MOO_HTML_STRIKETHROUGH) if (attr->mask & MOO_HTML_STRIKETHROUGH)
g_object_set (tag, "strikethrough", TRUE, NULL); g_object_set (tag, "strikethrough", TRUE, nullptr);
if (attr->mask & MOO_HTML_LEFT_MARGIN) if (attr->mask & MOO_HTML_LEFT_MARGIN)
g_object_set (tag, "left-margin", attr->left_margin, NULL); g_object_set (tag, "left-margin", attr->left_margin, nullptr);
if (attr->mask & MOO_HTML_LINK) if (attr->mask & MOO_HTML_LINK)
{ {
g_free (tag->href); g_free (tag->href);
tag->href = g_strdup (attr->link); tag->href = g_strdup (attr->link);
g_object_set (tag, "foreground", "blue", NULL); g_object_set (tag, "foreground", "blue", nullptr);
} }
if (attr->mask & MOO_HTML_SUP) if (attr->mask & MOO_HTML_SUP)
g_object_set (tag, g_object_set (tag,
"rise", 8 * PANGO_SCALE, "rise", 8 * PANGO_SCALE,
"size", 8 * PANGO_SCALE, "size", 8 * PANGO_SCALE,
NULL); nullptr);
if (attr->mask & MOO_HTML_SUB) if (attr->mask & MOO_HTML_SUB)
g_object_set (tag, g_object_set (tag,
"rise", -8 * PANGO_SCALE, "rise", -8 * PANGO_SCALE,
"size", 8 * PANGO_SCALE, "size", 8 * PANGO_SCALE,
NULL); nullptr);
if (attr->mask & MOO_HTML_MONOSPACE) if (attr->mask & MOO_HTML_MONOSPACE)
g_object_set (tag, "font", data->monospace, NULL); g_object_set (tag, "font", data->monospace, nullptr);
else if (attr->mask & MOO_HTML_FONT_FACE) else if (attr->mask & MOO_HTML_FONT_FACE)
g_object_set (tag, "font", attr->font_face, NULL); g_object_set (tag, "font", attr->font_face, nullptr);
if (attr->mask & MOO_HTML_HEADING) if (attr->mask & MOO_HTML_HEADING)
{ {
@ -914,7 +914,7 @@ attr_apply (const MooHtmlAttr *attr,
g_object_set (tag, g_object_set (tag,
"scale", scale, "scale", scale,
"pixels-below-lines", DEFAULT_PAR_SPACING + space, "pixels-below-lines", DEFAULT_PAR_SPACING + space,
NULL); nullptr);
} }
else if (attr->mask & MOO_HTML_SMALLER) else if (attr->mask & MOO_HTML_SMALLER)
{ {
@ -927,7 +927,7 @@ attr_apply (const MooHtmlAttr *attr,
g_object_set (tag, g_object_set (tag,
"scale", scale, "scale", scale,
"pixels-below-lines", DEFAULT_PAR_SPACING + space, "pixels-below-lines", DEFAULT_PAR_SPACING + space,
NULL); nullptr);
} }
else if (attr->mask & MOO_HTML_FONT_SIZE) else if (attr->mask & MOO_HTML_FONT_SIZE)
{ {
@ -936,11 +936,11 @@ attr_apply (const MooHtmlAttr *attr,
"scale", data->font_sizes[attr->font_size - 1], "scale", data->font_sizes[attr->font_size - 1],
"pixels-below-lines", "pixels-below-lines",
DEFAULT_PAR_SPACING + data->par_spacing[attr->font_size - 1], DEFAULT_PAR_SPACING + data->par_spacing[attr->font_size - 1],
NULL); nullptr);
} }
else if (attr->mask & MOO_HTML_FONT_PT_SIZE) else if (attr->mask & MOO_HTML_FONT_PT_SIZE)
{ {
g_object_set (tag, "size-points", (double) attr->font_pt_size, NULL); g_object_set (tag, "size-points", (double) attr->font_pt_size, nullptr);
} }
} }
@ -958,11 +958,11 @@ moo_html_make_heading_tag (GtkTextView *view,
"pixels-below-lines", "pixels-below-lines",
DEFAULT_PAR_SPACING + data->heading_spacing[heading - 1], DEFAULT_PAR_SPACING + data->heading_spacing[heading - 1],
"scale", data->heading_sizes[heading - 1], "scale", data->heading_sizes[heading - 1],
"weight", PANGO_WEIGHT_BOLD, NULL); "weight", PANGO_WEIGHT_BOLD, nullptr);
if (data->heading_faces[heading - 1]) if (data->heading_faces[heading - 1])
g_object_set (tag, "family", g_object_set (tag, "family",
data->heading_faces[heading - 1], NULL); data->heading_faces[heading - 1], nullptr);
} }
@ -976,7 +976,7 @@ moo_html_create_tag (GtkTextView *view,
MooHtmlAttr real_attr; MooHtmlAttr real_attr;
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_return_val_if_fail (attr != NULL, NULL); g_return_val_if_fail (attr != nullptr, nullptr);
if (!attr->mask && !force) if (!attr->mask && !force)
return parent; return parent;
@ -991,7 +991,7 @@ moo_html_create_tag (GtkTextView *view,
real_attr = *attr; real_attr = *attr;
} }
tag = MOO_HTML_TAG (g_object_new (MOO_TYPE_HTML_TAG, (const char*) NULL)); tag = MOO_HTML_TAG (g_object_new (MOO_TYPE_HTML_TAG, (const char*) nullptr));
gtk_text_tag_table_add (gtk_text_buffer_get_tag_table (gtk_text_view_get_buffer (view)), gtk_text_tag_table_add (gtk_text_buffer_get_tag_table (gtk_text_view_get_buffer (view)),
GTK_TEXT_TAG (tag)); GTK_TEXT_TAG (tag));
g_object_unref (tag); g_object_unref (tag);
@ -1010,7 +1010,7 @@ moo_html_attr_copy (const MooHtmlAttr *src)
{ {
MooHtmlAttr *attr; MooHtmlAttr *attr;
g_return_val_if_fail (src != NULL, NULL); g_return_val_if_fail (src != nullptr, nullptr);
attr = g_new (MooHtmlAttr, 1); attr = g_new (MooHtmlAttr, 1);
@ -1048,9 +1048,9 @@ moo_html_create_anchor (GtkTextView *view,
char *alt_name; char *alt_name;
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_return_if_fail (name != NULL && (name[0] != '#' || name[1])); g_return_if_fail (name != nullptr && (name[0] != '#' || name[1]));
mark = gtk_text_buffer_create_mark (buffer, NULL, iter, TRUE); mark = gtk_text_buffer_create_mark (buffer, nullptr, iter, TRUE);
if (name[0] == '#') if (name[0] == '#')
alt_name = g_strdup (name + 1); alt_name = g_strdup (name + 1);
@ -1101,7 +1101,7 @@ moo_html_motion (GtkWidget *widget,
if (tag) if (tag)
{ {
g_return_val_if_fail (tag->href != NULL, FALSE); g_return_val_if_fail (tag->href != nullptr, FALSE);
if (!html->data->hover_link || strcmp (html->data->hover_link, tag->href)) if (!html->data->hover_link || strcmp (html->data->hover_link, tag->href))
{ {
@ -1122,13 +1122,13 @@ moo_html_motion (GtkWidget *widget,
GdkCursor *cursor; GdkCursor *cursor;
g_free (html->data->hover_link); g_free (html->data->hover_link);
html->data->hover_link = NULL; html->data->hover_link = nullptr;
cursor = gdk_cursor_new (GDK_XTERM); cursor = gdk_cursor_new (GDK_XTERM);
gdk_window_set_cursor (event->window, cursor); gdk_window_set_cursor (event->window, cursor);
gdk_cursor_unref (cursor); gdk_cursor_unref (cursor);
g_signal_emit (html, html_signals[HOVER_LINK], 0, NULL); g_signal_emit (html, html_signals[HOVER_LINK], 0, nullptr);
} }
out: out:
@ -1140,18 +1140,18 @@ static MooHtmlTag*
moo_html_get_link_tag (GtkTextIter *iter) moo_html_get_link_tag (GtkTextIter *iter)
{ {
MooHtmlTag *tag = moo_html_get_tag (iter); MooHtmlTag *tag = moo_html_get_tag (iter);
return (tag && tag->href) ? tag : NULL; return (tag && tag->href) ? tag : nullptr;
} }
static MooHtmlTag* static MooHtmlTag*
moo_html_get_tag (GtkTextIter *iter) moo_html_get_tag (GtkTextIter *iter)
{ {
MooHtmlTag *tag = NULL; MooHtmlTag *tag = nullptr;
GSList *l; GSList *l;
GSList *list = gtk_text_iter_get_tags (iter); GSList *list = gtk_text_iter_get_tags (iter);
for (l = list; l != NULL; l = l->next) for (l = list; l != nullptr; l = l->next)
{ {
if (MOO_IS_HTML_TAG (l->data)) if (MOO_IS_HTML_TAG (l->data))
{ {
@ -1206,7 +1206,7 @@ moo_html_button_release (GtkWidget *widget,
if (tag) if (tag)
{ {
gboolean result; gboolean result;
g_assert (tag->href != NULL); g_assert (tag->href != nullptr);
g_signal_emit (html, html_signals[LOAD_URL], 0, tag->href, &result); g_signal_emit (html, html_signals[LOAD_URL], 0, tag->href, &result);
} }
@ -1224,11 +1224,11 @@ moo_html_parse_url (const char *url,
GRegex *regex; GRegex *regex;
GMatchInfo *match_info; GMatchInfo *match_info;
g_return_val_if_fail (url != NULL, FALSE); g_return_val_if_fail (url != nullptr, FALSE);
g_return_val_if_fail (scheme && base && anchor, FALSE); g_return_val_if_fail (scheme && base && anchor, FALSE);
regex = g_regex_new ("^([a-zA-Z]+:(//)?)?([^#]*)(#(.*))?$", GRegexCompileFlags (0), GRegexMatchFlags (0), NULL); regex = g_regex_new ("^([a-zA-Z]+:(//)?)?([^#]*)(#(.*))?$", GRegexCompileFlags (0), GRegexMatchFlags (0), nullptr);
g_return_val_if_fail (regex != NULL, FALSE); g_return_val_if_fail (regex != nullptr, FALSE);
if (!g_regex_match (regex, url, GRegexMatchFlags (0), &match_info)) if (!g_regex_match (regex, url, GRegexMatchFlags (0), &match_info))
{ {
@ -1241,9 +1241,9 @@ moo_html_parse_url (const char *url,
*base = g_match_info_fetch (match_info, 3); *base = g_match_info_fetch (match_info, 3);
*anchor = g_match_info_fetch (match_info, 5); *anchor = g_match_info_fetch (match_info, 5);
if (!*scheme || !**scheme) {g_free (*scheme); *scheme = NULL;} if (!*scheme || !**scheme) {g_free (*scheme); *scheme = nullptr;}
if (!*base || !**base) {g_free (*base); *base = NULL;} if (!*base || !**base) {g_free (*base); *base = nullptr;}
if (!*anchor || !**anchor) {g_free (*anchor); *anchor = NULL;} if (!*anchor || !**anchor) {g_free (*anchor); *anchor = nullptr;}
g_match_info_free (match_info); g_match_info_free (match_info);
g_regex_unref (regex); g_regex_unref (regex);
@ -1258,7 +1258,7 @@ moo_html_goto_anchor (GtkTextView *view,
GtkTextMark *mark; GtkTextMark *mark;
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_return_val_if_fail (anchor != NULL, FALSE); g_return_val_if_fail (anchor != nullptr, FALSE);
mark = (GtkTextMark*) g_hash_table_lookup (data->anchors, anchor); mark = (GtkTextMark*) g_hash_table_lookup (data->anchors, anchor);
@ -1284,10 +1284,10 @@ moo_html_set_font (MooHtml *html,
PangoFontDescription *font; PangoFontDescription *font;
g_return_if_fail (MOO_IS_HTML (html)); g_return_if_fail (MOO_IS_HTML (html));
g_return_if_fail (string != NULL); g_return_if_fail (string != nullptr);
font = pango_font_description_from_string (string); font = pango_font_description_from_string (string);
g_return_if_fail (font != NULL); g_return_if_fail (font != nullptr);
gtk_widget_modify_font (GTK_WIDGET (html), font); gtk_widget_modify_font (GTK_WIDGET (html), font);
pango_font_description_free (font); pango_font_description_free (font);
@ -1299,7 +1299,7 @@ static void
moo_html_size_allocate_real (GtkWidget *widget, moo_html_size_allocate_real (GtkWidget *widget,
G_GNUC_UNUSED GtkAllocation *allocation) G_GNUC_UNUSED GtkAllocation *allocation)
{ {
int border_width, child_width, height; int border_width, child_width;
GSList *l; GSList *l;
GdkWindow *window; GdkWindow *window;
MooHtmlData *data = moo_html_get_data (GTK_TEXT_VIEW (widget)); MooHtmlData *data = moo_html_get_data (GTK_TEXT_VIEW (widget));
@ -1308,17 +1308,16 @@ moo_html_size_allocate_real (GtkWidget *widget,
return; return;
window = gtk_text_view_get_window (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_TEXT); window = gtk_text_view_get_window (GTK_TEXT_VIEW (widget), GTK_TEXT_WINDOW_TEXT);
g_return_if_fail (window != NULL); g_return_if_fail (window != nullptr);
child_width = gdk_window_get_width (window); child_width = gdk_window_get_width (window);
height = gdk_window_get_height (window);
border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
child_width -= 2 * border_width + 2 * widget->style->xthickness + child_width -= 2 * border_width + 2 * widget->style->xthickness +
gtk_text_view_get_left_margin (GTK_TEXT_VIEW (widget)) + gtk_text_view_get_left_margin (GTK_TEXT_VIEW (widget)) +
gtk_text_view_get_right_margin (GTK_TEXT_VIEW (widget)); gtk_text_view_get_right_margin (GTK_TEXT_VIEW (widget));
child_width = MAX (child_width, 0); child_width = MAX (child_width, 0);
for (l = data->rulers; l != NULL; l = l->next) for (l = data->rulers; l != nullptr; l = l->next)
{ {
GtkWidget *ruler = GTK_WIDGET (l->data); GtkWidget *ruler = GTK_WIDGET (l->data);
gtk_widget_set_size_request (ruler, child_width, -1); gtk_widget_set_size_request (ruler, child_width, -1);
@ -1403,7 +1402,7 @@ moo_html_load_doc (GtkTextView *view,
return; return;
} }
for (node = root->children; node != NULL; node = node->next) for (node = root->children; node != nullptr; node = node->next)
{ {
if (IS_HEAD_ELEMENT (node)) if (IS_HEAD_ELEMENT (node))
{ {
@ -1427,7 +1426,7 @@ moo_html_load_head (GtkTextView *view,
{ {
xmlNode *child; xmlNode *child;
for (child = node->children; child != NULL; child = child->next) for (child = node->children; child != nullptr; child = child->next)
{ {
if (IS_TITLE_ELEMENT (child)) if (IS_TITLE_ELEMENT (child))
{ {
@ -1462,7 +1461,7 @@ moo_html_new_line (GtkTextView *view,
{ {
if (tag) if (tag)
gtk_text_buffer_insert_with_tags (buffer, iter, "\n", 1, gtk_text_buffer_insert_with_tags (buffer, iter, "\n", 1,
GTK_TEXT_TAG (tag), NULL); GTK_TEXT_TAG (tag), nullptr);
else else
gtk_text_buffer_insert (buffer, iter, "\n", 1); gtk_text_buffer_insert (buffer, iter, "\n", 1);
} }
@ -1483,7 +1482,7 @@ str_find_separator (const char *str)
return p; return p;
} }
return NULL; return nullptr;
} }
@ -1515,9 +1514,9 @@ moo_html_insert_text (GtkTextView *view,
{ {
gtk_text_buffer_insert_with_tags (buffer, iter, gtk_text_buffer_insert_with_tags (buffer, iter,
text, p - text, text, p - text,
GTK_TEXT_TAG (tag), NULL); GTK_TEXT_TAG (tag), nullptr);
gtk_text_buffer_insert_with_tags (buffer, iter, " ", 1, gtk_text_buffer_insert_with_tags (buffer, iter, " ", 1,
GTK_TEXT_TAG (tag), NULL); GTK_TEXT_TAG (tag), nullptr);
} }
else else
{ {
@ -1545,7 +1544,7 @@ moo_html_insert_text (GtkTextView *view,
if (tag) if (tag)
gtk_text_buffer_insert_with_tags (buffer, iter, gtk_text_buffer_insert_with_tags (buffer, iter,
text, -1, text, -1,
GTK_TEXT_TAG (tag), NULL); GTK_TEXT_TAG (tag), nullptr);
else else
gtk_text_buffer_insert (buffer, iter, text, -1); gtk_text_buffer_insert (buffer, iter, text, -1);
data->new_line = FALSE; data->new_line = FALSE;
@ -1595,7 +1594,7 @@ moo_html_insert_verbatim (GtkTextView *view,
guint len; guint len;
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
g_return_if_fail (text != NULL); g_return_if_fail (text != nullptr);
if (text[0] == '\n' && data->new_line) if (text[0] == '\n' && data->new_line)
text++; text++;
@ -1608,7 +1607,7 @@ moo_html_insert_verbatim (GtkTextView *view,
if (tag) if (tag)
gtk_text_buffer_insert_with_tags (buffer, iter, gtk_text_buffer_insert_with_tags (buffer, iter,
text, len, text, len,
GTK_TEXT_TAG (tag), NULL); GTK_TEXT_TAG (tag), nullptr);
else else
gtk_text_buffer_insert (buffer, iter, text, len); gtk_text_buffer_insert (buffer, iter, text, len);
@ -1696,7 +1695,7 @@ moo_html_load_body (GtkTextView *view,
buffer = gtk_text_view_get_buffer (view); buffer = gtk_text_view_get_buffer (view);
gtk_text_buffer_get_end_iter (buffer, &iter); gtk_text_buffer_get_end_iter (buffer, &iter);
process_elm_body (view, buffer, node, NULL, &iter); process_elm_body (view, buffer, node, nullptr, &iter);
} }
@ -1708,11 +1707,11 @@ typedef struct {
static MooHtmlAttr* static MooHtmlAttr*
get_format_elm_attr (xmlNode *node) get_format_elm_attr (xmlNode *node)
{ {
static GHashTable *elms = NULL; static GHashTable *elms = nullptr;
MooHtmlAttr *attr; MooHtmlAttr *attr;
if (!IS_ELEMENT (node)) if (!IS_ELEMENT (node))
return NULL; return nullptr;
if (!elms) if (!elms)
{ {
@ -1765,7 +1764,7 @@ get_format_elm_attr (xmlNode *node)
typedef void (*ProcessElm) (GtkTextView *view, GtkTextBuffer *buffer, xmlNode *elm, typedef void (*ProcessElm) (GtkTextView *view, GtkTextBuffer *buffer, xmlNode *elm,
MooHtmlTag *parent, GtkTextIter *iter); MooHtmlTag *parent, GtkTextIter *iter);
static GHashTable *proc_elm_funcs__ = NULL; static GHashTable *proc_elm_funcs__ = nullptr;
static void static void
add_func__ (const char *static_elm_name, add_func__ (const char *static_elm_name,
@ -1807,7 +1806,7 @@ get_proc_elm_func (xmlNode *node)
if (IS_ELEMENT (node)) if (IS_ELEMENT (node))
return (ProcessElm) g_hash_table_lookup (proc_elm_funcs__, node->name); return (ProcessElm) g_hash_table_lookup (proc_elm_funcs__, node->name);
else else
return NULL; return nullptr;
} }
@ -1822,7 +1821,7 @@ process_elm_body (GtkTextView *view,
MooHtmlAttr *attr; MooHtmlAttr *attr;
ProcessElm func; ProcessElm func;
for (child = elm->children; child != NULL; child = child->next) for (child = elm->children; child != nullptr; child = child->next)
{ {
if (IS_TEXT (child)) if (IS_TEXT (child))
@ -1964,7 +1963,7 @@ parse_int (const char *str,
return FALSE; return FALSE;
errno = 0; errno = 0;
num = strtol (str, NULL, 10); num = strtol (str, nullptr, 10);
if (errno) if (errno)
return FALSE; return FALSE;
@ -1993,7 +1992,7 @@ static char*
make_li_number (int count, make_li_number (int count,
OLType type) OLType type)
{ {
g_return_val_if_fail (count > 0, NULL); g_return_val_if_fail (count > 0, nullptr);
switch (type) switch (type)
{ {
@ -2003,14 +2002,14 @@ make_li_number (int count,
case OL_NUM: case OL_NUM:
return g_strdup_printf (" %d. ", count); return g_strdup_printf (" %d. ", count);
case OL_LOWER_ALPHA: case OL_LOWER_ALPHA:
g_return_val_if_fail (count <= 26, NULL); g_return_val_if_fail (count <= 26, nullptr);
return g_strdup_printf (" %c. ", count - 1 + 'a'); return g_strdup_printf (" %c. ", count - 1 + 'a');
case OL_UPPER_ALPHA: case OL_UPPER_ALPHA:
g_return_val_if_fail (count <= 26, NULL); g_return_val_if_fail (count <= 26, nullptr);
return g_strdup_printf (" %c. ", count - 1 + 'A'); return g_strdup_printf (" %c. ", count - 1 + 'A');
} }
g_return_val_if_reached (NULL); g_return_val_if_reached (nullptr);
} }
static void static void
@ -2023,7 +2022,7 @@ process_ol_elm (GtkTextView *view,
int count; int count;
OLType list_type = OL_NUM; OLType list_type = OL_NUM;
xmlNode *child; xmlNode *child;
xmlChar *start = NULL, *type = NULL; xmlChar *start = nullptr, *type = nullptr;
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
count = 1; count = 1;
@ -2051,7 +2050,7 @@ process_ol_elm (GtkTextView *view,
moo_html_new_line (view, buffer, iter, current, FALSE); moo_html_new_line (view, buffer, iter, current, FALSE);
for (child = elm->children; child != NULL; child = child->next) for (child = elm->children; child != nullptr; child = child->next)
{ {
if (IS_LI_ELEMENT (child)) if (IS_LI_ELEMENT (child))
{ {
@ -2094,7 +2093,7 @@ process_ul_elm (GtkTextView *view,
GtkTextIter *iter) GtkTextIter *iter)
{ {
xmlNode *child; xmlNode *child;
for (child = elm->children; child != NULL; child = child->next) for (child = elm->children; child != nullptr; child = child->next)
process_elm_body (view, buffer, child, current, iter); process_elm_body (view, buffer, child, current, iter);
} }
@ -2156,7 +2155,7 @@ process_font_elm (GtkTextView *view,
face = GET_PROP (elm, "face"); face = GET_PROP (elm, "face");
attr.mask = MOO_HTML_NONE; attr.mask = MOO_HTML_NONE;
attr.font_face = NULL; attr.font_face = nullptr;
if (size__) if (size__)
{ {
@ -2349,9 +2348,9 @@ process_img_elm (GtkTextView *view,
{ {
xmlChar *src; xmlChar *src;
xmlChar *alt; xmlChar *alt;
char *path = NULL; char *path = nullptr;
GdkPixbuf *pixbuf; GdkPixbuf *pixbuf;
GError *error = NULL; GError *error = nullptr;
int offset; int offset;
GtkTextIter before; GtkTextIter before;
MooHtmlData *data = moo_html_get_data (view); MooHtmlData *data = moo_html_get_data (view);
@ -2359,13 +2358,13 @@ process_img_elm (GtkTextView *view,
src = GET_PROP (elm, "src"); src = GET_PROP (elm, "src");
alt = GET_PROP (elm, "alt"); alt = GET_PROP (elm, "alt");
g_return_if_fail (src != NULL); g_return_if_fail (src != nullptr);
if (!data->dirname) if (!data->dirname)
goto try_alt; goto try_alt;
path = g_build_filename (data->dirname, src, NULL); path = g_build_filename (data->dirname, src, nullptr);
g_return_if_fail (path != NULL); g_return_if_fail (path != nullptr);
pixbuf = gdk_pixbuf_new_from_file (path, &error); pixbuf = gdk_pixbuf_new_from_file (path, &error);

2
moo/mooedit/mooeditaction.cpp
View File

@ -283,7 +283,7 @@ moo_edit_action_check_state_real (MooEditAction *action)
visible = moo_edit_action_check_visible (action); visible = moo_edit_action_check_visible (action);
sensitive = moo_edit_action_check_sensitive (action); sensitive = moo_edit_action_check_sensitive (action);
g_object_set (action, "sensitive", sensitive, "visible", visible, NULL); g_object_set (action, "sensitive", sensitive, "visible", visible, nullptr);
} }

24
moo/mooedit/mooeditdialogs.cpp
View File

@ -47,7 +47,7 @@ _moo_edit_open_dialog (GtkWidget *widget,
MooOpenInfoArray *info_array = NULL; MooOpenInfoArray *info_array = NULL;
guint i; guint i;
moo_prefs_create_key (moo_edit_setting (MOO_EDIT_PREFS_LAST_DIR), MOO_PREFS_STATE, G_TYPE_STRING, NULL); moo_prefs_create_key (moo_edit_setting (MOO_EDIT_PREFS_LAST_DIR), MOO_PREFS_STATE, G_TYPE_STRING, nullptr);
if (current_doc && moo_prefs_get_bool (moo_edit_setting (MOO_EDIT_PREFS_DIALOGS_OPEN_FOLLOWS_DOC))) if (current_doc && moo_prefs_get_bool (moo_edit_setting (MOO_EDIT_PREFS_DIALOGS_OPEN_FOLLOWS_DOC)))
{ {
@ -64,8 +64,8 @@ _moo_edit_open_dialog (GtkWidget *widget,
dialog = moo_file_dialog_new (MOO_FILE_DIALOG_OPEN, widget, dialog = moo_file_dialog_new (MOO_FILE_DIALOG_OPEN, widget,
TRUE, GTK_STOCK_OPEN, start, TRUE, GTK_STOCK_OPEN, start,
NULL); nullptr);
g_object_set (dialog, "enable-encodings", TRUE, NULL); g_object_set (dialog, "enable-encodings", TRUE, nullptr);
moo_file_dialog_set_help_id (dialog, "dialog-open"); moo_file_dialog_set_help_id (dialog, "dialog-open");
moo_file_dialog_set_remember_size (dialog, moo_edit_setting (MOO_EDIT_PREFS_DIALOG_OPEN)); moo_file_dialog_set_remember_size (dialog, moo_edit_setting (MOO_EDIT_PREFS_DIALOG_OPEN));
@ -107,7 +107,7 @@ _moo_edit_save_as_dialog (MooEdit *doc,
GFile *start = NULL; GFile *start = NULL;
GFile *file = NULL; GFile *file = NULL;
g_return_val_if_fail (MOO_IS_EDIT (doc), NULL); g_return_val_if_fail (MOO_IS_EDIT (doc), nullptr);
moo_prefs_create_key (moo_edit_setting (MOO_EDIT_PREFS_LAST_DIR), moo_prefs_create_key (moo_edit_setting (MOO_EDIT_PREFS_LAST_DIR),
MOO_PREFS_STATE, G_TYPE_STRING, NULL); MOO_PREFS_STATE, G_TYPE_STRING, NULL);
@ -128,7 +128,7 @@ _moo_edit_save_as_dialog (MooEdit *doc,
GTK_WIDGET (moo_edit_get_view (doc)), GTK_WIDGET (moo_edit_get_view (doc)),
FALSE, GTK_STOCK_SAVE_AS, FALSE, GTK_STOCK_SAVE_AS,
start, display_basename); start, display_basename);
g_object_set (dialog, "enable-encodings", TRUE, NULL); g_object_set (dialog, "enable-encodings", TRUE, nullptr);
moo_file_dialog_set_encoding (dialog, moo_edit_get_encoding (doc)); moo_file_dialog_set_encoding (dialog, moo_edit_get_encoding (doc));
moo_file_dialog_set_help_id (dialog, "dialog-save"); moo_file_dialog_set_help_id (dialog, "dialog-save");
@ -252,7 +252,7 @@ name_data_func (G_GNUC_UNUSED GtkTreeViewColumn *column,
gtk_tree_model_get (model, iter, COLUMN_EDIT, &doc, -1); gtk_tree_model_get (model, iter, COLUMN_EDIT, &doc, -1);
g_return_if_fail (MOO_IS_EDIT (doc)); g_return_if_fail (MOO_IS_EDIT (doc));
g_object_set (cell, "text", moo_edit_get_display_basename (doc), NULL); g_object_set (cell, "text", moo_edit_get_display_basename (doc), nullptr);
g_object_unref (doc); g_object_unref (doc);
} }
@ -337,7 +337,7 @@ files_treeview_init (GtkTreeView *treeview, GtkWidget *dialog, MooEditArray *doc
gtk_tree_view_append_column (treeview, column); gtk_tree_view_append_column (treeview, column);
cell = gtk_cell_renderer_toggle_new (); cell = gtk_cell_renderer_toggle_new ();
gtk_tree_view_column_pack_start (column, cell, FALSE); gtk_tree_view_column_pack_start (column, cell, FALSE);
g_object_set (cell, "activatable", TRUE, NULL); g_object_set (cell, "activatable", TRUE, nullptr);
gtk_tree_view_column_add_attribute (column, cell, "active", COLUMN_SAVE); gtk_tree_view_column_add_attribute (column, cell, "active", COLUMN_SAVE);
g_signal_connect (cell, "toggled", G_CALLBACK (save_toggled), store); g_signal_connect (cell, "toggled", G_CALLBACK (save_toggled), store);
@ -429,7 +429,7 @@ _moo_edit_save_multiple_changes_dialog (MooEditArray *docs,
MOO_STOCK_SAVE_NONE, GTK_RESPONSE_NO, MOO_STOCK_SAVE_NONE, GTK_RESPONSE_NO,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
MOO_STOCK_SAVE_SELECTED, GTK_RESPONSE_YES, MOO_STOCK_SAVE_SELECTED, GTK_RESPONSE_YES,
NULL); nullptr);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
@ -530,7 +530,7 @@ moo_edit_question_dialog (MooEdit *doc,
gtk_dialog_add_buttons (GTK_DIALOG (dialog), gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
button, GTK_RESPONSE_YES, button, GTK_RESPONSE_YES,
NULL); nullptr);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_YES, GTK_RESPONSE_YES,
@ -623,7 +623,7 @@ _moo_edit_try_encoding_dialog (G_GNUC_UNUSED GFile *file,
gtk_dialog_add_buttons (GTK_DIALOG (dialog), gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK, GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL); nullptr);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_OK, GTK_RESPONSE_OK,
@ -779,7 +779,7 @@ _moo_text_search_from_start_dialog (GtkWidget *widget,
gtk_dialog_add_buttons (GTK_DIALOG (dialog), gtk_dialog_add_buttons (GTK_DIALOG (dialog),
GTK_STOCK_NO, GTK_RESPONSE_CANCEL, GTK_STOCK_NO, GTK_RESPONSE_CANCEL,
GTK_STOCK_YES, GTK_RESPONSE_YES, GTK_STOCK_YES, GTK_RESPONSE_YES,
NULL); nullptr);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
GTK_RESPONSE_YES, GTK_RESPONSE_YES,
@ -817,7 +817,7 @@ _moo_text_regex_error_dialog (GtkWidget *parent,
"%s", msg_text); "%s", msg_text);
moo_window_set_parent (dialog, parent); moo_window_set_parent (dialog, parent);
gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE, gtk_dialog_add_buttons (GTK_DIALOG (dialog), GTK_STOCK_CLOSE,
GTK_RESPONSE_CANCEL, NULL); GTK_RESPONSE_CANCEL, nullptr);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
gtk_dialog_run (GTK_DIALOG (dialog)); gtk_dialog_run (GTK_DIALOG (dialog));

6
moo/mooedit/mooeditor.cpp
View File

@ -334,7 +334,7 @@ moo_editor_class_init (MooEditorClass *klass)
"label", Q_("Open Recent|_More..."), "label", Q_("Open Recent|_More..."),
"default-accel", MOO_EDIT_ACCEL_OPEN_RECENT_DIALOG, "default-accel", MOO_EDIT_ACCEL_OPEN_RECENT_DIALOG,
"closure-callback", action_recent_dialog, "closure-callback", action_recent_dialog,
NULL); nullptr);
g_type_class_unref (edit_window_class); g_type_class_unref (edit_window_class);
add_new_window_action (); add_new_window_action ();
@ -602,7 +602,7 @@ add_new_window_action (void)
"default-accel", MOO_EDIT_ACCEL_NEW_WINDOW, "default-accel", MOO_EDIT_ACCEL_NEW_WINDOW,
"closure-callback", moo_editor_new_window, "closure-callback", moo_editor_new_window,
"closure-proxy-func", moo_edit_window_get_editor, "closure-proxy-func", moo_edit_window_get_editor,
NULL); nullptr);
} }
@ -2997,7 +2997,7 @@ _moo_editor_apply_prefs (MooEditor *editor)
g_object_set (editor, g_object_set (editor,
"save-backups", backups, "save-backups", backups,
NULL); nullptr);
} }

6
moo/mooedit/mooeditprefs.cpp
View File

@ -211,7 +211,7 @@ _moo_edit_update_global_config (void)
"add-newline", add_newline, "add-newline", add_newline,
"show-line-numbers", show_line_numbers, "show-line-numbers", show_line_numbers,
"wrap-mode", wrap_mode, "wrap-mode", wrap_mode,
NULL); nullptr);
} }
@ -248,9 +248,9 @@ _moo_edit_view_apply_prefs (MooEditView *view)
"auto-indent", get_bool (MOO_EDIT_PREFS_AUTO_INDENT), "auto-indent", get_bool (MOO_EDIT_PREFS_AUTO_INDENT),
"tab-indents", get_bool (MOO_EDIT_PREFS_TAB_INDENTS), "tab-indents", get_bool (MOO_EDIT_PREFS_TAB_INDENTS),
"backspace-indents", get_bool (MOO_EDIT_PREFS_BACKSPACE_INDENTS), "backspace-indents", get_bool (MOO_EDIT_PREFS_BACKSPACE_INDENTS),
NULL); nullptr);
g_object_set (view, "draw-whitespace", ws_flags, NULL); g_object_set (view, "draw-whitespace", ws_flags, nullptr);
moo_text_view_set_font_from_string (MOO_TEXT_VIEW (view), moo_text_view_set_font_from_string (MOO_TEXT_VIEW (view),
get_string (MOO_EDIT_PREFS_FONT)); get_string (MOO_EDIT_PREFS_FONT));

16
moo/mooedit/mooeditprefspage.cpp
View File

@ -140,7 +140,7 @@ page_general_init (MooPrefsPage *page)
{ {
MooTextStyleScheme *scheme; MooTextStyleScheme *scheme;
g_object_set (gxml->fontbutton, "monospace", TRUE, NULL); g_object_set (gxml->fontbutton, "monospace", TRUE, nullptr);
scheme = moo_lang_mgr_get_active_scheme (moo_lang_mgr_default ()); scheme = moo_lang_mgr_get_active_scheme (moo_lang_mgr_default ());
g_return_if_fail (scheme != NULL); g_return_if_fail (scheme != NULL);
@ -407,7 +407,7 @@ scheme_combo_data_func (G_GNUC_UNUSED GtkCellLayout *layout,
MooTextStyleScheme *scheme = NULL; MooTextStyleScheme *scheme = NULL;
gtk_tree_model_get (model, iter, 0, &scheme, -1); gtk_tree_model_get (model, iter, 0, &scheme, -1);
g_return_if_fail (scheme != NULL); g_return_if_fail (scheme != NULL);
g_object_set (cell, "text", moo_text_style_scheme_get_name (scheme), NULL); g_object_set (cell, "text", moo_text_style_scheme_get_name (scheme), nullptr);
g_object_unref (scheme); g_object_unref (scheme);
} }
@ -652,7 +652,7 @@ set_sensitive (G_GNUC_UNUSED GtkCellLayout *cell_layout,
{ {
g_object_set (cell, "sensitive", g_object_set (cell, "sensitive",
!gtk_tree_model_iter_has_child (model, iter), !gtk_tree_model_iter_has_child (model, iter),
NULL); nullptr);
} }
@ -733,7 +733,7 @@ lang_combo_init (GtkComboBox *combo,
gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo)); gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo));
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell,
"text", COLUMN_NAME, NULL); "text", COLUMN_NAME, nullptr);
gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo), cell, gtk_cell_layout_set_cell_data_func (GTK_CELL_LAYOUT (combo), cell,
set_sensitive, NULL, NULL); set_sensitive, NULL, NULL);
@ -987,7 +987,7 @@ filter_icon_data_func (G_GNUC_UNUSED GtkTreeViewColumn *column,
{ {
gboolean invalid; gboolean invalid;
gtk_tree_model_get (model, iter, FILTER_COLUMN_INVALID, &invalid, -1); gtk_tree_model_get (model, iter, FILTER_COLUMN_INVALID, &invalid, -1);
g_object_set (cell, "visible", invalid, NULL); g_object_set (cell, "visible", invalid, nullptr);
} }
static void static void
@ -1006,7 +1006,7 @@ create_filter_column (GtkTreeView *treeview,
if (column_id == FILTER_COLUMN_FILTER) if (column_id == FILTER_COLUMN_FILTER)
{ {
cell = gtk_cell_renderer_pixbuf_new (); cell = gtk_cell_renderer_pixbuf_new ();
g_object_set (cell, "stock-id", GTK_STOCK_DIALOG_ERROR, NULL); g_object_set (cell, "stock-id", GTK_STOCK_DIALOG_ERROR, nullptr);
gtk_tree_view_column_pack_start (column, cell, FALSE); gtk_tree_view_column_pack_start (column, cell, FALSE);
gtk_tree_view_column_set_cell_data_func (column, cell, gtk_tree_view_column_set_cell_data_func (column, cell,
(GtkTreeCellDataFunc) filter_icon_data_func, (GtkTreeCellDataFunc) filter_icon_data_func,
@ -1015,9 +1015,9 @@ create_filter_column (GtkTreeView *treeview,
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, cell, TRUE); gtk_tree_view_column_pack_start (column, cell, TRUE);
gtk_tree_view_column_set_attributes (column, cell, "text", column_id, NULL); gtk_tree_view_column_set_attributes (column, cell, "text", column_id, nullptr);
g_object_set (cell, "editable", TRUE, NULL); g_object_set (cell, "editable", TRUE, nullptr);
g_object_set_data (G_OBJECT (cell), "filter-store-column-id", GINT_TO_POINTER (column_id)); g_object_set_data (G_OBJECT (cell), "filter-store-column-id", GINT_TO_POINTER (column_id));
g_signal_connect (cell, "edited", G_CALLBACK (filter_cell_edited), store); g_signal_connect (cell, "edited", G_CALLBACK (filter_cell_edited), store);
} }

6
moo/mooedit/mooeditview.cpp
View File

@ -437,7 +437,7 @@ _moo_edit_view_ui_set_line_wrap (MooEditView *view,
g_return_if_fail (MOO_IS_EDIT_VIEW (view)); g_return_if_fail (MOO_IS_EDIT_VIEW (view));
g_return_if_fail (view->priv->doc && view->priv->doc->config); g_return_if_fail (view->priv->doc && view->priv->doc->config);
g_object_get (view, "wrap-mode", &mode, NULL); g_object_get (view, "wrap-mode", &mode, nullptr);
enabled = enabled != 0; enabled = enabled != 0;
old_enabled = mode != GTK_WRAP_NONE; old_enabled = mode != GTK_WRAP_NONE;
@ -454,7 +454,7 @@ _moo_edit_view_ui_set_line_wrap (MooEditView *view,
moo_edit_config_set (view->priv->doc->config, moo_edit_config_set (view->priv->doc->config,
MOO_EDIT_CONFIG_SOURCE_USER, MOO_EDIT_CONFIG_SOURCE_USER,
"wrap-mode", mode, NULL); "wrap-mode", mode, nullptr);
} }
void void
@ -466,7 +466,7 @@ _moo_edit_view_ui_set_show_line_numbers (MooEditView *view,
g_return_if_fail (MOO_IS_EDIT_VIEW (view)); g_return_if_fail (MOO_IS_EDIT_VIEW (view));
g_return_if_fail (view->priv->doc && view->priv->doc->config); g_return_if_fail (view->priv->doc && view->priv->doc->config);
g_object_get (view, "show-line-numbers", &old_show, NULL); g_object_get (view, "show-line-numbers", &old_show, nullptr);
if (!old_show == !show) if (!old_show == !show)
return; return;

560
moo/mooedit/mooeditwindow.cpp
View File

File diff suppressed because it is too large Load Diff

2
moo/mooedit/moolangmgr.cpp
View File

@ -75,7 +75,7 @@ moo_lang_mgr_init (MooLangMgr *mgr)
mgr->lang_mgr = gtk_source_language_manager_new (); mgr->lang_mgr = gtk_source_language_manager_new ();
dirs = moo_get_data_subdirs (LANGUAGE_DIR); dirs = moo_get_data_subdirs (LANGUAGE_DIR);
g_object_set (mgr->lang_mgr, "search-path", dirs, NULL); g_object_set (mgr->lang_mgr, "search-path", dirs, nullptr);
mgr->style_mgr = gtk_source_style_scheme_manager_new (); mgr->style_mgr = gtk_source_style_scheme_manager_new ();
gtk_source_style_scheme_manager_set_search_path (mgr->style_mgr, dirs); gtk_source_style_scheme_manager_set_search_path (mgr->style_mgr, dirs);

2
moo/mooedit/mootextbtree.c
View File

@ -322,7 +322,7 @@ static void
merge_nodes (BTNode *parent, guint first) merge_nodes (BTNode *parent, guint first)
{ {
BTNode *node, *next; BTNode *node, *next;
guint i; int i;
g_assert (first + 1 < parent->n_children); g_assert (first + 1 < parent->n_children);

2
moo/mooedit/mootextview.c
View File

@ -3725,6 +3725,7 @@ moo_text_view_size_allocate (GtkWidget *widget,
{ {
case MOO_TEXT_VIEW_POS_RIGHT: case MOO_TEXT_VIEW_POS_RIGHT:
child_alloc.x = MAX (allocation->width - border_width - right, 0); child_alloc.x = MAX (allocation->width - border_width - right, 0);
// fallthrough
case MOO_TEXT_VIEW_POS_LEFT: case MOO_TEXT_VIEW_POS_LEFT:
child_alloc.width = child_req.width; child_alloc.width = child_req.width;
child_alloc.height = MAX (allocation->height - 2*border_width - top - bottom, 1); child_alloc.height = MAX (allocation->height - 2*border_width - top - bottom, 1);
@ -3732,6 +3733,7 @@ moo_text_view_size_allocate (GtkWidget *widget,
case MOO_TEXT_VIEW_POS_BOTTOM: case MOO_TEXT_VIEW_POS_BOTTOM:
child_alloc.y = MAX (allocation->height - bottom - border_width, 0); child_alloc.y = MAX (allocation->height - bottom - border_width, 0);
// fallthrough
case MOO_TEXT_VIEW_POS_TOP: case MOO_TEXT_VIEW_POS_TOP:
child_alloc.height = child_req.height; child_alloc.height = child_req.height;
child_alloc.width = MAX (allocation->width - 2*border_width - left - right, 1); child_alloc.width = MAX (allocation->width - 2*border_width - left - right, 1);

2
moo/moofileview/moofileview.c
View File

@ -1384,11 +1384,13 @@ init_gui (MooFileView *fileview)
TREEVIEW_PAGE); TREEVIEW_PAGE);
_moo_tree_view_set_active (fileview->priv->view, _moo_tree_view_set_active (fileview->priv->view,
GTK_WIDGET (fileview->priv->treeview)); GTK_WIDGET (fileview->priv->treeview));
break;
case MOO_FILE_VIEW_BOOKMARK: case MOO_FILE_VIEW_BOOKMARK:
fileview->priv->file_view_type = MOO_FILE_VIEW_ICON; fileview->priv->file_view_type = MOO_FILE_VIEW_ICON;
gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook), gtk_notebook_set_current_page (GTK_NOTEBOOK (notebook),
BOOKMARK_PAGE); BOOKMARK_PAGE);
break;
} }
moo_file_view_focus_files (fileview); moo_file_view_focus_files (fileview);

4
moo/moolua/lua/luaall.cpp
View File

@ -2,6 +2,10 @@
* all.c -- Lua core, libraries and interpreter in a single file * all.c -- Lua core, libraries and interpreter in a single file
*/ */
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wsign-compare"
#pragma GCC diagnostic ignored "-Wmisleading-indentation"
#define luaall_c #define luaall_c
#include "lapi.c" #include "lapi.c"

2
moo/moopython/moopython-tests.cpp
View File

@ -22,7 +22,7 @@ test_func (MooTestEnv *env)
{ {
char *dir; char *dir;
been_here = TRUE; been_here = TRUE;
dir = g_build_filename (moo_test_get_data_dir ().get(), "test-python", NULL); dir = g_build_filename (moo_test_get_data_dir ().get(), "test-python", nullptr);
moo_python_add_path (dir); moo_python_add_path (dir);
g_free (dir); g_free (dir);
} }

6
moo/mooutils/moo-test-utils.cpp
View File

@ -404,7 +404,7 @@ moo_test_find_data_file (const char *basename)
g_return_val_if_fail(!registry.data_dir.empty(), gstr()); g_return_val_if_fail(!registry.data_dir.empty(), gstr());
if (!_moo_path_is_absolute(basename)) if (!_moo_path_is_absolute(basename))
return gstr::take(g_build_filename(registry.data_dir.get(), basename, NULL)); return gstr::take(g_build_filename(registry.data_dir.get(), basename, nullptr));
else else
return gstr(basename); return gstr(basename);
} }
@ -421,7 +421,7 @@ moo_test_list_data_files (const char *dir)
if (!_moo_path_is_absolute (dir)) if (!_moo_path_is_absolute (dir))
{ {
g_return_val_if_fail (registry.data_dir != nullptr, NULL); g_return_val_if_fail (registry.data_dir != nullptr, NULL);
tmp.steal(g_build_filename(registry.data_dir.get(), dir, NULL)); tmp.steal(g_build_filename(registry.data_dir.get(), dir, nullptr));
dir = tmp.get(); dir = tmp.get();
} }
@ -454,7 +454,7 @@ moo_test_load_data_file (const char *basename)
g_return_val_if_fail (registry.data_dir != nullptr, NULL); g_return_val_if_fail (registry.data_dir != nullptr, NULL);
if (!_moo_path_is_absolute (basename)) if (!_moo_path_is_absolute (basename))
fullname = g_build_filename (registry.data_dir.get(), basename, NULL); fullname = g_build_filename (registry.data_dir.get(), basename, nullptr);
else else
fullname = g_strdup (basename); fullname = g_strdup (basename);

2
moo/mooutils/mooapp-ipc.c
View File

@ -244,7 +244,7 @@ moo_ipc_send (GObject *sender,
g_string_append (header, ipc_data.app_id); g_string_append (header, ipc_data.app_id);
g_string_append_printf (header, "%08x", ++ipc_data.stamp); g_string_append_printf (header, "%08x", ++ipc_data.stamp);
g_string_append_printf (header, "%04x", id_len); g_string_append_printf (header, "%04x", (unsigned) id_len);
g_string_append (header, id); g_string_append (header, id);
_moo_app_input_broadcast (header->str, data, len); _moo_app_input_broadcast (header->str, data, len);

6
moo/mooutils/mooentry.cpp
View File

@ -918,7 +918,7 @@ insert_action_merge (InsertAction *last_action,
return FALSE; return FALSE;
} }
tmp = g_strconcat (last_action->text, action->text, NULL); tmp = g_strconcat (last_action->text, action->text, nullptr);
g_free (last_action->text); g_free (last_action->text);
last_action->length += action->length; last_action->length += action->length;
last_action->text = tmp; last_action->text = tmp;
@ -953,7 +953,7 @@ delete_action_merge (DeleteAction *last_action,
return FALSE; return FALSE;
} }
tmp = g_strconcat (last_action->text, action->text, NULL); tmp = g_strconcat (last_action->text, action->text, nullptr);
g_free (last_action->text); g_free (last_action->text);
last_action->end += (action->end - action->start); last_action->end += (action->end - action->start);
last_action->text = tmp; last_action->text = tmp;
@ -967,7 +967,7 @@ delete_action_merge (DeleteAction *last_action,
return FALSE; return FALSE;
} }
tmp = g_strconcat (action->text, last_action->text, NULL); tmp = g_strconcat (action->text, last_action->text, nullptr);
g_free (last_action->text); g_free (last_action->text);
last_action->start = action->start; last_action->start = action->start;
last_action->text = tmp; last_action->text = tmp;

4
moo/mooutils/moofilewriter.cpp
View File

@ -631,8 +631,8 @@ test_moo_file_writer (void)
GError *error = NULL; GError *error = NULL;
dir = moo_test_get_working_dir (); dir = moo_test_get_working_dir ();
my_dir = g_build_filename (dir, "cfg-writer", NULL); my_dir = g_build_filename (dir, "cfg-writer", nullptr);
filename = g_build_filename (my_dir, "configfile", NULL); filename = g_build_filename (my_dir, "configfile", nullptr);
bak_filename = g_strdup_printf ("%s~", filename); bak_filename = g_strdup_printf ("%s~", filename);
writer = moo_config_writer_new (filename, TRUE, &error); writer = moo_config_writer_new (filename, TRUE, &error);

6
moo/mooutils/mooi18n.cpp
View File

@ -92,7 +92,7 @@ moo_pgettext2 (G_GNUC_UNUSED const char *context, const char *msgctxtid)
g_return_val_if_fail (msgctxtid != NULL, NULL); g_return_val_if_fail (msgctxtid != NULL, NULL);
init_gettext (); init_gettext ();
tmp = g_strjoin (context, "\004", msgctxtid, NULL); tmp = g_strjoin (context, "\004", msgctxtid, nullptr);
translation = dgettext (GETTEXT_PACKAGE, tmp); translation = dgettext (GETTEXT_PACKAGE, tmp);
if (translation == tmp) if (translation == tmp)
@ -171,8 +171,8 @@ test_mooi18n (void)
char *po_file, *po_file2; char *po_file, *po_file2;
locale_dir = moo_get_locale_dir (); locale_dir = moo_get_locale_dir ();
po_file = g_build_filename (locale_dir, "ru", "LC_MESSAGES", GETTEXT_PACKAGE ".mo", NULL); po_file = g_build_filename (locale_dir, "ru", "LC_MESSAGES", GETTEXT_PACKAGE ".mo", nullptr);
po_file2 = g_build_filename (locale_dir, "ru", "LC_MESSAGES", GETTEXT_PACKAGE "-gsv.mo", NULL); po_file2 = g_build_filename (locale_dir, "ru", "LC_MESSAGES", GETTEXT_PACKAGE "-gsv.mo", nullptr);
TEST_ASSERT_MSG (g_file_test (po_file, G_FILE_TEST_EXISTS), "mo file '%s' does not exist", po_file); TEST_ASSERT_MSG (g_file_test (po_file, G_FILE_TEST_EXISTS), "mo file '%s' does not exist", po_file);
TEST_ASSERT_MSG (g_file_test (po_file2, G_FILE_TEST_EXISTS), "mo file '%s' does not exist", po_file2); TEST_ASSERT_MSG (g_file_test (po_file2, G_FILE_TEST_EXISTS), "mo file '%s' does not exist", po_file2);

4
moo/mooutils/moopaned.c
View File

@ -1659,6 +1659,7 @@ draw_border (MooPaned *paned,
rect.x = widget->allocation.width - rect.x = widget->allocation.width -
paned->priv->button_box_size - paned->priv->button_box_size -
paned->priv->border_size; paned->priv->border_size;
// fallthrough
case MOO_PANE_POS_LEFT: case MOO_PANE_POS_LEFT:
rect.y = 0; rect.y = 0;
rect.height = widget->allocation.height; rect.height = widget->allocation.height;
@ -1679,6 +1680,7 @@ draw_border (MooPaned *paned,
rect.y = widget->allocation.height - rect.y = widget->allocation.height -
paned->priv->button_box_size - paned->priv->button_box_size -
paned->priv->border_size; paned->priv->border_size;
// fallthrough
case MOO_PANE_POS_TOP: case MOO_PANE_POS_TOP:
rect.x = 0; rect.x = 0;
rect.width = widget->allocation.width; rect.width = widget->allocation.width;
@ -2043,12 +2045,14 @@ _moo_paned_get_button_position (MooPaned *paned,
{ {
case MOO_PANE_POS_RIGHT: case MOO_PANE_POS_RIGHT:
rect->x = widget->allocation.width - 30; rect->x = widget->allocation.width - 30;
// fallthrough
case MOO_PANE_POS_LEFT: case MOO_PANE_POS_LEFT:
rect->height = 60; rect->height = 60;
rect->width = 30; rect->width = 30;
break; break;
case MOO_PANE_POS_BOTTOM: case MOO_PANE_POS_BOTTOM:
rect->y = widget->allocation.height - 30; rect->y = widget->allocation.height - 30;
// fallthrough
case MOO_PANE_POS_TOP: case MOO_PANE_POS_TOP:
rect->width = 60; rect->width = 60;
rect->height = 30; rect->height = 30;

10
moo/mooutils/mooutils-fs.cpp
View File

@ -526,7 +526,7 @@ _moo_filename_to_uri (const char *file,
if (!_moo_path_is_absolute (file)) if (!_moo_path_is_absolute (file))
{ {
char *cd = g_get_current_dir (); char *cd = g_get_current_dir ();
file = freeme = g_build_filename (cd, file, NULL); file = freeme = g_build_filename (cd, file, nullptr);
g_free (cd); g_free (cd);
} }
@ -731,7 +731,7 @@ normalize_full_path_win32 (const char *fullpath)
{ {
if (prefix) if (prefix)
{ {
char *tmp = g_strconcat (prefix, path, NULL); char *tmp = g_strconcat (prefix, path, nullptr);
g_free (path); g_free (path);
path = tmp; path = tmp;
} }
@ -764,7 +764,7 @@ normalize_path (const char *filename)
{ {
char *working_dir = g_get_current_dir (); char *working_dir = g_get_current_dir ();
g_return_val_if_fail (working_dir != NULL, g_strdup (filename)); g_return_val_if_fail (working_dir != NULL, g_strdup (filename));
freeme = g_build_filename (working_dir, filename, NULL); freeme = g_build_filename (working_dir, filename, nullptr);
filename = freeme; filename = freeme;
g_free (working_dir); g_free (working_dir);
} }
@ -925,7 +925,7 @@ make_cases (gboolean unix_paths)
{ {
g_ptr_array_add (paths, g_strdup (rel_files_common[i])); g_ptr_array_add (paths, g_strdup (rel_files_common[i]));
if (rel_files_common[i+1]) if (rel_files_common[i+1])
g_ptr_array_add (paths, g_build_filename (current_dir, rel_files_common[i+1], NULL)); g_ptr_array_add (paths, g_build_filename (current_dir, rel_files_common[i+1], nullptr));
else else
g_ptr_array_add (paths, g_strdup (current_dir)); g_ptr_array_add (paths, g_strdup (current_dir));
} }
@ -936,7 +936,7 @@ make_cases (gboolean unix_paths)
{ {
g_ptr_array_add (paths, g_strdup (rel_files_unix[i])); g_ptr_array_add (paths, g_strdup (rel_files_unix[i]));
if (rel_files_unix[i+1]) if (rel_files_unix[i+1])
g_ptr_array_add (paths, g_build_filename (current_dir, rel_files_unix[i+1], NULL)); g_ptr_array_add (paths, g_build_filename (current_dir, rel_files_unix[i+1], nullptr));
else else
g_ptr_array_add (paths, g_strdup (current_dir)); g_ptr_array_add (paths, g_strdup (current_dir));
} }

14
moo/mooutils/mooutils-misc.cpp
View File

@ -686,7 +686,7 @@ moo_log_window_insert (MooLogWindow *log,
{ {
GtkTextIter iter; GtkTextIter iter;
gtk_text_buffer_get_end_iter (log->buf, &iter); gtk_text_buffer_get_end_iter (log->buf, &iter);
gtk_text_buffer_insert_with_tags (log->buf, &iter, text, -1, tag, NULL); gtk_text_buffer_insert_with_tags (log->buf, &iter, text, -1, tag, nullptr);
gtk_text_view_scroll_mark_onscreen (log->textview, log->insert); gtk_text_view_scroll_mark_onscreen (log->textview, log->insert);
} }
@ -1193,7 +1193,7 @@ moo_get_user_cache_dir (void)
G_LOCK (moo_user_cache_dir); G_LOCK (moo_user_cache_dir);
if (!moo_user_cache_dir) if (!moo_user_cache_dir)
moo_user_cache_dir = g_build_filename (g_get_user_cache_dir (), MOO_PACKAGE_NAME, NULL); moo_user_cache_dir = g_build_filename (g_get_user_cache_dir (), MOO_PACKAGE_NAME, nullptr);
G_UNLOCK (moo_user_cache_dir); G_UNLOCK (moo_user_cache_dir);
@ -1277,7 +1277,7 @@ moo_get_user_data_dir (void)
moo_user_data_dir = g_build_filename (basedir, moo_user_data_dir = g_build_filename (basedir,
MOO_PACKAGE_NAME, MOO_PACKAGE_NAME,
NULL); nullptr);
g_free (freeme); g_free (freeme);
} }
@ -1340,7 +1340,7 @@ moo_make_user_data_dir (const char *path)
user_dir = moo_get_user_data_dir (); user_dir = moo_get_user_data_dir ();
g_return_val_if_fail (user_dir != NULL, FALSE); g_return_val_if_fail (user_dir != NULL, FALSE);
full_path = g_build_filename (user_dir, path, NULL); full_path = g_build_filename (user_dir, path, nullptr);
result = _moo_mkdir_with_parents (full_path, &err); result = _moo_mkdir_with_parents (full_path, &err);
if (result != 0) if (result != 0)
@ -1428,7 +1428,7 @@ enumerate_data_dirs (MooDataDirType type,
const char* const *p; const char* const *p;
for (p = g_get_system_data_dirs (); p && *p; ++p) for (p = g_get_system_data_dirs (); p && *p; ++p)
g_ptr_array_add (dirs, g_build_filename (*p, MOO_PACKAGE_NAME, NULL)); g_ptr_array_add (dirs, g_build_filename (*p, MOO_PACKAGE_NAME, nullptr));
g_ptr_array_add (dirs, g_strdup (MOO_DATA_DIR)); g_ptr_array_add (dirs, g_strdup (MOO_DATA_DIR));
} }
@ -1576,7 +1576,7 @@ moo_get_stuff_subdirs (const char *subdir,
dirs = g_new0 (char*, n_dirs + 1); dirs = g_new0 (char*, n_dirs + 1);
for (i = 0; i < n_dirs; ++i) for (i = 0; i < n_dirs; ++i)
dirs[i] = g_build_filename (data_dirs[i], subdir, NULL); dirs[i] = g_build_filename (data_dirs[i], subdir, nullptr);
g_strfreev (data_dirs); g_strfreev (data_dirs);
return dirs; return dirs;
@ -1650,7 +1650,7 @@ get_user_data_file (const char *basename,
g_return_val_if_fail (dir != NULL, NULL); g_return_val_if_fail (dir != NULL, NULL);
file = g_build_filename (dir, basename, NULL); file = g_build_filename (dir, basename, nullptr);
g_free (dir); g_free (dir);
return file; return file;

224
moo/plugins/moofilelist.cpp
View File

@ -195,7 +195,7 @@ file_list_init (FileList *list)
gtk_tree_store_set_column_types (GTK_TREE_STORE (list), 2, types); gtk_tree_store_set_column_types (GTK_TREE_STORE (list), 2, types);
list->n_user_items = 0; list->n_user_items = 0;
list->docs = NULL; list->docs = nullptr;
} }
static void static void
@ -217,7 +217,7 @@ static Item *
get_item_at_iter (FileList *list, get_item_at_iter (FileList *list,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
Item *item = NULL; Item *item = nullptr;
gtk_tree_model_get (GTK_TREE_MODEL (list), iter, COLUMN_ITEM, &item, -1); gtk_tree_model_get (GTK_TREE_MODEL (list), iter, COLUMN_ITEM, &item, -1);
@ -234,7 +234,7 @@ get_item_at_path (FileList *list,
GtkTreeIter iter; GtkTreeIter iter;
if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path)) if (!gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, path))
return NULL; return nullptr;
else else
return get_item_at_iter (list, &iter); return get_item_at_iter (list, &iter);
} }
@ -315,10 +315,10 @@ file_new (void)
ITEM (file)->ref_count = 1; ITEM (file)->ref_count = 1;
ITEM (file)->type = ITEM_FILE; ITEM (file)->type = ITEM_FILE;
file->uri = NULL; file->uri = nullptr;
file->doc = NULL; file->doc = nullptr;
file->display_name = NULL; file->display_name = nullptr;
file->display_basename = NULL; file->display_basename = nullptr;
return file; return file;
} }
@ -328,7 +328,7 @@ file_new_doc (MooEdit *doc)
{ {
File *file; File *file;
g_return_val_if_fail (MOO_IS_EDIT (doc), NULL); g_return_val_if_fail (MOO_IS_EDIT (doc), nullptr);
file = file_new (); file = file_new ();
file_set_doc (file, doc); file_set_doc (file, doc);
@ -343,8 +343,8 @@ file_set_uri (File *file,
char *tmp; char *tmp;
char *filename; char *filename;
g_return_if_fail (file != NULL); g_return_if_fail (file != nullptr);
g_return_if_fail (uri != NULL); g_return_if_fail (uri != nullptr);
tmp = file->uri; tmp = file->uri;
file->uri = g_strdup (uri); file->uri = g_strdup (uri);
@ -353,7 +353,7 @@ file_set_uri (File *file,
g_free (file->display_name); g_free (file->display_name);
g_free (file->display_basename); g_free (file->display_basename);
filename = g_filename_from_uri (uri, NULL, NULL); filename = g_filename_from_uri (uri, nullptr, nullptr);
if (filename) if (filename)
{ {
@ -374,7 +374,7 @@ file_new_uri (const char *uri)
{ {
File *file; File *file;
g_return_val_if_fail (uri != NULL, NULL); g_return_val_if_fail (uri != nullptr, nullptr);
file = file_new (); file = file_new ();
file_set_uri (file, uri); file_set_uri (file, uri);
@ -402,7 +402,7 @@ item_get_tooltip (Item *item)
if (ITEM_IS_FILE (item)) if (ITEM_IS_FILE (item))
return FILE_ITEM (item)->display_name; return FILE_ITEM (item)->display_name;
else else
return NULL; return nullptr;
} }
static Item * static Item *
@ -455,7 +455,7 @@ check_list (G_GNUC_UNUSED FileList *list)
GtkTreeIter iter; GtkTreeIter iter;
int index = 0; int index = 0;
if (gtk_tree_model_iter_children (GTK_TREE_MODEL (list), &iter, NULL)) if (gtk_tree_model_iter_children (GTK_TREE_MODEL (list), &iter, nullptr))
{ {
do do
{ {
@ -463,12 +463,12 @@ check_list (G_GNUC_UNUSED FileList *list)
if (list->n_user_items) if (list->n_user_items)
{ {
g_assert (index == list->n_user_items || item != NULL); g_assert (index == list->n_user_items || item != nullptr);
g_assert (index != list->n_user_items || item == NULL); g_assert (index != list->n_user_items || item == nullptr);
} }
else else
{ {
g_assert (item != NULL); g_assert (item != nullptr);
} }
index += 1; index += 1;
@ -477,7 +477,7 @@ check_list (G_GNUC_UNUSED FileList *list)
} }
g_assert (list->n_user_items == 0 || g_assert (list->n_user_items == 0 ||
list->n_user_items < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list), NULL)); list->n_user_items < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list), nullptr));
#endif #endif
} }
@ -519,7 +519,7 @@ file_list_find_uri (FileList *list,
const char *uri, const char *uri,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
return iter_find_uri (list, uri, NULL, iter); return iter_find_uri (list, uri, nullptr, iter);
} }
@ -543,7 +543,7 @@ file_list_remove_row (FileList *list,
if (last_user_item) if (last_user_item)
{ {
GtkTreeIter sep; GtkTreeIter sep;
gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), &sep, NULL, 0); gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), &sep, nullptr, 0);
gtk_tree_store_remove (GTK_TREE_STORE (list), &sep); gtk_tree_store_remove (GTK_TREE_STORE (list), &sep);
} }
@ -555,7 +555,7 @@ file_list_append_row (FileList *list,
Item *item, Item *item,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
gtk_tree_store_append (GTK_TREE_STORE (list), iter, NULL); gtk_tree_store_append (GTK_TREE_STORE (list), iter, nullptr);
gtk_tree_store_set (GTK_TREE_STORE (list), iter, gtk_tree_store_set (GTK_TREE_STORE (list), iter,
COLUMN_ITEM, item, COLUMN_ITEM, item,
COLUMN_TOOLTIP, item_get_tooltip (item), COLUMN_TOOLTIP, item_get_tooltip (item),
@ -596,7 +596,7 @@ file_list_insert_row (FileList *list,
if (first_user_item) if (first_user_item)
{ {
GtkTreeIter sep; GtkTreeIter sep;
gtk_tree_store_insert (GTK_TREE_STORE (list), &sep, NULL, list->n_user_items); gtk_tree_store_insert (GTK_TREE_STORE (list), &sep, nullptr, list->n_user_items);
gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), iter, parent_iter, index); gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), iter, parent_iter, index);
} }
@ -639,7 +639,7 @@ get_doc_row (FileList *list, MooEdit *doc)
{ {
GtkTreeRowReference *row = file_list_row_data.get(doc); GtkTreeRowReference *row = file_list_row_data.get(doc);
if (row && g_object_get_qdata (G_OBJECT (doc), FILE_LIST_QUARK) != list->plugin) if (row && g_object_get_qdata (G_OBJECT (doc), FILE_LIST_QUARK) != list->plugin)
row = NULL; row = nullptr;
return row; return row;
} }
@ -724,14 +724,14 @@ file_list_update_doc (FileList *list,
item = get_item_at_iter (list, &iter); item = get_item_at_iter (list, &iter);
DEBUG_ASSERT (ITEM_IS_FILE (item) && FILE_ITEM (item)->doc == doc); DEBUG_ASSERT (ITEM_IS_FILE (item) && FILE_ITEM (item)->doc == doc);
DEBUG_ASSERT (FILE_ITEM (item)->uri != NULL); DEBUG_ASSERT (FILE_ITEM (item)->uri != nullptr);
gstr new_uri = gstr::take (moo_edit_get_uri (doc)); gstr new_uri = gstr::take (moo_edit_get_uri (doc));
if (new_uri.empty() || strcmp (new_uri.get(), FILE_ITEM (item)->uri) != 0) if (new_uri.empty() || strcmp (new_uri.get(), FILE_ITEM (item)->uri) != 0)
{ {
file_list_row_data.set(doc, nullptr); file_list_row_data.set(doc, nullptr);
file_set_doc (FILE_ITEM (item), NULL); file_set_doc (FILE_ITEM (item), nullptr);
file_list_add_doc (list, doc, FALSE); file_list_add_doc (list, doc, FALSE);
} }
} }
@ -742,7 +742,7 @@ file_list_remove_doc (FileList *list,
{ {
GtkTreeIter iter; GtkTreeIter iter;
DEBUG_ASSERT (g_slist_find (list->docs, doc) != NULL); DEBUG_ASSERT (g_slist_find (list->docs, doc) != nullptr);
if (doc_get_list_iter (list, doc, &iter)) if (doc_get_list_iter (list, doc, &iter))
{ {
@ -755,13 +755,13 @@ file_list_remove_doc (FileList *list,
if (file_list_iter_is_auto (list, &iter)) if (file_list_iter_is_auto (list, &iter))
file_list_remove_row (list, &iter); file_list_remove_row (list, &iter);
else else
file_set_doc (FILE_ITEM (item), NULL); file_set_doc (FILE_ITEM (item), nullptr);
} }
if (get_doc_row (list, doc)) if (get_doc_row (list, doc))
{ {
file_list_row_data.set(doc, nullptr); file_list_row_data.set(doc, nullptr);
g_object_set_qdata (G_OBJECT (doc), FILE_LIST_QUARK, NULL); g_object_set_qdata (G_OBJECT (doc), FILE_LIST_QUARK, nullptr);
} }
disconnect_doc (list, doc); disconnect_doc (list, doc);
@ -774,10 +774,10 @@ remove_auto_items (FileList *list)
if (list->n_user_items) if (list->n_user_items)
while (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), &iter, while (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), &iter,
NULL, list->n_user_items + 1)) nullptr, list->n_user_items + 1))
gtk_tree_store_remove (GTK_TREE_STORE (list), &iter); gtk_tree_store_remove (GTK_TREE_STORE (list), &iter);
else else
while (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), &iter, NULL, 0)) while (gtk_tree_model_iter_nth_child (GTK_TREE_MODEL (list), &iter, nullptr, 0))
gtk_tree_store_remove (GTK_TREE_STORE (list), &iter); gtk_tree_store_remove (GTK_TREE_STORE (list), &iter);
} }
@ -790,13 +790,13 @@ file_list_update (FileList *list,
remove_auto_items (list); remove_auto_items (list);
for (l = docs; l != NULL; l = l->next) for (l = docs; l != nullptr; l = l->next)
file_list_update_doc (list, (MooEdit*) l->data); file_list_update_doc (list, (MooEdit*) l->data);
old_docs = g_slist_copy (list->docs); old_docs = g_slist_copy (list->docs);
for (l = docs; l != NULL; l = l->next) for (l = docs; l != nullptr; l = l->next)
old_docs = g_slist_remove (old_docs, l->data); old_docs = g_slist_remove (old_docs, l->data);
for (l = old_docs; l != NULL; l = l->next) for (l = old_docs; l != nullptr; l = l->next)
file_list_remove_doc (list, (MooEdit*) l->data); file_list_remove_doc (list, (MooEdit*) l->data);
check_list (list); check_list (list);
@ -818,13 +818,13 @@ file_list_shutdown (FileList *list)
{ {
Item *item = get_item_at_iter (list, &iter); Item *item = get_item_at_iter (list, &iter);
DEBUG_ASSERT (ITEM_IS_FILE (item)); DEBUG_ASSERT (ITEM_IS_FILE (item));
file_set_doc (FILE_ITEM (item), NULL); file_set_doc (FILE_ITEM (item), nullptr);
} }
if (get_doc_row (list, doc)) if (get_doc_row (list, doc))
{ {
file_list_row_data.set(doc, nullptr); file_list_row_data.set(doc, nullptr);
g_object_set_qdata (G_OBJECT (doc), FILE_LIST_QUARK, NULL); g_object_set_qdata (G_OBJECT (doc), FILE_LIST_QUARK, nullptr);
} }
disconnect_doc (list, doc); disconnect_doc (list, doc);
@ -836,8 +836,8 @@ static UIConfig *
ui_config_new (void) ui_config_new (void)
{ {
UIConfig *cfg = g_new0 (UIConfig, 1); UIConfig *cfg = g_new0 (UIConfig, 1);
cfg->expanded_rows = NULL; cfg->expanded_rows = nullptr;
cfg->selected_row = NULL; cfg->selected_row = nullptr;
return cfg; return cfg;
} }
@ -846,7 +846,7 @@ ui_config_free (UIConfig *cfg)
{ {
if (cfg) if (cfg)
{ {
g_slist_foreach (cfg->expanded_rows, (GFunc) gtk_tree_path_free, NULL); g_slist_foreach (cfg->expanded_rows, (GFunc) gtk_tree_path_free, nullptr);
g_slist_free (cfg->expanded_rows); g_slist_free (cfg->expanded_rows);
gtk_tree_path_free (cfg->selected_row); gtk_tree_path_free (cfg->selected_row);
g_free (cfg); g_free (cfg);
@ -879,7 +879,7 @@ parse_node (FileList *list,
file_list_insert_row (list, ITEM (group), &iter, parent, -1); file_list_insert_row (list, ITEM (group), &iter, parent, -1);
item_unref (ITEM (group)); item_unref (ITEM (group));
for (child = elm->children; child != NULL; child = child->next) for (child = elm->children; child != nullptr; child = child->next)
if (MOO_MARKUP_IS_ELEMENT (child)) if (MOO_MARKUP_IS_ELEMENT (child))
parse_node (list, child, &iter, filename, ui_config); parse_node (list, child, &iter, filename, ui_config);
} }
@ -905,7 +905,7 @@ parse_node (FileList *list,
const char *expanded_rows; const char *expanded_rows;
const char *selected_row; const char *selected_row;
UIConfig *config; UIConfig *config;
char **rows = NULL, **p; char **rows = nullptr, **p;
if (*ui_config) if (*ui_config)
{ {
@ -949,11 +949,11 @@ file_list_load_config (FileList *list,
UIConfig **ui_configp) UIConfig **ui_configp)
{ {
MooMarkupDoc *doc; MooMarkupDoc *doc;
GError *error = NULL; GError *error = nullptr;
MooMarkupNode *root, *node; MooMarkupNode *root, *node;
const char *version; const char *version;
*ui_configp = NULL; *ui_configp = nullptr;
if (!g_file_test (filename, G_FILE_TEST_EXISTS)) if (!g_file_test (filename, G_FILE_TEST_EXISTS))
return; return;
@ -984,12 +984,12 @@ file_list_load_config (FileList *list,
goto out; goto out;
} }
for (node = root->children; node != NULL; node = node->next) for (node = root->children; node != nullptr; node = node->next)
{ {
if (!MOO_MARKUP_IS_ELEMENT (node)) if (!MOO_MARKUP_IS_ELEMENT (node))
continue; continue;
parse_node (list, node, NULL, filename, ui_configp); parse_node (list, node, nullptr, filename, ui_configp);
} }
out: out:
@ -1061,7 +1061,7 @@ file_list_save_config (FileList *list,
{ {
GtkTreeIter iter; GtkTreeIter iter;
GString *buffer; GString *buffer;
GError *error = NULL; GError *error = nullptr;
if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &iter)) if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (list), &iter))
{ {
@ -1083,7 +1083,7 @@ file_list_save_config (FileList *list,
g_string_append (buffer, " " PROP_EXPANDED_ROWS "=\""); g_string_append (buffer, " " PROP_EXPANDED_ROWS "=\"");
for (l = ui_config->expanded_rows; l != NULL; l = l->next) for (l = ui_config->expanded_rows; l != nullptr; l = l->next)
{ {
GtkTreePath *path = (GtkTreePath*) l->data; GtkTreePath *path = (GtkTreePath*) l->data;
char *tmp = gtk_tree_path_to_string (path); char *tmp = gtk_tree_path_to_string (path);
@ -1135,9 +1135,9 @@ static GtkTreePath *
file_list_add_group (FileList *list, file_list_add_group (FileList *list,
GtkTreePath *path) GtkTreePath *path)
{ {
GtkTreePath *parent = NULL; GtkTreePath *parent = nullptr;
GtkTreeIter parent_iter, new_iter; GtkTreeIter parent_iter, new_iter;
GtkTreeIter *piter = NULL; GtkTreeIter *piter = nullptr;
Group *group; Group *group;
int index = -1; int index = -1;
@ -1205,7 +1205,7 @@ static void
file_list_remove_items (FileList *list, file_list_remove_items (FileList *list,
GList *paths) GList *paths)
{ {
GSList *rows = NULL; GSList *rows = nullptr;
while (paths) while (paths)
{ {
@ -1223,7 +1223,7 @@ file_list_remove_items (FileList *list,
while (rows) while (rows)
{ {
GtkTreePath *path = NULL; GtkTreePath *path = nullptr;
if (gtk_tree_row_reference_valid ((GtkTreeRowReference*) rows->data)) if (gtk_tree_row_reference_valid ((GtkTreeRowReference*) rows->data))
path = gtk_tree_row_reference_get_path ((GtkTreeRowReference*) rows->data); path = gtk_tree_row_reference_get_path ((GtkTreeRowReference*) rows->data);
@ -1316,12 +1316,12 @@ copy_row (FileList *list,
{ {
GtkTreeRowReference *source_row; GtkTreeRowReference *source_row;
GtkTreeIter iter, parent_iter; GtkTreeIter iter, parent_iter;
GtkTreeIter *piter = NULL; GtkTreeIter *piter = nullptr;
Item *item; Item *item;
gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, source); gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, source);
item = get_item_at_iter (list, &iter); item = get_item_at_iter (list, &iter);
g_return_if_fail (item != NULL); g_return_if_fail (item != nullptr);
source_row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list), source); source_row = gtk_tree_row_reference_new (GTK_TREE_MODEL (list), source);
@ -1346,7 +1346,7 @@ move_row (FileList *list,
GtkTreePath *parent, GtkTreePath *parent,
int index) int index)
{ {
GtkTreePath *source_parent = NULL; GtkTreePath *source_parent = nullptr;
gboolean same_parent = FALSE; gboolean same_parent = FALSE;
GtkTreeIter iter; GtkTreeIter iter;
Item *item; Item *item;
@ -1366,7 +1366,7 @@ move_row (FileList *list,
file_set_uri (FILE_ITEM (item), uri.get()); file_set_uri (FILE_ITEM (item), uri.get());
file_list_row_data.set(FILE_ITEM (item)->doc, nullptr); file_list_row_data.set(FILE_ITEM (item)->doc, nullptr);
file_set_doc (FILE_ITEM (item), NULL); file_set_doc (FILE_ITEM (item), nullptr);
} }
if (gtk_tree_path_get_depth (source) > 1) if (gtk_tree_path_get_depth (source) > 1)
@ -1382,7 +1382,7 @@ move_row (FileList *list,
if (same_parent) if (same_parent)
{ {
GtkTreeIter *piter = NULL; GtkTreeIter *piter = nullptr;
gboolean first_user = FALSE; gboolean first_user = FALSE;
if (parent) if (parent)
@ -1399,7 +1399,7 @@ move_row (FileList *list,
if (index >= gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list), piter) || index < 0) if (index >= gtk_tree_model_iter_n_children (GTK_TREE_MODEL (list), piter) || index < 0)
{ {
gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, source); gtk_tree_model_get_iter (GTK_TREE_MODEL (list), &iter, source);
gtk_tree_store_move_before (GTK_TREE_STORE (list), &iter, NULL); gtk_tree_store_move_before (GTK_TREE_STORE (list), &iter, nullptr);
} }
else else
{ {
@ -1411,7 +1411,7 @@ move_row (FileList *list,
if (first_user) if (first_user)
gtk_tree_store_insert (GTK_TREE_STORE (list), &iter, gtk_tree_store_insert (GTK_TREE_STORE (list), &iter,
NULL, list->n_user_items); nullptr, list->n_user_items);
} }
else else
{ {
@ -1444,7 +1444,7 @@ uri_is_directory (const char *uri)
char *filename; char *filename;
gboolean retval = FALSE; gboolean retval = FALSE;
filename = g_filename_from_uri (uri, NULL, NULL); filename = g_filename_from_uri (uri, nullptr, nullptr);
if (filename) if (filename)
retval = g_file_test (filename, G_FILE_TEST_IS_DIR); retval = g_file_test (filename, G_FILE_TEST_IS_DIR);
@ -1496,9 +1496,9 @@ add_row_from_uri (FileList *list,
int index) int index)
{ {
GtkTreeIter iter, dummy; GtkTreeIter iter, dummy;
GtkTreeIter *piter = NULL; GtkTreeIter *piter = nullptr;
g_return_val_if_fail (uri != NULL, FALSE); g_return_val_if_fail (uri != nullptr, FALSE);
if (parent) if (parent)
{ {
@ -1521,10 +1521,10 @@ find_drop_destination (FileList *list,
int *index) int *index)
{ {
int n_children; int n_children;
Group *parent_group = NULL; Group *parent_group = nullptr;
GtkTreeIter parent_iter; GtkTreeIter parent_iter;
*parent_path = NULL; *parent_path = nullptr;
*index = 0; *index = 0;
if (gtk_tree_path_get_depth (dest) > 1) if (gtk_tree_path_get_depth (dest) > 1)
@ -1571,7 +1571,7 @@ find_drop_destination (FileList *list,
} }
else else
{ {
parent_group = NULL; parent_group = nullptr;
*index = gtk_tree_path_get_indices (parent)[0]; *index = gtk_tree_path_get_indices (parent)[0];
} }
@ -1610,7 +1610,7 @@ drop_uris (FileList *list,
GtkTreePath *dest, GtkTreePath *dest,
char **uris) char **uris)
{ {
GtkTreePath *parent_path = NULL; GtkTreePath *parent_path = nullptr;
int index = 0; int index = 0;
if (!find_drop_destination (list, dest, &parent_path, &index)) if (!find_drop_destination (list, dest, &parent_path, &index))
@ -1638,7 +1638,7 @@ drop_tree_model_row (FileList *list,
GtkTreePath *dest, GtkTreePath *dest,
GtkTreePath *source) GtkTreePath *source)
{ {
GtkTreePath *parent_path = NULL; GtkTreePath *parent_path = nullptr;
int index; int index;
gboolean retval; gboolean retval;
@ -1678,10 +1678,10 @@ drag_dest_drag_data_received (GtkTreeDragDest *drag_dest,
{ {
if (selection_data->target == TREE_MODEL_ROW_ATOM) if (selection_data->target == TREE_MODEL_ROW_ATOM)
{ {
GtkTreePath *path = NULL; GtkTreePath *path = nullptr;
gboolean retval; gboolean retval;
if (!gtk_tree_get_row_drag_data (selection_data, NULL, &path)) if (!gtk_tree_get_row_drag_data (selection_data, nullptr, &path))
return FALSE; return FALSE;
if ((retval = drop_tree_model_row (FILE_LIST (drag_dest), dest, path))) if ((retval = drop_tree_model_row (FILE_LIST (drag_dest), dest, path)))
@ -1729,8 +1729,8 @@ _moo_str_semicase_compare (const char *string,
gboolean has_upper; gboolean has_upper;
const char *p; const char *p;
g_return_val_if_fail (string != NULL, FALSE); g_return_val_if_fail (string != nullptr, FALSE);
g_return_val_if_fail (key != NULL, FALSE); g_return_val_if_fail (key != nullptr, FALSE);
for (p = key, has_upper = FALSE; *p && !has_upper; ++p) for (p = key, has_upper = FALSE; *p && !has_upper; ++p)
has_upper = g_ascii_isupper (*p); has_upper = g_ascii_isupper (*p);
@ -1747,7 +1747,7 @@ row_separator_func (GtkTreeModel *model,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
Item *item = get_item_at_iter (FILE_LIST (model), iter); Item *item = get_item_at_iter (FILE_LIST (model), iter);
return item == NULL; return item == nullptr;
} }
static gboolean static gboolean
@ -1756,7 +1756,7 @@ tree_view_search_equal_func (GtkTreeModel *model,
const char *key, const char *key,
GtkTreeIter *iter) GtkTreeIter *iter)
{ {
const char *compare_with = NULL; const char *compare_with = nullptr;
Item *item; Item *item;
item = get_item_at_iter (FILE_LIST (model), iter); item = get_item_at_iter (FILE_LIST (model), iter);
@ -1780,9 +1780,9 @@ pixbuf_data_func (G_GNUC_UNUSED GtkTreeViewColumn *column,
{ {
Item *item = get_item_at_iter (FILE_LIST (model), iter); Item *item = get_item_at_iter (FILE_LIST (model), iter);
if (ITEM_IS_GROUP (item)) if (ITEM_IS_GROUP (item))
g_object_set (cell, "stock-id", GTK_STOCK_DIRECTORY, NULL); g_object_set (cell, "stock-id", GTK_STOCK_DIRECTORY, nullptr);
else if (ITEM_IS_FILE (item)) else if (ITEM_IS_FILE (item))
g_object_set (cell, "stock-id", GTK_STOCK_FILE, NULL); g_object_set (cell, "stock-id", GTK_STOCK_FILE, nullptr);
} }
static void static void
@ -1794,9 +1794,9 @@ text_data_func (G_GNUC_UNUSED GtkTreeViewColumn *column,
Item *item = get_item_at_iter (FILE_LIST (model), iter); Item *item = get_item_at_iter (FILE_LIST (model), iter);
if (ITEM_IS_GROUP (item)) if (ITEM_IS_GROUP (item))
g_object_set (cell, "text", GROUP_ITEM (item)->name, NULL); g_object_set (cell, "text", GROUP_ITEM (item)->name, nullptr);
else if (ITEM_IS_FILE (item)) else if (ITEM_IS_FILE (item))
g_object_set (cell, "text", FILE_ITEM (item)->display_basename, NULL); g_object_set (cell, "text", FILE_ITEM (item)->display_basename, nullptr);
} }
static void static void
@ -1809,10 +1809,10 @@ text_cell_edited (GtkCellRenderer *cell,
Item *item; Item *item;
GtkTreePath *path; GtkTreePath *path;
g_object_set (cell, "editable", FALSE, NULL); g_object_set (cell, "editable", FALSE, nullptr);
path = gtk_tree_path_new_from_string (path_string); path = gtk_tree_path_new_from_string (path_string);
g_return_if_fail (path != NULL); g_return_if_fail (path != nullptr);
gtk_tree_model_get_iter (GTK_TREE_MODEL (plugin->list), &iter, path); gtk_tree_model_get_iter (GTK_TREE_MODEL (plugin->list), &iter, path);
item = get_item_at_iter (plugin->list, &iter); item = get_item_at_iter (plugin->list, &iter);
@ -1827,14 +1827,14 @@ text_cell_edited (GtkCellRenderer *cell,
static void static void
text_cell_editing_canceled (GtkCellRenderer *cell) text_cell_editing_canceled (GtkCellRenderer *cell)
{ {
g_object_set (cell, "editable", FALSE, NULL); g_object_set (cell, "editable", FALSE, nullptr);
} }
static void static void
start_edit (WindowPlugin *plugin, start_edit (WindowPlugin *plugin,
GtkTreePath *path) GtkTreePath *path)
{ {
g_object_set (plugin->text_cell, "editable", TRUE, NULL); g_object_set (plugin->text_cell, "editable", TRUE, nullptr);
gtk_tree_view_set_cursor_on_cell (plugin->treeview, gtk_tree_view_set_cursor_on_cell (plugin->treeview,
path, plugin->column, path, plugin->column,
plugin->text_cell, plugin->text_cell,
@ -1846,13 +1846,13 @@ get_selected_rows (WindowPlugin *plugin)
{ {
GtkTreeSelection *selection; GtkTreeSelection *selection;
selection = gtk_tree_view_get_selection (plugin->treeview); selection = gtk_tree_view_get_selection (plugin->treeview);
return gtk_tree_selection_get_selected_rows (selection, NULL); return gtk_tree_selection_get_selected_rows (selection, nullptr);
} }
static void static void
path_list_free (GList *paths) path_list_free (GList *paths)
{ {
g_list_foreach (paths, (GFunc) gtk_tree_path_free, NULL); g_list_foreach (paths, (GFunc) gtk_tree_path_free, nullptr);
g_list_free (paths); g_list_free (paths);
} }
@ -1893,7 +1893,7 @@ add_group_activated (G_GNUC_UNUSED GtkWidget *menuitem,
if (selected) if (selected)
path = (GtkTreePath*) g_list_last (selected)->data; path = (GtkTreePath*) g_list_last (selected)->data;
else else
path = NULL; path = nullptr;
new_path = file_list_add_group (plugin->list, path); new_path = file_list_add_group (plugin->list, path);
@ -1937,7 +1937,7 @@ open_file (WindowPlugin *plugin,
Item *item; Item *item;
item = get_item_at_path (plugin->list, path); item = get_item_at_path (plugin->list, path);
g_return_if_fail (item != NULL); g_return_if_fail (item != nullptr);
if (ITEM_IS_FILE (item)) if (ITEM_IS_FILE (item))
{ {
@ -1950,7 +1950,7 @@ open_file (WindowPlugin *plugin,
else else
{ {
moo_editor_open_uri (moo_editor_instance (), moo_editor_open_uri (moo_editor_instance (),
FILE_ITEM (item)->uri, NULL, -1, FILE_ITEM (item)->uri, nullptr, -1,
MOO_WIN_PLUGIN (plugin)->window); MOO_WIN_PLUGIN (plugin)->window);
} }
} }
@ -1986,7 +1986,7 @@ open_activated (G_GNUC_UNUSED GtkWidget *menuitem,
selected = get_selected_rows (plugin); selected = get_selected_rows (plugin);
for (l = selected; l != NULL; l = l->next) for (l = selected; l != nullptr; l = l->next)
open_file (plugin, (GtkTreePath*) l->data); open_file (plugin, (GtkTreePath*) l->data);
path_list_free (selected); path_list_free (selected);
@ -1997,7 +1997,7 @@ can_open (G_GNUC_UNUSED FileList *list,
GList *paths) GList *paths)
{ {
/* XXX */ /* XXX */
return paths != NULL; return paths != nullptr;
} }
static gboolean static gboolean
@ -2027,26 +2027,26 @@ popup_menu (WindowPlugin *plugin,
GtkTreePath *single_path; GtkTreePath *single_path;
Item *single_item; Item *single_item;
single_path = (selected && !selected->next) ? (GtkTreePath*) selected->data : NULL; single_path = (selected && !selected->next) ? (GtkTreePath*) selected->data : nullptr;
single_item = single_path ? get_item_at_path (plugin->list, single_path) : NULL; single_item = single_path ? get_item_at_path (plugin->list, single_path) : nullptr;
menu = gtk_menu_new (); menu = gtk_menu_new ();
if (can_open (plugin->list, selected)) if (can_open (plugin->list, selected))
{ {
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_OPEN, NULL); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_OPEN, nullptr);
g_signal_connect (menuitem, "activate", G_CALLBACK (open_activated), plugin); g_signal_connect (menuitem, "activate", G_CALLBACK (open_activated), plugin);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
} }
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_ADD, NULL); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_ADD, nullptr);
gtk_label_set_text (GTK_LABEL (GTK_BIN (menuitem)->child), "Add Group"); gtk_label_set_text (GTK_LABEL (GTK_BIN (menuitem)->child), "Add Group");
g_signal_connect (menuitem, "activate", G_CALLBACK (add_group_activated), plugin); g_signal_connect (menuitem, "activate", G_CALLBACK (add_group_activated), plugin);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
if (selected) if (selected)
{ {
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_REMOVE, NULL); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_REMOVE, nullptr);
g_signal_connect (menuitem, "activate", G_CALLBACK (remove_activated), plugin); g_signal_connect (menuitem, "activate", G_CALLBACK (remove_activated), plugin);
gtk_widget_set_sensitive (menuitem, can_remove (plugin->list, selected)); gtk_widget_set_sensitive (menuitem, can_remove (plugin->list, selected));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
@ -2054,14 +2054,14 @@ popup_menu (WindowPlugin *plugin,
if (single_item && ITEM_IS_GROUP (single_item)) if (single_item && ITEM_IS_GROUP (single_item))
{ {
menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_EDIT, NULL); menuitem = gtk_image_menu_item_new_from_stock (GTK_STOCK_EDIT, nullptr);
gtk_label_set_text (GTK_LABEL (GTK_BIN (menuitem)->child), "Rename"); gtk_label_set_text (GTK_LABEL (GTK_BIN (menuitem)->child), "Rename");
g_signal_connect (menuitem, "activate", G_CALLBACK (rename_activated), plugin); g_signal_connect (menuitem, "activate", G_CALLBACK (rename_activated), plugin);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
} }
gtk_widget_show_all (menu); gtk_widget_show_all (menu);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, button, time); gtk_menu_popup (GTK_MENU (menu), nullptr, nullptr, nullptr, nullptr, button, time);
} }
static gboolean static gboolean
@ -2070,7 +2070,7 @@ treeview_button_press (GtkTreeView *treeview,
WindowPlugin *plugin) WindowPlugin *plugin)
{ {
GtkTreeSelection *selection; GtkTreeSelection *selection;
GtkTreePath *path = NULL; GtkTreePath *path = nullptr;
GList *selected; GList *selected;
int x, y; int x, y;
@ -2078,7 +2078,7 @@ treeview_button_press (GtkTreeView *treeview,
return FALSE; return FALSE;
gtk_tree_view_get_path_at_pos (treeview, (int) event->x, (int) event->y, gtk_tree_view_get_path_at_pos (treeview, (int) event->x, (int) event->y,
&path, NULL, &x, &y); &path, nullptr, &x, &y);
selection = gtk_tree_view_get_selection (treeview); selection = gtk_tree_view_get_selection (treeview);
@ -2087,13 +2087,13 @@ treeview_button_press (GtkTreeView *treeview,
else if (!gtk_tree_selection_path_is_selected (selection, path)) else if (!gtk_tree_selection_path_is_selected (selection, path))
gtk_tree_view_set_cursor (treeview, path, plugin->column, FALSE); gtk_tree_view_set_cursor (treeview, path, plugin->column, FALSE);
selected = gtk_tree_selection_get_selected_rows (selection, NULL); selected = gtk_tree_selection_get_selected_rows (selection, nullptr);
popup_menu (plugin, selected, event->button, event->time); popup_menu (plugin, selected, event->button, event->time);
if (path) if (path)
gtk_tree_path_free (path); gtk_tree_path_free (path);
g_list_foreach (selected, (GFunc) gtk_tree_path_free, NULL); g_list_foreach (selected, (GFunc) gtk_tree_path_free, nullptr);
g_list_free (selected); g_list_free (selected);
return TRUE; return TRUE;
@ -2106,7 +2106,7 @@ treeview_row_activated (WindowPlugin *plugin,
Item *item; Item *item;
item = get_item_at_path (plugin->list, path); item = get_item_at_path (plugin->list, path);
g_return_if_fail (item != NULL); g_return_if_fail (item != nullptr);
if (ITEM_IS_FILE (item)) if (ITEM_IS_FILE (item))
open_file (plugin, path); open_file (plugin, path);
@ -2126,10 +2126,10 @@ create_treeview (WindowPlugin *plugin)
gtk_tree_view_set_headers_visible (plugin->treeview, FALSE); gtk_tree_view_set_headers_visible (plugin->treeview, FALSE);
gtk_tree_view_set_row_separator_func (plugin->treeview, gtk_tree_view_set_row_separator_func (plugin->treeview,
(GtkTreeViewRowSeparatorFunc) row_separator_func, (GtkTreeViewRowSeparatorFunc) row_separator_func,
NULL, NULL); nullptr, nullptr);
gtk_tree_view_set_search_equal_func (plugin->treeview, gtk_tree_view_set_search_equal_func (plugin->treeview,
(GtkTreeViewSearchEqualFunc) tree_view_search_equal_func, (GtkTreeViewSearchEqualFunc) tree_view_search_equal_func,
NULL, NULL); nullptr, nullptr);
gtk_tree_view_set_tooltip_column (plugin->treeview, COLUMN_TOOLTIP); gtk_tree_view_set_tooltip_column (plugin->treeview, COLUMN_TOOLTIP);
selection = gtk_tree_view_get_selection (plugin->treeview); selection = gtk_tree_view_get_selection (plugin->treeview);
@ -2163,13 +2163,13 @@ create_treeview (WindowPlugin *plugin)
gtk_tree_view_column_pack_start (plugin->column, cell, FALSE); gtk_tree_view_column_pack_start (plugin->column, cell, FALSE);
gtk_tree_view_column_set_cell_data_func (plugin->column, cell, gtk_tree_view_column_set_cell_data_func (plugin->column, cell,
(GtkTreeCellDataFunc) pixbuf_data_func, (GtkTreeCellDataFunc) pixbuf_data_func,
NULL, NULL); nullptr, nullptr);
plugin->text_cell = gtk_cell_renderer_text_new (); plugin->text_cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (plugin->column, plugin->text_cell, TRUE); gtk_tree_view_column_pack_start (plugin->column, plugin->text_cell, TRUE);
gtk_tree_view_column_set_cell_data_func (plugin->column, plugin->text_cell, gtk_tree_view_column_set_cell_data_func (plugin->column, plugin->text_cell,
(GtkTreeCellDataFunc) text_data_func, (GtkTreeCellDataFunc) text_data_func,
NULL, NULL); nullptr, nullptr);
g_signal_connect (plugin->text_cell, "edited", g_signal_connect (plugin->text_cell, "edited",
G_CALLBACK (text_cell_edited), plugin); G_CALLBACK (text_cell_edited), plugin);
g_signal_connect (plugin->text_cell, "editing-canceled", g_signal_connect (plugin->text_cell, "editing-canceled",
@ -2179,7 +2179,7 @@ create_treeview (WindowPlugin *plugin)
static void static void
create_model (WindowPlugin *plugin) create_model (WindowPlugin *plugin)
{ {
plugin->list = (FileList*) g_object_new (file_list_get_type (), (const char*) NULL); plugin->list = (FileList*) g_object_new (file_list_get_type (), (const char*) nullptr);
plugin->list->plugin = plugin; plugin->list->plugin = plugin;
file_list_load_config (plugin->list, plugin->filename, &plugin->ui_config); file_list_load_config (plugin->list, plugin->filename, &plugin->ui_config);
@ -2218,7 +2218,7 @@ do_update (WindowPlugin *plugin)
docs = moo_edit_window_get_docs (MOO_WIN_PLUGIN (plugin)->window); docs = moo_edit_window_get_docs (MOO_WIN_PLUGIN (plugin)->window);
for (i = 0, list = NULL; i < docs->n_elms; ++i) for (i = 0, list = nullptr; i < docs->n_elms; ++i)
list = g_slist_prepend (list, docs->elms[i]); list = g_slist_prepend (list, docs->elms[i]);
list = g_slist_sort (list, (GCompareFunc) compare_docs_by_name); list = g_slist_sort (list, (GCompareFunc) compare_docs_by_name);
@ -2233,7 +2233,7 @@ do_update (WindowPlugin *plugin)
static void static void
window_plugin_queue_update (WindowPlugin *plugin) window_plugin_queue_update (WindowPlugin *plugin)
{ {
g_return_if_fail (plugin != NULL); g_return_if_fail (plugin != nullptr);
if (!plugin->update_idle) if (!plugin->update_idle)
plugin->update_idle = g_idle_add ((GSourceFunc) do_update, plugin->update_idle = g_idle_add ((GSourceFunc) do_update,
@ -2250,7 +2250,7 @@ load_ui_config (WindowPlugin *plugin)
{ {
UIConfig *cfg = plugin->ui_config; UIConfig *cfg = plugin->ui_config;
plugin->ui_config = NULL; plugin->ui_config = nullptr;
while (cfg->expanded_rows) while (cfg->expanded_rows)
{ {
@ -2262,7 +2262,7 @@ load_ui_config (WindowPlugin *plugin)
} }
if (cfg->selected_row) if (cfg->selected_row)
gtk_tree_view_set_cursor (plugin->treeview, cfg->selected_row, NULL, FALSE); gtk_tree_view_set_cursor (plugin->treeview, cfg->selected_row, nullptr, FALSE);
else else
_moo_tree_view_select_first (plugin->treeview); _moo_tree_view_select_first (plugin->treeview);
@ -2316,7 +2316,7 @@ do_update_ui (WindowPlugin *plugin)
static void static void
window_plugin_queue_update_ui (WindowPlugin *plugin) window_plugin_queue_update_ui (WindowPlugin *plugin)
{ {
g_return_if_fail (plugin != NULL); g_return_if_fail (plugin != nullptr);
if (!plugin->update_ui_idle) if (!plugin->update_ui_idle)
plugin->update_ui_idle = g_idle_add ((GSourceFunc) do_update_ui, plugin->update_ui_idle = g_idle_add ((GSourceFunc) do_update_ui,
plugin); plugin);
@ -2339,14 +2339,14 @@ file_list_window_plugin_create (WindowPlugin *plugin)
create_treeview (plugin); create_treeview (plugin);
create_model (plugin); create_model (plugin);
scrolled_window = gtk_scrolled_window_new (NULL, NULL); scrolled_window = gtk_scrolled_window_new (nullptr, nullptr);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (plugin->treeview)); gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (plugin->treeview));
gtk_widget_show_all (scrolled_window); gtk_widget_show_all (scrolled_window);
label = moo_pane_label_new (GTK_STOCK_DIRECTORY, label = moo_pane_label_new (GTK_STOCK_DIRECTORY,
NULL, _("File List"), nullptr, _("File List"),
_("File List")); _("File List"));
moo_edit_window_add_pane (window, moo_edit_window_add_pane (window,
FILE_LIST_PLUGIN_ID, FILE_LIST_PLUGIN_ID,
@ -2355,7 +2355,7 @@ file_list_window_plugin_create (WindowPlugin *plugin)
moo_pane_label_free (label); moo_pane_label_free (label);
pane = moo_big_paned_find_pane (window->paned, pane = moo_big_paned_find_pane (window->paned,
GTK_WIDGET (scrolled_window), NULL); GTK_WIDGET (scrolled_window), nullptr);
moo_pane_set_drag_dest (pane); moo_pane_set_drag_dest (pane);
plugin->first_time_show = TRUE; plugin->first_time_show = TRUE;
@ -2409,7 +2409,7 @@ MOO_PLUGIN_DEFINE_INFO (file_list,
MOO_VERSION) MOO_VERSION)
MOO_WIN_PLUGIN_DEFINE (FileList, file_list) MOO_WIN_PLUGIN_DEFINE (FileList, file_list)
MOO_PLUGIN_DEFINE (FileList, file_list, MOO_PLUGIN_DEFINE (FileList, file_list,
NULL, NULL, NULL, NULL, NULL, nullptr, nullptr, nullptr, nullptr, nullptr,
file_list_window_plugin_get_type (), 0) file_list_window_plugin_get_type (), 0)

2
moo/plugins/moofileselector-prefs.cpp
View File

@ -86,7 +86,7 @@ _moo_file_selector_prefs_page (MooPlugin *plugin)
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
gtk_tree_view_column_pack_start (column, cell, TRUE); gtk_tree_view_column_pack_start (column, cell, TRUE);
gtk_tree_view_column_set_attributes (column, cell, "text", COLUMN_LABEL, NULL); gtk_tree_view_column_set_attributes (column, cell, "text", COLUMN_LABEL, nullptr);
store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, store = gtk_list_store_new (N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING); G_TYPE_STRING, G_TYPE_STRING);

144
moo/plugins/moofileselector.cpp
View File

@ -162,7 +162,7 @@ _moo_file_selector_class_init (MooFileSelectorClass *klass)
G_OBJECT_CLASS_TYPE (klass), G_OBJECT_CLASS_TYPE (klass),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (goto_current_doc_dir), G_CALLBACK (goto_current_doc_dir),
NULL, NULL, nullptr, nullptr,
_moo_marshal_VOID__VOID, _moo_marshal_VOID__VOID,
G_TYPE_NONE, 0); G_TYPE_NONE, 0);
} }
@ -238,7 +238,7 @@ file_selector_go_home (MooFileView *fileview)
dir = moo_prefs_get_filename (PREFS_LAST_DIR); dir = moo_prefs_get_filename (PREFS_LAST_DIR);
if (!dir || !moo_file_view_chdir_path (fileview, dir, NULL)) if (!dir || !moo_file_view_chdir_path (fileview, dir, nullptr))
g_signal_emit_by_name (fileview, "go-home"); g_signal_emit_by_name (fileview, "go-home");
} }
@ -254,8 +254,8 @@ moo_file_selector_chdir (MooFileView *fileview,
if (result) if (result)
{ {
char *new_dir = NULL; char *new_dir = nullptr;
g_object_get (fileview, "current-directory", &new_dir, NULL); g_object_get (fileview, "current-directory", &new_dir, nullptr);
moo_prefs_set_filename (PREFS_LAST_DIR, new_dir); moo_prefs_set_filename (PREFS_LAST_DIR, new_dir);
g_free (new_dir); g_free (new_dir);
} }
@ -273,7 +273,7 @@ moo_file_selector_activate (MooFileView *fileview,
gboolean is_text = TRUE, is_exe = FALSE; gboolean is_text = TRUE, is_exe = FALSE;
mgw_errno_t err; mgw_errno_t err;
g_return_if_fail (path != NULL); g_return_if_fail (path != nullptr);
if (mgw_stat (path, &statbuf, &err) != 0) if (mgw_stat (path, &statbuf, &err) != 0)
{ {
@ -306,7 +306,7 @@ moo_file_selector_activate (MooFileView *fileview,
if (is_text) if (is_text)
moo_editor_open_path (moo_edit_window_get_editor (filesel->window), moo_editor_open_path (moo_edit_window_get_editor (filesel->window),
path, NULL, -1, filesel->window); path, nullptr, -1, filesel->window);
else if (!is_exe) else if (!is_exe)
moo_open_file (path); moo_open_file (path);
} }
@ -317,11 +317,11 @@ goto_current_doc_dir (MooFileSelector *filesel)
{ {
MooEdit *doc; MooEdit *doc;
GFile *file, *parent_file; GFile *file, *parent_file;
GError *error = NULL; GError *error = nullptr;
doc = moo_edit_window_get_active_doc (filesel->window); doc = moo_edit_window_get_active_doc (filesel->window);
file = doc ? moo_edit_get_file (doc) : NULL; file = doc ? moo_edit_get_file (doc) : nullptr;
parent_file = file ? g_file_get_parent (file) : NULL; parent_file = file ? g_file_get_parent (file) : nullptr;
if (parent_file) if (parent_file)
{ {
@ -375,7 +375,7 @@ create_new_file_dialog (GtkWidget *parent,
char *display_dirname, *label_text; char *display_dirname, *label_text;
display_dirname = g_filename_display_basename (dirname); display_dirname = g_filename_display_basename (dirname);
g_return_val_if_fail (display_dirname != NULL, NULL); g_return_val_if_fail (display_dirname != nullptr, nullptr);
*xml = new_file_dialog_xml_new (); *xml = new_file_dialog_xml_new ();
dialog = GTK_WIDGET ((*xml)->NewFileDialog); dialog = GTK_WIDGET ((*xml)->NewFileDialog);
@ -403,12 +403,12 @@ new_file_dialog (GtkWidget *parent,
const char *dirname, const char *dirname,
const char *start_name) const char *start_name)
{ {
NewFileDialogXml *xml = NULL; NewFileDialogXml *xml = nullptr;
GtkWidget *dialog = NULL; GtkWidget *dialog = nullptr;
GtkEntry *entry = NULL; GtkEntry *entry = nullptr;
char *fullname = NULL; char *fullname = nullptr;
g_return_val_if_fail (dirname != NULL, NULL); g_return_val_if_fail (dirname != nullptr, nullptr);
while (TRUE) while (TRUE)
{ {
@ -419,7 +419,7 @@ new_file_dialog (GtkWidget *parent,
if (!dialog) if (!dialog)
{ {
dialog = create_new_file_dialog (parent, dirname, start_name, &xml); dialog = create_new_file_dialog (parent, dirname, start_name, &xml);
g_return_val_if_fail (dialog != NULL, NULL); g_return_val_if_fail (dialog != nullptr, nullptr);
entry = GTK_ENTRY (xml->entry); entry = GTK_ENTRY (xml->entry);
} }
@ -435,7 +435,7 @@ new_file_dialog (GtkWidget *parent,
} }
/* XXX error checking, you know */ /* XXX error checking, you know */
name = g_filename_from_utf8 (text, -1, NULL, NULL, NULL); name = g_filename_from_utf8 (text, -1, nullptr, nullptr, nullptr);
if (!name) if (!name)
{ {
@ -450,18 +450,18 @@ new_file_dialog (GtkWidget *parent,
continue; continue;
} }
fullname = g_build_filename (dirname, name, NULL); fullname = g_build_filename (dirname, name, nullptr);
g_free (name); g_free (name);
if (!g_file_test (fullname, G_FILE_TEST_EXISTS)) if (!g_file_test (fullname, G_FILE_TEST_EXISTS))
goto out; goto out;
err_text = g_strdup_printf (_("File '%s' already exists"), text); err_text = g_strdup_printf (_("File '%s' already exists"), text);
moo_error_dialog (err_text, NULL, dialog); moo_error_dialog (err_text, nullptr, dialog);
g_free (err_text); g_free (err_text);
g_free (fullname); g_free (fullname);
fullname = NULL; fullname = nullptr;
} }
out: out:
@ -474,9 +474,9 @@ out:
static void static void
file_selector_create_file (MooFileSelector *filesel) file_selector_create_file (MooFileSelector *filesel)
{ {
char *path = NULL, *dir = NULL; char *path = nullptr, *dir = nullptr;
MooEdit *doc; MooEdit *doc;
GList *selected = NULL; GList *selected = nullptr;
MooOpenInfo *info; MooOpenInfo *info;
selected = _moo_file_view_get_filenames (MOO_FILE_VIEW (filesel)); selected = _moo_file_view_get_filenames (MOO_FILE_VIEW (filesel));
@ -491,18 +491,18 @@ file_selector_create_file (MooFileSelector *filesel)
dir = (char*) selected->data; dir = (char*) selected->data;
g_list_free (selected); g_list_free (selected);
selected = NULL; selected = nullptr;
if (!g_file_test (dir, G_FILE_TEST_IS_DIR)) if (!g_file_test (dir, G_FILE_TEST_IS_DIR))
{ {
g_free (dir); g_free (dir);
dir = NULL; dir = nullptr;
} }
} }
if (!dir) if (!dir)
{ {
g_object_get (filesel, "current-directory", &dir, NULL); g_object_get (filesel, "current-directory", &dir, nullptr);
if (!dir) if (!dir)
goto out; goto out;
@ -513,18 +513,18 @@ file_selector_create_file (MooFileSelector *filesel)
if (!path) if (!path)
goto out; goto out;
info = moo_open_info_new (path, NULL, -1, MOO_OPEN_FLAGS_NONE); info = moo_open_info_new (path, nullptr, -1, MOO_OPEN_FLAGS_NONE);
doc = moo_editor_new_file (moo_edit_window_get_editor (filesel->window), doc = moo_editor_new_file (moo_edit_window_get_editor (filesel->window),
info, GTK_WIDGET (filesel), NULL); info, GTK_WIDGET (filesel), nullptr);
g_object_unref (info); g_object_unref (info);
if (doc) if (doc)
moo_edit_save (doc, NULL); moo_edit_save (doc, nullptr);
out: out:
g_free (path); g_free (path);
g_free (dir); g_free (dir);
g_list_foreach (selected, (GFunc) g_free, NULL); g_list_foreach (selected, (GFunc) g_free, nullptr);
g_list_free (selected); g_list_free (selected);
} }
@ -532,8 +532,8 @@ out:
static void static void
file_selector_open_files (MooFileSelector *filesel) file_selector_open_files (MooFileSelector *filesel)
{ {
GList *selected = NULL; GList *selected = nullptr;
GList *files = NULL; GList *files = nullptr;
selected = _moo_file_view_get_filenames (MOO_FILE_VIEW (filesel)); selected = _moo_file_view_get_filenames (MOO_FILE_VIEW (filesel));
@ -560,7 +560,7 @@ file_selector_open_files (MooFileSelector *filesel)
while (files) while (files)
{ {
moo_editor_open_path (moo_edit_window_get_editor (filesel->window), moo_editor_open_path (moo_edit_window_get_editor (filesel->window),
(const char*) files->data, NULL, -1, filesel->window); (const char*) files->data, nullptr, -1, filesel->window);
g_free (files->data); g_free (files->data);
files = g_list_delete_link (files, files); files = g_list_delete_link (files, files);
} }
@ -570,7 +570,7 @@ static void
notify_show_hidden_files (MooFileSelector *filesel) notify_show_hidden_files (MooFileSelector *filesel)
{ {
gboolean show = FALSE; gboolean show = FALSE;
g_object_get (filesel, "show-hidden-files", &show, NULL); g_object_get (filesel, "show-hidden-files", &show, nullptr);
moo_prefs_set_bool (PREFS_HIDDEN_FILES, show); moo_prefs_set_bool (PREFS_HIDDEN_FILES, show);
} }
@ -596,14 +596,14 @@ moo_file_selector_constructor (GType type,
filesel = MOO_FILE_SELECTOR (object); filesel = MOO_FILE_SELECTOR (object);
fileview = MOO_FILE_VIEW (object); fileview = MOO_FILE_VIEW (object);
g_return_val_if_fail (filesel->window != NULL, object); g_return_val_if_fail (filesel->window != nullptr, object);
file_selector_go_home (MOO_FILE_VIEW (fileview)); file_selector_go_home (MOO_FILE_VIEW (fileview));
g_object_set (fileview, "show-hidden-files", moo_prefs_get_bool (PREFS_HIDDEN_FILES), NULL); g_object_set (fileview, "show-hidden-files", moo_prefs_get_bool (PREFS_HIDDEN_FILES), nullptr);
g_signal_connect (fileview, "notify::show-hidden-files", G_CALLBACK (notify_show_hidden_files), NULL); g_signal_connect (fileview, "notify::show-hidden-files", G_CALLBACK (notify_show_hidden_files), nullptr);
group = moo_action_collection_get_group (moo_file_view_get_actions (MOO_FILE_VIEW (fileview)), NULL); group = moo_action_collection_get_group (moo_file_view_get_actions (MOO_FILE_VIEW (fileview)), nullptr);
xml = moo_file_view_get_ui_xml (MOO_FILE_VIEW (fileview)); xml = moo_file_view_get_ui_xml (MOO_FILE_VIEW (fileview));
merge_id = moo_ui_xml_new_merge_id (xml); merge_id = moo_ui_xml_new_merge_id (xml);
@ -612,7 +612,7 @@ moo_file_selector_constructor (GType type,
"tooltip", _("Go to current document directory"), "tooltip", _("Go to current document directory"),
"closure-object", fileview, "closure-object", fileview,
"closure-signal", "goto-current-doc-dir", "closure-signal", "goto-current-doc-dir",
NULL); nullptr);
moo_ui_xml_insert_markup (xml, merge_id, moo_ui_xml_insert_markup (xml, merge_id,
"MooFileView/Toolbar", -1, "MooFileView/Toolbar", -1,
"<item action=\"GoToCurrentDocDir\"/>"); "<item action=\"GoToCurrentDocDir\"/>");
@ -626,14 +626,14 @@ moo_file_selector_constructor (GType type,
"stock-id", GTK_STOCK_NEW, "stock-id", GTK_STOCK_NEW,
"closure-object", filesel, "closure-object", filesel,
"closure-callback", file_selector_create_file, "closure-callback", file_selector_create_file,
NULL); nullptr);
moo_action_group_add_action (group, "Open", moo_action_group_add_action (group, "Open",
"label", GTK_STOCK_OPEN, "label", GTK_STOCK_OPEN,
"tooltip", GTK_STOCK_OPEN, "tooltip", GTK_STOCK_OPEN,
"stock-id", GTK_STOCK_OPEN, "stock-id", GTK_STOCK_OPEN,
"closure-object", filesel, "closure-object", filesel,
"closure-callback", file_selector_open_files, "closure-callback", file_selector_open_files,
NULL); nullptr);
moo_ui_xml_insert_markup_before (xml, merge_id, moo_ui_xml_insert_markup_before (xml, merge_id,
"MooFileView/Menu", "MooFileView/Menu",
"NewFolder", "NewFolder",
@ -644,14 +644,14 @@ moo_file_selector_constructor (GType type,
"<item action=\"Open\"/>"); "<item action=\"Open\"/>");
label = moo_pane_label_new (MOO_STOCK_FILE_SELECTOR, label = moo_pane_label_new (MOO_STOCK_FILE_SELECTOR,
NULL, _("File Selector"), nullptr, _("File Selector"),
_("File Selector")); _("File Selector"));
moo_edit_window_add_pane (filesel->window, MOO_FILE_SELECTOR_PLUGIN_ID, moo_edit_window_add_pane (filesel->window, MOO_FILE_SELECTOR_PLUGIN_ID,
GTK_WIDGET (filesel), label, MOO_PANE_POS_RIGHT); GTK_WIDGET (filesel), label, MOO_PANE_POS_RIGHT);
moo_pane_label_free (label); moo_pane_label_free (label);
pane = moo_big_paned_find_pane (filesel->window->paned, pane = moo_big_paned_find_pane (filesel->window->paned,
GTK_WIDGET (filesel), NULL); GTK_WIDGET (filesel), nullptr);
moo_pane_set_drag_dest (pane); moo_pane_set_drag_dest (pane);
return object; return object;
@ -773,12 +773,12 @@ save_as_dialog (GtkWidget *parent,
gboolean ask_name, gboolean ask_name,
const char *title) const char *title)
{ {
SaveAsDialogXml *xml = NULL; SaveAsDialogXml *xml = nullptr;
GtkWidget *dialog = NULL; GtkWidget *dialog = nullptr;
GtkEntry *entry = NULL; GtkEntry *entry = nullptr;
char *fullname = NULL; char *fullname = nullptr;
g_return_val_if_fail (dirname != NULL, NULL); g_return_val_if_fail (dirname != nullptr, nullptr);
while (TRUE) while (TRUE)
{ {
@ -811,7 +811,7 @@ save_as_dialog (GtkWidget *parent,
} }
/* XXX error checking, you know */ /* XXX error checking, you know */
name = g_filename_from_utf8 (text, -1, NULL, NULL, NULL); name = g_filename_from_utf8 (text, -1, nullptr, nullptr, nullptr);
if (!name) if (!name)
{ {
@ -826,7 +826,7 @@ save_as_dialog (GtkWidget *parent,
continue; continue;
} }
fullname = g_build_filename (dirname, name, NULL); fullname = g_build_filename (dirname, name, nullptr);
g_free (name); g_free (name);
if (!g_file_test (fullname, G_FILE_TEST_EXISTS)) if (!g_file_test (fullname, G_FILE_TEST_EXISTS))
@ -842,7 +842,7 @@ save_as_dialog (GtkWidget *parent,
g_free (display_dirname); g_free (display_dirname);
g_free (fullname); g_free (fullname);
fullname = NULL; fullname = nullptr;
} }
out: out:
@ -858,7 +858,7 @@ moo_file_selector_select_path (MooFileSelector *filesel,
{ {
char *basename; char *basename;
g_return_if_fail (filename != NULL); g_return_if_fail (filename != nullptr);
basename = g_path_get_basename (filename); basename = g_path_get_basename (filename);
_moo_file_view_select_name (MOO_FILE_VIEW (filesel), basename); _moo_file_view_select_name (MOO_FILE_VIEW (filesel), basename);
@ -882,8 +882,8 @@ save_as_path (MooEdit *doc,
{ {
MooSaveInfo *info; MooSaveInfo *info;
gboolean result; gboolean result;
info = moo_save_info_new (path, NULL); info = moo_save_info_new (path, nullptr);
result = moo_edit_save_as (doc, info, NULL); result = moo_edit_save_as (doc, info, nullptr);
g_object_unref (info); g_object_unref (info);
return result; return result;
} }
@ -953,8 +953,8 @@ doc_save_copy (MooFileSelector *filesel,
if (filename) if (filename)
{ {
MooSaveInfo *info = moo_save_info_new (filename, NULL); MooSaveInfo *info = moo_save_info_new (filename, nullptr);
if (moo_edit_save_copy (doc, info, NULL)) if (moo_edit_save_copy (doc, info, nullptr))
moo_file_selector_select_path (filesel, filename); moo_file_selector_select_path (filesel, filename);
g_object_unref (info); g_object_unref (info);
g_free (filename); g_free (filename);
@ -971,7 +971,7 @@ doc_move (MooFileSelector *filesel,
char *filename; char *filename;
old_file = moo_edit_get_file (doc); old_file = moo_edit_get_file (doc);
g_return_if_fail (old_file != NULL); g_return_if_fail (old_file != nullptr);
filename = save_as_dialog (GTK_WIDGET (filesel), destdir, filename = save_as_dialog (GTK_WIDGET (filesel), destdir,
moo_edit_get_display_basename (doc), moo_edit_get_display_basename (doc),
@ -981,7 +981,7 @@ doc_move (MooFileSelector *filesel,
{ {
if (save_as_path (doc, filename)) if (save_as_path (doc, filename))
{ {
g_file_delete (old_file, NULL, NULL); g_file_delete (old_file, nullptr, nullptr);
moo_file_selector_select_path (filesel, filename); moo_file_selector_select_path (filesel, filename);
} }
@ -1014,7 +1014,7 @@ drop_item_activated (GObject *item,
doc = (MooEdit*) g_object_get_data (item, "moo-file-selector-drop-doc"); doc = (MooEdit*) g_object_get_data (item, "moo-file-selector-drop-doc");
destdir = (char*) g_object_get_data (item, "moo-file-selector-drop-destdir"); destdir = (char*) g_object_get_data (item, "moo-file-selector-drop-destdir");
alternate = GPOINTER_TO_INT (g_object_get_data (item, "moo-menu-item-alternate")); alternate = GPOINTER_TO_INT (g_object_get_data (item, "moo-menu-item-alternate"));
g_return_if_fail (doc != NULL && destdir != NULL); g_return_if_fail (doc != nullptr && destdir != nullptr);
action = (DropDocAction) GPOINTER_TO_INT (data); action = (DropDocAction) GPOINTER_TO_INT (data);
@ -1086,7 +1086,7 @@ alternate_toggled (GtkWidget *menu)
items = (GSList*) g_object_get_data (G_OBJECT (menu), "moo-menu-items"); items = (GSList*) g_object_get_data (G_OBJECT (menu), "moo-menu-items");
for (l = items; l != NULL; l = l->next) for (l = items; l != nullptr; l = l->next)
{ {
GtkWidget *item = (GtkWidget*) l->data; GtkWidget *item = (GtkWidget*) l->data;
const char *label; const char *label;
@ -1108,10 +1108,10 @@ create_drop_doc_menu (MooFileSelector *filesel,
const char *destdir) const char *destdir)
{ {
GtkWidget *menu, *item; GtkWidget *menu, *item;
GSList *items = NULL; GSList *items = nullptr;
menu = moo_menu_new (); menu = moo_menu_new ();
g_signal_connect (menu, "alternate-toggled", G_CALLBACK (alternate_toggled), NULL); g_signal_connect (menu, "alternate-toggled", G_CALLBACK (alternate_toggled), nullptr);
item = create_menu_item (filesel, doc, destdir, item = create_menu_item (filesel, doc, destdir,
MOO_STOCK_FILE_MOVE, MOO_STOCK_FILE_MOVE,
@ -1147,7 +1147,7 @@ create_drop_doc_menu (MooFileSelector *filesel,
gtk_widget_show (item); gtk_widget_show (item);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CANCEL, NULL); item = gtk_image_menu_item_new_from_stock (GTK_STOCK_CANCEL, nullptr);
gtk_widget_show (item); gtk_widget_show (item);
_moo_menu_item_set_accel_label (item, "Escape"); _moo_menu_item_set_accel_label (item, "Escape");
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
@ -1170,7 +1170,7 @@ moo_file_selector_drop_doc (MooFileSelector *filesel,
DropDocAction action; DropDocAction action;
g_return_if_fail (MOO_IS_EDIT (doc)); g_return_if_fail (MOO_IS_EDIT (doc));
g_return_if_fail (destdir != NULL); g_return_if_fail (destdir != nullptr);
g_return_if_fail (GTK_IS_WIDGET (widget)); g_return_if_fail (GTK_IS_WIDGET (widget));
if (moo_edit_is_untitled (doc)) if (moo_edit_is_untitled (doc))
@ -1197,7 +1197,7 @@ moo_file_selector_drop_doc (MooFileSelector *filesel,
GtkWidget *menu = create_drop_doc_menu (filesel, doc, destdir); GtkWidget *menu = create_drop_doc_menu (filesel, doc, destdir);
g_object_ref_sink (menu); g_object_ref_sink (menu);
_moo_file_view_drag_finish (MOO_FILE_VIEW (filesel), context, TRUE, FALSE, time); _moo_file_view_drag_finish (MOO_FILE_VIEW (filesel), context, TRUE, FALSE, time);
gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL, 0, 0); gtk_menu_popup (GTK_MENU (menu), nullptr, nullptr, nullptr, nullptr, 0, 0);
g_object_unref (menu); g_object_unref (menu);
return; return;
} }
@ -1228,7 +1228,7 @@ moo_file_selector_drop_doc (MooFileSelector *filesel,
static gboolean static gboolean
file_selector_plugin_init (G_GNUC_UNUSED Plugin *plugin) file_selector_plugin_init (G_GNUC_UNUSED Plugin *plugin)
{ {
moo_prefs_create_key (PREFS_LAST_DIR, MOO_PREFS_STATE, G_TYPE_STRING, NULL); moo_prefs_create_key (PREFS_LAST_DIR, MOO_PREFS_STATE, G_TYPE_STRING, nullptr);
moo_prefs_create_key (PREFS_HIDDEN_FILES, MOO_PREFS_RC, G_TYPE_BOOLEAN, FALSE); moo_prefs_create_key (PREFS_HIDDEN_FILES, MOO_PREFS_RC, G_TYPE_BOOLEAN, FALSE);
return TRUE; return TRUE;
} }
@ -1239,7 +1239,7 @@ file_selector_plugin_deinit (Plugin *plugin)
{ {
if (plugin->bookmark_mgr) if (plugin->bookmark_mgr)
g_object_unref (plugin->bookmark_mgr); g_object_unref (plugin->bookmark_mgr);
plugin->bookmark_mgr = NULL; plugin->bookmark_mgr = nullptr;
} }
@ -1258,7 +1258,7 @@ file_selector_plugin_attach (MooPlugin *mplugin,
g_object_new (MOO_TYPE_FILE_SELECTOR, g_object_new (MOO_TYPE_FILE_SELECTOR,
"bookmark-mgr", plugin->bookmark_mgr, "bookmark-mgr", plugin->bookmark_mgr,
"window", window, "window", window,
(const char*) NULL)); (const char*) nullptr));
plugin->instances = g_slist_prepend (plugin->instances, filesel); plugin->instances = g_slist_prepend (plugin->instances, filesel);
} }
@ -1271,7 +1271,7 @@ file_selector_plugin_detach (MooPlugin *mplugin,
Plugin *plugin = FILE_SELECTOR_PLUGIN (mplugin); Plugin *plugin = FILE_SELECTOR_PLUGIN (mplugin);
GtkWidget *filesel = moo_edit_window_get_pane (window, MOO_FILE_SELECTOR_PLUGIN_ID); GtkWidget *filesel = moo_edit_window_get_pane (window, MOO_FILE_SELECTOR_PLUGIN_ID);
g_return_if_fail (filesel != NULL); g_return_if_fail (filesel != nullptr);
plugin->instances = g_slist_remove (plugin->instances, filesel); plugin->instances = g_slist_remove (plugin->instances, filesel);
moo_edit_window_remove_pane (window, MOO_FILE_SELECTOR_PLUGIN_ID); moo_edit_window_remove_pane (window, MOO_FILE_SELECTOR_PLUGIN_ID);
@ -1282,7 +1282,7 @@ void
_moo_file_selector_update_tools (MooPlugin *plugin) _moo_file_selector_update_tools (MooPlugin *plugin)
{ {
GSList *l; GSList *l;
for (l = ((Plugin*)plugin)->instances; l != NULL; l = l->next) for (l = ((Plugin*)plugin)->instances; l != nullptr; l = l->next)
_moo_file_view_tools_load ((MooFileView*) l->data); _moo_file_view_tools_load ((MooFileView*) l->data);
} }
@ -1294,7 +1294,7 @@ MOO_PLUGIN_DEFINE_INFO (file_selector,
MOO_VERSION) MOO_VERSION)
MOO_PLUGIN_DEFINE (FileSelector, file_selector, MOO_PLUGIN_DEFINE (FileSelector, file_selector,
file_selector_plugin_attach, file_selector_plugin_detach, file_selector_plugin_attach, file_selector_plugin_detach,
NULL, NULL, nullptr, nullptr,
_moo_file_selector_prefs_page, _moo_file_selector_prefs_page,
0, 0) 0, 0)
@ -1304,7 +1304,7 @@ get_widget_meth (G_GNUC_UNUSED gpointer plugin,
MooEditWindow *window) MooEditWindow *window)
{ {
gpointer widget = moo_edit_window_get_pane (window, MOO_FILE_SELECTOR_PLUGIN_ID); gpointer widget = moo_edit_window_get_pane (window, MOO_FILE_SELECTOR_PLUGIN_ID);
return widget ? g_object_ref (widget) : NULL; return widget ? g_object_ref (widget) : nullptr;
} }
@ -1316,7 +1316,7 @@ _moo_file_selector_plugin_init (void)
if (!moo_plugin_register (MOO_FILE_SELECTOR_PLUGIN_ID, if (!moo_plugin_register (MOO_FILE_SELECTOR_PLUGIN_ID,
ptype, ptype,
&file_selector_plugin_info, &file_selector_plugin_info,
NULL)) nullptr))
return FALSE; return FALSE;
moo_plugin_method_new ("get-widget", ptype, moo_plugin_method_new ("get-widget", ptype,

8
moo/plugins/moofind.cpp
View File

@ -206,7 +206,7 @@ ensure_output (WindowStuff *stuff)
"foreground", "#008040", NULL); "foreground", "#008040", NULL);
stuff->error_tag = stuff->error_tag =
moo_text_view_lookup_tag (MOO_TEXT_VIEW (stuff->output), "error"); moo_text_view_lookup_tag (MOO_TEXT_VIEW (stuff->output), "error");
g_object_set (stuff->error_tag, "foreground", "#C00000", NULL); g_object_set (stuff->error_tag, "foreground", "#C00000", nullptr);
stuff->message_tag = stuff->message_tag =
moo_text_view_lookup_tag (MOO_TEXT_VIEW (stuff->output), "message"); moo_text_view_lookup_tag (MOO_TEXT_VIEW (stuff->output), "message");
@ -255,7 +255,7 @@ find_plugin_init (FindPlugin *plugin)
"default-accel", MOO_EDIT_ACCEL_FIND_IN_FILES, "default-accel", MOO_EDIT_ACCEL_FIND_IN_FILES,
"stock-id", MOO_STOCK_FIND_IN_FILES, "stock-id", MOO_STOCK_FIND_IN_FILES,
"closure-callback", find_in_files_cb, "closure-callback", find_in_files_cb,
NULL); nullptr);
#ifndef __WIN32__ #ifndef __WIN32__
moo_window_class_new_action (klass, "FindFile", NULL, moo_window_class_new_action (klass, "FindFile", NULL,
@ -264,7 +264,7 @@ find_plugin_init (FindPlugin *plugin)
"tooltip", _("Find file"), "tooltip", _("Find file"),
"stock-id", MOO_STOCK_FIND_FILE, "stock-id", MOO_STOCK_FIND_FILE,
"closure-callback", find_file_cb, "closure-callback", find_file_cb,
NULL); nullptr);
#endif #endif
if (xml) if (xml)
@ -321,7 +321,7 @@ setup_file_combo (MooHistoryCombo *hist_combo)
GtkWidget *entry; GtkWidget *entry;
MooFileEntryCompletion *completion; MooFileEntryCompletion *completion;
g_object_set (hist_combo, "enable-completion", FALSE, NULL); g_object_set (hist_combo, "enable-completion", FALSE, nullptr);
entry = MOO_COMBO (hist_combo)->entry; entry = MOO_COMBO (hist_combo)->entry;
completion = MOO_FILE_ENTRY_COMPLETION ( completion = MOO_FILE_ENTRY_COMPLETION (

4
moo/plugins/support/moocmdview.cpp
View File

@ -181,8 +181,8 @@ moo_cmd_view_constructor (GType type,
view->priv->stdout_tag = gtk_text_buffer_create_tag (buffer, "stdout", NULL); view->priv->stdout_tag = gtk_text_buffer_create_tag (buffer, "stdout", NULL);
view->priv->stderr_tag = gtk_text_buffer_create_tag (buffer, "stderr", NULL); view->priv->stderr_tag = gtk_text_buffer_create_tag (buffer, "stderr", NULL);
g_object_set (view->priv->error_tag, "foreground", "red", NULL); g_object_set (view->priv->error_tag, "foreground", "red", nullptr);
g_object_set (view->priv->stderr_tag, "foreground", "red", NULL); g_object_set (view->priv->stderr_tag, "foreground", "red", nullptr);
return object; return object;
} }

7
moo/plugins/support/moocmdview.h
View File

@ -36,13 +36,16 @@ G_BEGIN_DECLS
typedef struct _MooCmdViewPrivate MooCmdViewPrivate; typedef struct _MooCmdViewPrivate MooCmdViewPrivate;
struct MooCmdView : public MooLineView struct MooCmdView
{ {
MooLineView parent;
MooCmdViewPrivate *priv; MooCmdViewPrivate *priv;
}; };
struct MooCmdViewClass : public MooLineViewClass struct MooCmdViewClass
{ {
MooLineViewClass parent_class;
void (*job_started) (MooCmdView *view, void (*job_started) (MooCmdView *view,
const char *job_name); const char *job_name);
void (*job_finished)(MooCmdView *view); void (*job_finished)(MooCmdView *view);

8
moo/plugins/support/moolineview.cpp
View File

@ -138,7 +138,7 @@ moo_line_view_init (MooLineView *view)
"cursor-visible", FALSE, "cursor-visible", FALSE,
"current-line-color", "grey", "current-line-color", "grey",
"highlight-matching-brackets", FALSE, "highlight-matching-brackets", FALSE,
NULL); nullptr);
} }
@ -527,7 +527,7 @@ check_if_scrolled (MooLineView *view)
if (view->priv->hscrollbar && GTK_WIDGET_VISIBLE (view->priv->hscrollbar)) if (view->priv->hscrollbar && GTK_WIDGET_VISIBLE (view->priv->hscrollbar))
{ {
int space; int space;
gtk_widget_style_get (GTK_WIDGET (view)->parent, "scrollbar-spacing", &space, NULL); gtk_widget_style_get (GTK_WIDGET (view)->parent, "scrollbar-spacing", &space, nullptr);
delta = MAX (delta - 1, space + view->priv->hscrollbar->allocation.height) + 1; delta = MAX (delta - 1, space + view->priv->hscrollbar->allocation.height) + 1;
} }
@ -578,14 +578,14 @@ moo_line_view_write (MooLineView *view,
if (g_utf8_validate (text, len, NULL)) if (g_utf8_validate (text, len, NULL))
{ {
gtk_text_buffer_insert_with_tags (buffer, &iter, text, len, tag, NULL); gtk_text_buffer_insert_with_tags (buffer, &iter, text, len, tag, nullptr);
} }
else else
{ {
char *text_utf8 = g_locale_to_utf8 (text, len, NULL, NULL, NULL); char *text_utf8 = g_locale_to_utf8 (text, len, NULL, NULL, NULL);
if (text_utf8) if (text_utf8)
gtk_text_buffer_insert_with_tags (buffer, &iter, text_utf8, -1, tag, NULL); gtk_text_buffer_insert_with_tags (buffer, &iter, text_utf8, -1, tag, nullptr);
else else
g_warning ("could not convert '%s' to utf8", text); g_warning ("could not convert '%s' to utf8", text);

7
moo/plugins/support/moolineview.h
View File

@ -32,13 +32,16 @@ G_BEGIN_DECLS
typedef struct _MooLineViewPrivate MooLineViewPrivate; typedef struct _MooLineViewPrivate MooLineViewPrivate;
struct MooLineView : public MooTextView struct MooLineView
{ {
MooTextView parent;
MooLineViewPrivate *priv; MooLineViewPrivate *priv;
}; };
struct MooLineViewClass : public MooTextViewClass struct MooLineViewClass
{ {
MooTextViewClass parent_class;
void (*activate) (MooLineView *view, void (*activate) (MooLineView *view,
int line); int line);
}; };

2
moo/plugins/support/moooutputfilter.cpp
View File

@ -368,7 +368,7 @@ find_file_in_dirs (const char *filename,
{ {
for ( ; dirs && *dirs; ++dirs) for ( ; dirs && *dirs; ++dirs)
{ {
char *path = g_build_filename (*dirs, filename, NULL); char *path = g_build_filename (*dirs, filename, nullptr);
if (g_file_test (path, G_FILE_TEST_EXISTS)) if (g_file_test (path, G_FILE_TEST_EXISTS))
return path; return path;
g_free (path); g_free (path);

7
moo/plugins/support/moooutputfilter.h
View File

@ -39,13 +39,16 @@ struct _MooFileLineData {
int character; int character;
}; };
struct MooOutputFilter : public GObject struct MooOutputFilter
{ {
GObject parent;
MooOutputFilterPrivate *priv; MooOutputFilterPrivate *priv;
}; };
struct MooOutputFilterClass : public GObjectClass struct MooOutputFilterClass
{ {
GObjectClass parent_class;
void (*attach) (MooOutputFilter *filter); void (*attach) (MooOutputFilter *filter);
void (*detach) (MooOutputFilter *filter); void (*detach) (MooOutputFilter *filter);

4
moo/plugins/usertools/moocommand-exe.cpp
View File

@ -957,7 +957,7 @@ init_combo (GtkComboBox *combo,
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell, "text", 0, NULL); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell, "text", 0, nullptr);
store = gtk_list_store_new (1, G_TYPE_STRING); store = gtk_list_store_new (1, G_TYPE_STRING);
@ -984,7 +984,7 @@ init_filter_combo (GtkComboBox *combo)
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell, gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), cell,
"text", COLUMN_NAME, NULL); "text", COLUMN_NAME, nullptr);
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);

2
moo/plugins/usertools/moocommanddisplay.cpp
View File

@ -223,7 +223,7 @@ init_factory_combo (MooCommandDisplay *display,
cell = gtk_cell_renderer_text_new (); cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (display->factory_combo), cell, TRUE); gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (display->factory_combo), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (display->factory_combo), cell, "text", 0, NULL); gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (display->factory_combo), cell, "text", 0, nullptr);
store = gtk_list_store_new (1, G_TYPE_STRING); store = gtk_list_store_new (1, G_TYPE_STRING);

4
moo/plugins/usertools/moooutputfilterregex.cpp
View File

@ -184,7 +184,7 @@ find_file_in_dir (const char *file,
if (!file || !dir) if (!file || !dir)
return NULL; return NULL;
path = g_build_filename (dir, file, NULL); path = g_build_filename (dir, file, nullptr);
if (g_file_test (path, G_FILE_TEST_EXISTS)) if (g_file_test (path, G_FILE_TEST_EXISTS))
return path; return path;
@ -401,7 +401,7 @@ get_tag (MooLineView *view,
_moo_text_style_apply_to_tag (style, tag); _moo_text_style_apply_to_tag (style, tag);
else if (type == OUTPUT_STDERR || !strcmp (name, "output-error") || else if (type == OUTPUT_STDERR || !strcmp (name, "output-error") ||
!strcmp (name, "output-stderr")) !strcmp (name, "output-stderr"))
g_object_set (tag, "foreground", "red", NULL); g_object_set (tag, "foreground", "red", nullptr);
} }
return tag; return tag;

4
moo/plugins/usertools/moousertools-prefs.cpp
View File

@ -404,7 +404,7 @@ name_data_func (G_GNUC_UNUSED GtkTreeViewColumn *column,
gtk_tree_model_get (model, iter, COLUMN_INFO, &info, -1); gtk_tree_model_get (model, iter, COLUMN_INFO, &info, -1);
g_return_if_fail (info != NULL); g_return_if_fail (info != NULL);
g_object_set (cell, "text", info->name, NULL); g_object_set (cell, "text", info->name, nullptr);
_moo_user_tool_info_unref (info); _moo_user_tool_info_unref (info);
} }
@ -466,7 +466,7 @@ command_page_init (MooPrefsPage *page,
(GtkTreeCellDataFunc) name_data_func, (GtkTreeCellDataFunc) name_data_func,
NULL, NULL); NULL, NULL);
gtk_tree_view_append_column (gxml->treeview, column); gtk_tree_view_append_column (gxml->treeview, column);
g_object_set (cell, "editable", TRUE, NULL); g_object_set (cell, "editable", TRUE, nullptr);
g_signal_connect_swapped (cell, "edited", G_CALLBACK (name_cell_edited), page); g_signal_connect_swapped (cell, "edited", G_CALLBACK (name_cell_edited), page);
populate_store (store, type); populate_store (store, type);

8
moo/plugins/usertools/moousertools.cpp
View File

@ -399,7 +399,7 @@ load_tool (MooUserToolInfo *info)
"label", label, "label", label,
"default-accel", info->accel, "default-accel", info->accel,
"command", cmd, "command", cmd,
NULL); nullptr);
moo_edit_window_set_action_check (info->id, MOO_ACTION_CHECK_SENSITIVE, moo_edit_window_set_action_check (info->id, MOO_ACTION_CHECK_SENSITIVE,
check_sensitive_func, check_sensitive_func,
@ -417,7 +417,7 @@ load_tool (MooUserToolInfo *info)
"default-accel", info->accel, "default-accel", info->accel,
"command", cmd, "command", cmd,
"file-filter", info->filter, "file-filter", info->filter,
NULL); nullptr);
break; break;
} }
@ -639,7 +639,7 @@ load_directory (const char *path,
{ {
char *filename; char *filename;
filename = g_build_filename (path, names->pdata[i], NULL); filename = g_build_filename (path, names->pdata[i], nullptr);
load_file (filename, (const char*) names->pdata[i], type, list, ids); load_file (filename, (const char*) names->pdata[i], type, list, ids);
g_free (filename); g_free (filename);
@ -1321,7 +1321,7 @@ moo_tool_action_check_state (MooEditAction *edit_action)
doc = moo_edit_action_get_doc (edit_action); doc = moo_edit_action_get_doc (edit_action);
sensitive = moo_command_check_sensitive (action->cmd, doc); sensitive = moo_command_check_sensitive (action->cmd, doc);
g_object_set (action, "sensitive", sensitive, NULL); g_object_set (action, "sensitive", sensitive, nullptr);
} }