From 01aefd229e82820455518e9feab1af5058433a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=C5=82odzimierz=20Skiba?= Date: Wed, 1 Jun 2005 07:52:29 +0000 Subject: [PATCH] Unwanted semicolon fix [#1212497] + source cleaning. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34488 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/mimetmac.cpp | 6 +++--- src/mac/classic/mimetmac.cpp | 26 +++++++++++++------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/mac/carbon/mimetmac.cpp b/src/mac/carbon/mimetmac.cpp index f9cfb58d97..5516810999 100644 --- a/src/mac/carbon/mimetmac.cpp +++ b/src/mac/carbon/mimetmac.cpp @@ -1213,7 +1213,7 @@ public: int GetValue() { int nOut; - CFNumberGetValue( m_cfnRef, + CFNumberGetValue( m_cfnRef, kCFNumberIntType, &nOut ); @@ -1462,7 +1462,7 @@ wxFileType* wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) 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]; @@ -1805,7 +1805,7 @@ wxMimeTypesManagerImpl::Unassociate(wxFileType *pFileType) 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]; diff --git a/src/mac/classic/mimetmac.cpp b/src/mac/classic/mimetmac.cpp index 1ea83612c2..511be916cf 100644 --- 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) { - return FALSE; + return false; } bool wxFileTypeImpl::SetDefaultIcon(const wxString& strIcon, int index) { - return FALSE; + return false; } bool wxFileTypeImpl::GetCommand(wxString *command, const char *verb) const { - return FALSE; + return false; } // @@ this function is half implemented bool wxFileTypeImpl::GetExtensions(wxArrayString& extensions) { - return FALSE; + return false; } bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const @@ -72,35 +72,35 @@ bool wxFileTypeImpl::GetMimeType(wxString *mimeType) const if ( m_strFileType.Length() > 0 ) { *mimeType = m_strFileType ; - return TRUE ; + return true ; } else - return FALSE; + return false; } bool wxFileTypeImpl::GetMimeTypes(wxArrayString& mimeTypes) const { wxString 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 - return FALSE; + return false; } bool wxFileTypeImpl::GetDescription(wxString *desc) const { - return FALSE; + return false; } size_t @@ -223,6 +223,6 @@ wxMimeTypesManagerImpl::Associate(const wxFileTypeInfo& ftInfo) bool wxMimeTypesManagerImpl::Unassociate(wxFileType *ft) { - return FALSE; + return false; }