X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d9bbb2d877071a8febecfdf77c06bcea868c4c16..129b8b1a215fc1fcc1b9f06daa0aeaf22bbce614:/src/unix/mimetype.cpp diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp index deb9fb624a..20b96b5c21 100644 --- a/src/unix/mimetype.cpp +++ b/src/unix/mimetype.cpp @@ -149,10 +149,10 @@ protected: // 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) + virtual bool OnRead(const wxMBConv& WXUNUSED(conv)) { return wxTextFile::OnRead( - wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_OCTAL)); + wxMBConvUTF8(wxMBConvUTF8::MAP_INVALID_UTF8_TO_PUA)); } }; @@ -1083,7 +1083,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 +1111,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 +1122,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 +1145,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 +1157,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 +1178,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 +1187,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 +1206,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 +1215,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()) { @@ -1425,14 +1425,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 +1464,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 +1530,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 +2101,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 +2162,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 ) && @@ -2745,8 +2765,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 +2871,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; }