Skip to content

Commit f5ec3d8

Browse files
committed
not the right clang format?
1 parent 56831f7 commit f5ec3d8

File tree

71 files changed

+295
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+295
-83
lines changed

include/controller/cpp/webots/Brake.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ namespace webots {
2727
typedef enum { ROTATIONAL = 0, LINEAR } Type;
2828

2929
explicit Brake(const std::string &name) :
30-
Device(name), motor(NULL), positionSensor(NULL) {} // Use Robot::getBrake() instead
30+
Device(name),
31+
motor(NULL),
32+
positionSensor(NULL) {} // Use Robot::getBrake() instead
3133
explicit Brake(WbDeviceTag tag) : Device(tag), motor(NULL), positionSensor(NULL) {}
3234
virtual ~Brake() {}
3335
Type getType() const;

include/controller/cpp/webots/Motor.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ namespace webots {
2828
typedef enum { ROTATIONAL = 0, LINEAR } Type;
2929

3030
explicit Motor(const std::string &name) :
31-
Device(name), brake(NULL), positionSensor(NULL) {} // Use Robot::getMotor() instead
31+
Device(name),
32+
brake(NULL),
33+
positionSensor(NULL) {} // Use Robot::getMotor() instead
3234
explicit Motor(WbDeviceTag tag) : Device(tag), brake(NULL), positionSensor(NULL) {}
3335
virtual ~Motor() {}
3436

include/controller/cpp/webots/PositionSensor.hpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ namespace webots {
2626
typedef enum { ROTATIONAL = 0, LINEAR } Type;
2727

2828
explicit PositionSensor(const std::string &name) :
29-
Device(name), brake(NULL), motor(NULL) {} // Use Robot::getPositionSensor() instead
29+
Device(name),
30+
brake(NULL),
31+
motor(NULL) {} // Use Robot::getPositionSensor() instead
3032
explicit PositionSensor(WbDeviceTag tag) : Device(tag), brake(NULL), motor(NULL) {}
3133
virtual ~PositionSensor() {}
3234
virtual void enable(int samplingPeriod); // milliseconds

projects/robots/gctronic/e-puck/plugins/robot_windows/botstudio/core/AutomatonObjectRepresentation.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
#include <QtGui/QTextDocument>
2323

2424
AutomatonObjectRepresentation::AutomatonObjectRepresentation(AutomatonObject *object) :
25-
QGraphicsTextItem(object->name()), mAutomatonObject(object) {
25+
QGraphicsTextItem(object->name()),
26+
mAutomatonObject(object) {
2627
setFlag(QGraphicsItem::ItemIsMovable);
2728
setFlag(QGraphicsItem::ItemIsSelectable);
2829

projects/robots/gctronic/e-puck/plugins/robot_windows/botstudio/core/AutomatonScene.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@
3030
#include <QtWidgets/QGraphicsSceneMouseEvent>
3131

3232
AutomatonScene::AutomatonScene(AutomatonWidget *automatonWidget) :
33-
QGraphicsScene(), mAutomatonWidget(automatonWidget), mTransitionCreationLine(NULL) {
33+
QGraphicsScene(),
34+
mAutomatonWidget(automatonWidget),
35+
mTransitionCreationLine(NULL) {
3436
mModel = Model::instance();
3537

3638
connect(mModel->automaton(), SIGNAL(stateCreated(State *)), this, SLOT(stateCreated(State *)));

projects/robots/gctronic/e-puck/plugins/robot_windows/botstudio/core/AutomatonWidget.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@
2525
#include <QtWidgets/QScrollBar>
2626

2727
AutomatonWidget::AutomatonWidget(QWidget *parent) :
28-
QGraphicsView(parent), mLastMovePos(NULL), mMode(SelectionMode), mZoomFactor(0.0), mWheelAttenuation(0.1) {
28+
QGraphicsView(parent),
29+
mLastMovePos(NULL),
30+
mMode(SelectionMode),
31+
mZoomFactor(0.0),
32+
mWheelAttenuation(0.1) {
2933
mAutomatonScene = new AutomatonScene(this);
3034
setRenderHint(QPainter::Antialiasing);
3135
setScene(mAutomatonScene);

projects/robots/gctronic/e-puck/plugins/robot_windows/botstudio/core/Transition.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@
2525
#include "Tokenizer.hpp"
2626

2727
Transition::Transition(const QPointF &position, State *startState, State *endState) :
28-
AutomatonObject(position), mStartState(startState), mEndState(endState) {
28+
AutomatonObject(position),
29+
mStartState(startState),
30+
mEndState(endState) {
2931
mSensorCondition = RobotObjectFactory::instance()->createRobotSensorCondition();
3032
setName(tr("Transition %1").arg(name()));
3133
}

projects/robots/gctronic/e-puck/plugins/robot_windows/botstudio/e-puck/EPuckLedButton.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
#include <QtGui/QBrush>
2424

2525
EPuckLedButton::EPuckLedButton() :
26-
QObject(), QGraphicsEllipseItem(EPuckDrawingHelper::ledRect()), mValue(EPuckFacade::NONE), mIndex(-1) {
26+
QObject(),
27+
QGraphicsEllipseItem(EPuckDrawingHelper::ledRect()),
28+
mValue(EPuckFacade::NONE),
29+
mIndex(-1) {
2730
updateColor();
2831
}
2932

projects/robots/gctronic/e-puck/transfer/library/camera/fast_2_timer/e_timers.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static void init_timer5(void) {
4343
0x2; // Asynchronous Counter Mode: external clock (timer increments on every rising edge of clock input) => VSYNC signal
4444
TMR5 = 0; // timer5 counter reset
4545
PR5 = 1; // timer5 period register (when TMRx and PRx matches, an interrupt occurs) => when one VSYNC is received then one
46-
// interrupt is generated
46+
// interrupt is generated
4747
IFS1bits.T5IF = 0; // clear timer5 interrupt status flag (zero means no pending interrupt requests)
4848
IEC1bits.T5IE = 1; // enable timer5 interrupt
4949
T5CONbits.TON = 1; // start timer5

projects/robots/robotis/darwin-op/libraries/managers/src/RobotisOp2MotionManager.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ static double clamp(double value, double min, double max) {
7070
#endif
7171

7272
RobotisOp2MotionManager::RobotisOp2MotionManager(webots::Robot *robot, const std::string &customMotionFile) :
73-
mRobot(robot), mCorrectlyInitialized(true) {
73+
mRobot(robot),
74+
mCorrectlyInitialized(true) {
7475
if (!mRobot) {
7576
cerr << "RobotisOp2MotionManager: The robot instance is required" << endl;
7677
mCorrectlyInitialized = false;

0 commit comments

Comments
 (0)