Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

static functions don't need an instance

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Paul Cornett
2006-12-07 09:00:52 +00:00
parent d7e15728ea
commit 61d8dec77f
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/log.cpp
View File

@@ -329,7 +329,7 @@ void wxLog::OnLog(wxLogLevel level, const wxChar *szString, time_t t)
{ {
if ( GetRepetitionCounting() ) if ( GetRepetitionCounting() )
{ {
pLogger->DoLogNumberOfRepeats(); DoLogNumberOfRepeats();
} }
ms_prevString = szString; ms_prevString = szString;
ms_prevLevel = level; ms_prevLevel = level;

18
src/common/tarstrm.cpp
View File

@@ -381,7 +381,7 @@ static inline wxFileOffset GetDataSize(const wxTarEntry& entry)
return 0; return 0;
default: default:
return entry.GetSize(); return entry.GetSize();
}; }
} }
@@ -824,7 +824,7 @@ wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const
{ {
wxString value; wxString value;
if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) { if ((value = GetExtendedHeader(wxTarHeaderBlock::Name(id))) != wxEmptyString) {
wxTarNumber n = 0; wxTarNumber n = 0;
const wxChar *p = value; const wxChar *p = value;
while (*p == ' ') while (*p == ' ')
@@ -841,7 +841,7 @@ wxString wxTarInputStream::GetHeaderString(int id) const
{ {
wxString value; wxString value;
if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) if ((value = GetExtendedHeader(wxTarHeaderBlock::Name(id))) != wxEmptyString)
return value; return value;
return wxString(m_hdr->Get(id), GetConv()); return wxString(m_hdr->Get(id), GetConv());
@@ -1291,7 +1291,7 @@ bool wxTarOutputStream::ModifyHeader()
originalPos = m_parent_o_stream->TellO(); originalPos = m_parent_o_stream->TellO();
if (originalPos != wxInvalidOffset) if (originalPos != wxInvalidOffset)
sizePos = sizePos =
m_parent_o_stream->SeekO(m_headpos + m_hdr->Offset(TAR_SIZE)); m_parent_o_stream->SeekO(m_headpos + wxTarHeaderBlock::Offset(TAR_SIZE));
} }
if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) { if (sizePos == wxInvalidOffset || !m_hdr->SetOctal(TAR_SIZE, m_pos)) {
@@ -1302,7 +1302,7 @@ bool wxTarOutputStream::ModifyHeader()
m_chksum += m_hdr->SumField(TAR_SIZE); m_chksum += m_hdr->SumField(TAR_SIZE);
m_hdr->SetOctal(TAR_CHKSUM, m_chksum); m_hdr->SetOctal(TAR_CHKSUM, m_chksum);
wxFileOffset sumPos = m_headpos + m_hdr->Offset(TAR_CHKSUM); wxFileOffset sumPos = m_headpos + wxTarHeaderBlock::Offset(TAR_CHKSUM);
return return
m_hdr->WriteField(*m_parent_o_stream, TAR_SIZE) && m_hdr->WriteField(*m_parent_o_stream, TAR_SIZE) &&
@@ -1322,16 +1322,16 @@ bool wxTarOutputStream::SetHeaderNumber(int id, wxTarNumber n)
if (m_hdr->SetOctal(id, n)) { if (m_hdr->SetOctal(id, n)) {
return true; return true;
} else { } else {
SetExtendedHeader(m_hdr->Name(id), wxLongLong(n).ToString()); SetExtendedHeader(wxTarHeaderBlock::Name(id), wxLongLong(n).ToString());
return false; return false;
} }
} }
void wxTarOutputStream::SetHeaderString(int id, const wxString& str) void wxTarOutputStream::SetHeaderString(int id, const wxString& str)
{ {
strncpy(m_hdr->Get(id), str.mb_str(GetConv()), m_hdr->Len(id)); strncpy(m_hdr->Get(id), str.mb_str(GetConv()), wxTarHeaderBlock::Len(id));
if (str.length() > m_hdr->Len(id)) if (str.length() > wxTarHeaderBlock::Len(id))
SetExtendedHeader(m_hdr->Name(id), str); SetExtendedHeader(wxTarHeaderBlock::Name(id), str);
} }
void wxTarOutputStream::SetHeaderDate(const wxString& key, void wxTarOutputStream::SetHeaderDate(const wxString& key,