From 562446e7b86659712823df026512f27973f5d89a Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Fri, 15 Jul 2016 14:44:27 -0700 Subject: [PATCH] use AddressManager, rather than adding a trampoline to hostname in AddressBarDialog. --- interface/resources/qml/AddressBarDialog.qml | 2 +- interface/src/ui/AddressBarDialog.cpp | 4 ---- interface/src/ui/AddressBarDialog.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index d87cfe1f48..43a1c10c0f 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -305,7 +305,7 @@ Window { console.log('domain query failed:', error); return filterChoicesByText(); } - var here = addressBarDialog.getHost(); // don't show where we are now. + var here = AddressManager.hostname; // don't show where we are now. allDomains = domains.filter(function (domain) { return domain.name !== here; }); allDomains.sort(function (a, b) { return b.online_users - a.online_users; }); // Whittle down suggestions to those that have at least one user, and try to get pictures. diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index 7a32381db3..6fb437e312 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -40,10 +40,6 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare _forwardEnabled = !(DependencyManager::get()->getForwardStack().isEmpty()); } -QString AddressBarDialog::getHost() const { - return DependencyManager::get()->getHost(); -} - void AddressBarDialog::loadAddress(const QString& address) { qDebug() << "Called LoadAddress with address " << address; if (!address.isEmpty()) { diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index b5a21dd47a..bbce52c67c 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -34,7 +34,6 @@ protected: void displayAddressOfflineMessage(); void displayAddressNotFoundMessage(); - Q_INVOKABLE QString getHost() const; Q_INVOKABLE void loadAddress(const QString& address); Q_INVOKABLE void loadHome(); Q_INVOKABLE void loadBack();