Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 19:50:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

quiet compiler

Browse source
This commit is contained in:
Seth Alves 2015-05-03 11:10:52 -07:00
parent b2583298a9
commit 0341caad95
4 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/Application.cpp
View file

@ -989,11 +989,12 @@ bool Application::importSVOFromURL(const QString& urlString) {
} }
bool Application::event(QEvent* event) { bool Application::event(QEvent* event) {
switch (event->type()) { if ((int)event->type() == (int)Lambda) {
case Lambda: ((LambdaEvent*)event)->call();
((LambdaEvent*)event)->call(); return true;
return true; }
switch (event->type()) {
case QEvent::MouseMove: case QEvent::MouseMove:
mouseMoveEvent((QMouseEvent*)event); mouseMoveEvent((QMouseEvent*)event);
return true; return true;

3
interface/src/avatar/Avatar.cpp
View file

@ -723,9 +723,6 @@ void Avatar::renderDisplayName() {
.arg(getReceiveRate()); .arg(getReceiveRate());
} }
QByteArray ba = _displayName.toLocal8Bit();
const char* text = ba.data();
glDisable(GL_POLYGON_OFFSET_FILL); glDisable(GL_POLYGON_OFFSET_FILL);
textRenderer(DISPLAYNAME)->draw(text_x, text_y, renderedDisplayName, color); textRenderer(DISPLAYNAME)->draw(text_x, text_y, renderedDisplayName, color);

2
libraries/gpu/src/gpu/GLBackendOutput.cpp
View file

@ -83,7 +83,7 @@ GLBackend::GLFramebuffer* GLBackend::syncGPUObject(const Framebuffer& framebuffe
glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA, framebuffer.getWidth(), framebuffer.getHeight()); glRenderbufferStorage(GL_RENDERBUFFER, GL_RGBA, framebuffer.getWidth(), framebuffer.getHeight());
glBindRenderbuffer(GL_RENDERBUFFER, 0); glBindRenderbuffer(GL_RENDERBUFFER, 0);
glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderBuffer); glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, renderBuffer);
CHECK_GL_ERROR(); (void) CHECK_GL_ERROR();
} }
#endif #endif

17
libraries/ui/src/VrMenu.cpp
View file

@ -102,9 +102,12 @@ class QQuickMenuItem;
QObject* addItem(QObject* parent, const QString& text) { QObject* addItem(QObject* parent, const QString& text) {
// FIXME add more checking here to ensure no name conflicts // FIXME add more checking here to ensure no name conflicts
QQuickMenuItem* returnedValue{ nullptr }; QQuickMenuItem* returnedValue{ nullptr };
bool invokeResult = QMetaObject::invokeMethod(parent, "addItem", Qt::DirectConnection, #ifndef QT_NO_DEBUG
Q_RETURN_ARG(QQuickMenuItem*, returnedValue), bool invokeResult =
Q_ARG(QString, text)); #endif
QMetaObject::invokeMethod(parent, "addItem", Qt::DirectConnection, Q_RETURN_ARG(QQuickMenuItem*, returnedValue),
Q_ARG(QString, text));
Q_ASSERT(invokeResult); Q_ASSERT(invokeResult);
QObject* result = reinterpret_cast<QObject*>(returnedValue); QObject* result = reinterpret_cast<QObject*>(returnedValue);
return result; return result;
@ -203,9 +206,11 @@ void VrMenu::insertAction(QAction* before, QAction* action) {
result = ::addItem(menu, action->text()); result = ::addItem(menu, action->text());
} else { } else {
QQuickMenuItem* returnedValue{ nullptr }; QQuickMenuItem* returnedValue{ nullptr };
bool invokeResult = QMetaObject::invokeMethod(menu, "insertItem", Qt::DirectConnection, #ifndef QT_NO_DEBUG
Q_RETURN_ARG(QQuickMenuItem*, returnedValue), bool invokeResult =
Q_ARG(int, index), Q_ARG(QString, action->text())); #endif
QMetaObject::invokeMethod(menu, "insertItem", Qt::DirectConnection, Q_RETURN_ARG(QQuickMenuItem*, returnedValue),
Q_ARG(int, index), Q_ARG(QString, action->text()));
Q_ASSERT(invokeResult); Q_ASSERT(invokeResult);
result = reinterpret_cast<QObject*>(returnedValue); result = reinterpret_cast<QObject*>(returnedValue);
} }