Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 08:04:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Move connect call for multiple destinations to constructor

Browse source
This commit is contained in:
Ryan Huffman 2014-06-16 11:30:47 -07:00
parent af3b2a9d0f
commit 978b7521db
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/src/Menu.cpp
View file

@ -165,6 +165,8 @@ Menu::Menu() :
Qt::Key_At,
this,
SLOT(goTo()));
connect(&LocationManager::getInstance(), &LocationManager::multipleDestinationsFound,
this, &Menu::multipleDestinationsDecision);
addDisabledActionAndSeparator(fileMenu, "Upload Avatar Model");
addActionToQMenuAndActionHash(fileMenu, MenuOption::UploadHead, 0, Application::getInstance(), SLOT(uploadHead()));
@ -1002,9 +1004,7 @@ bool Menu::goToDestination(QString destination) {
}
void Menu::goTo(QString destination) {
LocationManager* manager = &LocationManager::getInstance();
manager->goTo(destination);
connect(manager, &LocationManager::multipleDestinationsFound, getInstance(), &Menu::multipleDestinationsDecision);
LocationManager::getInstance().goTo(destination);
}
void Menu::goTo() {