diff --git a/common/include/Utilities/Assertions.h b/common/include/Utilities/Assertions.h index c35759c578..b2774f24c1 100644 --- a/common/include/Utilities/Assertions.h +++ b/common/include/Utilities/Assertions.h @@ -185,11 +185,7 @@ extern pxDoAssertFnType *pxDoAssert; #define IndexBoundsAssumeDev(objname, idx, sze) pxAssumeDev((uint)(idx) < (uint)(sze), \ pxsFmt(L"Array index out of bounds accessing object '%s' (index=%d, size=%d)", objname, (idx), (sze))) - -extern void pxOnAssert(const DiagnosticOrigin &origin, const wxChar *msg = NULL); -extern void pxOnAssert(const DiagnosticOrigin &origin, const char *msg); extern void pxOnAssert(const DiagnosticOrigin &origin, const wxString &msg); -extern void pxOnAssert(const DiagnosticOrigin &origin, const FastFormatUnicode &msg); // -------------------------------------------------------------------------------------- // jNO_DEFAULT -- disables the default case in a switch, which improves switch optimization diff --git a/common/include/Utilities/wxGuiTools.h b/common/include/Utilities/wxGuiTools.h index cadcdf880d..d2d68e6c86 100644 --- a/common/include/Utilities/wxGuiTools.h +++ b/common/include/Utilities/wxGuiTools.h @@ -680,8 +680,7 @@ protected: wxPoint m_curpos; int m_leading; - virtual void _DoWriteLn(const wxChar *msg); - void _DoWriteLn(const wxString msg); + virtual void _DoWriteLn(const wxString &msg); void _DoWrite(const wxChar *msg); public: diff --git a/common/src/Utilities/Exceptions.cpp b/common/src/Utilities/Exceptions.cpp index b0944bf30f..fc9d52a28f 100644 --- a/common/src/Utilities/Exceptions.cpp +++ b/common/src/Utilities/Exceptions.cpp @@ -95,7 +95,7 @@ bool pxAssertImpl_LogIt(const DiagnosticOrigin &origin, const wxChar *msg) } -DEVASSERT_INLINE void pxOnAssert(const DiagnosticOrigin &origin, const wxChar *msg) +DEVASSERT_INLINE void pxOnAssert(const DiagnosticOrigin &origin, const wxString &msg) { // Recursion guard: Allow at least one recursive call. This is useful because sometimes // we get meaningless assertions while unwinding stack traces after exceptions have occurred. @@ -114,9 +114,9 @@ DEVASSERT_INLINE void pxOnAssert(const DiagnosticOrigin &origin, const wxChar *m if (pxDoAssert == NULL) { // Note: Format uses MSVC's syntax for output window hotlinking. - trapit = pxAssertImpl_LogIt(origin, msg); + trapit = pxAssertImpl_LogIt(origin, msg.wc_str()); } else { - trapit = pxDoAssert(origin, msg); + trapit = pxDoAssert(origin, msg.wc_str()); } if (trapit) { @@ -124,21 +124,6 @@ DEVASSERT_INLINE void pxOnAssert(const DiagnosticOrigin &origin, const wxChar *m } } -__fi void pxOnAssert(const DiagnosticOrigin &origin, const char *msg) -{ - pxOnAssert(origin, fromUTF8(msg)); -} - -__fi void pxOnAssert(const DiagnosticOrigin &origin, const wxString &msg) -{ - pxOnAssert(origin, msg.wc_str()); -} - -__fi void pxOnAssert(const DiagnosticOrigin &origin, const FastFormatUnicode &msg) -{ - pxOnAssert(origin, msg.c_str()); -} - // -------------------------------------------------------------------------------------- // BaseException (implementations) // -------------------------------------------------------------------------------------- diff --git a/common/src/Utilities/pxWindowTextWriter.cpp b/common/src/Utilities/pxWindowTextWriter.cpp index c1ab3e425f..f49adb44fc 100644 --- a/common/src/Utilities/pxWindowTextWriter.cpp +++ b/common/src/Utilities/pxWindowTextWriter.cpp @@ -84,10 +84,8 @@ pxWindowTextWriter &pxWindowTextWriter::MoveY(int ydelta) return *this; } -void pxWindowTextWriter::_DoWriteLn(const wxChar *msg) +void pxWindowTextWriter::_DoWriteLn(const wxString &msg) { - pxAssert(msg); - int tWidth, tHeight; m_dc.GetMultiLineTextExtent(msg, &tWidth, &tHeight); @@ -103,11 +101,6 @@ void pxWindowTextWriter::_DoWriteLn(const wxChar *msg) m_curpos.y += tHeight + m_leading; } -void pxWindowTextWriter::_DoWriteLn(const wxString msg) -{ - _DoWriteLn(msg.wc_str()); -} - // Splits incoming multi-line strings into pieces, and dispatches each line individually // to the text writer. void pxWindowTextWriter::_DoWrite(const wxChar *msg) diff --git a/pcsx2/DebugTools/Debug.h b/pcsx2/DebugTools/Debug.h index 0fdc13725a..6dfece3e73 100644 --- a/pcsx2/DebugTools/Debug.h +++ b/pcsx2/DebugTools/Debug.h @@ -227,7 +227,7 @@ public: ConsoleLogFromVM( const TraceLogDescriptor* desc ) : _parent( desc ) {} - bool Write( const wxChar* msg ) const + bool Write( const wxString &msg ) const { ConsoleColorScope cs(conColor); Console.WriteRaw( msg ); @@ -239,12 +239,6 @@ public: return false; } - - bool Write( const wxString msg ) const - { - return Write(msg.wc_str()); - } - }; // --------------------------------------------------------------------------------------