diff options
| author | 2015-01-20 17:16:47 -0800 | |
|---|---|---|
| committer | 2015-02-10 18:30:31 -0800 | |
| commit | ef24e72b2618806f64345544fa46c84f3f494890 (patch) | |
| tree | fca138e8377c4d66bd1fe026a3d2fef54a7f090c /src/citra_qt/util/spinbox.cpp | |
| parent | GSP: Fixed typo in SignalInterrupt (diff) | |
| download | yuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.gz yuzu-ef24e72b2618806f64345544fa46c84f3f494890.tar.xz yuzu-ef24e72b2618806f64345544fa46c84f3f494890.zip | |
Asserts: break/crash program, fit to style guide; log.h->assert.h
Involves making asserts use printf instead of the log functions (log functions are asynchronous and, as such, the log won't be printed in time)
As such, the log type argument was removed (printf obviously can't use it, and it's made obsolete by the file and line printing)
Also removed some GEKKO cruft.
Diffstat (limited to 'src/citra_qt/util/spinbox.cpp')
| -rw-r--r-- | src/citra_qt/util/spinbox.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
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 |