Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Source cleaning: whitespaces, tabs, -1/wxID_ANY/wxDefaultCoord, TRUE/true, FALSE/false, !!/!IsEmpty().

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29139 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-09-14 12:08:28 +00:00
parent a2668a908a
commit a62848fdba
29 changed files with 427 additions and 429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
src/common/filesys.cpp
View File

@@ -105,15 +105,15 @@ wxString wxFileSystemHandler::GetMimeTypeFromExt(const wxString& location)
return mime;
#else
if ( ext.IsSameAs(wxT("htm"), FALSE) || ext.IsSameAs(_T("html"), FALSE) )
if ( ext.IsSameAs(wxT("htm"), false) || ext.IsSameAs(_T("html"), false) )
return wxT("text/html");
if ( ext.IsSameAs(wxT("jpg"), FALSE) || ext.IsSameAs(_T("jpeg"), FALSE) )
if ( ext.IsSameAs(wxT("jpg"), false) || ext.IsSameAs(_T("jpeg"), false) )
return wxT("image/jpeg");
if ( ext.IsSameAs(wxT("gif"), FALSE) )
if ( ext.IsSameAs(wxT("gif"), false) )
return wxT("image/gif");
if ( ext.IsSameAs(wxT("png"), FALSE) )
if ( ext.IsSameAs(wxT("png"), false) )
return wxT("image/png");
if ( ext.IsSameAs(wxT("bmp"), FALSE) )
if ( ext.IsSameAs(wxT("bmp"), false) )
return wxT("image/bmp");
return wxEmptyString;
#endif
@@ -125,11 +125,10 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
{
wxString s = wxEmptyString;
int i, l = location.Length();
bool fnd;
bool fnd = false;
fnd = FALSE;
for (i = l-1; (i >= 0) && ((location[i] != wxT('#')) || (!fnd)); i--) {
if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
}
if (!fnd) return wxT("file");
for (++i; (i < l) && (location[i] != wxT(':')); i++) s << location[i];
@@ -140,11 +139,10 @@ wxString wxFileSystemHandler::GetProtocol(const wxString& location) const
wxString wxFileSystemHandler::GetLeftLocation(const wxString& location) const
{
int i;
bool fnd;
bool fnd = false;
fnd = FALSE;
for (i = location.Length()-1; i >= 0; i--) {
if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = TRUE;
if ((location[i] == wxT(':')) && (i != 1 /*win: C:\path*/)) fnd = true;
else if (fnd && (location[i] == wxT('#'))) return location.Left(i);
}
return wxEmptyString;
@@ -155,8 +153,8 @@ wxString wxFileSystemHandler::GetRightLocation(const wxString& location) const
int i, l = location.Length();
int l2 = l + 1;
for (i = l-1;
(i >= 0) &&
for (i = l-1;
(i >= 0) &&
((location[i] != wxT(':')) || (i == 1) || (location[i-2] == wxT(':')));
i--)
{
@@ -468,44 +466,44 @@ const static wxString g_nativePathString(wxFILE_SEP_PATH);
// Returns the native path for a file URL
wxFileName wxFileSystem::URLToFileName(const wxString& url)
{
wxString path = url;
wxString path = url;
if ( path.Find(wxT("file://")) == 0 )
{
path = path.Mid(7);
}
if ( path.Find(wxT("file://")) == 0 )
{
path = path.Mid(7);
}
else if ( path.Find(wxT("file:")) == 0 )
{
path = path.Mid(5);
}
// Remove preceding double slash on Mac Classic
{
path = path.Mid(5);
}
// Remove preceding double slash on Mac Classic
#if defined(__WXMAC__) && !defined(__UNIX__)
else if ( path.Find(wxT("//")) == 0 )
path = path.Mid(2);
#endif
path.Replace(wxT("%25"), wxT("%"));
path.Replace(wxT("%3A"), wxT(":"));
#ifdef __WXMSW__
// file urls either start with a forward slash (local harddisk),
// file urls either start with a forward slash (local harddisk),
// otherwise they have a servername/sharename notation,
// which only exists on msw and corresponds to a unc
if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
{
path = path.Mid(1);
}
else if ( (url.Find(wxT("file://")) == 0) &&
if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
{
path = path.Mid(1);
}
else if ( (url.Find(wxT("file://")) == 0) &&
(path.Find(wxT('/')) != wxNOT_FOUND) &&
(path.Length() > 1) && (path[1u] != wxT(':')) )
{
path = wxT("//") + path;
}
{
path = wxT("//") + path;
}
#endif
path.Replace(g_unixPathString, g_nativePathString);
path.Replace(g_unixPathString, g_nativePathString);
return wxFileName(path, wxPATH_NATIVE);
return wxFileName(path, wxPATH_NATIVE);
}
// Returns the file URL for a native path
@@ -517,7 +515,7 @@ wxString wxFileSystem::FileNameToURL(const wxFileName& filename)
#ifndef __UNIX__
// unc notation, wxMSW
if ( url.Find(wxT("\\\\")) == 0 )
if ( url.Find(wxT("\\\\")) == 0 )
{
url = wxT("//") + url.Mid(2);
}