AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QtCore/IO: Fix some warnings on Windows (64bit).

Browse Source 
- Warnings about conversion from size_t to int
- Unused variable.

Change-Id: I4a79fa6dc4b95551a64d282ae4307b0edff41201
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Friedemann Kleint 2011-11-28 16:02:50 +01:00 committed by Qt by Nokia
parent 0f1d936998
commit 3ec60ca51b
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/io/qfilesystemengine_win.cpp
View File

@ -589,8 +589,6 @@ QString QFileSystemEngine::owner(const QFileSystemEntry &entry, QAbstractFileEng
bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &entry, QFileSystemMetaData &data, bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &entry, QFileSystemMetaData &data,
QFileSystemMetaData::MetaDataFlags what) QFileSystemMetaData::MetaDataFlags what)
{ {
QAbstractFileEngine::FileFlags ret = 0;
#if !defined(QT_NO_LIBRARY) #if !defined(QT_NO_LIBRARY)
if((qt_ntfs_permission_lookup > 0) && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) { if((qt_ntfs_permission_lookup > 0) && (QSysInfo::WindowsVersion & QSysInfo::WV_NT_based)) {
resolveLibs(); resolveLibs();

2
src/corelib/io/qiodevice_p.h
View File

@ -167,7 +167,7 @@ private:
size_t newCapacity = qMax(capacity, size_t(QIODEVICE_BUFFERSIZE)); size_t newCapacity = qMax(capacity, size_t(QIODEVICE_BUFFERSIZE));
while (newCapacity < required) while (newCapacity < required)
newCapacity *= 2; newCapacity *= 2;
int moveOffset = (where == freeSpaceAtEnd) ? 0 : newCapacity - len; const size_t moveOffset = (where == freeSpaceAtEnd) ? 0 : newCapacity - size_t(len);
if (newCapacity > capacity) { if (newCapacity > capacity) {
// allocate more space // allocate more space
char* newBuf = new char[newCapacity]; char* newBuf = new char[newCapacity];

2
src/corelib/io/qprocess_win.cpp
View File

@ -282,7 +282,7 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment()
// This is not the case the other way round. // This is not the case the other way round.
if (wchar_t *envStrings = GetEnvironmentStringsW()) { if (wchar_t *envStrings = GetEnvironmentStringsW()) {
for (const wchar_t *entry = envStrings; *entry; ) { for (const wchar_t *entry = envStrings; *entry; ) {
int entryLen = wcslen(entry); const int entryLen = int(wcslen(entry));
if (const wchar_t *equal = wcschr(entry, L'=')) { if (const wchar_t *equal = wcschr(entry, L'=')) {
int nameLen = equal - entry; int nameLen = equal - entry;
QString name = QString::fromWCharArray(entry, nameLen); QString name = QString::fromWCharArray(entry, nameLen);