From bf3bdf1468c5264a57b6aac343f8c7d1a50de848 Mon Sep 17 00:00:00 2001 From: tpearson Date: Fri, 31 Dec 2010 23:53:28 +0000 Subject: Automated conversion aRts now compiles with TQt for Qt4 git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1210526 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- flow/gsl/gbsearcharray.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'flow/gsl/gbsearcharray.h') diff --git a/flow/gsl/gbsearcharray.h b/flow/gsl/gbsearcharray.h index df06231..8eebbb1 100644 --- a/flow/gsl/gbsearcharray.h +++ b/flow/gsl/gbsearcharray.h @@ -56,9 +56,9 @@ typedef union { guint n_nodes; /*< private >*/ - gpointer alignment_dummy1; - glong alignment_dummy2; - gdouble alignment_dummy3; + gpointer tqalignment_dummy1; + glong tqalignment_dummy2; + gdouble tqalignment_dummy3; } GBSearchArray; @@ -78,7 +78,7 @@ static inline GBSearchArray* g_bsearch_array_remove (GBSearchArray *barray, static inline GBSearchArray* g_bsearch_array_grow (GBSearchArray *barray, const GBSearchConfig *bconfig, guint index); -/* insert key_node into array, or if it exists, replace +/* insert key_node into array, or if it exists, tqreplace * the existing node's contents with key_node */ static inline GBSearchArray* g_bsearch_array_insert (GBSearchArray *barray, @@ -241,7 +241,7 @@ g_bsearch_array_insert (GBSearchArray *barray, barray = g_bsearch_array_grow (barray, bconfig, index); node = G_BSEARCH_ARRAY_NODES (barray) + index * bconfig->sizeof_node; } - else /* replace (relookup is ok, replace is comparatively cheap anyways) */ + else /* tqreplace (relookup is ok, tqreplace is comparatively cheap anyways) */ node = g_bsearch_array_lookup (barray, bconfig, key_node); } memcpy (node, key_node, bconfig->sizeof_node); -- cgit v1.2.1