From d93907119d757c75cdd3a041312ca1fd70b491da Mon Sep 17 00:00:00 2001 From: jrheinlaender Date: Mon, 25 Mar 2013 20:40:41 +0430 Subject: [PATCH] more suggestions for moving float -> double --- src/Mod/Inspection/App/InspectionFeature.cpp | 10 +++++----- src/Mod/Inspection/Gui/ViewProviderInspection.cpp | 8 ++++---- src/Mod/Points/App/Properties.cpp | 6 +++--- src/Mod/Points/Gui/ViewProvider.cpp | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index 9ff0f6e6e..b0783ad43 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -40,8 +40,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -479,11 +479,11 @@ PROPERTY_SOURCE(Inspection::Feature, App::DocumentObject) Feature::Feature() { - ADD_PROPERTY(SearchRadius,(0.05f)); - ADD_PROPERTY(Thickness,(0.0f)); + ADD_PROPERTY(SearchRadius,(0.05)); + ADD_PROPERTY(Thickness,(0.0)); ADD_PROPERTY(Actual,(0)); ADD_PROPERTY(Nominals,(0)); - ADD_PROPERTY(Distances,(0.0f)); + ADD_PROPERTY(Distances,(0.0)); } Feature::~Feature() diff --git a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp index 871a2bfb6..be8d258c7 100644 --- a/src/Mod/Inspection/Gui/ViewProviderInspection.cpp +++ b/src/Mod/Inspection/Gui/ViewProviderInspection.cpp @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -63,14 +63,14 @@ using namespace InspectionGui; bool ViewProviderInspection::addflag = false; -App::PropertyFloatConstraint::Constraints ViewProviderInspection::floatRange = {1.0f,64.0f,1.0f}; +App::PropertyFloatConstraint::Constraints ViewProviderInspection::floatRange = {1.0,64.0,1.0}; PROPERTY_SOURCE(InspectionGui::ViewProviderInspection, Gui::ViewProviderDocumentObject) ViewProviderInspection::ViewProviderInspection() : search_radius(FLT_MAX) { ADD_PROPERTY_TYPE(OutsideGrayed,(false),"",(App::PropertyType) (App::Prop_Output|App::Prop_Hidden),""); - ADD_PROPERTY_TYPE(PointSize,(1.0f),"Display",(App::PropertyType) (App::Prop_None/*App::Prop_Hidden*/),""); + ADD_PROPERTY_TYPE(PointSize,(1.0),"Display",(App::PropertyType) (App::Prop_None/*App::Prop_Hidden*/),""); PointSize.setConstraints(&floatRange); pcColorRoot = new SoSeparator(); diff --git a/src/Mod/Points/App/Properties.cpp b/src/Mod/Points/App/Properties.cpp index 855633fa9..aba32ce2c 100644 --- a/src/Mod/Points/App/Properties.cpp +++ b/src/Mod/Points/App/Properties.cpp @@ -53,17 +53,17 @@ void PropertyGreyValueList::removeIndices( const std::vector& uIn std::vector uSortedInds = uIndices; std::sort(uSortedInds.begin(), uSortedInds.end()); - const std::vector& rValueList = getValues(); + const std::vector& rValueList = getValues(); assert( uSortedInds.size() <= rValueList.size() ); if ( uSortedInds.size() > rValueList.size() ) return; - std::vector remainValue; + std::vector remainValue; remainValue.reserve(rValueList.size() - uSortedInds.size()); std::vector::iterator pos = uSortedInds.begin(); - for ( std::vector::const_iterator it = rValueList.begin(); it != rValueList.end(); ++it ) { + for ( std::vector::const_iterator it = rValueList.begin(); it != rValueList.end(); ++it ) { unsigned long index = it - rValueList.begin(); if (pos == uSortedInds.end()) remainValue.push_back( *it ); diff --git a/src/Mod/Points/Gui/ViewProvider.cpp b/src/Mod/Points/Gui/ViewProvider.cpp index 4fe161b71..cbf165d1b 100644 --- a/src/Mod/Points/Gui/ViewProvider.cpp +++ b/src/Mod/Points/Gui/ViewProvider.cpp @@ -65,7 +65,7 @@ using namespace Points; PROPERTY_SOURCE(PointsGui::ViewProviderPoints, Gui::ViewProviderGeometryObject) -App::PropertyFloatConstraint::Constraints ViewProviderPoints::floatRange = {1.0f,64.0f,1.0f}; +App::PropertyFloatConstraint::Constraints ViewProviderPoints::floatRange = {1.0,64.0,1.0}; ViewProviderPoints::ViewProviderPoints() {