diff options
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/debugger/graphics_breakpoints_p.h | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/profiler.cpp | 4 | ||||
| -rw-r--r-- | src/citra_qt/debugger/profiler.h | 2 | ||||
| -rw-r--r-- | src/citra_qt/util/spinbox.cpp | 3 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/citra_qt/debugger/graphics_breakpoints_p.h b/src/citra_qt/debugger/graphics_breakpoints_p.h index 232bfc863..34e72e859 100644 --- a/src/citra_qt/debugger/graphics_breakpoints_p.h +++ b/src/citra_qt/debugger/graphics_breakpoints_p.h | |||
| @@ -25,7 +25,7 @@ public: | |||
| 25 | QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; | 25 | QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; |
| 26 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; | 26 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; |
| 27 | 27 | ||
| 28 | bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole); | 28 | bool setData(const QModelIndex& index, const QVariant& value, int role = Qt::EditRole) override; |
| 29 | 29 | ||
| 30 | public slots: | 30 | public slots: |
| 31 | void OnBreakPointHit(Pica::DebugContext::Event event); | 31 | void OnBreakPointHit(Pica::DebugContext::Event event); |
diff --git a/src/citra_qt/debugger/profiler.cpp b/src/citra_qt/debugger/profiler.cpp index ae0568b6a..2ac1748b7 100644 --- a/src/citra_qt/debugger/profiler.cpp +++ b/src/citra_qt/debugger/profiler.cpp | |||
| @@ -26,7 +26,7 @@ static QVariant GetDataForColumn(int col, const AggregatedDuration& duration) | |||
| 26 | static const TimingCategoryInfo* GetCategoryInfo(int id) | 26 | static const TimingCategoryInfo* GetCategoryInfo(int id) |
| 27 | { | 27 | { |
| 28 | const auto& categories = GetProfilingManager().GetTimingCategoriesInfo(); | 28 | const auto& categories = GetProfilingManager().GetTimingCategoriesInfo(); |
| 29 | if (id >= categories.size()) { | 29 | if ((size_t)id >= categories.size()) { |
| 30 | return nullptr; | 30 | return nullptr; |
| 31 | } else { | 31 | } else { |
| 32 | return &categories[id]; | 32 | return &categories[id]; |
| @@ -98,7 +98,7 @@ QVariant ProfilerModel::data(const QModelIndex& index, int role) const | |||
| 98 | const TimingCategoryInfo* info = GetCategoryInfo(index.row() - 2); | 98 | const TimingCategoryInfo* info = GetCategoryInfo(index.row() - 2); |
| 99 | return info != nullptr ? QString(info->name) : QVariant(); | 99 | return info != nullptr ? QString(info->name) : QVariant(); |
| 100 | } else { | 100 | } else { |
| 101 | if (index.row() - 2 < results.time_per_category.size()) { | 101 | if (index.row() - 2 < (int)results.time_per_category.size()) { |
| 102 | return GetDataForColumn(index.column(), results.time_per_category[index.row() - 2]); | 102 | return GetDataForColumn(index.column(), results.time_per_category[index.row() - 2]); |
| 103 | } else { | 103 | } else { |
| 104 | return QVariant(); | 104 | return QVariant(); |
diff --git a/src/citra_qt/debugger/profiler.h b/src/citra_qt/debugger/profiler.h index a6d87aa0f..fabf279b8 100644 --- a/src/citra_qt/debugger/profiler.h +++ b/src/citra_qt/debugger/profiler.h | |||
| @@ -18,7 +18,7 @@ class ProfilerModel : public QAbstractItemModel | |||
| 18 | public: | 18 | public: |
| 19 | ProfilerModel(QObject* parent); | 19 | ProfilerModel(QObject* parent); |
| 20 | 20 | ||
| 21 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; | 21 | QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; |
| 22 | QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; | 22 | QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; |
| 23 | QModelIndex parent(const QModelIndex& child) const override; | 23 | QModelIndex parent(const QModelIndex& child) const override; |
| 24 | int columnCount(const QModelIndex& parent = QModelIndex()) const override; | 24 | int columnCount(const QModelIndex& parent = QModelIndex()) const override; |
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp index 2e2076a27..de4060116 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/citra_qt/util/spinbox.cpp | |||
| @@ -29,6 +29,7 @@ | |||
| 29 | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 29 | // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 30 | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 30 | // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 31 | 31 | ||
| 32 | #include <cstdlib> | ||
| 32 | #include <QLineEdit> | 33 | #include <QLineEdit> |
| 33 | #include <QRegExpValidator> | 34 | #include <QRegExpValidator> |
| 34 | 35 | ||
| @@ -206,7 +207,7 @@ QString CSpinBox::TextFromValue() | |||
| 206 | { | 207 | { |
| 207 | return prefix | 208 | return prefix |
| 208 | + QString(HasSign() ? ((value < 0) ? "-" : "+") : "") | 209 | + QString(HasSign() ? ((value < 0) ? "-" : "+") : "") |
| 209 | + QString("%1").arg(abs(value), num_digits, base, QLatin1Char('0')).toUpper() | 210 | + QString("%1").arg(std::abs(value), num_digits, base, QLatin1Char('0')).toUpper() |
| 210 | + suffix; | 211 | + suffix; |
| 211 | } | 212 | } |
| 212 | 213 | ||