de-hrc various things

e.g.  helpid[s].hrc -> helpids.h
and insert include guards where missing

move "ordinary" defines into .hxx files

remove .hrc entries that are used as arguments to dialog factory
when a dedicated method can be added instead

Change-Id: I792fb8eb0adfaa63cf354e6e57401fc943e9196e

5 files changed, 0 insertions, 54 deletions

diff --git a/solenv/bin/concat-deps.c b/solenv/bin/concat-deps.c
index cae9bc88e230..602bdf4b7dbf 100644
--- a/solenv/bin/concat-deps.c
+++ b/solenv/bin/concat-deps.c
@@ -1034,11 +1034,6 @@ off_t size;
                     created_line = generate_phony_line(src_relative, "o");
                     rc = generate_phony_file(fn, created_line);
                 }
-                else if(strncmp(fn+work_dir_len+5, "SrsPartTarget/", 14) == 0)
-                {
-                    created_line = generate_phony_line(src_relative, "");
-                    rc = generate_phony_file(fn, created_line);
-                }
                 else if(strncmp(src_relative, "GenCxxObject/", 13) == 0)
                 {
                     created_line = generate_phony_line(src_relative, "o");
diff --git a/solenv/doc/gbuild/solenv/gbuild/types.mk b/solenv/doc/gbuild/solenv/gbuild/types.mk
index 7e606bd02731..8798f01050c7 100644
--- a/solenv/doc/gbuild/solenv/gbuild/types.mk
+++ b/solenv/doc/gbuild/solenv/gbuild/types.mk
@@ -158,14 +158,5 @@ namespace gb { namespace types
             /// just a few need to be modified.
             void set_include(List<Path> include);
     };
-    /// A target processing a set of srs files
-    class HasSrs
-    {
-        public:
-            /// Add a SrsTarget to be processed.
-            void add_one_srs(SrsTarget srs);
-            /// Add multiple SrsTarget s to be processed.
-            void add_srs(List<SrsTarget> srs);
-    };
 }};
 /* vim: set filetype=cpp : */
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 4518b00b5d69..206a88e187ca 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -153,10 +153,6 @@ gb_ScpTarget_get_target = $(WORKDIR)/ScpTarget/$(1).par
 gb_ScpTemplateTarget_get_dir = $(abspath $(WORKDIR)/ScpTemplateTarget/$(dir $(1)))
 gb_ScpTemplateTarget_get_target = $(abspath $(WORKDIR)/ScpTemplateTarget/$(dir $(1))$(subst pack,modules,$(subst module_,all,$(notdir $(1)))).inc)
 gb_SdiTarget_get_target = $(WORKDIR)/SdiTarget/$(1)
-gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
-gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
-gb_SrsTarget_get_headers_target = $(WORKDIR)/SrsTarget/$(1).headers
-gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
 gb_ThesaurusIndexTarget_get_target = $(WORKDIR)/ThesaurusIndexTarget/$(basename $(1)).idx
 gb_UIConfig_get_imagelist_target = $(WORKDIR)/UIConfig/$(1).ilst
 gb_UIConfig_get_target = $(WORKDIR)/UIConfig/$(1).done
@@ -277,7 +273,6 @@ $(eval $(call gb_Helper_make_clean_targets,\
 	ScpTarget \
 	ScpTemplateTarget \
 	SdiTarget \
-	SrsTarget \
 	StaticLibrary \
 	ThesaurusIndexTarget \
 	CppunitTest \
@@ -316,8 +311,6 @@ $(eval $(call gb_Helper_make_dep_targets,\
 	GenCObject \
 	GenCxxObject \
 	SdiTarget \
-	SrsPartTarget \
-	SrsTarget \
 ))
 
 # other getters
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk
index 7bb58e4d73fc..09db3a19dae6 100644
--- a/solenv/gbuild/platform/com_GCC_class.mk
+++ b/solenv/gbuild/platform/com_GCC_class.mk
@@ -67,18 +67,6 @@ $(call gb_Helper_abbreviate_dirs,\
 		)
 endef
 
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-	mkdir -p $(dir $(call gb_SrsPartTarget_get_dep_target,$(1))) && cd $(SRCDIR) && \
-	$(gb_GCCP) \
-		-MM -MP -MT $(call gb_SrsPartTarget_get_target,$(1)) \
-		$(INCLUDE) \
-		$(DEFS) \
-		-D__RSC \
-		-c -x c++-header $(2) \
-		-o $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-
 # PrecompiledHeader class
 
 ifeq ($(COM_IS_CLANG),TRUE)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 3a04f54a741f..8fadf93bb50c 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -451,27 +451,6 @@ ifeq ($(strip $(CPPUNITTRACE)),TRUE)
 gb_CppunitTest_GDBTRACE := '$(DEVENV)' /debugexe
 endif
 
-# SrsPartTarget class
-
-ifeq ($(gb_FULLDEPS),$(true))
-# FIXME this is used before TargetLocations is read?
-gb_SrsPartTarget__command_target = $(WORKDIR)/LinkTarget/Executable/makedepend.exe
-define gb_SrsPartTarget__command_dep
-$(call gb_Helper_abbreviate_dirs,\
-	$(call gb_Executable_get_target,makedepend) \
-		$(INCLUDE) \
-		$(DEFS) \
-		-D__RSC \
-		$(2) \
-		-o .src \
-		-p $(dir $(call gb_SrsPartTarget_get_target,$(1))) \
-		-f $(call gb_SrsPartTarget_get_dep_target,$(1)))
-endef
-else
-gb_SrsPartTarget__command_target =
-gb_SrsPartTarget__command_dep =
-endif
-
 # WinResTarget class
 
 gb_WinResTarget_POSTFIX :=.res