HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use the new Scintilla struct names prefixed with 'Sci_'.

Browse Source 
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@3912 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Enrico Tröger 2009-07-04 09:20:28 +00:00
parent aba1691372
commit 259639f3ee
6 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -9,6 +9,9 @@
Remove unnecessary enums. Remove unnecessary enums.
* scintilla/*, scintilla/include/*, src/plugindata.h: * scintilla/*, scintilla/include/*, src/plugindata.h:
Update Scintilla to version 1.79. 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> 2009-06-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>

8
src/document.c
View File

@ -1076,7 +1076,7 @@ static gboolean detect_tabs_and_spaces(GeanyEditor *editor)
const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor); const GeanyIndentPrefs *iprefs = editor_get_indent_prefs(editor);
ScintillaObject *sci = editor->sci; ScintillaObject *sci = editor->sci;
gsize count = 0; gsize count = 0;
struct TextToFind ttf; struct Sci_TextToFind ttf;
gchar *soft_tab = g_strnfill(iprefs->width, ' '); gchar *soft_tab = g_strnfill(iprefs->width, ' ');
gchar *regex = g_strconcat("^\t+", soft_tab, "[^ ]", NULL); gchar *regex = g_strconcat("^\t+", soft_tab, "[^ ]", NULL);
@ -1511,7 +1511,7 @@ static void replace_header_filename(GeanyDocument *doc)
{ {
gchar *filebase; gchar *filebase;
gchar *filename; gchar *filename;
struct TextToFind ttf; struct Sci_TextToFind ttf;
g_return_if_fail(doc != NULL); g_return_if_fail(doc != NULL);
g_return_if_fail(doc->file_type != NULL); g_return_if_fail(doc->file_type != NULL);
@ -1867,7 +1867,7 @@ gboolean document_save_file(GeanyDocument *doc, gboolean force)
gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gint flags, gboolean inc) gboolean document_search_bar_find(GeanyDocument *doc, const gchar *text, gint flags, gboolean inc)
{ {
gint start_pos, search_pos; 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(text != NULL, FALSE);
g_return_val_if_fail(doc != NULL, FALSE); g_return_val_if_fail(doc != NULL, FALSE);
@ -2096,7 +2096,7 @@ document_replace_range(GeanyDocument *doc, const gchar *find_text, const gchar *
gint flags, gint start, gint end, gboolean scroll_to_match, gint *new_range_end) gint flags, gint start, gint end, gboolean scroll_to_match, gint *new_range_end)
{ {
gint count = 0; gint count = 0;
struct TextToFind ttf; struct Sci_TextToFind ttf;
ScintillaObject *sci; ScintillaObject *sci;
if (new_range_end != NULL) if (new_range_end != NULL)

6
src/editor.c
View File

@ -1727,7 +1727,7 @@ static gboolean complete_doc_word(GeanyEditor *editor, gchar *root, gsize rootle
gsize nmatches = 0; gsize nmatches = 0;
gboolean ret = FALSE; gboolean ret = FALSE;
GString *words; GString *words;
struct TextToFind ttf; struct Sci_TextToFind ttf;
len = sci_get_length(sci); len = sci_get_length(sci);
current = sci_get_current_position(sci) - rootlen; current = sci_get_current_position(sci) - rootlen;
@ -4132,7 +4132,7 @@ void editor_replace_tabs(GeanyEditor *editor)
gint search_pos, pos_in_line, current_tab_true_length; gint search_pos, pos_in_line, current_tab_true_length;
gint tab_len; gint tab_len;
gchar *tab_str; gchar *tab_str;
struct TextToFind ttf; struct Sci_TextToFind ttf;
g_return_if_fail(editor != NULL); g_return_if_fail(editor != NULL);
@ -4170,7 +4170,7 @@ void editor_replace_spaces(GeanyEditor *editor)
gint search_pos; gint search_pos;
static gdouble tab_len_f = -1.0; /* keep the last used value */ static gdouble tab_len_f = -1.0; /* keep the last used value */
gint tab_len; gint tab_len;
struct TextToFind ttf; struct Sci_TextToFind ttf;
g_return_if_fail(editor != NULL); g_return_if_fail(editor != NULL);

4
src/sciwrappers.c
View File

@ -747,7 +747,7 @@ 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)
{ {
return SSM(sci, SCI_FINDTEXT, flags, (long) ttf ); return SSM(sci, SCI_FINDTEXT, flags, (long) ttf );
} }
@ -811,7 +811,7 @@ void sci_clear_cmdkey(ScintillaObject *sci, gint key)
* @param text Text will be zero terminated and must be allocated (end - start + 1) bytes. */ * @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) 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.cpMin = start;
tr.chrg.cpMax = end; tr.chrg.cpMax = end;
tr.lpstrText = text; tr.lpstrText = text;

2
src/sciwrappers.h
View File

@ -121,7 +121,7 @@ void sci_scroll_lines (ScintillaObject * sci, gint lines);
void sci_scroll_columns (ScintillaObject *sci, gint columns); void sci_scroll_columns (ScintillaObject *sci, gint columns);
gint sci_search_next (ScintillaObject * sci, gint flags, const gchar *text); gint sci_search_next (ScintillaObject * sci, gint flags, const gchar *text);
gint sci_search_prev (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_set_font (ScintillaObject * sci, gint style, const gchar* font, gint size);
void sci_goto_line (ScintillaObject * sci, gint line, gboolean unfold); void sci_goto_line (ScintillaObject * sci, gint line, gboolean unfold);
void sci_marker_delete_all (ScintillaObject * sci, gint marker); void sci_marker_delete_all (ScintillaObject * sci, gint marker);

4
src/search.c
View File

@ -963,7 +963,7 @@ static gint search_mark(GeanyDocument *doc, const gchar *search_text, gint flags
{ {
gint pos, count = 0; gint pos, count = 0;
gsize len; gsize len;
struct TextToFind ttf; struct Sci_TextToFind ttf;
g_return_val_if_fail(doc != NULL, 0); g_return_val_if_fail(doc != NULL, 0);
@ -1605,7 +1605,7 @@ static void search_close_pid(GPid child_pid, gint status, gpointer user_data)
static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gint flags) static gint find_document_usage(GeanyDocument *doc, const gchar *search_text, gint flags)
{ {
gchar *buffer, *short_file_name; gchar *buffer, *short_file_name;
struct TextToFind ttf; struct Sci_TextToFind ttf;
gint count = 0; gint count = 0;
gint prev_line = -1; gint prev_line = -1;