From 39ceed9ed4e4484919f9eecc35d0b51372e5a233 Mon Sep 17 00:00:00 2001 From: Cyrille Bagard Date: Wed, 2 Sep 2020 00:48:49 +0200 Subject: Updated code. --- plugins/pychrysalide/analysis/db/items/bookmark.c | 9 +++++---- plugins/pychrysalide/analysis/db/items/switcher.c | 2 +- src/analysis/db/items/switcher.h | 24 +++++++++++------------ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/plugins/pychrysalide/analysis/db/items/bookmark.c b/plugins/pychrysalide/analysis/db/items/bookmark.c index 274d72c..af649e3 100644 --- a/plugins/pychrysalide/analysis/db/items/bookmark.c +++ b/plugins/pychrysalide/analysis/db/items/bookmark.c @@ -161,8 +161,8 @@ static int py_db_bookmark_init(PyObject *self, PyObject *args, PyObject *kwds) "\n" \ " DbBookmark(addr, comment=None)\n" \ "\n" \ - "Where addr is a location of type pychrysalide.arch.vmpa and" \ - " comment is a string or None.\n" \ + "Where *addr* is a location of type pychrysalide.arch.vmpa and" \ + " *comment* is a string or None.\n" \ "\n" \ "An empty comment is not enough to delete a bookmark for a given address;" \ " the *ERASER* flag from the pychrysalide.analysis.db.DbItem.DbItemFlags" \ @@ -231,7 +231,8 @@ static PyObject *py_db_bookmark_get_address(PyObject *self, void *closure) #define DB_BOOKMARK_ADDRESS_ATTRIB PYTHON_GET_DEF_FULL \ ( \ address, py_db_bookmark, \ - "Location of the bookmark." \ + "Location of the bookmark, provided as a" \ + " pychrysalide.arch.vmpa instance." \ ) bookmark = G_DB_BOOKMARK(pygobject_get(self)); @@ -566,7 +567,7 @@ bool ensure_python_bookmark_collection_is_registered(void) dict = PyModule_GetDict(module); - if (!ensure_python_db_item_is_registered()) + if (!ensure_python_db_collection_is_registered()) return false; if (!register_class_for_pygobject(dict, G_TYPE_BM_COLLECTION, type, get_python_db_collection_type())) diff --git a/plugins/pychrysalide/analysis/db/items/switcher.c b/plugins/pychrysalide/analysis/db/items/switcher.c index 07aa038..6ac5cdf 100644 --- a/plugins/pychrysalide/analysis/db/items/switcher.c +++ b/plugins/pychrysalide/analysis/db/items/switcher.c @@ -600,7 +600,7 @@ bool ensure_python_switcher_collection_is_registered(void) dict = PyModule_GetDict(module); - if (!ensure_python_db_item_is_registered()) + if (!ensure_python_db_collection_is_registered()) return false; if (!register_class_for_pygobject(dict, G_TYPE_SWITCHER_COLLECTION, type, get_python_db_collection_type())) diff --git a/src/analysis/db/items/switcher.h b/src/analysis/db/items/switcher.h index daf6154..2567bbd 100644 --- a/src/analysis/db/items/switcher.h +++ b/src/analysis/db/items/switcher.h @@ -36,12 +36,12 @@ /* --------------------- ELABORATION D'UN ELEMENT DE COLLECTION --------------------- */ -#define G_TYPE_DB_SWITCHER g_db_switcher_get_type() -#define G_DB_SWITCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), g_db_switcher_get_type(), GDbSwitcher)) -#define G_IS_DB_SWITCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_db_switcher_get_type())) -#define G_DB_SWITCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_DB_SWITCHER, GDbSwitcherClass)) -#define G_IS_DB_SWITCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_DB_SWITCHER)) -#define G_DB_SWITCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DB_SWITCHER, GDbSwitcherClass)) +#define G_TYPE_DB_SWITCHER g_db_switcher_get_type() +#define G_DB_SWITCHER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_DB_SWITCHER, GDbSwitcher)) +#define G_IS_DB_SWITCHER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_DB_SWITCHER)) +#define G_DB_SWITCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_DB_SWITCHER, GDbSwitcherClass)) +#define G_IS_DB_SWITCHER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_DB_SWITCHER)) +#define G_DB_SWITCHER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_DB_SWITCHER, GDbSwitcherClass)) /* Bascule d'affichage pour un opérande numérique (instance) */ @@ -74,12 +74,12 @@ ImmOperandDisplay g_db_switcher_get_display(const GDbSwitcher *); /* ---------------------- DEFINITION DE LA COLLECTION ASSOCIEE ---------------------- */ -#define G_TYPE_SWITCHER_COLLECTION g_switcher_collection_get_type() -#define G_SWITCHER_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), g_switcher_collection_get_type(), GSwitcherCollection)) -#define G_IS_SWITCHER_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), g_switcher_collection_get_type())) -#define G_SWITCHER_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_SWITCHER_COLLECTION, GSwitcherCollectionClass)) -#define G_IS_SWITCHER_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_SWITCHER_COLLECTION)) -#define G_SWITCHER_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_SWITCHER_COLLECTION, GSwitcherCollectionClass)) +#define G_TYPE_SWITCHER_COLLECTION g_switcher_collection_get_type() +#define G_SWITCHER_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), G_TYPE_SWITCHER_COLLECTION, GSwitcherCollection)) +#define G_IS_SWITCHER_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), G_TYPE_SWITCHER_COLLECTION)) +#define G_SWITCHER_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), G_TYPE_SWITCHER_COLLECTION, GSwitcherCollectionClass)) +#define G_IS_SWITCHER_COLLECTION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), G_TYPE_SWITCHER_COLLECTION)) +#define G_SWITCHER_COLLECTION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), G_TYPE_SWITCHER_COLLECTION, GSwitcherCollectionClass)) /* Collection dédiée aux basculements d'affichage (instance) */ -- cgit v0.11.2-87-g4458