Update version to 2.9.4 in version.bkl too and rebake everything.

[wxWidgets.git] / src / osx / carbon / mimetmac.cpp

diff --git a/src/osx/carbon/mimetmac.cpp b/src/osx/carbon/mimetmac.cpp
index 5f1593ea0572a9445f2b81e56df44aee53c77c26..3e23d6087562665b886f5298d8fb1e5a4660c7bc 100644 (file)
--- a/src/osx/carbon/mimetmac.cpp
+++ b/src/osx/carbon/mimetmac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/mimetype.cpp
+// Name:        src/osx/carbon/mimetmac.cpp
 // Purpose:     Mac Carbon implementation for wx MIME-related classes
 // Author:      Ryan Norton
 // Modified by:
@@ -32,7 +32,7 @@
 
 #if wxUSE_MIMETYPE
 
-#include "wx/mac/mimetype.h"
+#include "wx/osx/mimetype.h"
 
 #ifndef WX_PRECOMP
     #include "wx/dynarray.h"
@@ -48,7 +48,7 @@
 #include "wx/file.h"
 #include "wx/confbase.h"
 
-#include "wx/mac/private.h"
+#include "wx/osx/private.h"
 
 // other standard headers
 #include <ctype.h>
@@ -752,7 +752,7 @@ pascal  OSStatus  MoreProcGetProcessTypeSignature(
 //
 //
 
-#include "wx/mac/corefoundation/cfstring.h"
+#include "wx/osx/core/cfstring.h"
 
 #define wxCF_RELEASE true
 #define wxCF_RETAIN  false
@@ -1404,7 +1404,9 @@ wxFileType* wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
                 wxString sError;
                 bInfoOpenSuccess = cfdInfo.ReadAsXML(cfdaInDict, &sError);
                 if (!bInfoOpenSuccess)
+                {
                     wxLogDebug(sError);
+                }
                 indictfile.Close();
             }
 
@@ -1752,7 +1754,9 @@ wxMimeTypesManagerImpl::Unassociate(wxFileType *pFileType)
                 wxString sError;
                 bInfoOpenSuccess = cfdInfo.ReadAsXML(cfdaInDict, &sError);
                 if (!bInfoOpenSuccess)
+                {
                     wxLogDebug(sError);
+                }
                 indictfile.Close();
             }
 
@@ -1853,7 +1857,9 @@ wxMimeTypesManagerImpl::Unassociate(wxFileType *pFileType)
                         wxLogDebug(sPrintOut);
 
                         for (size_t i = 0; i < asExtensions.GetCount(); ++i)
+                        {
                             wxLogDebug(asExtensions[i]);
+                        }
                     }
                 }
                 else