X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9bbb2d877071a8febecfdf77c06bcea868c4c16..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index deb9fb624a..e85d76f28e 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -141,24 +141,8 @@ public: wxString sTmp = GetLine(i).AfterFirst(wxT('=')); return sTmp; } - -protected: - // we override this virtual method because we want to always use UTF-8 - // conversion allowing for invalid characters as MIME information files - // often contain lines in different encodings and can't be read using any - // single conversion in Unicode build, so we just try to read what we can - // suing the most common encoding (UTF-8 is almost ubiquitous nowadays) and - // ignore the rest - virtual bool OnRead(const wxMBConv& conv) - { - return wxTextFile::OnRead( - wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)); - } }; -// in case we're compiling in non-GUI mode -class WXDLLEXPORT wxIcon; - // ---------------------------------------------------------------------------- // constants // ---------------------------------------------------------------------------- @@ -1019,7 +1003,7 @@ void wxMimeTypesManagerImpl::LoadKDEApp(const wxString& filename) wxStringTokenizer tokenizer(mimetypes, _T(";")); while(tokenizer.HasMoreTokens()) { wxString mimetype = tokenizer.GetNextToken().Lower(); - int nIndex = m_aTypes.Index(mimetype); + nIndex = m_aTypes.Index(mimetype); if(nIndex != wxNOT_FOUND) { // is this a known MIME type? wxMimeTypeCommands* entry = m_aEntries[nIndex]; entry->AddOrReplaceVerb(wxT("open"), sCmd); @@ -1083,7 +1067,7 @@ static wxString ReadPathFromKDEConfig(const wxString& request) wxString str; wxArrayString output; if(wxExecute(wxT("kde-config --path ")+request, output) == 0 && - output.Count() > 0) + output.GetCount() > 0) str = output.Item(0); return str; } @@ -1111,7 +1095,7 @@ static wxString GetKDEThemeInFile(const wxFileName& filename) static wxString GetKDETheme(const wxArrayString& basedirs) { wxString theme; - for(size_t i = 0; i < basedirs.Count(); i++) { + for(size_t i = 0; i < basedirs.GetCount(); i++) { wxFileName filename(basedirs.Item(i), wxEmptyString); filename.AppendDir( wxT("share") ); filename.AppendDir( wxT("config") ); @@ -1122,7 +1106,7 @@ static wxString GetKDETheme(const wxArrayString& basedirs) } // If $KDEDIRS and $KDEDIR were set, we try nothing more. Otherwise, we // try to get the configuration file with 'kde-config'. - if(basedirs.Count() > 1) + if(basedirs.GetCount() > 1) return theme; wxString paths = ReadPathFromKDEConfig(wxT("config")); if(! paths.IsEmpty()) { @@ -1145,7 +1129,7 @@ static void GetKDEIconDirs(const wxArrayString& basedirs, if(theme.IsEmpty()) theme = wxT("default.kde"); - for(size_t i = 0; i < basedirs.Count(); i++) { + for(size_t i = 0; i < basedirs.GetCount(); i++) { wxFileName dirname(basedirs.Item(i), wxEmptyString); dirname.AppendDir( wxT("share") ); dirname.AppendDir( wxT("icons") ); @@ -1157,7 +1141,7 @@ static void GetKDEIconDirs(const wxArrayString& basedirs, } // If $KDEDIRS and $KDEDIR were not set, use 'kde-config' - if(basedirs.Count() > 1) + if(basedirs.GetCount() > 1) return; wxString paths = ReadPathFromKDEConfig(wxT("icon")); if(! paths.IsEmpty()) { @@ -1178,7 +1162,7 @@ static void GetKDEIconDirs(const wxArrayString& basedirs, static void GetKDEMimeDirs(const wxArrayString& basedirs, wxArrayString& mimedirs) { - for(size_t i = 0; i < basedirs.Count(); i++) { + for(size_t i = 0; i < basedirs.GetCount(); i++) { wxFileName dirname(basedirs.Item(i), wxEmptyString); dirname.AppendDir( wxT("share") ); dirname.AppendDir( wxT("mimelnk") ); @@ -1187,7 +1171,7 @@ static void GetKDEMimeDirs(const wxArrayString& basedirs, } // If $KDEDIRS and $KDEDIR were not set, use 'kde-config' - if(basedirs.Count() > 1) + if(basedirs.GetCount() > 1) return; wxString paths = ReadPathFromKDEConfig(wxT("mime")); if(! paths.IsEmpty()) { @@ -1206,7 +1190,7 @@ static void GetKDEMimeDirs(const wxArrayString& basedirs, static void GetKDEAppsDirs(const wxArrayString& basedirs, wxArrayString& appsdirs) { - for(size_t i = 0; i < basedirs.Count(); i++) { + for(size_t i = 0; i < basedirs.GetCount(); i++) { wxFileName dirname(basedirs.Item(i), wxEmptyString); dirname.AppendDir( wxT("share") ); dirname.AppendDir( wxT("applnk") ); @@ -1215,7 +1199,7 @@ static void GetKDEAppsDirs(const wxArrayString& basedirs, } // If $KDEDIRS and $KDEDIR were not set, use 'kde-config' - if(basedirs.Count() > 1) + if(basedirs.GetCount() > 1) return; wxString paths = ReadPathFromKDEConfig(wxT("apps")); if(! paths.IsEmpty()) { @@ -1367,14 +1351,15 @@ size_t wxFileTypeImpl::GetAllCommands(wxArrayString *verbs, bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) { - wxString strExtensions = m_manager->GetExtension(m_index[0]); + const wxString strExtensions = m_manager->GetExtension(m_index[0]); extensions.Empty(); // one extension in the space or comma-delimited list wxString strExt; - for ( const wxChar *p = strExtensions; /* nothing */; p++ ) + wxString::const_iterator end = strExtensions.end(); + for ( wxString::const_iterator p = strExtensions.begin(); /* nothing */; ++p ) { - if ( *p == wxT(' ') || *p == wxT(',') || *p == wxT('\0') ) + if ( p == end || *p == wxT(' ') || *p == wxT(',') ) { if ( !strExt.empty() ) { @@ -1384,7 +1369,7 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) //else: repeated spaces // (shouldn't happen, but it's not that important if it does happen) - if ( *p == wxT('\0') ) + if ( p == end ) break; } else if ( *p == wxT('.') ) @@ -1425,14 +1410,27 @@ wxFileTypeImpl::SetCommand(const wxString& cmd, wxMimeTypeCommands *entry = new wxMimeTypeCommands(); entry->Add(verb + wxT("=") + cmd + wxT(" %s ")); - bool ok = true; + bool ok = false; size_t nCount = strTypes.GetCount(); for ( size_t i = 0; i < nCount; i++ ) { - if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc)) - ok = false; + if ( m_manager->DoAssociation + ( + strTypes[i], + strIcon, + entry, + strExtensions, + strDesc + ) ) + { + // DoAssociation() took ownership of entry, don't delete it below + ok = true; + } } + if ( !ok ) + delete entry; + return ok; } @@ -1451,23 +1449,28 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index) return false; wxMimeTypeCommands *entry = new wxMimeTypeCommands(); - bool ok = true; + bool ok = false; size_t nCount = strTypes.GetCount(); for ( size_t i = 0; i < nCount; i++ ) { - if ( !m_manager->DoAssociation - ( + if ( m_manager->DoAssociation + ( strTypes[i], strIcon, entry, strExtensions, strDesc - ) ) + ) ) { - ok = false; + // we don't need to free entry now, DoAssociation() took ownership + // of it + ok = true; } } + if ( !ok ) + delete entry; + return ok; } @@ -1512,9 +1515,11 @@ void wxMimeTypesManagerImpl::Initialize(int mailcapStyles, if (mailcapStyles & wxMAILCAP_GNOME) GetGnomeMimeInfo(sExtraDir); - // read KDE tables + // read KDE tables which are never installed on OpenVMS +#ifndef __VMS if (mailcapStyles & wxMAILCAP_KDE) GetKDEMimeInfo(sExtraDir); +#endif m_mailcapStylesInited |= mailcapStyles; } @@ -2081,10 +2086,10 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType, } // check data integrity - wxASSERT( m_aTypes.Count() == m_aEntries.Count() && - m_aTypes.Count() == m_aExtensions.Count() && - m_aTypes.Count() == m_aIcons.Count() && - m_aTypes.Count() == m_aDescriptions.Count() ); + wxASSERT( m_aTypes.GetCount() == m_aEntries.GetCount() && + m_aTypes.GetCount() == m_aExtensions.GetCount() && + m_aTypes.GetCount() == m_aIcons.GetCount() && + m_aTypes.GetCount() == m_aDescriptions.GetCount() ); return nIndex; } @@ -2142,7 +2147,7 @@ wxFileType * wxMimeTypesManagerImpl::GetFileTypeFromMimeType(const wxString& mim index = wxNOT_FOUND; wxString strCategory = mimetype.BeforeFirst(wxT('/')); - size_t nCount = m_aTypes.Count(); + size_t nCount = m_aTypes.GetCount(); for ( size_t n = 0; n < nCount; n++ ) { if ( (m_aTypes[n].BeforeFirst(wxT('/')) == strCategory ) && @@ -2468,8 +2473,7 @@ wxMimeTypesManagerImpl::ProcessOtherMailcapField(MailcapLineData& data, } // is this something of the form foo=bar? - const wxChar *pEq = wxStrchr(curField, wxT('=')); - if ( pEq != NULL ) + if ( curField.find('=') != wxString::npos ) { // split "LHS = RHS" in 2 wxString lhs = curField.BeforeFirst(wxT('=')), @@ -2593,8 +2597,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, Field_Type, Field_OpenCmd, Field_Other - } - currentToken = Field_Type; + } currentToken = Field_Type; // the flags and field values on the current line MailcapLineData data; @@ -2745,8 +2748,8 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName, if ( data.needsterminal ) { - data.cmdOpen.Printf(wxT("xterm -e sh -c '%s'"), - data.cmdOpen.c_str()); + data.cmdOpen.insert(0, wxT("xterm -e sh -c '")); + data.cmdOpen.append(wxT("'")); } if ( !data.cmdOpen.empty() ) @@ -2851,10 +2854,10 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) } } // check data integrity - wxASSERT( m_aTypes.Count() == m_aEntries.Count() && - m_aTypes.Count() == m_aExtensions.Count() && - m_aTypes.Count() == m_aIcons.Count() && - m_aTypes.Count() == m_aDescriptions.Count() ); + wxASSERT( m_aTypes.GetCount() == m_aEntries.GetCount() && + m_aTypes.GetCount() == m_aExtensions.GetCount() && + m_aTypes.GetCount() == m_aIcons.GetCount() && + m_aTypes.GetCount() == m_aDescriptions.GetCount() ); return true; }