kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

[skip ci] fix more -Wgnu-zero-variadic-macro-arguments

Browse Source
This commit is contained in:
wmayer
2019-11-17 19:11:08 +01:00
parent a3e88a399f
commit c0d58b8f3e
12 changed files with 529 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -91,7 +91,7 @@
#include <Gui/Application.h>
#include <Gui/BitmapFactory.h>
#include <Gui/Document.h>
#include <Gui/Command.h>
#include <Gui/CommandT.h>
#include <Gui/Control.h>
#include <Gui/Selection.h>
#include <Gui/Utilities.h>
@@ -789,8 +789,7 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
if (GeoId != Sketcher::Constraint::GeoUndef && PosId != Sketcher::none) {
getDocument()->openCommand("Drag Point");
try {
FCMD_OBJ_CMD2("movePoint(%i,%i,App.Vector(%f,%f,0),%i)"
,getObject()
Gui::cmdAppObjectArgs(getObject(), "movePoint(%i,%i,App.Vector(%f,%f,0),%i)"
,GeoId, PosId, x-xInit, y-yInit, 0);
getDocument()->commitCommand();
@@ -821,8 +820,7 @@ bool ViewProviderSketch::mouseButtonPressed(int Button, bool pressed, const SbVe
geo->getTypeId() == Part::GeomBSplineCurve::getClassTypeId()) {
getDocument()->openCommand("Drag Curve");
try {
FCMD_OBJ_CMD2("movePoint(%i,%i,App.Vector(%f,%f,0),%i)"
,getObject()
Gui::cmdAppObjectArgs(getObject(), "movePoint(%i,%i,App.Vector(%f,%f,0),%i)"
,edit->DragCurve, Sketcher::none, x-xInit, y-yInit, relative ? 1 : 0);
getDocument()->commitCommand();
@@ -1019,7 +1017,7 @@ void ViewProviderSketch::editDoubleClicked(void)
if (Constr->isDimensional()) {
if(!Constr->isDriving) {
FCMD_OBJ_CMD2("setDriving(%i,%s)", getObject(),id,"True");
Gui::cmdAppObjectArgs(getObject(), "setDriving(%i,%s)", id, "True");
}
// Coin's SoIdleSensor causes problems on some platform while Qt seems to work properly (#0001517)
@@ -6431,7 +6429,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
for (rit = delConstraints.rbegin(); rit != delConstraints.rend(); ++rit) {
try {
FCMD_OBJ_CMD2("delConstraint(%i)" ,getObject(), *rit);
Gui::cmdAppObjectArgs(getObject(), "delConstraint(%i)", *rit);
}
catch (const Base::Exception& e) {
Base::Console().Error("%s\n", e.what());
@@ -6454,7 +6452,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
if (((*it)->Type == Sketcher::Coincident) && (((*it)->First == GeoId && (*it)->FirstPos == PosId) ||
((*it)->Second == GeoId && (*it)->SecondPos == PosId)) ) {
try {
FCMD_OBJ_CMD2("delConstraintOnPoint(%i,%i)" ,getObject(), GeoId, (int)PosId);
Gui::cmdAppObjectArgs(getObject(), "delConstraintOnPoint(%i,%i)", GeoId, (int)PosId);
}
catch (const Base::Exception& e) {
Base::Console().Error("%s\n", e.what());
@@ -6467,7 +6465,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
for (rit = delInternalGeometries.rbegin(); rit != delInternalGeometries.rend(); ++rit) {
try {
FCMD_OBJ_CMD2("delGeometry(%i)" ,getObject(), *rit);
Gui::cmdAppObjectArgs(getObject(), "delGeometry(%i)", *rit);
}
catch (const Base::Exception& e) {
Base::Console().Error("%s\n", e.what());
@@ -6476,7 +6474,7 @@ bool ViewProviderSketch::onDelete(const std::vector<std::string> &subList)
for (rit = delExternalGeometries.rbegin(); rit != delExternalGeometries.rend(); ++rit) {
try {
FCMD_OBJ_CMD2("delExternal(%i)",getObject(), *rit);
Gui::cmdAppObjectArgs(getObject(), "delExternal(%i)", *rit);
}
catch (const Base::Exception& e) {
Base::Console().Error("%s\n", e.what());