rename wxURI::GetUser to wxURI::GetUserInfo and add wxURI::GetUser and wxURI::GetPassword

[wxWidgets.git] / src / common / mimecmn.cpp

diff --git a/src/common/mimecmn.cpp b/src/common/mimecmn.cpp
index 1510e92b2fabf6311bd493f55de7e48ecc1e35f2..4d251a8dc5205b6a199b13aa454c52ce63064995 100644 (file)
--- a/src/common/mimecmn.cpp
+++ b/src/common/mimecmn.cpp
@@ -53,8 +53,9 @@
     #include "wx/msw/mimetype.h"
 #elif defined(__WXMAC__)
     #include "wx/mac/mimetype.h"
-#elif defined(__WXPM__)
+#elif defined(__WXPM__) || defined (__EMX__)
     #include "wx/os2/mimetype.h"
+    #undef __UNIX__
 #else // Unix
     #include "wx/unix/mimetype.h"
 #endif
@@ -125,7 +126,7 @@ WX_DEFINE_OBJARRAY(wxArrayFileTypeInfo);
 wxString wxFileType::ExpandCommand(const wxString& command,
                                    const wxFileType::MessageParameters& params)
 {
-    bool hasFilename = FALSE;
+    bool hasFilename = false;
 
     wxString str;
     for ( const wxChar *pc = command.c_str(); *pc != wxT('\0'); pc++ ) {
@@ -143,7 +144,7 @@ wxString wxFileType::ExpandCommand(const wxString& command,
                         str << wxT('"') << params.GetFileName() << wxT('"');
 #endif
                     str << params.GetFileName();
-                    hasFilename = TRUE;
+                    hasFilename = true;
                     break;
 
                 case wxT('t'):
@@ -195,7 +196,7 @@ wxString wxFileType::ExpandCommand(const wxString& command,
     // know of the correct solution, try to guess what we have to do.
 
     // test now carried out on reading file so test should never get here
-    if ( !hasFilename && !str.IsEmpty()
+    if ( !hasFilename && !str.empty()
 #ifdef __UNIX__
                       && !str.StartsWith(_T("test "))
 #endif // Unix
@@ -229,7 +230,7 @@ bool wxFileType::GetExtensions(wxArrayString& extensions)
     if ( m_info )
     {
         extensions = m_info->GetExtensions();
-        return TRUE;
+        return true;
     }
 
     return m_impl->GetExtensions(extensions);
@@ -237,13 +238,13 @@ bool wxFileType::GetExtensions(wxArrayString& extensions)
 
 bool wxFileType::GetMimeType(wxString *mimeType) const
 {
-    wxCHECK_MSG( mimeType, FALSE, _T("invalid parameter in GetMimeType") );
+    wxCHECK_MSG( mimeType, false, _T("invalid parameter in GetMimeType") );
 
     if ( m_info )
     {
         *mimeType = m_info->GetMimeType();
 
-        return TRUE;
+        return true;
     }
 
     return m_impl->GetMimeType(mimeType);
@@ -256,7 +257,7 @@ bool wxFileType::GetMimeTypes(wxArrayString& mimeTypes) const
         mimeTypes.Clear();
         mimeTypes.Add(m_info->GetMimeType());
 
-        return TRUE;
+        return true;
     }
 
     return m_impl->GetMimeTypes(mimeTypes);
@@ -274,7 +275,7 @@ bool wxFileType::GetIcon(wxIconLocation *iconLoc) const
 #endif // __WXMSW__
         }
 
-        return TRUE;
+        return true;
     }
 
     return m_impl->GetIcon(iconLoc);
@@ -301,13 +302,13 @@ wxFileType::GetIcon(wxIconLocation *iconloc,
 
 bool wxFileType::GetDescription(wxString *desc) const
 {
-    wxCHECK_MSG( desc, FALSE, _T("invalid parameter in GetDescription") );
+    wxCHECK_MSG( desc, false, _T("invalid parameter in GetDescription") );
 
     if ( m_info )
     {
         *desc = m_info->GetDescription();
 
-        return TRUE;
+        return true;
     }
 
     return m_impl->GetDescription(desc);
@@ -317,13 +318,13 @@ bool
 wxFileType::GetOpenCommand(wxString *openCmd,
                            const wxFileType::MessageParameters& params) const
 {
-    wxCHECK_MSG( openCmd, FALSE, _T("invalid parameter in GetOpenCommand") );
+    wxCHECK_MSG( openCmd, false, _T("invalid parameter in GetOpenCommand") );
 
     if ( m_info )
     {
         *openCmd = ExpandCommand(m_info->GetOpenCommand(), params);
 
-        return TRUE;
+        return true;
     }
 
     return m_impl->GetOpenCommand(openCmd, params);
@@ -345,13 +346,13 @@ bool
 wxFileType::GetPrintCommand(wxString *printCmd,
                             const wxFileType::MessageParameters& params) const
 {
-    wxCHECK_MSG( printCmd, FALSE, _T("invalid parameter in GetPrintCommand") );
+    wxCHECK_MSG( printCmd, false, _T("invalid parameter in GetPrintCommand") );
 
     if ( m_info )
     {
         *printCmd = ExpandCommand(m_info->GetPrintCommand(), params);
 
-        return TRUE;
+        return true;
     }
 
     return m_impl->GetPrintCommand(printCmd, params);
@@ -401,11 +402,11 @@ bool wxFileType::Unassociate()
 {
 #if defined(__WXMSW__)
     return m_impl->Unassociate();
-#elif defined(__UNIX__) && !defined(__WXPM__)
+#elif defined(__UNIX__)
     return m_impl->Unassociate(this);
 #else
     wxFAIL_MSG( _T("not implemented") ); // TODO
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -416,7 +417,7 @@ bool overwriteprompt)
     return m_impl->SetCommand(cmd, verb, overwriteprompt);
 #else
     wxFAIL_MSG(_T("not implemented"));
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -427,16 +428,16 @@ bool wxFileType::SetDefaultIcon(const wxString& cmd, int index)
     // VZ: should we do this?
     // chris elliott : only makes sense in MS windows
     if ( sTmp.empty() )
-        GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxT(""), wxT("")));
+        GetOpenCommand(&sTmp, wxFileType::MessageParameters(wxEmptyString, wxEmptyString));
 #endif
-    wxCHECK_MSG( !sTmp.empty(), FALSE, _T("need the icon file") );
+    wxCHECK_MSG( !sTmp.empty(), false, _T("need the icon file") );
 
 #if defined (__WXMSW__) || defined(__UNIX__)
     return m_impl->SetDefaultIcon (cmd, index);
 #else
     wxFAIL_MSG(_T("not implemented"));
 
-    return FALSE;
+    return false;
 #endif
 }
 
@@ -457,21 +458,21 @@ bool wxMimeTypesManager::IsOfType(const wxString& mimeType,
     wxASSERT_MSG( mimeType.Find(wxT('*')) == wxNOT_FOUND,
                   wxT("first MIME type can't contain wildcards") );
 
-    // all comparaisons are case insensitive (2nd arg of IsSameAs() is FALSE)
+    // all comparaisons are case insensitive (2nd arg of IsSameAs() is false)
     if ( wildcard.BeforeFirst(wxT('/')).
-            IsSameAs(mimeType.BeforeFirst(wxT('/')), FALSE) )
+            IsSameAs(mimeType.BeforeFirst(wxT('/')), false) )
     {
         wxString strSubtype = wildcard.AfterFirst(wxT('/'));
 
         if ( strSubtype == wxT("*") ||
-             strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), FALSE) )
+             strSubtype.IsSameAs(mimeType.AfterFirst(wxT('/')), false) )
         {
             // matches (either exactly or it's a wildcard)
-            return TRUE;
+            return true;
         }
     }
 
-    return FALSE;
+    return false;
 }
 
 wxMimeTypesManager::wxMimeTypesManager()
@@ -487,7 +488,7 @@ wxMimeTypesManager::~wxMimeTypesManager()
 
 bool wxMimeTypesManager::Unassociate(wxFileType *ft)
 {
-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
     return m_impl->Unassociate(ft);
 #else
     return ft->Unassociate();
@@ -500,7 +501,7 @@ wxMimeTypesManager::Associate(const wxFileTypeInfo& ftInfo)
 {
     EnsureImpl();
 
-#if defined(__WXMSW__) || (defined(__UNIX__) && !defined(__WXPM__))
+#if defined(__WXMSW__) || defined(__UNIX__)
     return m_impl->Associate(ftInfo);
 #else // other platforms
     wxFAIL_MSG( _T("not implemented") ); // TODO
@@ -597,20 +598,20 @@ size_t wxMimeTypesManager::EnumAllFileTypes(wxArrayString& mimetypes)
 void wxMimeTypesManager::Initialize(int mcapStyle,
                                     const wxString& sExtraDir)
 {
-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
     EnsureImpl();
 
     m_impl->Initialize(mcapStyle, sExtraDir);
 #else
-       (void)mcapStyle;        
-       (void)sExtraDir;        
+    (void)mcapStyle;
+    (void)sExtraDir;
 #endif // Unix
 }
 
 // and this function clears all the data from the manager
 void wxMimeTypesManager::ClearData()
 {
-#if defined(__UNIX__) && !defined(__WXPM__) && !defined(__CYGWIN__) && !defined(__WINE__)
+#if defined(__UNIX__) && !defined(__CYGWIN__) && !defined(__WINE__)
     EnsureImpl();
 
     m_impl->ClearData();
@@ -631,7 +632,7 @@ class wxMimeTypeCmnModule: public wxModule
 {
 public:
     wxMimeTypeCmnModule() : wxModule() { }
-    virtual bool OnInit() { return TRUE; }
+    virtual bool OnInit() { return true; }
     virtual void OnExit()
     {
         // this avoids false memory leak allerts: