diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-02-08 01:48:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-02-08 01:48:23 +0300 |
commit | 0d8416acc7fa39a8519043e6e57006a203622644 (patch) | |
tree | 174da7aca885c66731bc9418a45a923fd53c22ce /source/blender/editors/space_text | |
parent | 16160f5fcc1689d8008603442fe31b4edb507fb2 (diff) |
minor edits, no functional changes.
- BGE was getting MCol array and not using it.
- use list lookup functions for getting constraint from pose bone.
- use const char * in more places.
Diffstat (limited to 'source/blender/editors/space_text')
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 8 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_intern.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index eb69374b5b7..6f9ad138bac 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -89,7 +89,7 @@ static int text_font_draw_character(SpaceText *st, int x, int y, char c) return st->cwidth; } -int text_font_width(SpaceText *UNUSED(st), char *str) +int text_font_width(SpaceText *UNUSED(st), const char *str) { return BLF_width(mono, str); } @@ -124,7 +124,7 @@ static void flatten_string_append(FlattenString *fs, char c, int accum) fs->pos++; } -int flatten_string(SpaceText *st, FlattenString *fs, char *in) +int flatten_string(SpaceText *st, FlattenString *fs, const char *in) { int r = 0, i = 0; @@ -645,7 +645,7 @@ void wrap_offset_in_line(SpaceText *st, ARegion *ar, TextLine *linein, int cursi } } -int text_get_char_pos(SpaceText *st, char *line, int cur) +int text_get_char_pos(SpaceText *st, const char *line, int cur) { int a=0, i; @@ -961,7 +961,7 @@ int text_get_visible_lines_no(SpaceText *st, int lineno) return drawcache->line_height[lineno]; } -int text_get_visible_lines(SpaceText *st, ARegion *ar, char *str) +int text_get_visible_lines(SpaceText *st, ARegion *ar, const char *str) { int i, j, start, end, max, lines, chars; char ch; diff --git a/source/blender/editors/space_text/text_intern.h b/source/blender/editors/space_text/text_intern.h index cc957141ed2..5f6b2e05ba7 100644 --- a/source/blender/editors/space_text/text_intern.h +++ b/source/blender/editors/space_text/text_intern.h @@ -45,7 +45,7 @@ struct wmWindowManager; void draw_text_main(struct SpaceText *st, struct ARegion *ar); int text_font_width_character(struct SpaceText *st); -int text_font_width(struct SpaceText *st, char *str); +int text_font_width(struct SpaceText *st, const char *str); void text_update_line_edited(struct TextLine *line); void text_update_edited(struct Text *text); @@ -79,13 +79,13 @@ typedef struct FlattenString { int pos, len; } FlattenString; -int flatten_string(struct SpaceText *st, FlattenString *fs, char *in); +int flatten_string(struct SpaceText *st, FlattenString *fs, const char *in); void flatten_string_free(FlattenString *fs); int wrap_width(struct SpaceText *st, struct ARegion *ar); void wrap_offset(struct SpaceText *st, struct ARegion *ar, struct TextLine *linein, int cursin, int *offl, int *offc); void wrap_offset_in_line(struct SpaceText *st, struct ARegion *ar, struct TextLine *linep, int cursin, int *offl, int *offc); -int text_get_char_pos(struct SpaceText *st, char *line, int cur); +int text_get_char_pos(struct SpaceText *st, const char *line, int cur); void text_drawcache_tag_update(struct SpaceText *st, int full); void text_free_caches(struct SpaceText *st); @@ -95,7 +95,7 @@ int text_file_modified(struct Text *text); int text_do_suggest_select(struct SpaceText *st, struct ARegion *ar); void text_pop_suggest_list(void); -int text_get_visible_lines(struct SpaceText *st, struct ARegion *ar, char *str); +int text_get_visible_lines(struct SpaceText *st, struct ARegion *ar, const char *str); int text_get_span_wrap(struct SpaceText *st, struct ARegion *ar, struct TextLine *from, struct TextLine *to); int text_get_total_lines(struct SpaceText *st, struct ARegion *ar); |