Revision: 3912 http://geany.svn.sourceforge.net/geany/?rev=3912&view=rev Author: eht16 Date: 2009-07-04 09:20:28 +0000 (Sat, 04 Jul 2009)
Log Message: ----------- Use the new Scintilla struct names prefixed with 'Sci_'.
Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/editor.c trunk/src/sciwrappers.c trunk/src/sciwrappers.h trunk/src/search.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-07-04 09:19:36 UTC (rev 3911) +++ trunk/ChangeLog 2009-07-04 09:20:28 UTC (rev 3912) @@ -9,6 +9,9 @@ Remove unnecessary enums. * scintilla/*, scintilla/include/*, src/plugindata.h: Update Scintilla to version 1.79. + * src/document.c, src/editor.c, src/sciwrappers.c, src/sciwrappers.h, + src/search.c: + Use the new Scintilla struct names prefixed with 'Sci_'.
2009-06-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-07-04 09:19:36 UTC (rev 3911) +++ trunk/src/document.c 2009-07-04 09:20:28 UTC (rev 3912) @@ -1076,7 +1076,7 @@ const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); ScintillaObject *sci = editor->sci; gsize count = 0; - struct TextToFind ttf; + struct Sci_TextToFind ttf; gchar *soft_tab = g_strnfill(iprefs->width, ' '); gchar *regex = g_strconcat("^\t+", soft_tab, "[^ ]", NULL);
@@ -1511,7 +1511,7 @@ { gchar *filebase; gchar *filename; - struct TextToFind ttf; + struct Sci_TextToFind ttf;
g_return_if_fail(doc != NULL); g_return_if_fail(doc->file_type != NULL); @@ -1867,7 +1867,7 @@ gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gint flags, gboolean inc) { gint start_pos, search_pos; - struct TextToFind ttf; + struct Sci_TextToFind ttf;
g_return_val_if_fail(text != NULL, FALSE); g_return_val_if_fail(doc != NULL, FALSE); @@ -2096,7 +2096,7 @@ gint flags, gint start, gint end, gboolean scroll_to_match, gint *new_range_end) { gint count = 0; - struct TextToFind ttf; + struct Sci_TextToFind ttf; ScintillaObject *sci;
if (new_range_end != NULL)
Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2009-07-04 09:19:36 UTC (rev 3911) +++ trunk/src/editor.c 2009-07-04 09:20:28 UTC (rev 3912) @@ -1727,7 +1727,7 @@ gsize nmatches = 0; gboolean ret = FALSE; GString *words; - struct TextToFind ttf; + struct Sci_TextToFind ttf;
len = sci_get_length(sci); current = sci_get_current_position(sci) - rootlen; @@ -4132,7 +4132,7 @@ gint search_pos, pos_in_line, current_tab_true_length; gint tab_len; gchar *tab_str; - struct TextToFind ttf; + struct Sci_TextToFind ttf;
g_return_if_fail(editor != NULL);
@@ -4170,7 +4170,7 @@ gint search_pos; static gdouble tab_len_f = -1.0; /* keep the last used value */ gint tab_len; - struct TextToFind ttf; + struct Sci_TextToFind ttf;
g_return_if_fail(editor != NULL);
Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2009-07-04 09:19:36 UTC (rev 3911) +++ trunk/src/sciwrappers.c 2009-07-04 09:20:28 UTC (rev 3912) @@ -747,7 +747,7 @@ }
-gint sci_find_text(ScintillaObject *sci, gint flags, struct TextToFind *ttf) +gint sci_find_text(ScintillaObject *sci, gint flags, struct Sci_TextToFind *ttf) { return SSM(sci, SCI_FINDTEXT, flags, (long) ttf ); } @@ -811,7 +811,7 @@ * @param text Text will be zero terminated and must be allocated (end - start + 1) bytes. */ void sci_get_text_range(ScintillaObject *sci, gint start, gint end, gchar *text) { - struct TextRange tr; + struct Sci_TextRange tr; tr.chrg.cpMin = start; tr.chrg.cpMax = end; tr.lpstrText = text;
Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2009-07-04 09:19:36 UTC (rev 3911) +++ trunk/src/sciwrappers.h 2009-07-04 09:20:28 UTC (rev 3912) @@ -121,7 +121,7 @@ void sci_scroll_columns (ScintillaObject *sci, gint columns); gint sci_search_next (ScintillaObject * sci, gint flags, const gchar *text); gint sci_search_prev (ScintillaObject * sci, gint flags, const gchar *text); -gint sci_find_text (ScintillaObject * sci, gint flags, struct TextToFind *ttf); +gint sci_find_text (ScintillaObject * sci, gint flags, struct Sci_TextToFind *ttf); void sci_set_font (ScintillaObject * sci, gint style, const gchar* font, gint size); void sci_goto_line (ScintillaObject * sci, gint line, gboolean unfold); void sci_marker_delete_all (ScintillaObject * sci, gint marker);
Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2009-07-04 09:19:36 UTC (rev 3911) +++ trunk/src/search.c 2009-07-04 09:20:28 UTC (rev 3912) @@ -963,7 +963,7 @@ { gint pos, count = 0; gsize len; - struct TextToFind ttf; + struct Sci_TextToFind ttf;
g_return_val_if_fail(doc != NULL, 0);
@@ -1605,7 +1605,7 @@ static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gint flags) { gchar *buffer, *short_file_name; - struct TextToFind ttf; + struct Sci_TextToFind ttf; gint count = 0; gint prev_line = -1;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.