Committed forgotten files

[wxWidgets.git] / src / unix / mimetype.cpp

diff --git a/src/unix/mimetype.cpp b/src/unix/mimetype.cpp
index d8f03b387601958927ebb91a523b315511e64a1b..d5ff6698cc49e83c3f2016065428faf011b758cb 100644 (file)
--- a/src/unix/mimetype.cpp
+++ b/src/unix/mimetype.cpp
@@ -649,7 +649,7 @@ void wxMimeTypesManagerImpl::LoadGnomeMimeTypesFromMimeFile(const wxString& file
 
     const wxChar *pc;
     size_t nLineCount = textfile.GetLineCount();
-    for ( size_t nLine = 0;; nLine++ )
+    for ( size_t nLine = 0; /* nothing */; nLine++ )
     {
         if ( nLine < nLineCount )
         {
@@ -805,7 +805,7 @@ void wxMimeTypesManagerImpl::GetGnomeMimeInfo(const wxString& sExtraDir)
 {
     wxArrayString dirs;
 
-    wxString gnomedir = wxGetenv( wxT("GNOMEDIR") );;
+    wxString gnomedir = wxGetenv( wxT("GNOMEDIR") );
     if (!gnomedir.empty())
     {
         gnomedir << wxT("/share");
@@ -1384,9 +1384,9 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
     wxString strExtensions = m_manager->GetExtension(m_index[0]);
     extensions.Empty();
 
-    // one extension in the space or comma delimitid list
+    // one extension in the space or comma-delimited list
     wxString strExt;
-    for ( const wxChar *p = strExtensions;; p++ ) {
+    for ( const wxChar *p = strExtensions; /* nothing */; p++ ) {
         if ( *p == wxT(' ') || *p == wxT(',') || *p == wxT('\0') ) {
             if ( !strExt.empty() ) {
                 extensions.Add(strExt);
@@ -1417,7 +1417,10 @@ bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 // could adjust the code to ask confirmation if it already exists and
 // overwriteprompt is true, but this is currently ignored as *Associate* has
 // no overwrite prompt
-bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt /*= true*/)
+bool
+wxFileTypeImpl::SetCommand(const wxString& cmd,
+                           const wxString& verb,
+                           bool WXUNUSED(overwriteprompt))
 {
     wxArrayString strExtensions;
     wxString strDesc, strIcon;
@@ -1441,7 +1444,7 @@ bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool
 }
 
 // ignore index on the grouds that we only have one icon in a Unix file
-bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon /*= wxEmptyString*/, int /*index = 0*/)
+bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int WXUNUSED(index))
 {
     if (strIcon.empty()) return false;
     wxArrayString strExtensions;