From ef24e72b2618806f64345544fa46c84f3f494890 Mon Sep 17 00:00:00 2001
From: archshift <admin@archshift.com>
Date: Tue, 20 Jan 2015 17:16:47 -0800
Subject: 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.
---
 src/citra_qt/config/controller_config.cpp      | 2 +-
 src/citra_qt/debugger/graphics_breakpoints.cpp | 2 +-
 src/citra_qt/debugger/ramview.cpp              | 2 +-
 src/citra_qt/util/spinbox.cpp                  | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/citra_qt')

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()
     }
 }
 
-*/
\ No newline at end of file
+*/
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
                 { Pica::DebugContext::Event::VertexLoaded, tr("Vertex loaded") }
             };
 
-            _dbg_assert_(Debug_GPU, map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents));
+            DEBUG_ASSERT(map.size() == static_cast<size_t>(Pica::DebugContext::Event::NumEvents));
 
             return (map.find(event) != map.end()) ? map.at(event) : QString();
         }
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()
 {
     // TODO: QHexEdit doesn't show vertical scroll bars for > 10MB data streams...
     //setData(QByteArray((const char*)Mem_RAM,sizeof(Mem_RAM)/8));
-}
\ No newline at end of file
+}
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 @@
 #include <QLineEdit>
 #include <QRegExpValidator>
 
-#include "common/log.h"
-
+#include "common/assert.h"
 #include "spinbox.h"
 
 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
     if (strpos >= input.length() - HasSign() - suffix.length())
         return QValidator::Intermediate;
 
-    _dbg_assert_(Frontend, base <= 10 || base == 16);
+    DEBUG_ASSERT(base <= 10 || base == 16);
     QString regexp;
 
     // Demand sign character for negative ranges
-- 
cgit v1.2.3