[glibmm/gmmproc-refactor] Rename cpp_foo to cxx_foo and foo_name to foo_type where appriopriate.
- From: Krzesimir Nowak <krnowak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/gmmproc-refactor] Rename cpp_foo to cxx_foo and foo_name to foo_type where appriopriate.
- Date: Sun, 24 Jun 2012 19:51:47 +0000 (UTC)
commit 5e0f59a3194e0df4603939d818c00bb0a6cf57f6
Author: Krzesimir Nowak <qdlacz gmail com>
Date: Thu Jun 14 02:47:31 2012 +0200
Rename cpp_foo to cxx_foo and foo_name to foo_type where appriopriate.
tools/pm/Common/Output/BoxedType.pm | 62 ++++++++--------
tools/pm/Common/Output/BoxedTypeStatic.pm | 38 +++++-----
tools/pm/Common/Output/Ctor.pm | 52 +++++++-------
tools/pm/Common/Output/Enum.pm | 58 ++++++++--------
tools/pm/Common/Output/GError.pm | 42 ++++++------
tools/pm/Common/Output/GObject.pm | 106 ++++++++++++++--------------
tools/pm/Common/Output/Generic.pm | 4 +-
tools/pm/Common/Output/Interface.pm | 108 ++++++++++++++--------------
tools/pm/Common/Output/Method.pm | 56 +++++++-------
tools/pm/Common/Output/OpaqueCopyable.pm | 34 +++++-----
tools/pm/Common/Output/OpaqueRefcounted.pm | 52 +++++++-------
tools/pm/Common/Output/Property.pm | 24 +++---
tools/pm/Common/Output/Shared.pm | 96 ++++++++++++------------
tools/pm/Common/Output/Signal.pm | 70 +++++++++---------
tools/pm/Common/Output/VFunc.pm | 46 ++++++------
tools/pm/Common/Scanner.pm | 26 ++++----
tools/pm/Common/Sections.pm | 4 +-
tools/pm/Common/WrapParser.pm | 98 +++++++++++++-------------
18 files changed, 488 insertions(+), 488 deletions(-)
---
diff --git a/tools/pm/Common/Output/BoxedType.pm b/tools/pm/Common/Output/BoxedType.pm
index 245ebbb..b7607d8 100644
--- a/tools/pm/Common/Output/BoxedType.pm
+++ b/tools/pm/Common/Output/BoxedType.pm
@@ -30,7 +30,7 @@ sub nl
sub _output_h_before_first_namespace ($$$)
{
- my ($wrap_parser, $c_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_STRUCT_PROTOTYPE;
my $conditional = Common::Output::Shared::generate_conditional $wrap_parser;
@@ -46,12 +46,12 @@ sub _output_h_before_first_namespace ($$$)
sub _output_h_in_class ($$$)
{
- my ($wrap_parser, $c_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
my $code_string = nl ('public:') .
nl (Common::Output::Shared::doxy_skip_begin) .
- nl (' typedef ' . $cpp_type . 'CppObjectType;') .
+ nl (' typedef ' . $cxx_type . 'CppObjectType;') .
nl (' typedef ' . $c_type . 'BaseObjectType;') .
nl () .
nl ( 'static GType get_type() G_GNUC_CONST;') .
@@ -61,7 +61,7 @@ sub _output_h_in_class ($$$)
$section_manager->push_section ($main_section);
$section_manager->append_string ($code_string);
- my $conditional = Common::Output::Shared::default_ctor_proto $wrap_parser, $cpp_type;
+ my $conditional = Common::Output::Shared::default_ctor_proto $wrap_parser, $cxx_type;
my $copy_proto = 'const';
my $reinterpret = 0;
my $definitions = 1;
@@ -69,13 +69,13 @@ sub _output_h_in_class ($$$)
$section_manager->append_conditional ($conditional);
$code_string = nl () .
- nl ('explicit ' . $cpp_type . '(' . $c_type . '* gobject, bool make_a_copy = true);') .
+ nl ('explicit ' . $cxx_type . '(' . $c_type . '* gobject, bool make_a_copy = true);') .
nl () .
- nl (Common::Output::Shared::copy_protos_str $cpp_type) .
+ nl (Common::Output::Shared::copy_protos_str $cxx_type) .
nl () .
- nl (Common::Output::Shared::dtor_proto_str $cpp_type, $virtual_dtor) .
+ nl (Common::Output::Shared::dtor_proto_str $cxx_type, $virtual_dtor) .
nl () .
- nl (' void swap(' . $cpp_type . '& other);') .
+ nl (' void swap(' . $cxx_type . '& other);') .
nl () .
nl (Common::Output::Shared::gobj_protos_str $c_type, $copy_proto, $reinterpret, $definitions) .
nl () .
@@ -89,18 +89,18 @@ sub _output_h_in_class ($$$)
sub _output_h_after_first_namespace ($$$)
{
- my ($wrap_parser, $c_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::H_AFTER_FIRST_NAMESPACE;
my $code_string = nl (Common::Output::Shared::open_namespaces $wrap_parser) .
nl () .
- nl ('/** @relates ' . $full_cpp_type) .
+ nl ('/** @relates ' . $full_cxx_type) .
nl (' *') .
nl (' * @param lhs The left-hand side') .
nl (' * @param rhs The right-hand side') .
nl (' */') .
- nl ('inline void swap(' . $cpp_type . '& lhs, ' . $cpp_type . '& rhs)') .
+ nl ('inline void swap(' . $cxx_type . '& lhs, ' . $cxx_type . '& rhs)') .
nl ('{ lhs.swap(rhs); }') .
nl () .
nl (Common::Output::Shared::close_namespaces $wrap_parser) .
@@ -121,7 +121,7 @@ sub _output_h_after_first_namespace ($$$)
$section_manager->append_conditional ($conditional);
$code_string = nl (Common::Output::Shared::doxy_skip_begin) .
nl ('template <>') .
- nl ('class Value< ' . $full_cpp_type . ' > : public Glib::Value_Boxed< ' . $full_cpp_type . ' >') .
+ nl ('class Value< ' . $full_cxx_type . ' > : public Glib::Value_Boxed< ' . $full_cxx_type . ' >') .
nl ('{};') .
nl (Common::Output::Shared::doxy_skip_end) .
nl () .
@@ -132,18 +132,18 @@ sub _output_h_after_first_namespace ($$$)
sub _output_cc ($$$$$$$)
{
- my ($wrap_parser, $c_type, $cpp_type, $get_type_func, $new_func, $copy_func, $free_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $get_type_func, $new_func, $copy_func, $free_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $prefix = Common::Output::Shared::get_var_prefix $wrap_parser;
my $variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::NO_WRAP_FUNCTION;
my $conditional = Common::Output::Shared::generate_conditional $wrap_parser;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $code_string = nl ('namespace Glib') .
nl ('{') .
nl () .
- nl ($full_cpp_type . ' wrap(' . $c_type . '* object, bool take_copy)') .
+ nl ($full_cxx_type . ' wrap(' . $c_type . '* object, bool take_copy)') .
nl ('{') .
- nl (' return ' . $full_cpp_type . '(object, take_copy);') .
+ nl (' return ' . $full_cxx_type . '(object, take_copy);') .
nl ('}') .
nl () .
nl ('} // namespace Glib') .
@@ -156,7 +156,7 @@ sub _output_cc ($$$$$$$)
$section_manager->set_variable_for_conditional ($variable, $conditional);
$code_string = nl (Common::Output::Shared::open_namespaces $wrap_parser) .
nl ('// static') .
- nl ('GType ' . $cpp_type . '::get_type()') .
+ nl ('GType ' . $cxx_type . '::get_type()') .
nl ('{') .
nl (' return ' . $get_type_func . '();') .
nl ('}') .
@@ -164,7 +164,7 @@ sub _output_cc ($$$$$$$)
$section_manager->append_string ($code_string);
$variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_DEFAULT_CTOR;
$conditional = Common::Output::Shared::generate_conditional $wrap_parser;
- $code_string = nl($cpp_type . '::' . $cpp_type . '()') .
+ $code_string = nl($cxx_type . '::' . $cxx_type . '()') .
nl(':');
if (defined $new_func and $new_func != '' and $new_func != 'NONE')
{
@@ -178,12 +178,12 @@ sub _output_cc ($$$$$$$)
$section_manager->append_string_to_conditional ($code_string, $conditional, 0);
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($variable, $conditional);
- $code_string = nl ($cpp_type . '::' . $cpp_type . '(const ' . $cpp_type . '& other)') .
+ $code_string = nl ($cxx_type . '::' . $cxx_type . '(const ' . $cxx_type . '& other)') .
nl (':') .
nl (' gobject_ ((other.gobject_) ? ' . $copy_func . '(other.gobject_) : 0)') .
nl ('{}') .
nl () .
- nl ($cpp_type . '::' . $cpp_type . '(' . $c_type . '* gobject, bool make_a_copy)') .
+ nl ($cxx_type . '::' . $cxx_type . '(' . $c_type . '* gobject, bool make_a_copy)') .
nl (':') .
nl ('// For BoxedType wrappers, make_a_copy is true by default. The static') .
nl ('// BoxedTyoe wrappers always take a copy, thus make_a_copy = true') .
@@ -191,27 +191,27 @@ sub _output_cc ($$$$$$$)
nl (' gobject_ ((make_a_copy && gobject) ? ' . $copy_func . '(gobject) : gobject)') .
nl ('{}') .
nl () .
- nl ($cpp_type . '& ' . $cpp_type . '::operator=(const ' . $cpp_type . '& other)') .
+ nl ($cxx_type . '& ' . $cxx_type . '::operator=(const ' . $cxx_type . '& other)') .
nl ('{') .
- nl (' ' . $cpp_type . ' temp (other);') .
+ nl (' ' . $cxx_type . ' temp (other);') .
nl (' swap(temp);') .
nl (' return *this;') .
nl ('}') .
nl () .
- nl ($cpp_type . '::~' . $cpp_type . '()') .
+ nl ($cxx_type . '::~' . $cxx_type . '()') .
nl ('{') .
nl (' if (gobject_)') .
nl (' ' . $free_func . '(gobject_);') .
nl ('}') .
nl () .
- nl ('void ' . $cpp_type . '::swap(' . $cpp_type . '& other)') .
+ nl ('void ' . $cxx_type . '::swap(' . $cxx_type . '& other)') .
nl ('{') .
nl (' ' . $c_type . '* const temp = gobject_;') .
nl (' gobject_ = other.gobject_;') .
nl (' other.gobject_ = temp;') .
nl ('}') .
nl () .
- nl ($c_type . '* ' . $cpp_type . '::gobj_copy() const') .
+ nl ($c_type . '* ' . $cxx_type . '::gobj_copy() const') .
nl ('{') .
nl (' return ' . $copy_func . '(gobject_);') .
nl ('}') .
@@ -226,12 +226,12 @@ sub _output_cc ($$$$$$$)
sub output ($)
{
- my ($wrap_parser, $c_type, $cpp_type, $get_type_func, $new_func, $copy_func, $free_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $get_type_func, $new_func, $copy_func, $free_func) = @_;
- _output_h_before_first_namespace $wrap_parser, $c_type, $cpp_type;
- _output_h_in_class $wrap_parser, $c_type, $cpp_type;
- _output_h_after_first_namespace $wrap_parser, $c_type, $cpp_type;
- _output_cc $wrap_parser, $c_type, $cpp_type, $get_type_func, $new_func, $copy_func, $free_func;
+ _output_h_before_first_namespace $wrap_parser, $c_type, $cxx_type;
+ _output_h_in_class $wrap_parser, $c_type, $cxx_type;
+ _output_h_after_first_namespace $wrap_parser, $c_type, $cxx_type;
+ _output_cc $wrap_parser, $c_type, $cxx_type, $get_type_func, $new_func, $copy_func, $free_func;
}
1; # indicate proper module load.
diff --git a/tools/pm/Common/Output/BoxedTypeStatic.pm b/tools/pm/Common/Output/BoxedTypeStatic.pm
index ed5af28..8e55071 100644
--- a/tools/pm/Common/Output/BoxedTypeStatic.pm
+++ b/tools/pm/Common/Output/BoxedTypeStatic.pm
@@ -32,11 +32,11 @@ sub nl
sub _output_h_in_class ($$$)
{
- my ($wrap_parser, $c_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = nl ('public:') .
nl (Common::Output::Shared::doxy_skip_begin) .
- nl (' typedef ' . $cpp_type . 'CppObjectType;') .
+ nl (' typedef ' . $cxx_type . 'CppObjectType;') .
nl (' typedef ' . $c_type . 'BaseObjectType;') .
nl () .
nl (' static GType get_type() G_GNUC_CONST') .
@@ -47,14 +47,14 @@ sub _output_h_in_class ($$$)
$section_manager->push_section ($main_section);
$section_manager->append_string ($code_string);
- my $conditional = Common::Output::Shared::default_ctor_proto $wrap_parser, $cpp_type;
+ my $conditional = Common::Output::Shared::default_ctor_proto $wrap_parser, $cxx_type;
$section_manager->append_conditional ($conditional);
my $variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_CTOR_CAST;
$conditional = Common::Output::Shared::generate_conditional $wrap_parser;
- $code_string = nl (' explicit ' . $cpp_type . '(const ' . $c_type . '* gobject); // always takes a copy');
+ $code_string = nl (' explicit ' . $cxx_type . '(const ' . $c_type . '* gobject); // always takes a copy');
$section_manager->append_string_to_conditional ($code_string, $conditional, 0);
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($variable, $conditional);
@@ -75,7 +75,7 @@ sub _output_h_in_class ($$$)
sub _output_h_after_namespace ($$$)
{
- my ($wrap_parser, $c_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = nl ('namespace Glib') .
nl ('{');
@@ -94,12 +94,12 @@ sub _output_h_after_namespace ($$$)
$conditional = Common::Output::Shared::wrap_proto $wrap_parser, $c_type, $result_type, $take_copy_by_default, $open_glib_namespace, $const_function;
$section_manager->append_conditional ($conditional);
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type ($wrap_parser);
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type ($wrap_parser);
$code_string = nl () .
nl (Common::Output::Shared::doxy_skip_begin) .
nl ('template <>') .
- nl ('class Value< ' . $full_cpp_type . ' > : public Glib::Value_Boxed< ' . $full_cpp_type . ' >') .
+ nl ('class Value< ' . $full_cxx_type . ' > : public Glib::Value_Boxed< ' . $full_cxx_type . ' >') .
nl ('{};') .
nl (Common::Output::Shared::doxy_skip_end) .
nl () .
@@ -111,17 +111,17 @@ sub _output_h_after_namespace ($$$)
sub _output_cc ($$$$)
{
- my ($wrap_parser, $c_type, $cpp_type, $get_type_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $get_type_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::NO_WRAP_FUNCTION;
- my $complete_cpp_type = Common::Output::Shared::get_complete_cpp_type $wrap_parser;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $complete_cxx_type = Common::Output::Shared::get_complete_cxx_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $code_string = nl ('namespace Glib') .
nl ('{') .
nl () .
- nl ($complete_cpp_type . '& wrap(' . $c_type . '* object)') .
+ nl ($complete_cxx_type . '& wrap(' . $c_type . '* object)') .
nl ('{') .
- nl (' return *reinterpret_cast< ' . $complete_cpp_type . '* >(object);') .
+ nl (' return *reinterpret_cast< ' . $complete_cxx_type . '* >(object);') .
nl ('}') .
nl () .
nl ('} // namespace Glib') .
@@ -135,7 +135,7 @@ sub _output_cc ($$$$)
$section_manager->set_variable_for_conditional ($variable, $conditional);
$code_string = nl (Common::Output::Shared::open_namespaces $wrap_parser) .
nl ('// static') .
- nl ('GType ' . $full_cpp_type . '::get_type()') .
+ nl ('GType ' . $full_cxx_type . '::get_type()') .
nl ('{') .
nl (' return ' . $get_type_func . '();') .
nl ('}') .
@@ -143,7 +143,7 @@ sub _output_cc ($$$$)
$section_manager->append_string ($code_string);
$variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_DEFAULT_CTOR;
$conditional = Common::Output::Shared::generate_conditional $wrap_parser;
- $code_string = nl ($full_cpp_type . '::' . $cpp_type . '()') .
+ $code_string = nl ($full_cxx_type . '::' . $cxx_type . '()') .
nl ('{') .
nl (' GLIBMM_INITIALIZE_STRUCT(gobject_, ' . $c_type . ');') .
nl ('}') .
@@ -153,7 +153,7 @@ sub _output_cc ($$$$)
$section_manager->set_variable_for_conditional ($variable, $conditional);
$variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_CTOR_CAST;
$conditional = Common::Output::Shared::generate_conditional $wrap_parser;
- $code_string = nl ($full_cpp_type . '::' . $cpp_type . '(const ' . $c_type . '* gobject)') .
+ $code_string = nl ($full_cxx_type . '::' . $cxx_type . '(const ' . $c_type . '* gobject)') .
nl ('{') .
nl (' if (gobject)') .
nl (' {') .
@@ -178,11 +178,11 @@ sub _output_cc ($$$$)
sub output ($$$$)
{
- my ($wrap_parser, $c_type, $cpp_type, $get_type_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $get_type_func) = @_;
- _output_h_in_class $wrap_parser, $c_type, $cpp_type;
- _output_h_after_namespace $wrap_parser, $c_type, $cpp_type;
- _output_cc $wrap_parser, $c_type, $cpp_type, $get_type_func;
+ _output_h_in_class $wrap_parser, $c_type, $cxx_type;
+ _output_h_after_namespace $wrap_parser, $c_type, $cxx_type;
+ _output_cc $wrap_parser, $c_type, $cxx_type, $get_type_func;
}
1; # indicate proper module load.
diff --git a/tools/pm/Common/Output/Ctor.pm b/tools/pm/Common/Output/Ctor.pm
index 26a57c5..d44f212 100644
--- a/tools/pm/Common/Output/Ctor.pm
+++ b/tools/pm/Common/Output/Ctor.pm
@@ -48,25 +48,25 @@ sub initially_unowned_sink ($)
sub ctor_default ($)
{
my ($wrap_parser) = @_;
- my $cpp_type = Common::Output::Shared::get_cpp_type $wrap_parser;
+ my $cxx_type = Common::Output::Shared::get_cxx_type $wrap_parser;
- unless (defined $cpp_type)
+ unless (defined $cxx_type)
{
# TODO: warn.
return;
}
- my $code_string = nl $cpp_type, '();';
+ my $code_string = nl $cxx_type, '();';
my $main_section = $wrap_parser->get_main_section;
my $section_manager = $wrap_parser->get_section_manager;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
- my $base_member = (lc $cpp_class_type) . '_';
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
+ my $base_member = (lc $cxx_class_type) . '_';
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_NAMESPACE;
my $conditional = initially_unowned_sink $wrap_parser;
$section_manager->append_string_to_section ($code_string, $main_section);
- $code_string = (nl $full_cpp_type, '::', $cpp_type, '()') .
+ $code_string = (nl $full_cxx_type, '::', $cxx_type, '()') .
(nl ':') .
(nl ' // Mark this class as non-derived to allow C++ vfuncs to be skipped.') .
(nl ' Glib::ObjectBase(0),') .
@@ -84,24 +84,24 @@ sub ctor_default ($)
sub wrap_ctor ($$$$$$$)
{
- my ($wrap_parser, $c_param_types, $c_param_transfers, $c_prop_names, $cpp_param_types, $cpp_param_names, $cxx_param_values) = @_;
+ my ($wrap_parser, $c_param_types, $c_param_transfers, $c_prop_names, $cxx_param_types, $cxx_param_names, $cxx_param_values) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
- my $cpp_type = Common::Output::Shared::get_cpp_type $wrap_parser;
- my $cpp_params_str_h = Common::Output::Shared::paramzipstr ($cpp_param_types, $cpp_param_names, $cxx_param_values);
- my $cxx_params_str_cc = Common::Output::Shared::paramzipstr ($cpp_param_types, $cpp_param_names);
- my $code_string = (nl 'explicit ', $cpp_type, '(', $cpp_params_str_h, ');') .
+ my $cxx_type = Common::Output::Shared::get_cxx_type $wrap_parser;
+ my $cxx_params_str_h = Common::Output::Shared::paramzipstr ($cxx_param_types, $cxx_param_names, $cxx_param_values);
+ my $cxx_params_str_cc = Common::Output::Shared::paramzipstr ($cxx_param_types, $cxx_param_names);
+ my $code_string = (nl 'explicit ', $cxx_type, '(', $cxx_params_str_h, ');') .
(nl);
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_NAMESPACE;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
- my $base_member = (lc $cpp_class_type) . '_';
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
+ my $base_member = (lc $cxx_class_type) . '_';
my $conditional = initially_unowned_sink $wrap_parser;
my $type_info_local = $wrap_parser->get_type_info_local ();
- my $ctor_params_str = join ', ', '', (map { join '', '"', $c_prop_names->[$_], '", ', ($type_info_local->get_conversion ($cpp_param_types->[$_], $c_param_types->[$_], $c_param_transfers->[$_], $cpp_param_names->[$_])) } 0 .. (@{$cpp_param_types} - 1)), 'static_cast<char*>(0)';
+ my $ctor_params_str = join ', ', '', (map { join '', '"', $c_prop_names->[$_], '", ', ($type_info_local->get_conversion ($cxx_param_types->[$_], $c_param_types->[$_], $c_param_transfers->[$_], $cxx_param_names->[$_])) } 0 .. (@{$cxx_param_types} - 1)), 'static_cast<char*>(0)';
$section_manager->append_string_to_section ($code_string, $main_section);
- $code_string = (nl $full_cpp_type, '::', $cpp_type, '(', $cxx_params_str_cc, ')') .
+ $code_string = (nl $full_cxx_type, '::', $cxx_type, '(', $cxx_params_str_cc, ')') .
(nl ':') .
(nl ' // Mark this class as non-derived to allow C++ vfuncs to be skipped.') .
(nl ' Glib::ObjectBase(0),') .
@@ -119,21 +119,21 @@ sub wrap_ctor ($$$$$$$)
sub wrap_create ($$$$)
{
- my ($wrap_parser, $cpp_param_types, $cpp_param_names, $cxx_param_values) = @_;
+ my ($wrap_parser, $cxx_param_types, $cxx_param_names, $cxx_param_values) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_NAMESPACE;
- my $cpp_type = Common::Output::Shared::get_cpp_type $wrap_parser;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $cpp_params_str_h = Common::Output::Shared::paramzipstr ($cpp_param_types, $cpp_param_names, $cxx_param_values);
- my $cxx_params_str_cc = Common::Output::Shared::paramzipstr ($cpp_param_types, $cpp_param_names);
- my $cpp_names_str = join ', ', @{$cpp_param_names};
- my $code_string = (nl 'static Glib::RefPtr< ', $cpp_type, ' > create(', $cpp_params_str_h, ');');
+ my $cxx_type = Common::Output::Shared::get_cxx_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $cxx_params_str_h = Common::Output::Shared::paramzipstr ($cxx_param_types, $cxx_param_names, $cxx_param_values);
+ my $cxx_params_str_cc = Common::Output::Shared::paramzipstr ($cxx_param_types, $cxx_param_names);
+ my $cxx_names_str = join ', ', @{$cxx_param_names};
+ my $code_string = (nl 'static Glib::RefPtr< ', $cxx_type, ' > create(', $cxx_params_str_h, ');');
$section_manager->append_string_to_section ($code_string, $main_section);
- $code_string = (nl 'Glib::RefPtr< ', $full_cpp_type, ' > ', $full_cpp_type, '::create(', $cxx_params_str_cc, ')') .
+ $code_string = (nl 'Glib::RefPtr< ', $full_cxx_type, ' > ', $full_cxx_type, '::create(', $cxx_params_str_cc, ')') .
(nl '{') .
- (nl ' return Glib::RefPtr< ', $cpp_type, ' >(new ', $cpp_type, '(', $cpp_names_str, '));') .
+ (nl ' return Glib::RefPtr< ', $cxx_type, ' >(new ', $cxx_type, '(', $cxx_names_str, '));') .
(nl '}') .
(nl);
$section_manager->append_string_to_section ($code_string, $section);
diff --git a/tools/pm/Common/Output/Enum.pm b/tools/pm/Common/Output/Enum.pm
index 527a2c5..e5428d1 100644
--- a/tools/pm/Common/Output/Enum.pm
+++ b/tools/pm/Common/Output/Enum.pm
@@ -30,11 +30,11 @@ sub nl
sub _output_enum ($$$)
{
- my ($wrap_parser, $cpp_type, $members) = @_;
+ my ($wrap_parser, $cxx_type, $members) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
my $string_members = Common::Output::Shared::convert_members_to_strings $members;
- my $code_string = nl ('enum ' . $cpp_type) .
+ my $code_string = nl ('enum ' . $cxx_type) .
nl ('{') .
nl (join ((nl ','), @{$string_members})) .
nl ('};') .
@@ -45,36 +45,36 @@ sub _output_enum ($$$)
sub _output_flag_ops ($$$)
{
- my ($wrap_parser, $cpp_type, $flags) = @_;
+ my ($wrap_parser, $cxx_type, $flags) = @_;
if ($flags)
{
my $section_manager = $wrap_parser->get_section_manager;
- my $container_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $full_cpp_type = join '::', $container_cpp_type, $cpp_type;
- my $code_string .= nl ('inline ' . $full_cpp_type . ' operator|(' . $full_cpp_type . ' lhs, ' . $full_cpp_type . ' rhs)') .
- nl (' { return static_cast<' . $full_cpp_type . '>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs)); }') .
+ my $container_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $full_cxx_type = join '::', $container_cxx_type, $cxx_type;
+ my $code_string .= nl ('inline ' . $full_cxx_type . ' operator|(' . $full_cxx_type . ' lhs, ' . $full_cxx_type . ' rhs)') .
+ nl (' { return static_cast<' . $full_cxx_type . '>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs)); }') .
nl () .
- nl ('inline ' . $full_cpp_type . ' operator&(' . $full_cpp_type . ' lhs, ' . $full_cpp_type . ' rhs)') .
- nl (' { return static_cast<' . $full_cpp_type . '>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs)); }') .
+ nl ('inline ' . $full_cxx_type . ' operator&(' . $full_cxx_type . ' lhs, ' . $full_cxx_type . ' rhs)') .
+ nl (' { return static_cast<' . $full_cxx_type . '>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs)); }') .
nl () .
- nl ('inline ' . $full_cpp_type . ' operator^(' . $full_cpp_type . ' lhs, ' . $full_cpp_type . ' rhs)') .
- nl ('{ return static_cast<' . $full_cpp_type . '>(static_cast<unsigned>(lhs) ^ static_cast<unsigned>(rhs)); }') .
+ nl ('inline ' . $full_cxx_type . ' operator^(' . $full_cxx_type . ' lhs, ' . $full_cxx_type . ' rhs)') .
+ nl ('{ return static_cast<' . $full_cxx_type . '>(static_cast<unsigned>(lhs) ^ static_cast<unsigned>(rhs)); }') .
nl () .
- nl ('inline ' . $full_cpp_type . ' operator~(' . $full_cpp_type . ' flags)') .
- nl (' { return static_cast<' . $full_cpp_type . '>(~static_cast<unsigned>(flags)); }') .
+ nl ('inline ' . $full_cxx_type . ' operator~(' . $full_cxx_type . ' flags)') .
+ nl (' { return static_cast<' . $full_cxx_type . '>(~static_cast<unsigned>(flags)); }') .
nl () .
- nl ('inline ' . $full_cpp_type . '& operator|=(' . $full_cpp_type . '& lhs, ' . $full_cpp_type . ' rhs)') .
- nl (' { return (lhs = static_cast<' . $full_cpp_type . '>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs))); }') .
+ nl ('inline ' . $full_cxx_type . '& operator|=(' . $full_cxx_type . '& lhs, ' . $full_cxx_type . ' rhs)') .
+ nl (' { return (lhs = static_cast<' . $full_cxx_type . '>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs))); }') .
nl () .
- nl ('inline ' . $full_cpp_type . '& operator&=(' . $full_cpp_type . '& lhs, ' . $full_cpp_type . ' rhs)') .
- nl (' { return (lhs = static_cast<' . $full_cpp_type . '>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs))); }') .
+ nl ('inline ' . $full_cxx_type . '& operator&=(' . $full_cxx_type . '& lhs, ' . $full_cxx_type . ' rhs)') .
+ nl (' { return (lhs = static_cast<' . $full_cxx_type . '>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs))); }') .
nl () .
- nl ('inline ' . $full_cpp_type . '& operator^=(' . $full_cpp_type . '& lhs, ' . $full_cpp_type . ' rhs)') .
- nl (' { return (lhs = static_cast<' . $full_cpp_type . '>(static_cast<unsigned>(lhs) ^ static_cast<unsigned>(rhs))); }') .
+ nl ('inline ' . $full_cxx_type . '& operator^=(' . $full_cxx_type . '& lhs, ' . $full_cxx_type . ' rhs)') .
+ nl (' { return (lhs = static_cast<' . $full_cxx_type . '>(static_cast<unsigned>(lhs) ^ static_cast<unsigned>(rhs))); }') .
nl ();
- if ($container_cpp_type)
+ if ($container_cxx_type)
{
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::H_AFTER_FIRST_CLASS;
@@ -89,7 +89,7 @@ sub _output_flag_ops ($$$)
sub _output_gtype_func_h ($$$$)
{
- my ($wrap_parser, $cpp_type, $flags, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $flags, $get_type_func) = @_;
my $type = undef;
if ($flags)
@@ -101,24 +101,24 @@ sub _output_gtype_func_h ($$$$)
$type = Common::Output::Shared::ENUM_TYPE;
}
- Common::Output::Shared::output_enum_gtype_func_h $wrap_parser, $cpp_type, $type, $get_type_func;
+ Common::Output::Shared::output_enum_gtype_func_h $wrap_parser, $cxx_type, $type, $get_type_func;
}
sub _output_gtype_func_cc ($$$)
{
- my ($wrap_parser, $cpp_type, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $get_type_func) = @_;
- Common::Output::Shared::output_enum_gtype_func_cc $wrap_parser, $cpp_type, $get_type_func;
+ Common::Output::Shared::output_enum_gtype_func_cc $wrap_parser, $cxx_type, $get_type_func;
}
sub output ($$$$$)
{
- my ($wrap_parser, $cpp_type, $members, $flags, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $members, $flags, $get_type_func) = @_;
- _output_enum $wrap_parser, $cpp_type, $members;
- _output_flag_ops $wrap_parser, $cpp_type, $flags;
- _output_gtype_func_h $wrap_parser, $cpp_type, $flags, $get_type_func;
- _output_gtype_func_cc $wrap_parser, $cpp_type, $get_type_func;
+ _output_enum $wrap_parser, $cxx_type, $members;
+ _output_flag_ops $wrap_parser, $cxx_type, $flags;
+ _output_gtype_func_h $wrap_parser, $cxx_type, $flags, $get_type_func;
+ _output_gtype_func_cc $wrap_parser, $cxx_type, $get_type_func;
}
1; # indicate proper module load.
diff --git a/tools/pm/Common/Output/GError.pm b/tools/pm/Common/Output/GError.pm
index 8cbb092..e55b361 100644
--- a/tools/pm/Common/Output/GError.pm
+++ b/tools/pm/Common/Output/GError.pm
@@ -30,7 +30,7 @@ sub nl
sub _output_gerror ($$$)
{
- my ($wrap_parser, $cpp_type, $members) = @_;
+ my ($wrap_parser, $cxx_type, $members) = @_;
my $string_members = Common::Output::Shared::convert_members_to_strings ($members);
my $section_manager = $wrap_parser->get_section_manager;
my $namespaces = $wrap_parser->get_namespaces;
@@ -41,7 +41,7 @@ sub _output_gerror ($$$)
$wrap_init = '::' . $namespaces->[0] . '::' . $wrap_init;
}
- my $code_string = nl ('class ' . $cpp_type . ' : public Glib::Error') .
+ my $code_string = nl ('class ' . $cxx_type . ' : public Glib::Error') .
nl ('{') .
nl ('public:') .
nl (' enum Code') .
@@ -49,8 +49,8 @@ sub _output_gerror ($$$)
nl (join nl (','), @{$string_members}) .
nl (' };') .
nl () .
- nl (' ' . $cpp_type . '(Code error_code, const Glib::ustring& error_message);') .
- nl (' explicit ' . $cpp_type . '(GError* gobject);') .
+ nl (' ' . $cxx_type . '(Code error_code, const Glib::ustring& error_message);') .
+ nl (' explicit ' . $cxx_type . '(GError* gobject);') .
nl (' Code code() const;') .
nl () .
nl (Common::Output::Shared::doxy_skip_begin) .
@@ -68,37 +68,37 @@ sub _output_gerror ($$$)
sub _output_gerror_gtype_h ($$$)
{
- my ($wrap_parser, $cpp_type, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $get_type_func) = @_;
- Common::Output::Shared::output_enum_gtype_func_h $wrap_parser, $cpp_type, Common::Output::Shared::ENUM_TYPE, $get_type_func;
+ Common::Output::Shared::output_enum_gtype_func_h $wrap_parser, $cxx_type, Common::Output::Shared::ENUM_TYPE, $get_type_func;
}
sub _output_gerror_impl ($$$)
{
- my ($wrap_parser, $cpp_type, $domain) = @_;
- my $container_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $full_cpp_type = join '::', $container_cpp_type, $cpp_type;
+ my ($wrap_parser, $cxx_type, $domain) = @_;
+ my $container_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $full_cxx_type = join '::', $container_cxx_type, $cxx_type;
my $section_manager->get_section_manager;
my $code_string = nl (Common::Output::Shared::open_namespaces $wrap_parser) .
- nl ($full_cpp_type . '::' . $cpp_type . '(' . $full_cpp_type . '::Code error_code, const Glib::ustring& error_message)') .
+ nl ($full_cxx_type . '::' . $cxx_type . '(' . $full_cxx_type . '::Code error_code, const Glib::ustring& error_message)') .
nl (':') .
nl (' Glib::Error(g_quark_from_static_string ("' . $domain . '"), error_code, error_message)') .
nl ('{}') .
nl () .
- nl ($full_cpp_type . '::' . $cpp_type . '(GError* gobject)') .
+ nl ($full_cxx_type . '::' . $cxx_type . '(GError* gobject)') .
nl (':') .
nl (' Glib::Error(gobject)') .
nl ('{}') .
nl () .
- nl ($full_cpp_type . '::Code ' . $full_cpp_type . '::code() const') .
+ nl ($full_cxx_type . '::Code ' . $full_cxx_type . '::code() const') .
nl ('{') .
nl (' return static_cast<Code>(Glib::Error::code());') .
nl ('}') .
nl () .
nl ('// static') .
- nl ('void ' . $full_cpp_type . '::throw_func(GError* gobject)') .
+ nl ('void ' . $full_cxx_type . '::throw_func(GError* gobject)') .
nl ('{') .
- nl (' throw ' . $full_cpp_type . '(gobject);') .
+ nl (' throw ' . $full_cxx_type . '(gobject);') .
nl ('}') .
nl () .
Common::Output::Shared::close_namespaces $wrap_parser;
@@ -109,19 +109,19 @@ sub _output_gerror_impl ($$$)
sub _output_gerror_gtype_cc ($$$)
{
- my ($wrap_parser, $cpp_type, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $get_type_func) = @_;
- Common::Output::Shared::output_enum_gtype_func_cc ($wrap_parser, $cpp_type, $get_type_func);
+ Common::Output::Shared::output_enum_gtype_func_cc ($wrap_parser, $cxx_type, $get_type_func);
}
sub output ($$$$$)
{
- my ($wrap_parser, $cpp_type, $members, $domain, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $members, $domain, $get_type_func) = @_;
- _output_gerror $wrap_parser, $cpp_type, $members;
- _output_gerror_gtype_h $wrap_parser, $cpp_type, $get_type_func;
- _output_gerror_impl $wrap_parser, $cpp_type, $domain;
- _output_gerror_gtype_cc $wrap_parser, $cpp_type, $get_type_func;
+ _output_gerror $wrap_parser, $cxx_type, $members;
+ _output_gerror_gtype_h $wrap_parser, $cxx_type, $get_type_func;
+ _output_gerror_impl $wrap_parser, $cxx_type, $domain;
+ _output_gerror_gtype_cc $wrap_parser, $cxx_type, $get_type_func;
}
1; # indicate proper module load.
diff --git a/tools/pm/Common/Output/GObject.pm b/tools/pm/Common/Output/GObject.pm
index 7409f66..2257537 100644
--- a/tools/pm/Common/Output/GObject.pm
+++ b/tools/pm/Common/Output/GObject.pm
@@ -32,7 +32,7 @@ sub _output_h_before_namespace ($$$)
{
my ($wrap_parser, $c_type, $c_class_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
my $subconditional = Common::Output::Shared::struct_prototype $wrap_parser, $c_type, $c_class_type;
my $variable = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::NO_WRAP_FUNCTION;
my $conditional = Common::Output::Shared::generate_conditional ($wrap_parser);
@@ -43,7 +43,7 @@ sub _output_h_before_namespace ($$$)
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($variable, $conditional);
my $code_string = Common::Output::Shared::open_namespaces ($wrap_parser) .
- nl ('class ' . $cpp_class_type . ';') .
+ nl ('class ' . $cxx_class_type . ';') .
Common::Output::Shared::close_namespaces ($wrap_parser) .
nl ();
$section_manager->append_string ($code_string);
@@ -52,16 +52,16 @@ sub _output_h_before_namespace ($$$)
sub _output_h_in_class ($$$$$$)
{
- my ($wrap_parser, $c_type, $c_parent_type, $c_class_type, $cpp_type, $cpp_parent_type) = @_;
+ my ($wrap_parser, $c_type, $c_parent_type, $c_class_type, $cxx_type, $cxx_parent_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
my $code_string = nl (Common::Output::Shared::doxy_skip_begin) .
nl () .
nl ('public:') .
- nl (' typedef ' . $cpp_type . ' CppObjectType;') .
- nl (' typedef ' . $cpp_class_type . ' CppClassType;') .
- nl (' typedef ' . $cpp_parent_type . ' CppParentType;') .
+ nl (' typedef ' . $cxx_type . ' CppObjectType;') .
+ nl (' typedef ' . $cxx_class_type . ' CppClassType;') .
+ nl (' typedef ' . $cxx_parent_type . ' CppParentType;') .
nl (' typedef ' . $c_type . ' BaseObjectType;') .
nl (' typedef ' . $c_class_type . ' BaseClassType;') .
nl (' typedef ' . $c_parent_type . ' BaseParentType;') .
@@ -81,23 +81,23 @@ sub _output_h_in_class ($$$$$$)
$section_manager->set_variable_for_conditional ($variable, $conditional);
my $virtual_dtor = 1;
- my $base_member = lc ($cpp_class_type) . '_';
+ my $base_member = lc ($cxx_class_type) . '_';
- $code_string = nl (' friend class ' . $cpp_class_type . ';') .
+ $code_string = nl (' friend class ' . $cxx_class_type . ';') .
nl (' static CppClassType ' . $base_member . ';') .
nl () .
nl ('private:') .
nl (' // noncopyable') .
- nl (Common::Output::Shared::copy_protos_str $cpp_type) .
+ nl (Common::Output::Shared::copy_protos_str $cxx_type) .
nl () .
nl ('protected:') .
- nl (' explicit ' . $cpp_type . '(const Glib::ConstructParams& construct_params);') .
- nl (' explicit ' . $cpp_type . '(' . $c_type . '* castitem);') .
+ nl (' explicit ' . $cxx_type . '(const Glib::ConstructParams& construct_params);') .
+ nl (' explicit ' . $cxx_type . '(' . $c_type . '* castitem);') .
nl () .
nl (Common::Output::Shared::doxy_skip_end) .
nl () .
nl ('public:') .
- nl (Common::Output::Shared::dtor_proto_str $cpp_type, $virtual_dtor) .
+ nl (Common::Output::Shared::dtor_proto_str $cxx_type, $virtual_dtor) .
nl () .
nl (Common::Output::Shared::doxy_skip_begin) .
nl (' static GType get_type() G_GNUC_CONST;');
@@ -139,20 +139,20 @@ sub _output_h_after_namespace ($$)
sub _output_p_h ($$$$$)
{
- my ($wrap_parser, $c_type, $c_class_type, $c_parent_class_type, $cpp_parent_type) = @_;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $cpp_parent_class_type = $cpp_parent_type . '::CppClassType';
+ my ($wrap_parser, $c_type, $c_class_type, $c_parent_class_type, $cxx_parent_type) = @_;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $cxx_parent_class_type = $cxx_parent_type . '::CppClassType';
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = nl ('#include <glibmm/class.h>') .
nl () .
Common::Output::Shared::open_namespaces ($wrap_parser) .
nl () .
- nl ('class ' . $cpp_class_type . ' : public Glib::Class') .
+ nl ('class ' . $cxx_class_type . ' : public Glib::Class') .
nl ('{') .
nl ('public:') .
nl (Common::Output::Shared::doxy_skip_begin) .
- nl (' typedef ' . $full_cpp_type . ' CppObjectType;') .
+ nl (' typedef ' . $full_cxx_type . ' CppObjectType;') .
nl (' typedef ' . $c_type . ' BaseObjectType;');
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::P_H_GENERATED;
@@ -162,16 +162,16 @@ sub _output_p_h ($$$$$)
my $do_not_derive_gtype_var = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::DO_NOT_DERIVE_GTYPE;
my $conditional = Common::Output::Shared::generate_conditional ($wrap_parser);
- $code_string = nl (' typedef ' . $cpp_parent_class_type . ' CppClassParent;');
+ $code_string = nl (' typedef ' . $cxx_parent_class_type . ' CppClassParent;');
$section_manager->append_string_to_conditional ($code_string, $conditional, 1);
$code_string = nl (' typedef ' . $c_class_type . ' BaseClassType;') .
- nl (' typedef ' . $cpp_parent_class_type . ' CppClassParent;') .
+ nl (' typedef ' . $cxx_parent_class_type . ' CppClassParent;') .
nl (' typedef ' . $c_parent_class_type . ' BaseClassParent;');
$section_manager->append_string_to_conditional ($code_string, $conditional, 0);
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($do_not_derive_gtype_var, $conditional);
$code_string = nl () .
- nl (' friend class ' . $full_cpp_type . ';') .
+ nl (' friend class ' . $full_cxx_type . ';') .
nl (Common::Output::Shared::doxy_skip_end) .
nl () .
nl (' const Glib::Class& init();') .
@@ -216,10 +216,10 @@ sub _output_p_h ($$$$$)
sub _output_cc ($$$$$$)
{
- my ($wrap_parser, $c_type, $c_parent_type, $get_type_func, $cpp_type, $cpp_parent_type) = @_;
+ my ($wrap_parser, $c_type, $c_parent_type, $get_type_func, $cxx_type, $cxx_parent_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $complete_cpp_type = Common::Output::Shared::get_complete_cpp_type $wrap_parser;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $complete_cxx_type = Common::Output::Shared::get_complete_cxx_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
{
my $mm_module = $wrap_parser->get_mm_module;
@@ -245,9 +245,9 @@ sub _output_cc ($$$$$$)
my $code_string = nl ('namespace Glib') .
nl ('{') .
nl () .
- nl ('Glib::RefPtr< ' . $complete_cpp_type . ' > wrap(' . $c_type . '* object, bool take_copy)') .
+ nl ('Glib::RefPtr< ' . $complete_cxx_type . ' > wrap(' . $c_type . '* object, bool take_copy)') .
nl ('{') .
- nl (' return Glib::RefPtr< ' . $complete_cpp_type . ' >(dynamic_cast< ' . $complete_cpp_type . '* >(Glib::wrap_auto (reinterpret_cast< GObject* >(object), take_copy)));') .
+ nl (' return Glib::RefPtr< ' . $complete_cxx_type . ' >(dynamic_cast< ' . $complete_cxx_type . '* >(Glib::wrap_auto (reinterpret_cast< GObject* >(object), take_copy)));') .
nl (' // We use dynamic_cast<> in case of multiple inheritance.') .
nl ('}') .
nl () .
@@ -262,7 +262,7 @@ sub _output_cc ($$$$$$)
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($no_wrap_function_var, $conditional);
$code_string = Common::Output::Shared::open_namespaces ($wrap_parser) .
- nl ($c_type . '* ' . $full_cpp_type . '::gobj_copy()') .
+ nl ($c_type . '* ' . $full_cxx_type . '::gobj_copy()') .
nl ('{') .
nl (' reference();') .
nl (' return gobj();') .
@@ -273,9 +273,9 @@ sub _output_cc ($$$$$$)
my $custom_ctor_cast_var = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_CTOR_CAST;
- $code_string = nl ($full_cpp_type . '::' . $cpp_type . '(const Glib::ConstructParams& construct_params)') .
+ $code_string = nl ($full_cxx_type . '::' . $cxx_type . '(const Glib::ConstructParams& construct_params)') .
nl (':') .
- nl (' ' . $cpp_parent_type . '(construct_params)') .
+ nl (' ' . $cxx_parent_type . '(construct_params)') .
nl ('{');
$section_manager->append_string_to_conditional ($code_string, $conditional, 0);
@@ -284,9 +284,9 @@ sub _output_cc ($$$$$$)
$section_manager->append_conditional_to_conditional ($subconditional, $conditional, 0);
$code_string = nl ('}') .
nl () .
- nl ($full_cpp_type . '::' . $cpp_type . '(' . $c_type . '* castitem)') .
+ nl ($full_cxx_type . '::' . $cxx_type . '(' . $c_type . '* castitem)') .
nl (':') .
- nl (' ' . $cpp_parent_type . '(reinterpret_cast< ' . $c_parent_type . '* >(castitem))') .
+ nl (' ' . $cxx_parent_type . '(reinterpret_cast< ' . $c_parent_type . '* >(castitem))') .
nl ('{}') .
nl ();
$section_manager->append_string_to_conditional ($code_string, $conditional, 0);
@@ -295,28 +295,28 @@ sub _output_cc ($$$$$$)
$conditional = Common::Output::Shared::generate_conditional ($wrap_parser);
my $custom_dtor_var = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_DTOR;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
- $code_string = nl ($full_cpp_type . '::~' . $cpp_type . '()') .
+ $code_string = nl ($full_cxx_type . '::~' . $cxx_type . '()') .
nl ('{}') .
nl ();
$section_manager->append_string_to_conditional ($code_string, $conditional, 0);
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($custom_dtor_var, $conditional);
- my $base_member = lc ($cpp_class_type) . '_';
+ my $base_member = lc ($cxx_class_type) . '_';
# TODO: move to Shared?
- $code_string = nl ($full_cpp_type . '::CppClassType ' . $full_cpp_type . '::' . $base_member . '; // Initialize static member') .
+ $code_string = nl ($full_cxx_type . '::CppClassType ' . $full_cxx_type . '::' . $base_member . '; // Initialize static member') .
nl () .
- nl ('GType ' . $full_cpp_type . '::get_type()') .
+ nl ('GType ' . $full_cxx_type . '::get_type()') .
nl ('{') .
nl (' return ' . $base_member . '.init().get_type();') .
nl ('}') .
nl ();
$section_manager->append_string ($code_string);
$conditional = Common::Output::Shared::generate_conditional ($wrap_parser);
- $code_string = nl ('GType ' . $full_cpp_type . '::get_type(GTypeModule* module)') .
+ $code_string = nl ('GType ' . $full_cxx_type . '::get_type(GTypeModule* module)') .
nl ('{') .
nl (' return ' . $base_member . '.init(module).get_type();') .
nl ('}') .
@@ -327,7 +327,7 @@ sub _output_cc ($$$$$$)
$section_manager->append_string_to_conditional ($code_string, $conditional, 1);
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($dynamic_gtype_registration_var, $conditional);
- $code_string = nl ('GType ' . $full_cpp_type . '::get_base_type()') .
+ $code_string = nl ('GType ' . $full_cxx_type . '::get_base_type()') .
nl ('{') .
nl (' return ' . $get_type_func . '();') .
nl ('}') .
@@ -341,7 +341,7 @@ sub _output_cc ($$$$$$)
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_PROPERTY_PROXIES),
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_DEFAULT_SIGNAL_HANDLERS),
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_VFUNCS),
- (Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_VFUNCS_CPP_WRAPPER),
+ (Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_VFUNCS_CXX_WRAPPER),
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::P_CC_NAMESPACE)
);
@@ -358,9 +358,9 @@ sub _output_p_cc ($$$$)
{
my ($wrap_parser, $c_type, $c_type_class, $get_type_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
- my $code_string = nl ('const Glib::Class& ' . $cpp_class_type . '::init()') .
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
+ my $code_string = nl ('const Glib::Class& ' . $cxx_class_type . '::init()') .
nl ('{') .
nl (' if (!gtype_) // create the GType if necessary') .
nl (' {');
@@ -375,7 +375,7 @@ sub _output_p_cc ($$$$)
$code_string = nl (' gtype_ = CppClassParent::CppObjectType::get_type();');
$section_manager->append_string_to_conditional ($code_string, $conditional, 1);
$code_string = nl (' // Glib::Class has to know the class init function to clone custom types.') .
- nl (' class_init_func_ = &' . $cpp_class_type . '::class_init_function;') .
+ nl (' class_init_func_ = &' . $cxx_class_type . '::class_init_function;') .
nl () .
nl (' // This is actually just optimized away, apparently with no harm.') .
nl (' // Make sure that the parent type has been created.') .
@@ -403,7 +403,7 @@ sub _output_p_cc ($$$$)
my $dynamic_gtype_registration_var = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::DYNAMIC_GTYPE_REGISTRATION;
- $code_string = nl ('const Glib::Class& ' . $cpp_class_type . '::init(GTypeModule* module)') .
+ $code_string = nl ('const Glib::Class& ' . $cxx_class_type . '::init(GTypeModule* module)') .
nl ('{') .
nl (' if (!gtype_) // create the GType if necessary') .
nl (' {');
@@ -416,7 +416,7 @@ sub _output_p_cc ($$$$)
nl (' gtype_ = CppClassParent::CppObjectType::get_type();');
$section_manager->append_string_to_conditional ($code_string, $subconditional, 1);
$code_string = nl (' // Glib::Class has to know the class init function to clone custom types.') .
- nl (' class_init_func_ = &' . $cpp_class_type . '::class_init_function;') .
+ nl (' class_init_func_ = &' . $cxx_class_type . '::class_init_function;') .
nl () .
nl (' // This is actually just optimized away, apparently with no harm.') .
nl (' // Make sure that the parent type has been created.') .
@@ -443,7 +443,7 @@ sub _output_p_cc ($$$$)
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($dynamic_gtype_registration_var, $conditional);
$conditional = Common::Output::Shared::generate_conditional ($wrap_parser);
- $code_string = nl ('void ' . $cpp_class_type . '::class_init_function(void* g_class, void* class_data)') .
+ $code_string = nl ('void ' . $cxx_class_type . '::class_init_function(void* g_class, void* class_data)') .
nl ('{') .
nl (' BaseClassType* const klass = static_cast< BaseClassType* >(g_class);') .
nl (' CppClassParent::class_init_function(klass, class_data);') .
@@ -481,9 +481,9 @@ sub _output_p_cc ($$$$)
$section_manager->append_string (nl);
}
- $code_string = nl ('Glib::ObjectBase* ' . $cpp_class_type . '::wrap_new(GObject* object)') .
+ $code_string = nl ('Glib::ObjectBase* ' . $cxx_class_type . '::wrap_new(GObject* object)') .
nl ('{') .
- nl (' return new ' . $full_cpp_type . '(reinterpret_cast< ' . $c_type . '* >(object));') .
+ nl (' return new ' . $full_cxx_type . '(reinterpret_cast< ' . $c_type . '* >(object));') .
nl ('}') .
nl ();
$conditional = Common::Output::Shared::generate_conditional ($wrap_parser);
@@ -498,13 +498,13 @@ sub _output_p_cc ($$$$)
sub output ($$$$$$$$)
{
- my ($wrap_parser, $c_type, $c_class_type, $c_parent_type, $c_parent_class_type, $get_type_func, $cpp_type, $cpp_parent_type) = @_;
+ my ($wrap_parser, $c_type, $c_class_type, $c_parent_type, $c_parent_class_type, $get_type_func, $cxx_type, $cxx_parent_type) = @_;
_output_h_before_namespace $wrap_parser, $c_type, $c_class_type;
- _output_h_in_class $wrap_parser, $c_type, $c_parent_type, $c_class_type, $cpp_type, $cpp_parent_type;
+ _output_h_in_class $wrap_parser, $c_type, $c_parent_type, $c_class_type, $cxx_type, $cxx_parent_type;
_output_h_after_namespace $wrap_parser, $c_type;
- _output_p_h $wrap_parser, $c_type, $c_class_type, $c_parent_class_type, $cpp_parent_type;
- _output_cc $wrap_parser, $c_type, $c_parent_type, $get_type_func, $cpp_type, $cpp_parent_type;
+ _output_p_h $wrap_parser, $c_type, $c_class_type, $c_parent_class_type, $cxx_parent_type;
+ _output_cc $wrap_parser, $c_type, $c_parent_type, $get_type_func, $cxx_type, $cxx_parent_type;
_output_p_cc $wrap_parser, $c_type, $c_class_type, $get_type_func;
}
diff --git a/tools/pm/Common/Output/Generic.pm b/tools/pm/Common/Output/Generic.pm
index 9d43560..5796037 100644
--- a/tools/pm/Common/Output/Generic.pm
+++ b/tools/pm/Common/Output/Generic.pm
@@ -30,14 +30,14 @@ sub nl
sub output ($$$)
{
- my ($wrap_parser, $c_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
my $cc_end_section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_GENERATED;
my $cc_namespace_section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_NAMESPACE;
my $code_string = nl ('public:') .
nl (Common::Output::Shared::doxy_skip_begin) .
- nl (' typedef ' . $cpp_type . ' CppObjectType;') .
+ nl (' typedef ' . $cxx_type . ' CppObjectType;') .
nl (' typedef ' . $c_type . ' BaseObjectType;') .
nl (Common::Output::Shared::doxy_skip_end) .
nl () .
diff --git a/tools/pm/Common/Output/Interface.pm b/tools/pm/Common/Output/Interface.pm
index 5233fd7..5855865 100644
--- a/tools/pm/Common/Output/Interface.pm
+++ b/tools/pm/Common/Output/Interface.pm
@@ -38,10 +38,10 @@ sub _output_h_before_first_namespace ($$$)
$section_manager->push_section ($section);
$section_manager->append_conditional ($conditional);
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
my $code_string = nl (Common::Output::Shared::open_namespaces $wrap_parser) .
nl () .
- nl ('class ' . $cpp_class_type . ';') .
+ nl ('class ' . $cxx_class_type . ';') .
nl () .
nl (Common::Output::Shared::close_namespaces $wrap_parser) .
nl ();
@@ -52,10 +52,10 @@ sub _output_h_before_first_namespace ($$$)
sub _output_h_in_class ($$$$)
{
- my ($wrap_parser, $c_type, $c_class_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $c_class_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
- my $base_member = lc ($cpp_class_type) . '_';
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
+ my $base_member = lc ($cxx_class_type) . '_';
my $virtual_dtor = 1;
my $copy_proto = 'no';
my $reinterpret = 1;
@@ -64,20 +64,20 @@ sub _output_h_in_class ($$$$)
nl (Common::Output::Shared::doxy_skip_begin) .
nl () .
nl ('public:') .
- nl (' typedef ' . $cpp_type . ' CppObjectType;') .
- nl (' typedef ' . $cpp_class_type . ' CppClassType;') .
+ nl (' typedef ' . $cxx_type . ' CppObjectType;') .
+ nl (' typedef ' . $cxx_class_type . ' CppClassType;') .
nl (' typedef ' . $c_type . ' BaseObjectType;') .
nl (' typedef ' . $c_class_type . ' BaseClassType;') .
nl () .
nl ('private:') .
- nl (' friend class ' . $cpp_class_type . ';') .
+ nl (' friend class ' . $cxx_class_type . ';') .
nl (' static CppClassType ' . $base_member . ';') .
nl () .
nl (' // noncopyable') .
- nl (Common::Output::Shared::copy_protos_str $cpp_type) .
+ nl (Common::Output::Shared::copy_protos_str $cxx_type) .
nl () .
nl ('protected:') .
- nl (' ' . $cpp_type . '(); // You must derive from this class.') .
+ nl (' ' . $cxx_type . '(); // You must derive from this class.') .
nl () .
nl (' /** Called by constructors of derived classes. Provide the result of') .
nl (' * the Class init() function to ensure that it is properly') .
@@ -85,18 +85,18 @@ sub _output_h_in_class ($$$$)
nl (' *') .
nl (' * @param interface_class The Class object for the derived type.') .
nl (' */') .
- nl (' explicit ' . $cpp_type . '(const Glib::Interface_class& interface_class);') .
+ nl (' explicit ' . $cxx_type . '(const Glib::Interface_class& interface_class);') .
nl () .
nl ('public:') .
nl (' // This is public so that C++ wrapper instances can be') .
nl (' // created for C instances of unwrapped types.') .
nl (' // For instance, if an unexpected C type implements the C interface.') .
- nl (' explicit ' . $cpp_type . '(' . $c_type . '* castitem);') .
+ nl (' explicit ' . $cxx_type . '(' . $c_type . '* castitem);') .
nl () .
nl (Common::Output::Shared::doxy_skip_end) .
nl () .
nl ('public:') .
- nl (Common::Output::Shared::dtor_proto_str $cpp_type, $virtual_dtor) .
+ nl (Common::Output::Shared::dtor_proto_str $cxx_type, $virtual_dtor) .
nl () .
nl (' static void add_interface(GType gtype_implementer);') .
nl () .
@@ -134,24 +134,24 @@ sub _output_h_after_first_namespace ($$)
sub _output_p_h ($$$$)
{
- my ($wrap_parser, $c_type, $c_class_type, $cpp_parent_type) = @_;
+ my ($wrap_parser, $c_type, $c_class_type, $cxx_parent_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
- my $cpp_parent_class_type = $cpp_parent_type . '::CppClassType';
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
+ my $cxx_parent_class_type = $cxx_parent_type . '::CppClassType';
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $code_string = nl ('#include <glibmm/private/interface_p.h>') .
nl () .
nl (Common::Output::Shared::open_namespaces $wrap_parser) .
nl () .
- nl ('class ' . $cpp_class_type . ' : public ' . $cpp_parent_class_type) .
+ nl ('class ' . $cxx_class_type . ' : public ' . $cxx_parent_class_type) .
nl ('{') .
nl ('public:') .
- nl (' typedef ' . $full_cpp_type . ' CppObjectType;') .
+ nl (' typedef ' . $full_cxx_type . ' CppObjectType;') .
nl (' typedef ' . $c_type . ' BaseObjectType;') .
nl (' typedef ' . $c_class_type . ' BaseClassType;') .
- nl (' typedef ' . $cpp_parent_class_type . ' CppClassParent;') .
+ nl (' typedef ' . $cxx_parent_class_type . ' CppClassParent;') .
nl () .
- nl (' friend class ' . $full_cpp_type . ';') .
+ nl (' friend class ' . $full_cxx_type . ';') .
nl () .
nl (' const Glib::Interface_Class& init();') .
nl () .
@@ -186,18 +186,18 @@ sub _output_p_h ($$$$)
sub _output_cc ($$$$$$)
{
- my ($wrap_parser, $c_type, $c_parent_type, $cpp_type, $cpp_parent_type, $get_type_func) = @_;
+ my ($wrap_parser, $c_type, $c_parent_type, $cxx_type, $cxx_parent_type, $get_type_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $conditional = Common::Output::Shared::generate_conditional $wrap_parser;
my $no_wrap_function_var = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::NO_WRAP_FUNCTION;
- my $complete_cpp_type = Common::Output::Shared::get_complete_cpp_type $wrap_parser;
+ my $complete_cxx_type = Common::Output::Shared::get_complete_cxx_type $wrap_parser;
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_GENERATED;
my $code_string = nl ('namespace Glib') .
nl ('{') .
nl () .
- nl ('Glib::RefPtr< ' . $complete_cpp_type . '> wrap(' . $c_type . '* object, bool take_copy)') .
+ nl ('Glib::RefPtr< ' . $complete_cxx_type . '> wrap(' . $c_type . '* object, bool take_copy)') .
nl ('{') .
- nl (' return Glib::RefPtr< ' . $complete_cpp_type . ' >(dynamic_cast< ' . $complete_cpp_type . '* >(Glib::wrap_auto_interface< ' . $complete_cpp_type . ' >(static_cast<GObject*>(object), take_copy)));') .
+ nl (' return Glib::RefPtr< ' . $complete_cxx_type . ' >(dynamic_cast< ' . $complete_cxx_type . '* >(Glib::wrap_auto_interface< ' . $complete_cxx_type . ' >(static_cast<GObject*>(object), take_copy)));') .
nl (' // We use dynamic_cast<> in case of multiple inheritance.') .
nl ('}') .
nl () .
@@ -209,54 +209,54 @@ sub _output_cc ($$$$$$)
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($no_wrap_function_var, $conditional);
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
- my $base_member = lc ($cpp_class_type) . '_';
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
+ my $base_member = lc ($cxx_class_type) . '_';
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
$code_string = nl (Common::Output::Shared::open_namespaces $wrap_parser) .
- nl ($full_cpp_type . '::' . $cpp_type . '()') .
+ nl ($full_cxx_type . '::' . $cxx_type . '()') .
nl (':') .
- nl (' ' . $cpp_parent_type . '(' . $base_member . '.init())') .
+ nl (' ' . $cxx_parent_type . '(' . $base_member . '.init())') .
nl ('{}') .
nl () .
- nl ($full_cpp_type . '::' . $cpp_type . '(' . $c_type . '* castitem)') .
+ nl ($full_cxx_type . '::' . $cxx_type . '(' . $c_type . '* castitem)') .
nl (':') .
- nl (' ' . $cpp_parent_type . '(static_cast< ' . $c_parent_type . '* >(castitem))') .
+ nl (' ' . $cxx_parent_type . '(static_cast< ' . $c_parent_type . '* >(castitem))') .
nl ('{}') .
nl () .
- nl ($full_cpp_type . '::' . $cpp_type . '(const Glib::Interface_Class& interface_class)') .
+ nl ($full_cxx_type . '::' . $cxx_type . '(const Glib::Interface_Class& interface_class)') .
nl (':') .
- nl (' ' . $cpp_parent_type . '(interface_class)') .
+ nl (' ' . $cxx_parent_type . '(interface_class)') .
nl ('{}') .
nl () .
- nl ($full_cpp_type . '::~' . $cpp_type . '()') .
+ nl ($full_cxx_type . '::~' . $cxx_type . '()') .
nl ('{}') .
nl () .
nl ('// static') .
- nl ('void ' . $full_cpp_type . '::add_interface(GType gtype_implementer)') .
+ nl ('void ' . $full_cxx_type . '::add_interface(GType gtype_implementer)') .
nl ('{') .
nl (' ' . $base_member . '.init().add_interface(gtype_implementer);') .
nl ('}') .
nl () .
- nl ($full_cpp_type . '::CppClassType ' . $full_cpp_type . '::' . $base_member . '; // initialize static member') .
+ nl ($full_cxx_type . '::CppClassType ' . $full_cxx_type . '::' . $base_member . '; // initialize static member') .
nl () .
- nl ('GType ' . $full_cpp_type . '::get_type()') .
+ nl ('GType ' . $full_cxx_type . '::get_type()') .
nl ('{') .
nl (' return ' . $base_member . '.init().get_type();') .
nl ('}') .
nl ();
$section_manager->append_string ($code_string);
# TODO: move to Shared?
- $code_string = nl ($full_cpp_type . '::CppClassType ' . $full_cpp_type . '::' . $base_member . '; // Initialize static member') .
+ $code_string = nl ($full_cxx_type . '::CppClassType ' . $full_cxx_type . '::' . $base_member . '; // Initialize static member') .
nl () .
- nl ('GType ' . $full_cpp_type . '::get_type()') .
+ nl ('GType ' . $full_cxx_type . '::get_type()') .
nl ('{') .
nl (' return ' . $base_member . '.init().get_type();') .
nl ('}') .
nl ();
$section_manager->append_string ($code_string);
$conditional = Common::Output::Shared::generate_conditional ($wrap_parser);
- $code_string = nl ('GType ' . $full_cpp_type . '::get_type(GTypeModule* module)') .
+ $code_string = nl ('GType ' . $full_cxx_type . '::get_type(GTypeModule* module)') .
nl ('{') .
nl (' return ' . $base_member . '.init(module).get_type();') .
nl ('}') .
@@ -267,7 +267,7 @@ sub _output_cc ($$$$$$)
$section_manager->append_string_to_conditional ($code_string, $conditional, 1);
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($dynamic_gtype_registration_var, $conditional);
- $code_string = nl ('GType ' . $full_cpp_type . '::get_base_type()') .
+ $code_string = nl ('GType ' . $full_cxx_type . '::get_base_type()') .
nl ('{') .
nl (' return ' . $get_type_func . '();') .
nl ('}') .
@@ -281,7 +281,7 @@ sub _output_cc ($$$$$$)
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_PROPERTY_PROXIES),
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_DEFAULT_SIGNAL_HANDLERS),
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_VFUNCS),
- (Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_VFUNCS_CPP_WRAPPER),
+ (Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_VFUNCS_CXX_WRAPPER),
(Common::Output::Shared::get_section $wrap_parser, Common::Sections::P_CC_NAMESPACE)
);
@@ -299,15 +299,15 @@ sub _output_p_cc ($$$)
{
my ($wrap_parser, $c_type, $get_type_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $cpp_class_type = Common::Output::Shared::get_class_type $wrap_parser;
- my $code_string = nl ('const Glib::Interface_Class& ' . $cpp_class_type . '::init()') .
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_class_type $wrap_parser;
+ my $code_string = nl ('const Glib::Interface_Class& ' . $cxx_class_type . '::init()') .
nl ('{') .
nl (' if (!gtype) // create GType if necessary.') .
nl (' {') .
nl (' // Glib::Interface_Class has to know the interface init function') .
nl (' // in order to add interfaces to implementing types') .
- nl (' class_init_func_ = &' . $cpp_class_type . '::iface_init_function;') .
+ nl (' class_init_func_ = &' . $cxx_class_type . '::iface_init_function;') .
nl () .
nl (' // We can not derive from another interface and it is not necessary anyway.') .
nl (' gtype_ = ' . $get_type_func . '();') .
@@ -316,7 +316,7 @@ sub _output_p_cc ($$$)
nl (' return *this;') .
nl ('}') .
nl () .
- nl ('void ' . $cpp_class_type . '::iface_init_function(void* g_iface, void*)') .
+ nl ('void ' . $cxx_class_type . '::iface_init_function(void* g_iface, void*)') .
nl ('{') .
nl (' BaseClassType* const klass(static_cast<BaseClassType*>(g_iface));') .
nl () .
@@ -355,9 +355,9 @@ sub _output_p_cc ($$$)
$section_manager->append_string (nl);
}
- $code_string = nl ('Glib::ObjectBase* ' . $cpp_class_type . '::wrap_new(GObject* object)') .
+ $code_string = nl ('Glib::ObjectBase* ' . $cxx_class_type . '::wrap_new(GObject* object)') .
nl ('{') .
- nl (' return new ' . $full_cpp_type . '(static_cast< ' . $c_type .' >(object));') .
+ nl (' return new ' . $full_cxx_type . '(static_cast< ' . $c_type .' >(object));') .
nl ('}');
$section_manager->append_string ($code_string);
$section_manager->pop_entry;
@@ -365,13 +365,13 @@ sub _output_p_cc ($$$)
sub output ($$$$$$$)
{
- my ($wrap_parser, $c_type, $c_class_type, $c_parent_type, $cpp_type, $cpp_parent_type, $get_type_func) = @_;
+ my ($wrap_parser, $c_type, $c_class_type, $c_parent_type, $cxx_type, $cxx_parent_type, $get_type_func) = @_;
_output_h_before_first_namespace $wrap_parser, $c_type, $c_class_type;
- _output_h_in_class $wrap_parser, $c_type, $c_class_type, $cpp_type;
+ _output_h_in_class $wrap_parser, $c_type, $c_class_type, $cxx_type;
_output_h_after_first_namespace $wrap_parser, $c_type;
- _output_p_h $wrap_parser, $c_type, $c_class_type, $cpp_parent_type;
- _output_cc $wrap_parser, $c_type, $c_parent_type, $cpp_type, $cpp_parent_type, $get_type_func;
+ _output_p_h $wrap_parser, $c_type, $c_class_type, $cxx_parent_type;
+ _output_cc $wrap_parser, $c_type, $c_parent_type, $cxx_type, $cxx_parent_type, $get_type_func;
_output_cc_p $wrap_parser, $c_type, $get_type_func;
}
diff --git a/tools/pm/Common/Output/Method.pm b/tools/pm/Common/Output/Method.pm
index 3eb8188..bea505f 100644
--- a/tools/pm/Common/Output/Method.pm
+++ b/tools/pm/Common/Output/Method.pm
@@ -30,23 +30,23 @@ sub nl
sub _output_h ($$$$$$$$)
{
- my ($wrap_parser, $static, $cpp_ret_type, $cpp_func_name, $cpp_param_types, $cpp_param_names, $cxx_param_values, $const) = @_;
+ my ($wrap_parser, $static, $cxx_ret_type, $cxx_func_name, $cxx_param_types, $cxx_param_names, $cxx_param_values, $const) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
my $code_string = '';
- die if (scalar (@{$cpp_param_types}) != scalar(@{$cpp_param_names}));
+ die if (scalar (@{$cxx_param_types}) != scalar(@{$cxx_param_names}));
die if ($static and $const);
if ($static)
{
$code_string .= 'static ';
}
- $code_string .= $cpp_ret_type . ' ' . $cpp_func_name;
+ $code_string .= $cxx_ret_type . ' ' . $cxx_func_name;
- my $cpp_params_str = Common::Output::Shared::paramzipstr $cpp_param_types, $cpp_param_names, $cxx_param_values;
+ my $cxx_params_str = Common::Output::Shared::paramzipstr $cxx_param_types, $cxx_param_names, $cxx_param_values;
- $code_string .= '(' . $cpp_params_str . ')';
+ $code_string .= '(' . $cxx_params_str . ')';
if ($const)
{
$code_string .= ' const';
@@ -57,21 +57,21 @@ sub _output_h ($$$$$$$$)
sub _output_cc ($$$$$$$$$$$$$$$$$)
{
- my ($wrap_parser, $static, $cpp_ret_type, $cpp_func_name, $cpp_param_types, $cpp_param_names, $cxx_param_out_index, $const, $constversion, $deprecated, $ifdef, $c_ret_type, $ret_transfer, $c_func_name, $c_param_types, $c_param_transfers, $errthrow) = @_;
+ my ($wrap_parser, $static, $cxx_ret_type, $cxx_func_name, $cxx_param_types, $cxx_param_names, $cxx_param_out_index, $const, $constversion, $deprecated, $ifdef, $c_ret_type, $ret_transfer, $c_func_name, $c_param_types, $c_param_transfers, $errthrow) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = '';
- my $ret_void = ($cpp_ret_type eq 'void');
+ my $ret_void = ($cxx_ret_type eq 'void');
# TODO: replace with exception throwing
# if dies then it is internal error. should not happen here.
die if ($static and ($const or $constversion));
- die if (scalar (@{$cpp_param_types}) != scalar(@{$cpp_param_names}));
+ die if (scalar (@{$cxx_param_types}) != scalar(@{$cxx_param_names}));
if ($cxx_param_out_index < 0) {
- die if (scalar (@{$c_param_types}) != scalar(@{$cpp_param_types}));
+ die if (scalar (@{$c_param_types}) != scalar(@{$cxx_param_types}));
}
else
{
- die if (scalar (@{$c_param_types}) + 1 != scalar(@{$cpp_param_types}));
+ die if (scalar (@{$c_param_types}) + 1 != scalar(@{$cxx_param_types}));
}
if ($deprecated)
@@ -87,14 +87,14 @@ sub _output_cc ($$$$$$$$$$$$$$$$$)
$code_string .= nl ('// static');
}
- my $cpp_params_str = Common::Output::Shared::paramzipstr $cpp_param_types, $cpp_param_names;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $cxx_params_str = Common::Output::Shared::paramzipstr $cxx_param_types, $cxx_param_names;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $c_type = Common::Output::Shared::get_c_type $wrap_parser;
- $code_string .= nl ($cpp_ret_type . ' ' . $full_cpp_type . '::' . $cpp_func_name . '(' . $cpp_params_str . ')' . ($const ? ' const' : '')) .
+ $code_string .= nl ($cxx_ret_type . ' ' . $full_cxx_type . '::' . $cxx_func_name . '(' . $cxx_params_str . ')' . ($const ? ' const' : '')) .
nl ('{');
- my $names_only = join ', ', @{$cpp_param_names};
+ my $names_only = join ', ', @{$cxx_param_names};
if ($constversion)
{
@@ -104,7 +104,7 @@ sub _output_cc ($$$$$$$$$$$$$$$$$)
{
$ret = 'return ';
}
- $code_string .= nl (' ' . $ret . 'const_cast< ' . $full_cpp_type . '* >(this)->' . $cpp_func_name . '(' . $names_only . ');');
+ $code_string .= nl (' ' . $ret . 'const_cast< ' . $full_cxx_type . '* >(this)->' . $cxx_func_name . '(' . $names_only . ');');
}
else
{
@@ -128,14 +128,14 @@ sub _output_cc ($$$$$$$$$$$$$$$$$)
if ($cxx_param_out_index < 0)
{
- $prepped_cxx_param_types = $cpp_param_types;
- $prepped_cxx_param_names = $cpp_param_names;
+ $prepped_cxx_param_types = $cxx_param_types;
+ $prepped_cxx_param_names = $cxx_param_names;
}
else
{
# copy arrays
- $prepped_cxx_param_types = [ {$cpp_param_types}];
- $prepped_cxx_param_names = [ {$cpp_param_names}];
+ $prepped_cxx_param_types = [ {$cxx_param_types}];
+ $prepped_cxx_param_names = [ {$cxx_param_names}];
splice (@{$prepped_cxx_param_types}, $cxx_param_out_index, 1);
splice (@{$prepped_cxx_param_names}, $cxx_param_out_index, 1);
@@ -159,11 +159,11 @@ sub _output_cc ($$$$$$$$$$$$$$$$$)
unless ($ret_void)
{
- $ret_convert = $type_info_local->get_conversion ($c_ret_type, $cpp_ret_type, $ret_transfer, $c_func_invocation);
+ $ret_convert = $type_info_local->get_conversion ($c_ret_type, $cxx_ret_type, $ret_transfer, $c_func_invocation);
}
elsif ($cxx_param_out_index > -1)
{
- $ret_convert = $type_info_local->get_conversion ($c_ret_type, $cpp_param_types->[$cxx_param_out_index], $ret_transfer, $c_func_invocation);
+ $ret_convert = $type_info_local->get_conversion ($c_ret_type, $cxx_param_types->[$cxx_param_out_index], $ret_transfer, $c_func_invocation);
}
if ($errthrow)
@@ -172,11 +172,11 @@ sub _output_cc ($$$$$$$$$$$$$$$$$)
unless ($ret_void)
{
- $code_string .= nl (' ' . $cpp_ret_type . ' retvalue(' . $ret_convert . ');');
+ $code_string .= nl (' ' . $cxx_ret_type . ' retvalue(' . $ret_convert . ');');
}
elsif ($cxx_param_out_index > -1)
{
- $code_string .= nl (' ' . $cpp_param_names->[$cxx_param_out_index] . ' = (' . $ret_convert . ');');
+ $code_string .= nl (' ' . $cxx_param_names->[$cxx_param_out_index] . ' = (' . $ret_convert . ');');
}
else
{
@@ -205,7 +205,7 @@ sub _output_cc ($$$$$$$$$$$$$$$$$)
}
elsif ($cxx_param_out_index > -1)
{
- $code_string .= nl (' ' . $cpp_param_names->[$cxx_param_out_index] . ' = (' . $ret_convert . ');');
+ $code_string .= nl (' ' . $cxx_param_names->[$cxx_param_out_index] . ' = (' . $ret_convert . ');');
}
else
{
@@ -230,13 +230,13 @@ sub _output_cc ($$$$$$$$$$$$$$$$$)
sub output ($$$$$$$$$$$$$$$$$$$)
{
- my ($wrap_parser, $static, $cpp_ret_type, $cpp_func_name, $cpp_param_types, $cpp_param_names, $cxx_param_values, $cxx_param_nullables, $cxx_param_out_index, $const, $constversion, $deprecated, $ifdef, $c_ret_type, $ret_transfer, $c_func_name, $c_param_types, $c_param_transfers, $errthrow) = @_;
- my $permutations = Common::Output::Shared::get_types_permutations ($cpp_param_types, $cxx_param_nullables);
+ my ($wrap_parser, $static, $cxx_ret_type, $cxx_func_name, $cxx_param_types, $cxx_param_names, $cxx_param_values, $cxx_param_nullables, $cxx_param_out_index, $const, $constversion, $deprecated, $ifdef, $c_ret_type, $ret_transfer, $c_func_name, $c_param_types, $c_param_transfers, $errthrow) = @_;
+ my $permutations = Common::Output::Shared::get_types_permutations ($cxx_param_types, $cxx_param_nullables);
foreach my $permutation (@{$permutations})
{
- _output_h $wrap_parser, $static, $cpp_ret_type, $cpp_func_name, $permutation, $cpp_param_names, $cxx_param_values, $const;
- _output_cc $wrap_parser, $static, $cpp_ret_type, $cpp_func_name, $permutation, $cpp_param_names, $cxx_param_out_index, $const, $constversion, $deprecated, $ifdef, $c_ret_type, $ret_transfer, $c_func_name, $c_param_types, $c_param_transfers, $errthrow;
+ _output_h $wrap_parser, $static, $cxx_ret_type, $cxx_func_name, $permutation, $cxx_param_names, $cxx_param_values, $const;
+ _output_cc $wrap_parser, $static, $cxx_ret_type, $cxx_func_name, $permutation, $cxx_param_names, $cxx_param_out_index, $const, $constversion, $deprecated, $ifdef, $c_ret_type, $ret_transfer, $c_func_name, $c_param_types, $c_param_transfers, $errthrow;
}
}
diff --git a/tools/pm/Common/Output/OpaqueCopyable.pm b/tools/pm/Common/Output/OpaqueCopyable.pm
index fbc2a9c..415b03a 100644
--- a/tools/pm/Common/Output/OpaqueCopyable.pm
+++ b/tools/pm/Common/Output/OpaqueCopyable.pm
@@ -30,11 +30,11 @@ sub nl
sub _output_h_in_class ($$$)
{
- my ($wrap_parser, $c_type, $cpp_type) = @_;
+ my ($wrap_parser, $c_type, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = nl ('public:') .
nl (Common::Output::Shared::doxy_skip_begin) .
- nl (' typedef ' . $cpp_type . ' CppObjectType;') .
+ nl (' typedef ' . $cxx_type . ' CppObjectType;') .
nl (' typedef ' . $c_type . ' BaseObjectType;') .
nl (Common::Output::Shared::doxy_skip_end) .
nl ();
@@ -43,7 +43,7 @@ sub _output_h_in_class ($$$)
$section_manager->push_section ($main_section);
$section_manager->append_string ($code_string);
- my $conditional = Common::Output::Shared::default_ctor_proto $wrap_parser, $cpp_type;
+ my $conditional = Common::Output::Shared::default_ctor_proto $wrap_parser, $cxx_type;
$section_manager->append_conditional ($conditional);
@@ -53,11 +53,11 @@ sub _output_h_in_class ($$$)
my $virtual_dtor = 0;
$code_string = nl (' // Use make_a_copy = true when getting it directly from a struct.') .
- nl (' explicit ' . $cpp_type . '(' . $c_type . '* castitem, bool make_a_copy = false);') .
+ nl (' explicit ' . $cxx_type . '(' . $c_type . '* castitem, bool make_a_copy = false);') .
nl () .
- nl (Common::Output::Shared::copy_protos_str $cpp_type) .
+ nl (Common::Output::Shared::copy_protos_str $cxx_type) .
nl () .
- nl (Common::Output::Shared::dtor_proto_str $cpp_type, $virtual_dtor) .
+ nl (Common::Output::Shared::dtor_proto_str $cxx_type, $virtual_dtor) .
nl () .
nl (Common::Output::Shared::gobj_protos_str $c_type, $copy_proto, $reinterpret, $definitions) .
nl () .
@@ -85,12 +85,12 @@ sub _output_h_after_first_namespace ($$)
sub _output_cc ($$$$$$)
{
- my ($wrap_parser, $c_type, $cpp_type, $new_func, $copy_func, $free_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $new_func, $copy_func, $free_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $custom_default_ctor_var = Common::Output::Shared::get_variable $wrap_parser, Common::Variables::CUSTOM_DEFAULT_CTOR;
my $conditional = Common::Output::Shared::generate_conditional $wrap_parser;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $code_string = nl ($full_cpp_type . '::' . $cpp_type . '()') .
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $code_string = nl ($full_cxx_type . '::' . $cxx_type . '()') .
nl (':');
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_GENERATED;
@@ -108,12 +108,12 @@ sub _output_cc ($$$$$$)
$section_manager->append_conditional ($conditional);
$section_manager->set_variable_for_conditional ($custom_default_ctor_var, $conditional);
# TODO: we probably have to assume that copy func must be provided.
- $code_string = nl ($full_cpp_type . '::' . $cpp_type . '(const ' . $cpp_type . '& src)') .
+ $code_string = nl ($full_cxx_type . '::' . $cxx_type . '(const ' . $cxx_type . '& src)') .
nl (':') .
nl (' gobject_((src.gobject_) ? ' . $copy_func . '(src.gobject_) : 0)') .
nl ('{}') .
nl () .
- nl ($full_cpp_type . '::' . $cpp_type . '(' . $c_type . '* castitem, bool make_a_copy /* = false */)') .
+ nl ($full_cxx_type . '::' . $cxx_type . '(' . $c_type . '* castitem, bool make_a_copy /* = false */)') .
nl ('{') .
nl (' if (!make_a_copy)') .
nl (' {') .
@@ -137,7 +137,7 @@ sub _output_cc ($$$$$$)
nl ();
if (defined $copy_func and $copy_func ne '' and $copy_func ne 'NONE')
{
- $code_string .= nl ($full_cpp_type . '& ' . $full_cpp_type . '::operator=(const ' . $full_cpp_type . '& src)') .
+ $code_string .= nl ($full_cxx_type . '& ' . $full_cxx_type . '::operator=(const ' . $full_cxx_type . '& src)') .
nl ('{') .
nl (' ' . $c_type . '* const new_gobject = (src.gobject_) ? ' . $copy_func . '(src.gobject_) : 0;') .
nl () .
@@ -152,7 +152,7 @@ sub _output_cc ($$$$$$)
nl ('}') .
nl ();
}
- $code_string .= nl ($full_cpp_type . '::~' . $cpp_type . '()') .
+ $code_string .= nl ($full_cxx_type . '::~' . $cxx_type . '()') .
nl ('{') .
nl (' if (gobject_)') .
nl (' {') .
@@ -160,7 +160,7 @@ sub _output_cc ($$$$$$)
nl (' }') .
nl ('}') .
nl () .
- nl ($c_type . '* ' . $full_cpp_type . '::gobj_copy() const') .
+ nl ($c_type . '* ' . $full_cxx_type . '::gobj_copy() const') .
nl ('{') .
nl (' return ' . $copy_func . '(gobject_);') .
nl ('}') .
@@ -178,11 +178,11 @@ sub _output_cc ($$$$$$)
sub output ($$$$$$)
{
- my ($wrap_parser, $c_type, $cpp_type, $new_func, $copy_func, $free_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $new_func, $copy_func, $free_func) = @_;
- _output_h_in_class $wrap_parser, $c_type, $cpp_type;
+ _output_h_in_class $wrap_parser, $c_type, $cxx_type;
_output_h_after_first_namespace $wrap_parser, $c_type;
- _output_cc $wrap_parser, $c_type, $cpp_type, $new_func, $copy_func, $free_func;
+ _output_cc $wrap_parser, $c_type, $cxx_type, $new_func, $copy_func, $free_func;
}
1; # indicate proper module load.
diff --git a/tools/pm/Common/Output/OpaqueRefcounted.pm b/tools/pm/Common/Output/OpaqueRefcounted.pm
index 70e7b65..8e71d0f 100644
--- a/tools/pm/Common/Output/OpaqueRefcounted.pm
+++ b/tools/pm/Common/Output/OpaqueRefcounted.pm
@@ -30,25 +30,25 @@ sub nl
sub _output_h_in_class ($$$$)
{
- my ($wrap_parser, $c_type, $cpp_type, $new_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $new_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = nl ('public:') .
nl (Common::Output::Shared::doxy_skip_begin) .
- nl (' typedef ' . $cpp_type . ' CppObjectType;') .
+ nl (' typedef ' . $cxx_type . ' CppObjectType;') .
nl (' typedef ' . $c_type . ' BaseObjectType;') .
nl (Common::Output::Shared::doxy_skip_end) .
nl ();
if (defined $new_func and $new_func ne '' and $new_func ne 'NONE')
{
- $code_string .= nl (' static Glib::RefPtr< ' . $cpp_type . ' > create();') .
+ $code_string .= nl (' static Glib::RefPtr< ' . $cxx_type . ' > create();') .
nl ();
}
my $copy_proto = 'const';
my $reinterpret = 0;
my $definitions = 0;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $main_section = $wrap_parser->get_main_section;
$code_string .= nl (' /** Increment the reference count for this object.') .
@@ -64,12 +64,12 @@ sub _output_h_in_class ($$$$)
nl (Common::Output::Shared::gobj_protos_str $c_type, $copy_proto, $reinterpret, $definitions) .
nl () .
nl ('protected:') .
- nl (' // Do not derive this. ' . $full_cpp_type . ' can neither be constructed nor deleted.') .
- nl (' ' . $cpp_type . '();') .
+ nl (' // Do not derive this. ' . $full_cxx_type . ' can neither be constructed nor deleted.') .
+ nl (' ' . $cxx_type . '();') .
nl (' void operator delete(void*, size_t);') .
nl () .
nl ('private:') .
- nl (Common::Output::Shared::copy_protos_str $cpp_type) .
+ nl (Common::Output::Shared::copy_protos_str $cxx_type) .
nl ();
$section_manager->append_string_to_section ($code_string, $main_section);
}
@@ -93,17 +93,17 @@ sub _output_cc ($$$$$)
{
my ($wrap_parser, $c_type, $new_func, $ref_func, $unref_func) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_GENERATED;
- my $code_string = nl ('/* Why reinterpret_cast< ' . $full_cpp_type . '* >(gobject) is needed:') .
+ my $code_string = nl ('/* Why reinterpret_cast< ' . $full_cxx_type . '* >(gobject) is needed:') .
nl (' *') .
- nl (' * A ' . $full_cpp_type . ' instance is in fact always a ' . $c_type . ' instance.') .
- nl (' * Unfortunately, ' . $c_type . ' cannot be a member of ' . $full_cpp_type . ',') .
+ nl (' * A ' . $full_cxx_type . ' instance is in fact always a ' . $c_type . ' instance.') .
+ nl (' * Unfortunately, ' . $c_type . ' cannot be a member of ' . $full_cxx_type . ',') .
nl (' * because it is an opaque struct. Also, the C interface does not provide') .
nl (' * any hooks to install a destroy notification handler, thus we cannot') .
nl (' * wrap it dynamically either.') .
nl (' *') .
- nl (' * The cast works because ' . $full_cpp_type . ' does not have any member data, and') .
+ nl (' * The cast works because ' . $full_cxx_type . ' does not have any member data, and') .
nl (' * it is impossible to derive from it. This is ensured by not implementing') .
nl (' * the (protected) default constructor. The ctor is protected rather than') .
nl (' * private just to avoid a compile warning.') .
@@ -117,13 +117,13 @@ sub _output_cc ($$$$$)
nl ('namespace Glib') .
nl ('{') .
nl () .
- nl ('Glib::RefPtr< ' . $full_cpp_type . ' > wrap(' . $c_type . '* object, bool take_copy)') .
+ nl ('Glib::RefPtr< ' . $full_cxx_type . ' > wrap(' . $c_type . '* object, bool take_copy)') .
nl ('{') .
nl (' if (take_copy && object)') .
nl (' ' . $ref_func . '(object);') .
nl () .
nl (' // See the comment at the top of this file, if you want to know why the cast works.') .
- nl (' return Glib::RefPtr< ' . $full_cpp_type . ' >(reinterpret_cast< ' . $full_cpp_type . '* >(object));') .
+ nl (' return Glib::RefPtr< ' . $full_cxx_type . ' >(reinterpret_cast< ' . $full_cxx_type . '* >(object));') .
nl ('}') .
nl () .
nl ('} // namespace Glib') .
@@ -133,42 +133,42 @@ sub _output_cc ($$$$$)
if (defined $new_func and $new_func ne '' and $new_func ne 'NONE')
{
$code_string .= nl ('// static') .
- nl ('Glib::RefPtr< ' . $full_cpp_type . ' > ' . $full_cpp_type . '::create()') .
+ nl ('Glib::RefPtr< ' . $full_cxx_type . ' > ' . $full_cxx_type . '::create()') .
nl ('{') .
nl (' // See the comment at the top of this file, if you want to know why the cast works.') .
- nl (' return Glib::RefPtr< ' . $full_cpp_type . ' >(reinterpret_cast< ' . $full_cpp_type . ' >(' . $new_func . '()));') .
+ nl (' return Glib::RefPtr< ' . $full_cxx_type . ' >(reinterpret_cast< ' . $full_cxx_type . ' >(' . $new_func . '()));') .
nl ('}') .
nl ();
}
- $code_string .= nl ('void ' . $full_cpp_type . '::reference() const') .
+ $code_string .= nl ('void ' . $full_cxx_type . '::reference() const') .
nl ('{') .
nl (' // See the comment at the top of this file, if you want to know why the cast works.') .
- nl (' ' . $ref_func . '(reinterpret_cast< ' . $c_type . '* >(const_cast< ' . $full_cpp_type . '* >(this)));') .
+ nl (' ' . $ref_func . '(reinterpret_cast< ' . $c_type . '* >(const_cast< ' . $full_cxx_type . '* >(this)));') .
nl ('}') .
nl () .
- nl ('void ' . $full_cpp_type . '::unreference() const') .
+ nl ('void ' . $full_cxx_type . '::unreference() const') .
nl ('{') .
nl (' // See the comment at the top of this file, if you want to know why the cast works.') .
- nl (' ' . $unref_func . '(reinterpret_cast< ' . $c_type . '* >(const_cast< ' . $full_cpp_type . '* >(this)));') .
+ nl (' ' . $unref_func . '(reinterpret_cast< ' . $c_type . '* >(const_cast< ' . $full_cxx_type . '* >(this)));') .
nl ('}') .
nl () .
- nl ($c_type . '* ' . $full_cpp_type . '::gobj()') .
+ nl ($c_type . '* ' . $full_cxx_type . '::gobj()') .
nl ('{') .
nl (' // See the comment at the top of this file, if you want to know why the cast works.') .
nl (' return reinterpret_cast< ' . $c_type . '* >(this);') .
nl ('}') .
nl () .
- nl ('const ' . $c_type . '* ' . $full_cpp_type . '::gobj() const') .
+ nl ('const ' . $c_type . '* ' . $full_cxx_type . '::gobj() const') .
nl ('{') .
nl (' // See the comment at the top of this file, if you want to know why the cast works.') .
nl (' return reinterpret_cast< const ' . $c_type . '* >(this);') .
nl ('}') .
nl () .
- nl ($c_type . '* ' . $full_cpp_type . '::gobj_copy() const') .
+ nl ($c_type . '* ' . $full_cxx_type . '::gobj_copy() const') .
nl ('{') .
nl (' // See the comment at the top of this file, if you want to know why the cast works.') .
- nl (' ' . $c_type . '* const gobject = reinterpret_cast< ' . $c_type . '* >(const_cast< ' . $full_cpp_type . '* >(this));') .
+ nl (' ' . $c_type . '* const gobject = reinterpret_cast< ' . $c_type . '* >(const_cast< ' . $full_cxx_type . '* >(this));') .
nl (' ' . $ref_func . '(gobject);') .
nl (' return gobject;') .
nl ('}') .
@@ -181,9 +181,9 @@ sub _output_cc ($$$$$)
sub output ($$$$$$)
{
- my ($wrap_parser, $c_type, $cpp_type, $new_func, $ref_func, $unref_func) = @_;
+ my ($wrap_parser, $c_type, $cxx_type, $new_func, $ref_func, $unref_func) = @_;
- _output_h_in_class $wrap_parser, $c_type, $cpp_type, $new_func;
+ _output_h_in_class $wrap_parser, $c_type, $cxx_type, $new_func;
_output_h_after_first_namespace $wrap_parser, $c_type;
_output_cc $wrap_parser, $c_type, $new_func, $ref_func, $unref_func;
}
diff --git a/tools/pm/Common/Output/Property.pm b/tools/pm/Common/Output/Property.pm
index 095b66e..86af205 100644
--- a/tools/pm/Common/Output/Property.pm
+++ b/tools/pm/Common/Output/Property.pm
@@ -30,29 +30,29 @@ sub nl
sub _output_h ($$$$)
{
- my ($wrap_parser, $proxy_suffix, $prop_cpp_type, $prop_cpp_name) = @_;
+ my ($wrap_parser, $proxy_suffix, $prop_cxx_type, $prop_cxx_name) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
- my $proxy_type = 'Glib::PropertyProxy' . $proxy_suffix . '< ' . $prop_cpp_type . ' >';
+ my $proxy_type = 'Glib::PropertyProxy' . $proxy_suffix . '< ' . $prop_cxx_type . ' >';
my $method_suffix = ($proxy_suffix eq '_ReadOnly' ? ' const' : '');
my $code_string = (nl ' /** You rarely need to use properties because there are get_and _set_ methods for almost all of them.') .
(nl ' * @return A PropertyProxy that allows you to get or set the property of the value, or receive notification when') .
(nl ' * the value of the property changes.') .
(nl ' */') .
- (nl ' ' . $proxy_type . ' property_' . $prop_cpp_name . '()' . $method_suffix . ';');
+ (nl ' ' . $proxy_type . ' property_' . $prop_cxx_name . '()' . $method_suffix . ';');
$section_manager->append_string_to_section ($code_string, $main_section);
}
sub _output_cc ($$$$$)
{
- my ($wrap_parser, $proxy_suffix, $prop_cpp_type, $prop_cpp_name, $prop_c_name) = @_;
+ my ($wrap_parser, $proxy_suffix, $prop_cxx_type, $prop_cxx_name, $prop_c_name) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::CC_PROPERTY_PROXIES;
- my $proxy_type = 'Glib::PropertyProxy' . $proxy_suffix . '< ' . $prop_cpp_type . ' >';
+ my $proxy_type = 'Glib::PropertyProxy' . $proxy_suffix . '< ' . $prop_cxx_type . ' >';
my $method_suffix = ($proxy_suffix eq '_ReadOnly' ? ' const' : '');
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $code_string = (nl $proxy_type . ' ' . $full_cpp_type . '::property_' . $prop_cpp_name . '()' . $method_suffix) .
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $code_string = (nl $proxy_type . ' ' . $full_cxx_type . '::property_' . $prop_cxx_name . '()' . $method_suffix) .
(nl '{') .
(nl ' return ' . $proxy_type . '(this, "' . $prop_c_name . '");') .
(nl '}') .
@@ -63,7 +63,7 @@ sub _output_cc ($$$$$)
sub output ($$$$$$$)
{
- my ($wrap_parser, $construct_only, $readable, $writable, $prop_cpp_type, $prop_cpp_name, $prop_c_name) = @_;
+ my ($wrap_parser, $construct_only, $readable, $writable, $prop_cxx_type, $prop_cxx_name, $prop_c_name) = @_;
my $read_only = 0;
my $write_only = 0;
@@ -82,15 +82,15 @@ sub output ($$$$$$$)
my $proxy_suffix = ($read_only ? '_ReadOnly' : ($write_only ? '_WriteOnly' : ''));
- _output_h $wrap_parser, $proxy_suffix, $prop_cpp_type, $prop_cpp_name;
- _output_cc $wrap_parser, $proxy_suffix, $prop_cpp_type, $prop_cpp_name, $prop_c_name;
+ _output_h $wrap_parser, $proxy_suffix, $prop_cxx_type, $prop_cxx_name;
+ _output_cc $wrap_parser, $proxy_suffix, $prop_cxx_type, $prop_cxx_name, $prop_c_name;
if (not $read_only and $readable)
{
$proxy_suffix = '_ReadOnly';
- _output_h $wrap_parser, $proxy_suffix, $prop_cpp_type, $prop_cpp_name;
- _output_cc $wrap_parser, $proxy_suffix, $prop_cpp_type, $prop_cpp_name, $prop_c_name;
+ _output_h $wrap_parser, $proxy_suffix, $prop_cxx_type, $prop_cxx_name;
+ _output_cc $wrap_parser, $proxy_suffix, $prop_cxx_type, $prop_cxx_name, $prop_c_name;
}
}
diff --git a/tools/pm/Common/Output/Shared.pm b/tools/pm/Common/Output/Shared.pm
index 37562c6..bd8c78f 100644
--- a/tools/pm/Common/Output/Shared.pm
+++ b/tools/pm/Common/Output/Shared.pm
@@ -110,7 +110,7 @@ sub get_c_type ($)
}
# returns Terminal
-sub get_cpp_type ($)
+sub get_cxx_type ($)
{
my ($wrap_parser) = @_;
my $classes = $wrap_parser->get_classes;
@@ -124,13 +124,13 @@ sub get_cpp_type ($)
# returns Terminal, the difference is that it can also return Foo::Bar if Bar is
# a class inside a Foo class
-sub get_full_cpp_type ($)
+sub get_full_cxx_type ($)
{
my ($wrap_parser) = @_;
my $classes = $wrap_parser->get_classes;
- my $full_cpp_class = join '::', @{$classes};
+ my $full_cxx_class = join '::', @{$classes};
- return $full_cpp_class;
+ return $full_cxx_class;
}
# returns Gnome::Vte
@@ -144,35 +144,35 @@ sub get_full_namespace ($)
}
# returns Gnome::Vte::Terminal
-sub get_complete_cpp_type ($)
+sub get_complete_cxx_type ($)
{
my ($wrap_parser) = @_;
my $namespaces = get_full_namespace $wrap_parser;
- my $classes = get_full_cpp_type $wrap_parser;
+ my $classes = get_full_cxx_type $wrap_parser;
return join '::', $namespaces, $classes;
}
# returns Terminal_Class for Gnome::Vte::Terminal.
# returns Terminal_Foo_Class for Gnome::Vte::Terminal::Foo.
-sub get_cpp_class_type ($)
+sub get_cxx_class_type ($)
{
my ($wrap_parser) = @_;
- my $full_cpp_type = get_full_cpp_type $wrap_parser;
+ my $full_cxx_type = get_full_cxx_type $wrap_parser;
- $full_cpp_type =~ s/::/_/g;
- return $full_cpp_type . '_Class';
+ $full_cxx_type =~ s/::/_/g;
+ return $full_cxx_type . '_Class';
}
# returns Gnome::Vte::Terminal_Class for Gnome::Vte::Terminal.
# returns Gnome::Vte::Terminal_Foo_Class for Gnome::Vte::Terminal::Foo.
-sub get_complete_cpp_class_type ($)
+sub get_complete_cxx_class_type ($)
{
my ($wrap_parser) = @_;
my $full_namespace = get_full_namespace $wrap_parser;
- my $cpp_class_type = get_cpp_class_type $wrap_parser;
+ my $cxx_class_type = get_cxx_class_type $wrap_parser;
- return join '::', $full_namespace, $cpp_class_type;
+ return join '::', $full_namespace, $cxx_class_type;
}
# TODO: implement beautifying if I am really bored.
@@ -196,14 +196,14 @@ sub get_variable ($$);
sub output_enum_gtype_func_h ($$$$)
{
- my ($wrap_parser, $cpp_type, $type, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $type, $get_type_func) = @_;
if (defined $get_type_func)
{
my $namespaces = $wrap_parser->get_namespaces;
my $main_section = $wrap_parser->get_main_section;
my $classes = $wrap_parser->get_classes;
- my $full_cpp_type = join '::', (get_full_cpp_type $wrap_parser), $cpp_type;
+ my $full_cxx_type = join '::', (get_full_cxx_type $wrap_parser), $cxx_type;
my $close = 1;
my $value_base = 'Glib::Value_' . $type;
my $code_string = '';
@@ -228,7 +228,7 @@ sub output_enum_gtype_func_h ($$$$)
}
$code_string .= nl ('template <>') .
- nl ('class Value< ' . $full_cpp_type . ' > : public ' . $value_base . '< ' . $full_cpp_type . ' >') .
+ nl ('class Value< ' . $full_cxx_type . ' > : public ' . $value_base . '< ' . $full_cxx_type . ' >') .
nl ('{') .
nl ('public:') .
nl (' static GType value_type() G_GNUC_CONST;') .
@@ -263,18 +263,18 @@ sub output_enum_gtype_func_h ($$$$)
sub output_enum_gtype_func_cc ($$$)
{
- my ($wrap_parser, $cpp_type, $get_type_func) = @_;
+ my ($wrap_parser, $cxx_type, $get_type_func) = @_;
if (defined $get_type_func)
{
- my $container_cpp_type = get_full_cpp_type $wrap_parser;
- my $full_cpp_type = join '::', $container_cpp_type, $cpp_type;
+ my $container_cxx_type = get_full_cxx_type $wrap_parser;
+ my $full_cxx_type = join '::', $container_cxx_type, $cxx_type;
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = nl ('namespace Glib') .
nl ('{') .
nl () .
nl ('// static') .
- nl ('GType Glib::Value< ' . $full_cpp_type . ' >::value_type()') .
+ nl ('GType Glib::Value< ' . $full_cxx_type . ' >::value_type()') .
nl ('{') .
nl (' return ' . $get_type_func . '();') .
nl ('}') .
@@ -297,11 +297,11 @@ sub generate_conditional ($)
sub struct_prototype ($$$)
{
- my ($wrap_parser, $c_name, $c_class_name) = @_;
+ my ($wrap_parser, $c_type, $c_class_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $code_string = nl (doxy_skip_begin) .
- nl ('typedef struct _' . $c_name . ' ' . $c_name . ';') .
- nl ('typedef struct _' . $c_class_name . ' ' . $c_class_name . ';') .
+ nl ('typedef struct _' . $c_type . ' ' . $c_type . ';') .
+ nl ('typedef struct _' . $c_class_type . ' ' . $c_class_type . ';') .
nl (doxy_skip_end) .
nl ();
my $variable = get_variable $wrap_parser, Common::Variables::STRUCT_NOT_HIDDEN;
@@ -315,27 +315,27 @@ sub struct_prototype ($$$)
sub wrap_proto ($$$$$$)
{
- my ($wrap_parser, $c_name, $result_type, $take_copy, $open, $const) = @_;
+ my ($wrap_parser, $c_type, $result_type, $take_copy, $open, $const) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $result = undef;
- my $complete_cpp_type = get_complete_cpp_type $wrap_parser;
+ my $complete_cxx_type = get_complete_cxx_type $wrap_parser;
# TODO: make result type constant
if ($result_type eq 'refptr')
{
- $result = 'Glib::RefPtr< ' . $complete_cpp_type . ' >';
+ $result = 'Glib::RefPtr< ' . $complete_cxx_type . ' >';
}
elsif ($result_type eq 'ref')
{
- $result = $complete_cpp_type . '&';
+ $result = $complete_cxx_type . '&';
}
elsif ($result_type eq 'ptr')
{
- $result = $complete_cpp_type . '*';
+ $result = $complete_cxx_type . '*';
}
elsif ($result_type eq 'plain')
{
- $result = $complete_cpp_type;
+ $result = $complete_cxx_type;
}
else
{
@@ -347,7 +347,7 @@ sub wrap_proto ($$$$$$)
$result = 'const ' . $result;
}
- my $params = ($const ? 'const ' : '') . $c_name . '* object';
+ my $params = ($const ? 'const ' : '') . $c_type . '* object';
my $params_doc = ' * @param object The C instance.';
if ($take_copy ne 'N/A')
@@ -386,7 +386,7 @@ sub wrap_proto ($$$$$$)
nl ($params_doc) .
nl (' * @result A C++ instance that wraps this C instance') .
nl (' *') .
- nl (' * @relates ' . $complete_cpp_type) .
+ nl (' * @relates ' . $complete_cxx_type) .
nl (' */') .
nl ($result . ' wrap(' . $params . ');') .
nl ();
@@ -404,11 +404,11 @@ sub wrap_proto ($$$$$$)
sub default_ctor_proto ($$)
{
- my ($wrap_parser, $cpp_name) = @_;
+ my ($wrap_parser, $cxx_type) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $variable = get_variable $wrap_parser, Common::Variables::CUSTOM_DEFAULT_CTOR;
my $conditional = generate_conditional $wrap_parser;
- my $code_string = nl (' ' . $cpp_name . '();');
+ my $code_string = nl (' ' . $cxx_type . '();');
$section_manager->append_string_to_conditional ($code_string, $conditional, 0);
$section_manager->set_variable_for_conditional ($variable, $conditional);
@@ -419,37 +419,37 @@ sub default_ctor_proto ($$)
# wrap output of this function with nl();
sub copy_protos_str ($)
{
- my ($cpp_name) = @_;
- my $code_string = nl (' ' . $cpp_name . '(const ' . $cpp_name . '& src);') .
- ' ' . $cpp_name . '& operator=(const ' . $cpp_name . '& src);';
+ my ($cxx_type) = @_;
+ my $code_string = nl (' ' . $cxx_type . '(const ' . $cxx_type . '& src);') .
+ ' ' . $cxx_type . '& operator=(const ' . $cxx_type . '& src);';
return $code_string;
}
sub dtor_proto_str ($$)
{
- my ($cpp_name, $virtual_dtor) = @_;
- my $code_string = ' ' . ($virtual_dtor ? 'virtual ' : '') . '~' . $cpp_name . '();';
+ my ($cxx_type, $virtual_dtor) = @_;
+ my $code_string = ' ' . ($virtual_dtor ? 'virtual ' : '') . '~' . $cxx_type . '();';
return $code_string;
}
sub gobj_protos_str ($$$$)
{
- my ($c_name, $copy_proto, $reinterpret, $definitions) = @_;
- my $gobj = ($reinterpret ? 'reinterpret_cast< ' . $c_name . '* >(gobject_)' : 'gobject_');
+ my ($c_type, $copy_proto, $reinterpret, $definitions) = @_;
+ my $gobj = ($reinterpret ? 'reinterpret_cast< ' . $c_type . '* >(gobject_)' : 'gobject_');
my $code_string = nl (' /// Provides access to the underlying C instance.') .
- nl (' ' . $c_name . '* gobj()' . ($definitions ? ' { return ' . $gobj . '; }' : ';')) .
+ nl (' ' . $c_type . '* gobj()' . ($definitions ? ' { return ' . $gobj . '; }' : ';')) .
nl () .
nl (' /// Provides access to the underlying C instance.') .
- ' const ' . $c_name . '* gobj() const' . ($definitions ? ' { return ' . $gobj . '; }' : ';');
+ ' const ' . $c_type . '* gobj() const' . ($definitions ? ' { return ' . $gobj . '; }' : ';');
if ($copy_proto ne 'no')
{
$code_string = nl ($code_string) .
nl () .
nl (' /// Provides access to the underlying C instance. The caller is responsible for freeing it. Use when directly setting fields in structs.') .
- ' ' . $c_name . '* gobj_copy()';
+ ' ' . $c_type . '* gobj_copy()';
if ($copy_proto eq 'const')
{
$code_string .= ' const';
@@ -472,7 +472,7 @@ sub _get_prefixed_name ($$$)
{
when (Common::Constants::CLASS)
{
- my $complete_type = get_complete_cpp_type $wrap_parser;
+ my $complete_type = get_complete_cxx_type $wrap_parser;
$complete_type =~ s/::/_/g;
$prefixed_name = join '_', $complete_type, $name;
@@ -611,15 +611,15 @@ sub get_parent_from_object ($$)
sub convzipstr ($$$$$)
{
- my ($wrap_parser, $from_types, $to_types, $transfers, $from_names) = @_;
+ my ($wrap_parser, $from_types, $to_types, $transfers, $substs) = @_;
my $type_info_local = $wrap_parser->get_type_info_local ();
my $from_types_count = @{$from_types};
my $to_types_count = @{$to_types};
my $transfers_count = @{$transfers};
- my $from_names_count = @{$from_names};
+ my $substs_count = @{$substs};
# TODO: throw runtime error or internal error or whatever.
- die if $from_types_count != $to_types_count or $to_types_count != $transfers_count or $transfers_count != $from_names_count;
+ die if $from_types_count != $to_types_count or $to_types_count != $transfers_count or $transfers_count != $substs_count;
my @conversions = ();
@@ -631,7 +631,7 @@ sub convzipstr ($$$$$)
$type_info_local->get_conversion ($from_types->[$index],
$to_types->[$index],
$transfers->[$index],
- $from_names->[$index]));
+ $substs->[$index]));
}
else
{
diff --git a/tools/pm/Common/Output/Signal.pm b/tools/pm/Common/Output/Signal.pm
index eff8ad2..c481882 100644
--- a/tools/pm/Common/Output/Signal.pm
+++ b/tools/pm/Common/Output/Signal.pm
@@ -30,12 +30,12 @@ sub nl
sub _output_h ($$$$$$)
{
- my ($wrap_parser, $ifdef, $cpp_return_type, $cpp_signal_name, $cpp_param_types, $default_signal_handler_enabled) = @_;
+ my ($wrap_parser, $ifdef, $cxx_return_type, $cxx_signal_name, $cxx_param_types, $default_signal_handler_enabled) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
- my $cpp_param_types_str = join ', ', @{$cpp_param_types};
+ my $cxx_param_types_str = join ', ', @{$cxx_param_types};
my $code_string = (Common::Output::Shared::ifdef $ifdef) .
- nl (' Glib::SignalProxy' . (scalar @{$cpp_param_types}) . '< ' . $cpp_return_type . ', ' . $cpp_param_types_str . ' > signal_' . $cpp_signal_name . '();') .
+ nl (' Glib::SignalProxy' . (scalar @{$cxx_param_types}) . '< ' . $cxx_return_type . ', ' . $cxx_param_types_str . ' > signal_' . $cxx_signal_name . '();') .
nl () .
Common::Output::Shared::endif $ifdef;
@@ -44,7 +44,7 @@ sub _output_h ($$$$$$)
if ($default_signal_handler_enabled)
{
$code_string = (Common::Output::Shared::ifdef $ifdef) .
- nl (' virtual ' . $cpp_return_type . ' on_' . $cpp_signal_name . '(' . $cpp_param_types_str . ');') .
+ nl (' virtual ' . $cxx_return_type . ' on_' . $cxx_signal_name . '(' . $cxx_param_types_str . ');') .
nl () .
Common::Output::Shared::endif $ifdef;
@@ -74,21 +74,21 @@ sub _output_p_h ($$$$$$$)
sub _output_cc ($$$$$$$$$$$$$$)
{
- my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_signal_string, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_signal_name, $cpp_param_types, $custom_c_callback, $default_signal_handler_enabled) = @_;
+ my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_signal_string, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_signal_name, $cxx_param_types, $custom_c_callback, $default_signal_handler_enabled) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
- my $signal_prefix = $full_cpp_type;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
+ my $signal_prefix = $full_cxx_type;
my $c_type = Common::Output::Shared::get_c_type $wrap_parser;
$signal_prefix =~ s/::/_/g;
- my $proxy_info = $signal_prefix . '_signal_' . $cpp_signal_name . '_info';
+ my $proxy_info = $signal_prefix . '_signal_' . $cxx_signal_name . '_info';
my $ret_void = ($c_return_type eq 'void');
- my $cpp_param_types_str = join ', ', @cpp_param_types;
+ my $cxx_param_types_str = join ', ', @cxx_param_types;
my $type_info_local = $wrap_parser->get_type_info_local ();
my $code_string = Common::Output::Shared::ifdef $ifdef;
- if ($ret_void and not @{$c_param_types} and $cpp_return_type eq 'void' and not @{$cpp_param_types})
+ if ($ret_void and not @{$c_param_types} and $cxx_return_type eq 'void' and not @{$cxx_param_types})
{
$code_string .= nl ('// Use predefined callback for SignalProxy0<void> to reduce code size.') .
nl ('const Glib::SignalProxyInfo ' . $proxy_info . ' =') .
@@ -101,7 +101,7 @@ sub _output_cc ($$$$$$$$$$$$$$)
}
else
{
- my $signal_callback = $signal_prefix . '_signal_' . $cpp_signal_name . '_callback';
+ my $signal_callback = $signal_prefix . '_signal_' . $cxx_signal_name . '_callback';
my $signal_notify = undef;
if ($ret_void)
@@ -110,13 +110,13 @@ sub _output_cc ($$$$$$$$$$$$$$)
}
else
{
- $signal_notify = $signal_prefix . '_signal_' . $cpp_signal_name . '_notify_callback';
+ $signal_notify = $signal_prefix . '_signal_' . $cxx_signal_name . '_notify_callback';
}
unless ($custom_c_callback)
{
- my $callback_cpp_params_str = Common::Output::Shared::convzipstr $wrap_parser, $c_param_types, $cpp_param_types, $c_param_transfers, $c_param_names;
+ my $callback_cxx_params_str = Common::Output::Shared::convzipstr $wrap_parser, $c_param_types, $cxx_param_types, $c_param_transfers, $c_param_names;
my $c_params_str = Common::Output::Shared::paramzipstr $c_param_types, $c_param_names;
- my $partial_return_string = '(*static_cast<SlotType*>(slot))(' . $callback_cpp_params_str . ')';
+ my $partial_return_string = '(*static_cast<SlotType*>(slot))(' . $callback_cxx_params_str . ')';
my $return_string = $partial_return_string;
my $last_return = '';
@@ -127,7 +127,7 @@ sub _output_cc ($$$$$$$$$$$$$$)
# TODO: print a warning - pointers returned from signals ought to have ownership transferred fully.
# TODO continued: need warning or error with fixed line number for this.
}
- my $conv = $type_info_local->get_conversion ($cpp_return_type, $c_return_type, $c_return_transfer, $return_string);
+ my $conv = $type_info_local->get_conversion ($cxx_return_type, $c_return_type, $c_return_transfer, $return_string);
$return_string = 'return ' . $conv;
$last_return = nl () .
@@ -137,7 +137,7 @@ sub _output_cc ($$$$$$$$$$$$$$)
$code_string .= nl ($c_return_type . ' ' . $signal_callback . '(' . $c_type . '* self, ' . $c_params_str . ', gpointer data)') .
nl ('{') .
nl (' using namespace ' . (Common::Output::Shared::get_full_namespace $wrap_parser) . ';') .
- nl (' typedef sigc::slot< ' . $cpp_return_type . ', ' . $cpp_param_types_str . ' > SlotType;') .
+ nl (' typedef sigc::slot< ' . $cxx_return_type . ', ' . $cxx_param_types_str . ' > SlotType;') .
nl () .
nl (' // Do not try to call a signal on a disassociated wrapper.') .
nl (' if (Glib::ObjectBase::_get_current_wrapper(static_cast<GObject*>(self)))') .
@@ -163,7 +163,7 @@ sub _output_cc ($$$$$$$$$$$$$$)
$code_string .= nl ($c_return_type . ' ' . $signal_notify . '(' . $c_type . '* self, ' . $c_params_str . ', gpointer data)') .
nl ('{') .
nl (' using namespace ' . (Common::Output::Shared::get_full_namespace $wrap_parser) . ';') .
- nl (' typedef sigc::slot< void, ' . $cpp_param_types_str . ' > SlotType;') .
+ nl (' typedef sigc::slot< void, ' . $cxx_param_types_str . ' > SlotType;') .
nl () .
nl (' // Do not try to call a signal on disassociated wrapper.') .
nl (' if (Glib::ObjectBase::_get_current_wrapper(static_cast<GObject*>(self)))') .
@@ -202,10 +202,10 @@ sub _output_cc ($$$$$$$$$$$$$$)
$section_manager->append_string_to_section ($code_string, $section);
- my $signal_proxy_type = 'Glib::SignalProxy' . (scalar @{$cpp_param_types}) . '< ' . $cpp_return_type . ', ' . $cpp_param_types_str . ' >';
+ my $signal_proxy_type = 'Glib::SignalProxy' . (scalar @{$cxx_param_types}) . '< ' . $cxx_return_type . ', ' . $cxx_param_types_str . ' >';
$code_string = (Common::Output::Shared::ifdef $ifdef) .
- nl ($signal_proxy_type . ' ' . $full_cpp_type . '::signal_' . $cpp_signal_name . '()') .
+ nl ($signal_proxy_type . ' ' . $full_cxx_type . '::signal_' . $cxx_signal_name . '()') .
nl ('{') .
nl (' ' . $signal_proxy_type . '(this, &' . $proxy_info . ');') .
nl ('}') .
@@ -219,12 +219,12 @@ sub _output_cc ($$$$$$$$$$$$$$)
$code_string = Common::Output::Shared::ifdef $ifdef;
my $parent_from_object = Common::Output::Shared::get_parent_from_object $wrap_parser, 'gobject_';
- my $cpp_params_str = Common::Output::paramzipstr $cpp_param_types, $cpp_param_names;
- my $cpp_to_c_params_str = Common::Output::Shared::convzipstr $cpp_param_types, $c_param_types, $c_param_transfers, $cpp_param_names;
- my $c_func_invocation = '(*base->' . $c_signal_name . ')(gobj(), ' . $cpp_to_c_params_str . ')';
+ my $cxx_params_str = Common::Output::paramzipstr $cxx_param_types, $cxx_param_names;
+ my $cxx_to_c_params_str = Common::Output::Shared::convzipstr $cxx_param_types, $c_param_types, $c_param_transfers, $cxx_param_names;
+ my $c_func_invocation = '(*base->' . $c_signal_name . ')(gobj(), ' . $cxx_to_c_params_str . ')';
my $last_return = '';
- $code_string .= nl ($cpp_return_type . ' ' . $full_cpp_type . '::on_' . $cpp_signal_name . '(' . $cpp_params_str . ')') .
+ $code_string .= nl ($cxx_return_type . ' ' . $full_cxx_type . '::on_' . $cxx_signal_name . '(' . $cxx_params_str . ')') .
nl ('{') .
nl (' BaseClassType* const base(static_cast<BaseClassType*>(' . $parent_from_object . '));') .
nl () .
@@ -237,11 +237,11 @@ sub _output_cc ($$$$$$$$$$$$$$)
}
else
{
- my $conv = $type_info_local->get_conversion ($c_return_type, $cpp_return_type, $c_return_transfer, $c_func_invocation);
+ my $conv = $type_info_local->get_conversion ($c_return_type, $cxx_return_type, $c_return_transfer, $c_func_invocation);
$code_string .= nl (' return ' . $conv . ';');
$last_return = nl () .
- nl (' typedef ' . $cpp_return_type . ' RType;') .
+ nl (' typedef ' . $cxx_return_type . ' RType;') .
nl (' return RType();');
}
@@ -257,12 +257,12 @@ sub _output_cc ($$$$$$$$$$$$$$)
sub _output_p_cc ($$$$$$$$$$$$$)
{
- my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_signal_name, $cpp_param_types, $default_signal_handler_enabled) = @_;
+ my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_signal_name, $cxx_param_types, $default_signal_handler_enabled) = @_;
if ($default_signal_handler_enabled)
{
my $section_manager = $wrap_parser->get_section_manager;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::P_CC_INIT_DEFAULT_SIGNAL_HANDLERS;
my $code_string = (Common::Output::Shared::ifdef $ifdef) .
nl (' klass->' . $c_signal_name . ' = &' . $c_signal_name . '_callback;') .
@@ -274,14 +274,14 @@ sub _output_p_cc ($$$$$$$$$$$$$)
my $c_params_str = Common::Output::Shared::zupstr $c_param_types, $c_param_names, ' ', ', ';
my $ret_void = ($c_return_type eq 'void');
my $type_info_local = $wrap_parser->get_type_info_local ();
- my $convs_str = Common::Output::Shared::convzipstr $c_param_types, $cpp_param_types, $c_param_transfers, $c_param_names;
- my $vfunc_call = 'obj->on_' . $cpp_signal_name . '(' . $convs_str . ')';
+ my $convs_str = Common::Output::Shared::convzipstr $c_param_types, $cxx_param_types, $c_param_transfers, $c_param_names;
+ my $vfunc_call = 'obj->on_' . $cxx_signal_name . '(' . $convs_str . ')';
my $c_callback_call = '(*base->' . $c_signal_name . '(self, ' . (join ', ', @{$c_param_names}) . ')';
my $last_return = '';
unless ($ret_void)
{
- $vfunc_call = 'return ' . $type_info_local->get_conversion ($cpp_return_type, $c_return_type, $c_return_transfer, $vfunc_call);
+ $vfunc_call = 'return ' . $type_info_local->get_conversion ($cxx_return_type, $c_return_type, $c_return_transfer, $vfunc_call);
$c_callback_call = 'return ' . $c_callback_call;
$last_return = nl () .
nl (' typedef ' . $c_return_type . ' RType;') .
@@ -297,7 +297,7 @@ sub _output_p_cc ($$$$$$$$$$$$$)
my $c_type = Common::Output::Shared::get_c_type $wrap_parser;
$code_string = (Common::Output::Shared::ifdef $ifdef) .
- nl ($c_return_type . ' ' . $cpp_class_type . '::' . $c_signal_name . '_callback(' . $c_type . '* self, ' . $c_params_str . ')') .
+ nl ($c_return_type . ' ' . $cxx_class_type . '::' . $c_signal_name . '_callback(' . $c_type . '* self, ' . $c_params_str . ')') .
nl ('{') .
nl (' // First, do a simple cast to ObjectBase. We will have to do a dynamic cast') .
nl (' // eventually, but it is not necessary to check whether we need to call') .
@@ -348,12 +348,12 @@ sub _output_p_cc ($$$$$$$$$$$$$)
# TODO: Add custom_signal_handler.
sub output ($$$$$$$$$$$$$$$$)
{
- my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_signal_string, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_signal_name, $cpp_param_types, $cpp_param_names, $custom_c_callback, $default_signal_handler_enabled) = @_;
+ my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_signal_string, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_signal_name, $cxx_param_types, $cxx_param_names, $custom_c_callback, $default_signal_handler_enabled) = @_;
- _output_h $wrap_parser, $ifdef, $cpp_return_type, $cpp_signal_name, $cpp_param_types, $default_signal_handler_enabled;
+ _output_h $wrap_parser, $ifdef, $cxx_return_type, $cxx_signal_name, $cxx_param_types, $default_signal_handler_enabled;
_output_p_h $wrap_parser, $ifdef, $c_return_type, $c_signal_name, $c_param_types, $c_param_names, $default_signal_handler_enabled;
- _output_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_signal_string, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_signal_name, $cpp_param_types, $custom_c_callback, $default_signal_handler_enabled;
- _output_p_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_signal_name, $cpp_param_types, $default_signal_handler_enabled;
+ _output_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_signal_string, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_signal_name, $cxx_param_types, $custom_c_callback, $default_signal_handler_enabled;
+ _output_p_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_signal_name, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_signal_name, $cxx_param_types, $default_signal_handler_enabled;
}
1; # indicate proper module load.
diff --git a/tools/pm/Common/Output/VFunc.pm b/tools/pm/Common/Output/VFunc.pm
index aa4f298..964d477 100644
--- a/tools/pm/Common/Output/VFunc.pm
+++ b/tools/pm/Common/Output/VFunc.pm
@@ -30,12 +30,12 @@ sub nl
sub _output_h ($$$$$$$)
{
- my ($wrap_parser, $ifdef, $cpp_return_type, $cpp_vfunc_name, $cpp_param_types, $cpp_param_names, $const) = @_;
+ my ($wrap_parser, $ifdef, $cxx_return_type, $cxx_vfunc_name, $cxx_param_types, $cxx_param_names, $const) = @_;
my $section_manager = $wrap_parser->get_section_manager;
my $main_section = $wrap_parser->get_main_section;
- my $cpp_params_str = Common::Output::Shared::paramzipstr $cpp_param_types, $cpp_param_names;
+ my $cxx_params_str = Common::Output::Shared::paramzipstr $cxx_param_types, $cxx_param_names;
my $code_string = (Common::Output::Shared::ifdef $ifdef) .
- (nl 'virtual ', $cpp_return_type, ' ', $cpp_vfunc_name, '(', $cpp_params_str, ($const ? ') const;' : ');')) .
+ (nl 'virtual ', $cxx_return_type, ' ', $cxx_vfunc_name, '(', $cxx_params_str, ($const ? ') const;' : ');')) .
(nl) .
Common::Output::Shared::endif $ifdef;
@@ -58,23 +58,23 @@ sub _output_p_h ($$$$$$$)
sub _output_cc ($$$$$$$$$$$$$)
{
- my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_transfers, $cpp_return_type, $cpp_vfunc_name, $cpp_param_types, $cpp_param_names, $const, $errthrow) = @_;
+ my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_transfers, $cxx_return_type, $cxx_vfunc_name, $cxx_param_types, $cxx_param_names, $const, $errthrow) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $full_cpp_type = Common::Output::Shared::get_full_cpp_type $wrap_parser;
+ my $full_cxx_type = Common::Output::Shared::get_full_cxx_type $wrap_parser;
my $parent_from_object = Common::Output::Shared::get_parent_from_object $wrap_parser, 'gobject_';
- my $cpp_params_str = Common::Output::Shared::paramzipstr $cpp_param_types, $cpp_param_names;
+ my $cxx_params_str = Common::Output::Shared::paramzipstr $cxx_param_types, $cxx_param_names;
my $code_string = (Common::Output::Shared::ifdef $ifdef) .
- (nl $cpp_return_type, ' ', $full_cpp_type, '::', $cpp_vfunc_name, '(', $cpp_params_str, ($const ? ') const' : ')')) .
+ (nl $cxx_return_type, ' ', $full_cxx_type, '::', $cxx_vfunc_name, '(', $cxx_params_str, ($const ? ') const' : ')')) .
(nl '{') .
(nl ' BaseClassType* const base(static_cast<BaseClassType*>(' . $parent_from_object . '));') .
(nl) .
(nl ' if (base && base->' . $c_vfunc_name . ')') .
(nl ' {');
- my $ret_void = ($cpp_return_type eq 'void');
+ my $ret_void = ($cxx_return_type eq 'void');
my $c_type = Common::Output::Shared::get_c_type $wrap_parser;
my $gobj = ($const ? 'const_cast< ' . $c_type . ' >(gobj())' : 'gobj()');
- my $cpp_to_c_params_str = (Common::Output::Shared::convzipstr $wrap_parser, $cpp_param_types, $c_param_types, $c_param_transfers, $cpp_param_names) . ($errthrow ? ', &temp_error' : '');
- my $c_func_invocation = join '', '(*base->', $c_vfunc_name, ')(', $gobj, ', ', $cpp_to_c_params_str . ')';
+ my $cxx_to_c_params_str = (Common::Output::Shared::convzipstr $wrap_parser, $cxx_param_types, $c_param_types, $c_param_transfers, $cxx_param_names) . ($errthrow ? ', &temp_error' : '');
+ my $c_func_invocation = join '', '(*base->', $c_vfunc_name, ')(', $gobj, ', ', $cxx_to_c_params_str . ')';
my $last_return = '';
my $type_info_local = $wrap_parser->get_type_info_local ();
my $error_init_string = (nl ' GError* temp_error(0);');
@@ -112,15 +112,15 @@ sub _output_cc ($$$$$$$$$$$$$)
(nl) .
$errthrow_string .
(nl);
- $conv = $type_info_local->get_conversion ($c_return_type, $cpp_return_type, $c_return_transfer, 'temp_retval');
+ $conv = $type_info_local->get_conversion ($c_return_type, $cxx_return_type, $c_return_transfer, 'temp_retval');
}
else
{
- $conv = $type_info_local->get_conversion ($c_return_type, $cpp_return_type, $c_return_transfer, $c_func_invocation);
+ $conv = $type_info_local->get_conversion ($c_return_type, $cxx_return_type, $c_return_transfer, $c_func_invocation);
}
$code_string .= nl (' return ' . $conv . ';');
$last_return = (nl) .
- (nl ' typedef ' . $cpp_return_type . ' RType;') .
+ (nl ' typedef ' . $cxx_return_type . ' RType;') .
(nl ' return RType();');
}
$code_string .= (nl ' }') .
@@ -134,9 +134,9 @@ sub _output_cc ($$$$$$$$$$$$$)
sub _output_p_cc ($$$$$$$$$$$$)
{
- my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_vfunc_name, $cpp_param_types, $errthrow) = @_;
+ my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_vfunc_name, $cxx_param_types, $errthrow) = @_;
my $section_manager = $wrap_parser->get_section_manager;
- my $cpp_class_type = Common::Output::Shared::get_cpp_class_type $wrap_parser;
+ my $cxx_class_type = Common::Output::Shared::get_cxx_class_type $wrap_parser;
my $section = Common::Output::Shared::get_section $wrap_parser, Common::Sections::P_CC_INIT_VFUNCS;
my $code_string = (Common::Output::Shared::ifdef $ifdef) .
(nl ' klass->' . $c_vfunc_name . ' = &' . $c_vfunc_name . '_vfunc_callback;') .
@@ -148,15 +148,15 @@ sub _output_p_cc ($$$$$$$$$$$$)
my $c_params_str = (Common::Output::Shared::paramzipstr $c_param_types, $c_param_names) . ($errthrow ? ', GError** gerror' : '');
my $ret_void = ($c_return_type eq 'void');
my $type_info_local = $wrap_parser->get_type_info_local ();
- my $convs_str = Common::Output::Shared::convzipstr $wrap_parser, $c_param_types, $cpp_param_types, $c_param_transfers, $c_param_names;
- my $vfunc_call = 'obj->' . $cpp_vfunc_name . '(' . $convs_str . ')';
+ my $convs_str = Common::Output::Shared::convzipstr $wrap_parser, $c_param_types, $cxx_param_types, $c_param_transfers, $c_param_names;
+ my $vfunc_call = 'obj->' . $cxx_vfunc_name . '(' . $convs_str . ')';
my $c_callback_call = '(*base->' . $c_vfunc_name . '(self, ' . (join ', ', @{$c_param_names}) . ($errthrow ? ', gerror' : '') . ')';
my $last_return = '';
my $after_catch_return = '';
unless ($ret_void)
{
- $vfunc_call = 'return ' . $type_info_local->get_conversion ($cpp_return_type, $c_return_type, $c_return_transfer, $vfunc_call);
+ $vfunc_call = 'return ' . $type_info_local->get_conversion ($cxx_return_type, $c_return_type, $c_return_transfer, $vfunc_call);
$c_callback_call = 'return ' . $c_callback_call;
$after_catch_return = (nl) .
(nl ' typedef ', $c_return_type, ' RType;') .
@@ -177,7 +177,7 @@ sub _output_p_cc ($$$$$$$$$$$$)
my $c_type = Common::Output::Shared::get_c_type $wrap_parser;
$code_string = (Common::Output::Shared::ifdef $ifdef) .
- (nl $c_return_type, ' ', $cpp_class_type . '::' . $c_vfunc_name . '_vfunc_callback(', $c_type, '* self, ', $c_params_str, ')') .
+ (nl $c_return_type, ' ', $cxx_class_type . '::' . $c_vfunc_name . '_vfunc_callback(', $c_type, '* self, ', $c_params_str, ')') .
(nl '{') .
(nl ' // First, do a simple cast to ObjectBase. We will have to do a dynamic cast') .
(nl ' // eventually, but it is not necessary to check whether we need to call') .
@@ -236,19 +236,19 @@ sub _output_p_cc ($$$$$$$$$$$$)
sub output ($$$$$$$$$$$$$$$$)
{
- my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_vfunc_name, $cpp_param_types, $cpp_param_names, $const, $custom_vfunc, $custom_vfunc_callback, $errthrow) = @_;
+ my ($wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_vfunc_name, $cxx_param_types, $cxx_param_names, $const, $custom_vfunc, $custom_vfunc_callback, $errthrow) = @_;
- _output_h $wrap_parser, $ifdef, $cpp_return_type, $cpp_vfunc_name, $cpp_param_types, $cpp_param_names, $const;
+ _output_h $wrap_parser, $ifdef, $cxx_return_type, $cxx_vfunc_name, $cxx_param_types, $cxx_param_names, $const;
_output_p_h $wrap_parser, $ifdef, $c_return_type, $c_vfunc_name, $c_param_types, $c_param_names, $errthrow;
unless ($custom_vfunc)
{
- _output_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_transfers, $cpp_return_type, $cpp_vfunc_name, $cpp_param_types, $cpp_param_names, $const, $errthrow;
+ _output_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_transfers, $cxx_return_type, $cxx_vfunc_name, $cxx_param_types, $cxx_param_names, $const, $errthrow;
}
unless ($custom_vfunc_callback)
{
- _output_p_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_names, $c_param_transfers, $cpp_return_type, $cpp_vfunc_name, $cpp_param_types, $errthrow;
+ _output_p_cc $wrap_parser, $ifdef, $c_return_type, $c_return_transfer, $c_vfunc_name, $c_param_types, $c_param_names, $c_param_transfers, $cxx_return_type, $cxx_vfunc_name, $cxx_param_types, $errthrow;
}
}
diff --git a/tools/pm/Common/Scanner.pm b/tools/pm/Common/Scanner.pm
index d1f4631..43e1817 100644
--- a/tools/pm/Common/Scanner.pm
+++ b/tools/pm/Common/Scanner.pm
@@ -166,13 +166,13 @@ sub _extract_bracketed_text ($)
sub _make_full_type ($$)
{
- my ($self, $cpp_type) = @_;
+ my ($self, $cxx_type) = @_;
my $namespaces = $self->_get_namespaces;
my $classes = $self->_get_classes;
- if (defined $cpp_type)
+ if (defined $cxx_type)
{
- return join '::', reverse (@{$namespaces}), reverse (@{$classes}), $cpp_type;
+ return join '::', reverse (@{$namespaces}), reverse (@{$classes}), $cxx_type;
}
else
{
@@ -204,29 +204,29 @@ sub _get_params ($)
sub _on_wrap_func_generic ($$)
{
my ($self, $args) = @_;
- my $cpp_function = Common::Shared::parse_function_declaration ($args->[0])->[2];
+ my $cxx_function = Common::Shared::parse_function_declaration ($args->[0])->[2];
my $c_function = $args->[1];
- $self->_append ($c_function, $self->_make_full_type ($cpp_function), 'FUNC');
+ $self->_append ($c_function, $self->_make_full_type ($cxx_function), 'FUNC');
}
sub _on_wrap_enum_generic ($$)
{
my ($self, $args) = @_;
- my $cpp_enum = $args->[0];
+ my $cxx_enum = $args->[0];
my $c_enum = $args->[1];
- $self->_append ($c_enum, $self->_make_full_type ($cpp_enum), 'ENUM');
+ $self->_append ($c_enum, $self->_make_full_type ($cxx_enum), 'ENUM');
}
sub _on_wrap_class_generic ($$$)
{
my ($self, $args, $macro_type) = @_;
my $classes = $self->_get_classes;
- my $cpp_class = $args->[0];
+ my $cxx_class = $args->[0];
my $c_class = $args->[1];
- if (@{$classes} > 0 and $classes->[-1] eq $cpp_class)
+ if (@{$classes} > 0 and $classes->[-1] eq $cxx_class)
{
my $cxx_full_type = $self->_make_full_type (undef);
@@ -274,7 +274,7 @@ sub _on_string_literal ($)
$self->_on_string_with_end ('"');
}
-sub _on_comment_cpp ($)
+sub _on_comment_cxx ($)
{
my ($self) = @_;
@@ -598,9 +598,9 @@ sub new ($$$)
'{' => [$self, \&_on_open_brace],
'}' => [$self, \&_on_close_brace],
'"' => [$self, \&_on_string_literal],
- '//' => [$self, \&_on_comment_cpp],
- '///' => [$self, \&_on_comment_cpp],
- '//!' => [$self, \&_on_comment_cpp],
+ '//' => [$self, \&_on_comment_cxx],
+ '///' => [$self, \&_on_comment_cxx],
+ '//!' => [$self, \&_on_comment_cxx],
'/*' => [$self, \&_on_comment_c],
'/**' => [$self, \&_on_comment_doxygen],
'/*!' => [$self, \&_on_comment_doxygen],
diff --git a/tools/pm/Common/Sections.pm b/tools/pm/Common/Sections.pm
index 15ce226..28949d5 100644
--- a/tools/pm/Common/Sections.pm
+++ b/tools/pm/Common/Sections.pm
@@ -49,11 +49,11 @@ use constant
'CC_NAMESPACE' => ['SECTION_CC_NAMESPACE', Common::Constants::NAMESPACE ()],
'P_CC_IMPLEMENTS_INTERFACES' => ['SECTION_P_CC_IMPLEMENTS_INTERFACES', Common::Constants::CLASS ()],
'H_VFUNCS' => ['SECTION_H_VFUNCS', Common::Constants::CLASS ()],
- 'H_VFUNCS_CPP_WRAPPER' => ['SECTION_H_VFUNCS_CPP_WRAPPER', Common::Constants::CLASS ()], # TODO: probably not needed.
+ 'H_VFUNCS_CXX_WRAPPER' => ['SECTION_H_VFUNCS_CXX_WRAPPER', Common::Constants::CLASS ()], # TODO: probably not needed.
'H_DEFAULT_SIGNAL_HANDLERS' => ['SECTION_H_DEFAULT_SIGNAL_HANDLERS', Common::Constants::CLASS ()],
'CC_DEFAULT_SIGNAL_HANDLERS' => ['SECTION_CC_DEFAULT_SIGNAL_HANDLERS', Common::Constants::CLASS ()],
'CC_VFUNCS' => ['SECTION_CC_VFUNCS', Common::Constants::CLASS ()],
- 'CC_VFUNCS_CPP_WRAPPER' => ['SECTION_CC_VFUNCS_CPP_WRAPPER', Common::Constants::CLASS ()], # TODO: probably not needed
+ 'CC_VFUNCS_CXX_WRAPPER' => ['SECTION_CC_VFUNCS_CXX_WRAPPER', Common::Constants::CLASS ()], # TODO: probably not needed
'P_H_DEFAULT_SIGNAL_HANDLERS' => ['SECTION_P_H_DEFAULT_SIGNAL_HANDLERS', Common::Constants::CLASS ()],
'P_H_VFUNCS' => ['SECTION_P_H_VFUNCS', Common::Constants::CLASS ()],
'P_CC_DEFAULT_SIGNAL_HANDLERS' => ['SECTION_P_CC_DEFAULT_SIGNAL_HANDLERS', Common::Constants::CLASS ()],
diff --git a/tools/pm/Common/WrapParser.pm b/tools/pm/Common/WrapParser.pm
index 7c98931..202a200 100644
--- a/tools/pm/Common/WrapParser.pm
+++ b/tools/pm/Common/WrapParser.pm
@@ -526,7 +526,7 @@ sub _on_string_literal ($)
$self->_on_string_with_delimiters ('"', '"', 'string');
}
-sub _on_comment_cpp ($)
+sub _on_comment_cxx ($)
{
my ($self) = @_;
@@ -978,7 +978,7 @@ sub _on_wrap_property ($)
}
my $prop_c_name = shift @args;
- my $prop_cpp_type = shift @args;
+ my $prop_cxx_type = shift @args;
# Catch useless parameters.
$self->_handle_get_args_results (Common::Shared::get_args \ args, {});
@@ -991,7 +991,7 @@ sub _on_wrap_property ($)
$prop_c_name =~ s/_/-/g;
$prop_c_name =~ s/"//g;
- my $prop_cpp_name = $prop_c_name;
+ my $prop_cxx_name = $prop_c_name;
$prop_c_name =~ s/-/_/g;
@@ -1026,8 +1026,8 @@ sub _on_wrap_property ($)
$construct_only,
$readable,
$writable,
- $prop_cpp_type,
- $prop_cpp_name,
+ $prop_cxx_type,
+ $prop_cxx_name,
$prop_c_name;
}
@@ -1200,7 +1200,7 @@ sub _on_wrap_enum ($)
$self->fixed_error ('Too few parameters.');
}
- my $cpp_type = Common::Util::string_trim(shift @args);
+ my $cxx_type = Common::Util::string_trim(shift @args);
my $c_type = Common::Util::string_trim(shift @args);
my @sed = ();
my $setup =
@@ -1242,7 +1242,7 @@ sub _on_wrap_enum ($)
my $gir_gtype = $enum->get_a_glib_get_type;
my $members = _extract_members $enum, \ substs;
- Common::Output::Enum::output ($self, $cpp_type, $members, $flags, $gir_gtype);
+ Common::Output::Enum::output ($self, $cxx_type, $members, $flags, $gir_gtype);
}
sub _on_wrap_gerror ($)
@@ -1259,7 +1259,7 @@ sub _on_wrap_gerror ($)
$self->fixed_error ('Too few parameters.');
}
- my $cpp_type = Common::Util::string_trim (shift @args);
+ my $cxx_type = Common::Util::string_trim (shift @args);
my $c_type = Common::Util::string_trim (shift @args);
my $enum = $namespace->get_g_enumeration_by_name ($c_type);
@@ -1307,7 +1307,7 @@ sub _on_wrap_gerror ($)
my $gir_domain = $enum->get_a_glib_error_domain;
my $members = _extract_members $enum, \ substs;
- Common::Output::GError::output $self, $cpp_type, $members, $gir_domain, $gir_gtype;
+ Common::Output::GError::output $self, $cxx_type, $members, $gir_domain, $gir_gtype;
}
sub _on_implements_interface ($)
@@ -1342,7 +1342,7 @@ sub _on_class_generic ($)
$self->fixed_error ('Too few parameters.');
}
- my $cpp_type = shift @args;
+ my $cxx_type = shift @args;
my $c_type = shift @args;
# Catch useless parameters.
@@ -1374,7 +1374,7 @@ sub _on_class_generic ($)
$self->push_gir_record ($gir_record);
- Common::Output::Generic::output ($self, $c_type, $cpp_type);
+ Common::Output::Generic::output ($self, $c_type, $cxx_type);
}
sub _on_class_g_object ($)
@@ -1403,7 +1403,7 @@ sub _on_class_g_object ($)
$self->fixed_error ('No such namespace: ' . $module);
}
- my $cpp_type = shift @args;
+ my $cxx_type = shift @args;
my $c_type = shift @args;
my $gir_class = $namespace->get_g_class_by_name ($c_type);
@@ -1579,7 +1579,7 @@ sub _on_class_g_object ($)
$c_parent_type,
$c_parent_class_type,
$get_type_func,
- $cpp_type,
+ $cxx_type,
$cxx_parent_type;
}
@@ -1615,7 +1615,7 @@ sub _on_class_boxed_type ($)
$self->fixed_error ('No such namespace: ' . $module);
}
- my ($cpp_type, $c_type, $new_func, $copy_func, $free_func) = @args;
+ my ($cxx_type, $c_type, $new_func, $copy_func, $free_func) = @args;
my $gir_record = $namespace->get_g_record_by_name ($c_type);
unless (defined $gir_record)
@@ -1754,7 +1754,7 @@ sub _on_class_boxed_type ($)
Common::Output::BoxedType::output $self,
$c_type,
- $cpp_type,
+ $cxx_type,
$get_type_func,
$new_func,
$copy_func,
@@ -1787,7 +1787,7 @@ sub _on_class_boxed_type_static ($)
$self->fixed_error ('No such namespace: ' . $module);
}
- my ($cpp_type, $c_type) = @args;
+ my ($cxx_type, $c_type) = @args;
my $gir_record = $namespace->get_g_record_by_name ($c_type);
unless (defined $gir_record)
@@ -1806,7 +1806,7 @@ sub _on_class_boxed_type_static ($)
Common::Output::BoxedTypeStatic::output $self,
$c_type,
- $cpp_type,
+ $cxx_type,
$get_type_func;
}
@@ -1836,19 +1836,19 @@ sub _on_class_interface ($)
$self->fixed_error ('No such namespace: ' . $module);
}
- my ($cpp_name, $c_name) = @args;
- my $gir_class = $namespace->get_g_class_by_name ($c_name);
+ my ($cxx_type, $c_type) = @args;
+ my $gir_class = $namespace->get_g_class_by_name ($c_type);
unless (defined $gir_class)
{
- $self->fixed_error ('No such class: ' . $c_name);
+ $self->fixed_error ('No such class: ' . $c_type);
}
my $get_type_func = $gir_class->get_a_glib_get_type;
unless (defined $get_type_func)
{
- $self->fixed_error ('Class `' . $c_name . '\' has no get type function.');
+ $self->fixed_error ('Class `' . $c_type . '\' has no get type function.');
}
my $prerequisite_count = $gir_class->get_g_prerequisite_count;
@@ -1878,35 +1878,35 @@ sub _on_class_interface ($)
unless (defined $gir_type_struct)
{
- $self->fixed_error ('Class `' . $c_name . '\' has no Iface struct.');
+ $self->fixed_error ('Class `' . $c_type . '\' has no Iface struct.');
}
my @gir_prefixes = $namespace->get_a_c_identifier_prefixes;
- my $c_class_name = undef;
+ my $c_class_type = undef;
foreach my $gir_prefix (@gir_prefixes)
{
- my $temp_name = $gir_prefix . $gir_type_struct;
+ my $temp_type = $gir_prefix . $gir_type_struct;
- if (defined $namespace->get_g_record_by_name ($temp_name))
+ if (defined $namespace->get_g_record_by_name ($temp_type))
{
- $c_class_name = $temp_name;
+ $c_class_type = $temp_type;
last;
}
}
- unless (defined $c_class_name)
+ unless (defined $c_class_type)
{
$self->fixed_error ('Could not find any type struct (' . $gir_type_struct . ').');
}
- my $c_parent_name = undef;
+ my $c_parent_type = undef;
# if parent is for example Gtk.Widget
if ($gir_parent =~ /^([^.]+)\.(.*)/)
{
my $gir_parent_module = $1;
- my $gir_parent_name = $2;
+ my $gir_parent_type = $2;
my $parent_repository = $repositories=>get_repository ($gir_parent_module);
unless (defined $parent_repository)
@@ -1925,51 +1925,51 @@ sub _on_class_interface ($)
foreach my $gir_parent_prefix (@gir_parent_prefixes)
{
- my $temp_parent_name = $gir_parent_prefix . $gir_parent_name;
- my $gir_parent_class = $parent_namespace->get_g_class_by_name ($temp_parent_name);
+ my $temp_parent_type = $gir_parent_prefix . $gir_parent_type;
+ my $gir_parent_class = $parent_namespace->get_g_class_by_name ($temp_parent_type);
if (defined $gir_parent_class)
{
- $c_parent_name = $temp_parent_name;
+ $c_parent_type = $temp_parent_type;
last;
}
}
- unless (defined $c_parent_name)
+ unless (defined $c_parent_type)
{
- $self->fixed_error ('No such parent class in namespace: `' . $c_parent_name . '\.');
+ $self->fixed_error ('No such parent class in namespace: `' . $c_parent_type . '\.');
}
}
else
{
for my $gir_prefix (@gir_prefixes)
{
- my $temp_parent_name = $gir_prefix . $gir_parent;
- my $gir_parent_class = $namespace->get_g_class_by_name ($temp_parent_name);
+ my $temp_parent_type = $gir_prefix . $gir_parent;
+ my $gir_parent_class = $namespace->get_g_class_by_name ($temp_parent_type);
if (defined $gir_parent_class)
{
- $c_parent_name = $temp_parent_name;
+ $c_parent_type = $temp_parent_type;
last;
}
}
- unless (defined $c_parent_name)
+ unless (defined $c_parent_type)
{
- $self->fixed_error ('No such parent class in namespace: `' . $c_parent_name . '\.');
+ $self->fixed_error ('No such parent class in namespace: `' . $c_parent_type . '\.');
}
}
my $type_info_local = $self->get_type_info_local;
- my $cxx_parent_type = $type_info_local->c_to_cxx ($c_parent_name);
+ my $cxx_parent_type = $type_info_local->c_to_cxx ($c_parent_type);
$self->_push_gir_class ($gir_class);
Common::Output::Interface::output $self,
- $c_name,
- $c_class_name,
- $c_parent_name,
- $cpp_name,
+ $c_type,
+ $c_class_type,
+ $c_parent_type,
+ $cxx_type,
$cxx_parent_type,
$get_type_func;
}
@@ -2002,7 +2002,7 @@ sub _on_class_opaque_copyable ($)
$self->fixed_error ('No such namespace: ' . $module);
}
- my ($cpp_type, $c_type, $new_func, $copy_func, $free_func) = @args;
+ my ($cxx_type, $c_type, $new_func, $copy_func, $free_func) = @args;
my $gir_record = $namespace->get_g_record_by_name ($c_type);
unless (defined $gir_record)
@@ -2134,7 +2134,7 @@ sub _on_class_opaque_copyable ($)
Common::Output::OpaqueCopyable::output $self,
$c_type,
- $cpp_type,
+ $cxx_type,
$new_func,
$copy_func,
$free_func;
@@ -2168,7 +2168,7 @@ sub _on_class_opaque_refcounted ($)
$self->fixed_error ('No such namespace: ' . $module);
}
- my ($cpp_type, $c_type, $new_func, $copy_func, $free_func) = @args;
+ my ($cxx_type, $c_type, $new_func, $copy_func, $free_func) = @args;
my $gir_record = $namespace->get_g_record_by_name ($c_type);
unless (defined $gir_record)
@@ -2300,7 +2300,7 @@ sub _on_class_opaque_refcounted ($)
Common::Output::OpaqueRefcounted::output $self,
$c_type,
- $cpp_type,
+ $cxx_type,
$new_func,
$copy_func,
$free_func;
@@ -2620,7 +2620,7 @@ sub new ($$$$$$)
# '`' => [$self, \&_on_backtick], # probably won't be needed anymore
# '\'' => [$self, \&_on_apostrophe], # probably won't be needed anymore
'"' => [$self, \&_on_string_literal],
- '//' => [$self, \&_on_comment_cpp],
+ '//' => [$self, \&_on_comment_cxx],
'///' => [$self, \&_on_comment_doxygen_single],
'//!' => [$self, \&_on_comment_doxygen_single],
'/*' => [$self, \&_on_comment_c],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
