Compile warning fixes and minor code policy fixes.
This commit is contained in:
parent
71e5fb13e6
commit
5729ee7ea5
|
@ -192,7 +192,7 @@ int VRML1_MODEL_PARSER::readMaterial()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@ -240,7 +240,7 @@ int VRML1_MODEL_PARSER::readCoordinate3()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@ -268,7 +268,7 @@ int VRML1_MODEL_PARSER::readIndexedFaceSet()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -145,7 +145,7 @@ int VRML2_MODEL_PARSER::read_Transform()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
// DBG( printf( " } Exit Transform\n" ) );
|
||||
break;
|
||||
|
@ -265,7 +265,7 @@ int VRML2_MODEL_PARSER::read_DEF()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
// DBG( printf( " } Exit DEF\n") );
|
||||
return 0;
|
||||
|
@ -321,7 +321,7 @@ int VRML2_MODEL_PARSER::read_Shape()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
// DBG( printf( " } Exit Shape\n") );
|
||||
return 0;
|
||||
|
@ -368,7 +368,7 @@ int VRML2_MODEL_PARSER::read_Appearance()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@ -473,7 +473,7 @@ int VRML2_MODEL_PARSER::read_Material()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
@ -566,7 +566,7 @@ int VRML2_MODEL_PARSER::read_IndexedFaceSet()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
// DBG( printf( " } Exit IndexedFaceSet\n") );
|
||||
return 0;
|
||||
|
@ -749,7 +749,7 @@ int VRML2_MODEL_PARSER::read_Color()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
// DBG( printf( " m_DiffuseColor.size: %ld\n", m_model->m_Materials->m_DiffuseColor.size() ) );
|
||||
return 0;
|
||||
|
@ -779,7 +779,7 @@ int VRML2_MODEL_PARSER::read_Normal()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
// DBG( printf( " m_PerFaceNormalsNormalized.size: %lu\n", m_model->m_PerFaceNormalsNormalized.size() ) );
|
||||
return 0;
|
||||
|
@ -817,7 +817,7 @@ int VRML2_MODEL_PARSER::read_Coordinate()
|
|||
continue;
|
||||
}
|
||||
|
||||
if( ( *text == '}' ) )
|
||||
if( *text == '}' )
|
||||
{
|
||||
// DBG( printf( " m_Point.size: %lu\n", m_model->m_Point.size() ) );
|
||||
return 0;
|
||||
|
|
|
@ -384,7 +384,9 @@ bool X3D_MODEL_PARSER::parseDoubleTriplet( const wxString& aData,
|
|||
{
|
||||
wxStringTokenizer tokens( aData );
|
||||
|
||||
double x, y, z;
|
||||
double x = 0;
|
||||
double y = 0;
|
||||
double z = 0;
|
||||
|
||||
bool ret = tokens.GetNextToken().ToDouble( &x )
|
||||
&& tokens.GetNextToken().ToDouble( &y )
|
||||
|
|
|
@ -250,7 +250,7 @@ struct KIFACE
|
|||
*/
|
||||
class KIWAY : public wxEvtHandler
|
||||
{
|
||||
friend class PGM_SINGLE_TOP; // can use set_kiface()
|
||||
friend struct PGM_SINGLE_TOP; // can use set_kiface()
|
||||
|
||||
public:
|
||||
/// Known KIFACE implementations
|
||||
|
|
|
@ -75,7 +75,7 @@ namespace PCB { struct IFACE; } // KIFACE_I is in pcbnew.cpp
|
|||
*/
|
||||
class PCB_EDIT_FRAME : public PCB_BASE_EDIT_FRAME
|
||||
{
|
||||
friend class PCB::IFACE;
|
||||
friend struct PCB::IFACE;
|
||||
friend class PCB_LAYER_WIDGET;
|
||||
|
||||
void updateTraceWidthSelectBox();
|
||||
|
|
|
@ -65,7 +65,7 @@ public:
|
|||
ANG_UNDEFINED = 0x20
|
||||
};
|
||||
|
||||
DIRECTION_45( Directions aDir = UNDEFINED ) : m_dir( aDir ) {};
|
||||
DIRECTION_45( Directions aDir = UNDEFINED ) : m_dir( aDir ) {}
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
|
|
|
@ -756,7 +756,7 @@ PNS_SHOVE::SHOVE_STATUS PNS_SHOVE::shoveIteration( int aIter )
|
|||
{
|
||||
PNS_LINE* currentLine = m_lineStack.back();
|
||||
PNS_NODE::OPT_OBSTACLE nearest;
|
||||
SHOVE_STATUS st;
|
||||
SHOVE_STATUS st = SH_NULL;
|
||||
|
||||
PNS_ITEM::PnsKind search_order[] = { PNS_ITEM::SOLID, PNS_ITEM::VIA, PNS_ITEM::SEGMENT };
|
||||
|
||||
|
@ -1057,8 +1057,6 @@ void PNS_SHOVE::runOptimizer( PNS_NODE* aNode, PNS_LINE* aHead )
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
#include <boost/function.hpp>
|
||||
#include <core/typeinfo.h>
|
||||
|
||||
class SELECTION;
|
||||
struct SELECTION;
|
||||
|
||||
///> Functor type that checks a specific condition for selected items.
|
||||
typedef boost::function<bool (const SELECTION&)> SELECTION_CONDITION;
|
||||
|
|
|
@ -848,7 +848,7 @@ bool VRML_LAYER::Tesselate( VRML_LAYER* holes, bool aHolesOnly )
|
|||
std::ostringstream ostr;
|
||||
ostr << "Tesselate():FAILED: " << holes->GetError();
|
||||
error = ostr.str();
|
||||
return NULL;
|
||||
return false;
|
||||
}
|
||||
|
||||
if( Fault )
|
||||
|
|
|
@ -62,7 +62,6 @@
|
|||
#define M_PI4 ( M_PI / 4.0 )
|
||||
#endif
|
||||
|
||||
struct GLUtesselator;
|
||||
|
||||
struct VERTEX_3D
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue