From 1b01938767b6bb716bbfd7ecd0791badd2e2f983 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 10 Jan 2015 15:35:26 -0500 Subject: [PATCH 1/2] citra-qt: Fixed some Qt errors on initialization --- src/citra_qt/debugger/graphics_framebuffer.cpp | 4 ++-- src/citra_qt/debugger/graphics_framebuffer.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp index caa6896f91..9f31e1e9f7 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.cpp +++ b/src/citra_qt/debugger/graphics_framebuffer.cpp @@ -158,7 +158,7 @@ void GraphicsFramebufferWidget::OnFramebufferAddressChanged(qint64 new_value) } } -void GraphicsFramebufferWidget::OnFramebufferWidthChanged(unsigned int new_value) +void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value) { if (framebuffer_width != new_value) { framebuffer_width = new_value; @@ -168,7 +168,7 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(unsigned int new_value } } -void GraphicsFramebufferWidget::OnFramebufferHeightChanged(unsigned int new_value) +void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value) { if (framebuffer_height != new_value) { framebuffer_height = new_value; diff --git a/src/citra_qt/debugger/graphics_framebuffer.h b/src/citra_qt/debugger/graphics_framebuffer.h index 02813525cc..56215761ea 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.h +++ b/src/citra_qt/debugger/graphics_framebuffer.h @@ -62,8 +62,8 @@ public: public slots: void OnFramebufferSourceChanged(int new_value); void OnFramebufferAddressChanged(qint64 new_value); - void OnFramebufferWidthChanged(unsigned int new_value); - void OnFramebufferHeightChanged(unsigned int new_value); + void OnFramebufferWidthChanged(int new_value); + void OnFramebufferHeightChanged(int new_value); void OnFramebufferFormatChanged(int new_value); void OnUpdate(); From 115a4bfc9e1fd3cfadb0d220bd65471319def560 Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 10 Jan 2015 15:55:52 -0500 Subject: [PATCH 2/2] citra-qt: Add explicit casts to prevent some warnings. --- src/citra_qt/debugger/graphics_framebuffer.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp index 9f31e1e9f7..a9423d6c73 100644 --- a/src/citra_qt/debugger/graphics_framebuffer.cpp +++ b/src/citra_qt/debugger/graphics_framebuffer.cpp @@ -160,8 +160,8 @@ void GraphicsFramebufferWidget::OnFramebufferAddressChanged(qint64 new_value) void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value) { - if (framebuffer_width != new_value) { - framebuffer_width = new_value; + if (framebuffer_width != static_cast(new_value)) { + framebuffer_width = static_cast(new_value); framebuffer_source_list->setCurrentIndex(static_cast(Source::Custom)); emit Update();