[Xfce4-commits] [apps/parole] 01/02: cpplint: Fix false positive, Add #include <string> for string [build/include_what_you_use] [4]

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/parole.

commit 97a9009cc755ca694c0930a5b1e1284df5db7b3e
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Wed May 31 06:31:31 2017 -0400

    cpplint: Fix false positive, Add #include <string> for string  [build/include_what_you_use] [4]
---
 src/misc/parole-pl-parser.c | 6 +++---
 src/parole-conf.c           | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/misc/parole-pl-parser.c b/src/misc/parole-pl-parser.c
index 6c6eeb6..84f086b 100644
--- a/src/misc/parole-pl-parser.c
+++ b/src/misc/parole-pl-parser.c
@@ -58,7 +58,7 @@ typedef struct {
     gchar    *title;
 } ParoleParserData;
 
-gchar *g_substr(const gchar* string, gint start, gint end);
+gchar *g_substr(const gchar* str, gint start, gint end);
 
 static gchar*
 parole_filename_to_utf8(const gchar* filename) {
@@ -277,10 +277,10 @@ out:
 }
 
 gchar *
-g_substr(const gchar* string, gint start, gint end) {
+g_substr(const gchar* str, gint start, gint end) {
     gsize len = (end - start + 1);
     gchar *output = g_malloc0(len + 1);
-    return g_utf8_strncpy (output, &string[start], len);
+    return g_utf8_strncpy (output, &str[start], len);
 }
 
 static GSList *
diff --git a/src/parole-conf.c b/src/parole-conf.c
index 6f1be3f..57c9e47 100644
--- a/src/parole-conf.c
+++ b/src/parole-conf.c
@@ -900,7 +900,7 @@ parole_conf_load_rc_file(ParoleConf *conf) {
     GParamSpec   *pspec;
     XfceRc       *rc;
     guint         nspecs, n;
-    const gchar  *string;
+    const gchar  *str;
     GValue        dst = { 0, };
     GValue        src = { 0, };
     gchar         prop_name[64];
@@ -929,8 +929,8 @@ parole_conf_load_rc_file(ParoleConf *conf) {
             continue;
 
         /* read the value from the rc file */
-        string = xfce_rc_read_entry(rc, nick, NULL);
-        if (G_UNLIKELY (string == NULL))
+        str = xfce_rc_read_entry(rc, nick, NULL);
+        if (G_UNLIKELY (str == NULL))
             continue;
 
         /* xfconf property name, continue if exists */
@@ -940,7 +940,7 @@ parole_conf_load_rc_file(ParoleConf *conf) {
 
         /* source property */
         g_value_init(&src, G_TYPE_STRING);
-        g_value_set_static_string(&src, string);
+        g_value_set_static_string(&src, str);
 
         /* store string and enums directly */
         if (G_IS_PARAM_SPEC_STRING(pspec) || G_IS_PARAM_SPEC_ENUM(pspec)) {

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.