diff options
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/BKE_text_suggestions.h (renamed from source/blender/blenkernel/BKE_suggestions.h) | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 4 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/text_suggestions.c (renamed from source/blender/blenkernel/intern/suggestions.c) | 2 | ||||
-rw-r--r-- | source/blender/editors/space_info/info_draw.c | 1 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_autocomplete.c | 19 | ||||
-rw-r--r-- | source/blender/editors/space_text/text_draw.c | 2 |
6 files changed, 22 insertions, 12 deletions
diff --git a/source/blender/blenkernel/BKE_suggestions.h b/source/blender/blenkernel/BKE_text_suggestions.h index 78da2eee402..80c38719f96 100644 --- a/source/blender/blenkernel/BKE_suggestions.h +++ b/source/blender/blenkernel/BKE_text_suggestions.h @@ -16,8 +16,8 @@ * The Original Code is Copyright (C) 2008, Blender Foundation * All rights reserved. */ -#ifndef __BKE_SUGGESTIONS_H__ -#define __BKE_SUGGESTIONS_H__ +#ifndef __BKE_TEXT_SUGGESTIONS_H__ +#define __BKE_TEXT_SUGGESTIONS_H__ /** \file * \ingroup bke @@ -84,4 +84,4 @@ void texttool_docs_clear(void); } #endif -#endif +#endif /* __BKE_TEXT_SUGGESTIONS_H__ */ diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index fd8a3db1b63..f80744feecc 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -217,8 +217,8 @@ set(SRC intern/subdiv_stats.c intern/subdiv_topology.c intern/subsurf_ccg.c - intern/suggestions.c intern/text.c + intern/text_suggestions.c intern/texture.c intern/tracking.c intern/tracking_auto.c @@ -352,8 +352,8 @@ set(SRC BKE_subdiv_mesh.h BKE_subdiv_topology.h BKE_subsurf.h - BKE_suggestions.h BKE_text.h + BKE_text_suggestions.h BKE_texture.h BKE_tracking.h BKE_undo_system.h diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/text_suggestions.c index 47d536f4f4f..64087369173 100644 --- a/source/blender/blenkernel/intern/suggestions.c +++ b/source/blender/blenkernel/intern/text_suggestions.c @@ -30,7 +30,7 @@ #include "BLI_string.h" #include "DNA_text_types.h" -#include "BKE_suggestions.h" +#include "BKE_text_suggestions.h" /* Own include. */ /**********************/ /* Static definitions */ diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c index c588df9528f..734515e1f79 100644 --- a/source/blender/editors/space_info/info_draw.c +++ b/source/blender/editors/space_info/info_draw.c @@ -32,7 +32,6 @@ #include "DNA_space_types.h" #include "DNA_screen_types.h" -// #include "BKE_suggestions.h" #include "BKE_report.h" #include "UI_resources.h" diff --git a/source/blender/editors/space_text/text_autocomplete.c b/source/blender/editors/space_text/text_autocomplete.c index a4531284e1a..9b10f9831a5 100644 --- a/source/blender/editors/space_text/text_autocomplete.c +++ b/source/blender/editors/space_text/text_autocomplete.c @@ -30,8 +30,8 @@ #include "BKE_context.h" #include "BKE_text.h" +#include "BKE_text_suggestions.h" #include "BKE_screen.h" -#include "BKE_suggestions.h" #include "WM_api.h" #include "WM_types.h" @@ -46,7 +46,8 @@ #include "text_intern.h" /* own include */ /* -------------------------------------------------------------------- */ -/* Public API */ +/** \name Public API + * \{ */ int text_do_suggest_select(SpaceText *st, ARegion *ar) { @@ -136,8 +137,11 @@ void text_pop_suggest_list(void) } } +/** \} */ + /* -------------------------------------------------------------------- */ -/* Private API */ +/** \name Private API + * \{ */ static void text_autocomplete_free(bContext *C, wmOperator *op); @@ -288,7 +292,12 @@ static void confirm_suggestion(Text *text) texttool_text_clear(); } -/* -- */ +/** \} */ + +/* -------------------------------------------------------------------- */ +/** \name Auto Complete Operator + * + * \{ */ static int text_autocomplete_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) { @@ -625,3 +634,5 @@ void TEXT_OT_autocomplete(wmOperatorType *ot) /* Undo is handled conditionally by this operator. */ ot->flag = OPTYPE_BLOCKING; } + +/** \} */ diff --git a/source/blender/editors/space_text/text_draw.c b/source/blender/editors/space_text/text_draw.c index 278d5dad808..816bbca4afa 100644 --- a/source/blender/editors/space_text/text_draw.c +++ b/source/blender/editors/space_text/text_draw.c @@ -32,8 +32,8 @@ #include "DNA_screen_types.h" #include "BKE_context.h" -#include "BKE_suggestions.h" #include "BKE_text.h" +#include "BKE_text_suggestions.h" #include "BKE_screen.h" #include "ED_text.h" |