summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/animation/qabstractanimation.cpp2
-rw-r--r--src/corelib/global/qlibraryinfo.cpp2
-rw-r--r--src/corelib/io/qdiriterator.cpp4
-rw-r--r--src/corelib/io/qfile.cpp14
-rw-r--r--src/corelib/io/qfilesystemengine_win.cpp30
-rw-r--r--src/corelib/io/qfilesystemwatcher.cpp4
-rw-r--r--src/corelib/io/qtemporaryfile.cpp8
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp2
-rw-r--r--src/corelib/kernel/qeventdispatcher_win.cpp2
-rw-r--r--src/corelib/kernel/qobject.cpp2
-rw-r--r--src/corelib/plugin/qlibrary.cpp2
-rw-r--r--src/corelib/serialization/qxmlstream.cpp4
-rw-r--r--src/corelib/serialization/qxmlstream_p.h2
-rw-r--r--src/corelib/serialization/qxmlutils.cpp6
-rw-r--r--src/corelib/text/qbytedata_p.h2
-rw-r--r--src/corelib/text/qstring.cpp4
-rw-r--r--src/corelib/thread/qthreadstorage.cpp2
-rw-r--r--src/corelib/tools/qcontiguouscache.h4
18 files changed, 48 insertions, 48 deletions
diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp
index 7ccb5772d6..133bc5689d 100644
--- a/src/corelib/animation/qabstractanimation.cpp
+++ b/src/corelib/animation/qabstractanimation.cpp
@@ -293,7 +293,7 @@ void QUnifiedTimer::stopAnimationDriver()
void QUnifiedTimer::updateAnimationTimers()
{
//setCurrentTime can get this called again while we're the for loop. At least with pauseAnimations
- if(insideTick)
+ if (insideTick)
return;
const qint64 totalElapsed = elapsed();
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index 4cd940a7a3..301c3ab89a 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -700,7 +700,7 @@ QLibraryInfo::rawLocation(LibraryPath loc, PathGroup group)
}
#endif
- if(!key.isNull()) {
+ if (!key.isNull()) {
QSettings *config = QLibraryInfoPrivate::configuration();
config->beginGroup(QLatin1String(
#ifdef QT_BUILD_QMAKE
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();
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 758e1d3caa..ec8a2dc286 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2297,7 +2297,7 @@ QString QCoreApplication::applicationFilePath()
return *QCoreApplicationPrivate::cachedApplicationFilePath;
#elif defined(Q_OS_MAC)
QString qAppFileName_str = qAppFileName();
- if(!qAppFileName_str.isEmpty()) {
+ if (!qAppFileName_str.isEmpty()) {
QFileInfo fi(qAppFileName_str);
if (fi.exists()) {
QCoreApplicationPrivate::setApplicationFilePath(fi.canonicalFilePath());
diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp
index 1336238795..d547642e7d 100644
--- a/src/corelib/kernel/qeventdispatcher_win.cpp
+++ b/src/corelib/kernel/qeventdispatcher_win.cpp
@@ -510,7 +510,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags)
if (!(flags & QEventLoop::ExcludeUserInputEvents) && !d->queuedUserInputEvents.isEmpty()) {
// process queued user input events
msg = d->queuedUserInputEvents.takeFirst();
- } else if(!(flags & QEventLoop::ExcludeSocketNotifiers) && !d->queuedSocketEvents.isEmpty()) {
+ } else if (!(flags & QEventLoop::ExcludeSocketNotifiers) && !d->queuedSocketEvents.isEmpty()) {
// process queued socket events
msg = d->queuedSocketEvents.takeFirst();
} else if (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) {
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 28dd89397b..54bed0564f 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3109,7 +3109,7 @@ bool QObject::disconnect(const QObject *sender, const QMetaMethod &signal,
return false;
}
if (signal.mobj) {
- if(signal.methodType() != QMetaMethod::Signal) {
+ if (signal.methodType() != QMetaMethod::Signal) {
qCWarning(lcConnect, "QObject::%s: Attempt to %s non-signal %s::%s",
"disconnect","unbind",
sender->metaObject()->className(), signal.methodSignature().constData());
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index fcda933fd5..c625269ada 100644
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
@@ -801,7 +801,7 @@ void QLibraryPrivate::updatePluginState()
.arg(qt_version&0xff)
.arg(debug ? QLatin1String("debug") : QLatin1String("release"));
#ifndef QT_NO_DEBUG_PLUGIN_CHECK
- } else if(debug != QLIBRARY_AS_DEBUG) {
+ } else if (debug != QLIBRARY_AS_DEBUG) {
//don't issue a qWarning since we will hopefully find a non-debug? --Sam
errorString = QLibrary::tr("The plugin '%1' uses incompatible Qt library."
" (Cannot mix debug and release libraries.)").arg(fileName);
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
index e15db62aeb..7a4a6ed3e5 100644
--- a/src/corelib/serialization/qxmlstream.cpp
+++ b/src/corelib/serialization/qxmlstream.cpp
@@ -1572,7 +1572,7 @@ void QXmlStreamReaderPrivate::resolveTag()
namespaceDeclaration.prefix.clear();
const XmlStringRef ns(dtdAttribute.defaultValue);
- if(ns == QLatin1String("http://www.w3.org/2000/xmlns/") ||
+ if (ns == QLatin1String("http://www.w3.org/2000/xmlns/") ||
ns == QLatin1String("http://www.w3.org/XML/1998/namespace"))
raiseWellFormedError(QXmlStream::tr("Illegal namespace declaration."));
else
@@ -1783,7 +1783,7 @@ void QXmlStreamReaderPrivate::startDocument()
if (prefix.isEmpty() && key == QLatin1String("encoding")) {
documentEncoding = value;
- if(hasStandalone)
+ if (hasStandalone)
err = QXmlStream::tr("The standalone pseudo attribute must appear after the encoding.");
if (!QXmlUtils::isEncName(value))
err = QXmlStream::tr("%1 is an invalid encoding name.").arg(value);
diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h
index a601c24bd6..afbd6f22de 100644
--- a/src/corelib/serialization/qxmlstream_p.h
+++ b/src/corelib/serialization/qxmlstream_p.h
@@ -529,7 +529,7 @@ private:
*/
inline void setType(const QXmlStreamReader::TokenType t)
{
- if(type != QXmlStreamReader::Invalid)
+ if (type != QXmlStreamReader::Invalid)
type = t;
}
};
diff --git a/src/corelib/serialization/qxmlutils.cpp b/src/corelib/serialization/qxmlutils.cpp
index 01c84251fd..dccdf85182 100644
--- a/src/corelib/serialization/qxmlutils.cpp
+++ b/src/corelib/serialization/qxmlutils.cpp
@@ -371,16 +371,16 @@ bool QXmlUtils::isPublicID(QStringView candidate)
*/
bool QXmlUtils::isNCName(QStringView ncName)
{
- if(ncName.isEmpty())
+ if (ncName.isEmpty())
return false;
const QChar first(ncName.at(0));
- if(!QXmlUtils::isLetter(first) && first.unicode() != '_' && first.unicode() != ':')
+ if (!QXmlUtils::isLetter(first) && first.unicode() != '_' && first.unicode() != ':')
return false;
for (QChar at : ncName) {
- if(!QXmlUtils::isNameChar(at) || at == QLatin1Char(':'))
+ if (!QXmlUtils::isNameChar(at) || at == QLatin1Char(':'))
return false;
}
diff --git a/src/corelib/text/qbytedata_p.h b/src/corelib/text/qbytedata_p.h
index 053e4202d3..77f351cbb4 100644
--- a/src/corelib/text/qbytedata_p.h
+++ b/src/corelib/text/qbytedata_p.h
@@ -275,7 +275,7 @@ public:
inline qint64 sizeNextBlock() const
{
- if(buffers.isEmpty())
+ if (buffers.isEmpty())
return 0;
else
return buffers.first().size() - firstPos;
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index c955cb8736..499d8dcade 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -4475,9 +4475,9 @@ QString QString::section(const QString &sep, qsizetype start, qsizetype end, Sec
const QStringView &section = sections.at(i);
const bool empty = section.isEmpty();
if (x >= start) {
- if(x == start)
+ if (x == start)
first_i = i;
- if(x == end)
+ if (x == end)
last_i = i;
if (x > start && i > 0)
ret += sep;
diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp
index 7f78f69bc7..98d8e87459 100644
--- a/src/corelib/thread/qthreadstorage.cpp
+++ b/src/corelib/thread/qthreadstorage.cpp
@@ -65,7 +65,7 @@ void qtsDebug(const char *fmt, ...)
va_end(va);
}
#else
-# define DEBUG_MSG if(false)qDebug
+# define DEBUG_MSG if (false)qDebug
#endif
static QBasicMutex destructorsMutex;
diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h
index 5e1eb17658..e4d493cc52 100644
--- a/src/corelib/tools/qcontiguouscache.h
+++ b/src/corelib/tools/qcontiguouscache.h
@@ -209,13 +209,13 @@ void QContiguousCache<T>::setCapacity(qsizetype asize)
x->alloc = asize;
x->count = qMin(d->count, asize);
x->offset = d->offset + d->count - x->count;
- if(asize)
+ if (asize)
x->start = x->offset % x->alloc;
else
x->start = 0;
qsizetype oldcount = x->count;
- if(oldcount)
+ if (oldcount)
{
T *dest = x->array + (x->start + x->count-1) % x->alloc;
T *src = d->array + (d->start + d->count-1) % d->alloc;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 10:57:35 +0000