From: Paul Cornett Date: Thu, 7 Dec 2006 09:00:52 +0000 (+0000) Subject: static functions don't need an instance X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/61d8dec77fb3895f7756dd815c78b300e1edb7ac?ds=inline static functions don't need an instance git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43857 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/log.cpp b/src/common/log.cpp index a42d6aaf89..0687124fe8 100644 --- a/src/common/log.cpp +++ b/src/common/log.cpp @@ -329,7 +329,7 @@ void wxLog::OnLog(wxLogLevel level, const wxChar *szString, time_t t) { if ( GetRepetitionCounting() ) { - pLogger->DoLogNumberOfRepeats(); + DoLogNumberOfRepeats(); } ms_prevString = szString; ms_prevLevel = level; diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp index 398d7fffeb..cf149f638a 100644 --- a/src/common/tarstrm.cpp +++ b/src/common/tarstrm.cpp @@ -381,7 +381,7 @@ static inline wxFileOffset GetDataSize(const wxTarEntry& entry) return 0; default: return entry.GetSize(); - }; + } } @@ -824,7 +824,7 @@ wxTarNumber wxTarInputStream::GetHeaderNumber(int id) const { wxString value; - if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) { + if ((value = GetExtendedHeader(wxTarHeaderBlock::Name(id))) != wxEmptyString) { wxTarNumber n = 0; const wxChar *p = value; while (*p == ' ') @@ -841,7 +841,7 @@ wxString wxTarInputStream::GetHeaderString(int id) const { wxString value; - if ((value = GetExtendedHeader(m_hdr->Name(id))) != wxEmptyString) + if ((value = GetExtendedHeader(wxTarHeaderBlock::Name(id))) != wxEmptyString) return value; return wxString(m_hdr->Get(id), GetConv()); @@ -1291,7 +1291,7 @@ bool wxTarOutputStream::ModifyHeader() originalPos = m_parent_o_stream->TellO(); if (originalPos != wxInvalidOffset) 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)) { @@ -1302,7 +1302,7 @@ bool wxTarOutputStream::ModifyHeader() m_chksum += m_hdr->SumField(TAR_SIZE); 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 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)) { return true; } else { - SetExtendedHeader(m_hdr->Name(id), wxLongLong(n).ToString()); + SetExtendedHeader(wxTarHeaderBlock::Name(id), wxLongLong(n).ToString()); return false; } } void wxTarOutputStream::SetHeaderString(int id, const wxString& str) { - strncpy(m_hdr->Get(id), str.mb_str(GetConv()), m_hdr->Len(id)); - if (str.length() > m_hdr->Len(id)) - SetExtendedHeader(m_hdr->Name(id), str); + strncpy(m_hdr->Get(id), str.mb_str(GetConv()), wxTarHeaderBlock::Len(id)); + if (str.length() > wxTarHeaderBlock::Len(id)) + SetExtendedHeader(wxTarHeaderBlock::Name(id), str); } void wxTarOutputStream::SetHeaderDate(const wxString& key,