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

Code and warning cleaning.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@28544 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-07-30 15:55:53 +00:00
parent 8b567f9b46
commit 79e162f526
2 changed files with 48 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
src/common/filefn.cpp
View File

@@ -316,9 +316,9 @@ bool wxPathList::Member (const wxString& path)
path.CompareTo (path2) == 0 path.CompareTo (path2) == 0
#endif #endif
) )
return TRUE; return true;
} }
return FALSE; return false;
} }
wxString wxPathList::FindValidPath (const wxString& file) wxString wxPathList::FindValidPath (const wxString& file)
@@ -397,23 +397,23 @@ wxIsAbsolutePath (const wxString& filename)
// "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt" // "MacOS:MyText.txt" is absolute whereas "MyDir:MyText.txt"
// is not. Or maybe ":MyDir:MyText.txt" has to be used? RR. // is not. Or maybe ":MyDir:MyText.txt" has to be used? RR.
if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':') if (filename.Find(':') != wxNOT_FOUND && filename[0] != ':')
return TRUE ; return true ;
#else #else
// Unix like or Windows // Unix like or Windows
if (filename[0] == wxT('/')) if (filename[0] == wxT('/'))
return TRUE; return true;
#endif #endif
#ifdef __VMS__ #ifdef __VMS__
if ((filename[0] == wxT('[') && filename[1] != wxT('.'))) if ((filename[0] == wxT('[') && filename[1] != wxT('.')))
return TRUE; return true;
#endif #endif
#if defined(__WINDOWS__) || defined(__OS2__) #if defined(__WINDOWS__) || defined(__OS2__)
// MSDOS like // MSDOS like
if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':'))) if (filename[0] == wxT('\\') || (wxIsalpha (filename[0]) && filename[1] == wxT(':')))
return TRUE; return true;
#endif #endif
} }
return FALSE ; return false ;
} }
/* /*
@@ -1172,7 +1172,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
{ {
wxString outfile; wxString outfile;
if ( !wxGetTempFileName( wxT("cat"), outfile) ) if ( !wxGetTempFileName( wxT("cat"), outfile) )
return FALSE; return false;
FILE *fp1 wxDUMMY_INITIALIZE(NULL); FILE *fp1 wxDUMMY_INITIALIZE(NULL);
FILE *fp2 = NULL; FILE *fp2 = NULL;
@@ -1188,7 +1188,7 @@ wxConcatFiles (const wxString& file1, const wxString& file2, const wxString& fil
fclose (fp2); fclose (fp2);
if (fp3) if (fp3)
fclose (fp3); fclose (fp3);
return FALSE; return false;
} }
int ch; int ch;
@@ -1219,11 +1219,11 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
wxLogSysError(_("Failed to copy the file '%s' to '%s'"), wxLogSysError(_("Failed to copy the file '%s' to '%s'"),
file1.c_str(), file2.c_str()); file1.c_str(), file2.c_str());
return FALSE; return false;
} }
#elif defined(__OS2__) #elif defined(__OS2__)
if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 ) if ( ::DosCopy(file2, file2, overwrite ? DCPY_EXISTING : 0) != 0 )
return FALSE; return false;
#else // !Win32 #else // !Win32
wxStructStat fbuf; wxStructStat fbuf;
@@ -1234,13 +1234,13 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
// from it anyhow // from it anyhow
wxLogSysError(_("Impossible to get permissions for file '%s'"), wxLogSysError(_("Impossible to get permissions for file '%s'"),
file1.c_str()); file1.c_str());
return FALSE; return false;
} }
// open file1 for reading // open file1 for reading
wxFile fileIn(file1, wxFile::read); wxFile fileIn(file1, wxFile::read);
if ( !fileIn.IsOpened() ) if ( !fileIn.IsOpened() )
return FALSE; return false;
// remove file2, if it exists. This is needed for creating // remove file2, if it exists. This is needed for creating
// file2 with the correct permissions in the next step // file2 with the correct permissions in the next step
@@ -1248,7 +1248,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{ {
wxLogSysError(_("Impossible to overwrite the file '%s'"), wxLogSysError(_("Impossible to overwrite the file '%s'"),
file2.c_str()); file2.c_str());
return FALSE; return false;
} }
#ifdef __UNIX__ #ifdef __UNIX__
@@ -1262,7 +1262,7 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
wxFile fileOut; wxFile fileOut;
if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) ) if ( !fileOut.Create(file2, overwrite, fbuf.st_mode & 0777) )
return FALSE; return false;
#ifdef __UNIX__ #ifdef __UNIX__
/// restore the old umask /// restore the old umask
@@ -1276,21 +1276,21 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{ {
count = fileIn.Read(buf, WXSIZEOF(buf)); count = fileIn.Read(buf, WXSIZEOF(buf));
if ( fileIn.Error() ) if ( fileIn.Error() )
return FALSE; return false;
// end of file? // end of file?
if ( !count ) if ( !count )
break; break;
if ( fileOut.Write(buf, count) < count ) if ( fileOut.Write(buf, count) < count )
return FALSE; return false;
} }
// we can expect fileIn to be closed successfully, but we should ensure // we can expect fileIn to be closed successfully, but we should ensure
// that fileOut was closed as some write errors (disk full) might not be // that fileOut was closed as some write errors (disk full) might not be
// detected before doing this // detected before doing this
if ( !fileIn.Close() || !fileOut.Close() ) if ( !fileIn.Close() || !fileOut.Close() )
return FALSE; return false;
#if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__) #if !defined(__VISAGECPP__) && !defined(__WXMAC__) || defined(__UNIX__)
// no chmod in VA. Should be some permission API for HPFS386 partitions // no chmod in VA. Should be some permission API for HPFS386 partitions
@@ -1299,12 +1299,12 @@ wxCopyFile (const wxString& file1, const wxString& file2, bool overwrite)
{ {
wxLogSysError(_("Impossible to set permissions for the file '%s'"), wxLogSysError(_("Impossible to set permissions for the file '%s'"),
file2.c_str()); file2.c_str());
return FALSE; return false;
} }
#endif // OS/2 || Mac #endif // OS/2 || Mac
#endif // __WXMSW__ && __WIN32__ #endif // __WXMSW__ && __WIN32__
return TRUE; return true;
} }
bool bool
@@ -1313,16 +1313,16 @@ wxRenameFile (const wxString& file1, const wxString& file2)
#ifndef __WXWINCE__ #ifndef __WXWINCE__
// Normal system call // Normal system call
if ( wxRename (file1, file2) == 0 ) if ( wxRename (file1, file2) == 0 )
return TRUE; return true;
#endif #endif
// Try to copy // Try to copy
if (wxCopyFile(file1, file2)) { if (wxCopyFile(file1, file2)) {
wxRemoveFile(file1); wxRemoveFile(file1);
return TRUE; return true;
} }
// Give up // Give up
return FALSE; return false;
} }
bool wxRemoveFile(const wxString& file) bool wxRemoveFile(const wxString& file)
@@ -1354,6 +1354,7 @@ bool wxMkdir(const wxString& dir, int perm)
// for the GNU compiler // for the GNU compiler
#if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__) #if (!(defined(__WXMSW__) || defined(__OS2__) || defined(__DOS__))) || (defined(__GNUWIN32__) && !defined(__MINGW32__)) || defined(__WINE__) || defined(__WXMICROWIN__)
#if defined(MSVCRT) #if defined(MSVCRT)
wxUnusedVar(perm);
if ( mkdir(wxFNCONV(dirname)) != 0 ) if ( mkdir(wxFNCONV(dirname)) != 0 )
#else #else
if ( mkdir(wxFNCONV(dirname), perm) != 0 ) if ( mkdir(wxFNCONV(dirname), perm) != 0 )
@@ -1380,17 +1381,17 @@ bool wxMkdir(const wxString& dir, int perm)
{ {
wxLogSysError(_("Directory '%s' couldn't be created"), dirname); wxLogSysError(_("Directory '%s' couldn't be created"), dirname);
return FALSE; return false;
} }
return TRUE; return true;
#endif // Mac/!Mac #endif // Mac/!Mac
} }
bool wxRmdir(const wxString& dir, int WXUNUSED(flags)) bool wxRmdir(const wxString& dir, int WXUNUSED(flags))
{ {
#ifdef __VMS__ #ifdef __VMS__
return FALSE; //to be changed since rmdir exists in VMS7.x return false; //to be changed since rmdir exists in VMS7.x
#elif defined(__OS2__) #elif defined(__OS2__)
return (::DosDeleteDir((PSZ)dir.c_str()) == 0); return (::DosDeleteDir((PSZ)dir.c_str()) == 0);
#else #else
@@ -1541,14 +1542,14 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
buf = new wxChar[sz + 1]; buf = new wxChar[sz + 1];
} }
bool ok wxDUMMY_INITIALIZE(FALSE); bool ok wxDUMMY_INITIALIZE(false);
// for the compilers which have Unicode version of _getcwd(), call it // for the compilers which have Unicode version of _getcwd(), call it
// directly, for the others call the ANSI version and do the translation // directly, for the others call the ANSI version and do the translation
#if !wxUSE_UNICODE #if !wxUSE_UNICODE
#define cbuf buf #define cbuf buf
#else // wxUSE_UNICODE #else // wxUSE_UNICODE
bool needsANSI = TRUE; bool needsANSI = true;
#if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU #if !defined(HAVE_WGETCWD) || wxUSE_UNICODE_MSLU
// This is not legal code as the compiler // This is not legal code as the compiler
@@ -1562,11 +1563,11 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
#if wxUSE_UNICODE_MSLU #if wxUSE_UNICODE_MSLU
if ( wxGetOsVersion() != wxWIN95 ) if ( wxGetOsVersion() != wxWIN95 )
#else #else
char *cbuf = NULL; // never really used because needsANSI will always be FALSE char *cbuf = NULL; // never really used because needsANSI will always be false
#endif #endif
{ {
ok = _wgetcwd(buf, sz) != NULL; ok = _wgetcwd(buf, sz) != NULL;
needsANSI = FALSE; needsANSI = false;
} }
#endif #endif
@@ -1592,11 +1593,11 @@ wxChar *wxGetWorkingDirectory(wxChar *buf, int sz)
cwdSpec.name[0] = 0 ; cwdSpec.name[0] = 0 ;
wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ; wxString res = wxMacFSSpec2MacFilename( &cwdSpec ) ;
wxStrcpy( buf , res ) ; wxStrcpy( buf , res ) ;
ok = TRUE; ok = true;
} }
else else
{ {
ok = FALSE; ok = false;
} }
#elif defined(__OS2__) #elif defined(__OS2__)
APIRET rc; APIRET rc;
@@ -1688,7 +1689,7 @@ bool wxSetWorkingDirectory(const wxString& d)
#ifdef __WIN32__ #ifdef __WIN32__
#ifdef __WXWINCE__ #ifdef __WXWINCE__
// No equivalent in WinCE // No equivalent in WinCE
return FALSE; return false;
#else #else
return (bool)(SetCurrentDirectory(d) != 0); return (bool)(SetCurrentDirectory(d) != 0);
#endif #endif
@@ -1743,11 +1744,11 @@ bool wxEndsWithPathSeparator(const wxChar *pszFileName)
return len && wxIsPathSeparator(pszFileName[len - 1]); return len && wxIsPathSeparator(pszFileName[len - 1]);
} }
// find a file in a list of directories, returns FALSE if not found // find a file in a list of directories, returns false if not found
bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile) bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFile)
{ {
// we assume that it's not empty // we assume that it's not empty
wxCHECK_MSG( !wxIsEmpty(pszFile), FALSE, wxCHECK_MSG( !wxIsEmpty(pszFile), false,
_T("empty file name in wxFindFileInPath")); _T("empty file name in wxFindFileInPath"));
// skip path separator in the beginning of the file name if present // skip path separator in the beginning of the file name if present
@@ -1782,7 +1783,7 @@ bool wxFindFileInPath(wxString *pStr, const wxChar *pszPath, const wxChar *pszFi
delete [] szPath; delete [] szPath;
return pc != NULL; // if TRUE => we breaked from the loop return pc != NULL; // if true => we breaked from the loop
} }
void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName, void WXDLLEXPORT wxSplitPath(const wxChar *pszFileName,
@@ -1962,13 +1963,13 @@ bool wxIsWild( const wxString& pattern )
switch (*pat++) switch (*pat++)
{ {
case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'): case wxT('?'): case wxT('*'): case wxT('['): case wxT('{'):
return TRUE; return true;
case wxT('\\'): case wxT('\\'):
if (!*pat++) if (!*pat++)
return FALSE; return false;
} }
} }
return FALSE; return false;
} }
/* /*
@@ -2000,7 +2001,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
{ {
/* Never match so that hidden Unix files /* Never match so that hidden Unix files
* are never found. */ * are never found. */
return FALSE; return false;
} }
for (;;) for (;;)
@@ -2017,7 +2018,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
{ {
m++; m++;
if (!*n++) if (!*n++)
return FALSE; return false;
} }
else else
{ {
@@ -2026,7 +2027,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
m++; m++;
/* Quoting "nothing" is a bad thing */ /* Quoting "nothing" is a bad thing */
if (!*m) if (!*m)
return FALSE; return false;
} }
if (!*m) if (!*m)
{ {
@@ -2036,9 +2037,9 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
* match * match
*/ */
if (!*n) if (!*n)
return TRUE; return true;
if (just) if (just)
return TRUE; return true;
just = 0; just = 0;
goto not_matched; goto not_matched;
} }
@@ -2070,7 +2071,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
* impossible to match it * impossible to match it
*/ */
if (!*n) if (!*n)
return FALSE; return false;
if (mp) if (mp)
{ {
m = mp; m = mp;
@@ -2092,7 +2093,7 @@ bool wxMatchWild( const wxString& pat, const wxString& text, bool dot_special )
count = acount; count = acount;
} }
else else
return FALSE; return false;
} }
} }
} }

1
src/generic/dirctrlg.cpp
View File

@@ -1723,6 +1723,7 @@ int wxFileIconsTable::GetIconID(const wxString& extension, const wxString& mime)
#else // !wxUSE_MIMETYPE #else // !wxUSE_MIMETYPE
wxUnusedVar(mime);
if (extension == wxT("exe")) if (extension == wxT("exe"))
return executable; return executable;
else else