diff options
author | Zhang Sheng <zhangsheng@uniontech.com> | 2020-11-16 11:19:17 +0800 |
---|---|---|
committer | Zhang Sheng <zhangsheng@uniontech.com> | 2020-11-16 12:53:37 +0000 |
commit | e13173c112b729da8f53dd2e81e8116a1ed857cf (patch) | |
tree | 49c2bce0c3349eebd0f2b62c80a1b7168ae45dc2 /src/corelib/io | |
parent | 802e5a45baf3ac7da2cb3be06d10bdd69696fcae (diff) |
Adjust code format, add space after 'if'
Change-Id: Ice081c891ff7f4b766f49dd4bd5cf18c30237acf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/corelib/io')
-rw-r--r-- | src/corelib/io/qdiriterator.cpp | 4 | ||||
-rw-r--r-- | src/corelib/io/qfile.cpp | 14 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemengine_win.cpp | 30 | ||||
-rw-r--r-- | src/corelib/io/qfilesystemwatcher.cpp | 4 | ||||
-rw-r--r-- | src/corelib/io/qtemporaryfile.cpp | 8 |
5 files changed, 30 insertions, 30 deletions
diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index d958318708..9799c9b075 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -355,9 +355,9 @@ bool QDirIteratorPrivate::matchesFilters(const QString &fileName, const QFileInf // skip symlinks const bool skipSymlinks = (filters & QDir::NoSymLinks); const bool includeSystem = (filters & QDir::System); - if(skipSymlinks && fi.isSymLink()) { + if (skipSymlinks && fi.isSymLink()) { // The only reason to save this file is if it is a broken link and we are requesting system files. - if(!includeSystem || fi.exists()) + if (!includeSystem || fi.exists()) return false; } diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 77c83d08b6..36e2b4476a 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -453,7 +453,7 @@ QFile::remove() } unsetError(); close(); - if(error() == QFile::NoError) { + if (error() == QFile::NoError) { if (d->engine()->remove()) { unsetError(); return true; @@ -630,7 +630,7 @@ QFile::rename(const QString &newName) } unsetError(); close(); - if(error() == QFile::NoError) { + if (error() == QFile::NoError) { if (changingCase ? d->engine()->renameOverwrite(newName) : d->engine()->rename(newName)) { unsetError(); // engine was able to handle the new name so we just reset it @@ -661,7 +661,7 @@ QFile::rename(const QString &newName) d->setError(QFile::RenameError, errorString()); error = true; } - if(!error) { + if (!error) { if (!remove()) { d->setError(QFile::RenameError, tr("Cannot remove source file")); error = true; @@ -785,13 +785,13 @@ QFile::copy(const QString &newName) } unsetError(); close(); - if(error() == QFile::NoError) { + if (error() == QFile::NoError) { if (d->engine()->copy(newName)) { unsetError(); return true; } else { bool error = false; - if(!open(QFile::ReadOnly)) { + if (!open(QFile::ReadOnly)) { error = true; d->setError(QFile::CopyError, tr("Cannot open %1 for input").arg(d->fileName)); } else { @@ -855,7 +855,7 @@ QFile::copy(const QString &newName) #endif } } - if(!error) { + if (!error) { QFile::setPermissions(newName, permissions()); close(); unsetError(); @@ -920,7 +920,7 @@ bool QFile::open(OpenMode mode) return true; } QFile::FileError err = d->fileEngine->error(); - if(err == QFile::UnspecifiedError) + if (err == QFile::UnspecifiedError) err = QFile::OpenError; d->setError(err, d->fileEngine->errorString()); return false; diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index d876fdf4ae..f27040b07c 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -792,7 +792,7 @@ bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &entry, QFileSyst DWORD res = GetNamedSecurityInfo(reinterpret_cast<const wchar_t*>(fname.utf16()), SE_FILE_OBJECT, OWNER_SECURITY_INFORMATION | GROUP_SECURITY_INFORMATION | DACL_SECURITY_INFORMATION, &pOwner, &pGroup, &pDacl, 0, &pSD); - if(res == ERROR_SUCCESS) { + if (res == ERROR_SUCCESS) { ACCESS_MASK access_mask; TRUSTEE_W trustee; if (what & QFileSystemMetaData::UserPermissions) { // user @@ -845,11 +845,11 @@ bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &entry, QFileSyst BuildTrusteeWithSid(&trustee, pOwner); if (GetEffectiveRightsFromAcl(pDacl, &trustee, &access_mask) != ERROR_SUCCESS) access_mask = (ACCESS_MASK)-1; - if(access_mask & ReadMask) + if (access_mask & ReadMask) data.entryFlags |= QFileSystemMetaData::OwnerReadPermission; - if(access_mask & WriteMask) + if (access_mask & WriteMask) data.entryFlags |= QFileSystemMetaData::OwnerWritePermission; - if(access_mask & ExecMask) + if (access_mask & ExecMask) data.entryFlags |= QFileSystemMetaData::OwnerExecutePermission; } if (what & QFileSystemMetaData::GroupPermissions) { // group @@ -857,22 +857,22 @@ bool QFileSystemEngine::fillPermissions(const QFileSystemEntry &entry, QFileSyst BuildTrusteeWithSid(&trustee, pGroup); if (GetEffectiveRightsFromAcl(pDacl, &trustee, &access_mask) != ERROR_SUCCESS) access_mask = (ACCESS_MASK)-1; - if(access_mask & ReadMask) + if (access_mask & ReadMask) data.entryFlags |= QFileSystemMetaData::GroupReadPermission; - if(access_mask & WriteMask) + if (access_mask & WriteMask) data.entryFlags |= QFileSystemMetaData::GroupWritePermission; - if(access_mask & ExecMask) + if (access_mask & ExecMask) data.entryFlags |= QFileSystemMetaData::GroupExecutePermission; } if (what & QFileSystemMetaData::OtherPermissions) { // other (world) data.knownFlagsMask |= QFileSystemMetaData::OtherPermissions; if (GetEffectiveRightsFromAcl(pDacl, &worldTrusteeW, &access_mask) != ERROR_SUCCESS) access_mask = (ACCESS_MASK)-1; // ### - if(access_mask & ReadMask) + if (access_mask & ReadMask) data.entryFlags |= QFileSystemMetaData::OtherReadPermission; - if(access_mask & WriteMask) + if (access_mask & WriteMask) data.entryFlags |= QFileSystemMetaData::OtherWritePermission; - if(access_mask & ExecMask) + if (access_mask & ExecMask) data.entryFlags |= QFileSystemMetaData::OwnerExecutePermission; } LocalFree(pSD); @@ -1281,7 +1281,7 @@ bool QFileSystemEngine::setCurrentPath(const QFileSystemEntry &entry) { QFileSystemMetaData meta; fillMetaData(entry, meta, QFileSystemMetaData::ExistsAttribute | QFileSystemMetaData::DirectoryType); - if(!(meta.exists() && meta.isDirectory())) + if (!(meta.exists() && meta.isDirectory())) return false; //TODO: this should really be using nativeFilePath(), but that returns a path in long format \\?\c:\foo @@ -1326,7 +1326,7 @@ bool QFileSystemEngine::copyFile(const QFileSystemEntry &source, const QFileSyst { bool ret = ::CopyFile((wchar_t*)source.nativeFilePath().utf16(), (wchar_t*)target.nativeFilePath().utf16(), true) != 0; - if(!ret) + if (!ret) error = QSystemError(::GetLastError(), QSystemError::NativeError); return ret; } @@ -1339,7 +1339,7 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy bool ret = ::MoveFile((wchar_t*)source.nativeFilePath().utf16(), (wchar_t*)target.nativeFilePath().utf16()) != 0; - if(!ret) + if (!ret) error = QSystemError(::GetLastError(), QSystemError::NativeError); return ret; } @@ -1364,7 +1364,7 @@ bool QFileSystemEngine::removeFile(const QFileSystemEntry &entry, QSystemError & Q_CHECK_FILE_NAME(entry, false); bool ret = ::DeleteFile((wchar_t*)entry.nativeFilePath().utf16()) != 0; - if(!ret) + if (!ret) error = QSystemError(::GetLastError(), QSystemError::NativeError); return ret; } @@ -1477,7 +1477,7 @@ bool QFileSystemEngine::setPermissions(const QFileSystemEntry &entry, QFile::Per return false; bool ret = ::_wchmod(reinterpret_cast<const wchar_t*>(entry.nativeFilePath().utf16()), mode) == 0; - if(!ret) + if (!ret) error = QSystemError(errno, QSystemError::StandardLibraryError); return ret; } diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index 1712fec751..bd5a73da84 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -121,7 +121,7 @@ void QFileSystemWatcherPrivate::init() void QFileSystemWatcherPrivate::initPollerEngine() { - if(poller) + if (poller) return; Q_Q(QFileSystemWatcher); @@ -379,7 +379,7 @@ QStringList QFileSystemWatcher::addPaths(const QStringList &paths) } #endif // Normal runtime case - search intelligently for best engine - if(d->native) { + if (d->native) { return d->native; } else { d_func()->initPollerEngine(); diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index fba3def4fa..bdd128a88c 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -797,7 +797,7 @@ QString QTemporaryFile::fileName() const if (tef && tef->isReallyOpen()) const_cast<QTemporaryFilePrivate *>(d)->materializeUnnamedFile(); - if(d->fileName.isEmpty()) + if (d->fileName.isEmpty()) return QString(); return d->engine()->fileName(QAbstractFileEngine::DefaultName); } @@ -887,12 +887,12 @@ bool QTemporaryFile::rename(const QString &newName) QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file) { if (QAbstractFileEngine *engine = file.d_func()->engine()) { - if(engine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag) + if (engine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag) return nullptr; // native already //cache bool wasOpen = file.isOpen(); qint64 old_off = 0; - if(wasOpen) + if (wasOpen) old_off = file.pos(); else if (!file.open(QIODevice::ReadOnly)) return nullptr; @@ -913,7 +913,7 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file) ret = nullptr; } //restore - if(wasOpen) + if (wasOpen) file.seek(old_off); else file.close(); |