From bde733b0c646954653799d75d839960af3bd0d39 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 23 Nov 2006 13:51:49 +0000 Subject: [PATCH] moved some wxMimeTypeCommands methods into .cpp file from header, this generally makes sense (methods are too long to be inline anyhow) and might also incidentally fix the compilation with -funsigned-char git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/mimetype.h | 41 ++++---------------------------------- src/common/mimecmn.cpp | 45 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 37 deletions(-) diff --git a/include/wx/mimetype.h b/include/wx/mimetype.h index 59369ba565..3c99c2c621 100644 --- a/include/wx/mimetype.h +++ b/include/wx/mimetype.h @@ -82,20 +82,7 @@ public: } // add a new verb with the command or replace the old value - void AddOrReplaceVerb(const wxString& verb, const wxString& cmd) - { - int n = m_verbs.Index(verb, false /* ignore case */); - if ( n == wxNOT_FOUND ) - { - m_verbs.Add(verb); - m_commands.Add(cmd); - } - else - { - m_commands[n] = cmd; - } - } - + void AddOrReplaceVerb(const wxString& verb, const wxString& cmd); void Add(const wxString& s) { m_verbs.Add(s.BeforeFirst(wxT('='))); @@ -110,31 +97,11 @@ public: bool HasVerb(const wxString& verb) const { return m_verbs.Index(verb) != wxNOT_FOUND; } - wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const - { - wxString s; - - int n = m_verbs.Index(verb); - if ( n != wxNOT_FOUND ) - { - s = m_commands[(size_t)n]; - if ( idx ) - *idx = n; - } - else if ( idx ) - { - // different from any valid index - *idx = (size_t)-1; - } - - return s; - } + // returns empty string and wxNOT_FOUND in idx if no such verb + wxString GetCommandForVerb(const wxString& verb, size_t *idx = NULL) const; // get a "verb=command" string - wxString GetVerbCmd(size_t n) const - { - return m_verbs[n] + wxT('=') + m_commands[n]; - } + wxString GetVerbCmd(size_t n) const; private: wxArrayString m_verbs; diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp index db1cf082f3..9325fb81c3 100644 --- a/src/common/mimecmn.cpp +++ b/src/common/mimecmn.cpp @@ -62,6 +62,51 @@ // common classes // ============================================================================ +// ---------------------------------------------------------------------------- +// wxMimeTypeCommands +// ---------------------------------------------------------------------------- + +void +wxMimeTypeCommands::AddOrReplaceVerb(const wxString& verb, const wxString& cmd) +{ + int n = m_verbs.Index(verb, false /* ignore case */); + if ( n == wxNOT_FOUND ) + { + m_verbs.Add(verb); + m_commands.Add(cmd); + } + else + { + m_commands[n] = cmd; + } +} + +wxString +wxMimeTypeCommands::GetCommandForVerb(const wxString& verb, size_t *idx) const +{ + wxString s; + + int n = m_verbs.Index(verb); + if ( n != wxNOT_FOUND ) + { + s = m_commands[(size_t)n]; + if ( idx ) + *idx = n; + } + else if ( idx ) + { + // different from any valid index + *idx = (size_t)-1; + } + + return s; +} + +wxString wxMimeTypeCommands::GetVerbCmd(size_t n) const +{ + return m_verbs[n] + wxT('=') + m_commands[n]; +} + // ---------------------------------------------------------------------------- // wxFileTypeInfo // ---------------------------------------------------------------------------- -- 2.45.2