X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..6f34921d9369a31de14e4b07e4824e2d701710f0:/src/common/textfile.cpp?ds=sidebyside diff --git a/src/common/textfile.cpp b/src/common/textfile.cpp index d67663557e..cf3095cd5e 100644 --- a/src/common/textfile.cpp +++ b/src/common/textfile.cpp @@ -101,13 +101,13 @@ wxTextFile::Type wxTextFile::GuessType() const wxASSERT( m_file.IsOpened() && m_file.Tell() == 0 ); // scan the file lines - uint nUnix = 0, // number of '\n's alone + size_t nUnix = 0, // number of '\n's alone nDos = 0, // number of '\r\n' nMac = 0; // number of '\r's // we take MAX_LINES_SCAN in the beginning, middle and the end of file #define MAX_LINES_SCAN (10) - uint nCount = m_aLines.Count() / 3, + size_t nCount = m_aLines.Count() / 3, nScan = nCount > 3*MAX_LINES_SCAN ? MAX_LINES_SCAN : nCount / 3; #define AnalyseLine(n) \ @@ -118,7 +118,7 @@ wxTextFile::Type wxTextFile::GuessType() const default: wxFAIL_MSG(_("unknown line terminator")); \ } - uint n; + size_t n; for ( n = 0; n < nScan; n++ ) // the beginning AnalyseLine(n); for ( n = (nCount - nScan)/2; n < (nCount + nScan)/2; n++ ) @@ -228,8 +228,8 @@ bool wxTextFile::Write(Type typeNew) return FALSE; } - uint nCount = m_aLines.Count(); - for ( uint n = 0; n < nCount; n++ ) { + size_t nCount = m_aLines.Count(); + for ( size_t n = 0; n < nCount; n++ ) { fileTmp.Write(m_aLines[n] + GetEOL(typeNew == Type_None ? m_aTypes[n] : typeNew)); }