Commit 5729ee7e authored by Camille's avatar Camille Committed by Wayne Stambaugh
Browse files

Compile warning fixes and minor code policy fixes.

parent 71e5fb13

3d-viewer/vrml_v1_modelparser.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -192,7 +192,7 @@ int VRML1_MODEL_PARSER::readMaterial() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            return 0;

            return 0;

        }

        }
@@ -240,7 +240,7 @@ int VRML1_MODEL_PARSER::readCoordinate3() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            return 0;

            return 0;

        }

        }
@@ -268,7 +268,7 @@ int VRML1_MODEL_PARSER::readIndexedFaceSet() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            return 0;

            return 0;

        }

        }

3d-viewer/vrml_v2_modelparser.cpp

+9 −9
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ int VRML2_MODEL_PARSER::read_Transform() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            // DBG( printf( "  } Exit Transform\n" ) );

            // DBG( printf( "  } Exit Transform\n" ) );

            break;

            break;
@@ -265,7 +265,7 @@ int VRML2_MODEL_PARSER::read_DEF() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            // DBG( printf( "  } Exit DEF\n") );

            // DBG( printf( "  } Exit DEF\n") );

            return 0;

            return 0;
@@ -321,7 +321,7 @@ int VRML2_MODEL_PARSER::read_Shape() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            // DBG( printf( "  } Exit Shape\n") );

            // DBG( printf( "  } Exit Shape\n") );

            return 0;

            return 0;
@@ -368,7 +368,7 @@ int VRML2_MODEL_PARSER::read_Appearance() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            return 0;

            return 0;

        }

        }
@@ -473,7 +473,7 @@ int VRML2_MODEL_PARSER::read_Material() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            return 0;

            return 0;

        }

        }
@@ -566,7 +566,7 @@ int VRML2_MODEL_PARSER::read_IndexedFaceSet() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            // DBG( printf( "  } Exit IndexedFaceSet\n") );

            // DBG( printf( "  } Exit IndexedFaceSet\n") );

            return 0;

            return 0;
@@ -749,7 +749,7 @@ int VRML2_MODEL_PARSER::read_Color() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            // DBG( printf( "    m_DiffuseColor.size: %ld\n", m_model->m_Materials->m_DiffuseColor.size() ) );

            // DBG( printf( "    m_DiffuseColor.size: %ld\n", m_model->m_Materials->m_DiffuseColor.size() ) );

            return 0;

            return 0;
@@ -779,7 +779,7 @@ int VRML2_MODEL_PARSER::read_Normal() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            // DBG( printf( "    m_PerFaceNormalsNormalized.size: %lu\n", m_model->m_PerFaceNormalsNormalized.size() ) );

            // DBG( printf( "    m_PerFaceNormalsNormalized.size: %lu\n", m_model->m_PerFaceNormalsNormalized.size() ) );

            return 0;

            return 0;
@@ -817,7 +817,7 @@ int VRML2_MODEL_PARSER::read_Coordinate() 
            continue;

            continue;

        }

        }





        if( ( *text == '}' ) )

        if( *text == '}' )

        {

        {

            // DBG( printf( "    m_Point.size: %lu\n", m_model->m_Point.size() ) );

            // DBG( printf( "    m_Point.size: %lu\n", m_model->m_Point.size() ) );

            return 0;

            return 0;

3d-viewer/x3dmodelparser.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -384,7 +384,9 @@ bool X3D_MODEL_PARSER::parseDoubleTriplet( const wxString& aData, 
{

{

    wxStringTokenizer tokens( aData );

    wxStringTokenizer tokens( aData );





    double x, y, z;

    double x = 0;

    double y = 0;

    double z = 0;





    bool ret = tokens.GetNextToken().ToDouble( &x )

    bool ret = tokens.GetNextToken().ToDouble( &x )

               && tokens.GetNextToken().ToDouble( &y )

               && tokens.GetNextToken().ToDouble( &y )

include/kiway.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -250,7 +250,7 @@ struct KIFACE 
 */

 */

class KIWAY : public wxEvtHandler

class KIWAY : public wxEvtHandler

{

{

    friend class PGM_SINGLE_TOP;        // can use set_kiface()

    friend struct PGM_SINGLE_TOP;        // can use set_kiface()





public:

public:

    /// Known KIFACE implementations

    /// Known KIFACE implementations

include/wxPcbStruct.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ namespace PCB { struct IFACE; } // KIFACE_I is in pcbnew.cpp 
 */

 */

class PCB_EDIT_FRAME : public PCB_BASE_EDIT_FRAME

class PCB_EDIT_FRAME : public PCB_BASE_EDIT_FRAME

{

{

    friend class PCB::IFACE;

    friend struct PCB::IFACE;

    friend class PCB_LAYER_WIDGET;

    friend class PCB_LAYER_WIDGET;





    void updateTraceWidthSelectBox();

    void updateTraceWidthSelectBox();