From b24681125d94e19941f79f14de4df02b335dc0ae Mon Sep 17 00:00:00 2001 From: Zach Pomerantz Date: Tue, 13 Jun 2017 18:16:16 -0400 Subject: [PATCH] rm debugging --- interface/src/Application.cpp | 1 - interface/src/InterfaceLogging.cpp | 2 +- interface/src/Menu.cpp | 2 +- interface/src/ui/AvatarInputs.h | 2 +- libraries/networking/src/NetworkLogging.cpp | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 8e1066af7b..ef44821507 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -809,7 +809,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateThreadPoolCount); connect(this, &Application::activeDisplayPluginChanged, this, [](){ - bool isHMD = qApp->isHMDMode(); qApp->setProperty(hifi::properties::HMD, qApp->isHMDMode()); }); connect(this, &Application::activeDisplayPluginChanged, this, &Application::updateSystemTabletMode); diff --git a/interface/src/InterfaceLogging.cpp b/interface/src/InterfaceLogging.cpp index 74297cd0c4..49fb0bd640 100644 --- a/interface/src/InterfaceLogging.cpp +++ b/interface/src/InterfaceLogging.cpp @@ -11,6 +11,6 @@ #include "InterfaceLogging.h" -Q_LOGGING_CATEGORY(interfaceapp, "hifi.interface", QtFatalMsg) +Q_LOGGING_CATEGORY(interfaceapp, "hifi.interface") Q_LOGGING_CATEGORY(interfaceapp_timing, "hifi.interface.timing") Q_LOGGING_CATEGORY(interfaceapp_deadlock, "hifi.interface.deadlock") diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index f8b1d495b3..bc771594a9 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -287,7 +287,7 @@ Menu::Menu() { QString("../../hifi/tablet/TabletGeneralPreferences.qml"), "GeneralPreferencesDialog"); }); - action = addActionToQMenuAndActionHash(settingsMenu, "Audio...", Qt::CTRL | Qt::Key_Z); + action = addActionToQMenuAndActionHash(settingsMenu, "Audio..."); connect(action, &QAction::triggered, [] { static const QUrl widgetUrl("hifi/dialogs/Audio.qml"); static const QUrl tabletUrl("../../hifi/audio/Audio.qml"); diff --git a/interface/src/ui/AvatarInputs.h b/interface/src/ui/AvatarInputs.h index ec6ff65789..247cc54995 100644 --- a/interface/src/ui/AvatarInputs.h +++ b/interface/src/ui/AvatarInputs.h @@ -49,7 +49,7 @@ signals: void audioClippingChanged(); void audioLevelChanged(); void isHMDChanged(); - void showAudioToolsChanged(bool); + void showAudioToolsChanged(bool show); protected: Q_INVOKABLE void resetSensors(); diff --git a/libraries/networking/src/NetworkLogging.cpp b/libraries/networking/src/NetworkLogging.cpp index b0b7146633..834398694d 100644 --- a/libraries/networking/src/NetworkLogging.cpp +++ b/libraries/networking/src/NetworkLogging.cpp @@ -11,7 +11,7 @@ #include "NetworkLogging.h" -Q_LOGGING_CATEGORY(networking, "hifi.networking", QtFatalMsg) +Q_LOGGING_CATEGORY(networking, "hifi.networking") Q_LOGGING_CATEGORY(resourceLog, "hifi.networking.resource") Q_LOGGING_CATEGORY(asset_client, "hifi.networking.asset_client") Q_LOGGING_CATEGORY(messages_client, "hifi.networking.messages_client")