diff options
Diffstat (limited to 'src/corelib')
26 files changed, 75 insertions, 75 deletions
diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index 070139b608..cc603dd63f 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -1076,7 +1076,7 @@ QFileInfo QAbstractFileEngineIterator::currentFileInfo() const */ QVariant QAbstractFileEngineIterator::entryInfo(EntryInfoType type) const { - Q_UNUSED(type) + Q_UNUSED(type); return QVariant(); } diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index 8bf87eacae..e202be154a 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1100,7 +1100,7 @@ QT_WARNING_DISABLE_DEPRECATED QResource::addSearchPath(path); QT_WARNING_POP #else - Q_UNUSED(path) + Q_UNUSED(path); #endif } #endif diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index d91807c342..fb41b372a2 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -615,7 +615,7 @@ void QFileSystemMetaData::fillFromDirEnt(const QT_DIRENT &entry) clear(); } #else - Q_UNUSED(entry) + Q_UNUSED(entry); #endif } diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp index e91a7558d7..4e7824522c 100644 --- a/src/corelib/io/qfilesystemengine_win.cpp +++ b/src/corelib/io/qfilesystemengine_win.cpp @@ -1321,9 +1321,9 @@ QFileSystemEntry QFileSystemEngine::currentPath() bool QFileSystemEngine::createLink(const QFileSystemEntry &source, const QFileSystemEntry &target, QSystemError &error) { Q_ASSERT(false); - Q_UNUSED(source) - Q_UNUSED(target) - Q_UNUSED(error) + Q_UNUSED(source); + Q_UNUSED(target); + Q_UNUSED(error); return false; // TODO implement; - code needs to be moved from qfsfileengine_win.cpp } diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp index fd96298f69..c69138e3ba 100644 --- a/src/corelib/io/qfilesystemiterator_unix.cpp +++ b/src/corelib/io/qfilesystemiterator_unix.cpp @@ -66,9 +66,9 @@ QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Fi , dirEntry(nullptr) , lastError(0) { - Q_UNUSED(filters) - Q_UNUSED(nameFilters) - Q_UNUSED(flags) + Q_UNUSED(filters); + Q_UNUSED(nameFilters); + Q_UNUSED(flags); if ((dir = QT_OPENDIR(nativePath.constData())) == nullptr) { lastError = errno; diff --git a/src/corelib/io/qfilesystemiterator_win.cpp b/src/corelib/io/qfilesystemiterator_win.cpp index 65596643bc..ca9f83c0ab 100644 --- a/src/corelib/io/qfilesystemiterator_win.cpp +++ b/src/corelib/io/qfilesystemiterator_win.cpp @@ -57,8 +57,8 @@ QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Fi , uncShareIndex(0) , onlyDirs(false) { - Q_UNUSED(nameFilters) - Q_UNUSED(flags) + Q_UNUSED(nameFilters); + Q_UNUSED(flags); if (nativePath.endsWith(QLatin1String(".lnk"))) { QFileSystemMetaData metaData; QFileSystemEntry link = QFileSystemEngine::getLinkTarget(entry, metaData); diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index cc1d110252..9def33ad9f 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -102,7 +102,7 @@ static void checkWarnMessage(const QIODevice *device, const char *function, cons d << ", \"" << QDir::toNativeSeparators(f->fileName()) << '"'; d << ')'; #else - Q_UNUSED(device) + Q_UNUSED(device); #endif // !QT_NO_QOBJECT d << ": " << what; #else diff --git a/src/corelib/io/qsettings_wasm.cpp b/src/corelib/io/qsettings_wasm.cpp index 8d8f4b505c..949b478c40 100644 --- a/src/corelib/io/qsettings_wasm.cpp +++ b/src/corelib/io/qsettings_wasm.cpp @@ -126,7 +126,7 @@ QSettingsPrivate *QSettingsPrivate::create(QSettings::Format format, const QString &organization, const QString &application) { - Q_UNUSED(format) + Q_UNUSED(format); if (organization == QLatin1String("Qt")) { QString organizationDomain = QCoreApplication::organizationDomain(); diff --git a/src/corelib/io/qstandardpaths_win.cpp b/src/corelib/io/qstandardpaths_win.cpp index a120db32fc..3637c11c0a 100644 --- a/src/corelib/io/qstandardpaths_win.cpp +++ b/src/corelib/io/qstandardpaths_win.cpp @@ -84,7 +84,7 @@ static void appendOrganizationAndApp(QString &path) // Courtesy qstandardpaths_u if (!appName.isEmpty()) path += QLatin1Char('/') + appName; #else // !QT_BOOTSTRAPPED - Q_UNUSED(path) + Q_UNUSED(path); #endif } diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index e6a160c3b2..56a3d1982f 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -242,7 +242,7 @@ static bool createFileFromTemplate(NativeFileHandle &file, QTemporaryFileName &t return false; } #else // POSIX - Q_UNUSED(flags) + Q_UNUSED(flags); file = QT_OPEN(path.constData(), QT_OPEN_CREAT | QT_OPEN_EXCL | QT_OPEN_RDWR | QT_OPEN_LARGEFILE, static_cast<mode_t>(mode)); diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 27885bcb9b..1bb65336bf 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -1942,9 +1942,9 @@ bool QAbstractItemModel::canDropMimeData(const QMimeData *data, Qt::DropAction a int row, int column, const QModelIndex &parent) const { - Q_UNUSED(row) - Q_UNUSED(column) - Q_UNUSED(parent) + Q_UNUSED(row); + Q_UNUSED(column); + Q_UNUSED(parent); if (!(action & supportedDropActions())) return false; diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp index 209626a0ee..8634ddd520 100644 --- a/src/corelib/itemmodels/qidentityproxymodel.cpp +++ b/src/corelib/itemmodels/qidentityproxymodel.cpp @@ -470,9 +470,9 @@ void QIdentityProxyModelPrivate::_q_sourceColumnsInserted(const QModelIndex &par { Q_ASSERT(parent.isValid() ? parent.model() == model : true); Q_Q(QIdentityProxyModel); - Q_UNUSED(parent) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(parent); + Q_UNUSED(start); + Q_UNUSED(end); q->endInsertColumns(); } @@ -481,11 +481,11 @@ void QIdentityProxyModelPrivate::_q_sourceColumnsMoved(const QModelIndex &source Q_ASSERT(sourceParent.isValid() ? sourceParent.model() == model : true); Q_ASSERT(destParent.isValid() ? destParent.model() == model : true); Q_Q(QIdentityProxyModel); - Q_UNUSED(sourceParent) - Q_UNUSED(sourceStart) - Q_UNUSED(sourceEnd) - Q_UNUSED(destParent) - Q_UNUSED(dest) + Q_UNUSED(sourceParent); + Q_UNUSED(sourceStart); + Q_UNUSED(sourceEnd); + Q_UNUSED(destParent); + Q_UNUSED(dest); q->endMoveColumns(); } @@ -493,9 +493,9 @@ void QIdentityProxyModelPrivate::_q_sourceColumnsRemoved(const QModelIndex &pare { Q_ASSERT(parent.isValid() ? parent.model() == model : true); Q_Q(QIdentityProxyModel); - Q_UNUSED(parent) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(parent); + Q_UNUSED(start); + Q_UNUSED(end); q->endRemoveColumns(); } @@ -605,9 +605,9 @@ void QIdentityProxyModelPrivate::_q_sourceRowsInserted(const QModelIndex &parent { Q_ASSERT(parent.isValid() ? parent.model() == model : true); Q_Q(QIdentityProxyModel); - Q_UNUSED(parent) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(parent); + Q_UNUSED(start); + Q_UNUSED(end); q->endInsertRows(); } @@ -616,11 +616,11 @@ void QIdentityProxyModelPrivate::_q_sourceRowsMoved(const QModelIndex &sourcePar Q_ASSERT(sourceParent.isValid() ? sourceParent.model() == model : true); Q_ASSERT(destParent.isValid() ? destParent.model() == model : true); Q_Q(QIdentityProxyModel); - Q_UNUSED(sourceParent) - Q_UNUSED(sourceStart) - Q_UNUSED(sourceEnd) - Q_UNUSED(destParent) - Q_UNUSED(dest) + Q_UNUSED(sourceParent); + Q_UNUSED(sourceStart); + Q_UNUSED(sourceEnd); + Q_UNUSED(destParent); + Q_UNUSED(dest); q->endMoveRows(); } @@ -628,9 +628,9 @@ void QIdentityProxyModelPrivate::_q_sourceRowsRemoved(const QModelIndex &parent, { Q_ASSERT(parent.isValid() ? parent.model() == model : true); Q_Q(QIdentityProxyModel); - Q_UNUSED(parent) - Q_UNUSED(start) - Q_UNUSED(end) + Q_UNUSED(parent); + Q_UNUSED(start); + Q_UNUSED(end); q->endRemoveRows(); } diff --git a/src/corelib/itemmodels/qtransposeproxymodel.cpp b/src/corelib/itemmodels/qtransposeproxymodel.cpp index c72128fa7d..83a86d1a97 100644 --- a/src/corelib/itemmodels/qtransposeproxymodel.cpp +++ b/src/corelib/itemmodels/qtransposeproxymodel.cpp @@ -440,8 +440,8 @@ bool QTransposeProxyModel::moveColumns(const QModelIndex &sourceParent, int sour */ void QTransposeProxyModel::sort(int column, Qt::SortOrder order) { - Q_UNUSED(column) - Q_UNUSED(order) + Q_UNUSED(column); + Q_UNUSED(order); return; } diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 2894e1a731..7c47e324f5 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2237,8 +2237,8 @@ bool QCoreApplicationPrivate::isTranslatorInstalled(QTranslator *translator) QString QCoreApplication::translate(const char *context, const char *sourceText, const char *disambiguation, int n) { - Q_UNUSED(context) - Q_UNUSED(disambiguation) + Q_UNUSED(context); + Q_UNUSED(disambiguation); QString ret = QString::fromUtf8(sourceText); if (n >= 0) ret.replace(QLatin1String("%n"), QString::number(n)); diff --git a/src/corelib/kernel/qjnionload.cpp b/src/corelib/kernel/qjnionload.cpp index 0550b86553..4b2480ff2a 100644 --- a/src/corelib/kernel/qjnionload.cpp +++ b/src/corelib/kernel/qjnionload.cpp @@ -46,7 +46,7 @@ static const char logTag[] = "QtCore"; Q_CORE_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) { - Q_UNUSED(reserved) + Q_UNUSED(reserved); static bool initialized = false; if (initialized) diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 90241854fb..335b958c18 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -747,7 +747,7 @@ template <typename T, bool Accepted = true> struct QMetaTypeFunctionHelper { static void Destruct(void *t) { - Q_UNUSED(t) // Silence MSVC that warns for POD types. + Q_UNUSED(t); // Silence MSVC that warns for POD types. static_cast<T*>(t)->~T(); } diff --git a/src/corelib/kernel/qproperty.h b/src/corelib/kernel/qproperty.h index de08a71349..4a323fe8fe 100644 --- a/src/corelib/kernel/qproperty.h +++ b/src/corelib/kernel/qproperty.h @@ -208,7 +208,7 @@ namespace Qt { return QPropertyBinding<std::invoke_result_t<Functor>>(std::forward<Functor>(f), location); } // Work around bogus warning - Q_UNUSED(QtPrivate::is_variant_v<bool>) + Q_UNUSED(QtPrivate::is_variant_v<bool>); } } diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp index b425ca3dcb..af880ef522 100644 --- a/src/corelib/kernel/qtimerinfo_unix.cpp +++ b/src/corelib/kernel/qtimerinfo_unix.cpp @@ -116,7 +116,7 @@ timespec qAbsTimespec(const timespec &t) bool QTimerInfoList::timeChanged(timespec *delta) { #ifdef Q_OS_NACL - Q_UNUSED(delta) + Q_UNUSED(delta); return false; // Calling "times" crashes. #endif struct tms unused; diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index 98ace021fc..bc28c18edd 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -1109,7 +1109,7 @@ bool QJsonArray::operator!=(const QJsonArray &other) const */ void QJsonArray::detach(uint reserve) { - Q_UNUSED(reserve) + Q_UNUSED(reserve); Q_ASSERT(!reserve); detach2(0); } diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index e573485226..1c7fb7885f 100644 --- a/src/corelib/serialization/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp @@ -1421,7 +1421,7 @@ QJsonObject::const_iterator QJsonObject::constFindImpl(T key) const */ void QJsonObject::detach(uint reserve) { - Q_UNUSED(reserve) + Q_UNUSED(reserve); Q_ASSERT(!reserve); detach2(reserve); } diff --git a/src/corelib/text/qbytearray.cpp b/src/corelib/text/qbytearray.cpp index ee559c6d75..375c64a90c 100644 --- a/src/corelib/text/qbytearray.cpp +++ b/src/corelib/text/qbytearray.cpp @@ -676,7 +676,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) switch (res) { case Z_OK: { Q_ASSERT(len <= alloc); - Q_UNUSED(alloc) + Q_UNUSED(alloc); d.data()[len] = '\0'; d.size = len; return QByteArray(d); diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 5f182df10e..70c1eb4b62 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -775,7 +775,7 @@ void QThread::setTerminationEnabled(bool enabled) Q_ASSERT_X(thr != nullptr, "QThread::setTerminationEnabled()", "Current thread was not started with QThread."); - Q_UNUSED(thr) + Q_UNUSED(thr); #if defined(Q_OS_ANDROID) Q_UNUSED(enabled); #else diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index ffd476d6d3..b59a9d1bb4 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -229,7 +229,7 @@ DWORD WINAPI qt_adopted_thread_watcher_function(LPVOID) QThread *thread = data->thread; Q_ASSERT(thread); auto thread_p = static_cast<QThreadPrivate *>(QObjectPrivate::get(thread)); - Q_UNUSED(thread_p) + Q_UNUSED(thread_p); Q_ASSERT(!thread_p->finished); QThreadPrivate::finish(thread); } diff --git a/src/corelib/time/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp index ebd08ea7db..873b05295d 100644 --- a/src/corelib/time/qtimezoneprivate.cpp +++ b/src/corelib/time/qtimezoneprivate.cpp @@ -198,15 +198,15 @@ QString QTimeZonePrivate::displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, const QLocale &locale) const { - Q_UNUSED(timeType) - Q_UNUSED(nameType) - Q_UNUSED(locale) + Q_UNUSED(timeType); + Q_UNUSED(nameType); + Q_UNUSED(locale); return QString(); } QString QTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch) + Q_UNUSED(atMSecsSinceEpoch); return QString(); } @@ -217,13 +217,13 @@ int QTimeZonePrivate::offsetFromUtc(qint64 atMSecsSinceEpoch) const int QTimeZonePrivate::standardTimeOffset(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch) + Q_UNUSED(atMSecsSinceEpoch); return invalidSeconds(); } int QTimeZonePrivate::daylightTimeOffset(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch) + Q_UNUSED(atMSecsSinceEpoch); return invalidSeconds(); } @@ -234,13 +234,13 @@ bool QTimeZonePrivate::hasDaylightTime() const bool QTimeZonePrivate::isDaylightTime(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch) + Q_UNUSED(atMSecsSinceEpoch); return false; } QTimeZonePrivate::Data QTimeZonePrivate::data(qint64 forMSecsSinceEpoch) const { - Q_UNUSED(forMSecsSinceEpoch) + Q_UNUSED(forMSecsSinceEpoch); return invalidData(); } @@ -454,13 +454,13 @@ bool QTimeZonePrivate::hasTransitions() const QTimeZonePrivate::Data QTimeZonePrivate::nextTransition(qint64 afterMSecsSinceEpoch) const { - Q_UNUSED(afterMSecsSinceEpoch) + Q_UNUSED(afterMSecsSinceEpoch); return invalidData(); } QTimeZonePrivate::Data QTimeZonePrivate::previousTransition(qint64 beforeMSecsSinceEpoch) const { - Q_UNUSED(beforeMSecsSinceEpoch) + Q_UNUSED(beforeMSecsSinceEpoch); return invalidData(); } @@ -877,8 +877,8 @@ QString QUtcTimeZonePrivate::displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, const QLocale &locale) const { - Q_UNUSED(timeType) - Q_UNUSED(locale) + Q_UNUSED(timeType); + Q_UNUSED(locale); if (nameType == QTimeZone::ShortName) return m_abbreviation; else if (nameType == QTimeZone::OffsetName) @@ -888,19 +888,19 @@ QString QUtcTimeZonePrivate::displayName(QTimeZone::TimeType timeType, QString QUtcTimeZonePrivate::abbreviation(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch) + Q_UNUSED(atMSecsSinceEpoch); return m_abbreviation; } qint32 QUtcTimeZonePrivate::standardTimeOffset(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch) + Q_UNUSED(atMSecsSinceEpoch); return m_offsetFromUtc; } qint32 QUtcTimeZonePrivate::daylightTimeOffset(qint64 atMSecsSinceEpoch) const { - Q_UNUSED(atMSecsSinceEpoch) + Q_UNUSED(atMSecsSinceEpoch); return 0; } diff --git a/src/corelib/time/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp index 33518994d1..198e1530e4 100644 --- a/src/corelib/time/qtimezoneprivate_icu.cpp +++ b/src/corelib/time/qtimezoneprivate_icu.cpp @@ -440,7 +440,7 @@ QTimeZonePrivate::Data QIcuTimeZonePrivate::nextTransition(qint64 afterMSecsSinc #if U_ICU_VERSION_MAJOR_NUM == 50 return ucalTimeZoneTransition(m_ucal, UCAL_TZ_TRANSITION_NEXT, afterMSecsSinceEpoch); #else - Q_UNUSED(afterMSecsSinceEpoch) + Q_UNUSED(afterMSecsSinceEpoch); return invalidData(); #endif // U_ICU_VERSION_MAJOR_NUM == 50 } @@ -452,7 +452,7 @@ QTimeZonePrivate::Data QIcuTimeZonePrivate::previousTransition(qint64 beforeMSec #if U_ICU_VERSION_MAJOR_NUM == 50 return ucalTimeZoneTransition(m_ucal, UCAL_TZ_TRANSITION_PREVIOUS, beforeMSecsSinceEpoch); #else - Q_UNUSED(beforeMSecsSinceEpoch) + Q_UNUSED(beforeMSecsSinceEpoch); return invalidData(); #endif // U_ICU_VERSION_MAJOR_NUM == 50 } diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp index 7a31677db0..32d8b78ac3 100644 --- a/src/corelib/time/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp @@ -888,8 +888,8 @@ QString QTzTimeZonePrivate::displayName(qint64 atMSecsSinceEpoch, if (m_icu->isValid()) return m_icu->displayName(atMSecsSinceEpoch, nameType, locale); #else - Q_UNUSED(nameType) - Q_UNUSED(locale) + Q_UNUSED(nameType); + Q_UNUSED(locale); #endif return abbreviation(atMSecsSinceEpoch); } @@ -906,9 +906,9 @@ QString QTzTimeZonePrivate::displayName(QTimeZone::TimeType timeType, if (m_icu->isValid()) return m_icu->displayName(timeType, nameType, locale); #else - Q_UNUSED(timeType) - Q_UNUSED(nameType) - Q_UNUSED(locale) + Q_UNUSED(timeType); + Q_UNUSED(nameType); + Q_UNUSED(locale); #endif // If no ICU available then have to use abbreviations instead // Abbreviations don't have GenericTime |