Skip to content

Commit 949b25a

Browse files
bobtistabobtista
committed
Fix spacing in override declarations
1 parent 71a59d1 commit 949b25a

10 files changed

Lines changed: 82 additions & 82 deletions

File tree

‎Generals/Code/GameEngine/Include/Common/StateMachine.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -185,9 +185,9 @@ class State : public MemoryPoolObject, public Snapshot
185185
// Essentially all the member data gets set up on creation and shouldn't change.
186186
// So none of it needs to be saved, and it nicely forces all user states to
187187
// remember to implement crc, xfer & loadPostProcess. jba
188-
virtual void crc( Xfer *xfer ) =0;
189-
virtual void xfer( Xfer *xfer ) =0;
190-
virtual void loadPostProcess() =0;
188+
virtual void crc( Xfer *xfer )=0;
189+
virtual void xfer( Xfer *xfer )=0;
190+
virtual void loadPostProcess()=0;
191191

192192
private:
193193

@@ -406,9 +406,9 @@ class SuccessState : public State
406406
virtual StateReturnType update() override { return STATE_SUCCESS; }
407407
protected:
408408
// snapshot interface STUBBED.
409-
virtual void crc( Xfer *xfer ) override{};
410-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
411-
virtual void loadPostProcess() override{};
409+
virtual void crc( Xfer *xfer ) override {};
410+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
411+
virtual void loadPostProcess() override {};
412412

413413
};
414414
EMPTY_DTOR(SuccessState)
@@ -426,9 +426,9 @@ class FailureState : public State
426426
virtual StateReturnType update() override { return STATE_FAILURE; }
427427
protected:
428428
// snapshot interface STUBBED.
429-
virtual void crc( Xfer *xfer ) override{};
430-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
431-
virtual void loadPostProcess() override{};
429+
virtual void crc( Xfer *xfer ) override {};
430+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
431+
virtual void loadPostProcess() override {};
432432
};
433433
EMPTY_DTOR(FailureState)
434434

@@ -446,9 +446,9 @@ class ContinueState : public State
446446
virtual StateReturnType update() override { return STATE_CONTINUE; }
447447
protected:
448448
// snapshot interface STUBBED.
449-
virtual void crc( Xfer *xfer ) override{};
450-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
451-
virtual void loadPostProcess() override{};
449+
virtual void crc( Xfer *xfer ) override {};
450+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
451+
virtual void loadPostProcess() override {};
452452
};
453453
EMPTY_DTOR(ContinueState)
454454

@@ -466,9 +466,9 @@ class SleepState : public State
466466
virtual StateReturnType update() override { return STATE_SLEEP_FOREVER; }
467467
protected:
468468
// snapshot interface STUBBED.
469-
virtual void crc( Xfer *xfer ) override{};
470-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
471-
virtual void loadPostProcess() override{};
469+
virtual void crc( Xfer *xfer ) override {};
470+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
471+
virtual void loadPostProcess() override {};
472472
};
473473
EMPTY_DTOR(SleepState)
474474

‎Generals/Code/GameEngine/Include/GameLogic/AIDock.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ class AIDockApproachState : public AIInternalMoveToState
8787
virtual StateReturnType update() override;
8888
protected:
8989
// snapshot interface STUBBED.
90-
virtual void crc( Xfer *xfer ) override{};
90+
virtual void crc( Xfer *xfer ) override {};
9191
virtual void xfer( Xfer *xfer ) override;
92-
virtual void loadPostProcess() override{};
92+
virtual void loadPostProcess() override {};
9393
};
9494
EMPTY_DTOR(AIDockApproachState)
9595

@@ -106,9 +106,9 @@ class AIDockWaitForClearanceState : public State
106106
UnsignedInt m_enterFrame;
107107
protected:
108108
// snapshot interface STUBBED.
109-
virtual void crc( Xfer *xfer ) override{};
109+
virtual void crc( Xfer *xfer ) override {};
110110
virtual void xfer( Xfer *xfer ) override;
111-
virtual void loadPostProcess() override{};
111+
virtual void loadPostProcess() override {};
112112
};
113113
EMPTY_DTOR(AIDockWaitForClearanceState)
114114

@@ -177,9 +177,9 @@ class AIDockProcessDockState : public State
177177

178178
protected:
179179
// snapshot interface STUBBED.
180-
virtual void crc( Xfer *xfer ) override{};
181-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
182-
virtual void loadPostProcess() override{};
180+
virtual void crc( Xfer *xfer ) override {};
181+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
182+
virtual void loadPostProcess() override {};
183183

184184
private:
185185
ObjectID m_droneID; ///< If I have a drone, the drone will get repaired too.

‎Generals/Code/GameEngine/Include/GameLogic/AIStateMachine.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,9 @@ class AIBusyState : public State
342342
virtual Bool isBusy() const override { return true; }
343343
protected:
344344
// snapshot interface STUBBED.
345-
virtual void crc( Xfer *xfer ) override{};
346-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
347-
virtual void loadPostProcess() override{};
345+
virtual void crc( Xfer *xfer ) override {};
346+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
347+
virtual void loadPostProcess() override {};
348348

349349
};
350350
EMPTY_DTOR(AIBusyState)
@@ -916,9 +916,9 @@ class AIWaitState : public State
916916
virtual StateReturnType update() override;
917917
protected:
918918
// snapshot interface STUBBED.
919-
virtual void crc( Xfer *xfer ) override{};
920-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
921-
virtual void loadPostProcess() override{};
919+
virtual void crc( Xfer *xfer ) override {};
920+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
921+
virtual void loadPostProcess() override {};
922922
};
923923
EMPTY_DTOR(AIWaitState)
924924

@@ -948,9 +948,9 @@ class AIAttackFireWeaponState : public State
948948
virtual StateReturnType onEnter() override;
949949
protected:
950950
// snapshot interface STUBBED.
951-
virtual void crc( Xfer *xfer ) override{};
952-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
953-
virtual void loadPostProcess() override{};
951+
virtual void crc( Xfer *xfer ) override {};
952+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
953+
virtual void loadPostProcess() override {};
954954
private:
955955
NotifyWeaponFiredInterface *const m_att; // this is NOT owned by us and should not be freed
956956
};
@@ -1047,9 +1047,9 @@ class AIDeadState : public State
10471047
virtual void onExit( StateExitType status ) override;
10481048
protected:
10491049
// snapshot interface STUBBED.
1050-
virtual void crc( Xfer *xfer ) override{};
1051-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
1052-
virtual void loadPostProcess() override{};
1050+
virtual void crc( Xfer *xfer ) override {};
1051+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
1052+
virtual void loadPostProcess() override {};
10531053
};
10541054
EMPTY_DTOR(AIDeadState)
10551055

‎Generals/Code/GameEngine/Include/GameLogic/CrateSystem.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class CrateSystem : public SubsystemInterface
9292

9393
virtual void init() override;
9494
virtual void reset() override;
95-
virtual void update() override{}
95+
virtual void update() override {}
9696

9797
const CrateTemplate *findCrateTemplate(AsciiString name) const;
9898
CrateTemplate *friend_findCrateTemplate(AsciiString name);

‎Generals/Code/GameEngine/Include/GameLogic/TurretAI.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ class TurretAIAimTurretState : public TurretState
158158
virtual StateReturnType update() override;
159159
protected:
160160
// snapshot interface STUBBED - no member vars to save. jba.
161-
virtual void crc( Xfer *xfer ) override{};
162-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
163-
virtual void loadPostProcess() override{};
161+
virtual void crc( Xfer *xfer ) override {};
162+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
163+
virtual void loadPostProcess() override {};
164164
};
165165
EMPTY_DTOR(TurretAIAimTurretState)
166166

@@ -178,9 +178,9 @@ class TurretAIRecenterTurretState : public TurretState
178178
virtual StateReturnType update() override;
179179
protected:
180180
// snapshot interface STUBBED - no member vars to save. jba.
181-
virtual void crc( Xfer *xfer ) override{};
182-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
183-
virtual void loadPostProcess() override{};
181+
virtual void crc( Xfer *xfer ) override {};
182+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
183+
virtual void loadPostProcess() override {};
184184
};
185185
EMPTY_DTOR(TurretAIRecenterTurretState)
186186

‎GeneralsMD/Code/GameEngine/Include/Common/StateMachine.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,9 @@ class State : public MemoryPoolObject, public Snapshot
186186
// Essentially all the member data gets set up on creation and shouldn't change.
187187
// So none of it needs to be saved, and it nicely forces all user states to
188188
// remember to implement crc, xfer & loadPostProcess. jba
189-
virtual void crc( Xfer *xfer ) =0;
190-
virtual void xfer( Xfer *xfer ) =0;
191-
virtual void loadPostProcess() =0;
189+
virtual void crc( Xfer *xfer )=0;
190+
virtual void xfer( Xfer *xfer )=0;
191+
virtual void loadPostProcess()=0;
192192

193193
private:
194194

@@ -408,9 +408,9 @@ class SuccessState : public State
408408
virtual StateReturnType update() override { return STATE_SUCCESS; }
409409
protected:
410410
// snapshot interface STUBBED.
411-
virtual void crc( Xfer *xfer ) override{};
412-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
413-
virtual void loadPostProcess() override{};
411+
virtual void crc( Xfer *xfer ) override {};
412+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
413+
virtual void loadPostProcess() override {};
414414

415415
};
416416
EMPTY_DTOR(SuccessState)
@@ -428,9 +428,9 @@ class FailureState : public State
428428
virtual StateReturnType update() override { return STATE_FAILURE; }
429429
protected:
430430
// snapshot interface STUBBED.
431-
virtual void crc( Xfer *xfer ) override{};
432-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
433-
virtual void loadPostProcess() override{};
431+
virtual void crc( Xfer *xfer ) override {};
432+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
433+
virtual void loadPostProcess() override {};
434434
};
435435
EMPTY_DTOR(FailureState)
436436

@@ -448,9 +448,9 @@ class ContinueState : public State
448448
virtual StateReturnType update() override { return STATE_CONTINUE; }
449449
protected:
450450
// snapshot interface STUBBED.
451-
virtual void crc( Xfer *xfer ) override{};
452-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
453-
virtual void loadPostProcess() override{};
451+
virtual void crc( Xfer *xfer ) override {};
452+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
453+
virtual void loadPostProcess() override {};
454454
};
455455
EMPTY_DTOR(ContinueState)
456456

@@ -468,9 +468,9 @@ class SleepState : public State
468468
virtual StateReturnType update() override { return STATE_SLEEP_FOREVER; }
469469
protected:
470470
// snapshot interface STUBBED.
471-
virtual void crc( Xfer *xfer ) override{};
472-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
473-
virtual void loadPostProcess() override{};
471+
virtual void crc( Xfer *xfer ) override {};
472+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
473+
virtual void loadPostProcess() override {};
474474
};
475475
EMPTY_DTOR(SleepState)
476476

‎GeneralsMD/Code/GameEngine/Include/GameLogic/AIDock.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ class AIDockApproachState : public AIInternalMoveToState
8787
virtual StateReturnType update() override;
8888
protected:
8989
// snapshot interface STUBBED.
90-
virtual void crc( Xfer *xfer ) override{};
90+
virtual void crc( Xfer *xfer ) override {};
9191
virtual void xfer( Xfer *xfer ) override;
92-
virtual void loadPostProcess() override{};
92+
virtual void loadPostProcess() override {};
9393
};
9494
EMPTY_DTOR(AIDockApproachState)
9595

@@ -106,9 +106,9 @@ class AIDockWaitForClearanceState : public State
106106
UnsignedInt m_enterFrame;
107107
protected:
108108
// snapshot interface STUBBED.
109-
virtual void crc( Xfer *xfer ) override{};
109+
virtual void crc( Xfer *xfer ) override {};
110110
virtual void xfer( Xfer *xfer ) override;
111-
virtual void loadPostProcess() override{};
111+
virtual void loadPostProcess() override {};
112112
};
113113
EMPTY_DTOR(AIDockWaitForClearanceState)
114114

@@ -177,9 +177,9 @@ class AIDockProcessDockState : public State
177177

178178
protected:
179179
// snapshot interface STUBBED.
180-
virtual void crc( Xfer *xfer ) override{};
181-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
182-
virtual void loadPostProcess() override{};
180+
virtual void crc( Xfer *xfer ) override {};
181+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
182+
virtual void loadPostProcess() override {};
183183

184184
private:
185185
ObjectID m_droneID; ///< If I have a drone, the drone will get repaired too.

‎GeneralsMD/Code/GameEngine/Include/GameLogic/AIStateMachine.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -345,9 +345,9 @@ class AIBusyState : public State
345345
virtual Bool isBusy() const override { return true; }
346346
protected:
347347
// snapshot interface STUBBED.
348-
virtual void crc( Xfer *xfer ) override{};
349-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
350-
virtual void loadPostProcess() override{};
348+
virtual void crc( Xfer *xfer ) override {};
349+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
350+
virtual void loadPostProcess() override {};
351351

352352
};
353353
EMPTY_DTOR(AIBusyState)
@@ -926,9 +926,9 @@ class AIWaitState : public State
926926
virtual StateReturnType update() override;
927927
protected:
928928
// snapshot interface STUBBED.
929-
virtual void crc( Xfer *xfer ) override{};
930-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
931-
virtual void loadPostProcess() override{};
929+
virtual void crc( Xfer *xfer ) override {};
930+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
931+
virtual void loadPostProcess() override {};
932932
};
933933
EMPTY_DTOR(AIWaitState)
934934

@@ -959,9 +959,9 @@ class AIAttackFireWeaponState : public State
959959
virtual StateReturnType onEnter() override;
960960
protected:
961961
// snapshot interface STUBBED.
962-
virtual void crc( Xfer *xfer ) override{};
963-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
964-
virtual void loadPostProcess() override{};
962+
virtual void crc( Xfer *xfer ) override {};
963+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
964+
virtual void loadPostProcess() override {};
965965
private:
966966
NotifyWeaponFiredInterface *const m_att; // this is NOT owned by us and should not be freed
967967
};
@@ -1058,9 +1058,9 @@ class AIDeadState : public State
10581058
virtual void onExit( StateExitType status ) override;
10591059
protected:
10601060
// snapshot interface STUBBED.
1061-
virtual void crc( Xfer *xfer ) override{};
1062-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
1063-
virtual void loadPostProcess() override{};
1061+
virtual void crc( Xfer *xfer ) override {};
1062+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
1063+
virtual void loadPostProcess() override {};
10641064
};
10651065
EMPTY_DTOR(AIDeadState)
10661066

‎GeneralsMD/Code/GameEngine/Include/GameLogic/CrateSystem.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ class CrateSystem : public SubsystemInterface
9292

9393
virtual void init() override;
9494
virtual void reset() override;
95-
virtual void update() override{}
95+
virtual void update() override {}
9696

9797
const CrateTemplate *findCrateTemplate(AsciiString name) const;
9898
CrateTemplate *friend_findCrateTemplate(AsciiString name);

‎GeneralsMD/Code/GameEngine/Include/GameLogic/TurretAI.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@ class TurretAIAimTurretState : public TurretState
158158
virtual StateReturnType update() override;
159159
protected:
160160
// snapshot interface STUBBED - no member vars to save. jba.
161-
virtual void crc( Xfer *xfer ) override{};
162-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
163-
virtual void loadPostProcess() override{};
161+
virtual void crc( Xfer *xfer ) override {};
162+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
163+
virtual void loadPostProcess() override {};
164164
};
165165
EMPTY_DTOR(TurretAIAimTurretState)
166166

@@ -178,9 +178,9 @@ class TurretAIRecenterTurretState : public TurretState
178178
virtual StateReturnType update() override;
179179
protected:
180180
// snapshot interface STUBBED - no member vars to save. jba.
181-
virtual void crc( Xfer *xfer ) override{};
182-
virtual void xfer( Xfer *xfer ) override{XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
183-
virtual void loadPostProcess() override{};
181+
virtual void crc( Xfer *xfer ) override {};
182+
virtual void xfer( Xfer *xfer ) override {XferVersion cv = 1; XferVersion v = cv; xfer->xferVersion( &v, cv );}
183+
virtual void loadPostProcess() override {};
184184
};
185185
EMPTY_DTOR(TurretAIRecenterTurretState)
186186

0 commit comments

Comments
 (0)