Do not declare private symbols in internal header

diff --git a/codegen/valaccodebasemodule.vala b/codegen/valaccodebasemodule.vala
index 3c0ef09826b96051a78b57e939ad73b9a373da05..9f5611dda3871dc37c700f70e4b2f5a746c769e0 100644 (file)
--- a/codegen/valaccodebasemodule.vala
+++ b/codegen/valaccodebasemodule.vala
@@ -737,7 +737,9 @@ internal class Vala.CCodeBaseModule : CCodeModule {
                if (!en.is_internal_symbol ()) {
                        generate_enum_declaration (en, header_declarations);
                }
-               generate_enum_declaration (en, internal_header_declarations);
+               if (!en.is_private_symbol ()) {
+                       generate_enum_declaration (en, internal_header_declarations);
+               }
 
                if (!en.has_type_id) {
                        return;
@@ -875,7 +877,9 @@ internal class Vala.CCodeBaseModule : CCodeModule {
                if (!c.is_internal_symbol ()) {
                        generate_constant_declaration (c, header_declarations);
                }
-               generate_constant_declaration (c, internal_header_declarations);
+               if (!c.is_private_symbol ()) {
+                       generate_constant_declaration (c, internal_header_declarations);
+               }
        }
 
        public void generate_field_declaration (Field f, CCodeDeclarationSpace decl_space) {
@@ -1020,7 +1024,9 @@ internal class Vala.CCodeBaseModule : CCodeModule {
                        if (!f.is_internal_symbol ()) {
                                generate_field_declaration (f, header_declarations);
                        }
-                       generate_field_declaration (f, internal_header_declarations);
+                       if (!f.is_private_symbol ()) {
+                               generate_field_declaration (f, internal_header_declarations);
+                       }
 
                        lhs = new CCodeIdentifier (f.get_cname ());
 
@@ -1338,7 +1344,9 @@ internal class Vala.CCodeBaseModule : CCodeModule {
                                        || acc.access == SymbolAccessibility.PROTECTED)) {
                                        generate_property_accessor_declaration (acc, header_declarations);
                                }
-                               generate_property_accessor_declaration (acc, internal_header_declarations);
+                               if (!prop.is_private_symbol () && acc.access != SymbolAccessibility.PRIVATE) {
+                                       generate_property_accessor_declaration (acc, internal_header_declarations);
+                               }
                        }
                }
 

diff --git a/codegen/valaccodedelegatemodule.vala b/codegen/valaccodedelegatemodule.vala
index 3ff96666e4c3e28e0268b0cc807232d9bb06b771..c148d8ae58b55eee7e04d8131c054b8927c7b25d 100644 (file)
--- a/codegen/valaccodedelegatemodule.vala
+++ b/codegen/valaccodedelegatemodule.vala
@@ -114,7 +114,9 @@ internal class Vala.CCodeDelegateModule : CCodeArrayModule {
                if (!d.is_internal_symbol ()) {
                        generate_delegate_declaration (d, header_declarations);
                }
-               generate_delegate_declaration (d, internal_header_declarations);
+               if (!d.is_private_symbol ()) {
+                       generate_delegate_declaration (d, internal_header_declarations);
+               }
        }
 
        public override string get_delegate_target_cname (string delegate_cname) {

diff --git a/codegen/valaccodemethodmodule.vala b/codegen/valaccodemethodmodule.vala
index 670a2a9f6202cf48322551d0d7084c8d39eb7eee..3125e749fd6797b2da56539bd255d288fc7536a4 100644 (file)
--- a/codegen/valaccodemethodmodule.vala
+++ b/codegen/valaccodemethodmodule.vala
@@ -332,7 +332,9 @@ internal class Vala.CCodeMethodModule : CCodeStructModule {
                        if (!m.is_internal_symbol ()) {
                                generate_method_declaration (m, header_declarations);
                        }
-                       generate_method_declaration (m, internal_header_declarations);
+                       if (!m.is_private_symbol ()) {
+                               generate_method_declaration (m, internal_header_declarations);
+                       }
                }
 
                function = new CCodeFunction (m.get_real_cname ());

diff --git a/codegen/valaccodestructmodule.vala b/codegen/valaccodestructmodule.vala
index d8f5d4db7ac25bbeecdddcbffe4bceb291d87f20..c1d9f4ada211c302daa648a620bf41ded649d6d7 100644 (file)
--- a/codegen/valaccodestructmodule.vala
+++ b/codegen/valaccodestructmodule.vala
@@ -146,7 +146,9 @@ internal class Vala.CCodeStructModule : CCodeBaseModule {
                if (!st.is_internal_symbol ()) {
                        generate_struct_declaration (st, header_declarations);
                }
-               generate_struct_declaration (st, internal_header_declarations);
+               if (!st.is_private_symbol ()) {
+                       generate_struct_declaration (st, internal_header_declarations);
+               }
 
                st.accept_children (codegen);
 

diff --git a/codegen/valagerrormodule.vala b/codegen/valagerrormodule.vala
index 2ab64a0b6ee0e944603397a0e6516a26bed9530e..ff089843c6da878fb1b04d16584f53f3110f97f4 100644 (file)
--- a/codegen/valagerrormodule.vala
+++ b/codegen/valagerrormodule.vala
@@ -67,7 +67,9 @@ internal class Vala.GErrorModule : CCodeDelegateModule {
                if (!edomain.is_internal_symbol ()) {
                        generate_error_domain_declaration (edomain, header_declarations);
                }
-               generate_error_domain_declaration (edomain, internal_header_declarations);
+               if (!edomain.is_private_symbol ()) {
+                       generate_error_domain_declaration (edomain, internal_header_declarations);
+               }
 
                string quark_fun_name = edomain.get_lower_case_cprefix () + "quark";
 

diff --git a/codegen/valagtypemodule.vala b/codegen/valagtypemodule.vala
index f2a28bdf7b9c390de5b0f9266dc0064ceddf2d4f..75912b529e489c352ed0396914449fc7b54e6033 100644 (file)
--- a/codegen/valagtypemodule.vala
+++ b/codegen/valagtypemodule.vala
@@ -491,7 +491,9 @@ internal class Vala.GTypeModule : GErrorModule {
                if (!cl.is_internal_symbol ()) {
                        generate_class_struct_declaration (cl, header_declarations);
                }
-               generate_class_struct_declaration (cl, internal_header_declarations);
+               if (!cl.is_private_symbol ()) {
+                       generate_class_struct_declaration (cl, internal_header_declarations);
+               }
 
                cl.accept_children (codegen);