Merge pull request #13727 from wwmayer/fix_warnings

Fix compiler warnings
This commit is contained in:
Chris Hennes
2024-05-01 10:29:21 -05:00
committed by GitHub
16 changed files with 17 additions and 27 deletions

View File

@@ -32,7 +32,7 @@ measureType : Measure.MeasureBasePython
The actual measure type.</UserDocu>
</Documentation>
</Methode>
<Methode Name="getMeasureTypes" Static="true">
<Methode Name="getMeasureTypes" Static="true" NoArgs="true">
<Documentation>
<UserDocu>getMeasureTypes() -> List[(id, label, pythonMeasureType)]

View File

@@ -63,7 +63,7 @@ PyObject* MeasureManagerPy::addMeasureType(PyObject *args)
}
PyObject* MeasureManagerPy::getMeasureTypes(PyObject *args)
PyObject* MeasureManagerPy::getMeasureTypes()
{
Py::List types;
for (auto & it : MeasureManager::getMeasureTypes()) {
@@ -73,7 +73,7 @@ PyObject* MeasureManagerPy::getMeasureTypes(PyObject *args)
type.setItem(2, Py::Object(it->pythonClass));
types.append(type);
}
}
return Py::new_reference_to(types);
}
}

View File

@@ -60,14 +60,11 @@ public:
void setMeasureObject(Measure::MeasureBase* obj);
private:
QColumnView* dialog{nullptr};
void onSelectionChanged(const Gui::SelectionChanges& msg) override;
Measure::MeasureBase *_mMeasureObject = nullptr;
QLineEdit* valueResult{nullptr};
QLabel* labelResult{nullptr};
QComboBox* modeSwitch{nullptr};
void removeObject();

View File

@@ -67,7 +67,7 @@ public:
virtual QString getResultString();
virtual std::vector<std::string> getInputProps();
virtual App::Property* getResultProp() {return {};};
virtual App::Property* getResultProp() {return {};}
virtual Base::Placement getPlacement();
// Return the objects that are measured

View File

@@ -63,7 +63,7 @@ public:
App::Property* getResultProp() override {return &this->Length;}
// Return a placement for the viewprovider, just use the first element for now
Base::Placement getPlacement();
Base::Placement getPlacement() override;
// Return the object we are measuring
std::vector<App::DocumentObject*> getSubject() const override;

View File

@@ -29,5 +29,4 @@ using namespace std;
void CreateMeasureCommands() {
Base::Console().Message("Init MeasureGui\n");
Gui::CommandManager& rcCmdMgr = Gui::Application::Instance->commandManager();
}
}

View File

@@ -53,13 +53,6 @@
#include <Base/Rotation.h>
#include <Base/Vector3D.h>
#include <Mod/Measure/App/MeasureAngle.h>
#include <Mod/Measure/App/MeasureDistance.h>
#include <Mod/Measure/App/MeasureLength.h>
#include <Mod/Measure/App/MeasurePosition.h>
#include <Mod/Measure/App/MeasureArea.h>
#include <Mod/Measure/App/MeasureRadius.h>
#include "VectorAdapter.h"
#include "PartFeature.h"

View File

@@ -4081,6 +4081,7 @@ bool TopoShape::findPlane(gp_Pln& pln, double tol, double atol) const
}
#else
bool TopoShape::findPlane(gp_Pln &pln, double tol, double atol) const {
(void)atol;
if(_Shape.IsNull())
return false;
TopoDS_Shape shape = _Shape;

View File

@@ -431,7 +431,6 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt
bool makeface = options.testFlag(ExtrudeOption::MakeFace);
bool fuse = options.testFlag(ExtrudeOption::MakeFuse);
bool legacyPocket = options.testFlag(ExtrudeOption::LegacyPocket);
bool inverseDirection = options.testFlag(ExtrudeOption::InverseDirection);
std::string method(Type.getValueAsString());

View File

@@ -280,7 +280,7 @@ TopoDS_Shape ProfileBased::getVerifiedFace(bool silent) const {
}
TopoShape ProfileBased::getTopoShapeVerifiedFace(bool silent,
bool doFit,
[[maybe_unused]]bool doFit, // TODO: Remove parameter
bool allowOpen,
const App::DocumentObject* profile,
const std::vector<std::string>& _subs) const

View File

@@ -996,7 +996,6 @@ void DrawSketchHandler::createAutoConstraints(const std::vector<AutoConstraint>&
geoId2);
} break;
case Sketcher::Symmetric: {
Sketcher::PointPos posId2 = cstr.PosId;
Gui::cmdAppObjectArgs(
sketchgui->getObject(),
"addConstraint(Sketcher.Constraint('Symmetric',%d,1,%d,2,%d,%d)) ",

View File

@@ -31,7 +31,6 @@
using namespace Start;
FC_LOG_LEVEL_INIT(ExamplesModel)
ExamplesModel::ExamplesModel(QObject* parent)
: DisplayedFilesModel(parent)

View File

@@ -115,6 +115,7 @@ PyObject* initModule()
PyMOD_INIT_FUNC(StartGui)
{
static StartGui::StartLauncher* launcher = new StartGui::StartLauncher();
Q_UNUSED(launcher)
Base::Console().Log("Loading GUI of Start module... ");
PyObject* mod = StartGui::initModule();

View File

@@ -24,6 +24,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${Boost_INCLUDE_DIRS}
${COIN3D_INCLUDE_DIRS}
${PYTHON_INCLUDE_DIRS}
${QtCore_INCLUDE_DIRS}
${QtSvg_INCLUDE_DIRS}

View File

@@ -1803,6 +1803,7 @@ TEST_F(TopoShapeExpansionTest, makeElementThickSolid)
std::vector<TopoShape> shapes = {subFaces[0], subFaces[1]};
// Act
TopoShape& result = cube1TS.makeElementThickSolid(cube1TS, shapes, 0.1, 1e-07);
(void)result;
auto elements = elementMap(cube1TS);
// Assert
EXPECT_EQ(cube1TS.countSubElements("Wire"), 16);

View File

@@ -312,11 +312,11 @@ TEST_F(TopoShapeMakeShapeWithElementMapTests, findMakerOpInElementMap)
EXPECT_EQ(tmpShape.getElementMapSize(), 26);
// For all the mappedElements ...
for (const auto& mappedElement : tmpShape.getElementMap()) {
// TODO: This no longer works, it needs a different check. We don't set MAK
// EXPECT_NE(mappedElement.name.find(OpCodes::Maker),
// -1); // ... we check that there's the "MAK" OpCode
}
// for (const auto& mappedElement : tmpShape.getElementMap()) {
// TODO: This no longer works, it needs a different check. We don't set MAK
// EXPECT_NE(mappedElement.name.find(OpCodes::Maker),
// -1); // ... we check that there's the "MAK" OpCode
//}
}
}