kicad-developers team mailing list archive

[Simon Richter <Simon.Richter@xxxxxxxxxx>]

---
 eeschema/lib_pin.cpp                   | 11 -----------
 eeschema/lib_pin.h                     |  6 ------
 eeschema/widgets/pin_type_combobox.cpp |  5 +++--
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/eeschema/lib_pin.cpp b/eeschema/lib_pin.cpp
index cbea37c..d7a83f7 100644
--- a/eeschema/lib_pin.cpp
+++ b/eeschema/lib_pin.cpp
@@ -2190,17 +2190,6 @@ void LIB_PIN::Rotate()
 }
 
 
-wxArrayString LIB_PIN::GetElectricalTypeNames( void )
-{
-    wxArrayString tmp;
-
-    for( unsigned ii = 0; ii < PIN_ELECTRICAL_TYPE_CNT; ii++ )
-        tmp.Add( GetText( static_cast<ElectricPinType>( ii ) ) );
-
-    return tmp;
-}
-
-
 const BITMAP_DEF* LIB_PIN::GetElectricalTypeSymbols()
 {
     return iconsPinsElectricalType;
diff --git a/eeschema/lib_pin.h b/eeschema/lib_pin.h
index 6cb03d9..95e241d 100644
--- a/eeschema/lib_pin.h
+++ b/eeschema/lib_pin.h
@@ -440,12 +440,6 @@ public:
      */
     static int GetOrientationCodeIndex( int aCode );
 
-    /**
-     * Get a list of pin electrical type names.
-     *
-     * @return  List of valid pin electrical type names.
-     */
-    static wxArrayString GetElectricalTypeNames();
 
     /**
      * Get a list of pin electrical bitmaps for menus and dialogs.
diff --git a/eeschema/widgets/pin_type_combobox.cpp b/eeschema/widgets/pin_type_combobox.cpp
index ae9676d..52dc5fb 100644
--- a/eeschema/widgets/pin_type_combobox.cpp
+++ b/eeschema/widgets/pin_type_combobox.cpp
@@ -42,12 +42,13 @@ PinTypeComboBox::PinTypeComboBox( wxWindow* parent,
         const wxString& name ) :
     wxBitmapComboBox( parent, id, value, pos, size, n, choices, style, validator, name )
 {
-    wxArrayString texts = LIB_PIN::GetElectricalTypeNames();
     const BITMAP_DEF* bitmaps = LIB_PIN::GetElectricalTypeSymbols();
 
     for( unsigned ii = 0; ii < PINTYPE_COUNT; ++ii )
     {
-        wxString text = texts[ ii ];
+        ElectricPinType type = static_cast<ElectricPinType>( ii );
+
+        wxString text = GetText( type );
         BITMAP_DEF bitmap = bitmaps[ ii ];
 
         if( bitmap == NULL )