Skip to content

Commit bba38ad

Browse files
dpasukhidpasukhi
committed
Using default values from Microsoft for Breaking (BeforeColon)
1 parent 1b44cf7 commit bba38ad

13 files changed

+102
-105
lines changed

‎.clang-format

-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@ BinPackArguments: false
2020
BinPackParameters: false
2121
BreakBeforeBinaryOperators: NonAssignment
2222
BreakBeforeTernaryOperators: true
23-
BreakConstructorInitializers: AfterColon
24-
BreakInheritanceList: AfterComma
2523
ColumnLimit: 100
2624
ContinuationIndentWidth: 2
2725
IndentCaseLabels: true

‎src/Approx/Approx_Curve2d.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ class Approx_Curve2d_Eval : public AdvApprox_EvaluatorFunction
2929
public:
3030
Approx_Curve2d_Eval(const Handle(Adaptor2d_Curve2d)& theFunc,
3131
Standard_Real First,
32-
Standard_Real Last) :
33-
fonct(theFunc)
32+
Standard_Real Last)
33+
: fonct(theFunc)
3434
{
3535
StartEndSav[0] = First;
3636
StartEndSav[1] = Last;

‎src/Approx/Approx_Curve3d.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ class Approx_Curve3d_Eval : public AdvApprox_EvaluatorFunction
3434
public:
3535
Approx_Curve3d_Eval(const Handle(Adaptor3d_Curve)& theFunc,
3636
Standard_Real First,
37-
Standard_Real Last) :
38-
fonct(theFunc)
37+
Standard_Real Last)
38+
: fonct(theFunc)
3939
{
4040
StartEndSav[0] = First;
4141
StartEndSav[1] = Last;

‎src/Approx/Approx_CurveOnSurface.cxx

+29-29
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ class Approx_CurveOnSurface_Eval : public AdvApprox_EvaluatorFunction
5050
Approx_CurveOnSurface_Eval(const Handle(Adaptor3d_Curve)& theFunc,
5151
const Handle(Adaptor2d_Curve2d)& theFunc2d,
5252
Standard_Real First,
53-
Standard_Real Last) :
54-
fonct(theFunc),
55-
fonct2d(theFunc2d)
53+
Standard_Real Last)
54+
: fonct(theFunc),
55+
fonct2d(theFunc2d)
5656
{
5757
StartEndSav[0] = First;
5858
StartEndSav[1] = Last;
@@ -149,8 +149,8 @@ class Approx_CurveOnSurface_Eval3d : public AdvApprox_EvaluatorFunction
149149
public:
150150
Approx_CurveOnSurface_Eval3d(const Handle(Adaptor3d_Curve)& theFunc,
151151
Standard_Real First,
152-
Standard_Real Last) :
153-
fonct(theFunc)
152+
Standard_Real Last)
153+
: fonct(theFunc)
154154
{
155155
StartEndSav[0] = First;
156156
StartEndSav[1] = Last;
@@ -232,8 +232,8 @@ class Approx_CurveOnSurface_Eval2d : public AdvApprox_EvaluatorFunction
232232
public:
233233
Approx_CurveOnSurface_Eval2d(const Handle(Adaptor2d_Curve2d)& theFunc2d,
234234
Standard_Real First,
235-
Standard_Real Last) :
236-
fonct2d(theFunc2d)
235+
Standard_Real Last)
236+
: fonct2d(theFunc2d)
237237
{
238238
StartEndSav[0] = First;
239239
StartEndSav[1] = Last;
@@ -317,17 +317,17 @@ Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& C2
317317
const Standard_Integer MaxDegree,
318318
const Standard_Integer MaxSegments,
319319
const Standard_Boolean only3d,
320-
const Standard_Boolean only2d) :
321-
myC2D(C2D),
322-
mySurf(Surf),
323-
myFirst(First),
324-
myLast(Last),
325-
myTol(Tol),
326-
myIsDone(Standard_False),
327-
myHasResult(Standard_False),
328-
myError3d(0.0),
329-
myError2dU(0.0),
330-
myError2dV(0.0)
320+
const Standard_Boolean only2d)
321+
: myC2D(C2D),
322+
mySurf(Surf),
323+
myFirst(First),
324+
myLast(Last),
325+
myTol(Tol),
326+
myIsDone(Standard_False),
327+
myHasResult(Standard_False),
328+
myError3d(0.0),
329+
myError2dU(0.0),
330+
myError2dV(0.0)
331331
{
332332
Perform(MaxSegments, MaxDegree, S, only3d, only2d);
333333
}
@@ -338,17 +338,17 @@ Approx_CurveOnSurface::Approx_CurveOnSurface(const Handle(Adaptor2d_Curve2d)& th
338338
const Handle(Adaptor3d_Surface)& theSurf,
339339
const Standard_Real theFirst,
340340
const Standard_Real theLast,
341-
const Standard_Real theTol) :
342-
myC2D(theC2D),
343-
mySurf(theSurf),
344-
myFirst(theFirst),
345-
myLast(theLast),
346-
myTol(theTol),
347-
myIsDone(Standard_False),
348-
myHasResult(Standard_False),
349-
myError3d(0.0),
350-
myError2dU(0.0),
351-
myError2dV(0.0)
341+
const Standard_Real theTol)
342+
: myC2D(theC2D),
343+
mySurf(theSurf),
344+
myFirst(theFirst),
345+
myLast(theLast),
346+
myTol(theTol),
347+
myIsDone(Standard_False),
348+
myHasResult(Standard_False),
349+
myError3d(0.0),
350+
myError2dU(0.0),
351+
myError2dV(0.0)
352352
{
353353
}
354354

‎src/Approx/Approx_CurvilinearParameter.cxx

+9-9
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class Approx_CurvilinearParameter_EvalCurv : public AdvApprox_EvaluatorFunction
6969
public:
7070
Approx_CurvilinearParameter_EvalCurv(const Handle(Approx_CurvlinFunc)& theFunc,
7171
Standard_Real First,
72-
Standard_Real Last) :
73-
fonct(theFunc)
72+
Standard_Real Last)
73+
: fonct(theFunc)
7474
{
7575
StartEndSav[0] = First;
7676
StartEndSav[1] = Last;
@@ -131,9 +131,9 @@ Approx_CurvilinearParameter::Approx_CurvilinearParameter(const Handle(Adaptor3d_
131131
const Standard_Real Tol,
132132
const GeomAbs_Shape Order,
133133
const Standard_Integer MaxDegree,
134-
const Standard_Integer MaxSegments) :
135-
myMaxError2d1(0.0),
136-
myMaxError2d2(0.0)
134+
const Standard_Integer MaxSegments)
135+
: myMaxError2d1(0.0),
136+
myMaxError2d2(0.0)
137137
{
138138
#ifdef OCCT_DEBUG_CHRONO
139139
t_total = t_init = t_approx = t_uparam = 0;
@@ -222,8 +222,8 @@ class Approx_CurvilinearParameter_EvalCurvOnSurf : public AdvApprox_EvaluatorFun
222222
public:
223223
Approx_CurvilinearParameter_EvalCurvOnSurf(const Handle(Approx_CurvlinFunc)& theFunc,
224224
Standard_Real First,
225-
Standard_Real Last) :
226-
fonct(theFunc)
225+
Standard_Real Last)
226+
: fonct(theFunc)
227227
{
228228
StartEndSav[0] = First;
229229
StartEndSav[1] = Last;
@@ -397,8 +397,8 @@ class Approx_CurvilinearParameter_EvalCurvOn2Surf : public AdvApprox_EvaluatorFu
397397
public:
398398
Approx_CurvilinearParameter_EvalCurvOn2Surf(const Handle(Approx_CurvlinFunc)& theFunc,
399399
Standard_Real First,
400-
Standard_Real Last) :
401-
fonct(theFunc)
400+
Standard_Real Last)
401+
: fonct(theFunc)
402402
{
403403
StartEndSav[0] = First;
404404
StartEndSav[1] = Last;

‎src/Approx/Approx_CurvlinFunc.cxx

+28-28
Original file line numberDiff line numberDiff line change
@@ -118,29 +118,29 @@ static void findfourpoints(const Standard_Real,
118118
}
119119
*/
120120

121-
Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor3d_Curve)& C, const Standard_Real Tol) :
122-
myC3D(C),
123-
myCase(1),
124-
myFirstS(0),
125-
myLastS(1),
126-
myTolLen(Tol),
127-
myPrevS(0.0),
128-
myPrevU(0.0)
121+
Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor3d_Curve)& C, const Standard_Real Tol)
122+
: myC3D(C),
123+
myCase(1),
124+
myFirstS(0),
125+
myLastS(1),
126+
myTolLen(Tol),
127+
myPrevS(0.0),
128+
myPrevU(0.0)
129129
{
130130
Init();
131131
}
132132

133133
Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D,
134134
const Handle(Adaptor3d_Surface)& S,
135-
const Standard_Real Tol) :
136-
myC2D1(C2D),
137-
mySurf1(S),
138-
myCase(2),
139-
myFirstS(0),
140-
myLastS(1),
141-
myTolLen(Tol),
142-
myPrevS(0.0),
143-
myPrevU(0.0)
135+
const Standard_Real Tol)
136+
: myC2D1(C2D),
137+
mySurf1(S),
138+
myCase(2),
139+
myFirstS(0),
140+
myLastS(1),
141+
myTolLen(Tol),
142+
myPrevS(0.0),
143+
myPrevU(0.0)
144144
{
145145
Init();
146146
}
@@ -149,17 +149,17 @@ Approx_CurvlinFunc::Approx_CurvlinFunc(const Handle(Adaptor2d_Curve2d)& C2D1,
149149
const Handle(Adaptor2d_Curve2d)& C2D2,
150150
const Handle(Adaptor3d_Surface)& S1,
151151
const Handle(Adaptor3d_Surface)& S2,
152-
const Standard_Real Tol) :
153-
myC2D1(C2D1),
154-
myC2D2(C2D2),
155-
mySurf1(S1),
156-
mySurf2(S2),
157-
myCase(3),
158-
myFirstS(0),
159-
myLastS(1),
160-
myTolLen(Tol),
161-
myPrevS(0.0),
162-
myPrevU(0.0)
152+
const Standard_Real Tol)
153+
: myC2D1(C2D1),
154+
myC2D2(C2D2),
155+
mySurf1(S1),
156+
mySurf2(S2),
157+
myCase(3),
158+
myFirstS(0),
159+
myLastS(1),
160+
myTolLen(Tol),
161+
myPrevS(0.0),
162+
myPrevU(0.0)
163163
{
164164
Init();
165165
}

‎src/Approx/Approx_SameParameter.cxx

+16-17
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ class Approx_SameParameter_Evaluator : public AdvApprox_EvaluatorFunction
3939
public:
4040
Approx_SameParameter_Evaluator(const TColStd_Array1OfReal& theFlatKnots,
4141
const TColStd_Array1OfReal& thePoles,
42-
const Handle(Adaptor2d_Curve2d)& theHCurve2d) :
43-
FlatKnots(theFlatKnots),
44-
Poles(thePoles),
45-
HCurve2d(theHCurve2d)
42+
const Handle(Adaptor2d_Curve2d)& theHCurve2d)
43+
: FlatKnots(theFlatKnots),
44+
Poles(thePoles),
45+
HCurve2d(theHCurve2d)
4646
{
4747
}
4848

@@ -268,10 +268,10 @@ static Standard_Boolean Check(const TColStd_Array1OfReal& FlatKnots,
268268
Approx_SameParameter::Approx_SameParameter(const Handle(Geom_Curve)& C3D,
269269
const Handle(Geom2d_Curve)& C2D,
270270
const Handle(Geom_Surface)& S,
271-
const Standard_Real Tol) :
272-
myDeltaMin(Precision::PConfusion()),
273-
mySameParameter(Standard_True),
274-
myDone(Standard_False)
271+
const Standard_Real Tol)
272+
: myDeltaMin(Precision::PConfusion()),
273+
mySameParameter(Standard_True),
274+
myDone(Standard_False)
275275
{
276276
myHCurve2d = new Geom2dAdaptor_Curve(C2D);
277277
myC3d = new GeomAdaptor_Curve(C3D);
@@ -284,10 +284,10 @@ Approx_SameParameter::Approx_SameParameter(const Handle(Geom_Curve)& C3D,
284284
Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D,
285285
const Handle(Geom2d_Curve)& C2D,
286286
const Handle(Adaptor3d_Surface)& S,
287-
const Standard_Real Tol) :
288-
myDeltaMin(Precision::PConfusion()),
289-
mySameParameter(Standard_True),
290-
myDone(Standard_False)
287+
const Standard_Real Tol)
288+
: myDeltaMin(Precision::PConfusion()),
289+
mySameParameter(Standard_True),
290+
myDone(Standard_False)
291291
{
292292
myC3d = C3D;
293293
mySurf = S;
@@ -300,10 +300,10 @@ Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D,
300300
Approx_SameParameter::Approx_SameParameter(const Handle(Adaptor3d_Curve)& C3D,
301301
const Handle(Adaptor2d_Curve2d)& C2D,
302302
const Handle(Adaptor3d_Surface)& S,
303-
const Standard_Real Tol) :
304-
myDeltaMin(Precision::PConfusion()),
305-
mySameParameter(Standard_True),
306-
myDone(Standard_False)
303+
const Standard_Real Tol)
304+
: myDeltaMin(Precision::PConfusion()),
305+
mySameParameter(Standard_True),
306+
myDone(Standard_False)
307307
{
308308
myC3d = C3D;
309309
mySurf = S;
@@ -471,7 +471,6 @@ void Approx_SameParameter::Build(const Standard_Real Tolerance)
471471

472472
if (!interpolok)
473473
hasCountChanged = IncreaseNbPoles(Poles, FlatKnots, aData, besttol2);
474-
475474
} while (!interpolok && hasCountChanged);
476475

477476
if (!myDone)

‎src/Approx/Approx_SweepApproximation.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
class Approx_SweepApproximation_Eval : public AdvApprox_EvaluatorFunction
3232
{
3333
public:
34-
Approx_SweepApproximation_Eval(Approx_SweepApproximation& theTool) :
35-
Tool(theTool)
34+
Approx_SweepApproximation_Eval(Approx_SweepApproximation& theTool)
35+
: Tool(theTool)
3636
{
3737
}
3838

‎src/ApproxInt/ApproxInt_SvSurfaces.hxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ class ApproxInt_SvSurfaces
4343
public:
4444
DEFINE_STANDARD_ALLOC
4545

46-
ApproxInt_SvSurfaces() :
47-
myUseSolver(false)
46+
ApproxInt_SvSurfaces()
47+
: myUseSolver(false)
4848
{
4949
}
5050

‎src/DE/DE_ConfigurationNode.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ IMPLEMENT_STANDARD_RTTIEXT(DE_ConfigurationNode, Standard_Transient)
2525

2626
//=================================================================================================
2727

28-
DE_ConfigurationNode::DE_ConfigurationNode() :
29-
myIsEnabled(Standard_True)
28+
DE_ConfigurationNode::DE_ConfigurationNode()
29+
: myIsEnabled(Standard_True)
3030
{
3131
}
3232

‎src/DE/DE_Provider.cxx

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ DE_Provider::DE_Provider() {}
2424

2525
//=================================================================================================
2626

27-
DE_Provider::DE_Provider(const Handle(DE_ConfigurationNode)& theNode) :
28-
myNode(theNode)
27+
DE_Provider::DE_Provider(const Handle(DE_ConfigurationNode)& theNode)
28+
: myNode(theNode)
2929
{
3030
}
3131

‎src/DE/DE_ShapeFixConfigurationNode.cxx

+4-4
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ static const TCollection_AsciiString& THE_CONFIGURATION_SCOPE()
3030

3131
//=================================================================================================
3232

33-
DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode() :
34-
DE_ConfigurationNode()
33+
DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode()
34+
: DE_ConfigurationNode()
3535
{
3636
}
3737

3838
//=================================================================================================
3939

4040
DE_ShapeFixConfigurationNode::DE_ShapeFixConfigurationNode(
41-
const Handle(DE_ShapeFixConfigurationNode)& theNode) :
42-
DE_ConfigurationNode(theNode)
41+
const Handle(DE_ShapeFixConfigurationNode)& theNode)
42+
: DE_ConfigurationNode(theNode)
4343
{
4444
}
4545

‎src/DE/DE_Wrapper.cxx

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ static Handle(DE_Wrapper)& THE_GLOBAL_CONFIGURATION()
4444

4545
//=================================================================================================
4646

47-
DE_Wrapper::DE_Wrapper() :
48-
myKeepUpdates(Standard_False)
47+
DE_Wrapper::DE_Wrapper()
48+
: myKeepUpdates(Standard_False)
4949
{
5050
}
5151

5252
//=================================================================================================
5353

54-
DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper) :
55-
DE_Wrapper()
54+
DE_Wrapper::DE_Wrapper(const Handle(DE_Wrapper)& theWrapper)
55+
: DE_Wrapper()
5656
{
5757
if (theWrapper.IsNull())
5858
{

0 commit comments

Comments
 (0)