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;

projects/robots/robotis/darwin-op/transfer/src/Motion.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,13 @@ struct Pose {
7575
};
7676

7777
Motion::Motion(const string &fileName) :
78-
mValid(false), mDuration(0), mReverse(false), mLoop(false), mPlaying(false), mElapsed(0), mPreviousTime(0) {
78+
mValid(false),
79+
mDuration(0),
80+
mReverse(false),
81+
mLoop(false),
82+
mPlaying(false),
83+
mElapsed(0),
84+
mPreviousTime(0) {
7985
cMotions.push_back(this);
8086

8187
ifstream ifs;

resources/projects/libraries/qt_utils/graph2d/Line2D.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ namespace webotsQtUtils {
88
class Line2D {
99
public:
1010
Line2D(double x1, double y1, double x2, double y2, const QColor &color = Qt::black) :
11-
mX1(x1), mY1(y1), mX2(x2), mY2(y2), mColor(color) {}
11+
mX1(x1),
12+
mY1(y1),
13+
mX2(x2),
14+
mY2(y2),
15+
mColor(color) {}
1216
Line2D(const Line2D &copy) : mX1(copy.mX1), mY1(copy.mY1), mX2(copy.mX2), mY2(copy.mY2), mColor(copy.mColor) {}
1317
virtual ~Line2D() {}
1418

resources/projects/libraries/qt_utils/motion_editor/Motion.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ Motion *Motion::instance() {
2626
}
2727

2828
Motion::Motion(const MotionPlayer *player, const QString &filepath) :
29-
mNewPoseCounter(0), mPlayer(player), mIsValid(true), mIsPoseSelectionBlocked(false) {
29+
mNewPoseCounter(0),
30+
mPlayer(player),
31+
mIsValid(true),
32+
mIsPoseSelectionBlocked(false) {
3033
mFixedStep = wb_robot_get_basic_time_step();
3134
assert(!cInstance);
3235
setFilePath(filepath, true);

resources/projects/libraries/qt_utils/motion_editor/MotionPlayer.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ static double modulus(double a, double b) {
1717
}
1818

1919
MotionPlayer::MotionPlayer() :
20-
mMotion(NULL), mStartingTime(0), mPoseTimeOffset(0), mMotionDuration(0), mLoop(false), mReverse(false) {
20+
mMotion(NULL),
21+
mStartingTime(0),
22+
mPoseTimeOffset(0),
23+
mMotionDuration(0),
24+
mLoop(false),
25+
mReverse(false) {
2126
}
2227

2328
MotionPlayer::~MotionPlayer() {

resources/projects/libraries/qt_utils/motion_editor/PoseEditor.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@
1313
using namespace webotsQtUtils;
1414

1515
PoseEditor::PoseEditor(Pose *pose, Pose *previousPose, Pose *nextPose, bool fixedStep, QWidget *parent) :
16-
QDialog(parent), mPose(pose), mPreviousPose(previousPose), mNextPose(nextPose), mFixedStep(fixedStep) {
16+
QDialog(parent),
17+
mPose(pose),
18+
mPreviousPose(previousPose),
19+
mNextPose(nextPose),
20+
mFixedStep(fixedStep) {
1721
assert(mPose);
1822

1923
// create GUI

resources/projects/libraries/qt_utils/widgets/MotorWidget.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
using namespace webotsQtUtils;
1515

1616
MotorWidget::MotorWidget(Device *device, QWidget *parent) :
17-
ScalarSensorWidget(device, parent), mRangeLevel(0), mCommandRequest(false), mTargetPosition(0.0) {
17+
ScalarSensorWidget(device, parent),
18+
mRangeLevel(0),
19+
mCommandRequest(false),
20+
mTargetPosition(0.0) {
1821
mGraph2D->setUpdateRangeOnClick(false, false);
1922

2023
mSlider = new QSlider(Qt::Vertical, mMainWidget);

src/webots/app/WbPerspective.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
#endif
3333

3434
WbPerspective::WbPerspective(const QString &worldPath) :
35-
mMaximizedDockId(-1), mCentralWidgetVisible(true), mSelectedTab(-1), mOrthographicViewHeight(1.0) {
35+
mMaximizedDockId(-1),
36+
mCentralWidgetVisible(true),
37+
mSelectedTab(-1),
38+
mOrthographicViewHeight(1.0) {
3639
const QFileInfo info(worldPath);
3740
mBaseName = info.absolutePath() + "/." + info.completeBaseName();
3841
mVersion = WbApplicationInfo::version();

src/webots/app/WbSelection.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
WbSelection *WbSelection::cInstance = NULL;
2424

2525
WbSelection::WbSelection() :
26-
QObject(), mSelectedAbstractPose(NULL), mSelectedNode(NULL), mResizeHandlesEnabledFromSceneTree(false) {
26+
QObject(),
27+
mSelectedAbstractPose(NULL),
28+
mSelectedNode(NULL),
29+
mResizeHandlesEnabledFromSceneTree(false) {
2730
assert(cInstance == NULL);
2831
cInstance = this;
2932
}

src/webots/control/WbControlledWorld.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,11 @@ WbControlledWorld *WbControlledWorld::instance() {
3737
}
3838

3939
WbControlledWorld::WbControlledWorld(WbTokenizer *tokenizer) :
40-
WbSimulationWorld(tokenizer), mFirstStep(true), mRetryEnabled(false), mIsExecutingStep(false), mHasWaitingStep(false) {
40+
WbSimulationWorld(tokenizer),
41+
mFirstStep(true),
42+
mRetryEnabled(false),
43+
mIsExecutingStep(false),
44+
mHasWaitingStep(false) {
4145
if (mWorldLoadingCanceled)
4246
return;
4347

src/webots/core/WbDownloader.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
#include <QtNetwork/QNetworkRequest>
2121

2222
WbDownloader::WbDownloader(const QUrl &url, const WbDownloader *existingDownload, QObject *parent) :
23-
QObject(parent), mUrl(url), mNetworkReply(NULL), mExistingDownload(existingDownload), mFinished(false) {
23+
QObject(parent),
24+
mUrl(url),
25+
mNetworkReply(NULL),
26+
mExistingDownload(existingDownload),
27+
mFinished(false) {
2428
}
2529

2630
WbDownloader::~WbDownloader() {

src/webots/core/WbLanguage.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,11 @@ void WbLanguage::cleanup() {
738738

739739
WbLanguage::WbLanguage(int code, const QString &name, const QString &defaultFileSuffix, const QString &commentPrefix,
740740
bool isCompilable) :
741-
mCode(code), mName(name), mDefaultFileSuffix(defaultFileSuffix), mCommentPrefix(commentPrefix), mIsCompilable(isCompilable) {
741+
mCode(code),
742+
mName(name),
743+
mDefaultFileSuffix(defaultFileSuffix),
744+
mCommentPrefix(commentPrefix),
745+
mIsCompilable(isCompilable) {
742746
}
743747

744748
WbLanguage::~WbLanguage() {

src/webots/core/WbVersion.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@
1818
#include <QtCore/QRegularExpression>
1919

2020
WbVersion::WbVersion(int major, int minor, int revision, bool webots) :
21-
mMajor(major), mMinor(minor), mRevision(revision), mCommit(""), mDate(""), mIsWebots(webots) {
21+
mMajor(major),
22+
mMinor(minor),
23+
mRevision(revision),
24+
mCommit(""),
25+
mDate(""),
26+
mIsWebots(webots) {
2227
}
2328

2429
WbVersion::WbVersion(const WbVersion &other) :

src/webots/editor/WbBuildEditor.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ WbBuildEditor *WbBuildEditor::instance() {
4040
}
4141

4242
WbBuildEditor::WbBuildEditor(QWidget *parent, const QString &toolBarAlign) :
43-
WbTextEditor(parent, toolBarAlign), mIsCleaning(false) {
43+
WbTextEditor(parent, toolBarAlign),
44+
mIsCleaning(false) {
4445
gInstance = this;
4546
mProcess = NULL;
4647
createActions();

src/webots/engine/WbAnimationRecorder.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
#define ROUND(x, precision) (roundf((x) / precision) * precision)
3535

3636
WbAnimationCommand::WbAnimationCommand(const WbNode *n, const QStringList &fields, bool saveInitialValue) :
37-
mNode(n), mChangedFromStart(false) {
37+
mNode(n),
38+
mChangedFromStart(false) {
3839
QString state;
3940
for (int i = 0; i < fields.size(); ++i) {
4041
WbField *f = mNode->findField(fields[i], true);

src/webots/gui/WbAbstractDragEvent.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,9 @@ bool WbDragEvent::exceedsFloatMax(float x) {
4646

4747
// WbDragView3DEvent constructor
4848
WbDragView3DEvent::WbDragView3DEvent(WbViewpoint *viewpoint) :
49-
WbDragEvent(), mViewpoint(viewpoint), mViewDistanceUnscaling(1.0f) {
49+
WbDragEvent(),
50+
mViewpoint(viewpoint),
51+
mViewDistanceUnscaling(1.0f) {
5052
}
5153

5254
WbVector2 WbDragView3DEvent::clampLabelPosition(const float x, const float y, const WbWrenLabelOverlay *overlay) {

src/webots/gui/WbDragOverlayEvent.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,14 @@
1818
#include "WbWrenTextureOverlay.hpp"
1919

2020
WbDragOverlayEvent::WbDragOverlayEvent(const QPoint &initialMousePosition, WbRenderingDevice *renderingDevice) :
21-
mInitialMousePosition(initialMousePosition), mRenderingDevice(renderingDevice) {
21+
mInitialMousePosition(initialMousePosition),
22+
mRenderingDevice(renderingDevice) {
2223
}
2324

2425
WbDragTranslateOverlayEvent::WbDragTranslateOverlayEvent(const QPoint &initialMousePosition, const QPoint &windowSize,
2526
WbRenderingDevice *renderingDevice) :
26-
WbDragOverlayEvent(initialMousePosition, renderingDevice), mWindowSize(windowSize) {
27+
WbDragOverlayEvent(initialMousePosition, renderingDevice),
28+
mWindowSize(windowSize) {
2729
mHalfWidth = (double)mRenderingDevice->width() * mRenderingDevice->pixelSize() * 0.5f / (double)mWindowSize.x();
2830
mHalfHeight = (double)mRenderingDevice->height() * mRenderingDevice->pixelSize() * 0.5f / (double)mWindowSize.y();
2931
}

src/webots/gui/WbDragPoseEvent.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434
#define DRAG_HORIZONTAL_MIN_COS 0.25
3535

3636
WbDragPoseEvent::WbDragPoseEvent(WbViewpoint *viewpoint, WbAbstractPose *selectedPose) :
37-
WbDragKinematicsEvent(viewpoint), mSelectedPose(selectedPose) {
37+
WbDragKinematicsEvent(viewpoint),
38+
mSelectedPose(selectedPose) {
3839
mViewDistanceUnscaling = viewpoint->viewDistanceUnscaling(selectedPose->position());
3940
}
4041

@@ -120,7 +121,8 @@ void WbDragHorizontalEvent::apply(const QPoint &currentMousePosition) {
120121

121122
// WbDragVerticalEvent functions
122123
WbDragVerticalEvent::WbDragVerticalEvent(const QPoint &initialPosition, WbViewpoint *viewpoint, WbAbstractPose *selectedPose) :
123-
WbTranslateEvent(viewpoint, selectedPose), mNormal(viewpoint->orientation()->value().direction()) {
124+
WbTranslateEvent(viewpoint, selectedPose),
125+
mNormal(viewpoint->orientation()->value().direction()) {
124126
// this event needs to use the actual position of the plane as we care about its depth from the Viewpoint
125127
mDragPlane = WbAffinePlane(mNormal, mSelectedPose->position());
126128
mViewpoint->viewpointRay(initialPosition.x(), initialPosition.y(), mMouseRay);

src/webots/gui/WbDragSolidEvent.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@
3434

3535
WbDragHorizontalSolidEvent::WbDragHorizontalSolidEvent(const QPoint &initialPosition, WbViewpoint *viewpoint,
3636
WbSolid *selectedSolid) :
37-
WbDragHorizontalEvent(initialPosition, viewpoint, selectedSolid), mSelectedSolid(selectedSolid) {
37+
WbDragHorizontalEvent(initialPosition, viewpoint, selectedSolid),
38+
mSelectedSolid(selectedSolid) {
3839
mSelectedSolid->pausePhysics();
3940
}
4041

@@ -48,7 +49,8 @@ void WbDragHorizontalSolidEvent::apply(const QPoint &currentMousePosition) {
4849

4950
WbDragVerticalSolidEvent::WbDragVerticalSolidEvent(const QPoint &initialPosition, WbViewpoint *viewpoint,
5051
WbSolid *selectedSolid) :
51-
WbDragVerticalEvent(initialPosition, viewpoint, selectedSolid), mSelectedSolid(selectedSolid) {
52+
WbDragVerticalEvent(initialPosition, viewpoint, selectedSolid),
53+
mSelectedSolid(selectedSolid) {
5254
mSelectedSolid->pausePhysics();
5355
}
5456

@@ -79,7 +81,8 @@ void WbDragTranslateAlongAxisSolidEvent::apply(const QPoint &currentMousePositio
7981
WbDragRotateAroundWorldVerticalAxisSolidEvent::WbDragRotateAroundWorldVerticalAxisSolidEvent(const QPoint &initialPosition,
8082
WbViewpoint *viewpoint,
8183
WbSolid *selectedSolid) :
82-
WbDragRotateAroundWorldVerticalAxisEvent(initialPosition, viewpoint, selectedSolid), mSelectedSolid(selectedSolid) {
84+
WbDragRotateAroundWorldVerticalAxisEvent(initialPosition, viewpoint, selectedSolid),
85+
mSelectedSolid(selectedSolid) {
8386
mSelectedSolid->pausePhysics();
8487
}
8588

@@ -240,7 +243,8 @@ QString WbDragForceEvent::magnitudeString() const {
240243
// WbDragTorqueEvent functions
241244

242245
WbDragTorqueEvent::WbDragTorqueEvent(const QSize &widgetSize, WbViewpoint *viewpoint, WbSolid *selectedSolid) :
243-
WbDragPhysicsEvent(widgetSize, viewpoint, selectedSolid->solidMerger()->solid()), mSolidMerger(selectedSolid->solidMerger()) {
246+
WbDragPhysicsEvent(widgetSize, viewpoint, selectedSolid->solidMerger()->solid()),
247+
mSolidMerger(selectedSolid->solidMerger()) {
244248
mRepresentation = new WbTorqueRepresentation();
245249
mOrigin = mSelectedSolid->matrix() * mSolidMerger->centerOfMass();
246250
mEnd = mOrigin;

src/webots/gui/WbDragViewpointEvent.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,10 @@ void WbRotateViewpointEvent::applyToViewpoint(const QPoint &delta, const WbVecto
115115

116116
WbZoomAndRotateViewpointEvent::WbZoomAndRotateViewpointEvent(const QPoint &initialMousePosition, WbViewpoint *viewpoint,
117117
double scale) :
118-
WbDragViewpointEvent(viewpoint), mPreviousMousePosition(initialMousePosition), mDelta(), mZscaleFactor(scale) {
118+
WbDragViewpointEvent(viewpoint),
119+
mPreviousMousePosition(initialMousePosition),
120+
mDelta(),
121+
mZscaleFactor(scale) {
119122
}
120123

121124
WbZoomAndRotateViewpointEvent::~WbZoomAndRotateViewpointEvent() {

src/webots/gui/WbGuiApplication.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ using namespace std;
6666
// - http://lists-archives.org/kde-devel/20232-qt-4-5-related-crash-on-kdm-startup.html
6767
// - http://www.qtcentre.org/archive/index.php/t-28785.html
6868
WbGuiApplication::WbGuiApplication(int &argc, char **argv) :
69-
QApplication(argc, argv), mMainWindow(NULL), mHeartbeat(0), mTask(NORMAL), mTcpServer(NULL) {
69+
QApplication(argc, argv),
70+
mMainWindow(NULL),
71+
mHeartbeat(0),
72+
mTask(NORMAL),
73+
mTcpServer(NULL) {
7074
setApplicationName("Webots");
7175
setApplicationVersion(WbApplicationInfo::version().toString(true, false, true));
7276
setOrganizationName("Cyberbotics");

0 commit comments

Comments
 (0)