SF.net SVN: geany:[2973] trunk

[eht16 at users.sourceforge.net]

Revision: 2973
          http://geany.svn.sourceforge.net/geany/?rev=2973&view=rev
Author:   eht16
Date:     2008-09-18 13:27:10 +0000 (Thu, 18 Sep 2008)

Log Message:
-----------
Rename the new indicator functions and add documentation comment.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/editor.c
    trunk/src/plugins.c
    trunk/src/sciwrappers.c
    trunk/src/sciwrappers.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-09-18 13:25:13 UTC (rev 2972)
+++ trunk/ChangeLog	2008-09-18 13:27:10 UTC (rev 2973)
@@ -4,6 +4,8 @@
    Display also the style of the current position in the status bar
    when debug mode is enabled.
    No need to make the debugging strings translatable in the status bar.
+ * src/editor.c, src/plugins.c, src/sciwrappers.c, src/sciwrappers.h:
+   Rename the new indicator functions and add documentation comment.
 
 
 2008-09-18  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/editor.c
===================================================================
--- trunk/src/editor.c	2008-09-18 13:25:13 UTC (rev 2972)
+++ trunk/src/editor.c	2008-09-18 13:27:10 UTC (rev 2973)
@@ -3270,7 +3270,7 @@
 
 	last_pos = sci_get_length(editor->sci);
 	if (last_pos > 0)
-		sci_indic_clear(editor->sci, 0, last_pos);
+		sci_indicator_clear(editor->sci, 0, last_pos);
 
 	sci_marker_delete_all(editor->sci, 0);	/* remove the yellow error line marker */
 }
@@ -3331,8 +3331,8 @@
 	if (editor == NULL || start >= end)
 		return;
 
-	sci_set_indic(editor->sci, 0);
-	sci_indic_fill(editor->sci, start, end - start);
+	sci_set_indicator(editor->sci, 0);
+	sci_indicator_fill(editor->sci, start, end - start);
 }
 
 

Modified: trunk/src/plugins.c
===================================================================
--- trunk/src/plugins.c	2008-09-18 13:25:13 UTC (rev 2972)
+++ trunk/src/plugins.c	2008-09-18 13:27:10 UTC (rev 2973)
@@ -155,7 +155,7 @@
 	&sci_get_current_line,
 	&sci_has_selection,
 	&sci_get_tab_width,
-	&sci_indic_clear
+	&sci_indicator_clear
 };
 
 static TemplateFuncs template_funcs = {

Modified: trunk/src/sciwrappers.c
===================================================================
--- trunk/src/sciwrappers.c	2008-09-18 13:25:13 UTC (rev 2972)
+++ trunk/src/sciwrappers.c	2008-09-18 13:27:10 UTC (rev 2973)
@@ -1010,22 +1010,26 @@
 	SSM(sci, SCI_STARTSTYLING, pos, mask);
 }
 
-gint sci_get_indic(ScintillaObject *sci)
+gint sci_get_indicator(ScintillaObject *sci)
 {
 	return SSM(sci, SCI_GETINDICATORCURRENT, 0, 0);
 }
 
-void sci_set_indic(ScintillaObject *sci, gint indic)
+void sci_set_indicator(ScintillaObject *sci, gint indic)
 {
 	SSM(sci, SCI_SETINDICATORCURRENT, indic, 0);
 }
 
-void sci_indic_fill(ScintillaObject *sci, gint pos, gint len)
+void sci_indicator_fill(ScintillaObject *sci, gint pos, gint len)
 {
 	SSM(sci, SCI_INDICATORFILLRANGE, pos, len);
 }
 
-void sci_indic_clear(ScintillaObject *sci, gint pos, gint len)
+/** Clear a range of text from any set indicators. Starting at @a pos, @a len characters long.
+ * @param sci Scintilla widget.
+ * @param pos Starting position.
+ * @param len Length. */
+void sci_indicator_clear(ScintillaObject *sci, gint pos, gint len)
 {
 	SSM(sci, SCI_INDICATORCLEARRANGE, pos, len);
 }

Modified: trunk/src/sciwrappers.h
===================================================================
--- trunk/src/sciwrappers.h	2008-09-18 13:25:13 UTC (rev 2972)
+++ trunk/src/sciwrappers.h	2008-09-18 13:27:10 UTC (rev 2973)
@@ -162,10 +162,10 @@
 void				sci_set_styling				(ScintillaObject * sci, gint len, gint style);
 void				sci_start_styling			(ScintillaObject * sci, gint pos, gint mask);
 
-gint				sci_get_indic				(ScintillaObject * sci);
-void				sci_set_indic				(ScintillaObject * sci, gint indic);
-void				sci_indic_fill				(ScintillaObject * sci, gint pos, gint len);
-void				sci_indic_clear				(ScintillaObject * sci, gint pos, gint len);
+gint				sci_get_indicator			(ScintillaObject * sci);
+void				sci_set_indicator			(ScintillaObject * sci, gint indic);
+void				sci_indicator_fill			(ScintillaObject * sci, gint pos, gint len);
+void				sci_indicator_clear			(ScintillaObject * sci, gint pos, gint len);
 
 void				sci_select_all				(ScintillaObject * sci);
 gint				sci_get_line_indent_position(ScintillaObject * sci, gint line);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.