From d9bd7f019fe31dda672df552faf065a12c1fbcf5 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Wed, 14 Jan 2015 22:20:45 -0800
Subject: [PATCH] Simplify bookmark handling

---
 interface/src/Bookmarks.cpp | 17 +++++------------
 interface/src/Bookmarks.h   |  3 +--
 interface/src/Menu.cpp      |  2 +-
 3 files changed, 7 insertions(+), 15 deletions(-)

diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp
index 36f489fa6a..23a637c1d9 100644
--- a/interface/src/Bookmarks.cpp
+++ b/interface/src/Bookmarks.cpp
@@ -15,14 +15,9 @@ Bookmarks::Bookmarks() {
 }
 
 void Bookmarks::insert(const QString& name, const QString& address) {
-    QString key = name.toLower();
+    _bookmarks.insert(name, address);
 
-    QJsonObject bookmark;
-    bookmark.insert("name", name);
-    bookmark.insert("address", address);
-    _bookmarks.insert(key, bookmark);
-
-    if (contains(key)) {
+    if (contains(name)) {
         qDebug() << "Added bookmark: " << name << ", " << address;
     } else {
         qDebug() << "Couldn't add bookmark: " << name << ", " << address;
@@ -30,11 +25,9 @@ void Bookmarks::insert(const QString& name, const QString& address) {
 }
 
 void Bookmarks::remove(const QString& name) {
-    QString key = name.toLower();
+    _bookmarks.remove(name);
 
-    _bookmarks.remove(key);
-
-    if (!contains(key)) {
+    if (!contains(name)) {
         qDebug() << "Removed bookmark: " << name;
     } else {
         qDebug() << "Couldn't remove bookmark: " << name;
@@ -42,5 +35,5 @@ void Bookmarks::remove(const QString& name) {
 }
 
 bool Bookmarks::contains(const QString& name) const {
-    return _bookmarks.contains(name.toLower());
+    return _bookmarks.contains(name);
 }
diff --git a/interface/src/Bookmarks.h b/interface/src/Bookmarks.h
index f9c40d7523..3a3f7f74d1 100644
--- a/interface/src/Bookmarks.h
+++ b/interface/src/Bookmarks.h
@@ -28,8 +28,7 @@ public:
     bool contains(const QString& name) const;
 
 private:
-    QMap<QString, QJsonObject> _bookmarks;  // key: { name: string, address: string }
-                                            // key is a lowercase copy of name, used to make the bookmarks case insensitive.
+    QVariantMap _bookmarks;  // { name: address, ... }
 };
 
 #endif // hifi_Bookmarks_h
\ No newline at end of file
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 24e5935887..2f477d9711 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -1069,7 +1069,7 @@ void Menu::bookmarkLocation() {
     addActionToQMenuAndActionHash(_bookmarksMenu, teleportAction, bookmarkName, 0,
                                   QAction::NoRole, position);
 
-    bookmarks->insert(bookmarkName, bookmarkAddress);
+    bookmarks->insert(bookmarkName, bookmarkAddress);  // Overwrites any item with the same bookmarkName.
 
     _bookmarksMenu->setEnabled(true);
     _deleteBookmarksMenu->setEnabled(true);