rename UI to UIConfig

I plan to use it to deliver all */uiconfig files, not just .ui, as a
preliminary step to get rid of postprocess/packconfig.

Change-Id: Ie7b4434b2f247165e3ab69a4d0c193418720a149
Reviewed-on: https://gerrit.libreoffice.org/3225Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

Makefile.in

@@ -120,7 +120,7 @@ gbuild_TARGETS := AllLangHelp \
 	Pyuno \
 	Rdb \
 	StaticLibrary \
-	UI \
+	UIConfig \
 	UnoApi \
 	UnoApiMerge \
 	UnpackedTarball \

basctl/Module_basctl.mk

@@ -39,7 +39,7 @@ endif
 
 $(eval $(call gb_Module_add_targets,basctl,\
 	Package_uiconfig \
-	UI_basicide \
+	UIConfig_basicide \
 ))
 
 # vim: set noet sw=4 ts=4:

basctl/UI_basicide.mk → basctl/UIConfig_basicide.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/BasicIDE))
+$(eval $(call gb_UIConfig_UIConfig,modules/BasicIDE))
 
-$(eval $(call gb_UI_add_uifiles,modules/BasicIDE,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
 	basctl/uiconfig/basicide/ui/basicmacrodialog \
 ))
 

chart2/Module_chart2.mk

@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,chart2,\
     Library_chartcontroller \
     Library_chartcore \
     Package_uiconfig \
-	UI_chart2 \
+	UIConfig_chart2 \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,chart2,\

chart2/UI_chart2.mk → chart2/UIConfig_chart2.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/schart))
+$(eval $(call gb_UIConfig_UIConfig,modules/schart))
 
-$(eval $(call gb_UI_add_uifiles,modules/schart,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
 	chart2/uiconfig/ui/smoothlinesdlg \
 ))
 

cui/Module_cui.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Module_Module,cui))
 $(eval $(call gb_Module_add_targets,cui,\
 	AllLangResTarget_cui \
 	Library_cui \
-	UI_cui \
+	UIConfig_cui \
 ))
 
 # vim: set noet sw=4 ts=4:

cui/UI_cui.mk → cui/UIConfig_cui.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,cui))
+$(eval $(call gb_UIConfig_UIConfig,cui))
 
-$(eval $(call gb_UI_add_uifiles,cui,\
+$(eval $(call gb_UIConfig_add_uifiles,cui,\
 	cui/uiconfig/ui/aboutdialog \
 	cui/uiconfig/ui/asiantypography \
 	cui/uiconfig/ui/backgroundpage \

dbaccess/Module_dbaccess.mk

@@ -43,7 +43,7 @@ $(eval $(call gb_Module_add_targets,dbaccess,\
     Library_sdbt \
     Package_inc \
     Package_uiconfig \
-    UI_dbaccess \
+    UIConfig_dbaccess \
 ))
 
 $(eval $(call gb_Module_add_check_targets,dbaccess,\

dbaccess/UI_dbaccess.mk → dbaccess/UIConfig_dbaccess.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,dbaccess))
+$(eval $(call gb_UIConfig_UIConfig,dbaccess))
 
-$(eval $(call gb_UI_add_uifiles,dbaccess, \
+$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
     dbaccess/uiconfig/ui/querypropertiesdialog  \
     dbaccess/uiconfig/ui/generalpagedialog \
     dbaccess/uiconfig/ui/generalpagewizard \

desktop/Module_desktop.mk

@@ -38,7 +38,7 @@ $(eval $(call gb_Module_add_targets,desktop,\
     Library_sofficeapp \
     Library_spl \
     Package_intro \
-    UI_deployment \
+    UIConfig_deployment \
     Zip_brand \
     Zip_brand_dev \
 ))

desktop/UI_deployment.mk → desktop/UIConfig_deployment.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,desktop))
+$(eval $(call gb_UIConfig_UIConfig,desktop))
 
-$(eval $(call gb_UI_add_uifiles,desktop,\
+$(eval $(call gb_UIConfig_add_uifiles,desktop,\
     desktop/uiconfig/ui/cmdlinehelp \
     desktop/uiconfig/ui/extensionmanager \
 ))

filter/Module_filter.mk

@@ -66,7 +66,7 @@ $(eval $(call gb_Module_add_targets,filter,\
 	Package_inc \
 	Package_docbook \
 	Package_xslt \
-	UI_xsltdlg \
+	UIConfig_xsltdlg \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))

filter/UI_xsltdlg.mk → filter/UIConfig_xsltdlg.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,filter))
+$(eval $(call gb_UIConfig_UIConfig,filter))
 
-$(eval $(call gb_UI_add_uifiles,filter,\
+$(eval $(call gb_UIConfig_add_uifiles,filter,\
 	filter/uiconfig/ui/testxmlfilter \
 	filter/uiconfig/ui/xmlfiltersettings \
 ))

padmin/Module_padmin.mk

@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,padmin,\
     Library_spa \
     AllLangResTarget_spa \
     Package_inc \
-    UI_spa \
+    UIConfig_spa \
 ))
 endif
 

padmin/UI_spa.mk → padmin/UIConfig_spa.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,spa))
+$(eval $(call gb_UIConfig_UIConfig,spa))
 
-$(eval $(call gb_UI_add_uifiles,spa,\
+$(eval $(call gb_UIConfig_add_uifiles,spa,\
 	padmin/uiconfig/ui/printerdevicepage \
 	padmin/uiconfig/ui/printerpaperpage \
 	padmin/uiconfig/ui/printerpropertiesdialog \

sc/Module_sc.mk

@@ -31,7 +31,7 @@ $(eval $(call gb_Module_add_targets,sc,\
 	Library_scfilt \
 	Library_scui \
 	Package_uiconfig \
-	UI_scalc \
+	UIConfig_scalc \
 ))
 
 ifneq ($(DISABLE_SCRIPTING),TRUE)

sc/UI_scalc.mk → sc/UIConfig_scalc.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/scalc))
+$(eval $(call gb_UIConfig_UIConfig,modules/scalc))
 
-$(eval $(call gb_UI_add_uifiles,modules/scalc,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
 	sc/uiconfig/scalc/ui/cellprotectionpage \
 	sc/uiconfig/scalc/ui/definename \
 	sc/uiconfig/scalc/ui/deletecontents \

sd/Module_sd.mk

@@ -38,8 +38,8 @@ $(eval $(call gb_Module_add_targets,sd,\
     Package_uiconfig \
     Package_web \
     Package_xml \
-    UI_sdraw \
-    UI_simpress \
+    UIConfig_sdraw \
+    UIConfig_simpress \
 ))
 
 ifneq ($(OS),DRAGONFLY)

sd/UI_sdraw.mk → sd/UIConfig_sdraw.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/sdraw))
+$(eval $(call gb_UIConfig_UIConfig,modules/sdraw))
 
-$(eval $(call gb_UI_add_uifiles,modules/sdraw,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/sdraw,\
 	sd/uiconfig/sdraw/ui/printeroptions \
 ))
 

sd/UI_simpress.mk → sd/UIConfig_simpress.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/simpress))
+$(eval $(call gb_UIConfig_UIConfig,modules/simpress))
 
-$(eval $(call gb_UI_add_uifiles,modules/simpress,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
 	sd/uiconfig/simpress/ui/presentationdialog \
 	sd/uiconfig/simpress/ui/printeroptions \
 	sd/uiconfig/simpress/ui/photoalbum \

sfx2/Module_sfx2.mk

@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,sfx2,\
     Library_sfx \
     Package_inc \
     Package_sdi \
-    UI_sfx \
+    UIConfig_sfx \
 ))
 
 $(eval $(call gb_Module_add_check_targets,sfx2,\

sfx2/UI_sfx.mk → sfx2/UIConfig_sfx.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,sfx))
+$(eval $(call gb_UIConfig_UIConfig,sfx))
 
-$(eval $(call gb_UI_add_uifiles,sfx,\
+$(eval $(call gb_UIConfig_add_uifiles,sfx,\
 	sfx2/uiconfig/ui/checkin \
 	sfx2/uiconfig/ui/custominfopage \
 	sfx2/uiconfig/ui/descriptioninfopage \

solenv/gbuild/Postprocess.mk

@@ -28,7 +28,7 @@ $(call gb_Postprocess_Postprocess,AllLibraries,All libraries)
 $(call gb_Postprocess_Postprocess,AllModulesButInstsetNative,All modules but instset,$(WORKDIR)/Module/)
 $(call gb_Postprocess_Postprocess,AllPackages,All packages,$(WORKDIR)/Package/)
 $(call gb_Postprocess_Postprocess,AllResources,All resources,$(WORKDIR)/AllLangRes/)
-$(call gb_Postprocess_Postprocess,AllUIs,All UI files,$(WORKDIR)/UI/)
+$(call gb_Postprocess_Postprocess,AllUIConfigs,All UI configuration files,$(WORKDIR)/UIConfig/)
 
 endef
 

solenv/gbuild/TargetLocations.mk

@@ -191,7 +191,7 @@ gb_SrsTemplatePartTarget_get_target = $(WORKDIR)/SrsTemplatePartTarget/$(firstwo
 gb_SrsTemplateTarget_get_include_dir = $(WORKDIR)/SrsTemplatePartTarget/$(firstword $(subst /, ,$(1)))
 gb_SrsTemplateTarget_get_target = $(WORKDIR)/SrsTemplateTarget/$(1)
 gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx
-gb_UI_get_target = $(WORKDIR)/UI/$(1)
+gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1)
 gb_UILocalizeTarget_get_target = $(WORKDIR)/UILocalizeTarget/$(1).done
 gb_UILocalizeTarget_get_workdir = $(WORKDIR)/UILocalizeTarget/$(1)
 gb_UnoApiTarget_get_external_headers_target = $(WORKDIR)/UnoApiTarget/$(1).external
@@ -306,7 +306,7 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	CppunitTestFakeExecutable \
 	CustomTarget \
 	ExternalProject \
-	UI \
+	UIConfig \
 	UILocalizeTarget \
 	UnoApiHeadersTarget \
 	UnoApiTarget \

solenv/gbuild/UI.mk → solenv/gbuild/UIConfig.mk

@@ -32,7 +32,7 @@ MERGEINPUT=`$(gb_MKTEMP)` && \
 echo $(POFILES) > $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
 	$(gb_UILocalizeTarget_COMMAND) \
-		-i $(UI_FILE) \
+		-i $(UIConfig_FILE) \
 		-o $(call gb_UILocalizeTarget_get_workdir,$(2)) \
 		-l all \
 		-m $${MERGEINPUT} \
@@ -68,7 +68,7 @@ endef
 # gb_UILocalizeTarget__UILocalizeTarget_impl target pofiles
 define gb_UILocalizeTarget__UILocalizeTarget_impl
 $(call gb_UILocalizeTarget_get_target,$(1)) : POFILES := $(2)
-$(call gb_UILocalizeTarget_get_target,$(1)) : UI_FILE := $(SRCDIR)/$(1).ui
+$(call gb_UILocalizeTarget_get_target,$(1)) : UIConfig_FILE := $(SRCDIR)/$(1).ui
 
 $(call gb_UILocalizeTarget_get_target,$(1)) : $(2)
 $(call gb_UILocalizeTarget_get_target,$(1)) : $(SRCDIR)/$(1).ui
@@ -78,97 +78,100 @@ $(call gb_UILocalizeTarget_get_target,$(1)) :| \
 
 endef
 
-# class UI
+# class UIConfig
 
-# Handles UI description files (suffix .ui) for the new layouting mechanism.
+# Handles UI configuration files.
+#
+# This mostly means UI description files (suffix .ui) for the new layouting
+# mechanism.
 
 # en-US is the default, so there is no translation for it
-gb_UI_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
+gb_UIConfig_LANGS := $(filter-out en-US,$(gb_WITH_LANG))
 
-$(dir $(call gb_UI_get_target,%)).dir :
+$(dir $(call gb_UIConfig_get_target,%)).dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(dir $(call gb_UI_get_target,%))%/.dir :
+$(dir $(call gb_UIConfig_get_target,%))%/.dir :
 	$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
 
-$(call gb_UI_get_target,%) :
-	$(call gb_Output_announce,$*,$(true),UI ,2)
+$(call gb_UIConfig_get_target,%) :
+	$(call gb_Output_announce,$*,$(true),UIC,2)
 	$(call gb_Helper_abbreviate_dirs,\
 		touch $@ \
 	)
 
-.PHONY : $(call gb_UI_get_clean_target,%)
-$(call gb_UI_get_clean_target,%) :
-	$(call gb_Output_announce,$*,$(false),UI ,2)
+.PHONY : $(call gb_UIConfig_get_clean_target,%)
+$(call gb_UIConfig_get_clean_target,%) :
+	$(call gb_Output_announce,$*,$(false),UIC,2)
 	$(call gb_Helper_abbreviate_dirs,\
-		rm -f $(call gb_UI_get_target,$*) \
+		rm -f $(call gb_UIConfig_get_target,$*) \
 	)
 
-# Translates and delivers a set of .ui files
+# Processes and delivers a set of UI configuration files.
 #
-# gb_UI_UI modulename
-define gb_UI_UI
+# gb_UIConfig_UIConfig modulename
+define gb_UIConfig_UIConfig
 $(call gb_Package_Package_internal,$(1)_ui,$(SRCDIR))
-$(call gb_UI_get_target,$(1)) :| $(dir $(call gb_UI_get_target,$(1))).dir
-$(call gb_UI_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui)
-$(call gb_Postprocess_get_target,AllUIs) : $(call gb_UI_get_target,$(1))
-$(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui)
+$(call gb_UIConfig_get_target,$(1)) :| $(dir $(call gb_UIConfig_get_target,$(1))).dir
+$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui)
+$(call gb_Postprocess_get_target,AllUIConfigs) : $(call gb_UIConfig_get_target,$(1))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui)
 
-ifneq ($(gb_UI_LANGS),)
+ifneq ($(gb_UIConfig_LANGS),)
 $(call gb_Package_Package_internal,$(1)_ui_localized,$(gb_UILocalizeTarget_WORKDIR))
-$(call gb_UI_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui_localized)
-$(call gb_UI_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui_localized)
+$(call gb_UIConfig_get_target,$(1)) :| $(call gb_Package_get_target,$(1)_ui_localized)
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(1)_ui_localized)
 endif
 
-$$(eval $$(call gb_Module_register_target,$(call gb_UI_get_target,$(1)),$(call gb_UI_get_clean_target,$(1))))
-$(call gb_Helper_make_userfriendly_targets,$(1),UI)
+$$(eval $$(call gb_Module_register_target,$(call gb_UIConfig_get_target,$(1)),$(call gb_UIConfig_get_clean_target,$(1))))
+$(call gb_Helper_make_userfriendly_targets,$(1),UIConfig)
 
 endef
 
-# gb_UI__package_uifile target package destfile srcfile
-define gb_UI__package_uifile
+# gb_UIConfig__package_uifile target package destfile srcfile
+define gb_UIConfig__package_uifile
 $(call gb_Package_add_file,$(2),xml/uiconfig/$(1)/ui/$(3),$(4))
 
 endef
 
-# gb_UI__add_uifile target file
-define gb_UI__add_uifile
-$(call gb_UI__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui)
+# gb_UIConfig__add_uifile target file
+define gb_UIConfig__add_uifile
+$(call gb_UIConfig__package_uifile,$(1),$(1)_ui,$(notdir $(2)).ui,$(2).ui)
 
 endef
 
-# gb_UI__add_uifile_for_lang target file lang
-define gb_UI__add_uifile_for_lang
-$(call gb_UI__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui)
+# gb_UIConfig__add_uifile_for_lang target file lang
+define gb_UIConfig__add_uifile_for_lang
+$(call gb_UIConfig__package_uifile,$(1),$(1)_ui_localized,res/$(3)/$(notdir $(2)),$(2)/$(3).ui)
 
 endef
 
-# gb_UI__add_translations_impl target uifile langs
-define gb_UI__add_translations_impl
+# gb_UIConfig__add_translations_impl target uifile langs
+define gb_UIConfig__add_translations_impl
 $(call gb_UILocalizeTarget_UILocalizeTarget,$(2))
-$(call gb_UI_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2))
-$(call gb_UI_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(2))
+$(call gb_UIConfig_get_target,$(1)) : $(call gb_UILocalizeTarget_get_target,$(2))
+$(call gb_UIConfig_get_clean_target,$(1)) : $(call gb_UILocalizeTarget_get_clean_target,$(2))
 $(call gb_Package_get_preparation_target,$(1)_ui_localized) : $(call gb_UILocalizeTarget_get_target,$(2))
-$(foreach lang,$(3),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(lang)))
+$(foreach lang,$(3),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(lang)))
 
 endef
 
-# gb_UI__add_translations target uifile langs qtz
-define gb_UI__add_translations
-$(if $(strip $(3) $(4)),$(call gb_UI__add_translations_impl,$(1),$(2),$(3)))
-$(if $(strip $(4)),$(call gb_UI__add_uifile_for_lang,$(1),$(2),$(strip $(4))))
+# gb_UIConfig__add_translations target uifile langs qtz
+define gb_UIConfig__add_translations
+$(if $(strip $(3) $(4)),$(call gb_UIConfig__add_translations_impl,$(1),$(2),$(3)))
+$(if $(strip $(4)),$(call gb_UIConfig__add_uifile_for_lang,$(1),$(2),$(strip $(4))))
 
 endef
 
 # Adds translations for languages that have corresponding .po file
 #
-# gb_UI__add_uifile_translations target uifile
-define gb_UI__add_uifile_translations
-$(call gb_UI__add_translations,$(1),$(2),\
-	$(foreach lang,$(gb_UI_LANGS),\
+# gb_UIConfig__add_uifile_translations target uifile
+define gb_UIConfig__add_uifile_translations
+$(call gb_UIConfig__add_translations,$(1),$(2),\
+	$(foreach lang,$(gb_UIConfig_LANGS),\
 		$(if $(wildcard $(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(2))).po),$(lang)) \
 	),\
-	$(filter qtz,$(gb_UI_LANGS)) \
+	$(filter qtz,$(gb_UIConfig_LANGS)) \
 )
 
 endef
@@ -177,21 +180,21 @@ endef
 #
 # The file is relative to $(SRCDIR) and without extension.
 #
-# gb_UI_add_uifile target uifile
-define gb_UI_add_uifile
-$(call gb_UI__add_uifile,$(1),$(2))
+# gb_UIConfig_add_uifile target uifile
+define gb_UIConfig_add_uifile
+$(call gb_UIConfig__add_uifile,$(1),$(2))
 
-ifneq ($(gb_UI_LANGS),)
-$(call gb_UI__add_uifile_translations,$(1),$(2))
+ifneq ($(gb_UIConfig_LANGS),)
+$(call gb_UIConfig__add_uifile_translations,$(1),$(2))
 endif
 
 endef
 
 # Adds multiple .ui files to the package
 #
-# gb_UI_add_uifiles target uifile(s)
-define gb_UI_add_uifiles
-$(foreach uifile,$(2),$(call gb_UI_add_uifile,$(1),$(uifile)))
+# gb_UIConfig_add_uifiles target uifile(s)
+define gb_UIConfig_add_uifiles
+$(foreach uifile,$(2),$(call gb_UIConfig_add_uifile,$(1),$(uifile)))
 
 endef
 

solenv/gbuild/gbuild.mk

@@ -320,7 +320,7 @@ include $(foreach class, \
 	JavaClassSet \
 	JunitTest \
 	Module \
-	UI \
+	UIConfig \
 	UnoApiTarget \
 	UnoApi \
 	UnoApiMerge \

starmath/Module_starmath.mk

@@ -28,7 +28,7 @@ $(eval $(call gb_Module_add_targets,starmath,\
     Library_sm \
     Library_smd \
     Package_uiconfig \
-    UI_smath \
+    UIConfig_smath \
 ))
 
 $(eval $(call gb_Module_add_check_targets,starmath,\

starmath/UI_smath.mk → starmath/UIConfig_smath.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/smath))
+$(eval $(call gb_UIConfig_UIConfig,modules/smath))
 
-$(eval $(call gb_UI_add_uifiles,modules/smath,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/smath,\
 	starmath/uiconfig/smath/ui/printeroptions \
 ))
 

svtools/Module_svtools.mk

@@ -24,7 +24,7 @@ $(eval $(call gb_Module_add_targets,svtools,\
     Library_hatchwindowfactory \
     Library_svt \
     Package_inc \
-    UI_svt \
+    UIConfig_svt \
 ))
 
 ifneq ($(CROSS_COMPILING),YES)

svtools/UI_svt.mk → svtools/UIConfig_svt.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,svt))
+$(eval $(call gb_UIConfig_UIConfig,svt))
 
-$(eval $(call gb_UI_add_uifiles,svt,\
+$(eval $(call gb_UIConfig_add_uifiles,svt,\
 	svtools/uiconfig/ui/addresstemplatedialog \
 	svtools/uiconfig/ui/graphicexport \
 	svtools/uiconfig/ui/placeedit \

svx/Module_svx.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Module_add_targets,svx,\
     Package_globlmn_hrc \
     Package_inc \
     Package_sdi \
-    UI_svx \
+    UIConfig_svx \
 ))
 
 ifneq (,$(filter DESKTOP,$(BUILD_TYPE)))

svx/UI_svx.mk → svx/UIConfig_svx.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,svx))
+$(eval $(call gb_UIConfig_UIConfig,svx))
 
-$(eval $(call gb_UI_add_uifiles,svx,\
+$(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/acceptrejectchangesdialog \
 	svx/uiconfig/ui/asianphoneticguidedialog \
 	svx/uiconfig/ui/chineseconversiondialog \

sw/Module_sw.mk

@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,sw,\
     Library_swd \
     Library_swui \
     Package_uiconfig \
-	UI_swriter \
+	UIConfig_swriter \
 ))
 
 ifneq ($(DISABLE_SCRIPTING),TRUE)

sw/UI_swriter.mk → sw/UIConfig_swriter.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,modules/swriter))
+$(eval $(call gb_UIConfig_UIConfig,modules/swriter))
 
-$(eval $(call gb_UI_add_uifiles,modules/swriter,\
+$(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/autoformattable \
 	sw/uiconfig/swriter/ui/autotext \
 	sw/uiconfig/swriter/ui/bibliographyentry \

tubes/Module_tubes.mk

@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,tubes,\
 	Executable_liboapprover \
 	Library_tubes \
 	Package_inc \
-	UI_tubes \
+	UIConfig_tubes \
 ))
 
 $(eval $(call gb_Module_add_subsequentcheck_targets,tubes,\

tubes/UI_tubes.mk → tubes/UIConfig_tubes.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,tubes))
+$(eval $(call gb_UIConfig_UIConfig,tubes))
 
-$(eval $(call gb_UI_add_uifiles,tubes,\
+$(eval $(call gb_UIConfig_add_uifiles,tubes,\
 	tubes/uiconfig/ui/contacts \
 ))
 

uui/Module_uui.mk

@@ -31,7 +31,7 @@ $(eval $(call gb_Module_Module,uui))
 $(eval $(call gb_Module_add_targets,uui,\
 	AllLangResTarget_uui \
 	Library_uui \
-	UI_uui \
+	UIConfig_uui \
 ))
 
 # vim: set noet sw=4 ts=4:

uui/UI_uui.mk → uui/UIConfig_uui.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,uui))
+$(eval $(call gb_UIConfig_UIConfig,uui))
 
-$(eval $(call gb_UI_add_uifiles,uui,\
+$(eval $(call gb_UIConfig_add_uifiles,uui,\
 	uui/uiconfig/ui/masterpassworddlg \
 	uui/uiconfig/ui/setmasterpassworddlg \
 ))

vcl/Module_vcl.mk

@@ -27,7 +27,7 @@ $(eval $(call gb_Module_add_targets,vcl,\
     $(if $(filter DESKTOP,$(BUILD_TYPE)), \
 		StaticLibrary_vclmain \
 		Executable_ui-previewer) \
-    UI_vcl \
+    UIConfig_vcl \
 ))
 
 ifeq ($(GUIBASE),unx)

vcl/UI_vcl.mk → vcl/UIConfig_vcl.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,vcl))
+$(eval $(call gb_UIConfig_UIConfig,vcl))
 
-$(eval $(call gb_UI_add_uifiles,vcl,\
+$(eval $(call gb_UIConfig_add_uifiles,vcl,\
 	vcl/uiconfig/ui/printdialog \
 ))
 

xmlsecurity/Module_xmlsecurity.mk

@@ -33,7 +33,7 @@ $(eval $(call gb_Module_add_targets,xmlsecurity,\
 	Library_xmlsecurity \
 	Library_xsec_fw \
 	$(if $(filter-out IOS ANDROID,$(OS)),Library_xsec_xmlsec) \
-	UI_xmlsec \
+	UIConfig_xmlsec \
 ))
 
 #FIXME: ^^^, get nss&libxmlsec building on ios and android

xmlsecurity/UI_xmlsec.mk → xmlsecurity/UIConfig_xmlsec.mk

@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_UI_UI,xmlsec))
+$(eval $(call gb_UIConfig_UIConfig,xmlsec))
 
-$(eval $(call gb_UI_add_uifiles,xmlsec,\
+$(eval $(call gb_UIConfig_add_uifiles,xmlsec,\
 	xmlsecurity/uiconfig/ui/digitalsignaturesdialog \
 	xmlsecurity/uiconfig/ui/securitylevelpage \
 	xmlsecurity/uiconfig/ui/securitytrustpage \