From 7cd437656783a3db31a092715a502860e4de9f61 Mon Sep 17 00:00:00 2001
From: Maciej Suminski <maciej.suminski@cern.ch>
Date: Mon, 14 Jul 2014 16:43:21 +0200
Subject: [PATCH] Refinement to commit #4993.

---
 include/dlist.h           | 3 ---
 pcbnew/scripting/pcbnew.i | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/include/dlist.h b/include/dlist.h
index d8fcd31b3b..2acf80271c 100644
--- a/include/dlist.h
+++ b/include/dlist.h
@@ -143,8 +143,6 @@ class DLIST : public DHEAD
 {
 public:
 
-// Without the following ifdef, SWIG appends methods from the templated class
-#ifndef SWIG
     /**
      * operator T*
      * is a casting operator that returns \a GetFirst(), a T*
@@ -156,7 +154,6 @@ public:
      * is a dereferencing operator that returns \a GetFirst(), a T*
      */
     T* operator -> () const { return GetFirst(); }
-#endif /* SWIG */
 
     /**
      * Function GetFirst
diff --git a/pcbnew/scripting/pcbnew.i b/pcbnew/scripting/pcbnew.i
index 71687e4980..e893a55859 100644
--- a/pcbnew/scripting/pcbnew.i
+++ b/pcbnew/scripting/pcbnew.i
@@ -47,6 +47,11 @@
 
 %rename(AddNative) *::Add;
 
+// fix method names conflicts
+%rename(AddChild) MODULE::Add;
+%rename(RemoveChild) MODULE::Remove;
+%rename(DeleteChild) MODULE::Delete;
+
 %exception {
     try{
         $action