[libgda-uimm] Remove optional API, to make the code simpler.
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda-uimm] Remove optional API, to make the code simpler.
- Date: Mon, 18 Oct 2010 08:37:05 +0000 (UTC)
commit 9d375346bd5a06284a8d643ade14900550dafcc9
Author: Murray Cumming <murrayc murrayc com>
Date: Mon Oct 18 10:36:59 2010 +0200
Remove optional API, to make the code simpler.
* libgda-ui/src/cloud.ccg:
* libgda-ui/src/dataentry.ccg:
* libgda-ui/src/dataentry.hg: Used Jose's remove-optional-api-ifdefs.new.sh
script to remove the ifdefs.
ChangeLog | 18 +++++++++++++-----
libgda-ui/src/cloud.ccg | 4 ----
libgda-ui/src/dataentry.ccg | 10 ----------
libgda-ui/src/dataentry.hg | 4 ----
4 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5205717..0995196 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-18 Murray Cumming <murrayc murrayc com>
+
+ Remove optional API, to make the code simpler.
+
+ * libgda-ui/src/cloud.ccg:
+ * libgda-ui/src/dataentry.ccg:
+ * libgda-ui/src/dataentry.hg: Used Jose's remove-optional-api-ifdefs.new.sh
+ script to remove the ifdefs.
+
2010-10-16 Murray Cumming <murrayc murrayc com>
Fix the build with the latest (stable) libgda-ui.
@@ -5,7 +14,7 @@
* libgda-ui/src/libgda_ui_methods.defs: Regenerated with h2defs.py
* libgda-ui/src/libgda_ui_vfuncs.defs: Corrected by hand.
* configure.ac: Depend on libgda-ui 4.2.0
- * libgda-ui/src/dataentry.[hg|ccg]: Removed get_default_value(). Added
+ * libgda-ui/src/dataentry.[hg|ccg]: Removed get_default_value(). Added
get/set_reference_value() and set_reference_current().
3.99.20:
@@ -224,7 +233,7 @@
* libgda-ui/src/filelist.am: Add new DataProxy interface.
* libgda-ui/src/libgda_ui_vfuncs.defs: Added GdauiDataProxy virtual
functions.
- * tools/m4/convert_libgda_uimm.m4: Added conversions for DataProxy.
+ * tools/m4/convert_libgda_uimm.m4: Added conversions for DataProxy.
2010-02-24 José Alburquerque <jaalburqu svn gnome org>
@@ -259,7 +268,7 @@
Login: Wrapped properties and signals.
* libgda-ui/src/login.hg: Wrapped signals and properties.
- * tools/extra_defs_gen/generate_defs_libgda_ui.cc: Added
+ * tools/extra_defs_gen/generate_defs_libgda_ui.cc: Added
GDAUI_TYPE_LOGIN to the list of types for which signals and properties
should be generated.
* libgda-ui/src/libgda_ui_signals.defs: Regenerated with
@@ -355,6 +364,5 @@
2009-09-14 Murray Cumming <murrayc murrayc com>
* libgda-ui/src/Makefile.am:
- * libgda-ui/src/combo.[hg|ccg]: Change the namespace from Gnome::Gda to
+ * libgda-ui/src/combo.[hg|ccg]: Change the namespace from Gnome::Gda to
Gnome::GdaUI.
-
diff --git a/libgda-ui/src/cloud.ccg b/libgda-ui/src/cloud.ccg
index 09c4e85..266ef08 100644
--- a/libgda-ui/src/cloud.ccg
+++ b/libgda-ui/src/cloud.ccg
@@ -32,18 +32,14 @@ static gdouble Cloud_Weight_libgda_uimm_callback(GdaDataModel *model,
Gnome::GdaUI::Cloud::SlotWeight* the_slot =
static_cast<Gnome::GdaUI::Cloud::SlotWeight*>(data);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
return (*the_slot)(Glib::wrap(model, true), row);
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
Glib::exception_handlers_invoke();
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
return 0;
}
diff --git a/libgda-ui/src/dataentry.ccg b/libgda-ui/src/dataentry.ccg
index b483728..68b19a5 100644
--- a/libgda-ui/src/dataentry.ccg
+++ b/libgda-ui/src/dataentry.ccg
@@ -40,7 +40,6 @@ void DataEntry::get_reference_value(Glib::ValueBase& value) const
value.init(gvalue);
}
-#ifdef GLIBMM_VFUNCS_ENABLED
GValue* DataEntry_Class::get_value_vfunc_callback(GdauiDataEntry* self)
{
Glib::ObjectBase *const obj_base = static_cast<Glib::ObjectBase*>(
@@ -56,23 +55,19 @@ GValue* DataEntry_Class::get_value_vfunc_callback(GdauiDataEntry* self)
CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
if(obj) // This can be NULL during destruction.
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
// Call the virtual member method, which derived classes might override.
GValue* copy = 0;
Glib::ValueBase val;
obj->get_value_vfunc(val);
g_value_copy(val.gobj(), copy);
return copy;
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
Glib::exception_handlers_invoke();
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
@@ -118,23 +113,19 @@ DataEntry_Class::get_ref_value_vfunc_callback(GdauiDataEntry* self)
CppObjectType *const obj = dynamic_cast<CppObjectType* const>(obj_base);
if(obj) // This can be NULL during destruction.
{
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
try // Trap C++ exceptions which would normally be lost because this is a C callback.
{
- #endif //GLIBMM_EXCEPTIONS_ENABLED
// Call the virtual member method, which derived classes might override.
GValue* copy = 0;
Glib::ValueBase val;
obj->get_ref_value_vfunc(val);
g_value_copy(val.gobj(), copy);
return copy;
- #ifdef GLIBMM_EXCEPTIONS_ENABLED
}
catch(...)
{
Glib::exception_handlers_invoke();
}
- #endif //GLIBMM_EXCEPTIONS_ENABLED
}
}
@@ -165,7 +156,6 @@ g_type_interface_peek(G_OBJECT_GET_CLASS(gobject_), CppObjectType::get_type()) /
value.init(g_val);
}
}
-#endif //GLIBMM_VFUNCS_ENABLED
} /* namespace GdaUI */
diff --git a/libgda-ui/src/dataentry.hg b/libgda-ui/src/dataentry.hg
index 6c48e4b..4706d56 100644
--- a/libgda-ui/src/dataentry.hg
+++ b/libgda-ui/src/dataentry.hg
@@ -183,16 +183,12 @@ public:
_WRAP_VFUNC(GType get_value_type() const, "get_value_type")
_WRAP_VFUNC(void set_value(const Glib::ValueBase& value), "set_value")
-#ifdef GLIBMM_VFUNCS_ENABLED
void get_value_vfunc(Glib::ValueBase& value) const;
-#endif //GLIBMM_VFUNCS_ENABLED
_WRAP_VFUNC(void set_ref_value(const Glib::ValueBase& value), "set_ref_value")
-#ifdef GLIBMM_VFUNCS_ENABLED
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")
_WRAP_VFUNC(void set_attributes(Gnome::Gda::ValueAttribute attrs, Gnome::Gda::ValueAttribute mask), "set_attributes")
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]