aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/citra_qt
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-02-01 00:31:06 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-02-01 00:31:06 -0500
commitc915d0b727bf0beb22943ccd5b2a6dc7c7ac2803 (patch)
treebeb460de11181a617b910a0a9c272c0427975372 /src/citra_qt
parentc8628f5d5611658cf1c769367830bc16d4ecfd5c (diff)
parent5ebf35db9601b12c7142641cc5635da32537171b (diff)
Merge pull request #514 from rohit-n/fix-warnings
Silence a few warnings.
Diffstat (limited to 'src/citra_qt')
-rw-r--r--src/citra_qt/debugger/graphics_framebuffer.cpp4
-rw-r--r--src/citra_qt/util/spinbox.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/citra_qt/debugger/graphics_framebuffer.cpp b/src/citra_qt/debugger/graphics_framebuffer.cpp
index a9423d6c..43c59738 100644
--- a/src/citra_qt/debugger/graphics_framebuffer.cpp
+++ b/src/citra_qt/debugger/graphics_framebuffer.cpp
@@ -170,8 +170,8 @@ void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value)
void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value)
{
- if (framebuffer_height != new_value) {
- framebuffer_height = new_value;
+ if (framebuffer_height != static_cast<unsigned>(new_value)) {
+ framebuffer_height = static_cast<unsigned>(new_value);
framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom));
emit Update();
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp
index 54f628e4..1e3767c1 100644
--- a/src/citra_qt/util/spinbox.cpp
+++ b/src/citra_qt/util/spinbox.cpp
@@ -36,7 +36,7 @@
#include "spinbox.h"
-CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), base(10), min_value(-100), max_value(100), value(0), num_digits(0)
+CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), min_value(-100), max_value(100), value(0), base(10), num_digits(0)
{
// TODO: Might be nice to not immediately call the slot.
// Think of an address that is being replaced by a different one, in which case a lot