made core::Entity and core::Zone child classes from core::Label

1 files changed, 8 insertions, 34 deletions

diff --git a/src/core/label.h b/src/core/label.h
index e772277..12a417c 100644
--- a/src/core/label.h
+++ b/src/core/label.h
@@ -14,17 +14,12 @@
 namespace core {
 
 /**
- * @brief baseclass for objects with a name and a label
+ * @brief base class for objects with a name and a label
  */
 class Label {
 public:
-	inline Label() {
-	}
-	
-	inline ~Label() {
-		labelstr.clear();
-		namestr.clear();
-	}
+	Label();
+	~Label();
 	
 	/* --- inspectors ------------------------------------------------- */
 	
@@ -38,34 +33,13 @@ public:
 
 	/* --- mutators --------------------------------------------------- */
 	
-	inline void set_label(const std::string & label)
-	{
-		labelstr.assign(label);
-		aux::to_label(labelstr);
-	}
+	void set_label(const std::string & label);
 
-	inline void set_label(const char *label)
-	{
-		if (label) {
-			labelstr.assign(label);
-			aux::to_label(labelstr);
-		} else {
-			labelstr.clear();
-		}
-	}
+	void set_label(const char *label);
 
-	inline void set_name(const std::string & name)
-	{
-		namestr.assign(name);
-	}
-
-	inline void set_name(const char *name)
-	{
-		if (name)
-			namestr.assign(name);
-		else
-			namestr.clear();
-	}
+	void set_name(const std::string & name);
+	
+	void set_name(const char *name);
 
 private:
 	std::string		labelstr;