From 53660ad91f8edf3cc232dcd24f5b53c65beed834 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Wed, 9 Jul 2014 15:10:32 +0200
Subject: [PATCH] Pad Enumeration tool support for SMD pads.

---
 pcbnew/tools/module_tools.cpp   | 4 +---
 pcbnew/tools/selection_tool.cpp | 6 +++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pcbnew/tools/module_tools.cpp b/pcbnew/tools/module_tools.cpp
index 447e249229..d3e5b85cf3 100644
--- a/pcbnew/tools/module_tools.cpp
+++ b/pcbnew/tools/module_tools.cpp
@@ -233,12 +233,10 @@ int MODULE_TOOLS::EnumeratePads( TOOL_EVENT& aEvent )
     guide.SetIgnoreMTextsMarkedNoShow( true );
     guide.SetIgnoreMTextsOnCopper( true );
     guide.SetIgnoreMTextsOnCmp( true );
-    guide.SetIgnoreModulesOnCu( true );
-    guide.SetIgnoreModulesOnCmp( true );
     guide.SetIgnoreModulesVals( true );
     guide.SetIgnoreModulesRefs( true );
 
-    // Create a set containing all pads (to avoid double adding to a list);
+    // Create a set containing all pads (to avoid double adding to a list)
     for( D_PAD* p = module->Pads(); p; p = p->Next() )
         allPads.insert( p );
 
diff --git a/pcbnew/tools/selection_tool.cpp b/pcbnew/tools/selection_tool.cpp
index 3ae883ed89..511564c216 100644
--- a/pcbnew/tools/selection_tool.cpp
+++ b/pcbnew/tools/selection_tool.cpp
@@ -47,8 +47,6 @@
 #include "bright_box.h"
 #include "common_actions.h"
 
-using boost::optional;
-
 SELECTION_TOOL::SELECTION_TOOL() :
         TOOL_INTERACTIVE( "pcbnew.InteractiveSelection" ),
         SelectedEvent( TC_MESSAGE, TA_ACTION, "pcbnew.InteractiveSelection.selected" ),
@@ -393,6 +391,7 @@ int SELECTION_TOOL::SingleSelection( TOOL_EVENT& aEvent )
     return 0;
 }
 
+
 int SELECTION_TOOL::ClearSelection( TOOL_EVENT& aEvent )
 {
     clearSelection();
@@ -401,6 +400,7 @@ int SELECTION_TOOL::ClearSelection( TOOL_EVENT& aEvent )
     return 0;
 }
 
+
 void SELECTION_TOOL::clearSelection()
 {
     if( m_selection.Empty() )
@@ -472,7 +472,7 @@ BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR* aCollector )
         }
         else if( evt->Action() == TA_CONTEXT_MENU_CHOICE )
         {
-            optional<int> id = evt->GetCommandId();
+            boost::optional<int> id = evt->GetCommandId();
 
             // User has selected an item, so this one will be returned
             if( id && ( *id >= 0 ) )