Browse Source

Add deprecated warning for all remaining callers of plString::IFormat

Remove deprecated warning for plString::IFormat, since it is a helper
Michael Hansen 10 years ago
parent
commit
cea5a37027
  1. 2
      Sources/Plasma/CoreLib/hsStream.h
  2. 1
      Sources/Plasma/CoreLib/plString.h
  3. 4
      Sources/Plasma/PubUtilLib/plSDL/plSDL.h
  4. 11
      Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp

2
Sources/Plasma/CoreLib/hsStream.h

@ -120,7 +120,9 @@ public:
virtual bool IsCompressed() { return false; } virtual bool IsCompressed() { return false; }
uint32_t WriteString(const plString & string) { return Write(string.GetSize(), string.c_str()); } uint32_t WriteString(const plString & string) { return Write(string.GetSize(), string.c_str()); }
hsDeprecated("hsStream::WriteFmt is deprecated -- use plFormat instead")
uint32_t WriteFmt(const char * fmt, ...); uint32_t WriteFmt(const char * fmt, ...);
hsDeprecated("hsStream::WriteFmtV is deprecated -- use plFormat instead")
uint32_t WriteFmtV(const char * fmt, va_list av); uint32_t WriteFmtV(const char * fmt, va_list av);
uint32_t WriteSafeStringLong(const plString &string); // uses 4 bytes for length uint32_t WriteSafeStringLong(const plString &string); // uses 4 bytes for length

1
Sources/Plasma/CoreLib/plString.h

@ -458,7 +458,6 @@ public:
* This function should be called inside of other vararg functions, * This function should be called inside of other vararg functions,
* but those should be eventually replaced with plFormat-based variants. * but those should be eventually replaced with plFormat-based variants.
*/ */
hsDeprecated("plString::IFormat is deprecated -- use plFormat instead")
static plString IFormat(const char *fmt, va_list vptr); static plString IFormat(const char *fmt, va_list vptr);
enum CaseSensitivity { enum CaseSensitivity {

4
Sources/Plasma/PubUtilLib/plSDL/plSDL.h

@ -516,7 +516,11 @@ private:
bool IParseStateDesc(const plFileName& fileName, hsStream* stream, char token[], bool IParseStateDesc(const plFileName& fileName, hsStream* stream, char token[],
plStateDescriptor*& curDesc) const; plStateDescriptor*& curDesc) const;
void DebugMsg(const plString& msg) const;
hsDeprecated("plSDLParser::DebugMsg with format is deprecated -- use plFormat instead")
void DebugMsg(const char* fmt, ...) const; void DebugMsg(const char* fmt, ...) const;
hsDeprecated("plSDLParser::DebugMsgV is deprecated -- use plFormat instead")
void DebugMsgV(const char* fmt, va_list args) const; void DebugMsgV(const char* fmt, va_list args) const;
public: public:

11
Sources/Plasma/PubUtilLib/plSDL/plSDLParser.cpp

@ -47,6 +47,17 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
static const int kTokenLen=256; static const int kTokenLen=256;
void plSDLParser::DebugMsg(const plString& msg) const
{
return;
plNetApp* netApp = plSDLMgr::GetInstance()->GetNetApp();
if (netApp)
hsLogEntry(netApp->DebugMsg(msg));
else
hsStatusMessage(msg.c_str());
}
void plSDLParser::DebugMsg(const char* fmt, ...) const void plSDLParser::DebugMsg(const char* fmt, ...) const
{ {
return; return;

Loading…
Cancel
Save