Merge pull request #457 from Subv/qt

citra-qt: Fixed some Qt errors on initialization
merge-requests/60/head
bunnei 2015-01-11 10:59:53 +07:00
commit 63d05fca36
2 changed files with 6 additions and 6 deletions

@ -158,17 +158,17 @@ void GraphicsFramebufferWidget::OnFramebufferAddressChanged(qint64 new_value)
} }
} }
void GraphicsFramebufferWidget::OnFramebufferWidthChanged(unsigned int new_value) void GraphicsFramebufferWidget::OnFramebufferWidthChanged(int new_value)
{ {
if (framebuffer_width != new_value) { if (framebuffer_width != static_cast<unsigned>(new_value)) {
framebuffer_width = new_value; framebuffer_width = static_cast<unsigned>(new_value);
framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom)); framebuffer_source_list->setCurrentIndex(static_cast<int>(Source::Custom));
emit Update(); emit Update();
} }
} }
void GraphicsFramebufferWidget::OnFramebufferHeightChanged(unsigned int new_value) void GraphicsFramebufferWidget::OnFramebufferHeightChanged(int new_value)
{ {
if (framebuffer_height != new_value) { if (framebuffer_height != new_value) {
framebuffer_height = new_value; framebuffer_height = new_value;

@ -62,8 +62,8 @@ public:
public slots: public slots:
void OnFramebufferSourceChanged(int new_value); void OnFramebufferSourceChanged(int new_value);
void OnFramebufferAddressChanged(qint64 new_value); void OnFramebufferAddressChanged(qint64 new_value);
void OnFramebufferWidthChanged(unsigned int new_value); void OnFramebufferWidthChanged(int new_value);
void OnFramebufferHeightChanged(unsigned int new_value); void OnFramebufferHeightChanged(int new_value);
void OnFramebufferFormatChanged(int new_value); void OnFramebufferFormatChanged(int new_value);
void OnUpdate(); void OnUpdate();