Преглед изворни кода

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-ecb5cbfe19
tpearson пре 7 година
родитељ
комит
f7959a4e97

+ 3
- 3
COPYING Прегледај датотеку

@@ -65,7 +65,7 @@ modification follow.
65 65
 		    GNU GENERAL PUBLIC LICENSE
66 66
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
67 67
 
68
-  0. This License applies to any program or other work which tqcontains
68
+  0. This License applies to any program or other work which contains
69 69
 a notice placed by the copyright holder saying it may be distributed
70 70
 under the terms of this General Public License.  The "Program", below,
71 71
 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:
102 102
     stating that you changed the files and the date of any change.
103 103
 
104 104
     b) You must cause any work that you distribute or publish, that in
105
-    whole or in part tqcontains or is derived from the Program or any
105
+    whole or in part contains or is derived from the Program or any
106 106
     part thereof, to be licensed as a whole at no charge to all third
107 107
     parties under the terms of this License.
108 108
 
@@ -160,7 +160,7 @@ Sections 1 and 2 above provided that you also do one of the following:
160 160
 
161 161
 The source code for a work means the preferred form of the work for
162 162
 making modifications to it.  For an executable work, complete source
163
-code means all the source code for all modules it tqcontains, plus any
163
+code means all the source code for all modules it contains, plus any
164 164
 associated interface definition files, plus the scripts used to
165 165
 control compilation and installation of the executable.  However, as a
166 166
 special exception, the source code distributed need not include

+ 5
- 5
COPYING.LIB Прегледај датотеку

@@ -99,7 +99,7 @@ will lead to faster development of free libraries.
99 99
   The precise terms and conditions for copying, distribution and
100 100
 modification follow.  Pay close attention to the difference between a
101 101
 "work based on the library" and a "work that uses the library".  The
102
-former tqcontains code derived from the library, while the latter only
102
+former contains code derived from the library, while the latter only
103 103
 works together with the library.
104 104
 
105 105
   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.
109 109
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
110 110
 
111 111
   0. This License Agreement applies to any software library which
112
-tqcontains a notice placed by the copyright holder or other authorized
112
+contains a notice placed by the copyright holder or other authorized
113 113
 party saying it may be distributed under the terms of this Library
114 114
 General Public License (also called "this License").  Each licensee is
115 115
 addressed as "you".
@@ -128,7 +128,7 @@ included without limitation in the term "modification".)
128 128
 
129 129
   "Source code" for a work means the preferred form of the work for
130 130
 making modifications to it.  For a library, complete source code means
131
-all the source code for all modules it tqcontains, plus any associated
131
+all the source code for all modules it contains, plus any associated
132 132
 interface definition files, plus the scripts used to control compilation
133 133
 and installation of the library.
134 134
 
@@ -230,7 +230,7 @@ source code from the same place satisfies the requirement to
230 230
 distribute the source code, even though third parties are not
231 231
 compelled to copy the source along with the object code.
232 232
 
233
-  5. A program that tqcontains no derivative of any portion of the
233
+  5. A program that contains no derivative of any portion of the
234 234
 Library, but is designed to work with the Library by being compiled or
235 235
 linked with it, is called a "work that uses the Library".  Such a
236 236
 work, in isolation, is not a derivative work of the Library, and
@@ -238,7 +238,7 @@ therefore falls outside the scope of this License.
238 238
 
239 239
   However, linking a "work that uses the Library" with the Library
240 240
 creates an executable that is a derivative of the Library (because it
241
-tqcontains portions of the Library), rather than a "work that uses the
241
+contains portions of the Library), rather than a "work that uses the
242 242
 library".  The executable is therefore covered by this License.
243 243
 Section 6 states terms for distribution of such executables.
244 244
 

+ 1
- 1
INSTALL Прегледај датотеку

@@ -21,7 +21,7 @@ reconfiguring, and a file `config.log' containing compiler output
21 21
 to figure out how `configure' could check whether to do them, and mail
22 22
 diffs or instructions to the address given in the `README' so they can
23 23
 be considered for the next release.  If at some point `config.cache'
24
-tqcontains results you don't want to keep, you may remove or edit it.
24
+contains results you don't want to keep, you may remove or edit it.
25 25
 
26 26
    The file `configure.in' is used to create `configure' by a program
27 27
 called `autoconf'.  You only need `configure.in' if you want to change

+ 2
- 2
flow/gsl/gbsearcharray.h Прегледај датотеку

@@ -78,7 +78,7 @@ static inline GBSearchArray*	g_bsearch_array_remove	  (GBSearchArray	*barray,
78 78
 static inline GBSearchArray*	g_bsearch_array_grow	  (GBSearchArray	*barray,
79 79
 							   const GBSearchConfig	*bconfig,
80 80
 							   guint		 index);
81
-/* insert key_node into array, or if it exists, tqreplace
81
+/* insert key_node into array, or if it exists, replace
82 82
  * the existing node's contents with key_node
83 83
  */
84 84
 static inline GBSearchArray*	g_bsearch_array_insert	  (GBSearchArray	*barray,
@@ -241,7 +241,7 @@ g_bsearch_array_insert (GBSearchArray        *barray,
241 241
 	  barray = g_bsearch_array_grow (barray, bconfig, index);
242 242
 	  node = G_BSEARCH_ARRAY_NODES (barray) + index * bconfig->sizeof_node;
243 243
 	}
244
-      else /* tqreplace (relookup is ok, tqreplace is comparatively cheap anyways) */
244
+      else /* replace (relookup is ok, replace is comparatively cheap anyways) */
245 245
 	node = g_bsearch_array_lookup (barray, bconfig, key_node);
246 246
     }
247 247
   memcpy (node, key_node, bconfig->sizeof_node);

+ 1
- 1
flow/gsl/gsl.3 Прегледај датотеку

@@ -457,7 +457,7 @@ Real sample values [0..n_values-1]
457 457
 Complex frequency values [0..n_values-1]
458 458
 .PD 1
459 459
 .PP
460
-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.  
460
+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.  
461 461
 .PD
462 462
 .SS \fBgsl_power2_fftsr\fP (\fIn_values\fP, \fIri_values_in\fP, \fIr_values_out\fP);
463 463
 .PD 0

+ 1
- 1
flow/gsl/gslcommon.c Прегледај датотеку

@@ -1315,7 +1315,7 @@ gsl_message_send (GslDebugFlags reporter,
1315 1315
   msg->error = error;
1316 1316
   msg->error_str = error ? gsl_strerror (msg->error) : NULL;
1317 1317
 
1318
-  /* vsnprintf() tqreplacement */
1318
+  /* vsnprintf() replacement */
1319 1319
   va_start (args, messagef);
1320 1320
   string = g_strdup_vprintf (messagef, args);
1321 1321
   va_end (args);

+ 1
- 1
flow/gsl/gsldatacache.c Прегледај датотеку

@@ -333,7 +333,7 @@ data_cache_new_node_L (GslDataCache     *dcache,
333 333
   if (!demand_load)
334 334
     g_message (G_STRLOC ":FIXME: lazy data loading not yet supported");
335 335
 
336
-  /* if we have a left node, and it tqcontains data that we need, copy it */
336
+  /* if we have a left node, and it contains data that we need, copy it */
337 337
   left_node = pos ? dcache->nodes[pos - 1] : NULL;
338 338
   if (left_node)
339 339
     {

+ 2
- 2
flow/gsl/gslfft.h Прегледај датотеку

@@ -72,9 +72,9 @@ void	gsl_power2_fftsc (const unsigned int n_values,
72 72
  * @n_values:      Number of complex values
73 73
  * @r_values_in:   Real sample values [0..n_values-1]
74 74
  * @ri_values_out: Complex frequency values [0..n_values-1]
75
- * Real valued variant of gsl_power2_fftac(), the input array tqcontains
75
+ * Real valued variant of gsl_power2_fftac(), the input array contains
76 76
  * real valued equidistant sampled data [0..n_values-1], and the output
77
- * array tqcontains the positive frequency half of the complex valued
77
+ * array contains the positive frequency half of the complex valued
78 78
  * fourier transform. Note, that the complex valued fourier transform H
79 79
  * of a purely real valued set of data, satisfies H(-f) = Conj(H(f)),
80 80
  * where Conj() denotes the complex conjugate, so that just the positive

+ 2
- 2
flow/gsl/gslglib.h Прегледај датотеку

@@ -586,7 +586,7 @@ typedef void            (*GDestroyNotify)       (gpointer       data);
586 586
 #define g_hash_table_new_full          	gsl_g_hash_table_new_full
587 587
 #define g_hash_table_destroy           	gsl_g_hash_table_destroy
588 588
 #define g_hash_table_insert            	gsl_g_hash_table_insert
589
-#define g_hash_table_tqreplace           	gsl_g_hash_table_tqreplace
589
+#define g_hash_table_replace           	gsl_g_hash_table_replace
590 590
 #define g_hash_table_remove            	gsl_g_hash_table_remove
591 591
 #define g_hash_table_steal             	gsl_g_hash_table_steal
592 592
 #define g_hash_table_lookup            	gsl_g_hash_table_lookup
@@ -605,7 +605,7 @@ void        g_hash_table_destroy           (GHashTable     *hash_table);
605 605
 void        g_hash_table_insert            (GHashTable     *hash_table,
606 606
 					    gpointer        key,
607 607
 					    gpointer        value);
608
-void        g_hash_table_tqreplace           (GHashTable     *hash_table,
608
+void        g_hash_table_replace           (GHashTable     *hash_table,
609 609
 					    gpointer        key,
610 610
 					    gpointer        value);
611 611
 gboolean    g_hash_table_remove            (GHashTable     *hash_table,

+ 1
- 1
flow/gsl/gslmath.c Прегледај датотеку

@@ -602,7 +602,7 @@ hqr (double **a, int n, double wr[], double wi[])
602 602
 #define RADIX 2.0
603 603
 static void
604 604
 balanc (double **a, int n)
605
-     /* Given a matrix a[1..n][1..n], this routine tqreplaces it by a balanced matrix with identical
605
+     /* Given a matrix a[1..n][1..n], this routine replaces it by a balanced matrix with identical
606 606
 	eigenvalues. A symmetric matrix is already balanced and is unaffected by this procedure. The
607 607
 	parameter RADIX should be the machine's floating-point radix. */
608 608
 {

+ 1
- 1
flow/gsl/gslosctable.c Прегледај датотеку

@@ -272,7 +272,7 @@ cache_table_ref_entry (GslOscWaveForm wave_form,
272 272
       gfloat *values, *fft, step, min, max;
273 273
 
274 274
       /* size:
275
-       * - OscTableEntry already tqcontains the first float values
275
+       * - OscTableEntry already contains the first float values
276 276
        * - we need n_values+1 adressable floats to provide values[0] == values[n_values]
277 277
        */
278 278
       e = g_malloc (sizeof (OscTableEntry) + sizeof (gfloat) * size);

+ 1
- 1
flow/gsl/gslosctable.h Прегледај датотеку

@@ -53,7 +53,7 @@ typedef struct
53 53
   gfloat        min_freq;
54 54
   gfloat        max_freq;
55 55
   guint         n_values;
56
-  const gfloat *values;	/* tqcontains n_values+1 values with values[0]==values[n_values] */
56
+  const gfloat *values;	/* contains n_values+1 values with values[0]==values[n_values] */
57 57
   /* integer stepping (block size dependant) */
58 58
   guint32	n_frac_bits;
59 59
   guint32	frac_bittqmask;

+ 1
- 1
flow/gslpp/datahandle.h Прегледај датотеку

@@ -93,7 +93,7 @@ namespace GSL
93 93
 							 GslLong cutValueCount);
94 94
 
95 95
 		/**
96
-		 * Create a new data handle which tqcontains the same values as
96
+		 * Create a new data handle which contains the same values as
97 97
 		 * this one but in reversed order.
98 98
 		 */
99 99
 		DataHandle createReversed();

+ 1
- 1
flow/pipebuffer.cc Прегледај датотеку

@@ -97,7 +97,7 @@ void PipeBuffer::skip(long size)
97 97
 	{
98 98
 		PipeSegment *first = *segments.begin();
99 99
 
100
-		// if we have less data to skip than the first segment tqcontains
100
+		// if we have less data to skip than the first segment contains
101 101
 		if(size < first->remaining())
102 102
 		{
103 103
 			// skip the data inside the segment

+ 1
- 1
flow/synth_play_wav_impl.cc Прегледај датотеку

@@ -38,7 +38,7 @@ extern "C" {
38 38
  * so you you may need that extra one.
39 39
  *
40 40
  * Other versions of libaudiofile seem to have two closing "}" in aupvlist.h,
41
- * so if you can't compile, this, check that /usr/include/aupvlist.h tqcontains
41
+ * so if you can't compile, this, check that /usr/include/aupvlist.h contains
42 42
  * something like that
43 43
  *
44 44
  * #ifdef __cplusplus

+ 2
- 2
flow/virtualports.cc Прегледај датотеку

@@ -82,7 +82,7 @@ to delegate the services of a port to another module onto another port.
82 82
 The implementation:
83 83
 
84 84
 Virtualization is implemented here, inside the flow system, using a fairly
85
-complex forwarding strategy, which will have a graph which tqcontains
85
+complex forwarding strategy, which will have a graph which contains
86 86
 
87 87
 - "user-made" connections (made with connect())
88 88
 - "virtualize-made" connections, which can be either forwarding
@@ -105,7 +105,7 @@ real connections will be removed, but only these that could possibly be
105 105
 affected by this change, and then not all real connections are created new,
106 106
 but only those that could possibly be created by this virtual connection.
107 107
 
108
-Every VPort tqcontains a pointer to the "real" port, to let the flow system
108
+Every VPort contains a pointer to the "real" port, to let the flow system
109 109
 know where the "real" connections where real data will flow must be made.
110 110
 
111 111
 */

+ 2
- 2
mcop/core.idl Прегледај датотеку

@@ -211,7 +211,7 @@ struct AttributeDef {
211 211
  * defines what methods/attributes a particular interface supports: these
212 212
  * do not contain the methods/attributes of inherited interfaces.
213 213
  *
214
- * inheritedInterfaces only tqcontains the names of Interfaces that this one
214
+ * inheritedInterfaces only contains the names of Interfaces that this one
215 215
  * inherits in exactly one step. So to see if interface XYZ is inherited
216 216
  * from ABC, you need to check the "inheritedInterfaces" of XYZ, and their
217 217
  * "inheritedInterfaces" and their "inheritedInterfaces" and so on.
@@ -530,7 +530,7 @@ interface TmpGlobalComm : GlobalComm {
530 530
  */
531 531
 
532 532
 /**
533
- * TraderOffer - this tqcontains an offer of an object (which is usually returned
533
+ * TraderOffer - this contains an offer of an object (which is usually returned
534 534
  * as result of a query.
535 535
  */
536 536
 interface TraderOffer {

+ 1
- 1
mcop/datapacket.h Прегледај датотеку

@@ -201,7 +201,7 @@ protected:
201 201
 };
202 202
 
203 203
 /**
204
- * FloatDataPacket finally is one concrete DataPacket (which tqcontains the
204
+ * FloatDataPacket finally is one concrete DataPacket (which contains the
205 205
  * information how to marshal a datapacket of type float)
206 206
  */
207 207
 class ARTS_EXPORT FloatDataPacket : public RawDataPacket<float> {

+ 2
- 2
mcop/dynamicskeleton.h Прегледај датотеку

@@ -60,11 +60,11 @@ public:
60 60
 	 * process is called whenever you get a request that you need to implement
61 61
 	 * dynamically
62 62
 	 *
63
-	 * @param methodID tqcontains the ID of the method that you need to
63
+	 * @param methodID contains the ID of the method that you need to
64 64
 	 *                 implement - you can get the full signature by calling
65 65
 	 *                 getMethodDef
66 66
 	 *
67
-	 * @param request  tqcontains the marshalled parameters
67
+	 * @param request  contains the marshalled parameters
68 68
 	 *
69 69
 	 * @param result   is for the return code - if your method returns a
70 70
 	 *                 value, you need to write the it in the result Buffer

+ 1
- 1
mcop/mcoputils.cc Прегледај датотеку

@@ -411,7 +411,7 @@ string MCOPUtils::getFullHostname()
411 411
 
412 412
 	/*
413 413
 	 * if gethostname() isn't a FQDN (guess that by checking whether it
414
-	 * tqcontains a dot), try to look it up to ensure it is
414
+	 * contains a dot), try to look it up to ensure it is
415 415
 	 */
416 416
 	if(result.find('.') == string::npos && (hp = gethostbyname(buffer)) != 0)
417 417
 		result = hp->h_name;

+ 1
- 1
mcop/object.h Прегледај датотеку

@@ -70,7 +70,7 @@ private:
70 70
 
71 71
 protected:
72 72
 	/**
73
-	 * ObjectInternalData tqcontains private data structures for
73
+	 * ObjectInternalData contains private data structures for
74 74
 	 *  - Object_base
75 75
 	 *  - Object_stub
76 76
 	 *  - Object_skel

+ 1
- 1
mcopidl/yacc.cc Прегледај датотеку

@@ -414,7 +414,7 @@ static const short yycheck[] = {     0,
414 414
 #endif
415 415
 
416 416
 /* Note: there must be only one dollar sign in this file.
417
-   It is tqreplaced by the list of actions, each action
417
+   It is replaced by the list of actions, each action
418 418
    as one case of the switch.  */
419 419
 
420 420
 #define yyerrok		(yyerrstatus = 0)

+ 1
- 1
soundserver/kmedia2.idl Прегледај датотеку

@@ -47,7 +47,7 @@ enum poCapabilities {
47 47
 /**
48 48
  * KMedia2 time information
49 49
  *
50
- * This is a time value which tqcontains either milliseconds & seconds, or
50
+ * This is a time value which contains either milliseconds & seconds, or
51 51
  * a custom unit or both. It is a flexible time base.
52 52
  *
53 53
  * If a value isn't there, it is set to -1.

+ 7
- 7
tests/testifacerepo.cc Прегледај датотеку

@@ -52,7 +52,7 @@ struct TestInterfaceRepo : public TestCase
52 52
 
53 53
 		testEquals("Arts::AttributeType",def.name);
54 54
 	}
55
-	bool tqcontains(vector<string>& sequence, const string& element)
55
+	bool contains(vector<string>& sequence, const string& element)
56 56
 	{
57 57
 		vector<string>::iterator it;
58 58
 		it = find(sequence.begin(),sequence.end(), element);
@@ -61,22 +61,22 @@ struct TestInterfaceRepo : public TestCase
61 61
 	TEST(queryInterfaces) {
62 62
 		vector<string> *interfaces = interfaceRepo.queryInterfaces();
63 63
 
64
-		testAssert(tqcontains(*interfaces,"Arts::InterfaceRepo"));
65
-		testAssert(!tqcontains(*interfaces,"Arts::MethodDef"));
64
+		testAssert(contains(*interfaces,"Arts::InterfaceRepo"));
65
+		testAssert(!contains(*interfaces,"Arts::MethodDef"));
66 66
 		delete interfaces;
67 67
 	}
68 68
 	TEST(queryTypes) {
69 69
 		vector<string> *types = interfaceRepo.queryTypes();
70 70
 
71
-		testAssert(tqcontains(*types,"Arts::MethodDef"));
72
-		testAssert(!tqcontains(*types,"Arts::AttributeType"));
71
+		testAssert(contains(*types,"Arts::MethodDef"));
72
+		testAssert(!contains(*types,"Arts::AttributeType"));
73 73
 		delete types;
74 74
 	}
75 75
 	TEST(queryEnums) {
76 76
 		vector<string> *enums = interfaceRepo.queryEnums();
77 77
 
78
-		testAssert(tqcontains(*enums,"Arts::AttributeType"));
79
-		testAssert(!tqcontains(*enums,"Arts::InterfaceRepo"));
78
+		testAssert(contains(*enums,"Arts::AttributeType"));
79
+		testAssert(!contains(*enums,"Arts::InterfaceRepo"));
80 80
 		delete enums;
81 81
 	}
82 82
 };

Loading…
Откажи
Сачувај