summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2015-07-25 12:50:32 -0700
committerGravatar Yuri Kunde Schlesner2015-07-25 12:50:32 -0700
commit9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1 (patch)
tree732bc1b978397a05fab07d5443fe05534ea39b37 /src/citra_qt/debugger
parentMerge pull request #981 from Subv/checkboxes (diff)
parentVertex Shader : Undo casting (diff)
downloadyuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.gz
yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.tar.xz
yuzu-9a0f9f12cd867c8fa033fa8e5e564bda2eaf2db1.zip
Merge pull request #892 from zawata/another-warning-fixes
Yet More Warning Fixes
Diffstat (limited to 'src/citra_qt/debugger')
-rw-r--r--src/citra_qt/debugger/graphics_cmdlists.cpp2
-rw-r--r--src/citra_qt/debugger/graphics_vertex_shader.cpp2
-rw-r--r--src/citra_qt/debugger/profiler.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/citra_qt/debugger/graphics_cmdlists.cpp b/src/citra_qt/debugger/graphics_cmdlists.cpp
index 392ff570b..de10bce1f 100644
--- a/src/citra_qt/debugger/graphics_cmdlists.cpp
+++ b/src/citra_qt/debugger/graphics_cmdlists.cpp
@@ -170,7 +170,7 @@ GPUCommandListModel::GPUCommandListModel(QObject* parent) : QAbstractListModel(p
170} 170}
171 171
172int GPUCommandListModel::rowCount(const QModelIndex& parent) const { 172int GPUCommandListModel::rowCount(const QModelIndex& parent) const {
173 return pica_trace.writes.size(); 173 return static_cast<int>(pica_trace.writes.size());
174} 174}
175 175
176int GPUCommandListModel::columnCount(const QModelIndex& parent) const { 176int GPUCommandListModel::columnCount(const QModelIndex& parent) const {
diff --git a/src/citra_qt/debugger/graphics_vertex_shader.cpp b/src/citra_qt/debugger/graphics_vertex_shader.cpp
index db622d846..f42a2f4ce 100644
--- a/src/citra_qt/debugger/graphics_vertex_shader.cpp
+++ b/src/citra_qt/debugger/graphics_vertex_shader.cpp
@@ -34,7 +34,7 @@ int GraphicsVertexShaderModel::columnCount(const QModelIndex& parent) const {
34} 34}
35 35
36int GraphicsVertexShaderModel::rowCount(const QModelIndex& parent) const { 36int GraphicsVertexShaderModel::rowCount(const QModelIndex& parent) const {
37 return info.code.size(); 37 return static_cast<int>(info.code.size());
38} 38}
39 39
40QVariant GraphicsVertexShaderModel::headerData(int section, Qt::Orientation orientation, int role) const { 40QVariant GraphicsVertexShaderModel::headerData(int section, Qt::Orientation orientation, int role) const {
diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp
index 2ac1748b7..89b28c2f4 100644
--- a/src/citra_qt/debugger/profiler.cpp
+++ b/src/citra_qt/debugger/profiler.cpp
@@ -74,7 +74,7 @@ int ProfilerModel::rowCount(const QModelIndex& parent) const
74 if (parent.isValid()) { 74 if (parent.isValid()) {
75 return 0; 75 return 0;
76 } else { 76 } else {
77 return results.time_per_category.size() + 2; 77 return static_cast<int>(results.time_per_category.size() + 2);
78 } 78 }
79} 79}
80 80