Commit 8d6e75fc authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Fix 2 coverity warnings, and cleanup a old code in dialog_color_config.

parent 8cc70d44

common/class_plotter.cpp

+5 −1
Original line number Diff line number Diff line
@@ -54,12 +54,16 @@ PLOTTER::PLOTTER( ) 
    defaultPenWidth = 0;

    currentPenWidth = -1;       // To-be-set marker

    penState = 'Z';             // End-of-path idle

    m_plotMirror = false;    		// Mirror flag

    m_plotMirror = false;       // Plot mirror option flag

    m_mirrorIsHorizontal = true;

    m_yaxisReversed = false;

    outputFile = 0;

    colorMode = false;          // Starts as a BW plot

    negativeMode = false;

    // Temporary init to avoid not initialized vars, will be set later

    m_IUsPerDecimil = 1;        // will be set later to the actual value

    iuPerDeviceUnit = 1;        // will be set later to the actual value



}



PLOTTER::~PLOTTER()

common/grid_tricks.cpp

+5 −0
Original line number Diff line number Diff line
@@ -50,6 +50,11 @@ enum 
GRID_TRICKS::GRID_TRICKS( wxGrid* aGrid ):

    m_grid( aGrid )

{

    m_sel_row_start = 0;

    m_sel_col_start = 0;

    m_sel_row_count = 0;

    m_sel_col_count = 0;



    aGrid->Connect( wxEVT_GRID_CELL_RIGHT_CLICK, wxGridEventHandler( GRID_TRICKS::onGridCellRightClick ), NULL, this );

    aGrid->Connect( MYID_FIRST, MYID_LAST, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( GRID_TRICKS::onPopupSelection ), NULL, this );

    aGrid->Connect( wxEVT_KEY_DOWN, wxKeyEventHandler( GRID_TRICKS::onKeyDown ), NULL, this );

eeschema/dialogs/dialog_color_config.cpp

+9 −33
Original line number Diff line number Diff line 
/*

 * This program source code file is part of KiCad, a free EDA CAD application.

 *

 * Copyright (C) 2007 Jean-Pierre Charras, jp.charras at wanadoo.fr

 * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr

 * Copyright (C) 2014 KiCad Developers, see CHANGELOG.TXT for contributors.

 *

 * This program is free software; you can redistribute it and/or
@@ -110,46 +110,22 @@ static BUTTONINDEX buttonGroups[] = { 
static EDA_COLOR_T currentColors[ LAYERSCH_ID_COUNT ];





IMPLEMENT_DYNAMIC_CLASS( DIALOG_COLOR_CONFIG, wxDialog )





DIALOG_COLOR_CONFIG::DIALOG_COLOR_CONFIG()

{

    Init();

}





DIALOG_COLOR_CONFIG::DIALOG_COLOR_CONFIG( EDA_DRAW_FRAME* aParent )

DIALOG_COLOR_CONFIG::DIALOG_COLOR_CONFIG( EDA_DRAW_FRAME* aParent ) :

    DIALOG_SHIM( aParent, wxID_ANY,  _( "EESchema Colors" ),

              wxDefaultPosition, wxDefaultSize,

              wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER )

{

    m_parent = aParent;

    Init();

    Create( aParent );

}





DIALOG_COLOR_CONFIG::~DIALOG_COLOR_CONFIG()

{

}





bool DIALOG_COLOR_CONFIG::Create( wxWindow*       aParent,

                                  wxWindowID      aId,

                                  const wxString& aCaption,

                                  const wxPoint&  aPosition,

                                  const wxSize&   aSize,

                                  long            aStyle )

{

    SetExtraStyle( wxWS_EX_BLOCK_EVENTS );

    wxDialog::Create( aParent, aId, aCaption, aPosition, aSize, aStyle );



    Init();

    CreateControls();



    if( GetSizer() )

    {

    GetSizer()->SetSizeHints( this );

}



    return true;



DIALOG_COLOR_CONFIG::~DIALOG_COLOR_CONFIG()

{

}

eeschema/dialogs/dialog_color_config.h

+2 −14
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#define DIALOG_COLOR_CONFIG_H_



#include <wx/statline.h>

#include <dialog_shim.h>





class wxBoxSizer;
@@ -33,18 +34,13 @@ class wxStaticLine; 
class wxStdDialogButtonSizer;





extern void SeedLayers();





/***********************************************/

/* Derived class for the frame color settings. */

/***********************************************/



class DIALOG_COLOR_CONFIG : public wxDialog

class DIALOG_COLOR_CONFIG : public DIALOG_SHIM

{

private:

    DECLARE_DYNAMIC_CLASS( DIALOG_COLOR_CONFIG )



    EDA_DRAW_FRAME*         m_parent;

    wxBoxSizer*             m_outerBoxSizer;

    wxBoxSizer*             m_mainBoxSizer;
@@ -55,14 +51,6 @@ private: 
    wxStaticLine*           m_line;

    wxStdDialogButtonSizer* m_stdDialogButtonSizer;



    // Creation

    bool Create( wxWindow* aParent,

                 wxWindowID aId = wxID_ANY,

                 const wxString& aCaption =  _( "EESchema Colors" ),

                 const wxPoint& aPosition = wxDefaultPosition,

                 const wxSize& aSize = wxDefaultSize,

                 long aStyle = wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER );



    // Initializes member variables

    void Init();

eeschema/operations_on_items_lists.cpp

+1 −2
Original line number Diff line number Diff line
@@ -159,8 +159,7 @@ void SCH_EDIT_FRAME::DeleteItem( SCH_ITEM* aItem ) 
{

    wxCHECK_RET( aItem != NULL, wxT( "Cannot delete invalid item." ) );



    if( aItem == NULL )

        return;

    // Here, aItem is not null.



    SCH_SCREEN* screen = GetScreen();