cleaned up some warnings

This commit is contained in:
Stephen Birarda 2015-08-27 18:18:32 -07:00
parent 783bc4dafb
commit 1d6f43e0d0
10 changed files with 33 additions and 37 deletions

View file

@ -5047,5 +5047,7 @@ void Application::emulateMouse(Hand* hand, float click, float shift, int index)
void Application::crashApplication() { void Application::crashApplication() {
QObject* object = nullptr; QObject* object = nullptr;
bool value = object->isWindowType(); bool value = object->isWindowType();
Q_UNUSED(value);
qCDebug(interfaceapp) << "Intentionally crashed Interface"; qCDebug(interfaceapp) << "Intentionally crashed Interface";
} }

View file

@ -222,7 +222,7 @@ Menu::Menu() {
addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0, addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,
qApp, SLOT(packageModel())); qApp, SLOT(packageModel()));
MenuWrapper* displayMenu = addMenu(DisplayPlugin::MENU_PATH()); addMenu(DisplayPlugin::MENU_PATH());
{ {
MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu); MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu); QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);

View file

@ -843,7 +843,6 @@ void MyAvatar::sendKillAvatar() {
DependencyManager::get<NodeList>()->broadcastToNodes(std::move(killPacket), NodeSet() << NodeType::AvatarMixer); DependencyManager::get<NodeList>()->broadcastToNodes(std::move(killPacket), NodeSet() << NodeType::AvatarMixer);
} }
static int counter = 0;
void MyAvatar::updateLookAtTargetAvatar() { void MyAvatar::updateLookAtTargetAvatar() {
// //
// Look at the avatar whose eyes are closest to the ray in direction of my avatar's head // Look at the avatar whose eyes are closest to the ray in direction of my avatar's head

View file

@ -206,8 +206,6 @@ void ApplicationCompositor::displayOverlayTexture(RenderArgs* renderArgs) {
updateTooltips(); updateTooltips();
auto deviceSize = qApp->getDeviceSize();
//Handle fading and deactivation/activation of UI //Handle fading and deactivation/activation of UI
gpu::Batch batch; gpu::Batch batch;

View file

@ -80,32 +80,34 @@ void OpenGLDisplayPlugin::deactivate() {
// Pass input events on to the application // Pass input events on to the application
bool OpenGLDisplayPlugin::eventFilter(QObject* receiver, QEvent* event) { bool OpenGLDisplayPlugin::eventFilter(QObject* receiver, QEvent* event) {
switch (event->type()) { switch (event->type()) {
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
case QEvent::MouseButtonRelease: case QEvent::MouseButtonRelease:
case QEvent::MouseButtonDblClick: case QEvent::MouseButtonDblClick:
case QEvent::MouseMove: case QEvent::MouseMove:
case QEvent::Wheel: case QEvent::Wheel:
case QEvent::TouchBegin: case QEvent::TouchBegin:
case QEvent::TouchEnd: case QEvent::TouchEnd:
case QEvent::TouchUpdate: case QEvent::TouchUpdate:
case QEvent::FocusIn: case QEvent::FocusIn:
case QEvent::FocusOut: case QEvent::FocusOut:
case QEvent::KeyPress: case QEvent::KeyPress:
case QEvent::KeyRelease: case QEvent::KeyRelease:
case QEvent::ShortcutOverride: case QEvent::ShortcutOverride:
case QEvent::DragEnter: case QEvent::DragEnter:
case QEvent::Drop: case QEvent::Drop:
case QEvent::Resize: case QEvent::Resize:
if (QCoreApplication::sendEvent(QCoreApplication::instance(), event)) { if (QCoreApplication::sendEvent(QCoreApplication::instance(), event)) {
return true; return true;
} }
break; default:
break;
} }
return false; return false;
} }
@ -141,4 +143,4 @@ bool OpenGLDisplayPlugin::isVsyncEnabled() {
#else #else
return true; return true;
#endif #endif
} }

View file

@ -78,7 +78,7 @@ void StereoDisplayPlugin::activate() {
} }
void StereoDisplayPlugin::updateScreen() { void StereoDisplayPlugin::updateScreen() {
for (int i = 0; i < _screenActions.size(); ++i) { for (int i = 0; i < (int) _screenActions.size(); ++i) {
if (_screenActions[i]->isChecked()) { if (_screenActions[i]->isChecked()) {
CONTAINER->setFullscreen(qApp->screens().at(i)); CONTAINER->setFullscreen(qApp->screens().at(i));
break; break;

View file

@ -41,7 +41,6 @@ void GLBackend::do_setViewportTransform(Batch& batch, uint32 paramOffset) {
if (_stereo._pass) { if (_stereo._pass) {
vp.x += vp.z; vp.x += vp.z;
} }
int i = 0;
} }
glViewport(vp.x, vp.y, vp.z, vp.w); glViewport(vp.x, vp.y, vp.z, vp.w);

View file

@ -16,16 +16,16 @@
#include "WebSocketClass.h" #include "WebSocketClass.h"
WebSocketClass::WebSocketClass(QScriptEngine* engine, QString url) : WebSocketClass::WebSocketClass(QScriptEngine* engine, QString url) :
_engine(engine), _webSocket(new QWebSocket()),
_webSocket(new QWebSocket()) _engine(engine)
{ {
initialize(); initialize();
_webSocket->open(url); _webSocket->open(url);
} }
WebSocketClass::WebSocketClass(QScriptEngine* engine, QWebSocket* qWebSocket) : WebSocketClass::WebSocketClass(QScriptEngine* engine, QWebSocket* qWebSocket) :
_engine(engine), _webSocket(qWebSocket),
_webSocket(qWebSocket) _engine(engine)
{ {
initialize(); initialize();
} }

View file

@ -15,8 +15,8 @@
#include "WebSocketServerClass.h" #include "WebSocketServerClass.h"
WebSocketServerClass::WebSocketServerClass(QScriptEngine* engine, const QString& serverName, const quint16 port) : WebSocketServerClass::WebSocketServerClass(QScriptEngine* engine, const QString& serverName, const quint16 port) :
_engine(engine), _webSocketServer(serverName, QWebSocketServer::SslMode::NonSecureMode),
_webSocketServer(serverName, QWebSocketServer::SslMode::NonSecureMode) _engine(engine)
{ {
if (_webSocketServer.listen(QHostAddress::Any, port)) { if (_webSocketServer.listen(QHostAddress::Any, port)) {
connect(&_webSocketServer, &QWebSocketServer::newConnection, this, &WebSocketServerClass::onNewConnection); connect(&_webSocketServer, &QWebSocketServer::newConnection, this, &WebSocketServerClass::onNewConnection);

View file

@ -378,8 +378,6 @@ glm::mat4 createMatFromQuatAndPos(const glm::quat& q, const glm::vec3& p) {
// cancel out roll and pitch // cancel out roll and pitch
glm::quat cancelOutRollAndPitch(const glm::quat& q) { glm::quat cancelOutRollAndPitch(const glm::quat& q) {
glm::vec3 xAxis = q * glm::vec3(1, 0, 0);
glm::vec3 yAxis = q * glm::vec3(0, 1, 0);
glm::vec3 zAxis = q * glm::vec3(0, 0, 1); glm::vec3 zAxis = q * glm::vec3(0, 0, 1);
// cancel out the roll and pitch // cancel out the roll and pitch
@ -393,8 +391,6 @@ glm::quat cancelOutRollAndPitch(const glm::quat& q) {
// cancel out roll and pitch // cancel out roll and pitch
glm::mat4 cancelOutRollAndPitch(const glm::mat4& m) { glm::mat4 cancelOutRollAndPitch(const glm::mat4& m) {
glm::vec3 xAxis = glm::vec3(m[0]);
glm::vec3 yAxis = glm::vec3(m[1]);
glm::vec3 zAxis = glm::vec3(m[2]); glm::vec3 zAxis = glm::vec3(m[2]);
// cancel out the roll and pitch // cancel out the roll and pitch