From 231fec7ca2f61da7d94c8aa072b41fd7ee893861 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sat, 9 Oct 2021 15:06:03 +0200 Subject: corelib: Fix typos in source code comments Pick-to: 6.2 Change-Id: Ic78afb67143112468c6f84677ac88f27a74b53aa Reviewed-by: Edward Welbourne --- src/corelib/kernel/qcfsocketnotifier.cpp | 2 +- src/corelib/kernel/qcore_mac_p.h | 2 +- src/corelib/kernel/qeventdispatcher_cf.mm | 2 +- src/corelib/kernel/qeventdispatcher_wasm.cpp | 6 +++--- src/corelib/kernel/qmimedata.cpp | 2 +- src/corelib/kernel/qproperty.cpp | 2 +- src/corelib/kernel/qpropertyprivate.h | 2 +- src/corelib/kernel/qvariant.cpp | 4 ++-- src/corelib/kernel/qvariant.h | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/corelib/kernel') diff --git a/src/corelib/kernel/qcfsocketnotifier.cpp b/src/corelib/kernel/qcfsocketnotifier.cpp index 13fe30d0cd..9b1ed8cbf9 100644 --- a/src/corelib/kernel/qcfsocketnotifier.cpp +++ b/src/corelib/kernel/qcfsocketnotifier.cpp @@ -171,7 +171,7 @@ void QCFSocketNotifier::registerSocketNotifier(QSocketNotifier *notifier) CFOptionFlags flags = CFSocketGetSocketFlags(socketInfo->socket); // QSocketNotifier doesn't close the socket upon destruction/invalidation flags &= ~kCFSocketCloseOnInvalidate; - // Expicitly disable automatic re-enable, as we do that manually on each runloop pass + // Explicitly disable automatic re-enable, as we do that manually on each runloop pass flags &= ~(kCFSocketAutomaticallyReenableWriteCallBack | kCFSocketAutomaticallyReenableReadCallBack); CFSocketSetSocketFlags(socketInfo->socket, flags); diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 538ade3466..7b503d10cc 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -145,7 +145,7 @@ private: #endif /* - Helper class that automates refernce counting for CFtypes. + Helper class that automates reference counting for CFtypes. After constructing the QCFType object, it can be copied like a value-based type. diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index f8085f8991..6f6be9a73b 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -281,7 +281,7 @@ bool QEventDispatcherCoreFoundation::processEvents(QEventLoop::ProcessEventsFlag } if (m_processEvents.deferredWakeUp) { - // We may be processing events recursivly as a result of processing a posted event, + // We may be processing events recursively as a result of processing a posted event, // in which case we need to signal the run-loop source so that this iteration of // processEvents will take care of the newly posted events. m_postedEventsRunLoopSource.signal(); diff --git a/src/corelib/kernel/qeventdispatcher_wasm.cpp b/src/corelib/kernel/qeventdispatcher_wasm.cpp index c0d753c594..948e3356c1 100644 --- a/src/corelib/kernel/qeventdispatcher_wasm.cpp +++ b/src/corelib/kernel/qeventdispatcher_wasm.cpp @@ -108,7 +108,7 @@ bool qt_asyncify_suspend() } // Wakes any currently suspended main thread. Returns true if the main -// thread was suspended, in which case it will now be asynchonously woken. +// thread was suspended, in which case it will now be asynchronously woken. bool qt_asyncify_resume() { if (!g_is_asyncify_suspended) @@ -456,7 +456,7 @@ void QEventDispatcherWasm::callProcessEvents(void *context) // In the unlikely event that we get a callProcessEvents() call for // a previous main thread event dispatcher (i.e. the QApplication - // object was deleted and crated again): just ignore it and return. + // object was deleted and created again): just ignore it and return. if (context != g_mainThreadEventDispatcher) return; @@ -534,7 +534,7 @@ void QEventDispatcherWasm::updateNativeTimer() } // Static timer activation callback. Must be called on the main thread -// and will then either process timers on the main thrad or wake and +// and will then either process timers on the main thread or wake and // process timers on a secondary thread. void QEventDispatcherWasm::callProcessTimers(void *context) { diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index 1ed416e3e8..6a0a4d6ed1 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -141,7 +141,7 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QMetaType ty if (data.metaType() == type || !data.isValid()) return data; - // provide more conversion possiblities than just what QVariant provides + // provide more conversion possibilities than just what QVariant provides // URLs can be lists as well... if ((typeId == QMetaType::QUrl && data.metaType().id() == QMetaType::QVariantList) diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index f8bda06176..6561fb2ae8 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -766,7 +766,7 @@ void QPropertyObserverPointer::notify(QUntypedPropertyData *propertyDataPtr) * 1. Before executing any action which might modify the list, we insert a placeholder node after the current node. * As that one is stack allocated and owned by us, we can rest assured that it is * still there after the action has executed, and placeHolder->next points to the actual next node in the list. - * Note that taking next at the beginning of the loop does not work, as the execuated action might either move + * Note that taking next at the beginning of the loop does not work, as the executed action might either move * or delete that node. * 2. After the triggered action has finished, we can use the next pointer in the placeholder node as a safe way to * retrieve the next node. diff --git a/src/corelib/kernel/qpropertyprivate.h b/src/corelib/kernel/qpropertyprivate.h index 2fa82f6342..0f909712f6 100644 --- a/src/corelib/kernel/qpropertyprivate.h +++ b/src/corelib/kernel/qpropertyprivate.h @@ -201,7 +201,7 @@ struct BindingFunctionVTable static_assert (std::is_invocable_r_v ); auto untypedEvaluationFunction = static_cast(f); return std::invoke(*untypedEvaluationFunction, metaType, dataPtr); - } else if constexpr (!std::is_same_v) { // check for void to woraround MSVC issue + } else if constexpr (!std::is_same_v) { // check for void to workaround MSVC issue Q_UNUSED(metaType); QPropertyData *propertyPtr = static_cast *>(dataPtr); // That is allowed by POSIX even if Callable is a function pointer diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 547839d248..b34da6ca18 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -89,7 +89,7 @@ QT_BEGIN_NAMESPACE -namespace { // annonymous used to hide QVariant handlers +namespace { // anonymous used to hide QVariant handlers /*! \internal @@ -292,7 +292,7 @@ static void customClear(QVariant::Private *d) } -} // annonymous used to hide QVariant handlers +} // anonymous used to hide QVariant handlers /*! \class QVariant diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index bacaa44e95..a61b91cb92 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -548,7 +548,7 @@ private: // int variant, so delete this constructor: QVariant(QMetaType::Type) = delete; - // These constructors don't create QVariants of the type associcated + // These constructors don't create QVariants of the type associated // with the enum, as expected, but they would create a QVariant of // type int with the value of the enum value. // Use QVariant v = QColor(Qt::red) instead of QVariant v = Qt::red for -- cgit v1.2.1