callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkTextView: various code clean-ups

Browse Source 
- only one blank line is enough to separate code sections.
- the 'signals' variable was in the middle of function prototypes.
- compare pointers to NULL in some conditions ("if(blah) should be used
  only if blah is a boolean variable). It makes the code clearer.
- various other things.
This commit is contained in:
Sébastien Wilmet
2014-08-15 20:54:01 +02:00
parent 7bc819e88d
commit f39d211021
2 changed files with 47 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
gtk/gtktextbuffer.c
View File

@ -40,7 +40,6 @@
#include "gtkprivate.h"
#include "gtkintl.h"
/**
* SECTION:gtktextbuffer
* @Short_description: Stores attributed text for display in a GtkTextView
@ -53,7 +52,6 @@
* types related to the text widget and how they work together.
*/
typedef struct _GtkTextLogAttrCache GtkTextLogAttrCache;
struct _GtkTextBufferPrivate
@ -81,7 +79,6 @@ struct _GtkTextBufferPrivate
guint has_selection : 1;
};
typedef struct _ClipboardRequest ClipboardRequest;
struct _ClipboardRequest
@ -161,8 +158,6 @@ static GtkTextBuffer *create_clipboard_contents_buffer (GtkTextBuffer *buffer);
static void gtk_text_buffer_free_target_lists (GtkTextBuffer *buffer);
static guint signals[LAST_SIGNAL] = { 0 };
static void gtk_text_buffer_set_property (GObject *object,
guint prop_id,
const GValue *value,
@ -174,6 +169,8 @@ static void gtk_text_buffer_get_property (GObject *object,
static void gtk_text_buffer_notify (GObject *object,
GParamSpec *pspec);
static guint signals[LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_PRIVATE (GtkTextBuffer, gtk_text_buffer, G_TYPE_OBJECT)
static void
@ -3892,7 +3889,6 @@ gtk_text_buffer_backspace (GtkTextBuffer *buffer,
GtkTextIter end;
gboolean retval = FALSE;
const PangoLogAttr *attrs;
int offset;
gboolean backspace_deletes_character;
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
@ -3906,9 +3902,9 @@ gtk_text_buffer_backspace (GtkTextBuffer *buffer,
/* For no good reason, attrs is NULL for the empty last line in
* a buffer. Special case that here. (#156164)
*/
if (attrs)
if (attrs != NULL)
{
offset = gtk_text_iter_get_line_offset (&start);
gint offset = gtk_text_iter_get_line_offset (&start);
backspace_deletes_character = attrs[offset].backspace_deletes_character;
}
else
@ -4289,24 +4285,23 @@ struct _GtkTextLogAttrCache
static void
free_log_attr_cache (GtkTextLogAttrCache *cache)
{
gint i = 0;
while (i < ATTR_CACHE_SIZE)
{
gint i;
for (i = 0; i < ATTR_CACHE_SIZE; i++)
g_free (cache->entries[i].attrs);
++i;
}
g_slice_free (GtkTextLogAttrCache, cache);
}
static void
clear_log_attr_cache (GtkTextLogAttrCache *cache)
{
gint i = 0;
while (i < ATTR_CACHE_SIZE)
gint i;
for (i = 0; i < ATTR_CACHE_SIZE; i++)
{
g_free (cache->entries[i].attrs);
cache->entries[i].attrs = NULL;
++i;
}
}
@ -4332,7 +4327,7 @@ compute_log_attrs (const GtkTextIter *iter,
g_assert (char_len > 0);
if (char_lenp)
if (char_lenp != NULL)
*char_lenp = char_len;
attrs = g_new (PangoLogAttr, char_len + 1);
@ -4352,7 +4347,7 @@ compute_log_attrs (const GtkTextIter *iter,
/* The return value from this is valid until you call this a second time.
*/
const PangoLogAttr*
const PangoLogAttr *
_gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
const GtkTextIter *anywhere_in_line,
gint *char_len)
@ -4371,7 +4366,7 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
if (gtk_text_iter_is_end (anywhere_in_line) &&
gtk_text_iter_get_line_offset (anywhere_in_line) == 0)
{
if (char_len)
if (char_len != NULL)
*char_len = 0;
return NULL;
}
@ -4395,17 +4390,15 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
cache = priv->log_attr_cache;
line = gtk_text_iter_get_line (anywhere_in_line);
i = 0;
while (i < ATTR_CACHE_SIZE)
for (i = 0; i < ATTR_CACHE_SIZE; i++)
{
if (cache->entries[i].attrs &&
if (cache->entries[i].attrs != NULL &&
cache->entries[i].line == line)
{
if (char_len)
if (char_len != NULL)
*char_len = cache->entries[i].char_len;
return cache->entries[i].attrs;
}
++i;
}
/* Not in cache; open up the first cache entry */
@ -4418,7 +4411,7 @@ _gtk_text_buffer_get_line_log_attrs (GtkTextBuffer *buffer,
cache->entries[0].attrs = compute_log_attrs (anywhere_in_line,
&cache->entries[0].char_len);
if (char_len)
if (char_len != NULL)
*char_len = cache->entries[0].char_len;
return cache->entries[0].attrs;

14
gtk/gtktextiter.c
View File

@ -3059,7 +3059,7 @@ test_log_attrs (const GtkTextIter *iter,
{
gint char_len;
const PangoLogAttr *attrs;
int offset;
gint offset;
gboolean result = FALSE;
g_return_val_if_fail (iter != NULL, FALSE);
@ -3073,10 +3073,9 @@ test_log_attrs (const GtkTextIter *iter,
* iter is the end iter and the last line is empty.
*
* offset may be equal to char_len, since attrs contains an entry
* for one past the end
* for one past the end.
*/
if (attrs && offset <= char_len)
if (attrs != NULL && offset <= char_len)
result = (* func) (attrs, offset, 0, char_len);
return result;
@ -3090,7 +3089,7 @@ find_line_log_attrs (const GtkTextIter *iter,
{
gint char_len;
const PangoLogAttr *attrs;
int offset;
gint offset;
gboolean result = FALSE;
g_return_val_if_fail (iter != NULL, FALSE);
@ -3101,10 +3100,9 @@ find_line_log_attrs (const GtkTextIter *iter,
offset = gtk_text_iter_get_line_offset (iter);
/* char_len may be 0 and attrs will be NULL if so, if
* iter is the end iter and the last line is empty
* iter is the end iter and the last line is empty.
*/
if (attrs)
if (attrs != NULL)
result = (* func) (attrs, offset, char_len, found_offset,
already_moved_initially);