From b8cb79113e6a6d6eaa9532f50fb70f4028a80093 Mon Sep 17 00:00:00 2001
From: samcake <samuel.gateau@gmail.com>
Date: Thu, 6 Apr 2017 10:30:24 -0700
Subject: [PATCH] Nitpicking on the correct name maybe...

---
 libraries/render/src/render/Scene.h           |  8 +++---
 .../src/render/{Tag.cpp => Selection.cpp}     |  8 +++---
 .../render/src/render/{Tag.h => Selection.h}  | 26 ++++++-------------
 3 files changed, 16 insertions(+), 26 deletions(-)
 rename libraries/render/src/render/{Tag.cpp => Selection.cpp} (71%)
 rename libraries/render/src/render/{Tag.h => Selection.h} (57%)

diff --git a/libraries/render/src/render/Scene.h b/libraries/render/src/render/Scene.h
index 2440ac2246..b9aa6d3d2a 100644
--- a/libraries/render/src/render/Scene.h
+++ b/libraries/render/src/render/Scene.h
@@ -14,7 +14,7 @@
 
 #include "Item.h"
 #include "SpatialTree.h"
-#include "Tag.h"
+#include "Selection.h"
 
 namespace render {
 
@@ -116,9 +116,9 @@ protected:
     void updateItems(const ItemIDs& ids, UpdateFunctors& functors);
 
 
-    // The Tag map
-    std::mutex _tagsMutex;
-    TagMap _tags;
+    // The Selection map
+    std::mutex _selectionsMutex;
+    SelectionMap _selections;
 
     friend class Engine;
 };
diff --git a/libraries/render/src/render/Tag.cpp b/libraries/render/src/render/Selection.cpp
similarity index 71%
rename from libraries/render/src/render/Tag.cpp
rename to libraries/render/src/render/Selection.cpp
index 1ae0720746..ba72953455 100644
--- a/libraries/render/src/render/Tag.cpp
+++ b/libraries/render/src/render/Selection.cpp
@@ -1,5 +1,5 @@
 //
-//  Tag.cpp
+//  Selection.cpp
 //  render/src/render
 //
 //  Created by Sam Gateau on 4/4/2017.
@@ -8,20 +8,20 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-#include "Tag.h"
+#include "Selection.h"
 
 #include "Logging.h"
 
 using namespace render;
 
-Tag::Tag(const std::string& name, const ItemIDs items) : 
+Selection::Selection(const std::string& name, const ItemIDs items) :
     _name(name),
     _items(items)
 {
 
 }
 
-Tag::~Tag() {
+Selection::~Selection() {
 
 }
 
diff --git a/libraries/render/src/render/Tag.h b/libraries/render/src/render/Selection.h
similarity index 57%
rename from libraries/render/src/render/Tag.h
rename to libraries/render/src/render/Selection.h
index eb13a6366a..64bfb2455f 100644
--- a/libraries/render/src/render/Tag.h
+++ b/libraries/render/src/render/Selection.h
@@ -1,5 +1,5 @@
 //
-//  Tag.h
+//  Selection.h
 //  render/src/render
 //
 //  Created by Sam Gateau on 4/4/2017.
@@ -9,18 +9,18 @@
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#ifndef hifi_render_Tag_h
-#define hifi_render_Tag_h
+#ifndef hifi_render_Selection_h
+#define hifi_render_Selection_h
 
 #include "Item.h"
 
 namespace render {
 
-    class Tag {
+    class Selection {
     public:
 
-        Tag(const std::string& name, const ItemIDs items);
-        ~Tag();
+        Selection(const std::string& name, const ItemIDs items);
+        ~Selection();
 
         const std::string& getName() const { return _name; }
 
@@ -30,20 +30,10 @@ namespace render {
         const std::string _name;
         ItemIDs _items;
     };
-    using Tags = std::vector<Tag>;
+    using Selections = std::vector<Selection>;
 
-    class TagMap {
-    public:
-        using NameMap = std::map<std::string, uint32_t>;
+    using SelectionMap = std::map<std::string, Selection>;
 
-        TagMap() {}
-        ~TagMap() {}
-
-
-    protected:
-        NameMap _names;
-        Tags _values;
-    };
 }
 
 #endif
\ No newline at end of file