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.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/menu/control.hpp')

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