diff options
Diffstat (limited to 'src/citra_qt')
| -rw-r--r-- | src/citra_qt/config/controller_config.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/graphics_breakpoints.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/debugger/ramview.cpp | 2 | ||||
| -rw-r--r-- | src/citra_qt/util/spinbox.cpp | 5 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/citra_qt/config/controller_config.cpp b/src/citra_qt/config/controller_config.cpp index 892995bb2..512879f1b 100644 --- a/src/citra_qt/config/controller_config.cpp +++ b/src/citra_qt/config/controller_config.cpp | |||
| @@ -92,4 +92,4 @@ void GControllerConfigDialog::EnableChanges() | |||
| 92 | } | 92 | } |
| 93 | } | 93 | } |
| 94 | 94 | ||
| 95 | */ \ No newline at end of file | 95 | */ |
diff --git a/src/citra_qt/debugger/graphics_breakpoints.cpp b/src/citra_qt/debugger/graphics_breakpoints.cpp index 262e2e770..92348be34 100644 --- a/src/citra_qt/debugger/graphics_breakpoints.cpp +++ b/src/citra_qt/debugger/graphics_breakpoints.cpp | |||
| @@ -47,7 +47,7 @@ QVariant BreakPointModel::data(const QModelIndex& index, int role) const | |||
| 47 | { Pica::DebugContext::Event::VertexLoaded, tr("Vertex loaded") } | 47 | { Pica::DebugContext::Event::VertexLoaded, tr("Vertex loaded") } |
| 48 | }; | 48 | }; |
| 49 | 49 | ||
| 50 | _dbg_assert_(Debug_GPU, map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents)); | 50 | DEBUG_ASSERT(map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents)); |
| 51 | 51 | ||
| 52 | return (map.find(event) != map.end()) ? map.at(event) : QString(); | 52 | return (map.find(event) != map.end()) ? map.at(event) : QString(); |
| 53 | } | 53 | } |
diff --git a/src/citra_qt/debugger/ramview.cpp b/src/citra_qt/debugger/ramview.cpp index 2b199bad1..88570f2cd 100644 --- a/src/citra_qt/debugger/ramview.cpp +++ b/src/citra_qt/debugger/ramview.cpp | |||
| @@ -14,4 +14,4 @@ void GRamView::OnCPUStepped() | |||
| 14 | { | 14 | { |
| 15 | // TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams... | 15 | // TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams... |
| 16 | //setData(QByteArray((const char*)Mem_RAM,sizeof(Mem_RAM)/8)); | 16 | //setData(QByteArray((const char*)Mem_RAM,sizeof(Mem_RAM)/8)); |
| 17 | } \ No newline at end of file | 17 | } |
diff --git a/src/citra_qt/util/spinbox.cpp b/src/citra_qt/util/spinbox.cpp index 1e3767c18..2e2076a27 100644 --- a/src/citra_qt/util/spinbox.cpp +++ b/src/citra_qt/util/spinbox.cpp | |||
| @@ -32,8 +32,7 @@ | |||
| 32 | #include <QLineEdit> | 32 | #include <QLineEdit> |
| 33 | #include <QRegExpValidator> | 33 | #include <QRegExpValidator> |
| 34 | 34 | ||
| 35 | #include "common/log.h" | 35 | #include "common/assert.h" |
| 36 | |||
| 37 | #include "spinbox.h" | 36 | #include "spinbox.h" |
| 38 | 37 | ||
| 39 | CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), min_value(-100), max_value(100), value(0), base(10), num_digits(0) | 38 | CSpinBox::CSpinBox(QWidget* parent) : QAbstractSpinBox(parent), min_value(-100), max_value(100), value(0), base(10), num_digits(0) |
| @@ -244,7 +243,7 @@ QValidator::State CSpinBox::validate(QString& input, int& pos) const | |||
| 244 | if (strpos >= input.length() - HasSign() - suffix.length()) | 243 | if (strpos >= input.length() - HasSign() - suffix.length()) |
| 245 | return QValidator::Intermediate; | 244 | return QValidator::Intermediate; |
| 246 | 245 | ||
| 247 | _dbg_assert_(Frontend, base <= 10 || base == 16); | 246 | DEBUG_ASSERT(base <= 10 || base == 16); |
| 248 | QString regexp; | 247 | QString regexp; |
| 249 | 248 | ||
| 250 | // Demand sign character for negative ranges | 249 | // Demand sign character for negative ranges |