[at-spi2-core] For atspi_collection_get_matches_to, rename restrict to limit_scope
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core] For atspi_collection_get_matches_to, rename restrict to limit_scope
- Date: Fri, 3 Feb 2012 23:20:17 +0000 (UTC)
commit 1fe074c83b7290856957be1402aed3ca174c11e1
Author: Mike Gorse <mgorse novell com>
Date: Fri Feb 3 17:21:33 2012 -0600
For atspi_collection_get_matches_to, rename restrict to limit_scope
Restrict can be a keyword. Don't use it as a variable name.
Also update D-Bus introspection.
https://bugzilla.gnome.org/show_bug.cgi?id=669344
atspi/atspi-collection.c | 8 ++++----
xml/Collection.xml | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/atspi/atspi-collection.c b/atspi/atspi-collection.c
index a965757..b401d10 100644
--- a/atspi/atspi-collection.c
+++ b/atspi/atspi-collection.c
@@ -166,7 +166,7 @@ atspi_collection_get_matches (AtspiCollection *collection,
* @tree: An #AtspiCollectionTreeTraversalType specifying restrictions on
* the objects to be traversed.
*
- * @restrict: If #TRUE, only descendants of @current_object's parent
+ * @limit_scope: If #TRUE, only descendants of @current_object's parent
* will be returned. Otherwise (if #FALSE), any accessible may be returned
* if it would preceed @current_object in a flattened hierarchy.
*
@@ -187,7 +187,7 @@ atspi_collection_get_matches_to (AtspiCollection *collection,
AtspiMatchRule *rule,
AtspiCollectionSortOrder sortby,
AtspiCollectionTreeTraversalType tree,
- gboolean restrict,
+ gboolean limit_scope,
gint count,
gboolean traverse,
GError **error)
@@ -196,7 +196,7 @@ atspi_collection_get_matches_to (AtspiCollection *collection,
DBusMessage *reply;
dbus_int32_t d_sortby = sortby;
dbus_int32_t d_tree = tree;
- dbus_bool_t d_restrict = restrict;
+ dbus_bool_t d_limit_scope = limit_scope;
dbus_int32_t d_count = count;
dbus_bool_t d_traverse = traverse;
@@ -209,7 +209,7 @@ atspi_collection_get_matches_to (AtspiCollection *collection,
return NULL;
dbus_message_append_args (message, DBUS_TYPE_UINT32, &d_sortby,
DBUS_TYPE_UINT32, &d_tree,
- DBUS_TYPE_BOOLEAN, &d_restrict,
+ DBUS_TYPE_BOOLEAN, &d_limit_scope,
DBUS_TYPE_INT32, &d_count,
DBUS_TYPE_BOOLEAN, &d_traverse,
DBUS_TYPE_INVALID);
diff --git a/xml/Collection.xml b/xml/Collection.xml
index f4dca8a..7b39776 100644
--- a/xml/Collection.xml
+++ b/xml/Collection.xml
@@ -19,7 +19,7 @@
<annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="QSpiMatchRule"/>
<arg direction="in" name="sortby" type="u"/>
<arg direction="in" name="tree" type="u"/>
- <arg direction="in" name="recurse" type="b"/>
+ <arg direction="in" name="limit_scope" type="b"/>
<arg direction="in" name="count" type="i"/>
<arg direction="in" name="traverse" type="b"/>
<arg direction="out" type="a(so)"/>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]