suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ minor whitespace fix, fix warnings

Browse Source
This commit is contained in:
wmayer 2016-03-11 21:39:15 +01:00
parent 32760491a6
commit f124f6e70b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/DlgKeyboardImp.cpp
View File

@ -273,7 +273,7 @@ void DlgCustomKeyboardImp::on_buttonReset_clicked()
CommandManager & cCmdMgr = Application::Instance->commandManager(); CommandManager & cCmdMgr = Application::Instance->commandManager();
Command* cmd = cCmdMgr.getCommandByName(name.constData()); Command* cmd = cCmdMgr.getCommandByName(name.constData());
if (cmd && cmd->getAction()) { if (cmd && cmd->getAction()) {
cmd->getAction()->setShortcut(QString::fromLatin1(cmd->getAccel())); cmd->getAction()->setShortcut(QString::fromLatin1(cmd->getAccel()));
QString txt = cmd->getAction()->shortcut().toString(QKeySequence::NativeText); QString txt = cmd->getAction()->shortcut().toString(QKeySequence::NativeText);
accelLineEditShortcut->setText((txt.isEmpty() ? tr("none") : txt)); accelLineEditShortcut->setText((txt.isEmpty() ? tr("none") : txt));
ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("Shortcut"); ParameterGrp::handle hGrp = WindowParameter::getDefaultParameter()->GetGroup("Shortcut");

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

@ -3339,7 +3339,7 @@ Restart:
if (geo1->getTypeId() != Part::GeomLineSegment::getClassTypeId() || if (geo1->getTypeId() != Part::GeomLineSegment::getClassTypeId() ||
geo2->getTypeId() != Part::GeomLineSegment::getClassTypeId()) { geo2->getTypeId() != Part::GeomLineSegment::getClassTypeId()) {
if (Constr->Type == Equal) { if (Constr->Type == Equal) {
double r1a,r1b,r2a,r2b; double r1a=0,r1b=0,r2a=0,r2b=0;
double angle1,angle1plus=0., angle2, angle2plus=0.;//angle1 = rotation of object as a whole; angle1plus = arc angle (t parameter for ellipses). double angle1,angle1plus=0., angle2, angle2plus=0.;//angle1 = rotation of object as a whole; angle1plus = arc angle (t parameter for ellipses).
if (geo1->getTypeId() == Part::GeomCircle::getClassTypeId()) { if (geo1->getTypeId() == Part::GeomCircle::getClassTypeId()) {
const Part::GeomCircle *circle = dynamic_cast<const Part::GeomCircle *>(geo1); const Part::GeomCircle *circle = dynamic_cast<const Part::GeomCircle *>(geo1);