Cleanup: BKE_suggestions -> BKE_text_suggestions
authorCampbell Barton <ideasman42@gmail.com>
Fri, 22 Nov 2019 02:29:25 +0000 (13:29 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 22 Nov 2019 02:32:57 +0000 (13:32 +1100)
The term suggestions on it's own is too ambiguous, use BKE_text prefix.

source/blender/blenkernel/BKE_text_suggestions.h [moved from source/blender/blenkernel/BKE_suggestions.h with 95% similarity]
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/text_suggestions.c [moved from source/blender/blenkernel/intern/suggestions.c with 99% similarity]
source/blender/editors/space_info/info_draw.c
source/blender/editors/space_text/text_autocomplete.c
source/blender/editors/space_text/text_draw.c

similarity index 95%
rename from source/blender/blenkernel/BKE_suggestions.h
rename to source/blender/blenkernel/BKE_text_suggestions.h
index 78da2eee40202c3a74a63a3288ed0e594d1240de..80c38719f96549d7d88e54ce38055638e9e8c8a7 100644 (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__ */
index fd8a3db1b638fd585687f72cdd8bd21266a666b7..f80744feeccf778b78e2b01ec9b1d09b11a6bbc6 100644 (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
similarity index 99%
rename from source/blender/blenkernel/intern/suggestions.c
rename to source/blender/blenkernel/intern/text_suggestions.c
index 47d536f4f4f6eaa508b8e141902e1084397b40e7..6408736917393a8621efc1d1e591bc3e96cbd3b0 100644 (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 */
index c588df9528f57b0b5c8858e9187ba504a9439f8c..734515e1f799951dcb6afd5c98e2976bb92db033 100644 (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"
index a4531284e1a3a2fa6b08964cf3016dfd62f86c87..9b10f9831a5744809cc743cf7fa366c0546f5935 100644 (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;
 }
+
+/** \} */
index 278d5dad808327f4e1f252d59f1cafff8635fa6b..816bbca4afa719d786c3e85f9d446dfbddc0c39a 100644 (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"