diff --git a/gvr-interface/src/GVRInterface.h b/gvr-interface/src/GVRInterface.h index ca829243fd..87738a10d8 100644 --- a/gvr-interface/src/GVRInterface.h +++ b/gvr-interface/src/GVRInterface.h @@ -15,7 +15,6 @@ #include class RenderingClient; -class GVRMainWindow; #if defined(qApp) #undef qApp @@ -26,14 +25,10 @@ class GVRInterface : public QApplication { Q_OBJECT public: GVRInterface(int argc, char* argv[]); - - void setMainWindow(GVRMainWindow* mainWindow) { _mainWindow = mainWindow; } - GVRMainWindow* getMainWindow() { return _mainWindow; } - + RenderingClient* getClient() { return _client; } private: - GVRMainWindow* _mainWindow; RenderingClient* _client; }; diff --git a/gvr-interface/src/GVRMainWindow.cpp b/gvr-interface/src/GVRMainWindow.cpp index f7ca322cfe..4ef2dd37fa 100644 --- a/gvr-interface/src/GVRMainWindow.cpp +++ b/gvr-interface/src/GVRMainWindow.cpp @@ -9,9 +9,12 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // +#include +#include #include -#include "GVRInterface.h" +#include + #include "RenderingClient.h" #include "GVRMainWindow.h" @@ -31,6 +34,11 @@ GVRMainWindow::GVRMainWindow(QWidget* parent) : fileMenu->addAction(goToAddress); helpMenu->addAction(aboutQt); - QObject::connect(goToAddress, &QAction::triggered, qApp->getClient(), &RenderingClient::showAddressBar); + QObject::connect(goToAddress, &QAction::triggered, this, &GVRMainWindow::showAddressBar); QObject::connect(aboutQt, &QAction::triggered, qApp, &QApplication::aboutQt); } + +void GVRMainWindow::showAddressBar() { + QString addressString = QInputDialog::getText(centralWidget(), "Go to Address", "Address"); + DependencyManager::get()->handleLookupString(addressString); +} \ No newline at end of file diff --git a/gvr-interface/src/GVRMainWindow.h b/gvr-interface/src/GVRMainWindow.h index 55f291965b..5a0846da7a 100644 --- a/gvr-interface/src/GVRMainWindow.h +++ b/gvr-interface/src/GVRMainWindow.h @@ -18,6 +18,8 @@ class GVRMainWindow : public QMainWindow { Q_OBJECT public: GVRMainWindow(QWidget* parent = 0); +public slots: + void showAddressBar(); }; #endif // hifi_GVRMainWindow_h diff --git a/gvr-interface/src/RenderingClient.cpp b/gvr-interface/src/RenderingClient.cpp index 90ac027708..63627f210e 100644 --- a/gvr-interface/src/RenderingClient.cpp +++ b/gvr-interface/src/RenderingClient.cpp @@ -11,9 +11,6 @@ #include -#include "GVRInterface.h" -#include "GVRMainWindow.h" - #include "RenderingClient.h" RenderingClient::RenderingClient(QObject *parent) : @@ -21,9 +18,3 @@ RenderingClient::RenderingClient(QObject *parent) : { } - -void RenderingClient::showAddressBar() { -#ifdef Q_OS_ANDROID - QString addressString = QInputDialog::getText(qApp->getMainWindow()->centralWidget(), "Go to Address", "Address"); -#endif -} diff --git a/gvr-interface/src/RenderingClient.h b/gvr-interface/src/RenderingClient.h index c0665dc947..dcf643e0ed 100644 --- a/gvr-interface/src/RenderingClient.h +++ b/gvr-interface/src/RenderingClient.h @@ -19,8 +19,6 @@ class RenderingClient : public Client { Q_OBJECT public: RenderingClient(QObject* parent = 0); -public slots: - void showAddressBar(); }; #endif // hifi_RenderingClient_h diff --git a/gvr-interface/src/main.cpp b/gvr-interface/src/main.cpp index 081a82e167..5fa5390df0 100644 --- a/gvr-interface/src/main.cpp +++ b/gvr-interface/src/main.cpp @@ -18,7 +18,5 @@ int main(int argc, char* argv[]) { GVRMainWindow mainWindow; mainWindow.showMaximized(); - app.setMainWindow(&mainWindow); - return app.exec(); } \ No newline at end of file diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index fe6f95d43e..c85b3be1bb 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -27,7 +27,7 @@ #include "AccountManager.h" -const bool VERBOSE_HTTP_REQUEST_DEBUGGING = false; +const bool VERBOSE_HTTP_REQUEST_DEBUGGING = true; AccountManager& AccountManager::getInstance(bool forceReset) { static std::unique_ptr sharedInstance(new AccountManager()); @@ -59,7 +59,7 @@ JSONCallbackParameters::JSONCallbackParameters(QObject* jsonCallbackReceiver, co } AccountManager::AccountManager() : - _authURL(), + _authURL(DEFAULT_NODE_AUTH_URL), _pendingCallbackMap(), _accountInfo(), _shouldPersistToSettingsFile(true)