Merge lp:~p12/kicad/remove-uses-namespace-std into lp:kicad/product

[Povilas Kanapickas]

Remove uses of using namespace std.

[Dick Hollenbeck (dickelbeck)]

I wish we had added this text to the coding standards:

**************************

  The project should never use 'using namespace ...' in a header file, but using
  it in a *.cpp file is OK, according to the author of the *.cpp file's preference.
  If it occurs in a *.cpp file, it must occur after any #include statements.

**************************

The consequences of that make it impossible not to use std:: for all STL objects which
present themselves in a header file. This is the public API.

The above policy also gives the implementation author the freedom of brevity in a file which is not affecting usage of the API in (client callaing) *.cpp files.

I personally have followed this policy in everything I've contributed, never once put a "using namespace" into a header file. I was not aware that we had strayed from this common sense approach.

So I only like about 25% of this patch, because for my *.cpp files, I really don't care to see them be changed in a way other than I wrote them for something other than a bug. Of course, this is an understatement.

It is general, not limited to me. It is respectful of the original author's wishes, the person who we often call upon to *support* the code when something goes wrong.

[Dick Hollenbeck (dickelbeck)]

The negotiated result was that we are to add these lines to the Coding Standards document:

  The project should never use 'using namespace ...' in a header file, but using
  it in a *.cpp file is OK, according to the author of the *.cpp file's preference.
  If it occurs in a *.cpp file, it must occur after any #include statements.

(Wayne agreed to do that.)

Then I consulted authors/developers who have made use of 'using namespace' in *.cpp files, which is still legal, to find out what they were willing to give up. The applied patch is a result of this process, and it is a subset of the original request.

=== modified file 'CMakeModules/PerformFeatureChecks.cmake'
--- CMakeModules/PerformFeatureChecks.cmake	2013-10-03 22:53:42 +0000
+++ CMakeModules/PerformFeatureChecks.cmake	2013-12-04 08:51:30 +0000
@@ -92,7 +92,7 @@
 
     # CMakes check_cxx_symbol_exists() doesn't work for templates so we must create a
     # small program to verify isinf() exists in cmath.
-    check_cxx_source_compiles( "#include <cmath>\nusing namespace std;\nint main(int argc, char** argv)\n{\n  (void)argv;\n  isinf(1.0);  (void)argc;\n  return 0;\n}\n"  HAVE_CMATH_ISINF )
+    check_cxx_source_compiles( "#include <cmath>\nint main(int argc, char** argv)\n{\n  (void)argv;\n  std::isinf(1.0);  (void)argc;\n  return 0;\n}\n"  HAVE_CMATH_ISINF )
 
     #check_symbol_exists(clock_gettime "time.h" HAVE_CLOCK_GETTIME) non-standard library, does not work
     check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
 
=== modified file 'common/geometry/shape_line_chain.cpp'
--- common/geometry/shape_line_chain.cpp	2013-10-14 18:40:36 +0000
+++ common/geometry/shape_line_chain.cpp	2013-12-04 08:51:30 +0000
@@ -25,7 +25,6 @@
 #include <geometry/shape_line_chain.h>
 #include <geometry/shape_circle.h>
 
-using namespace std;
 using boost::optional;
 
 bool SHAPE_LINE_CHAIN::Collide( const VECTOR2I& aP, int aClearance ) const
@@ -137,7 +136,7 @@
     int d = INT_MAX;
 
     for( int s = 0; s < SegmentCount(); s++ )
-        d = min( d, CSegment( s ).Distance( aP ) );
+        d = std::min( d, CSegment( s ).Distance( aP ) );
 
     return d;
 }
@@ -437,7 +436,7 @@
 
 SHAPE_LINE_CHAIN& SHAPE_LINE_CHAIN::Simplify()
 {
-    vector<VECTOR2I> pts_unique;
+    std::vector<VECTOR2I> pts_unique;
 
     if( PointCount() < 2 )
     {
@@ -524,9 +523,9 @@
 }
 
 
-const string SHAPE_LINE_CHAIN::Format() const
+const std::string SHAPE_LINE_CHAIN::Format() const
 {
-    stringstream ss;
+    std::stringstream ss;
 
     ss << m_points.size() << " " << ( m_closed ? 1 : 0 ) << " ";
 
 
=== modified file 'common/gr_basic.cpp'
--- common/gr_basic.cpp	2013-09-11 09:11:27 +0000
+++ common/gr_basic.cpp	2013-12-04 08:51:30 +0000
@@ -1358,8 +1358,8 @@
     }
 
     // A clip box exists: clip and draw the polygon.
-    static vector<wxPoint> clippedPolygon;
-    static pointVector     inputPolygon, outputPolygon;
+    static std::vector<wxPoint> clippedPolygon;
+    static pointVector inputPolygon, outputPolygon;
 
     inputPolygon.clear();
     outputPolygon.clear();
 
=== modified file 'common/tool/tool_event.cpp'
--- common/tool/tool_event.cpp	2013-10-15 08:41:00 +0000
+++ common/tool/tool_event.cpp	2013-12-04 08:51:30 +0000
@@ -31,8 +31,6 @@
 
 #include <boost/foreach.hpp>
 
-using namespace std;
-
 struct FlagString
 {
     int flag;
@@ -153,7 +151,7 @@
 
 const std::string TOOL_EVENT_LIST::Format() const
 {
-    string s;
+    std::string s;
 
     BOOST_FOREACH( TOOL_EVENT e, m_events )
         s += e.Format() + " ";
 
=== modified file 'common/tool/tool_manager.cpp'
--- common/tool/tool_manager.cpp	2013-11-13 19:59:47 +0000
+++ common/tool/tool_manager.cpp	2013-12-04 08:51:30 +0000
@@ -47,7 +47,6 @@
 #include <class_drawpanel_gal.h>
 
 using boost::optional;
-using namespace std;
 
 /// Struct describing the current execution state of a TOOL
 struct TOOL_MANAGER::TOOL_STATE
 
=== modified file 'eeschema/annotate.cpp'
--- eeschema/annotate.cpp	2013-07-03 07:27:52 +0000
+++ eeschema/annotate.cpp	2013-12-04 08:51:30 +0000
@@ -26,8 +26,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <algorithm> // to use sort vector
-#include <vector>
+#include <algorithm>
 
 #include <fctsys.h>
 #include <class_drawpanel.h>
 
=== modified file 'eeschema/component_references_lister.cpp'
--- eeschema/component_references_lister.cpp	2013-06-14 14:59:52 +0000
+++ eeschema/component_references_lister.cpp	2013-12-04 08:51:30 +0000
@@ -30,7 +30,7 @@
 
 
 #include <wx/regex.h>
-#include <algorithm> // to use sort vector
+#include <algorithm>
 #include <vector>
 
 #include <fctsys.h>
 
=== modified file 'eeschema/hierarch.cpp'
--- eeschema/hierarch.cpp	2013-11-15 09:28:31 +0000
+++ eeschema/hierarch.cpp	2013-12-04 08:51:30 +0000
@@ -169,7 +169,7 @@
 
     // Set dialog window size to be large enough
     m_TreeSize.x = itemrect.GetWidth() + 20;
-    m_TreeSize.x = max( m_TreeSize.x, 250 );
+    m_TreeSize.x = std::max( m_TreeSize.x, 250 );
 
     // Readjust the size of the frame to an optimal value.
     m_TreeSize.y = m_nbsheets * itemrect.GetHeight();
 
=== modified file 'eeschema/sch_bus_entry.cpp'
--- eeschema/sch_bus_entry.cpp	2013-11-24 17:48:14 +0000
+++ eeschema/sch_bus_entry.cpp	2013-12-04 08:51:30 +0000
@@ -246,7 +246,7 @@
 }
 
 
-void SCH_BUS_ENTRY_BASE::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+void SCH_BUS_ENTRY_BASE::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
 {
     aPoints.push_back( m_pos );
     aPoints.push_back( m_End() );
 
=== modified file 'eeschema/sch_bus_entry.h'
--- eeschema/sch_bus_entry.h	2013-11-24 17:48:14 +0000
+++ eeschema/sch_bus_entry.h	2013-12-04 08:51:30 +0000
@@ -96,7 +96,7 @@
 
     bool IsConnectable() const { return true; }
 
-    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
 
     BITMAP_DEF GetMenuImage() const { return  add_entry_xpm; }
 
 
=== modified file 'eeschema/sch_component.cpp'
--- eeschema/sch_component.cpp	2013-11-26 09:15:20 +0000
+++ eeschema/sch_component.cpp	2013-12-04 08:51:30 +0000
@@ -1605,7 +1605,7 @@
 }
 
 
-void SCH_COMPONENT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+void SCH_COMPONENT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
 {
     LIB_PIN* pin;
     LIB_COMPONENT* component = CMP_LIBRARY::FindLibraryComponent( m_ChipName );
@@ -1876,7 +1876,7 @@
 
 bool SCH_COMPONENT::doIsConnected( const wxPoint& aPosition ) const
 {
-    vector< wxPoint > pts;
+    std::vector< wxPoint > pts;
 
     GetConnectionPoints( pts );
 
 
=== modified file 'eeschema/sch_component.h'
--- eeschema/sch_component.h	2013-11-24 17:48:14 +0000
+++ eeschema/sch_component.h	2013-12-04 08:51:30 +0000
@@ -357,7 +357,7 @@
 
     bool Matches( wxFindReplaceData& aSearchData, void* aAuxData, wxPoint* aFindLocation );
 
-    void GetEndPoints( std::vector <DANGLING_END_ITEM>& aItemList );
+    void GetEndPoints( std::vector<DANGLING_END_ITEM>& aItemList );
 
     wxPoint GetPinPhysicalPosition( LIB_PIN* Pin );
 
@@ -372,7 +372,7 @@
      */
     bool IsInNetlist() const;
 
-    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+    void GetConnectionPoints( std::vector<wxPoint>& aPoints ) const;
 
     SEARCH_RESULT Visit( INSPECTOR* inspector, const void* testData,
                                  const KICAD_T scanTypes[] );
 
=== modified file 'eeschema/sch_junction.cpp'
--- eeschema/sch_junction.cpp	2013-11-24 17:48:14 +0000
+++ eeschema/sch_junction.cpp	2013-12-04 08:51:30 +0000
@@ -168,7 +168,7 @@
 }
 
 
-void SCH_JUNCTION::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+void SCH_JUNCTION::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
 {
     aPoints.push_back( m_pos );
 }
 
=== modified file 'eeschema/sch_junction.h'
--- eeschema/sch_junction.h	2013-11-24 17:48:14 +0000
+++ eeschema/sch_junction.h	2013-12-04 08:51:30 +0000
@@ -81,7 +81,7 @@
 
     bool IsConnectable() const { return true; }
 
-    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
 
     wxString GetSelectMenuText() const { return wxString( _( "Junction" ) ); }
 
 
=== modified file 'eeschema/sch_line.cpp'
--- eeschema/sch_line.cpp	2013-11-24 17:48:14 +0000
+++ eeschema/sch_line.cpp	2013-12-04 08:51:30 +0000
@@ -461,7 +461,7 @@
 }
 
 
-void SCH_LINE::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+void SCH_LINE::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
 {
     aPoints.push_back( m_start );
     aPoints.push_back( m_end );
 
=== modified file 'eeschema/sch_line.h'
--- eeschema/sch_line.h	2013-11-24 17:48:14 +0000
+++ eeschema/sch_line.h	2013-12-04 08:51:30 +0000
@@ -113,9 +113,9 @@
      */
     bool MergeOverlap( SCH_LINE* aLine );
 
-    void GetEndPoints( vector <DANGLING_END_ITEM>& aItemList );
+    void GetEndPoints( std::vector<DANGLING_END_ITEM>& aItemList );
 
-    bool IsDanglingStateChanged( vector< DANGLING_END_ITEM >& aItemList );
+    bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList );
 
     bool IsDangling() const { return m_startIsDangling || m_endIsDangling; }
 
@@ -123,7 +123,7 @@
 
     bool IsConnectable() const;
 
-    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+    void GetConnectionPoints(std::vector< wxPoint >& aPoints ) const;
 
     wxString GetSelectMenuText() const;
 
 
=== modified file 'eeschema/sch_no_connect.cpp'
--- eeschema/sch_no_connect.cpp	2013-11-24 17:48:14 +0000
+++ eeschema/sch_no_connect.cpp	2013-12-04 08:51:30 +0000
@@ -182,7 +182,7 @@
 }
 
 
-void SCH_NO_CONNECT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+void SCH_NO_CONNECT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
 {
     aPoints.push_back( m_pos );
 }
 
=== modified file 'eeschema/sch_no_connect.h'
--- eeschema/sch_no_connect.h	2013-11-24 17:48:14 +0000
+++ eeschema/sch_no_connect.h	2013-12-04 08:51:30 +0000
@@ -81,7 +81,7 @@
 
     bool IsConnectable() const { return true; }
 
-    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
 
     wxString GetSelectMenuText() const { return wxString( _( "No Connect" ) ); }
 
 
=== modified file 'eeschema/sch_sheet.cpp'
--- eeschema/sch_sheet.cpp	2013-11-24 17:48:14 +0000
+++ eeschema/sch_sheet.cpp	2013-12-04 08:51:30 +0000
@@ -1000,7 +1000,7 @@
 }
 
 
-void SCH_SHEET::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+void SCH_SHEET::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
 {
     for( size_t i = 0; i < GetPins().size(); i++ )
         aPoints.push_back( GetPins()[i].GetPosition() );
 
=== modified file 'eeschema/sch_sheet.h'
--- eeschema/sch_sheet.h	2013-11-24 17:48:14 +0000
+++ eeschema/sch_sheet.h	2013-12-04 08:51:30 +0000
@@ -533,7 +533,7 @@
 
     bool IsConnectable() const { return true; }
 
-    void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+    void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
 
     SEARCH_RESULT Visit( INSPECTOR* inspector, const void* testData,
                                  const KICAD_T scanTypes[] );
 
=== modified file 'eeschema/sch_text.cpp'
--- eeschema/sch_text.cpp	2013-11-29 08:13:43 +0000
+++ eeschema/sch_text.cpp	2013-12-04 08:51:30 +0000
@@ -564,7 +564,7 @@
 }
 
 
-void SCH_TEXT::GetConnectionPoints( vector< wxPoint >& aPoints ) const
+void SCH_TEXT::GetConnectionPoints( std::vector< wxPoint >& aPoints ) const
 {
     // Normal text labels do not have connection points.  All others do.
     if( Type() == SCH_TEXT_T )
 
=== modified file 'eeschema/sch_text.h'
--- eeschema/sch_text.h	2013-11-24 17:48:14 +0000
+++ eeschema/sch_text.h	2013-12-04 08:51:30 +0000
@@ -189,7 +189,7 @@
 
     virtual bool IsSelectStateChanged( const wxRect& aRect );
 
-    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const;
+    virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const;
 
     virtual bool CanIncrementLabel() const { return true; }
 
 
=== modified file 'include/sch_item_struct.h'
--- include/sch_item_struct.h	2013-10-27 18:21:53 +0000
+++ include/sch_item_struct.h	2013-12-04 08:51:30 +0000
@@ -34,9 +34,6 @@
 #include <class_base_screen.h>
 #include <general.h>
 
-using namespace std;
-
-
 class SCH_ITEM;
 class SCH_SHEET_PATH;
 class LINE_READER;
@@ -49,7 +46,7 @@
 
 typedef boost::ptr_vector< SCH_ITEM > SCH_ITEMS;
 typedef SCH_ITEMS::iterator SCH_ITEMS_ITR;
-typedef vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
+typedef std::vector< SCH_ITEMS_ITR > SCH_ITEMS_ITRS;
 
 
 #define FMT_IU          SCH_ITEM::FormatInternalUnits
@@ -228,7 +225,7 @@
      *
      * @param aItemList - List of DANGLING_END_ITEMS to add to.
      */
-    virtual void GetEndPoints( vector< DANGLING_END_ITEM >& aItemList ) {}
+    virtual void GetEndPoints( std::vector< DANGLING_END_ITEM >& aItemList ) {}
 
     /**
      * Function IsDanglingStateChanged
@@ -243,7 +240,7 @@
      * @param aItemList - List of items to test item against.
      * @return True if the dangling state has changed from it's current setting.
      */
-    virtual bool IsDanglingStateChanged( vector< DANGLING_END_ITEM >& aItemList ) { return false; }
+    virtual bool IsDanglingStateChanged( std::vector< DANGLING_END_ITEM >& aItemList ) { return false; }
 
     virtual bool IsDangling() const { return false; }
 
@@ -273,7 +270,7 @@
      *
      * @param aPoints List of connection points to add to.
      */
-    virtual void GetConnectionPoints( vector< wxPoint >& aPoints ) const { }
+    virtual void GetConnectionPoints( std::vector< wxPoint >& aPoints ) const { }
 
     /**
      * Function ClearConnections
 
=== modified file 'include/tool/examples/coroutine_example.cpp'
--- include/tool/examples/coroutine_example.cpp	2013-10-14 14:13:35 +0000
+++ include/tool/examples/coroutine_example.cpp	2013-12-04 08:51:30 +0000
@@ -3,8 +3,6 @@
 
 #include <tool/coroutine.h>
 
-using namespace std;
-
 typedef COROUTINE<int, int> MyCoroutine;
 
 class MyClass
 
=== modified file 'include/tool/examples/delegate_example.cpp'
--- include/tool/examples/delegate_example.cpp	2013-10-14 14:13:35 +0000
+++ include/tool/examples/delegate_example.cpp	2013-12-04 08:51:30 +0000
@@ -3,8 +3,6 @@
 
 #include <tool/delegate.h>
 
-using namespace std;
-
 class MyClass
 {
 public:
 
=== modified file 'kicad/dialogs/dialog_template_selector.h'
--- kicad/dialogs/dialog_template_selector.h	2013-06-13 16:09:35 +0000
+++ kicad/dialogs/dialog_template_selector.h	2013-12-04 08:51:30 +0000
@@ -79,7 +79,7 @@
 class DIALOG_TEMPLATE_SELECTOR : public DIALOG_TEMPLATE_SELECTOR_BASE
 {
 protected:
-    vector<TEMPLATE_SELECTION_PANEL*> m_panels;
+    std::vector<TEMPLATE_SELECTION_PANEL*> m_panels;
     void AddTemplate( int aPage, PROJECT_TEMPLATE* aTemplate );
     TEMPLATE_WIDGET* m_selectedWidget;
 
 
=== modified file 'kicad/project_template.cpp'
--- kicad/project_template.cpp	2013-05-26 04:36:44 +0000
+++ kicad/project_template.cpp	2013-12-04 08:51:30 +0000
@@ -33,8 +33,6 @@
 #include <wx/txtstrm.h>
 #include <wx/wfstream.h>
 
-using namespace std;
-
 #define SEP()   wxFileName::GetPathSeparator()
 
 
@@ -71,9 +69,9 @@
     metaIcon = new wxBitmap( templateMetaIconFile.GetFullPath(), wxBITMAP_TYPE_PNG );
 }
 
-vector<wxFileName> PROJECT_TEMPLATE::GetFileList()
+std::vector<wxFileName> PROJECT_TEMPLATE::GetFileList()
 {
-    vector<wxFileName> files;
+    std::vector<wxFileName> files;
     wxString f = templateBasePath.GetPath();
     wxArrayString allfiles;
     wxFileName p;
@@ -122,8 +120,8 @@
 {
     bool result = true;
 
-    vector<wxFileName> srcFiles = GetFileList();
-    vector<wxFileName> dstFiles;
+    std::vector<wxFileName> srcFiles = GetFileList();
+    std::vector<wxFileName> dstFiles;
 
     for( size_t i=0; i < srcFiles.size(); i++ )
     {
 
=== modified file 'kicad/project_template.h'
--- kicad/project_template.h	2013-06-13 16:09:35 +0000
+++ kicad/project_template.h	2013-12-04 08:51:30 +0000
@@ -110,9 +110,6 @@
 #include <wx/image.h>
 #include <wx/filename.h>
 
-using namespace std;
-
-
 /**
  * @brief A directory which contains information about the project template and does not get
  * copied. This define is the default filename for this directory
@@ -200,7 +197,7 @@
      * @brief Get a vector list of filenames for the template. The files are the source files,
      * and have not yet been through any renaming
      */
-    vector<wxFileName> GetFileList();
+    std::vector<wxFileName> GetFileList();
 };
 
 #endif
 
=== modified file 'new/sch_dir_lib_source.cpp'
--- new/sch_dir_lib_source.cpp	2011-11-04 15:53:37 +0000
+++ new/sch_dir_lib_source.cpp	2013-12-04 08:51:30 +0000
@@ -52,9 +52,6 @@
 #include <errno.h>
 #include <assert.h>
 
-#include <vector>
-using namespace std;
-
 #include <sch_dir_lib_source.h>
 using namespace SCH;
 
 
=== modified file 'new/sch_lib_table.cpp'
--- new/sch_lib_table.cpp	2012-11-15 16:04:10 +0000
+++ new/sch_lib_table.cpp	2013-12-04 08:51:30 +0000
@@ -31,7 +31,6 @@
 #include <sch_dir_lib_source.h>
 
 
-//using namespace std;    // screws up Doxygen
 using namespace SCH;
 using namespace LT;         // tokens, enum T for LIB_TABLE
 
 
=== modified file 'pcbnew/eagle_plugin.cpp'
--- pcbnew/eagle_plugin.cpp	2013-11-29 18:29:41 +0000
+++ pcbnew/eagle_plugin.cpp	2013-12-04 08:51:30 +0000
@@ -77,7 +77,6 @@
 #include <class_pcb_text.h>
 
 using namespace boost::property_tree;
-using namespace std;
 
 typedef EAGLE_PLUGIN::BIU                   BIU;
 typedef PTREE::const_assoc_iterator         CA_ITER;
@@ -87,7 +86,7 @@
 typedef MODULE_MAP::iterator                MODULE_ITER;
 typedef MODULE_MAP::const_iterator          MODULE_CITER;
 
-typedef boost::optional<string>             opt_string;
+typedef boost::optional<std::string>        opt_string;
 typedef boost::optional<int>                opt_int;
 typedef boost::optional<double>             opt_double;
 typedef boost::optional<bool>               opt_bool;
@@ -151,11 +150,11 @@
     }
 
     /// return the contents of the XPATH as a single string
-    string Contents()
+    std::string Contents()
     {
         typedef std::vector<TRIPLET>::const_iterator CITER;
 
-        string ret;
+        std::string ret;
 
         for( CITER it = p.begin();  it != p.end();  ++it )
         {
@@ -187,7 +186,7 @@
 static opt_bool parseOptionalBool( CPTREE& attribs, const char* aName )
 {
     opt_bool    ret;
-    opt_string  stemp = attribs.get_optional<string>( aName );
+    opt_string  stemp = attribs.get_optional<std::string>( aName );
 
     if( stemp )
         ret = !stemp->compare( "yes" );
@@ -227,7 +226,7 @@
 
 /// parse an Eagle XML "rot" field.  Unfortunately the DTD seems not to explain
 /// this format very well.  [S][M]R<degrees>.   Examples: "R90", "MR180", "SR180"
-static EROT erot( const string& aRot )
+static EROT erot( const std::string& aRot )
 {
     EROT    rot;
 
@@ -245,7 +244,7 @@
 static opt_erot parseOptionalEROT( CPTREE& attribs )
 {
     opt_erot    ret;
-    opt_string  stemp = attribs.get_optional<string>( "rot" );
+    opt_string  stemp = attribs.get_optional<std::string>( "rot" );
     if( stemp )
         ret = erot( *stemp );
     return ret;
@@ -316,7 +315,7 @@
 
     curve = attribs.get_optional<double>( "curve" );
 
-    opt_string s = attribs.get_optional<string>( "style" );
+    opt_string s = attribs.get_optional<std::string>( "style" );
     if( s )
     {
         if( !s->compare( "continuous" ) )
@@ -329,7 +328,7 @@
             style = EWIRE::DASHDOT;
     }
 
-    s = attribs.get_optional<string>( "cap" );
+    s = attribs.get_optional<std::string>( "cap" );
     if( s )
     {
         if( !s->compare( "round" ) )
@@ -374,13 +373,13 @@
     x     = attribs.get<double>( "x" );
     y     = attribs.get<double>( "y" );
 
-    string ext = attribs.get<string>( "extent" );
+    std::string ext = attribs.get<std::string>( "extent" );
 
     sscanf( ext.c_str(), "%u-%u", &layer_front_most, &layer_back_most );
 
     drill = attribs.get<double>( "drill" );
     diam  = attribs.get_optional<double>( "diameter" );
-    shape = attribs.get_optional<string>( "shape" );
+    shape = attribs.get_optional<std::string>( "shape" );
 }
 
 
@@ -460,7 +459,7 @@
 /// Eagle "attribute" XML element, no foolin'.
 struct EATTR
 {
-    string      name;
+    std::string name;
     opt_string  value;
     opt_double  x;
     opt_double  y;
@@ -508,8 +507,8 @@
         >
     */
 
-    name    = attribs.get<string>( "name" );                    // #REQUIRED
-    value   = attribs.get_optional<string>( "value" );
+    name    = attribs.get<std::string>( "name" );                    // #REQUIRED
+    value   = attribs.get_optional<std::string>( "value" );
 
     x       = attribs.get_optional<double>( "x" );
     y       = attribs.get_optional<double>( "y" );
@@ -522,7 +521,7 @@
     ratio   = attribs.get_optional<double>( "ratio" );
     rot     = parseOptionalEROT( attribs );
 
-    opt_string stemp = attribs.get_optional<string>( "display" );
+    opt_string stemp = attribs.get_optional<std::string>( "display" );
     if( stemp )
     {
         // (off | value | name | both)
@@ -541,7 +540,7 @@
 /// Eagle text element
 struct ETEXT
 {
-    string      text;
+    std::string text;
     double      x;
     double      y;
     double      size;
@@ -593,11 +592,11 @@
     size   = attribs.get<double>( "size" );
     layer  = attribs.get<int>( "layer" );
 
-    font   = attribs.get_optional<string>( "font" );
+    font   = attribs.get_optional<std::string>( "font" );
     ratio  = attribs.get_optional<double>( "ratio" );
     rot    = parseOptionalEROT( attribs );
 
-    opt_string stemp = attribs.get_optional<string>( "align" );
+    opt_string stemp = attribs.get_optional<std::string>( "align" );
     if( stemp )
     {
         // (bottom-left | bottom-center | bottom-right | center-left |
@@ -627,7 +626,7 @@
 /// Eagle thru hol pad
 struct EPAD
 {
-    string      name;
+    std::string name;
     double      x;
     double      y;
     double      drill;
@@ -671,14 +670,14 @@
     */
 
     // #REQUIRED says DTD, throw exception if not found
-    name  = attribs.get<string>( "name" );
+    name  = attribs.get<std::string>( "name" );
     x     = attribs.get<double>( "x" );
     y     = attribs.get<double>( "y" );
     drill = attribs.get<double>( "drill" );
 
     diameter = attribs.get_optional<double>( "diameter" );
 
-    opt_string s = attribs.get_optional<string>( "shape" );
+    opt_string s = attribs.get_optional<std::string>( "shape" );
     if( s )
     {
         // (square | round | octagon | long | offset)
@@ -704,7 +703,7 @@
 /// Eagle SMD pad
 struct ESMD
 {
-    string      name;
+    std::string name;
     double      x;
     double      y;
     double      dx;
@@ -740,7 +739,7 @@
     */
 
     // DTD #REQUIRED, throw exception if not found
-    name  = attribs.get<string>( "name" );
+    name  = attribs.get<std::string>( "name" );
     x     = attribs.get<double>( "x" );
     y     = attribs.get<double>( "y" );
     dx    = attribs.get<double>( "dx" );
@@ -824,7 +823,7 @@
     layer   = attribs.get<int>( "layer" );
     spacing = attribs.get_optional<double>( "spacing" );
 
-    opt_string s = attribs.get_optional<string>( "pour" );
+    opt_string s = attribs.get_optional<std::string>( "pour" );
     if( s )
     {
         // (solid | hatch | cutout)
@@ -874,10 +873,10 @@
 /// Eagle element element
 struct EELEMENT
 {
-    string      name;
-    string      library;
-    string      package;
-    string      value;
+    std::string name;
+    std::string library;
+    std::string package;
+    std::string value;
     double      x;
     double      y;
     opt_bool    locked;
@@ -907,11 +906,11 @@
     */
 
     // #REQUIRED
-    name    = attribs.get<string>( "name" );
-    library = attribs.get<string>( "library" );
-    value   = attribs.get<string>( "value" );
+    name    = attribs.get<std::string>( "name" );
+    library = attribs.get<std::string>( "library" );
+    value   = attribs.get<std::string>( "value" );
 
-    package = attribs.get<string>( "package" );
+    package = attribs.get<std::string>( "package" );
     ReplaceIllegalFileNameChars( &package );
 
     x = attribs.get<double>( "x" );
@@ -927,7 +926,7 @@
 struct ELAYER
 {
     int         number;
-    string      name;
+    std::string name;
     int         color;
     int         fill;
     opt_bool    visible;
@@ -953,7 +952,7 @@
     */
 
     number = attribs.get<int>( "number" );
-    name   = attribs.get<string>( "name" );
+    name   = attribs.get<std::string>( "name" );
     color  = attribs.get<int>( "color" );
     visible = parseOptionalBool( attribs, "visible" );
     active  = parseOptionalBool( attribs, "active" );
@@ -962,7 +961,7 @@
 
 /// Parse an eagle distance which is either mm, or mils if there is "mil" suffix.
 /// Return is in BIU.
-static double parseEagle( const string& aDistance )
+static double parseEagle( const std::string& aDistance )
 {
     double ret = strtod( aDistance.c_str(), NULL );
     if( aDistance.npos != aDistance.find( "mil" ) )
@@ -1019,7 +1018,7 @@
 
         CPTREE& attribs = it->second.get_child( "<xmlattr>" );
 
-        const string& name = attribs.get<string>( "name" );
+        const std::string& name = attribs.get<std::string>( "name" );
 
         if( name == "psElongationLong" )
             psElongationLong = attribs.get<int>( "value" );
@@ -1028,28 +1027,28 @@
         else if( name == "rvPadTop" )
             rvPadTop = attribs.get<double>( "value" );
         else if( name == "rlMinPadTop" )
-            rlMinPadTop = parseEagle( attribs.get<string>( "value" ) );
+            rlMinPadTop = parseEagle( attribs.get<std::string>( "value" ) );
         else if( name == "rlMaxPadTop" )
-            rlMaxPadTop = parseEagle( attribs.get<string>( "value" ) );
+            rlMaxPadTop = parseEagle( attribs.get<std::string>( "value" ) );
 
         else if( name == "rvViaOuter" )
             rvViaOuter = attribs.get<double>( "value" );
         else if( name == "rlMinViaOuter" )
-            rlMinViaOuter = parseEagle( attribs.get<string>( "value" ) );
+            rlMinViaOuter = parseEagle( attribs.get<std::string>( "value" ) );
         else if( name == "rlMaxViaOuter" )
-            rlMaxViaOuter = parseEagle( attribs.get<string>( "value" ) );
+            rlMaxViaOuter = parseEagle( attribs.get<std::string>( "value" ) );
         else if( name == "mdWireWire" )
-            mdWireWire = parseEagle( attribs.get<string>( "value" ) );
+            mdWireWire = parseEagle( attribs.get<std::string>( "value" ) );
     }
 }
 
 
 /// Assemble a two part key as a simple concatonation of aFirst and aSecond parts,
 /// using a separator.
-static inline string makeKey( const string& aFirst, const string& aSecond )
+static inline std::string makeKey( const std::string& aFirst,
+                                   const std::string& aSecond )
 {
-    string key = aFirst + '\x02' +  aSecond;
-    return key;
+    return (aFirst + '\x02' +  aSecond);
 }
 
 
@@ -1119,14 +1118,14 @@
         m_board->SetFileName( aFileName );
 
     // delete on exception, iff I own m_board, according to aAppendToMe
-    auto_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board );
+    std::auto_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board );
 
     try
     {
         // 8 bit "filename" should be encoded according to disk filename encoding,
         // (maybe this is current locale, maybe not, its a filesystem issue),
         // and is not necessarily utf8.
-        string filename = (const char*) aFileName.char_str( wxConvFile );
+        std::string filename = (const char*) aFileName.char_str( wxConvFile );
 
         read_xml( filename, doc, xml_parser::trim_whitespace | xml_parser::no_comments );
 
@@ -1171,7 +1170,7 @@
     // so one catch should be OK for all errors.
     catch( ptree_error pte )
     {
-        string errmsg = pte.what();
+        std::string errmsg = pte.what();
 
         errmsg += " @\n";
         errmsg += m_xpath->Contents();
@@ -1571,7 +1570,7 @@
 }
 
 
-void EAGLE_PLUGIN::loadLibrary( CPTREE& aLib, const string* aLibName )
+void EAGLE_PLUGIN::loadLibrary( CPTREE& aLib, const std::string* aLibName )
 {
     m_xpath->push( "packages" );
 
@@ -1586,9 +1585,9 @@
     {
         m_xpath->push( "package", "name" );
 
-        const string& pack_ref = package->second.get<string>( "<xmlattr>.name" );
+        const std::string& pack_ref = package->second.get<std::string>( "<xmlattr>.name" );
 
-        string pack_name( pack_ref );
+        std::string pack_name( pack_ref );
 
         ReplaceIllegalFileNameChars( &pack_name );
 
@@ -1601,7 +1600,7 @@
 #endif
         m_xpath->Value( pack_name.c_str() );
 
-        string key = aLibName ? makeKey( *aLibName, pack_name ) : pack_name;
+        std::string key = aLibName ? makeKey( *aLibName, pack_name ) : pack_name;
 
         MODULE* m = makeModule( package->second, pack_name );
 
@@ -1636,7 +1635,7 @@
 
     for( CITER library = aLibs.begin();  library != aLibs.end();  ++library )
     {
-        const string& lib_name = library->second.get<string>( "<xmlattr>.name" );
+        const std::string& lib_name = library->second.get<std::string>( "<xmlattr>.name" );
 
         m_xpath->Value( lib_name.c_str() );
 
@@ -1667,7 +1666,7 @@
 
         m_xpath->Value( e.name.c_str() );
 
-        string key = makeKey( e.library, e.package );
+        std::string key = makeKey( e.library, e.package );
 
         MODULE_CITER mi = m_templates.find( key );
 
@@ -1693,7 +1692,7 @@
         // update the nets within the pads of the clone
         for( D_PAD* pad = m->Pads();  pad;  pad = pad->Next() )
         {
-            string key  = makeKey( e.name, TO_UTF8( pad->GetPadName() ) );
+            std::string key  = makeKey( e.name, TO_UTF8( pad->GetPadName() ) );
 
             NET_MAP_CITER ni = m_pads_to_nets.find( key );
             if( ni != m_pads_to_nets.end() )
@@ -1881,13 +1880,13 @@
 }
 
 
-MODULE* EAGLE_PLUGIN::makeModule( CPTREE& aPackage, const string& aPkgName ) const
+MODULE* EAGLE_PLUGIN::makeModule( CPTREE& aPackage, const std::string& aPkgName ) const
 {
     std::auto_ptr<MODULE>   m( new MODULE( NULL ) );
 
     m->SetFPID( FPID( aPkgName ) );
 
-    opt_string description = aPackage.get_optional<string>( "description" );
+    opt_string description = aPackage.get_optional<std::string>( "description" );
     if( description )
         m->SetDescription( FROM_UTF8( description->c_str() ) );
 
@@ -2354,7 +2353,7 @@
 
         zones.clear();
 
-        const string& nname = net->second.get<string>( "<xmlattr>.name" );
+        const std::string& nname = net->second.get<std::string>( "<xmlattr>.name" );
         wxString netName = FROM_UTF8( nname.c_str() );
 
         m_xpath->Value( nname.c_str() );
@@ -2469,10 +2468,10 @@
                 // <contactref element="RN1" pad="7"/>
                 CPTREE& attribs = it->second.get_child( "<xmlattr>" );
 
-                const string& reference = attribs.get<string>( "element" );
-                const string& pad       = attribs.get<string>( "pad" );
+                const std::string& reference = attribs.get<std::string>( "element" );
+                const std::string& pad       = attribs.get<std::string>( "pad" );
 
-                string key = makeKey( reference, pad ) ;
+                std::string key = makeKey( reference, pad ) ;
 
                 // D(printf( "adding refname:'%s' pad:'%s' netcode:%d netname:'%s'\n", reference.c_str(), pad.c_str(), netCode, nname.c_str() );)
 
@@ -2714,8 +2713,8 @@
 {
     if( m_props )
     {
-        string page_width;
-        string page_height;
+        std::string page_width;
+        std::string page_height;
 
         if( m_props->Value( "page_width",  &page_width ) &&
             m_props->Value( "page_height", &page_height ) )
@@ -2785,7 +2784,7 @@
             // 8 bit "filename" should be encoded according to disk filename encoding,
             // (maybe this is current locale, maybe not, its a filesystem issue),
             // and is not necessarily utf8.
-            string filename = (const char*) aLibPath.char_str( wxConvFile );
+            std::string filename = (const char*) aLibPath.char_str( wxConvFile );
 
             read_xml( filename, doc, xml_parser::trim_whitespace | xml_parser::no_comments );
 
@@ -2816,7 +2815,7 @@
     // so one catch should be OK for all errors.
     catch( ptree_error pte )
     {
-        string errmsg = pte.what();
+        std::string errmsg = pte.what();
 
         errmsg += " @\n";
         errmsg += m_xpath->Contents();
@@ -2847,7 +2846,7 @@
 
     cacheLib( aLibraryPath );
 
-    string key = TO_UTF8( aFootprintName );
+    std::string key = TO_UTF8( aFootprintName );
 
     MODULE_CITER mi = m_templates.find( key );
 
 
=== modified file 'pcbnew/github/github_plugin.cpp'
--- pcbnew/github/github_plugin.cpp	2013-12-03 18:37:21 +0000
+++ pcbnew/github/github_plugin.cpp	2013-12-04 08:51:30 +0000
@@ -63,15 +63,12 @@
 #include <macros.h>
 #include <fp_lib_table.h>       // ExpandSubstitutions()
 
-using namespace std;
-
-
 static const char* PRETTY_DIR = "allow_pretty_writing_to_this_dir";
 
 
-typedef boost::ptr_map<string, wxZipEntry>  MODULE_MAP;
-typedef MODULE_MAP::iterator                MODULE_ITER;
-typedef MODULE_MAP::const_iterator          MODULE_CITER;
+typedef boost::ptr_map<std::string, wxZipEntry> MODULE_MAP;
+typedef MODULE_MAP::iterator                    MODULE_ITER;
+typedef MODULE_MAP::const_iterator              MODULE_CITER;
 
 
 /**
@@ -166,7 +163,7 @@
         }
     }
 
-    string fp_name = TO_UTF8( aFootprintName );
+    std::string fp_name = TO_UTF8( aFootprintName );
 
     MODULE_CITER it = m_gh_cache->find( fp_name );
 
@@ -233,7 +230,7 @@
         // IsFootprintLibWritable() to determine if calling FootprintSave() is
         // even legal, so I spend no time on internationalization here:
 
-        string msg = StrPrintf( "Github library\n'%s'\nis only writable if you set option '%s' in Library Tables dialog.",
+        std::string msg = StrPrintf( "Github library\n'%s'\nis only writable if you set option '%s' in Library Tables dialog.",
                 (const char*) TO_UTF8( aLibraryPath ), PRETTY_DIR );
 
         THROW_IO_ERROR( msg );
@@ -275,7 +272,7 @@
         // IsFootprintLibWritable() to determine if calling FootprintSave() is
         // even legal, so I spend no time on internationalization here:
 
-        string msg = StrPrintf( "Github library\n'%s'\nis only writable if you set option '%s' in Library Tables dialog.",
+        std::string msg = StrPrintf( "Github library\n'%s'\nis only writable if you set option '%s' in Library Tables dialog.",
                 (const char*) TO_UTF8( aLibraryPath ), PRETTY_DIR );
 
         THROW_IO_ERROR( msg );
@@ -356,7 +353,7 @@
 
         if( aProperties )
         {
-            string  pretty_dir;
+            std::string pretty_dir;
 
             if( aProperties->Value( PRETTY_DIR, &pretty_dir ) )
             {
@@ -409,7 +406,7 @@
 
             if( fn.GetExt() == kicad_mod )
             {
-                string fp_name = TO_UTF8( fn.GetName() );   // omit extension & path
+                std::string fp_name = TO_UTF8( fn.GetName() );   // omit extension & path
 
                 m_gh_cache->insert( fp_name, entry );
             }
@@ -420,7 +417,7 @@
 }
 
 
-bool GITHUB_PLUGIN::repoURL_zipURL( const wxString& aRepoURL, string* aZipURL )
+bool GITHUB_PLUGIN::repoURL_zipURL( const wxString& aRepoURL, std::string* aZipURL )
 {
     // e.g. "https://github.com/liftoff-sr/pretty_footprints"
     //D(printf("aRepoURL:%s\n", TO_UTF8( aRepoURL ) );)
@@ -460,7 +457,7 @@
 
 void GITHUB_PLUGIN::remote_get_zip( const wxString& aRepoURL ) throw( IO_ERROR )
 {
-    string  zip_url;
+    std::string zip_url;
 
     if( !repoURL_zipURL( aRepoURL, &zip_url ) )
     {
@@ -478,7 +475,7 @@
 
     try
     {
-        ostringstream os;
+        std::ostringstream os;
 
         h.open( zip_url );      // only one file, therefore do it synchronously.
         os << &h;
@@ -495,10 +492,8 @@
         // https "GET" has faild, report this to API caller.
         wxString fmt( _( "Cannot GET zip: '%s'\nfor lib-path: '%s'.\nWhat: '%s'" ) );
 
-        string msg = StrPrintf( TO_UTF8( fmt ),
-                zip_url.c_str(),
-                TO_UTF8( aRepoURL ),
-                e.what() );
+        std::string msg = StrPrintf( TO_UTF8( fmt ), zip_url.c_str(),
+                                     TO_UTF8( aRepoURL ), e.what() );
 
         THROW_IO_ERROR( msg );
     }
 
=== modified file 'pcbnew/gpcb_plugin.cpp'
--- pcbnew/gpcb_plugin.cpp	2013-09-25 19:17:06 +0000
+++ pcbnew/gpcb_plugin.cpp	2013-12-04 08:51:30 +0000
@@ -48,9 +48,6 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <memory.h>
 
-using namespace std;
-
-
 /**
  * Definition for enabling and disabling footprint library trace output.  See the
  * wxWidgets documentation on using the WXTRACE environment variable.
@@ -118,7 +115,7 @@
     wxFileName         m_file_name; ///< The the full file name and path of the footprint to cache.
     bool               m_writable;  ///< Writability status of the footprint file.
     wxDateTime         m_mod_time;  ///< The last file modified time stamp.
-    auto_ptr< MODULE > m_module;
+    std::auto_ptr<MODULE> m_module;
 
 public:
     GPCB_FPL_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName );
@@ -327,13 +324,13 @@
     // Old version unit = 1 mil, so conv_unit is 10 or 0.1
     #define NEW_GPCB_UNIT_CONV ( 0.01*IU_PER_MILS )
 
-    int                paramCnt;
-    double             conv_unit = NEW_GPCB_UNIT_CONV; // GPCB unit = 0.01 mils and Pcbnew 0.1
-    wxPoint            refPos( 0, 0 );
-    wxPoint            textPos;
-    wxString           msg;
-    wxArrayString      parameters;
-    auto_ptr< MODULE > module( new MODULE( NULL ) );
+    int                   paramCnt;
+    double                conv_unit = NEW_GPCB_UNIT_CONV; // GPCB unit = 0.01 mils and Pcbnew 0.1
+    wxPoint               refPos( 0, 0 );
+    wxPoint               textPos;
+    wxString              msg;
+    wxArrayString         parameters;
+    std::auto_ptr<MODULE> module( new MODULE( NULL ) );
 
 
     if( aLineReader->ReadLine() == NULL )
 
=== modified file 'pcbnew/kicad_plugin.cpp'
--- pcbnew/kicad_plugin.cpp	2013-11-28 16:40:23 +0000
+++ pcbnew/kicad_plugin.cpp	2013-12-04 08:51:30 +0000
@@ -52,9 +52,6 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <memory.h>
 
-using namespace std;
-
-
 #define FMTIU        BOARD_ITEM::FormatInternalUnits
 
 /**
@@ -78,7 +75,7 @@
     wxFileName              m_file_name; ///< The the full file name and path of the footprint to cache.
     bool                    m_writable;  ///< Writability status of the footprint file.
     wxDateTime              m_mod_time;  ///< The last file modified time stamp.
-    auto_ptr< MODULE >      m_module;
+    std::auto_ptr<MODULE>   m_module;
 
 public:
     FP_CACHE_ITEM( MODULE* aModule, const wxFileName& aFileName );
 
=== modified file 'pcbnew/legacy_plugin.cpp'
--- pcbnew/legacy_plugin.cpp	2013-11-29 18:29:41 +0000
+++ pcbnew/legacy_plugin.cpp	2013-12-04 08:51:30 +0000
@@ -147,9 +147,6 @@
 #endif
 
 
-using namespace std;    // auto_ptr
-
-
 static inline const char* ShowVertJustify( EDA_TEXT_VJUSTIFY_T vertical )
 {
     const char* rs;
@@ -244,9 +241,9 @@
         m_board->SetFileName( aFileName );
 
     // delete on exception, iff I own m_board, according to aAppendToMe
-    auto_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board );
+    std::auto_ptr<BOARD> deleter( aAppendToMe ? NULL : m_board );
 
-    FILE_LINE_READER    reader( aFileName );
+    FILE_LINE_READER reader( aFileName );
 
     m_reader = &reader;          // member function accessibility
 
@@ -276,7 +273,7 @@
 
         if( TESTLINE( "$MODULE" ) )
         {
-            auto_ptr<MODULE>    module( new MODULE( m_board ) );
+            std::auto_ptr<MODULE> module( new MODULE( m_board ) );
 
             FPID        fpid;
             std::string fpName = StrPurge( line + SZ( "$MODULE" ) );
@@ -1149,7 +1146,7 @@
 
 void LEGACY_PLUGIN::loadPAD( MODULE* aModule )
 {
-    auto_ptr<D_PAD> pad( new D_PAD( aModule ) );
+    std::auto_ptr<D_PAD> pad( new D_PAD( aModule ) );
     char*           line;
 
     while( ( line = READLINE( m_reader ) ) != NULL )
@@ -1401,7 +1398,7 @@
         THROW_IO_ERROR( m_error );
     }
 
-    auto_ptr<EDGE_MODULE> dwg( new EDGE_MODULE( aModule, shape ) );    // a drawing
+    std::auto_ptr<EDGE_MODULE> dwg( new EDGE_MODULE( aModule, shape ) );    // a drawing
 
     const char* data;
 
@@ -1696,8 +1693,8 @@
         $EndDRAWSEGMENT
     */
 
-    auto_ptr<DRAWSEGMENT>   dseg( new DRAWSEGMENT( m_board ) );
-    char*                   line;
+    std::auto_ptr<DRAWSEGMENT> dseg( new DRAWSEGMENT( m_board ) );
+    char* line;
 
     while( ( line = READLINE( m_reader ) ) != NULL )
     {
@@ -2095,7 +2092,7 @@
     // yet since that would bypass duplicate netclass name checking within the BOARD.
     // store it temporarily in an auto_ptr until successfully inserted into the BOARD
     // just before returning.
-    auto_ptr<NETCLASS> nc( new NETCLASS( m_board, wxEmptyString ) );
+    std::auto_ptr<NETCLASS> nc( new NETCLASS( m_board, wxEmptyString ) );
 
     while( ( line = READLINE( m_reader ) ) != NULL )
     {
@@ -2182,7 +2179,7 @@
 
 void LEGACY_PLUGIN::loadZONE_CONTAINER()
 {
-    auto_ptr<ZONE_CONTAINER> zc( new ZONE_CONTAINER( m_board ) );
+    std::auto_ptr<ZONE_CONTAINER> zc( new ZONE_CONTAINER( m_board ) );
 
     CPolyLine::HATCH_STYLE outline_hatch = CPolyLine::NO_HATCH;
     bool    sawCorner = false;
@@ -2446,8 +2443,8 @@
 
 void LEGACY_PLUGIN::loadDIMENSION()
 {
-    auto_ptr<DIMENSION> dim( new DIMENSION( m_board ) );
-    char*               line;
+    std::auto_ptr<DIMENSION> dim( new DIMENSION( m_board ) );
+    char* line;
 
     while( ( line = READLINE( m_reader ) ) != NULL )
     {
@@ -4031,9 +4028,9 @@
         // test first for the $MODULE, even before reading because of INDEX bug.
         if( TESTLINE( "$MODULE" ) )
         {
-            auto_ptr<MODULE>    module( new MODULE( m_owner->m_board ) );
+            std::auto_ptr<MODULE> module( new MODULE( m_owner->m_board ) );
 
-            std::string         footprintName = StrPurge( line + SZ( "$MODULE" ) );
+            std::string footprintName = StrPurge( line + SZ( "$MODULE" ) );
 
             // The footprint names in legacy libraries can contain the '/' and ':'
             // characters which will cause the FPID parser to choke.
 
=== modified file 'pcbnew/pcb_parser.cpp'
--- pcbnew/pcb_parser.cpp	2013-09-24 18:45:57 +0000
+++ pcbnew/pcb_parser.cpp	2013-12-04 08:51:30 +0000
@@ -51,9 +51,6 @@
 #include <pcb_parser.h>
 
 
-using namespace std;
-
-
 void PCB_PARSER::init()
 {
     m_layerIndices.clear();
@@ -263,7 +260,7 @@
 
     T token;
 
-    auto_ptr< S3D_MASTER > n3D( new S3D_MASTER( NULL ) );
+    std::auto_ptr< S3D_MASTER > n3D( new S3D_MASTER( NULL ) );
 
     NeedSYMBOLorNUMBER();
     n3D->m_Shape3DName = FromUTF8();
@@ -1084,7 +1081,7 @@
 
     T token;
 
-    auto_ptr<NETCLASS> nc( new NETCLASS( m_board, wxEmptyString ) );
+    std::auto_ptr<NETCLASS> nc( new NETCLASS( m_board, wxEmptyString ) );
 
     // Read netclass name (can be a name or just a number like track width)
     NeedSYMBOLorNUMBER();
@@ -1164,7 +1161,7 @@
 
     T token;
     wxPoint pt;
-    auto_ptr< DRAWSEGMENT > segment( new DRAWSEGMENT( NULL ) );
+    std::auto_ptr< DRAWSEGMENT > segment( new DRAWSEGMENT( NULL ) );
 
     switch( CurTok() )
     {
@@ -1325,7 +1322,7 @@
 
     T token;
 
-    auto_ptr< TEXTE_PCB > text( new TEXTE_PCB( m_board ) );
+    std::auto_ptr<TEXTE_PCB> text( new TEXTE_PCB( m_board ) );
     NeedSYMBOLorNUMBER();
 
     text->SetText( FromUTF8() );
@@ -1393,7 +1390,7 @@
 
     T token;
 
-    auto_ptr< DIMENSION > dimension( new DIMENSION( NULL ) );
+    std::auto_ptr<DIMENSION> dimension( new DIMENSION( NULL ) );
 
     dimension->SetValue( parseBoardUnits( "dimension value" ) );
     NeedLEFT();
@@ -1545,7 +1542,7 @@
     T        token;
     FPID     fpid;
 
-    auto_ptr< MODULE > module( new MODULE( m_board ) );
+    std::auto_ptr<MODULE> module( new MODULE( m_board ) );
 
     module->SetInitialComments( aInitialComments );
 
@@ -1773,7 +1770,7 @@
 
     T token = NextTok();
 
-    auto_ptr< TEXTE_MODULE > text( new TEXTE_MODULE( NULL ) );
+    std::auto_ptr<TEXTE_MODULE> text( new TEXTE_MODULE( NULL ) );
 
     switch( token )
     {
@@ -1858,7 +1855,7 @@
     wxPoint pt;
     T token;
 
-    auto_ptr< EDGE_MODULE > segment( new EDGE_MODULE( NULL ) );
+    std::auto_ptr< EDGE_MODULE > segment( new EDGE_MODULE( NULL ) );
 
     switch( CurTok() )
     {
@@ -2023,7 +2020,7 @@
 
     wxSize sz;
     wxPoint pt;
-    auto_ptr< D_PAD > pad( new D_PAD( NULL ) );
+    std::auto_ptr< D_PAD > pad( new D_PAD( NULL ) );
 
     NeedSYMBOLorNUMBER();
     pad->SetPadName( FromUTF8() );
@@ -2260,7 +2257,7 @@
     wxPoint pt;
     T token;
 
-    auto_ptr< TRACK > track( new TRACK( m_board ) );
+    std::auto_ptr< TRACK > track( new TRACK( m_board ) );
 
     for( token = NextTok();  token != T_RIGHT;  token = NextTok() )
     {
@@ -2322,7 +2319,7 @@
     wxPoint pt;
     T token;
 
-    auto_ptr< SEGVIA > via( new SEGVIA( m_board ) );
+    std::auto_ptr< SEGVIA > via( new SEGVIA( m_board ) );
 
     for( token = NextTok();  token != T_RIGHT;  token = NextTok() )
     {
@@ -2407,7 +2404,7 @@
     // bigger scope since each filled_polygon is concatenated in here
     CPOLYGONS_LIST pts;
 
-    auto_ptr< ZONE_CONTAINER > zone( new ZONE_CONTAINER( m_board ) );
+    std::auto_ptr< ZONE_CONTAINER > zone( new ZONE_CONTAINER( m_board ) );
 
     zone->SetPriority( 0 );
 
@@ -2721,8 +2718,7 @@
     wxPoint pt;
     T token;
 
-    auto_ptr< PCB_TARGET > target( new PCB_TARGET( NULL ) );
-
+    std::auto_ptr< PCB_TARGET > target( new PCB_TARGET( NULL ) );
 
     for( token = NextTok();  token != T_RIGHT;  token = NextTok() )
     {
 
=== modified file 'pcbnew/router/pns_line.cpp'
--- pcbnew/router/pns_line.cpp	2013-10-14 18:40:36 +0000
+++ pcbnew/router/pns_line.cpp	2013-12-04 08:51:30 +0000
@@ -29,7 +29,6 @@
 #include "pns_utils.h"
 #include "pns_router.h"
 
-using namespace std;
 using boost::optional;
 
 PNS_LINE* PNS_LINE::Clone() const
@@ -321,10 +320,10 @@
 
     SHAPE_LINE_CHAIN l_orig( m_line );
     SHAPE_LINE_CHAIN l_hull;
-    vector<bool> outside, on_edge, inside;
+    std::vector<bool> outside, on_edge, inside;
     SHAPE_LINE_CHAIN path;
 
-    vector<INTERSECTION> isects;
+    std::vector<INTERSECTION> isects;
 
     // don't calculate walkaround for empty lines
     if( m_line.PointCount() < 2 )
 
=== modified file 'pcbnew/router/pns_line_placer.cpp'
--- pcbnew/router/pns_line_placer.cpp	2013-10-14 18:40:36 +0000
+++ pcbnew/router/pns_line_placer.cpp	2013-12-04 08:51:30 +0000
@@ -18,7 +18,6 @@
  * with this program.  If not, see <http://www.gnu.or/licenses/>.
  */
 
-#include <vector>
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 
@@ -30,7 +29,6 @@
 #include "pns_shove.h"
 #include "pns_utils.h"
 
-using namespace std;
 using boost::optional;
 
 PNS_LINE_PLACER::PNS_LINE_PLACER( PNS_NODE* aWorld )
@@ -528,7 +526,7 @@
 
     const int TailLookbackSegments = 5;
 
-    int threshold = min( tail.PointCount(), TailLookbackSegments + 1 );
+    int threshold = std::min( tail.PointCount(), TailLookbackSegments + 1 );
 
     if( tail.SegmentCount() < 3 )
         return false;
 
=== modified file 'pcbnew/router/pns_node.cpp'
--- pcbnew/router/pns_node.cpp	2013-10-14 18:40:36 +0000
+++ pcbnew/router/pns_node.cpp	2013-12-04 08:51:30 +0000
@@ -37,8 +37,6 @@
 #include "pns_joint.h"
 #include "pns_index.h"
 
-using namespace std;
-
 using boost::unordered_set;
 using boost::unordered_map;
 
@@ -138,7 +136,7 @@
     if( isRoot() )
         return;
 
-    for( vector<PNS_NODE*>::iterator i = m_parent->m_children.begin();
+    for( std::vector<PNS_NODE*>::iterator i = m_parent->m_children.begin();
          i != m_parent->m_children.end(); ++i )
     {
         if( *i == this )
@@ -284,7 +282,7 @@
         VECTOR2I ip_first, ip_last;
         int dist_max = INT_MIN;
 
-        vector<SHAPE_LINE_CHAIN::INTERSECTION> isect_list;
+        std::vector<SHAPE_LINE_CHAIN::INTERSECTION> isect_list;
 
         int clearance = GetClearance( obs.item, &aLine );
 
@@ -564,7 +562,7 @@
 
 void PNS_NODE::removeLine( PNS_LINE* aLine )
 {
-    vector<PNS_SEGMENT*>* segRefs = aLine->GetLinkedSegments();
+    std::vector<PNS_SEGMENT*>* segRefs = aLine->GetLinkedSegments();
 
     if( !segRefs )
         return;
@@ -700,7 +698,7 @@
 }
 
 
-int PNS_NODE::FindLinesBetweenJoints( PNS_JOINT& a, PNS_JOINT& b, vector<PNS_LINE*>& aLines )
+int PNS_NODE::FindLinesBetweenJoints( PNS_JOINT& a, PNS_JOINT& b, std::vector<PNS_LINE*>& aLines )
 {
     BOOST_FOREACH( PNS_ITEM* item, a.GetLinkList() )
     {
@@ -763,7 +761,7 @@
     // try to find the joint in this node.
     JointMap::iterator f = m_joints.find( tag );
 
-    pair<JointMap::iterator, JointMap::iterator> range;
+    std::pair<JointMap::iterator, JointMap::iterator> range;
 
     // not found and we are not root? find in the root and copy results here.
     if( f == m_joints.end() && !isRoot() )
@@ -895,7 +893,7 @@
             printf( "Line: %s, net %d ", l->GetLine().Format().c_str(), l->GetNet() );
 
 
-        for( vector<PNS_SEGMENT*>::iterator j = seg_refs->begin(); j != seg_refs->end(); ++j )
+        for( std::vector<PNS_SEGMENT*>::iterator j = seg_refs->begin(); j != seg_refs->end(); ++j )
         {
             printf( "%s ", (*j)->GetSeg().A.Format().c_str() );
 
@@ -932,7 +930,7 @@
 void PNS_NODE::releaseChildren()
 {
     // copy the kids as the PNS_NODE destructor erases the item from the parent node.
-    vector<PNS_NODE*> kids = m_children;
+    std::vector<PNS_NODE*> kids = m_children;
 
     BOOST_FOREACH( PNS_NODE * node, kids ) {
         node->releaseChildren();
 
=== modified file 'pcbnew/router/pns_optimizer.cpp'
--- pcbnew/router/pns_optimizer.cpp	2013-10-14 18:40:36 +0000
+++ pcbnew/router/pns_optimizer.cpp	2013-12-04 08:51:30 +0000
@@ -28,8 +28,6 @@
 #include "pns_optimizer.h"
 #include "pns_utils.h"
 
-using namespace std;
-
 /**
  *
  *  Cost Estimator Methods
@@ -620,8 +618,8 @@
     const int ForbiddenAngles = DIRECTION_45::ANG_ACUTE | DIRECTION_45::ANG_RIGHT |
                                 DIRECTION_45::ANG_HALF_FULL | DIRECTION_45::ANG_UNDEFINED;
 
-    typedef pair<int, SHAPE_LINE_CHAIN> RtVariant;
-    vector<RtVariant> variants;
+    typedef std::pair<int, SHAPE_LINE_CHAIN> RtVariant;
+    std::vector<RtVariant> variants;
 
     BreakoutList breakouts = computeBreakouts( aLine->GetWidth(), aPad, true );
 
@@ -629,7 +627,7 @@
 
     // bool startDiagonal = DIRECTION_45( line.CSegment(0) ).IsDiagonal();
 
-    int p_end = min( aEndVertex, min( 3, line.PointCount() - 1 ) );
+    int p_end = std::min( aEndVertex, std::min( 3, line.PointCount() - 1 ) );
 
     for( int p = 1; p <= p_end; p++ )
     {
 
=== modified file 'pcbnew/router/pns_router.cpp'
--- pcbnew/router/pns_router.cpp	2013-10-14 18:40:36 +0000
+++ pcbnew/router/pns_router.cpp	2013-12-04 08:51:30 +0000
@@ -51,8 +51,6 @@
 #include <class_track.h>
 #include <layers_id_colors_and_visibility.h>
 
-using namespace std;
-
 // an ugly singleton for drawing debug items within the router context.
 // To be fixed sometime in the future.
 static PNS_ROUTER* theRouter;
@@ -89,7 +87,7 @@
     }
 
 private:
-    vector<int> m_clearanceCache;
+    std::vector<int> m_clearanceCache;
     int m_defaultClearance;
 };
 
@@ -232,7 +230,7 @@
 
 void PNS_ROUTER::SyncWorld()
 {
-    vector<D_PAD*> pads;
+    std::vector<D_PAD*> pads;
 
     if( !m_board )
     {
@@ -662,7 +660,7 @@
     PNS_NODE* cleaned = aNode->Branch();
     PNS_JOINT a, b;
 
-    vector<PNS_LINE*> lines;
+    std::vector<PNS_LINE*> lines;
 
     cleaned->FindLineEnds( ourLine, a, b );
     cleaned->FindLinesBetweenJoints( a, b, lines );
@@ -699,7 +697,7 @@
     if( aEndItem && m_currentNet >= 0 && m_currentNet == aEndItem->GetNet() )
         real_end = true;
 
-    int last = ( real_end || m_placingVia ) ? l.SegmentCount() : max( 1, l.SegmentCount() - 1 );
+    int last = ( real_end || m_placingVia ) ? l.SegmentCount() : std::max( 1, l.SegmentCount() - 1 );
 
     PNS_NODE* latest = m_placer->GetCurrentNode();
 
@@ -771,7 +769,7 @@
     if( m_placer->GetTail().GetCLine().SegmentCount() == 0 )
     {
         m_start_diagonal = !m_start_diagonal;
-        m_placer->SetInitialDirection( m_start_diagonal ? 
+        m_placer->SetInitialDirection( m_start_diagonal ?
 			DIRECTION_45( DIRECTION_45::NE ) : DIRECTION_45( DIRECTION_45::N ) );
     }
     else
 
=== modified file 'pcbnew/router/pns_shove.cpp'
--- pcbnew/router/pns_shove.cpp	2013-11-27 08:46:59 +0000
+++ pcbnew/router/pns_shove.cpp	2013-12-04 08:51:30 +0000
@@ -35,8 +35,6 @@
 
 #include <profile.h>
 
-using namespace std;
-
 PNS_SHOVE::PNS_SHOVE( PNS_NODE* aWorld )
 {
     m_root = aWorld;
@@ -280,9 +278,9 @@
 
 PNS_SHOVE::ShoveStatus PNS_SHOVE::ShoveLines( PNS_LINE* aCurrentHead )
 {
-    stack <PNS_LINE*> lineStack;
+    std::stack<PNS_LINE*> lineStack;
     PNS_NODE* node, * parent;
-    PNS_VIA*    headVia = NULL;
+    PNS_VIA* headVia = NULL;
     bool    fail    = false;
     int     iter    = 0;
 
 
=== modified file 'pcbnew/router/pns_walkaround.cpp'
--- pcbnew/router/pns_walkaround.cpp	2013-10-14 18:40:36 +0000
+++ pcbnew/router/pns_walkaround.cpp	2013-12-04 08:51:30 +0000
@@ -18,8 +18,6 @@
  * with this program.  If not, see <http://www.gnu.or/licenses/>.
  */
 
-#include <vector>
-
 #include <boost/foreach.hpp>
 #include <boost/optional.hpp>
 
@@ -29,8 +27,6 @@
 #include "pns_optimizer.h"
 #include "pns_utils.h"
 #include "pns_router.h"
-
-using namespace std;
 using boost::optional;
 
 void PNS_WALKAROUND::start( const PNS_LINE& aInitialPath )
 
=== modified file 'pcbnew/router/router_tool.cpp'
--- pcbnew/router/router_tool.cpp	2013-10-15 08:41:00 +0000
+++ pcbnew/router/router_tool.cpp	2013-12-04 08:51:30 +0000
@@ -39,7 +39,6 @@
 #include "trace.h"
 
 using namespace KIGFX;
-using namespace std;
 using boost::optional;
 
 static TOOL_ACTION ACT_AutoEndRoute( "AutoEndRoute", AS_CONTEXT, 'F' );
 
=== modified file 'polygon/SutherlandHodgmanClipPoly.h'
--- polygon/SutherlandHodgmanClipPoly.h	2009-02-20 14:31:16 +0000
+++ polygon/SutherlandHodgmanClipPoly.h	2013-12-04 08:51:30 +0000
@@ -31,7 +31,6 @@
 #include <vector>
 #include <functional>
 
-using namespace std;
 #ifndef _GDIPLUS_H
 
 // I designed this with GDI+ in mind. However, this particular code doesn't
@@ -80,9 +79,9 @@
 
 #endif // _GDIPLUS_H
 
-typedef vector<PointF>                 pointVector;
-typedef vector<PointF>::iterator       pointIterator;
-typedef vector<PointF>::const_iterator cpointIterator;
+typedef std::vector<PointF>                 pointVector;
+typedef std::vector<PointF>::iterator       pointIterator;
+typedef std::vector<PointF>::const_iterator cpointIterator;
 
 class SutherlandHodgman
 {
@@ -249,10 +248,10 @@
     // rectangles, we include the left and top boundaries, but not the right and bottom boundaries.
     // In other words: a vertex on the left boundary is considered to be inside, but a vertex
     // on the right boundary is considered to be outside.
-    typedef BoundaryVert < less<REAL> >               BoundaryRight;
-    typedef BoundaryHor < greater_equal<REAL> >       BoundaryTop;
-    typedef BoundaryVert < greater_equal<REAL> >      BoundaryLeft;
-    typedef BoundaryHor < less<REAL> >                BoundaryBottom;
+    typedef BoundaryVert<std::less<REAL> >               BoundaryRight;
+    typedef BoundaryHor<std::greater_equal<REAL> >       BoundaryTop;
+    typedef BoundaryVert<std::greater_equal<REAL> >      BoundaryLeft;
+    typedef BoundaryHor<std::less<REAL> >                BoundaryBottom;
 
     // Next typedefs define the four stages. First template parameter is the boundary,
     // second template parameter is the next stage.
 
=== modified file 'polygon/poly2tri/common/shapes.cc'
--- polygon/poly2tri/common/shapes.cc	2013-09-13 13:28:20 +0000
+++ polygon/poly2tri/common/shapes.cc	2013-12-04 08:51:30 +0000
@@ -1,4 +1,4 @@
-/* 
+/*
  * Poly2Tri Copyright (c) 2009-2010, Poly2Tri Contributors
  * http://code.google.com/p/poly2tri/
  *
@@ -96,14 +96,14 @@
     }
     else if( neighbors_[1] == triangle )
     {
-        neighbors_[1] = NULL;            
+        neighbors_[1] = NULL;
     }
     else
     {
         neighbors_[2] = NULL;
     }
 }
-    
+
 void Triangle::ClearNeighbors()
 {
   neighbors_[0] = NULL;
@@ -357,10 +357,9 @@
 
 void Triangle::DebugPrint()
 {
-  using namespace std;
-  cout << points_[0]->x << "," << points_[0]->y << " ";
-  cout << points_[1]->x << "," << points_[1]->y << " ";
-  cout << points_[2]->x << "," << points_[2]->y << endl;
+  std::cout << points_[0]->x << "," << points_[0]->y << " ";
+  std::cout << points_[1]->x << "," << points_[1]->y << " ";
+  std::cout << points_[2]->x << "," << points_[2]->y << "\n";
 }
 
 }
 
=== modified file 'scripting/kicad.i'
--- scripting/kicad.i	2013-11-01 15:29:50 +0000
+++ scripting/kicad.i	2013-12-04 08:51:30 +0000
@@ -63,8 +63,6 @@
 	#include <cstddef>
   	#include <vector>
 
-	using namespace std;
-
 	#include <class_title_block.h>
 	#include <class_colors_design_settings.h>
 	#include <class_marker_base.h>