Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ 1579280 ] small src/unix/mimetype.cpp optimizations

Browse Source 
I'm not sure if this actually changes the assembly in
a smart compiler, but who knows.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@42093 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2006-10-18 17:19:22 +00:00
parent dcc36b34be
commit 15d4b8cdb5
1 changed files with 47 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
src/unix/mimetype.cpp
View File

@@ -345,7 +345,7 @@ void wxMimeTypesManagerImpl::LoadGnomeDataFromKeyFile(const wxString& filename,
// calls to FileExist() required) // calls to FileExist() required)
if (nDir != 0) if (nDir != 0)
{ {
wxString tmp = search_dirs[nDir]; const wxString &tmp = search_dirs[nDir];
search_dirs.RemoveAt( nDir ); search_dirs.RemoveAt( nDir );
search_dirs.Insert( tmp, 0 ); search_dirs.Insert( tmp, 0 );
} }
@@ -730,7 +730,7 @@ bool wxMimeTypesManagerImpl::WriteKDEMimeFile(int index, bool delete_index)
{ {
// holds an extension; need to change it to *.ext; // holds an extension; need to change it to *.ext;
wxString e = wxT("*.") + tokenizer.GetNextToken() + wxT(";"); wxString e = wxT("*.") + tokenizer.GetNextToken() + wxT(";");
sTmp = sTmp + e; sTmp += e;
} }
if (!delete_index) if (!delete_index)
@@ -897,7 +897,7 @@ void wxMimeTypesManagerImpl::LoadKDELinksForMimeSubtype(const wxString& dirbase,
// we expect %f; others including %F and %U and %u are possible // we expect %f; others including %F and %U and %u are possible
wxString sTmp = file.GetCmd(nIndex); wxString sTmp = file.GetCmd(nIndex);
if (0 == sTmp.Replace( wxT("%f"), wxT("%s") )) if (0 == sTmp.Replace( wxT("%f"), wxT("%s") ))
sTmp = sTmp + wxT(" %s"); sTmp += wxT(" %s");
entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp ); entry->AddOrReplaceVerb(wxString(wxT("open")), sTmp );
} }
@@ -1007,8 +1007,8 @@ void wxMimeTypesManagerImpl::GetKDEMimeInfo(const wxString& sExtraDir)
// Check for entry // Check for entry
wxString theme(wxT("default.kde")); wxString theme(wxT("default.kde"));
size_t cnt = config.GetLineCount(); size_t nCount = config.GetLineCount();
for (size_t i = 0; i < cnt; i++) for (size_t i = 0; i < nCount; i++)
{ {
if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/)) if (config[i].StartsWith(wxT("Theme="), &theme/*rest*/))
break; break;
@@ -1135,7 +1135,8 @@ bool wxFileTypeImpl::GetIcon(wxIconLocation *iconLoc) const
bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
{ {
mimeTypes.Clear(); mimeTypes.Clear();
for (size_t i = 0; i < m_index.GetCount(); i++) size_t nCount = m_index.GetCount();
for (size_t i = 0; i < nCount; i++)
mimeTypes.Add(m_manager->m_aTypes[m_index[i]]); mimeTypes.Add(m_manager->m_aTypes[m_index[i]]);
return true; return true;
@@ -1248,7 +1249,8 @@ wxFileTypeImpl::SetCommand(const wxString& cmd,
entry->Add(verb + wxT("=") + cmd + wxT(" %s ")); entry->Add(verb + wxT("=") + cmd + wxT(" %s "));
bool ok = true; bool ok = true;
for ( size_t i = 0; i < strTypes.GetCount(); i++ ) size_t nCount = strTypes.GetCount();
for ( size_t i = 0; i < nCount; i++ )
{ {
if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc)) if (!m_manager->DoAssociation(strTypes[i], strIcon, entry, strExtensions, strDesc))
ok = false; ok = false;
@@ -1257,7 +1259,7 @@ wxFileTypeImpl::SetCommand(const wxString& cmd,
return ok; return ok;
} }
// ignore index on the grouds that we only have one icon in a Unix file // ignore index on the grounds that we only have one icon in a Unix file
bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index)) bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index))
{ {
if (strIcon.empty()) if (strIcon.empty())
@@ -1273,7 +1275,8 @@ bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index)
wxMimeTypeCommands *entry = new wxMimeTypeCommands(); wxMimeTypeCommands *entry = new wxMimeTypeCommands();
bool ok = true; bool ok = true;
for ( size_t i = 0; i < strTypes.GetCount(); i++ ) size_t nCount = strTypes.GetCount();
for ( size_t i = 0; i < nCount; i++ )
{ {
if ( !m_manager->DoAssociation if ( !m_manager->DoAssociation
( (
@@ -1308,7 +1311,7 @@ void wxMimeTypesManagerImpl::InitIfNeeded()
// set the flag first to prevent recursion // set the flag first to prevent recursion
m_initialized = true; m_initialized = true;
wxString wm = wxGetenv( wxT("WINDOWMANAGER") ); const wxString &wm = wxGetenv( wxT("WINDOWMANAGER") );
if (wm.Find( wxT("kde") ) != wxNOT_FOUND) if (wm.Find( wxT("kde") ) != wxNOT_FOUND)
Initialize( wxMAILCAP_KDE ); Initialize( wxMAILCAP_KDE );
@@ -1385,20 +1388,21 @@ void wxMimeTypesManagerImpl::GetMimeInfo(const wxString& sExtraDir)
if (!sExtraDir.empty()) if (!sExtraDir.empty())
dirs.Add( sExtraDir + wxT("/") ); dirs.Add( sExtraDir + wxT("/") );
wxString file;
size_t nDirs = dirs.GetCount(); size_t nDirs = dirs.GetCount();
for ( size_t nDir = 0; nDir < nDirs; nDir++ ) for ( size_t nDir = 0; nDir < nDirs; nDir++ )
{ {
wxString file = dirs[nDir] + wxT("mailcap"); file = dirs[nDir];
file += wxT("mailcap");
if ( wxFile::Exists(file) ) if ( wxFile::Exists(file) )
{ {
ReadMailcap(file); ReadMailcap(file);
} }
file = dirs[nDir] + wxT("mime.types"); file = dirs[nDir];
file += wxT("mime.types");
if ( wxFile::Exists(file) ) if ( wxFile::Exists(file) )
{
ReadMimeTypes(file); ReadMimeTypes(file);
}
} }
} }
@@ -1451,7 +1455,7 @@ bool wxMimeTypesManagerImpl::WriteToMimeTypes(int index, bool delete_index)
{ {
// add the new entries in // add the new entries in
wxString sTmp = strType.Append( wxT(' '), 40 - strType.Len() ); wxString sTmp = strType.Append( wxT(' '), 40 - strType.Len() );
sTmp = sTmp + m_aExtensions[index]; sTmp += m_aExtensions[index];
file.AddLine(sTmp); file.AddLine(sTmp);
} }
@@ -1620,7 +1624,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
file.GetLineCount()) file.CommentLine(nIndex); file.GetLineCount()) file.CommentLine(nIndex);
} }
sTmp = sTmp + wxT(";") + sCmd; //includes wxT(" %s "); sTmp += wxT(";") + sCmd; //includes wxT(" %s ");
// write it in the format that Netscape uses (default) // write it in the format that Netscape uses (default)
if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) ) if (! ( m_mailcapStylesInited & wxMAILCAP_STANDARD ) )
@@ -1658,7 +1662,8 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
bKnownToken = true; bKnownToken = true;
size_t i; size_t i;
for (i=0; i < entries->GetCount(); i++) size_t nCount = entries->GetCount();
for (i=0; i < nCount; i++)
{ {
if (s.Contains(entries->GetVerb(i))) if (s.Contains(entries->GetVerb(i)))
bKnownToken = true; bKnownToken = true;
@@ -1666,7 +1671,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
if (!bKnownToken) if (!bKnownToken)
{ {
sTmp = sTmp + wxT("; \\"); sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex); file.InsertLine(sTmp, nIndex);
sTmp = s; sTmp = s;
} }
@@ -1677,7 +1682,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
if (! m_aDescriptions[index].empty() ) if (! m_aDescriptions[index].empty() )
{ {
sTmp = sTmp + wxT("; \\"); sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex); file.InsertLine(sTmp, nIndex);
nIndex++; nIndex++;
sTmp = wxT(" description=\"") + m_aDescriptions[index] + wxT("\""); sTmp = wxT(" description=\"") + m_aDescriptions[index] + wxT("\"");
@@ -1685,7 +1690,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
if (! m_aIcons[index].empty() ) if (! m_aIcons[index].empty() )
{ {
sTmp = sTmp + wxT("; \\"); sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex); file.InsertLine(sTmp, nIndex);
nIndex++; nIndex++;
sTmp = wxT(" x11-bitmap=\"") + m_aIcons[index] + wxT("\""); sTmp = wxT(" x11-bitmap=\"") + m_aIcons[index] + wxT("\"");
@@ -1697,7 +1702,7 @@ bool wxMimeTypesManagerImpl::WriteToMailCap(int index, bool delete_index)
for (i=0; i < entries->GetCount(); i++) for (i=0; i < entries->GetCount(); i++)
if ( i != iOpen ) if ( i != iOpen )
{ {
sTmp = sTmp + wxT("; \\"); sTmp += wxT("; \\");
file.InsertLine(sTmp, nIndex); file.InsertLine(sTmp, nIndex);
nIndex++; nIndex++;
sTmp = wxT(" ") + entries->GetVerbCmd(i); sTmp = wxT(" ") + entries->GetVerbCmd(i);
@@ -1734,14 +1739,16 @@ wxFileType * wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
wxArrayString sA_Exts = ftInfo.GetExtensions(); wxArrayString sA_Exts = ftInfo.GetExtensions();
wxString sExt, sExtStore; wxString sExt, sExtStore;
size_t i, nIndex; size_t i, nIndex;
for (i=0; i < sA_Exts.GetCount(); i++) size_t nExtCount = sA_Exts.GetCount();
for (i=0; i < nExtCount; i++)
{ {
sExt = sA_Exts.Item(i); sExt = sA_Exts.Item(i);
// clean up to just a space before and after // clean up to just a space before and after
sExt.Trim().Trim(false); sExt.Trim().Trim(false);
sExt = wxT(' ') + sExt + wxT(' '); sExt = wxT(' ') + sExt + wxT(' ');
for (nIndex = 0; nIndex < m_aExtensions.GetCount(); nIndex++) size_t nCount = m_aExtensions.GetCount();
for (nIndex = 0; nIndex < nCount; nIndex++)
{ {
sExtStore = m_aExtensions.Item(nIndex); sExtStore = m_aExtensions.Item(nIndex);
if (sExtStore.Replace(sExt, wxT(" ") ) > 0) if (sExtStore.Replace(sExt, wxT(" ") ) > 0)
@@ -1883,10 +1890,12 @@ int wxMimeTypesManagerImpl::AddToMimeData(const wxString& strType,
wxString& exts = m_aExtensions[nIndex]; wxString& exts = m_aExtensions[nIndex];
// add all extensions we don't have yet // add all extensions we don't have yet
wxString ext;
size_t count = strExtensions.GetCount(); size_t count = strExtensions.GetCount();
for ( size_t i = 0; i < count; i++ ) for ( size_t i = 0; i < count; i++ )
{ {
wxString ext = strExtensions[i] + wxT(' '); ext = strExtensions[i];
ext += wxT(' ');
if ( exts.Find(ext) == wxNOT_FOUND ) if ( exts.Find(ext) == wxNOT_FOUND )
{ {
@@ -1987,7 +1996,8 @@ wxString wxMimeTypesManagerImpl::GetCommand(const wxString & verb, size_t nIndex
wxMimeTypeCommands * sPairs = m_aEntries [nIndex]; wxMimeTypeCommands * sPairs = m_aEntries [nIndex];
size_t i; size_t i;
for ( i = 0; i < sPairs->GetCount (); i++ ) size_t nCount = sPairs->GetCount();
for ( i = 0; i < nCount; i++ )
{ {
sTmp = sPairs->GetVerbCmd (i); sTmp = sPairs->GetVerbCmd (i);
if ( sTmp.Contains(sV) ) if ( sTmp.Contains(sV) )
@@ -2383,6 +2393,10 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
wxString curField; wxString curField;
curField.reserve(1024); curField.reserve(1024);
const wxChar *pPagerEnv = wxGetenv(wxT("PAGER"));
const wxArrayString empty_extensions_list;
size_t nLineCount = file.GetLineCount(); size_t nLineCount = file.GetLineCount();
for ( size_t nLine = 0; nLine < nLineCount; nLine++ ) for ( size_t nLine = 0; nLine < nLineCount; nLine++ )
{ {
@@ -2557,13 +2571,12 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
// is a bad idea (FIXME) // is a bad idea (FIXME)
if ( data.copiousoutput ) if ( data.copiousoutput )
{ {
const wxChar *p = wxGetenv(wxT("PAGER")); data.cmdOpen << wxT(" | ") << (pPagerEnv ? pPagerEnv : wxT("more"));
data.cmdOpen << wxT(" | ") << (p ? p : wxT("more"));
} }
if ( data.needsterminal ) if ( data.needsterminal )
{ {
data.cmdOpen = wxString::Format(wxT("xterm -e sh -c '%s'"), data.cmdOpen.Printf(wxT("xterm -e sh -c '%s'"),
data.cmdOpen.c_str()); data.cmdOpen.c_str());
} }
@@ -2602,7 +2615,7 @@ bool wxMimeTypesManagerImpl::ReadMailcap(const wxString& strFileName,
data.type, data.type,
data.icon, data.icon,
new wxMimeTypeCommands(data.verbs, data.commands), new wxMimeTypeCommands(data.verbs, data.commands),
wxArrayString() /* extensions */, empty_extensions_list,
data.desc, data.desc,
overwrite overwrite
); );
@@ -2622,12 +2635,11 @@ size_t wxMimeTypesManagerImpl::EnumAllFileTypes(wxArrayString& mimetypes)
mimetypes.Empty(); mimetypes.Empty();
wxString type;
size_t count = m_aTypes.GetCount(); size_t count = m_aTypes.GetCount();
for ( size_t n = 0; n < count; n++ ) for ( size_t n = 0; n < count; n++ )
{ {
// don't return template types from here (i.e. anything containg '*') // don't return template types from here (i.e. anything containg '*')
type = m_aTypes[n]; const wxString &type = m_aTypes[n];
if ( type.Find(wxT('*')) == wxNOT_FOUND ) if ( type.Find(wxT('*')) == wxNOT_FOUND )
{ {
mimetypes.Add(type); mimetypes.Add(type);
@@ -2648,11 +2660,11 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
wxArrayString sMimeTypes; wxArrayString sMimeTypes;
ft->GetMimeTypes(sMimeTypes); ft->GetMimeTypes(sMimeTypes);
wxString sMime;
size_t i; size_t i;
for (i = 0; i < sMimeTypes.GetCount(); i ++) size_t nCount = sMimeTypes.GetCount();
for (i = 0; i < nCount; i ++)
{ {
sMime = sMimeTypes.Item(i); const wxString &sMime = sMimeTypes.Item(i);
int nIndex = m_aTypes.Index(sMime); int nIndex = m_aTypes.Index(sMime);
if ( nIndex == wxNOT_FOUND) if ( nIndex == wxNOT_FOUND)
{ {
@@ -2684,7 +2696,7 @@ bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
static bool IsKnownUnimportantField(const wxString& fieldAll) static bool IsKnownUnimportantField(const wxString& fieldAll)
{ {
static const wxChar *knownFields[] = static const wxChar * const knownFields[] =
{ {
wxT("x-mozilla-flags"), wxT("x-mozilla-flags"),
wxT("nametemplate"), wxT("nametemplate"),