Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 14:21:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change hidden overloading

Browse source
This commit is contained in:
Triplelexx 2017-03-30 12:07:19 +01:00
parent 50e35a220b
commit bec70976d8
4 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/src/AvatarBookmarks.cpp
View file

@ -41,6 +41,7 @@ void AvatarBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
Bookmarks::setupMenus(menubar, menu); Bookmarks::setupMenus(menubar, menu);
Bookmarks::sortActions(menubar, _bookmarksMenu); Bookmarks::sortActions(menubar, _bookmarksMenu);
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();
auto context = offscreenUi->getRootContext(); auto context = offscreenUi->getRootContext();
context->setContextProperty("avatarBookmarks", this); context->setContextProperty("avatarBookmarks", this);
@ -68,7 +69,7 @@ void AvatarBookmarks::addBookmark() {
auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar(); auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
const QString& bookmarkAddress = myAvatar->getSkeletonModelURL().toString(); 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) { void AvatarBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {

2
interface/src/Bookmarks.cpp
View file

@ -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(); Menu* menubar = Menu::getInstance();
if (contains(bookmarkName)) { if (contains(bookmarkName)) {
auto offscreenUi = DependencyManager::get<OffscreenUi>(); auto offscreenUi = DependencyManager::get<OffscreenUi>();

4
interface/src/Bookmarks.h
View file

@ -30,10 +30,8 @@ public:
virtual void setupMenus(Menu* menubar, MenuWrapper* menu); virtual void setupMenus(Menu* menubar, MenuWrapper* menu);
QString addressForBookmark(const QString& name) const; QString addressForBookmark(const QString& name) const;
public slots:
virtual void addBookmark(const QString& bookmarkName, const QString& bookmarkAddress);
protected: protected:
virtual void addBookmarkToFile(const QString& bookmarkName, const QString& bookmarkAddress);
virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) = 0; virtual void addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) = 0;
void enableMenuItems(bool enabled); void enableMenuItems(bool enabled);
void readFromFile(); void readFromFile();

4
interface/src/LocationBookmarks.cpp
View file

@ -49,7 +49,7 @@ void LocationBookmarks::setupMenus(Menu* menubar, MenuWrapper* menu) {
void LocationBookmarks::setHomeLocation() { void LocationBookmarks::setHomeLocation() {
auto addressManager = DependencyManager::get<AddressManager>(); auto addressManager = DependencyManager::get<AddressManager>();
QString bookmarkAddress = addressManager->currentAddress().toString(); QString bookmarkAddress = addressManager->currentAddress().toString();
Bookmarks::addBookmark(HOME_BOOKMARK, bookmarkAddress); Bookmarks::addBookmarkToFile(HOME_BOOKMARK, bookmarkAddress);
} }
void LocationBookmarks::teleportToBookmark() { void LocationBookmarks::teleportToBookmark() {
@ -72,7 +72,7 @@ void LocationBookmarks::addBookmark() {
auto addressManager = DependencyManager::get<AddressManager>(); auto addressManager = DependencyManager::get<AddressManager>();
QString bookmarkAddress = addressManager->currentAddress().toString(); QString bookmarkAddress = addressManager->currentAddress().toString();
Bookmarks::addBookmark(bookmarkName, bookmarkAddress); Bookmarks::addBookmarkToFile(bookmarkName, bookmarkAddress);
} }
void LocationBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) { void LocationBookmarks::addBookmarkToMenu(Menu* menubar, const QString& name, const QString& address) {