Core: Enable compiling with MSVC /permissive- (#11014)
* Base: Fixes for MSVC permissive- * App: Fixes for MSVC permissive- * Gui: Fixes for MSVC permissive- * Main: Fixes for MSVC permissive- * Fem: Fixes for MSVC permissive- * Material: Fixes for MSVC permissive- * Part: Fixes for MSVC permissive- * Mesh: Fixes for MSVC permissive- * Points: Fixes for MSVC permissive- * Robot: Fixes for MSVC permissive- * TechDraw: Fixes for MSVC permissive- * Path: Fixes for MSVC permissive- * Core; Changes per review comments * TD: Revision from wandererfan * [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --------- Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
@@ -27,6 +27,8 @@
|
||||
# include <QRegularExpressionMatch>
|
||||
#endif
|
||||
|
||||
#include <Base/PyWrapParseTupleAndKeywords.h>
|
||||
|
||||
#include "Command.h"
|
||||
#include "Action.h"
|
||||
#include "Application.h"
|
||||
@@ -34,7 +36,6 @@
|
||||
#include "Selection.h"
|
||||
#include "Window.h"
|
||||
#include "PythonWrapper.h"
|
||||
#include <Base/PyWrapParseTupleAndKeywords.h>
|
||||
|
||||
// inclusion of the generated files (generated out of CommandPy.xml)
|
||||
#include "CommandPy.h"
|
||||
@@ -297,10 +298,10 @@ PyObject* CommandPy::createCustomCommand(PyObject* args, PyObject* kw)
|
||||
const char* statustipTxt = nullptr;
|
||||
const char* pixmapTxt = nullptr;
|
||||
const char* shortcutTxt = nullptr;
|
||||
static const std::array<const char *, 8> kwlist{"macroFile", "menuText", "toolTip", "whatsThis", "statusTip",
|
||||
"pixmap", "shortcut", nullptr};
|
||||
static std::array<const char *, 8> kwlist {"macroFile", "menuText", "toolTip", "whatsThis",
|
||||
"statusTip", "pixmap", "shortcut", nullptr};
|
||||
if (!Base::Wrapped_ParseTupleAndKeywords(args, kw, "s|zzzzzz", kwlist, ¯oFile, &menuTxt,
|
||||
&tooltipTxt, &whatsthisTxt, &statustipTxt, &pixmapTxt, &shortcutTxt)) {
|
||||
&tooltipTxt, &whatsthisTxt, &statustipTxt, &pixmapTxt, &shortcutTxt)) {
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user