mirror of https://github.com/PCSX2/pcsx2.git
partially revert c5d2343f51
Parameter name can help to understand the code so let's keep them. Clang warning was disabled in previous commit
This commit is contained in:
parent
79f6aacc85
commit
4fdfd04d3c
|
@ -129,32 +129,32 @@ struct IConsoleWriter
|
||||||
//
|
//
|
||||||
struct NullConsoleWriter
|
struct NullConsoleWriter
|
||||||
{
|
{
|
||||||
void WriteRaw( const wxString& ) {}
|
void WriteRaw( const wxString& fmt ) {}
|
||||||
void DoWriteLn( const wxString& ) {}
|
void DoWriteLn( const wxString& fmt ) {}
|
||||||
void DoSetColor( ConsoleColors ) {}
|
void DoSetColor( ConsoleColors color ) {}
|
||||||
void DoWriteFromStdout( const wxString& ) {}
|
void DoWriteFromStdout( const wxString& fmt ) {}
|
||||||
void Newline() {}
|
void Newline() {}
|
||||||
void SetTitle( const wxString& ) {}
|
void SetTitle( const wxString& title ) {}
|
||||||
|
|
||||||
|
|
||||||
ConsoleColors GetColor() const { return Color_Current; }
|
ConsoleColors GetColor() const { return Color_Current; }
|
||||||
const NullConsoleWriter& SetColor( ConsoleColors ) const { return *this; }
|
const NullConsoleWriter& SetColor( ConsoleColors color ) const { return *this; }
|
||||||
const NullConsoleWriter& ClearColor() const { return *this; }
|
const NullConsoleWriter& ClearColor() const { return *this; }
|
||||||
const NullConsoleWriter& SetIndent( int =1 ) const { return *this; }
|
const NullConsoleWriter& SetIndent( int tabcount=1 ) const { return *this; }
|
||||||
|
|
||||||
NullConsoleWriter Indent( int =1 ) const { return NullConsoleWriter(); }
|
NullConsoleWriter Indent( int tabcount=1 ) const { return NullConsoleWriter(); }
|
||||||
|
|
||||||
bool FormatV( const char* , va_list ) const { return false; }
|
bool FormatV( const char* fmt, va_list args ) const { return false; }
|
||||||
bool WriteLn( ConsoleColors , const char* , ... ) const { return false; }
|
bool WriteLn( ConsoleColors color, const char* fmt, ... ) const { return false; }
|
||||||
bool WriteLn( const char* , ... ) const { return false; }
|
bool WriteLn( const char* fmt, ... ) const { return false; }
|
||||||
bool Error( const char* , ... ) const { return false; }
|
bool Error( const char* fmt, ... ) const { return false; }
|
||||||
bool Warning( const char* , ... ) const { return false; }
|
bool Warning( const char* fmt, ... ) const { return false; }
|
||||||
|
|
||||||
bool FormatV( const wxChar* , va_list ) const { return false; }
|
bool FormatV( const wxChar* fmt, va_list args ) const { return false; }
|
||||||
bool WriteLn( ConsoleColors , const wxChar* , ... ) const { return false; }
|
bool WriteLn( ConsoleColors color, const wxChar* fmt, ... ) const { return false; }
|
||||||
bool WriteLn( const wxChar* , ... ) const { return false; }
|
bool WriteLn( const wxChar* fmt, ... ) const { return false; }
|
||||||
bool Error( const wxChar* , ... ) const { return false; }
|
bool Error( const wxChar* fmt, ... ) const { return false; }
|
||||||
bool Warning( const wxChar* , ... ) const { return false; }
|
bool Warning( const wxChar* fmt, ... ) const { return false; }
|
||||||
};
|
};
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------
|
// --------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -52,12 +52,12 @@ public:
|
||||||
OnPageFaultEvent( evtinfo, handled );
|
OnPageFaultEvent( evtinfo, handled );
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void DispatchEvent( const PageFaultInfo& )
|
virtual void DispatchEvent( const PageFaultInfo& evtinfo )
|
||||||
{
|
{
|
||||||
pxFailRel( "Don't call me, damnit. Use DispatchException instead." );
|
pxFailRel( "Don't call me, damnit. Use DispatchException instead." );
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void OnPageFaultEvent( const PageFaultInfo& , bool& ) {}
|
virtual void OnPageFaultEvent( const PageFaultInfo& evtinfo, bool& handled ) {}
|
||||||
};
|
};
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------
|
// --------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -44,7 +44,7 @@ namespace Threading
|
||||||
void SetThread( pxThread& thr ) { m_thread = &thr; }
|
void SetThread( pxThread& thr ) { m_thread = &thr; }
|
||||||
void SetThread( pxThread* thr ) { m_thread = thr; }
|
void SetThread( pxThread* thr ) { m_thread = thr; }
|
||||||
|
|
||||||
void DispatchEvent( const int& )
|
void DispatchEvent( const int& params )
|
||||||
{
|
{
|
||||||
OnThreadCleanup();
|
OnThreadCleanup();
|
||||||
}
|
}
|
||||||
|
|
|
@ -143,7 +143,7 @@ public:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void ApplyPrefix( FastFormatAscii& ) const {}
|
virtual void ApplyPrefix( FastFormatAscii& ascii ) const {}
|
||||||
virtual void DoWrite( const char* fmt ) const=0;
|
virtual void DoWrite( const char* fmt ) const=0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -438,7 +438,7 @@ public:
|
||||||
|
|
||||||
// NOTE: Enabling system menu on dialogs usually doesn't work, and might cause
|
// NOTE: Enabling system menu on dialogs usually doesn't work, and might cause
|
||||||
// other unwanted behavior, such as a missing close button.
|
// other unwanted behavior, such as a missing close button.
|
||||||
pxDialogCreationFlags SystemMenu( bool =true ) const
|
pxDialogCreationFlags SystemMenu( bool enable=true ) const
|
||||||
{
|
{
|
||||||
return pxDialogCreationFlags(*this).SetSystemMenu( false );
|
return pxDialogCreationFlags(*this).SetSystemMenu( false );
|
||||||
}
|
}
|
||||||
|
@ -648,7 +648,7 @@ public:
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
// line may be empty
|
// line may be empty
|
||||||
virtual void OnOutputLine(const wxString&) { }
|
virtual void OnOutputLine(const wxString& line) { }
|
||||||
|
|
||||||
// called at the start of every new line (except the very first one)
|
// called at the start of every new line (except the very first one)
|
||||||
virtual void OnNewLine() { }
|
virtual void OnNewLine() { }
|
||||||
|
|
|
@ -648,7 +648,6 @@ struct Gif_Unit {
|
||||||
}
|
}
|
||||||
|
|
||||||
void PrintPathInfo(GIF_PATH path) {
|
void PrintPathInfo(GIF_PATH path) {
|
||||||
(void)path; // avoid silly warning
|
|
||||||
GUNIT_LOG("Gif Path %d - [hasData = %d][state = %d]", path,
|
GUNIT_LOG("Gif Path %d - [hasData = %d][state = %d]", path,
|
||||||
gifPath[path].hasDataRemaining(), gifPath[path].state);
|
gifPath[path].hasDataRemaining(), gifPath[path].state);
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,9 +42,9 @@ public:
|
||||||
|
|
||||||
virtual void close() = 0;
|
virtual void close() = 0;
|
||||||
|
|
||||||
virtual int lseek(s32 , s32 ) { return -IOP_EIO; }
|
virtual int lseek(s32 offset, s32 whence) { return -IOP_EIO; }
|
||||||
virtual int read(void *, u32 ) { return -IOP_EIO; }
|
virtual int read(void *buf, u32 count) { return -IOP_EIO; }
|
||||||
virtual int write(void *, u32 ) { return -IOP_EIO; }
|
virtual int write(void *buf, u32 count) { return -IOP_EIO; }
|
||||||
};
|
};
|
||||||
|
|
||||||
class IOManDir {
|
class IOManDir {
|
||||||
|
|
|
@ -236,7 +236,7 @@ public:
|
||||||
IEventListener_SysState() {}
|
IEventListener_SysState() {}
|
||||||
virtual ~IEventListener_SysState() throw() {}
|
virtual ~IEventListener_SysState() throw() {}
|
||||||
|
|
||||||
virtual void DispatchEvent( const SysStateUnlockedParams& )
|
virtual void DispatchEvent( const SysStateUnlockedParams& status )
|
||||||
{
|
{
|
||||||
SysStateAction_OnUnlocked();
|
SysStateAction_OnUnlocked();
|
||||||
}
|
}
|
||||||
|
|
|
@ -177,10 +177,10 @@ public:
|
||||||
|
|
||||||
void Step();
|
void Step();
|
||||||
void Execute(u32 cycles);
|
void Execute(u32 cycles);
|
||||||
void Clear(u32 , u32 ) {}
|
void Clear(u32 addr, u32 size) {}
|
||||||
|
|
||||||
uint GetCacheReserve() const { return 0; }
|
uint GetCacheReserve() const { return 0; }
|
||||||
void SetCacheReserve( uint ) const {}
|
void SetCacheReserve( uint reserveInMegs ) const {}
|
||||||
};
|
};
|
||||||
|
|
||||||
class InterpVU1 : public BaseVUmicroCPU
|
class InterpVU1 : public BaseVUmicroCPU
|
||||||
|
@ -198,11 +198,11 @@ public:
|
||||||
|
|
||||||
void Step();
|
void Step();
|
||||||
void Execute(u32 cycles);
|
void Execute(u32 cycles);
|
||||||
void Clear(u32 , u32 ) {}
|
void Clear(u32 addr, u32 size) {}
|
||||||
void ResumeXGkick() {}
|
void ResumeXGkick() {}
|
||||||
|
|
||||||
uint GetCacheReserve() const { return 0; }
|
uint GetCacheReserve() const { return 0; }
|
||||||
void SetCacheReserve( uint ) const {}
|
void SetCacheReserve( uint reserveInMegs ) const {}
|
||||||
};
|
};
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------
|
// --------------------------------------------------------------------------------------
|
||||||
|
|
Loading…
Reference in New Issue