From f7959a4e97cdef8152a8bbf4e6d0b69cefea1baa Mon Sep 17 00:00:00 2001
From: tpearson
Date: Wed, 10 Aug 2011 06:08:18 +0000
Subject: [PATCH] rename the following methods: tqfind find tqreplace replace
tqcontains contains
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
COPYING | 6 +++---
COPYING.LIB | 10 +++++-----
INSTALL | 2 +-
flow/gsl/gbsearcharray.h | 4 ++--
flow/gsl/gsl.3 | 2 +-
flow/gsl/gslcommon.c | 2 +-
flow/gsl/gsldatacache.c | 2 +-
flow/gsl/gslfft.h | 4 ++--
flow/gsl/gslglib.h | 4 ++--
flow/gsl/gslmath.c | 2 +-
flow/gsl/gslosctable.c | 2 +-
flow/gsl/gslosctable.h | 2 +-
flow/gslpp/datahandle.h | 2 +-
flow/pipebuffer.cc | 2 +-
flow/synth_play_wav_impl.cc | 2 +-
flow/virtualports.cc | 4 ++--
mcop/core.idl | 4 ++--
mcop/datapacket.h | 2 +-
mcop/dynamicskeleton.h | 4 ++--
mcop/mcoputils.cc | 2 +-
mcop/object.h | 2 +-
mcopidl/yacc.cc | 2 +-
soundserver/kmedia2.idl | 2 +-
tests/testifacerepo.cc | 14 +++++++-------
24 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/COPYING b/COPYING
index 7f447e1..81dbdfe 100644
--- a/COPYING
+++ b/COPYING
@@ -65,7 +65,7 @@ modification follow.
GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 0. This License applies to any program or other work which tqcontains
+ 0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License. The "Program", below,
refers to any such program or work, and a "work based on the Program"
@@ -102,7 +102,7 @@ above, provided that you also meet all of these conditions:
stating that you changed the files and the date of any change.
b) You must cause any work that you distribute or publish, that in
- whole or in part tqcontains or is derived from the Program or any
+ whole or in part contains or is derived from the Program or any
part thereof, to be licensed as a whole at no charge to all third
parties under the terms of this License.
@@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following:
The source code for a work means the preferred form of the work for
making modifications to it. For an executable work, complete source
-code means all the source code for all modules it tqcontains, plus any
+code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable. However, as a
special exception, the source code distributed need not include
diff --git a/COPYING.LIB b/COPYING.LIB
index 9ee39d0..f7b749a 100644
--- a/COPYING.LIB
+++ b/COPYING.LIB
@@ -99,7 +99,7 @@ will lead to faster development of free libraries.
The precise terms and conditions for copying, distribution and
modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
-former tqcontains code derived from the library, while the latter only
+former contains code derived from the library, while the latter only
works together with the library.
Note that it is possible for a library to be covered by the ordinary
@@ -109,7 +109,7 @@ General Public License rather than by this special one.
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License Agreement applies to any software library which
-tqcontains a notice placed by the copyright holder or other authorized
+contains a notice placed by the copyright holder or other authorized
party saying it may be distributed under the terms of this Library
General Public License (also called "this License"). Each licensee is
addressed as "you".
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
-all the source code for all modules it tqcontains, plus any associated
+all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.
@@ -230,7 +230,7 @@ source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.
- 5. A program that tqcontains no derivative of any portion of the
+ 5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library". Such a
work, in isolation, is not a derivative work of the Library, and
@@ -238,7 +238,7 @@ therefore falls outside the scope of this License.
However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
-tqcontains portions of the Library), rather than a "work that uses the
+contains portions of the Library), rather than a "work that uses the
library". The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.
diff --git a/INSTALL b/INSTALL
index 5862f28..911039a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -21,7 +21,7 @@ reconfiguring, and a file `config.log' containing compiler output
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If at some point `config.cache'
-tqcontains results you don't want to keep, you may remove or edit it.
+contains results you don't want to keep, you may remove or edit it.
The file `configure.in' is used to create `configure' by a program
called `autoconf'. You only need `configure.in' if you want to change
diff --git a/flow/gsl/gbsearcharray.h b/flow/gsl/gbsearcharray.h
index afd1a51..df06231 100644
--- a/flow/gsl/gbsearcharray.h
+++ b/flow/gsl/gbsearcharray.h
@@ -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, tqreplace
+/* insert key_node into array, or if it exists, replace
* 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 /* tqreplace (relookup is ok, tqreplace is comparatively cheap anyways) */
+ else /* replace (relookup is ok, replace is comparatively cheap anyways) */
node = g_bsearch_array_lookup (barray, bconfig, key_node);
}
memcpy (node, key_node, bconfig->sizeof_node);
diff --git a/flow/gsl/gsl.3 b/flow/gsl/gsl.3
index cd7eb8b..21a25d2 100644
--- a/flow/gsl/gsl.3
+++ b/flow/gsl/gsl.3
@@ -457,7 +457,7 @@ Real sample values [0..n_values-1]
Complex frequency values [0..n_values-1]
.PD 1
.PP
-Real valued variant of \fBgsl_power2_fftac()\fP, the input array tqcontains real valued equidistant sampled data [0..n_values-1], and the output array tqcontains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.
+Real valued variant of \fBgsl_power2_fftac()\fP, the input array contains real valued equidistant sampled data [0..n_values-1], and the output array contains the positive frequency half of the complex valued fourier transform. Note, that the complex valued fourier transform H of a purely real valued set of data, satisfies \fBH(-f)\fP = Conj(\fBH(f)\fP), where \fBConj()\fP denotes the complex conjugate, so that just the positive frequency half suffices to describe the entire frequency spectrum. Even so, the resulting n_values/2 complex frequencies are one value off in storage size, but the resulting frequencies \fBH(0)\fP and \fBH(n_values/2)\fP are both real valued, so the real portion of \fBH(n_values/2)\fP is stored in ri_values_out[1] (the imaginery part of \fBH(0)\fP), so that both r_values_in and ri_values_out can be of size n_values. Note that the transformation is performed out of place, the input array is not modified, and may not overlap with the output array.
.PD
.SS \fBgsl_power2_fftsr\fP (\fIn_values\fP, \fIri_values_in\fP, \fIr_values_out\fP);
.PD 0
diff --git a/flow/gsl/gslcommon.c b/flow/gsl/gslcommon.c
index d9f63fa..2c263b1 100644
--- a/flow/gsl/gslcommon.c
+++ b/flow/gsl/gslcommon.c
@@ -1315,7 +1315,7 @@ gsl_message_send (GslDebugFlags reporter,
msg->error = error;
msg->error_str = error ? gsl_strerror (msg->error) : NULL;
- /* vsnprintf() tqreplacement */
+ /* vsnprintf() replacement */
va_start (args, messagef);
string = g_strdup_vprintf (messagef, args);
va_end (args);
diff --git a/flow/gsl/gsldatacache.c b/flow/gsl/gsldatacache.c
index b925e83..b00f6ef 100644
--- a/flow/gsl/gsldatacache.c
+++ b/flow/gsl/gsldatacache.c
@@ -333,7 +333,7 @@ data_cache_new_node_L (GslDataCache *dcache,
if (!demand_load)
g_message (G_STRLOC ":FIXME: lazy data loading not yet supported");
- /* if we have a left node, and it tqcontains data that we need, copy it */
+ /* if we have a left node, and it contains data that we need, copy it */
left_node = pos ? dcache->nodes[pos - 1] : NULL;
if (left_node)
{
diff --git a/flow/gsl/gslfft.h b/flow/gsl/gslfft.h
index 51b9a8f..ecfa320 100644
--- a/flow/gsl/gslfft.h
+++ b/flow/gsl/gslfft.h
@@ -72,9 +72,9 @@ void gsl_power2_fftsc (const unsigned int n_values,
* @n_values: Number of complex values
* @r_values_in: Real sample values [0..n_values-1]
* @ri_values_out: Complex frequency values [0..n_values-1]
- * Real valued variant of gsl_power2_fftac(), the input array tqcontains
+ * Real valued variant of gsl_power2_fftac(), the input array contains
* real valued equidistant sampled data [0..n_values-1], and the output
- * array tqcontains the positive frequency half of the complex valued
+ * array contains the positive frequency half of the complex valued
* fourier transform. Note, that the complex valued fourier transform H
* of a purely real valued set of data, satisfies H(-f) = Conj(H(f)),
* where Conj() denotes the complex conjugate, so that just the positive
diff --git a/flow/gsl/gslglib.h b/flow/gsl/gslglib.h
index 3da5447..1831985 100644
--- a/flow/gsl/gslglib.h
+++ b/flow/gsl/gslglib.h
@@ -586,7 +586,7 @@ typedef void (*GDestroyNotify) (gpointer data);
#define g_hash_table_new_full gsl_g_hash_table_new_full
#define g_hash_table_destroy gsl_g_hash_table_destroy
#define g_hash_table_insert gsl_g_hash_table_insert
-#define g_hash_table_tqreplace gsl_g_hash_table_tqreplace
+#define g_hash_table_replace gsl_g_hash_table_replace
#define g_hash_table_remove gsl_g_hash_table_remove
#define g_hash_table_steal gsl_g_hash_table_steal
#define g_hash_table_lookup gsl_g_hash_table_lookup
@@ -605,7 +605,7 @@ void g_hash_table_destroy (GHashTable *hash_table);
void g_hash_table_insert (GHashTable *hash_table,
gpointer key,
gpointer value);
-void g_hash_table_tqreplace (GHashTable *hash_table,
+void g_hash_table_replace (GHashTable *hash_table,
gpointer key,
gpointer value);
gboolean g_hash_table_remove (GHashTable *hash_table,
diff --git a/flow/gsl/gslmath.c b/flow/gsl/gslmath.c
index 66f5b5b..008b5ec 100644
--- a/flow/gsl/gslmath.c
+++ b/flow/gsl/gslmath.c
@@ -602,7 +602,7 @@ hqr (double **a, int n, double wr[], double wi[])
#define RADIX 2.0
static void
balanc (double **a, int n)
- /* Given a matrix a[1..n][1..n], this routine tqreplaces it by a balanced matrix with identical
+ /* Given a matrix a[1..n][1..n], this routine replaces it by a balanced matrix with identical
eigenvalues. A symmetric matrix is already balanced and is unaffected by this procedure. The
parameter RADIX should be the machine's floating-point radix. */
{
diff --git a/flow/gsl/gslosctable.c b/flow/gsl/gslosctable.c
index ea43e89..b978668 100644
--- a/flow/gsl/gslosctable.c
+++ b/flow/gsl/gslosctable.c
@@ -272,7 +272,7 @@ cache_table_ref_entry (GslOscWaveForm wave_form,
gfloat *values, *fft, step, min, max;
/* size:
- * - OscTableEntry already tqcontains the first float values
+ * - OscTableEntry already contains the first float values
* - we need n_values+1 adressable floats to provide values[0] == values[n_values]
*/
e = g_malloc (sizeof (OscTableEntry) + sizeof (gfloat) * size);
diff --git a/flow/gsl/gslosctable.h b/flow/gsl/gslosctable.h
index f65dc04..d9f87b2 100644
--- a/flow/gsl/gslosctable.h
+++ b/flow/gsl/gslosctable.h
@@ -53,7 +53,7 @@ typedef struct
gfloat min_freq;
gfloat max_freq;
guint n_values;
- const gfloat *values; /* tqcontains n_values+1 values with values[0]==values[n_values] */
+ const gfloat *values; /* contains n_values+1 values with values[0]==values[n_values] */
/* integer stepping (block size dependant) */
guint32 n_frac_bits;
guint32 frac_bittqmask;
diff --git a/flow/gslpp/datahandle.h b/flow/gslpp/datahandle.h
index 1c106ed..26d8c33 100644
--- a/flow/gslpp/datahandle.h
+++ b/flow/gslpp/datahandle.h
@@ -93,7 +93,7 @@ namespace GSL
GslLong cutValueCount);
/**
- * Create a new data handle which tqcontains the same values as
+ * Create a new data handle which contains the same values as
* this one but in reversed order.
*/
DataHandle createReversed();
diff --git a/flow/pipebuffer.cc b/flow/pipebuffer.cc
index 532e58f..5fb81fb 100644
--- a/flow/pipebuffer.cc
+++ b/flow/pipebuffer.cc
@@ -97,7 +97,7 @@ void PipeBuffer::skip(long size)
{
PipeSegment *first = *segments.begin();
- // if we have less data to skip than the first segment tqcontains
+ // if we have less data to skip than the first segment contains
if(size < first->remaining())
{
// skip the data inside the segment
diff --git a/flow/synth_play_wav_impl.cc b/flow/synth_play_wav_impl.cc
index d6eebba..dec68f0 100644
--- a/flow/synth_play_wav_impl.cc
+++ b/flow/synth_play_wav_impl.cc
@@ -38,7 +38,7 @@ extern "C" {
* so you you may need that extra one.
*
* Other versions of libaudiofile seem to have two closing "}" in aupvlist.h,
- * so if you can't compile, this, check that /usr/include/aupvlist.h tqcontains
+ * so if you can't compile, this, check that /usr/include/aupvlist.h contains
* something like that
*
* #ifdef __cplusplus
diff --git a/flow/virtualports.cc b/flow/virtualports.cc
index 0e74606..b733256 100644
--- a/flow/virtualports.cc
+++ b/flow/virtualports.cc
@@ -82,7 +82,7 @@ to delegate the services of a port to another module onto another port.
The implementation:
Virtualization is implemented here, inside the flow system, using a fairly
-complex forwarding strategy, which will have a graph which tqcontains
+complex forwarding strategy, which will have a graph which contains
- "user-made" connections (made with connect())
- "virtualize-made" connections, which can be either forwarding
@@ -105,7 +105,7 @@ real connections will be removed, but only these that could possibly be
affected by this change, and then not all real connections are created new,
but only those that could possibly be created by this virtual connection.
-Every VPort tqcontains a pointer to the "real" port, to let the flow system
+Every VPort contains a pointer to the "real" port, to let the flow system
know where the "real" connections where real data will flow must be made.
*/
diff --git a/mcop/core.idl b/mcop/core.idl
index ea1062b..156632a 100644
--- a/mcop/core.idl
+++ b/mcop/core.idl
@@ -211,7 +211,7 @@ struct AttributeDef {
* defines what methods/attributes a particular interface supports: these
* do not contain the methods/attributes of inherited interfaces.
*
- * inheritedInterfaces only tqcontains the names of Interfaces that this one
+ * inheritedInterfaces only contains the names of Interfaces that this one
* inherits in exactly one step. So to see if interface XYZ is inherited
* from ABC, you need to check the "inheritedInterfaces" of XYZ, and their
* "inheritedInterfaces" and their "inheritedInterfaces" and so on.
@@ -530,7 +530,7 @@ interface TmpGlobalComm : GlobalComm {
*/
/**
- * TraderOffer - this tqcontains an offer of an object (which is usually returned
+ * TraderOffer - this contains an offer of an object (which is usually returned
* as result of a query.
*/
interface TraderOffer {
diff --git a/mcop/datapacket.h b/mcop/datapacket.h
index e62348e..e7a08e0 100644
--- a/mcop/datapacket.h
+++ b/mcop/datapacket.h
@@ -201,7 +201,7 @@ protected:
};
/**
- * FloatDataPacket finally is one concrete DataPacket (which tqcontains the
+ * FloatDataPacket finally is one concrete DataPacket (which contains the
* information how to marshal a datapacket of type float)
*/
class ARTS_EXPORT FloatDataPacket : public RawDataPacket {
diff --git a/mcop/dynamicskeleton.h b/mcop/dynamicskeleton.h
index 7fece5b..94fc8c5 100644
--- a/mcop/dynamicskeleton.h
+++ b/mcop/dynamicskeleton.h
@@ -60,11 +60,11 @@ public:
* process is called whenever you get a request that you need to implement
* dynamically
*
- * @param methodID tqcontains the ID of the method that you need to
+ * @param methodID contains the ID of the method that you need to
* implement - you can get the full signature by calling
* getMethodDef
*
- * @param request tqcontains the marshalled parameters
+ * @param request contains the marshalled parameters
*
* @param result is for the return code - if your method returns a
* value, you need to write the it in the result Buffer
diff --git a/mcop/mcoputils.cc b/mcop/mcoputils.cc
index 1bfe5df..2ba6ad2 100644
--- a/mcop/mcoputils.cc
+++ b/mcop/mcoputils.cc
@@ -411,7 +411,7 @@ string MCOPUtils::getFullHostname()
/*
* if gethostname() isn't a FQDN (guess that by checking whether it
- * tqcontains a dot), try to look it up to ensure it is
+ * contains a dot), try to look it up to ensure it is
*/
if(result.find('.') == string::npos && (hp = gethostbyname(buffer)) != 0)
result = hp->h_name;
diff --git a/mcop/object.h b/mcop/object.h
index dafddf7..f67bc67 100644
--- a/mcop/object.h
+++ b/mcop/object.h
@@ -70,7 +70,7 @@ private:
protected:
/**
- * ObjectInternalData tqcontains private data structures for
+ * ObjectInternalData contains private data structures for
* - Object_base
* - Object_stub
* - Object_skel
diff --git a/mcopidl/yacc.cc b/mcopidl/yacc.cc
index edd9157..e063506 100644
--- a/mcopidl/yacc.cc
+++ b/mcopidl/yacc.cc
@@ -414,7 +414,7 @@ static const short yycheck[] = { 0,
#endif
/* Note: there must be only one dollar sign in this file.
- It is tqreplaced by the list of actions, each action
+ It is replaced by the list of actions, each action
as one case of the switch. */
#define yyerrok (yyerrstatus = 0)
diff --git a/soundserver/kmedia2.idl b/soundserver/kmedia2.idl
index ca17d67..96fd5a0 100644
--- a/soundserver/kmedia2.idl
+++ b/soundserver/kmedia2.idl
@@ -47,7 +47,7 @@ enum poCapabilities {
/**
* KMedia2 time information
*
- * This is a time value which tqcontains either milliseconds & seconds, or
+ * This is a time value which contains either milliseconds & seconds, or
* a custom unit or both. It is a flexible time base.
*
* If a value isn't there, it is set to -1.
diff --git a/tests/testifacerepo.cc b/tests/testifacerepo.cc
index ceb36d3..a5c5962 100644
--- a/tests/testifacerepo.cc
+++ b/tests/testifacerepo.cc
@@ -52,7 +52,7 @@ struct TestInterfaceRepo : public TestCase
testEquals("Arts::AttributeType",def.name);
}
- bool tqcontains(vector& sequence, const string& element)
+ bool contains(vector& sequence, const string& element)
{
vector::iterator it;
it = find(sequence.begin(),sequence.end(), element);
@@ -61,22 +61,22 @@ struct TestInterfaceRepo : public TestCase
TEST(queryInterfaces) {
vector *interfaces = interfaceRepo.queryInterfaces();
- testAssert(tqcontains(*interfaces,"Arts::InterfaceRepo"));
- testAssert(!tqcontains(*interfaces,"Arts::MethodDef"));
+ testAssert(contains(*interfaces,"Arts::InterfaceRepo"));
+ testAssert(!contains(*interfaces,"Arts::MethodDef"));
delete interfaces;
}
TEST(queryTypes) {
vector *types = interfaceRepo.queryTypes();
- testAssert(tqcontains(*types,"Arts::MethodDef"));
- testAssert(!tqcontains(*types,"Arts::AttributeType"));
+ testAssert(contains(*types,"Arts::MethodDef"));
+ testAssert(!contains(*types,"Arts::AttributeType"));
delete types;
}
TEST(queryEnums) {
vector *enums = interfaceRepo.queryEnums();
- testAssert(tqcontains(*enums,"Arts::AttributeType"));
- testAssert(!tqcontains(*enums,"Arts::InterfaceRepo"));
+ testAssert(contains(*enums,"Arts::AttributeType"));
+ testAssert(!contains(*enums,"Arts::InterfaceRepo"));
delete enums;
}
};