Unwanted semicolon fix [#1212497] + source cleaning.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp
index f9cfb58d97233b2425e0e75ea829233bc90b7a22..5516810999446ec809db52a26c5e0482ea98ce4c 100644 (file)
--- a/src/mac/carbon/mimetmac.cpp
+++ b/src/mac/carbon/mimetmac.cpp
@@ -1213,7 +1213,7 @@ public:
     int GetValue()
     {
         int nOut;
     int GetValue()
     {
         int nOut;

-        CFNumberGetValue( m_cfnRef,    
+        CFNumberGetValue( m_cfnRef,

                           kCFNumberIntType,
                           &nOut
                         );
                           kCFNumberIntType,
                           &nOut
                         );


@@ -1462,7 +1462,7 @@ wxFileType* wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
             wxCFDictionary cfdInfo;
             bool bInfoOpenSuccess = false;
             wxFile indictfile;
             wxCFDictionary cfdInfo;
             bool bInfoOpenSuccess = false;
             wxFile indictfile;

-            if(indictfile.Open(sInfoPath, wxFile::read));
+            if(indictfile.Open(sInfoPath, wxFile::read))

             {
                 CFIndex cfiBufLen = (CFIndex) indictfile.Length();
                 const UInt8* pBuffer = new UInt8[cfiBufLen];
             {
                 CFIndex cfiBufLen = (CFIndex) indictfile.Length();
                 const UInt8* pBuffer = new UInt8[cfiBufLen];


@@ -1805,7 +1805,7 @@ wxMimeTypesManagerImpl::Unassociate(wxFileType *pFileType)
             wxCFDictionary cfdInfo;
             bool bInfoOpenSuccess = false;
             wxFile indictfile;
             wxCFDictionary cfdInfo;
             bool bInfoOpenSuccess = false;
             wxFile indictfile;

-            if(indictfile.Open(sInfoPath, wxFile::read));
+            if(indictfile.Open(sInfoPath, wxFile::read))

             {
                 CFIndex cfiBufLen = (CFIndex) indictfile.Length();
                 const UInt8* pBuffer = new UInt8[cfiBufLen];
             {
                 CFIndex cfiBufLen = (CFIndex) indictfile.Length();
                 const UInt8* pBuffer = new UInt8[cfiBufLen];

diff --git a/src/mac/classic/mimetmac.cpp b/src/mac/classic/mimetmac.cpp
index 1ea83612c2d1fa9c56bf28e6c11295f07d62e609..511be916cfebadc7144a486de62232f8db1c78b5 100644 (file)
--- a/src/mac/classic/mimetmac.cpp
+++ b/src/mac/classic/mimetmac.cpp
@@ -48,23 +48,23 @@ class WXDLLEXPORT wxIcon;
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt)
 {
 
 bool wxFileTypeImpl::SetCommand(const wxString& cmd, const wxString& verb, bool overwriteprompt)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int index)
 {
 }
 
 bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int index)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetCommand(wxString *command, const char *verb) const
 {
 }
 
 bool wxFileTypeImpl::GetCommand(wxString *command, const char *verb) const
 {

-    return FALSE;
+    return false;

 }
 
 // @@ this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {
 }
 
 // @@ this function is half implemented
 bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions)
 {

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
 }
 
 bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const


@@ -72,35 +72,35 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const
     if ( m_strFileType.Length() > 0 )
     {
         *mimeType = m_strFileType ;
     if ( m_strFileType.Length() > 0 )
     {
         *mimeType = m_strFileType ;

-        return TRUE ;
+        return true ;

     }
     else
     }
     else

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 {
     wxString s;
 }
 
 bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const
 {
     wxString s;

-    
+

     if (GetMimeType(&s))
     {
         mimeTypes.Clear();
         mimeTypes.Add(s);
     if (GetMimeType(&s))
     {
         mimeTypes.Clear();
         mimeTypes.Add(s);

-        return TRUE;
+        return true;

     }
     }

-    else 
-        return FALSE;
+    else
+        return false;

 }
 
 bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const
 {
     // no such file type or no value or incorrect icon entry
 }
 
 bool wxFileTypeImpl::GetIcon(wxIconLocation *WXUNUSED(icon)) const
 {
     // no such file type or no value or incorrect icon entry

-    return FALSE;
+    return false;

 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const
 {
 }
 
 bool wxFileTypeImpl::GetDescription(wxString *desc) const
 {

-    return FALSE;
+    return false;

 }
 
 size_t
 }
 
 size_t


@@ -223,6 +223,6 @@ wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo)
 bool
 wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
 {
 bool
 wxMimeTypesManagerImpl::Unassociate(wxFileType *ft)
 {

-    return FALSE;
+    return false;

 }
 
 }