Cleanup: BKE_suggestions -> BKE_text_suggestions

The term suggestions on it's own is too ambiguous, use BKE_text prefix.
This commit is contained in:
Campbell Barton
2019-11-22 13:29:25 +11:00
parent 3403645575
commit 35f2e4a35c
6 changed files with 22 additions and 12 deletions

View File

@@ -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__ */

View File

@@ -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

View File

@@ -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 */

View File

@@ -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"

View File

@@ -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;
}
/** \} */

View File

@@ -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"