Skip to content

Commit 897ff39

Browse files
dgobbicryos
authored andcommitted
COMP: remove BTX/ETX from vtkVariant method args
1 parent 0aeadcc commit 897ff39

31 files changed

+11
-102
lines changed

Common/vtkAbstractArray.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ class VTK_COMMON_EXPORT vtkAbstractArray : public vtkObject
278278
return this->GetNumberOfComponents() * this->GetNumberOfTuples();
279279
}
280280

281-
//BTX
282281
// Description:
283282
// Return the indices where a specific value appears.
284283
virtual vtkIdType LookupValue(vtkVariant value) = 0;
@@ -291,7 +290,6 @@ class VTK_COMMON_EXPORT vtkAbstractArray : public vtkObject
291290
// Description:
292291
// Insert a value into the array from a variant.
293292
virtual void InsertVariantValue(vtkIdType idx, vtkVariant value) = 0;
294-
//ETX
295293

296294
// Description:
297295
// Tell the array explicitly that the data has changed.

Common/vtkBitArray.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,11 +137,9 @@ class VTK_COMMON_EXPORT vtkBitArray : public vtkDataArray
137137
// Insets values and checks to make sure there is enough memory
138138
void InsertValue(vtkIdType id, int i);
139139

140-
//BTX
141140
// Description:
142141
// Insert a value into the array from a variant.
143142
void InsertVariantValue(vtkIdType idx, vtkVariant value);
144-
//ETX
145143

146144
vtkIdType InsertNextValue(int i);
147145

@@ -190,12 +188,10 @@ class VTK_COMMON_EXPORT vtkBitArray : public vtkDataArray
190188
// Returns a new vtkBitArrayIterator instance.
191189
vtkArrayIterator* NewIterator();
192190

193-
//BTX
194191
// Description:
195192
// Return the indices where a specific value appears.
196193
virtual vtkIdType LookupValue(vtkVariant value);
197194
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
198-
//ETX
199195
vtkIdType LookupValue(int value);
200196
void LookupValue(int value, vtkIdList* ids);
201197

Common/vtkDataArrayTemplate.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,11 @@ class VTK_COMMON_EXPORT vtkDataArrayTemplate: public vtkDataArray
234234
// Description:
235235
// Returns a vtkArrayIteratorTemplate<T>.
236236
virtual vtkArrayIterator* NewIterator();
237-
238-
//BTX
237+
239238
// Description:
240239
// Return the indices where a specific value appears.
241240
virtual vtkIdType LookupValue(vtkVariant value);
242241
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
243-
//ETX
244242
vtkIdType LookupValue(T value);
245243
void LookupValue(T value, vtkIdList* ids);
246244

Common/vtkStringArray.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ class VTK_COMMON_EXPORT vtkStringArray : public vtkAbstractArray
174174
int GetNumberOfElementComponents() { return 0; }
175175
int GetElementComponentSize() { return static_cast<int>(sizeof(vtkStdString::value_type)); }
176176

177+
//BTX
177178
// Description:
178179
// Insert data at a specified position in the array.
179-
//BTX
180180
void InsertValue(vtkIdType id, vtkStdString f);
181+
//ETX
181182

182183
// Description:
183184
// Insert a value into the array from a variant.
184185
void InsertVariantValue(vtkIdType idx, vtkVariant value);
185-
//ETX
186186
void InsertValue(vtkIdType id, const char *val);
187187

188188
// Description:

Common/vtkUnicodeStringArray.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,13 +62,11 @@ class VTK_COMMON_EXPORT vtkUnicodeStringArray :
6262
virtual unsigned long GetActualMemorySize();
6363
virtual int IsNumeric();
6464
virtual vtkArrayIterator* NewIterator();
65-
//BTX
6665
virtual vtkVariant GetVariantValue(vtkIdType idx);
6766
virtual vtkIdType LookupValue(vtkVariant value);
6867
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
6968

7069
virtual void InsertVariantValue(vtkIdType idx, vtkVariant value);
71-
//ETX
7270
virtual void DataChanged();
7371
virtual void ClearLookup();
7472

Common/vtkVariant.h

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,12 +147,11 @@ class VTK_COMMON_EXPORT vtkVariant
147147
// Create a string variant from a const char*.
148148
vtkVariant(const char* value);
149149

150+
//BTX
150151
// Description:
151152
// Create a string variant from a std string.
152153
vtkVariant(vtkStdString value);
153154

154-
//BTX
155-
156155
// Description:
157156
// Create a Unicode string variant
158157
vtkVariant(const vtkUnicodeString& value);
@@ -258,16 +257,14 @@ class VTK_COMMON_EXPORT vtkVariant
258257
// Get the type of the variant as a string.
259258
const char* GetTypeAsString() const;
260259

260+
//BTX
261261
// Description:
262262
// Convert the variant to a string.
263263
vtkStdString ToString() const;
264264

265-
//BTX
266-
267265
// Description:
268266
// convert the variant to a Unicode string.
269267
vtkUnicodeString ToUnicodeString() const;
270-
271268
//ETX
272269

273270
// Description:
@@ -311,7 +308,6 @@ class VTK_COMMON_EXPORT vtkVariant
311308
unsigned long ToUnsignedLong(bool* valid) const;
312309
unsigned long ToUnsignedLong() const {
313310
return this->ToUnsignedLong(0); };
314-
//BTX
315311
#if defined(VTK_TYPE_USE___INT64)
316312
__int64 To__Int64(bool* valid) const;
317313
__int64 To__Int64() const {
@@ -328,7 +324,6 @@ class VTK_COMMON_EXPORT vtkVariant
328324
unsigned long long ToUnsignedLongLong() const {
329325
return this->ToUnsignedLongLong(0); };
330326
#endif
331-
//ETX
332327
vtkTypeInt64 ToTypeInt64(bool* valid) const;
333328
vtkTypeInt64 ToTypeInt64() const {
334329
return this->ToTypeInt64(0); };

Common/vtkVariantArray.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ class VTK_COMMON_EXPORT vtkVariantArray : public vtkAbstractArray
206206
vtkIdType InsertNextValue(vtkVariant value);
207207

208208
//BTX
209-
210209
// Description:
211210
// Return a pointer to the location in the internal array at the specified index.
212211
vtkVariant* GetPointer(vtkIdType id);
@@ -226,12 +225,10 @@ class VTK_COMMON_EXPORT vtkVariantArray : public vtkAbstractArray
226225
// Return the number of values in the array.
227226
vtkIdType GetNumberOfValues() { return this->MaxId + 1; }
228227

229-
//BTX
230228
// Description:
231229
// Return the indices where a specific value appears.
232230
virtual vtkIdType LookupValue(vtkVariant value);
233231
virtual void LookupValue(vtkVariant value, vtkIdList* ids);
234-
//ETX
235232

236233
// Description:
237234
// Tell the array explicitly that the data has changed.
@@ -277,10 +274,8 @@ class VTK_COMMON_EXPORT vtkVariantArray : public vtkAbstractArray
277274
vtkVariantArray(const vtkVariantArray&); // Not implemented.
278275
void operator=(const vtkVariantArray&); // Not implemented.
279276

280-
//BTX
281277
vtkVariantArrayLookup* Lookup;
282278
void UpdateLookup();
283-
//ETX
284279
};
285280

286281
#endif

Filtering/vtkDistributedGraphHelper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,11 @@ class VTK_FILTERING_EXPORT vtkDistributedGraphHelper : public vtkObject
105105
// hashed distribution will be used.
106106
void SetVertexPedigreeIdDistribution(vtkVertexPedigreeIdDistribution Func,
107107
void *userData);
108+
//ETX
108109

109110
// Description:
110111
// Determine which processor owns the vertex with the given pedigree ID.
111112
vtkIdType GetVertexOwnerByPedigreeId(const vtkVariant& pedigreeId);
112-
//ETX
113113

114114
// Description:
115115
// Synchronizes all of the processors involved in this distributed

Filtering/vtkGraph.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,6 @@ class VTK_FILTERING_EXPORT vtkGraph : public vtkDataObject
422422
vtkDistributedGraphHelper *GetDistributedGraphHelper();
423423
//ETX
424424

425-
//BTX
426425
// Description:
427426
// Retrieve the vertex with the given pedigree ID. If successful,
428427
// returns the ID of the vertex. Otherwise, either the vertex data
@@ -431,7 +430,6 @@ class VTK_FILTERING_EXPORT vtkGraph : public vtkDataObject
431430
// If the graph is a distributed graph, this method will return the
432431
// Distributed-ID of the vertex.
433432
vtkIdType FindVertex(const vtkVariant& pedigreeID);
434-
//ETX
435433

436434
// Description:
437435
// Shallow copies the data object into this graph.

Filtering/vtkMutableDirectedGraph.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ class VTK_FILTERING_EXPORT vtkMutableDirectedGraph : public vtkDirectedGraph
8888
// the delays associated with returning the vertex index.
8989
vtkIdType AddVertex(vtkVariantArray *propertyArr);
9090

91-
//BTX
9291
// Description:
9392
// Adds a vertex with the given \p pedigreeID to the graph and
9493
// returns the index of the new vertex.
@@ -104,7 +103,6 @@ class VTK_FILTERING_EXPORT vtkMutableDirectedGraph : public vtkDirectedGraph
104103
// LazyAddVertex, which provides better performance by eliminating
105104
// the delays associated with returning the vertex index.
106105
vtkIdType AddVertex(const vtkVariant& pedigreeId);
107-
//ETX
108106

109107
// Description:
110108
// Adds a directed edge from \p u to \p v,
@@ -200,7 +198,6 @@ class VTK_FILTERING_EXPORT vtkMutableDirectedGraph : public vtkDirectedGraph
200198
// called on the helper.
201199
void LazyAddVertex(vtkVariantArray *propertyArr);
202200

203-
//BTX
204201
// Description:
205202
// Adds a vertex with the given \p pedigreeID to the graph.
206203
//
@@ -267,7 +264,6 @@ class VTK_FILTERING_EXPORT vtkMutableDirectedGraph : public vtkDirectedGraph
267264
void LazyAddEdge(const vtkVariant& u,
268265
const vtkVariant& v,
269266
vtkVariantArray *propertyArr = 0);
270-
//ETX
271267

272268
// Description:
273269
// Variant of AddEdge() that returns a heavyweight \p vtkGraphEdge object.

0 commit comments

Comments
 (0)