From bec70976d8b562acbb00e8ac09595151d6320deb Mon Sep 17 00:00:00 2001
From: Triplelexx <mojolexx@gmail.com>
Date: Thu, 30 Mar 2017 12:07:19 +0100
Subject: [PATCH] change hidden overloading

---
 interface/src/AvatarBookmarks.cpp   | 3 ++-
 interface/src/Bookmarks.cpp         | 2 +-
 interface/src/Bookmarks.h           | 4 +---
 interface/src/LocationBookmarks.cpp | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/interface/src/AvatarBookmarks.cpp b/interface/src/AvatarBookmarks.cpp
index a794c147c3..6b21065328 100644
--- a/interface/src/AvatarBookmarks.cpp
+++ b/interface/src/AvatarBookmarks.cpp
@@ -41,6 +41,7 @@ void AvatarBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
 
     Bookmarks::setupMenus(menubar, menu);
     Bookmarks::sortActions(menubar, _bookmarksMenu);
+
     auto offscreenUi = DependencyManager::get<OffscreenUi>();
     auto context = offscreenUi->getRootContext();
     context->setContextProperty("avatarBookmarks", this);
@@ -68,7 +69,7 @@ void AvatarBookmarks::addBookmark() {
 
     auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
     const QString& bookmarkAddress = myAvatar->getSkeletonModelURL().toString();
-    Bookmarks::addBookmark(bookmarkName, bookmarkAddress);
+    Bookmarks::addBookmarkToFile(bookmarkName, bookmarkAddress);
 }
 
 void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {
diff --git a/interface/src/Bookmarks.cpp b/interface/src/Bookmarks.cpp
index 172bfd29ca..bb109ddc0b 100644
--- a/interface/src/Bookmarks.cpp
+++ b/interface/src/Bookmarks.cpp
@@ -67,7 +67,7 @@ void Bookmarks::deleteBookmark() {
     }
 }
 
-void Bookmarks::addBookmark(const QString& bookmarkName, const QString& bookmarkAddress) {
+void Bookmarks::addBookmarkToFile(const QString& bookmarkName, const QString& bookmarkAddress) {
     Menu* menubar = Menu::getInstance();
     if (contains(bookmarkName)) {
         auto offscreenUi = DependencyManager::get<OffscreenUi>();
diff --git a/interface/src/Bookmarks.h b/interface/src/Bookmarks.h
index 9ba2e4f45a..09481d7db4 100644
--- a/interface/src/Bookmarks.h
+++ b/interface/src/Bookmarks.h
@@ -30,10 +30,8 @@ public:
     virtual void setupMenus(Menu* menubar, MenuWrapper* menu);
     QString addressForBookmark(const QString& name) const;
 
-public slots:
-    virtual void addBookmark(const QString& bookmarkName, const QString& bookmarkAddress);
-
 protected:
+    virtual void addBookmarkToFile(const QString& bookmarkName, const QString& bookmarkAddress);
     virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) = 0;
     void enableMenuItems(bool enabled);
     void readFromFile();
diff --git a/interface/src/LocationBookmarks.cpp b/interface/src/LocationBookmarks.cpp
index 436b435bc4..d0c5c4cd8a 100644
--- a/interface/src/LocationBookmarks.cpp
+++ b/interface/src/LocationBookmarks.cpp
@@ -49,7 +49,7 @@ void LocationBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
 void LocationBookmarks::setHomeLocation() {
     auto addressManager = DependencyManager::get<AddressManager>();
     QString bookmarkAddress = addressManager->currentAddress().toString();
-    Bookmarks::addBookmark(HOME_BOOKMARK, bookmarkAddress);
+    Bookmarks::addBookmarkToFile(HOME_BOOKMARK, bookmarkAddress);
 }
 
 void LocationBookmarks::teleportToBookmark() {
@@ -72,7 +72,7 @@ void LocationBookmarks::addBookmark() {
 
     auto addressManager = DependencyManager::get<AddressManager>();
     QString bookmarkAddress = addressManager->currentAddress().toString();
-    Bookmarks::addBookmark(bookmarkName, bookmarkAddress);
+    Bookmarks::addBookmarkToFile(bookmarkName, bookmarkAddress);
 }
 
 void LocationBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {