Changeset 4efa5ce

Timestamp:

2011-12-18T20:44:11Z (13 years ago)

Author:

Alex Miller <millerdevel@…>

Branches:

master

Children:

c1a58cc

Parents:

17f057d

Message:

Don't use the C++ keyword 'new' as a variable name.

Files:

• irc.h (modified) (3 diffs)
• protocols/bee.h (modified) (1 diff)

irc.h

@@ -182 +182 @@
         gboolean (*join)( irc_channel_t *ic );
         gboolean (*part)( irc_channel_t *ic, const char *msg );
-        gboolean (*topic)( irc_channel_t *ic, const char *new );
+        gboolean (*topic)( irc_channel_t *ic, const char *new_topic );
         gboolean (*invite)( irc_channel_t *ic, irc_user_t *iu );
         
@@ -332 +332 @@
 void irc_send_msg_raw( irc_user_t *iu, const char *type, const char *dst, const char *msg );
 void irc_send_msg_f( irc_user_t *iu, const char *type, const char *dst, const char *format, ... ) G_GNUC_PRINTF( 4, 5 );
-void irc_send_nick( irc_user_t *iu, const char *new );
+void irc_send_nick( irc_user_t *iu, const char *new_nick );
 void irc_send_channel_user_mode_diff( irc_channel_t *ic, irc_user_t *iu,
-                                      irc_channel_user_flags_t old, irc_channel_user_flags_t new );
+                                      irc_channel_user_flags_t old_flags, irc_channel_user_flags_t new_flags );
 void irc_send_invite( irc_user_t *iu, irc_channel_t *ic );
 
@@ -341 +341 @@
 int irc_user_free( irc_t *irc, irc_user_t *iu );
 irc_user_t *irc_user_by_name( irc_t *irc, const char *nick );
-int irc_user_set_nick( irc_user_t *iu, const char *new );
+int irc_user_set_nick( irc_user_t *iu, const char *new_nick );
 gint irc_user_cmp( gconstpointer a_, gconstpointer b_ );
 const char *irc_user_get_away( irc_user_t *iu );

protocols/bee.h

@@ -123 +123 @@
         gboolean (*chat_add_user)( bee_t *bee, struct groupchat *c, bee_user_t *bu );
         gboolean (*chat_remove_user)( bee_t *bee, struct groupchat *c, bee_user_t *bu );
-        gboolean (*chat_topic)( bee_t *bee, struct groupchat *c, const char *new, bee_user_t *bu );
+        gboolean (*chat_topic)( bee_t *bee, struct groupchat *c, const char *new_topic, bee_user_t *bu );
         gboolean (*chat_name_hint)( bee_t *bee, struct groupchat *c, const char *name );
         gboolean (*chat_invite)( bee_t *bee, bee_user_t *bu, const char *name, const char *msg );