From 489a164c1c56855b29285230237c69514ff823e1 Mon Sep 17 00:00:00 2001 From: Michael Wetherell Date: Sun, 29 Oct 2006 16:47:20 +0000 Subject: [PATCH] Rename wxSTREAM_FILEEXTENSION to wxSTREAM_FILEEXT. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42621 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/stream.h | 8 ++++---- src/common/stream.cpp | 8 +++----- src/common/tarstrm.cpp | 8 ++++---- src/common/zipstrm.cpp | 8 ++++---- src/common/zstream.cpp | 10 +++++----- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/include/wx/stream.h b/include/wx/stream.h index 505bb34625..62dced0447 100644 --- a/include/wx/stream.h +++ b/include/wx/stream.h @@ -327,10 +327,10 @@ protected: enum wxStreamProtocolType { - wxSTREAM_PROTOCOL, // wxFileSystem protocol (should be only one) - wxSTREAM_MIMETYPE, // Mime types the stream handles - wxSTREAM_ENCODING, // The http Content-Encodings the stream handles - wxSTREAM_FILEEXTENSION // File extensions the stream handles + wxSTREAM_PROTOCOL, // wxFileSystem protocol (should be only one) + wxSTREAM_MIMETYPE, // MIME types the stream handles + wxSTREAM_ENCODING, // The HTTP Content-Encodings the stream handles + wxSTREAM_FILEEXT // File extensions the stream handles }; void WXDLLIMPEXP_BASE wxUseFilterClasses(); diff --git a/src/common/stream.cpp b/src/common/stream.cpp index 5407bd2062..83c302f5d1 100644 --- a/src/common/stream.cpp +++ b/src/common/stream.cpp @@ -1121,9 +1121,7 @@ wxString::size_type wxFilterClassFactoryBase::FindExtension( { size_t len = wxStrlen(location); - for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXTENSION); - p && *p; - p++) + for (const wxChar *const *p = GetProtocols(wxSTREAM_FILEEXT); *p; p++) { size_t l = wxStrlen(*p); @@ -1137,10 +1135,10 @@ wxString::size_type wxFilterClassFactoryBase::FindExtension( bool wxFilterClassFactoryBase::CanHandle(const wxChar *protocol, wxStreamProtocolType type) const { - if (type == wxSTREAM_FILEEXTENSION) + if (type == wxSTREAM_FILEEXT) return FindExtension(protocol) != wxString::npos; else - for (const wxChar *const *p = GetProtocols(type); p && *p; p++) + for (const wxChar *const *p = GetProtocols(type); *p; p++) if (wxStrcmp(*p, protocol) == 0) return true; diff --git a/src/common/tarstrm.cpp b/src/common/tarstrm.cpp index 18412660d7..65fc6a2763 100644 --- a/src/common/tarstrm.cpp +++ b/src/common/tarstrm.cpp @@ -108,10 +108,10 @@ wxTarClassFactory::GetProtocols(wxStreamProtocolType type) const static const wxChar *empty[] = { NULL }; switch (type) { - case wxSTREAM_PROTOCOL: return protocols; - case wxSTREAM_MIMETYPE: return mimetypes; - case wxSTREAM_FILEEXTENSION: return fileexts; - default: return empty; + case wxSTREAM_PROTOCOL: return protocols; + case wxSTREAM_MIMETYPE: return mimetypes; + case wxSTREAM_FILEEXT: return fileexts; + default: return empty; } } diff --git a/src/common/zipstrm.cpp b/src/common/zipstrm.cpp index 3a533fcb93..484dbabcc0 100644 --- a/src/common/zipstrm.cpp +++ b/src/common/zipstrm.cpp @@ -157,10 +157,10 @@ wxZipClassFactory::GetProtocols(wxStreamProtocolType type) const static const wxChar *empty[] = { NULL }; switch (type) { - case wxSTREAM_PROTOCOL: return protocols; - case wxSTREAM_MIMETYPE: return mimetypes; - case wxSTREAM_FILEEXTENSION: return fileexts; - default: return empty; + case wxSTREAM_PROTOCOL: return protocols; + case wxSTREAM_MIMETYPE: return mimetypes; + case wxSTREAM_FILEEXT: return fileexts; + default: return empty; } } diff --git a/src/common/zstream.cpp b/src/common/zstream.cpp index 3ba96cf3cb..d614778813 100644 --- a/src/common/zstream.cpp +++ b/src/common/zstream.cpp @@ -100,11 +100,11 @@ wxGzipClassFactory::GetProtocols(wxStreamProtocolType type) const { NULL }; switch (type) { - case wxSTREAM_PROTOCOL: return protos; - case wxSTREAM_MIMETYPE: return mimes; - case wxSTREAM_ENCODING: return encs; - case wxSTREAM_FILEEXTENSION: return exts; - default: return empty; + case wxSTREAM_PROTOCOL: return protos; + case wxSTREAM_MIMETYPE: return mimes; + case wxSTREAM_ENCODING: return encs; + case wxSTREAM_FILEEXT: return exts; + default: return empty; } } -- 2.45.2