Skip to content

Commit ca0824d

Browse files
davywdavyw
committed
Removed __O3DB__ references.
* Cleaned up all __O3DB__ references for issue stepcode#30.
1 parent ffdeac2 commit ca0824d

26 files changed

+1
-247
lines changed

‎src/clSchemas/example/SdaiEXAMPLE_SCHEMA.cc‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -126,15 +126,6 @@ SdaiPoly_line::SdaiPoly_line( SdaiPoly_line & e ) {
126126
}
127127
SdaiPoly_line::~SdaiPoly_line() { }
128128

129-
130-
#ifdef __O3DB__
131-
void
132-
SdaiPoly_line::oodb_reInit() {
133-
eDesc = example_schemae_poly_line;
134-
attributes [0].aDesc = a_0points;
135-
}
136-
#endif
137-
138129
SdaiPoly_line::SdaiPoly_line( SCLP23( Application_instance ) *se, int * addAttrs ) {
139130
/* Set this to point to the head entity. */
140131
HeadEntity( se );
@@ -199,17 +190,6 @@ SdaiShape::SdaiShape( SdaiShape & e ) {
199190
}
200191
SdaiShape::~SdaiShape() { }
201192

202-
203-
#ifdef __O3DB__
204-
void
205-
SdaiShape::oodb_reInit() {
206-
eDesc = example_schemae_shape;
207-
attributes [0].aDesc = a_1item_name;
208-
attributes [1].aDesc = a_2item_color;
209-
attributes [2].aDesc = a_3number_of_sides;
210-
}
211-
#endif
212-
213193
SdaiShape::SdaiShape( SCLP23( Application_instance ) *se, int * addAttrs ) {
214194
/* Set this to point to the head entity. */
215195
HeadEntity( se );
@@ -363,15 +343,6 @@ create_SdaiRectangle( os_database * db ) {
363343
}
364344
#endif
365345

366-
#ifdef __O3DB__
367-
void
368-
SdaiRectangle::oodb_reInit() {
369-
eDesc = example_schemae_rectangle;
370-
attributes [3].aDesc = a_4height;
371-
attributes [4].aDesc = a_5width;
372-
}
373-
#endif
374-
375346
SdaiRectangle::SdaiRectangle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
376347
/* Set this to point to the head entity. */
377348
HeadEntity( se );
@@ -450,13 +421,6 @@ SdaiSquare::SdaiSquare( SdaiSquare & e ) {
450421
}
451422
SdaiSquare::~SdaiSquare() { }
452423

453-
#ifdef __O3DB__
454-
void
455-
SdaiSquare::oodb_reInit() {
456-
eDesc = example_schemae_square;
457-
}
458-
#endif
459-
460424
SdaiSquare::SdaiSquare( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiRectangle( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
461425
/* Set this to point to the head entity. */
462426
HeadEntity( se );
@@ -504,16 +468,6 @@ SdaiTriangle::SdaiTriangle( SdaiTriangle & e ) {
504468
}
505469
SdaiTriangle::~SdaiTriangle() { }
506470

507-
#ifdef __O3DB__
508-
void
509-
SdaiTriangle::oodb_reInit() {
510-
eDesc = example_schemae_triangle;
511-
attributes [3].aDesc = a_6side1_length;
512-
attributes [4].aDesc = a_7side2_length;
513-
attributes [5].aDesc = a_8side3_length;
514-
}
515-
#endif
516-
517471
SdaiTriangle::SdaiTriangle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
518472
/* Set this to point to the head entity. */
519473
HeadEntity( se );
@@ -620,14 +574,6 @@ SdaiCircle::SdaiCircle( SdaiCircle & e ) {
620574
}
621575
SdaiCircle::~SdaiCircle() { }
622576

623-
#ifdef __O3DB__
624-
void
625-
SdaiCircle::oodb_reInit() {
626-
eDesc = example_schemae_circle;
627-
attributes [3].aDesc = a_9radius;
628-
}
629-
#endif
630-
631577
SdaiCircle::SdaiCircle( SCLP23( Application_instance ) *se, int * addAttrs ) : SdaiShape( se, ( addAttrs ? &addAttrs[1] : 0 ) ) {
632578
/* Set this to point to the head entity. */
633579
HeadEntity( se );
@@ -691,16 +637,6 @@ SdaiLine::SdaiLine( SdaiLine & e ) {
691637
}
692638
SdaiLine::~SdaiLine() { }
693639

694-
695-
#ifdef __O3DB__
696-
void
697-
SdaiLine::oodb_reInit() {
698-
eDesc = example_schemae_line;
699-
attributes [0].aDesc = a_10end_point_one;
700-
attributes [1].aDesc = a_11end_point_two;
701-
}
702-
#endif
703-
704640
SdaiLine::SdaiLine( SCLP23( Application_instance ) *se, int * addAttrs ) {
705641
/* Set this to point to the head entity. */
706642
HeadEntity( se );
@@ -788,16 +724,6 @@ SdaiCartesian_point::SdaiCartesian_point( SdaiCartesian_point & e ) {
788724
}
789725
SdaiCartesian_point::~SdaiCartesian_point() { }
790726

791-
#ifdef __O3DB__
792-
void
793-
SdaiCartesian_point::oodb_reInit() {
794-
eDesc = example_schemae_cartesian_point;
795-
attributes [0].aDesc = a_12x;
796-
attributes [1].aDesc = a_13y;
797-
attributes [2].aDesc = a_14z;
798-
}
799-
#endif
800-
801727
SdaiCartesian_point::SdaiCartesian_point( SCLP23( Application_instance ) *se, int * addAttrs ) {
802728
/* Set this to point to the head entity. */
803729
HeadEntity( se );

‎src/clSchemas/example/SdaiEXAMPLE_SCHEMA.h‎

Lines changed: 0 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
// regenerate it.
66
/* $Id$ */
77

8-
#ifdef __O3DB__
9-
#include <OpenOODB.h>
10-
#endif
11-
128
#ifndef SCHEMA_H
139
#include <schema.h>
1410
#endif
@@ -110,10 +106,6 @@ class SdaiPoly_line : public SCLP23( Application_instance ) {
110106
SdaiPoly_line( SdaiPoly_line & e );
111107
~SdaiPoly_line();
112108

113-
#ifdef __O3DB__
114-
void oodb_reInit();
115-
#endif
116-
117109
int opcode() {
118110
return 0 ;
119111
}
@@ -123,17 +115,10 @@ class SdaiPoly_line : public SCLP23( Application_instance ) {
123115

124116
};
125117

126-
#ifdef __O3DB__
127-
inline SCLP23( Application_instance_ptr )
128-
create_SdaiPoly_line() {
129-
return ( SCLP23( Application_instance_ptr ) ) new SdaiPoly_line ;
130-
}
131-
#else
132118
inline SdaiPoly_line *
133119
create_SdaiPoly_line() {
134120
return new SdaiPoly_line ;
135121
}
136-
#endif
137122

138123
///////// END_ENTITY poly_line
139124

@@ -157,10 +142,6 @@ class SdaiShape : public SCLP23( Application_instance ) {
157142
SdaiShape( SdaiShape & e );
158143
~SdaiShape();
159144

160-
#ifdef __O3DB__
161-
void oodb_reInit();
162-
#endif
163-
164145
int opcode() {
165146
return 1 ;
166147
}
@@ -176,17 +157,10 @@ class SdaiShape : public SCLP23( Application_instance ) {
176157

177158
};
178159

179-
#ifdef __O3DB__
180-
inline SCLP23( Application_instance_ptr )
181-
create_SdaiShape() {
182-
return ( SCLP23( Application_instance_ptr ) ) new SdaiShape ;
183-
}
184-
#else
185160
inline SdaiShape *
186161
create_SdaiShape() {
187162
return new SdaiShape ;
188163
}
189-
#endif
190164

191165
///////// END_ENTITY shape
192166

@@ -208,10 +182,6 @@ class SdaiRectangle : public SdaiShape {
208182
SdaiRectangle( SdaiRectangle & e );
209183
~SdaiRectangle();
210184

211-
#ifdef __O3DB__
212-
void oodb_reInit();
213-
#endif
214-
215185
int opcode() {
216186
return 2 ;
217187
}
@@ -226,17 +196,10 @@ class SdaiRectangle : public SdaiShape {
226196

227197
};
228198

229-
#ifdef __O3DB__
230-
inline SCLP23( Application_instance_ptr )
231-
create_SdaiRectangle() {
232-
return ( SCLP23( Application_instance_ptr ) ) new SdaiRectangle ;
233-
}
234-
#else
235199
inline SdaiRectangle *
236200
create_SdaiRectangle() {
237201
return new SdaiRectangle ;
238202
}
239-
#endif
240203

241204
///////// END_ENTITY rectangle
242205

@@ -254,10 +217,6 @@ class SdaiSquare : public SdaiRectangle {
254217
SdaiSquare( SdaiSquare & e );
255218
~SdaiSquare();
256219

257-
#ifdef __O3DB__
258-
void oodb_reInit();
259-
#endif
260-
261220
int opcode() {
262221
return 3 ;
263222
}
@@ -266,17 +225,10 @@ class SdaiSquare : public SdaiRectangle {
266225

267226
};
268227

269-
#ifdef __O3DB__
270-
inline SCLP23( Application_instance_ptr )
271-
create_SdaiSquare() {
272-
return ( SCLP23( Application_instance_ptr ) ) new SdaiSquare ;
273-
}
274-
#else
275228
inline SdaiSquare *
276229
create_SdaiSquare() {
277230
return new SdaiSquare ;
278231
}
279-
#endif
280232

281233
///////// END_ENTITY square
282234

@@ -300,10 +252,6 @@ class SdaiTriangle : public SdaiShape {
300252
SdaiTriangle( SdaiTriangle & e );
301253
~SdaiTriangle();
302254

303-
#ifdef __O3DB__
304-
void oodb_reInit();
305-
#endif
306-
307255
int opcode() {
308256
return 4 ;
309257
}
@@ -321,17 +269,10 @@ class SdaiTriangle : public SdaiShape {
321269

322270
};
323271

324-
#ifdef __O3DB__
325-
inline SCLP23( Application_instance_ptr )
326-
create_SdaiTriangle() {
327-
return ( SCLP23( Application_instance_ptr ) ) new SdaiTriangle ;
328-
}
329-
#else
330272
inline SdaiTriangle *
331273
create_SdaiTriangle() {
332274
return new SdaiTriangle ;
333275
}
334-
#endif
335276

336277
///////// END_ENTITY triangle
337278

@@ -351,10 +292,6 @@ class SdaiCircle : public SdaiShape {
351292
SdaiCircle( SdaiCircle & e );
352293
~SdaiCircle();
353294

354-
#ifdef __O3DB__
355-
void oodb_reInit();
356-
#endif
357-
358295
int opcode() {
359296
return 5 ;
360297
}
@@ -366,17 +303,10 @@ class SdaiCircle : public SdaiShape {
366303

367304
};
368305

369-
#ifdef __O3DB__
370-
inline SCLP23( Application_instance_ptr )
371-
create_SdaiCircle() {
372-
return ( SCLP23( Application_instance_ptr ) ) new SdaiCircle ;
373-
}
374-
#else
375306
inline SdaiCircle *
376307
create_SdaiCircle() {
377308
return new SdaiCircle ;
378309
}
379-
#endif
380310

381311
///////// END_ENTITY circle
382312

@@ -398,10 +328,6 @@ class SdaiLine : public SCLP23( Application_instance ) {
398328
SdaiLine( SdaiLine & e );
399329
~SdaiLine();
400330

401-
#ifdef __O3DB__
402-
void oodb_reInit();
403-
#endif
404-
405331
int opcode() {
406332
return 6 ;
407333
}
@@ -414,17 +340,10 @@ class SdaiLine : public SCLP23( Application_instance ) {
414340

415341
};
416342

417-
#ifdef __O3DB__
418-
inline SCLP23( Application_instance_ptr )
419-
create_SdaiLine() {
420-
return ( SCLP23( Application_instance_ptr ) ) new SdaiLine ;
421-
}
422-
#else
423343
inline SdaiLine *
424344
create_SdaiLine() {
425345
return new SdaiLine ;
426346
}
427-
#endif
428347

429348
///////// END_ENTITY line
430349

@@ -448,10 +367,6 @@ class SdaiCartesian_point : public SCLP23( Application_instance ) {
448367
SdaiCartesian_point( SdaiCartesian_point & e );
449368
~SdaiCartesian_point();
450369

451-
#ifdef __O3DB__
452-
void oodb_reInit();
453-
#endif
454-
455370
int opcode() {
456371
return 7 ;
457372
}
@@ -467,17 +382,10 @@ class SdaiCartesian_point : public SCLP23( Application_instance ) {
467382

468383
};
469384

470-
#ifdef __O3DB__
471-
inline SCLP23( Application_instance_ptr )
472-
create_SdaiCartesian_point() {
473-
return ( SCLP23( Application_instance_ptr ) ) new SdaiCartesian_point ;
474-
}
475-
#else
476385
inline SdaiCartesian_point *
477386
create_SdaiCartesian_point() {
478387
return new SdaiCartesian_point ;
479388
}
480-
#endif
481389

482390
///////// END_ENTITY cartesian_point
483391

‎src/clSchemas/example/schema.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
#include <sys/time.h>
99
#endif
1010

11-
#ifdef __O3DB__
12-
#include <OpenOODB.h>
13-
#endif
14-
1511
#include <sdai.h>
1612

1713

‎src/cleditor/dispnode.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
/* $Id: dispnode.h,v 3.0.1.2 1997/11/05 22:11:39 sauderd DP3.1 $ */
1717

1818
#include <scl_export.h>
19-
#ifdef __O3DB__
20-
#include <OpenOODB.h>
21-
#endif
2219

2320
/*#include <STEPattribute.h>*/
2421
/*#include <STEPentity.h>*/

0 commit comments

Comments
 (0)