diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index d4d856e8f1..07298b345f 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -50,7 +50,7 @@ int QuantityFormat::defaultDenominator = 8; // for 1/8" QuantityFormat::QuantityFormat() - : option(static_cast(OmitGroupSeparator | RejectGroupSeparator)) + : option(OmitGroupSeparator | RejectGroupSeparator) , format(Fixed) , precision(UnitsApi::getDecimals()) , denominator(defaultDenominator) diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h index 97f8fbf892..edcf14548b 100644 --- a/src/Base/Quantity.h +++ b/src/Base/Quantity.h @@ -48,7 +48,8 @@ struct BaseExport QuantityFormat { Scientific = 2 }; - NumberOption option; + typedef int NumberOptions; + NumberOptions option; NumberFormat format; int precision; int denominator; diff --git a/src/Gui/BitmapFactory.cpp b/src/Gui/BitmapFactory.cpp index 5c8e7bf4cc..631bd21bc9 100644 --- a/src/Gui/BitmapFactory.cpp +++ b/src/Gui/BitmapFactory.cpp @@ -492,8 +492,7 @@ QPixmap BitmapFactoryInst::resize(int w, int h, const QPixmap& p, Qt::BGMode bgm QColor dl = pal.color(QPalette::Disabled, QPalette::Light); QColor dt = pal.color(QPalette::Disabled, QPalette::Text); - QPixmap pm = pix; - pm = QPixmap(w,h); + QPixmap pm(w,h); pm.fill(dl); QPainter pt; @@ -575,15 +574,15 @@ QPixmap BitmapFactoryInst::merge(const QPixmap& p1, const QPixmap& p2, Position switch (pos) { - case Qt::TopLeftCorner: + case TopLeft: break; - case Qt::TopRightCorner: + case TopRight: x = p1.width () - p2.width (); break; - case Qt::BottomLeftCorner: + case BottomLeft: y = p1.height() - p2.height(); break; - case Qt::BottomRightCorner: + case BottomRight: x = p1.width () - p2.width (); y = p1.height() - p2.height(); break; diff --git a/src/Gui/InputField.h b/src/Gui/InputField.h index f30ef179e1..b40047a8d4 100644 --- a/src/Gui/InputField.h +++ b/src/Gui/InputField.h @@ -210,7 +210,6 @@ private: void updateText(const Base::Quantity&); private: - QLabel* iconLabel; QByteArray m_sPrefGrp; bool validInput; diff --git a/src/Gui/SoFCCSysDragger.cpp b/src/Gui/SoFCCSysDragger.cpp index 0bb8eec435..f4c836469d 100644 --- a/src/Gui/SoFCCSysDragger.cpp +++ b/src/Gui/SoFCCSysDragger.cpp @@ -1072,7 +1072,7 @@ bool SoFCCSysDragger::isShownTranslationY() bool SoFCCSysDragger::isShownTranslationZ() { - SoSwitch *sw = SO_GET_ANY_PART(this, "yTranslatorSwitch", SoSwitch); + SoSwitch *sw = SO_GET_ANY_PART(this, "zTranslatorSwitch", SoSwitch); return (sw->whichChild.getValue() == SO_SWITCH_ALL); }