[libgda-uimm] DataEntry: Correct virtual function names.
- From: José Alburquerque <jaalburqu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda-uimm] DataEntry: Correct virtual function names.
- Date: Thu, 29 Apr 2010 22:29:45 +0000 (UTC)
commit 28095e81e6ffeb9b392cd2114016d587410d3549
Author: José Alburquerque <jaalburqu svn gnome org>
Date: Thu Apr 29 18:26:16 2010 -0400
DataEntry: Correct virtual function names.
* libgda-ui/src/dataentry.ccg:
* libgda-ui/src/dataentry.hg:
* libgda-ui/src/libgda_ui_vfuncs.defs ([get|set]_value_orig_vfunc):
Rename to [get|set]_ref_value_vfunc() as was done in the C API.
ChangeLog | 9 +++++++++
libgda-ui/src/dataentry.ccg | 14 +++++++-------
libgda-ui/src/dataentry.hg | 8 ++++----
libgda-ui/src/libgda_ui_vfuncs.defs | 4 ++--
4 files changed, 22 insertions(+), 13 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index e15fb30..341b03a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-04-29 José Alburquerque <jaalburqu svn gnome org>
+
+ DataEntry: Correct virtual function names.
+
+ * libgda-ui/src/dataentry.ccg:
+ * libgda-ui/src/dataentry.hg:
+ * libgda-ui/src/libgda_ui_vfuncs.defs ([get|set]_value_orig_vfunc):
+ Rename to [get|set]_ref_value_vfunc() as was done in the C API.
+
3.99.19:
2010-04-23 José Alburquerque <jaalburqu svn gnome org>
diff --git a/libgda-ui/src/dataentry.ccg b/libgda-ui/src/dataentry.ccg
index 80dbe0f..4101067 100644
--- a/libgda-ui/src/dataentry.ccg
+++ b/libgda-ui/src/dataentry.ccg
@@ -103,7 +103,7 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
}
}
const GValue*
-DataEntry_Class::get_value_orig_vfunc_callback(GdauiDataEntry* self)
+DataEntry_Class::get_ref_value_vfunc_callback(GdauiDataEntry* self)
{
Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
Glib::ObjectBase::_get_current_wrapper((GObject*)self));
@@ -125,7 +125,7 @@ DataEntry_Class::get_value_orig_vfunc_callback(GdauiDataEntry* self)
// Call the virtual member method, which derived classes might override.
GValue* copy = 0;
Glib::ValueBase val;
- obj->get_value_orig_vfunc(val);
+ obj->get_ref_value_vfunc(val);
g_value_copy(val.gobj(), copy);
return copy;
#ifdef GLIBMM_EXCEPTIONS_ENABLED
@@ -144,24 +144,24 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(self), CppObjectType::get_type()) // Ge
) );
// Call the original underlying C function:
- if(base && base->get_value_orig)
- return (*base->get_value_orig)(self);
+ if(base && base->get_ref_value)
+ return (*base->get_ref_value)(self);
typedef GValue* RType;
return RType();
}
-void Gnome::GdaUI::DataEntry::get_value_orig_vfunc(Glib::ValueBase& value) const
+void Gnome::GdaUI::DataEntry::get_ref_value_vfunc(Glib::ValueBase& value) const
{
BaseClassType *const base = static_cast<BaseClassType*>(
g_type_interface_peek_parent( // Get the parent interface of the interface (The original underlying C interface).
g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) // Get the interface.
) );
- if(base && base->get_value_orig)
+ if(base && base->get_ref_value)
{
const GValue* g_val =
- (*base->get_value_orig)(const_cast<GdauiDataEntry*>(gobj()));
+ (*base->get_ref_value)(const_cast<GdauiDataEntry*>(gobj()));
value.init(g_val);
}
}
diff --git a/libgda-ui/src/dataentry.hg b/libgda-ui/src/dataentry.hg
index abfab11..bc1d59f 100644
--- a/libgda-ui/src/dataentry.hg
+++ b/libgda-ui/src/dataentry.hg
@@ -171,11 +171,11 @@ public:
void get_value_vfunc(Glib::ValueBase& value) const;
#endif //GLIBMM_VFUNCS_ENABLED
- _WRAP_VFUNC(void set_value_orig(const Glib::ValueBase& value), "set_value_orig")
+ _WRAP_VFUNC(void set_ref_value(const Glib::ValueBase& value), "set_ref_value")
#ifdef GLIBMM_VFUNCS_ENABLED
- void get_value_orig_vfunc(Glib::ValueBase& value) const;
+ void get_ref_value_vfunc(Glib::ValueBase& value) const;
#endif //GLIBMM_VFUNCS_ENABLED
_WRAP_VFUNC(void set_value_default(const Glib::ValueBase& value), "set_value_default")
@@ -193,10 +193,10 @@ protected:
#m4begin
_PUSH(SECTION_PCC_CLASS_INIT_VFUNCS)
klass->get_value = &get_value_vfunc_callback;
- klass->get_value_orig = &get_value_orig_vfunc_callback;
+ klass->get_ref_value = &get_ref_value_vfunc_callback;
_SECTION(SECTION_PH_VFUNCS)
static GValue* get_value_vfunc_callback(GdauiDataEntry* self);
- static const GValue* get_value_orig_vfunc_callback(GdauiDataEntry* self);
+ static const GValue* get_ref_value_vfunc_callback(GdauiDataEntry* self);
_POP()
#m4end
};
diff --git a/libgda-ui/src/libgda_ui_vfuncs.defs b/libgda-ui/src/libgda_ui_vfuncs.defs
index 50f12bb..dd3e19f 100644
--- a/libgda-ui/src/libgda_ui_vfuncs.defs
+++ b/libgda-ui/src/libgda_ui_vfuncs.defs
@@ -30,7 +30,7 @@
(return-type "GValue*")
)
-(define-vfunc set_value_orig
+(define-vfunc set_ref_value
(of-object "GdauiDataEntry")
(return-type "void")
(parameters
@@ -38,7 +38,7 @@
)
)
-(define-vfunc get_value_orig
+(define-vfunc get_ref_value
(of-object "GdauiDataEntry")
(return-type "const-GValue*")
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]