From d2d3d5dd81089c95cbe75351bdd66faa646ce21f Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Thu, 22 Mar 2012 16:38:58 +0100
Subject: menu/control: renamed methods to avoid name collisions

---
 src/menu/control.cpp | 10 +++++-----
 src/menu/control.hpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/menu/control.cpp b/src/menu/control.cpp
index c1c91fa3..8d5e4438 100644
--- a/src/menu/control.cpp
+++ b/src/menu/control.cpp
@@ -32,7 +32,7 @@ namespace usdx
 		: owner(owner)
 	{
 		if (owner) {
-			owner->add(this);
+			owner->add_slave(this);
 		}
 	}
 
@@ -56,13 +56,13 @@ namespace usdx
 	{
 		if (this->owner != owner) {
 			if (this->owner) {
-				this->owner->remove(this);
+				this->owner->remove_slave(this);
 			}
 
 			this->owner = owner;
 
 			if (this->owner) {
-				this->owner->add(this);
+				this->owner->add_slave(this);
 			}
 		}
 	}
@@ -72,12 +72,12 @@ namespace usdx
 		return owner;
 	}
 
-	void Control::add(Control *new_slave)
+	void Control::add_slave(Control *new_slave)
 	{
 		slaves.push_back(new_slave);
 	}
 
-	void Control::remove(Control *slave)
+	void Control::remove_slave(Control *slave)
 	{
 		slaves.remove(slave);
 	}
diff --git a/src/menu/control.hpp b/src/menu/control.hpp
index f105b69c..c48098b3 100644
--- a/src/menu/control.hpp
+++ b/src/menu/control.hpp
@@ -39,8 +39,8 @@ namespace usdx
 	protected:
 		std::list<Control*> slaves;
 
-		void add(Control *new_slave);
-		void remove(Control *slave);
+		void add_slave(Control *new_slave);
+		void remove_slave(Control *slave);
 
 	public:
 		Control(Control *owner);
-- 
cgit v1.2.3