Merge pull request #6052 from cyberbotics/sync-master-718dfe006

Benjamin Délèze · web-flow · commit 623d11a2cad8 · 2023-04-12T08:42:18.000+02:00
Merge master into develop
diff --git a/.github/workflows/tests_sources.yml b/.github/workflows/tests_sources.yml
@@ -38,7 +38,7 @@ jobs:
         python: [3.9]
         include:
           - os: ubuntu-22.04
-            DEPENDENCIES_INSTALLATION: "sudo apt -y install cppcheck"
+            DEPENDENCIES_INSTALLATION: "wget https://github.com/danmar/cppcheck/archive/refs/tags/2.10.tar.gz; tar -xf 2.10.tar.gz -C ~/; mkdir -p ~/cppcheck-2.10/build; cd ~/cppcheck-2.10/build; cmake ..; cmake --build .; export PATH=~/cppcheck-2.10/build/bin:$PATH"
           - os: macos-11
             DEPENDENCIES_INSTALLATION: "brew tap-new --no-git $USER/local-cppcheck; brew extract --version=2.10 cppcheck $USER/local-cppcheck; brew install cppcheck@2.10; brew tap-new --no-git $USER/local-clang-format; brew extract --version=14.0.0 clang-format $USER/local-clang-format; brew install clang-format@14.0.0"
           - os: windows-2019
@@ -66,8 +66,9 @@ jobs:
     - name: Tests
       if: steps.os_check.outputs.job_needed == 'true'
       run: |
+        export WEBOTS_HOME=$PWD
         ${{ matrix.DEPENDENCIES_INSTALLATION }}
+        cd $WEBOTS_HOME
         cp dependencies/.clang-format-9 .clang-format
         pip install -r tests/sources/requirements.txt
-        export WEBOTS_HOME=$PWD
         python -m unittest discover -s tests/sources
diff --git a/src/webots/core/WbWebotsUpdateManager.cpp b/src/webots/core/WbWebotsUpdateManager.cpp
@@ -25,7 +25,7 @@
 
 WbWebotsUpdateManager *WbWebotsUpdateManager::cInstance = NULL;
 
-WbWebotsUpdateManager::WbWebotsUpdateManager() : mVersion(), mTargetVersionAvailable(false), mError() {
+WbWebotsUpdateManager::WbWebotsUpdateManager() : mTargetVersionAvailable(false) {
   sendRequest();
 }
 
diff --git a/src/webots/editor/WbBuildEditor.cpp b/src/webots/editor/WbBuildEditor.cpp
@@ -41,8 +41,6 @@ WbBuildEditor *WbBuildEditor::instance() {
 
 WbBuildEditor::WbBuildEditor(QWidget *parent, const QString &toolBarAlign) :
   WbTextEditor(parent, toolBarAlign),
-  mTargetModificationTimeBeforeMake(),
-  mTargetFile(),
   mIsCleaning(false) {
   gInstance = this;
   mProcess = NULL;
diff --git a/src/webots/gui/WbDragSolidEvent.cpp b/src/webots/gui/WbDragSolidEvent.cpp
@@ -119,8 +119,6 @@ void WbDragRotateAroundAxisSolidEvent::apply(const QPoint &currentMousePosition)
 WbDragPhysicsEvent::WbDragPhysicsEvent(const QSize &widgetSize, WbViewpoint *viewpoint, WbSolid *selectedSolid) :
   WbDragView3DEvent(viewpoint),
   mSelectedSolid(selectedSolid),
-  mVector(),
-  mMouseRay(),
   mIsLocked(false),
   mWidgetSize(widgetSize),
   mViewDistanceScaling(1.0f) {
diff --git a/src/webots/gui/WbDragTransformEvent.cpp b/src/webots/gui/WbDragTransformEvent.cpp
@@ -48,8 +48,7 @@ WbDragTransformEvent::~WbDragTransformEvent() {
 WbTranslateEvent::WbTranslateEvent(WbViewpoint *viewpoint, WbAbstractTransform *selectedTransform) :
   WbDragTransformEvent(viewpoint, selectedTransform),
   mInitialPosition(selectedTransform->translation()),
-  mUpWorldVector(WbWorld::instance()->worldInfo()->upVector()),
-  mMouseRay() {
+  mUpWorldVector(WbWorld::instance()->worldInfo()->upVector()) {
   WbVector3 computedScaleFromParents = mSelectedTransform->absoluteScale();
   computedScaleFromParents /= mSelectedTransform->scale();
   mScaleFromParents = computedScaleFromParents;
diff --git a/src/webots/gui/WbDragViewpointEvent.cpp b/src/webots/gui/WbDragViewpointEvent.cpp
@@ -34,7 +34,6 @@ WbDragViewpointEvent::WbDragViewpointEvent(WbViewpoint *viewpoint) : WbDragKinem
 WbTranslateViewpointEvent::WbTranslateViewpointEvent(const QPoint &initialMousePosition, WbViewpoint *viewpoint, double scale) :
   WbDragViewpointEvent(viewpoint),
   mInitialMousePosition(initialMousePosition),
-  mDifference(),
   mInitialCameraPosition(viewpoint->position()->value()),
   mScaleFactor(scale) {
 }
diff --git a/src/webots/gui/WbView3D.cpp b/src/webots/gui/WbView3D.cpp
@@ -91,7 +91,6 @@ int WbView3D::cView3DNumber = 0;
 WbView3D::WbView3D() :
   WbWrenWindow(),
   mParentWidget(NULL),
-  mLastRefreshTimer(),
   mMousePressTimer(NULL),
   mAspectRatio(1.0),
   mDisabledRenderingOverlay(NULL),
diff --git a/src/webots/nodes/WbAbstractCamera.cpp b/src/webots/nodes/WbAbstractCamera.cpp
@@ -98,7 +98,7 @@ WbAbstractCamera::WbAbstractCamera(const QString &modelName, WbTokenizer *tokeni
   init();
 }
 
-WbAbstractCamera::WbAbstractCamera(const WbAbstractCamera &other) : WbRenderingDevice(other), mInvisibleNodes() {
+WbAbstractCamera::WbAbstractCamera(const WbAbstractCamera &other) : WbRenderingDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbCharger.cpp b/src/webots/nodes/WbCharger.cpp
@@ -58,7 +58,7 @@ WbCharger::WbCharger(WbTokenizer *tokenizer) : WbSolid("Charger", tokenizer) {
   init();
 }
 
-WbCharger::WbCharger(const WbCharger &other) : WbSolid(other), mVisualElements() {
+WbCharger::WbCharger(const WbCharger &other) : WbSolid(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbDisplay.cpp b/src/webots/nodes/WbDisplay.cpp
@@ -102,7 +102,7 @@ WbDisplay::WbDisplay(WbTokenizer *tokenizer) : WbRenderingDevice("Display", toke
   init();
 }
 
-WbDisplay::WbDisplay(const WbDisplay &other) : WbRenderingDevice(other), mImages(), mSaveOrders(), mImageTextures() {
+WbDisplay::WbDisplay(const WbDisplay &other) : WbRenderingDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbEmitter.cpp b/src/webots/nodes/WbEmitter.cpp
@@ -47,7 +47,7 @@ WbEmitter::WbEmitter(WbTokenizer *tokenizer) : WbSolidDevice("Emitter", tokenize
   init();
 }
 
-WbEmitter::WbEmitter(const WbEmitter &other) : WbSolidDevice(other), mQueue() {
+WbEmitter::WbEmitter(const WbEmitter &other) : WbSolidDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbGroup.cpp b/src/webots/nodes/WbGroup.cpp
@@ -38,7 +38,7 @@ WbGroup::WbGroup(const QString &modelName, WbTokenizer *tokenizer) : WbBaseNode(
   init();
 }
 
-WbGroup::WbGroup(const WbGroup &other) : WbBaseNode(other), mHiddenKinematicParametersMap() {
+WbGroup::WbGroup(const WbGroup &other) : WbBaseNode(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbLed.cpp b/src/webots/nodes/WbLed.cpp
@@ -38,7 +38,7 @@ WbLed::WbLed(WbTokenizer *tokenizer) : WbSolidDevice("LED", tokenizer) {
   init();
 }
 
-WbLed::WbLed(const WbLed &other) : WbSolidDevice(other), mMaterials(), mPbrAppearances(), mLights() {
+WbLed::WbLed(const WbLed &other) : WbSolidDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbLensFlare.cpp b/src/webots/nodes/WbLensFlare.cpp
@@ -39,7 +39,7 @@ WbLensFlare::WbLensFlare(WbTokenizer *tokenizer) : WbBaseNode("LensFlare", token
   init();
 }
 
-WbLensFlare::WbLensFlare(const WbLensFlare &other) : WbBaseNode(other), mWrenLensFlares() {
+WbLensFlare::WbLensFlare(const WbLensFlare &other) : WbBaseNode(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbLightSensor.cpp b/src/webots/nodes/WbLightSensor.cpp
@@ -134,7 +134,7 @@ WbLightSensor::WbLightSensor(WbTokenizer *tokenizer) : WbSolidDevice("LightSenso
   init();
 }
 
-WbLightSensor::WbLightSensor(const WbLightSensor &other) : WbSolidDevice(other), mRayList() {
+WbLightSensor::WbLightSensor(const WbLightSensor &other) : WbSolidDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbMotor.cpp b/src/webots/nodes/WbMotor.cpp
@@ -83,7 +83,7 @@ WbMotor::WbMotor(const QString &modelName, WbTokenizer *tokenizer) : WbJointDevi
   init();
 }
 
-WbMotor::WbMotor(const WbMotor &other) : WbJointDevice(other), mChangedAssociatedDevices() {
+WbMotor::WbMotor(const WbMotor &other) : WbJointDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbRadar.cpp b/src/webots/nodes/WbRadar.cpp
@@ -104,11 +104,7 @@ WbRadar::WbRadar(WbTokenizer *tokenizer) : WbSolidDevice("Radar", tokenizer) {
   init();
 }
 
-WbRadar::WbRadar(const WbRadar &other) :
-  WbSolidDevice(other),
-  mRadarTargets(),
-  mInvalidRadarTargets(),
-  mRadarTargetsPreviousTranslations() {
+WbRadar::WbRadar(const WbRadar &other) : WbSolidDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbReceiver.cpp b/src/webots/nodes/WbReceiver.cpp
@@ -117,7 +117,7 @@ WbReceiver::WbReceiver(WbTokenizer *tokenizer) : WbSolidDevice("Receiver", token
   init();
 }
 
-WbReceiver::WbReceiver(const WbReceiver &other) : WbSolidDevice(other), mTransmissionList(), mWaitingQueue(), mReadyQueue() {
+WbReceiver::WbReceiver(const WbReceiver &other) : WbSolidDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbRobot.cpp b/src/webots/nodes/WbRobot.cpp
@@ -161,18 +161,7 @@ WbRobot::WbRobot(WbTokenizer *tokenizer) : WbSolid("Robot", tokenizer) {
   init();
 }
 
-WbRobot::WbRobot(const WbRobot &other) :
-  WbSolid(other),
-  mControllerDir(),
-  mAbsoluteWindowFilename(),
-  mAbsoluteRemoteControlFilename(),
-  mKeyboardLastValue(),
-  mUserInputEventReferenceTime(),
-  mDevices(),
-  mRenderingDevices(),
-  mActiveCameras(),
-  mNewlyAddedDevices(),
-  mPressedKeys() {
+WbRobot::WbRobot(const WbRobot &other) : WbSolid(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbSkin.cpp b/src/webots/nodes/WbSkin.cpp
@@ -81,20 +81,7 @@ WbSkin::WbSkin(WbTokenizer *tokenizer) : WbBaseNode("Skin", tokenizer), WbAbstra
   init();
 }
 
-WbSkin::WbSkin(const WbSkin &other) :
-  WbBaseNode(other),
-  WbAbstractTransform(this),
-  WbDevice(other),
-  mInitialSkeletonOrientation(),
-  mInitialSkeletonPosition(),
-  mRenderables(),
-  mMaterialNames(),
-  mMaterials(),
-  mSegmentationMaterials(),
-  mEncodeDepthMaterials(),
-  mMeshes(),
-  mBoneTransforms(),
-  mBonesMap() {
+WbSkin::WbSkin(const WbSkin &other) : WbBaseNode(other), WbAbstractTransform(this), WbDevice(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbTrack.cpp b/src/webots/nodes/WbTrack.cpp
@@ -69,14 +69,7 @@ WbTrack::WbTrack(WbTokenizer *tokenizer) : WbSolid("Track", tokenizer) {
   init();
 }
 
-WbTrack::WbTrack(const WbTrack &other) :
-  WbSolid(other),
-  mWheelsList(),
-  mPathList(),
-  mAnimatedObjectList(),
-  mBeltElements(),
-  mBeltPositions(),
-  mWrenNodes() {
+WbTrack::WbTrack(const WbTrack &other) : WbSolid(other) {
   init();
 }
 
diff --git a/src/webots/nodes/WbViewpoint.cpp b/src/webots/nodes/WbViewpoint.cpp
@@ -151,13 +151,7 @@ WbViewpoint::WbViewpoint(WbTokenizer *tokenizer) : WbBaseNode("Viewpoint", token
   init();
 }
 
-WbViewpoint::WbViewpoint(const WbViewpoint &other) :
-  WbBaseNode(other),
-  mSavedPosition(),
-  mSavedOrientation(),
-  mSavedDescription(),
-  mSavedFollow(),
-  mInvisibleNodes() {
+WbViewpoint::WbViewpoint(const WbViewpoint &other) : WbBaseNode(other) {
   init();
 }
 
diff --git a/src/webots/sound/WbSoundClip.cpp b/src/webots/sound/WbSoundClip.cpp
@@ -28,7 +28,7 @@
 #include <AL/al.h>
 #endif
 
-WbSoundClip::WbSoundClip() : mFilename(), mDevice(NULL), mBuffer(0), mSide(0), mBalance(0.0) {
+WbSoundClip::WbSoundClip() : mDevice(NULL), mBuffer(0), mSide(0), mBalance(0.0) {
 }
 
 WbSoundClip::~WbSoundClip() {
diff --git a/src/webots/sound/WbWaveFile.cpp b/src/webots/sound/WbWaveFile.cpp
@@ -55,7 +55,6 @@ WbWaveFile::WbWaveFile(const QString &filename, QIODevice *device) :
 }
 
 WbWaveFile::WbWaveFile(qint16 *buffer, int bufferSize, int channelNumber, int bitsPerSample, int rate) :
-  mFilename(),
   mDevice(NULL),
   mBuffer(buffer),
   mBufferSize(bufferSize),
diff --git a/src/webots/vrml/WbProtoTreeItem.cpp b/src/webots/vrml/WbProtoTreeItem.cpp
@@ -29,8 +29,7 @@ WbProtoTreeItem::WbProtoTreeItem(const QString &url, WbProtoTreeItem *parent, bo
   mImportable(importable),
   mIsReady(false),
   mDownloader(NULL),
-  mName(QUrl(url).fileName().replace(".proto", "", Qt::CaseInsensitive)),
-  mError() {
+  mName(QUrl(url).fileName().replace(".proto", "", Qt::CaseInsensitive)) {
 }
 
 WbProtoTreeItem::~WbProtoTreeItem() {
diff --git a/src/webots/wren/WbWrenLabelOverlay.cpp b/src/webots/wren/WbWrenLabelOverlay.cpp
@@ -113,7 +113,6 @@ void WbWrenLabelOverlay::applyChangesToWren() {
 
 WbWrenLabelOverlay::WbWrenLabelOverlay(int id, const QString &font) :
   mId(id),
-  mText(),
   mFontName(font),
   mX(0.0f),
   mY(0.0f),
diff --git a/src/webots/wren/WbWrenPicker.cpp b/src/webots/wren/WbWrenPicker.cpp
@@ -55,13 +55,7 @@ void WbWrenPicker::setPickable(WrRenderable *renderable, int uniqueId, bool pick
   wr_phong_material_set_linear_diffuse(material, encodedId + 3);
 }
 
-WbWrenPicker::WbWrenPicker() :
-  mCoordinates(),
-  mSelectedId(-1),
-  mPickedTranslation(0),
-  mPickedRotation(0),
-  mPickedScale(0),
-  mPickedResize(0) {
+WbWrenPicker::WbWrenPicker() : mSelectedId(-1), mPickedTranslation(0), mPickedRotation(0), mPickedScale(0), mPickedResize(0) {
   mViewport = wr_viewport_new();
 
   const float color[4] = {0.0f, 0.0f, 0.0f, 0.0f};
diff --git a/tests/sources/test_cppcheck.py b/tests/sources/test_cppcheck.py
@@ -19,6 +19,7 @@
 import os
 import multiprocessing
 import shutil
+import sys
 
 
 class TestCppCheck(unittest.TestCase):
@@ -29,6 +30,16 @@ def setUp(self):
         self.WEBOTS_HOME = os.path.normpath(os.environ['WEBOTS_HOME'])
         self.reportFilename = os.path.join(self.WEBOTS_HOME, 'tests', 'cppcheck_report.txt')
         self.extensions = ['c', 'h', 'cpp', 'hpp', 'cc', 'hh', 'c++', 'h++']
+        if (sys.platform.startswith('linux')):
+            self.platformOptions = ' -D__linux__'
+        elif (sys.platform.startswith('win32')):
+            self.platformOptions = ' -D_WIN32'
+        else:
+            self.platformOptions = ' -D__APPLE__'
+
+        with open(os.path.join(self.WEBOTS_HOME, 'resources', 'version.txt'), 'r') as file:
+            version = file.readlines()[0].strip()
+            self.platformOptions += ' -DLIBCONTROLLER_VERSION=' + version
 
     def test_cppcheck_is_correctly_installed(self):
         """Test Cppcheck is correctly installed."""
@@ -96,7 +107,9 @@ def test_sources_with_cppcheck(self):
             'resources/projects'
         ]
         skippedDirs = [
+            'src/webots/build',
             'src/webots/external',
+            'resources/projects/libraries/qt_utils/build',
             'include/opencv2',
             'include/qt'
         ]
@@ -128,7 +141,10 @@ def test_sources_with_cppcheck(self):
             'src/controller/c/sha1.c',
             'src/controller/c/sha1.h'
         ]
-        command = 'cppcheck --platform=native --enable=warning,style,performance,portability --inconclusive --force -q'
+        if not sys.platform.startswith('win32'):
+            skippedFiles.append('src/webots/core/WbWindowsRegistry.hpp')
+        command = 'cppcheck --platform=native --enable=warning,style,performance,portability --inconclusive -q'
+        command += self.platformOptions
         command += ' --library=qt -j %s' % str(multiprocessing.cpu_count())
         command += ' --inline-suppr --suppress=invalidPointerCast --suppress=useStlAlgorithm --suppress=uninitMemberVar'
         command += ' --suppress=noCopyConstructor --suppress=noOperatorEq --suppress=strdupCalled --suppress=unknownMacro'
@@ -162,12 +178,18 @@ def test_projects_with_cppcheck(self):
             'projects/robots/robotis/darwin-op/libraries/python',
             'projects/robots/robotis/darwin-op/libraries/robotis-op2/robotis',
             'projects/robots/robotis/darwin-op/remote_control/libjpeg-turbo',
-            'projects/vehicles/controllers/ros_automobile/include'
+            'projects/vehicles/controllers/ros_automobile/include',
+            'projects/robots/gctronic/e-puck/plugins/robot_windows/botstudio/build',
+            'projects/robots/nex/plugins/robot_windows/fire_bird_6_window/build',
+            'projects/robots/robotis/darwin-op/plugins/robot_windows/robotis-op2_window/build',
+            'projects/vehicles/plugins/robot_windows/automobile_window/build'
         ]
         skippedFiles = [
-            'projects/robots/robotis/darwin-op/plugins/remote_controls/robotis-op2_tcpip/stb_image.h'
+            'projects/robots/robotis/darwin-op/plugins/remote_controls/robotis-op2_tcpip/stb_image.h',
+            'projects/robots/epfl/lis/plugins/physics/blimp_physics/utils.h'
         ]
-        command = 'cppcheck --platform=native --enable=warning,style,performance,portability --inconclusive --force -q'
+        command = 'cppcheck --platform=native --enable=warning,style,performance,portability --inconclusive -q'
+        command += self.platformOptions
         command += ' --library=qt --inline-suppr --suppress=invalidPointerCast --suppress=useStlAlgorithm -UKROS_COMPILATION'
         command += ' --suppress=strdupCalled --suppress=ctuOneDefinitionRuleViolation --suppress=unknownMacro'
         # command += ' --xml'  # Uncomment this line to get more information on the errors

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`
`26`	`26`	`WbWebotsUpdateManager *WbWebotsUpdateManager::cInstance = NULL;`
`27`	`27`
`28`		`-WbWebotsUpdateManager::WbWebotsUpdateManager() : mVersion(), mTargetVersionAvailable(false), mError() {`
	`28`	`+WbWebotsUpdateManager::WbWebotsUpdateManager() : mTargetVersionAvailable(false) {`
`29`	`29`	`sendRequest();`
`30`	`30`	`}`
`31`	`31`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ WbDragViewpointEvent::WbDragViewpointEvent(WbViewpoint *viewpoint) : WbDragKinem`
`34`	`34`	`WbTranslateViewpointEvent::WbTranslateViewpointEvent(const QPoint &initialMousePosition, WbViewpoint *viewpoint, double scale) :`
`35`	`35`	`WbDragViewpointEvent(viewpoint),`
`36`	`36`	`mInitialMousePosition(initialMousePosition),`
`37`		`- mDifference(),`
`38`	`37`	`mInitialCameraPosition(viewpoint->position()->value()),`
`39`	`38`	`mScaleFactor(scale) {`
`40`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ WbAbstractCamera::WbAbstractCamera(const QString &modelName, WbTokenizer *tokeni`
`98`	`98`	`init();`
`99`	`99`	`}`
`100`	`100`
`101`		`-WbAbstractCamera::WbAbstractCamera(const WbAbstractCamera &other) : WbRenderingDevice(other), mInvisibleNodes() {`
	`101`	`+WbAbstractCamera::WbAbstractCamera(const WbAbstractCamera &other) : WbRenderingDevice(other) {`
`102`	`102`	`init();`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ WbCharger::WbCharger(WbTokenizer *tokenizer) : WbSolid("Charger", tokenizer) {`
`58`	`58`	`init();`
`59`	`59`	`}`
`60`	`60`
`61`		`-WbCharger::WbCharger(const WbCharger &other) : WbSolid(other), mVisualElements() {`
	`61`	`+WbCharger::WbCharger(const WbCharger &other) : WbSolid(other) {`
`62`	`62`	`init();`
`63`	`63`	`}`
`64`	`64`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ WbDisplay::WbDisplay(WbTokenizer *tokenizer) : WbRenderingDevice("Display", toke`
`102`	`102`	`init();`
`103`	`103`	`}`
`104`	`104`
`105`		`-WbDisplay::WbDisplay(const WbDisplay &other) : WbRenderingDevice(other), mImages(), mSaveOrders(), mImageTextures() {`
	`105`	`+WbDisplay::WbDisplay(const WbDisplay &other) : WbRenderingDevice(other) {`
`106`	`106`	`init();`
`107`	`107`	`}`
`108`	`108`