diff options
Diffstat (limited to 'src/corelib')
476 files changed, 35071 insertions, 24582 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index 3a60b8e0d2..0f006fe1e3 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -375,7 +375,7 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) if (NOT Qt5${_module}_FOUND) find_package(Qt5${_module} PATHS "${_Qt5_COMPONENT_PATH}" NO_DEFAULT_PATH) if (NOT Qt5${_module}_FOUND) - message(FATAL_ERROR "Can not use \"${_module}\" module which has not yet been found.") + message(FATAL_ERROR "Cannot use \"${_module}\" module which has not yet been found.") endif() endif() target_link_libraries(${_target} ${_qt5_link_type} ${Qt5${_module}_LIBRARIES}) diff --git a/src/corelib/animation/qabstractanimation.cpp b/src/corelib/animation/qabstractanimation.cpp index 42308b78fb..46b01449d4 100644 --- a/src/corelib/animation/qabstractanimation.cpp +++ b/src/corelib/animation/qabstractanimation.cpp @@ -152,6 +152,7 @@ #include <QtCore/qthreadstorage.h> #include <QtCore/qcoreevent.h> #include <QtCore/qpointer.h> +#include <QtCore/qscopedvaluerollback.h> #define DEFAULT_TIMER_INTERVAL 16 #define PAUSE_TIMER_COARSE_THRESHOLD 2000 @@ -315,14 +316,13 @@ void QUnifiedTimer::updateAnimationTimers(qint64 currentTick) //* it might happen in some cases that the delta is negative because the animation driver // advances faster than time.elapsed() if (delta > 0) { - insideTick = true; + QScopedValueRollback<bool> guard(insideTick, true); if (profilerCallback) profilerCallback(delta); for (currentAnimationIdx = 0; currentAnimationIdx < animationTimers.count(); ++currentAnimationIdx) { QAbstractAnimationTimer *animation = animationTimers.at(currentAnimationIdx); animation->updateAnimationsTime(delta); } - insideTick = false; currentAnimationIdx = 0; } } @@ -361,10 +361,11 @@ void QUnifiedTimer::localRestart() void QUnifiedTimer::restart() { - insideRestart = true; - for (int i = 0; i < animationTimers.count(); ++i) - animationTimers.at(i)->restartAnimationTimer(); - insideRestart = false; + { + QScopedValueRollback<bool> guard(insideRestart, true); + for (int i = 0; i < animationTimers.count(); ++i) + animationTimers.at(i)->restartAnimationTimer(); + } localRestart(); } @@ -599,14 +600,13 @@ void QAnimationTimer::updateAnimationsTime(qint64 delta) //it might happen in some cases that the time doesn't change because events are delayed //when the CPU load is high if (delta) { - insideTick = true; + QScopedValueRollback<bool> guard(insideTick, true); for (currentAnimationIdx = 0; currentAnimationIdx < animations.count(); ++currentAnimationIdx) { QAbstractAnimation *animation = animations.at(currentAnimationIdx); int elapsed = QAbstractAnimationPrivate::get(animation)->totalCurrentTime + (animation->direction() == QAbstractAnimation::Forward ? delta : -delta); animation->setCurrentTime(elapsed); } - insideTick = false; currentAnimationIdx = 0; } } @@ -773,6 +773,7 @@ QAnimationDriver::~QAnimationDriver() } +#if QT_DEPRECATED_SINCE(5, 13) /*! Sets the time at which an animation driver should start at. @@ -799,6 +800,7 @@ qint64 QAnimationDriver::startTime() const { return 0; } +#endif /*! @@ -1065,6 +1067,8 @@ QAbstractAnimation::~QAbstractAnimation() if (oldState == QAbstractAnimation::Running) QAnimationTimer::unregisterAnimation(this); } + if (d->group) + d->group->removeAnimation(this); } /*! diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 25b5726d56..7f2577d7f7 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -147,9 +147,10 @@ public: virtual qint64 elapsed() const; - // ### Qt6: Remove these two functions - void setStartTime(qint64 startTime); - qint64 startTime() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED void setStartTime(qint64 startTime); + QT_DEPRECATED qint64 startTime() const; +#endif Q_SIGNALS: void started(); diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h index 3b6e8d6cc4..037d3be74f 100644 --- a/src/corelib/animation/qabstractanimation_p.h +++ b/src/corelib/animation/qabstractanimation_p.h @@ -78,7 +78,7 @@ public: hasRegisteredTimer(false), isPause(false), isGroup(false), - group(0) + group(nullptr) { } diff --git a/src/corelib/animation/qanimationgroup.cpp b/src/corelib/animation/qanimationgroup.cpp index f47d99eb68..ed40817222 100644 --- a/src/corelib/animation/qanimationgroup.cpp +++ b/src/corelib/animation/qanimationgroup.cpp @@ -113,6 +113,11 @@ QAnimationGroup::QAnimationGroup(QAnimationGroupPrivate &dd, QObject *parent) */ QAnimationGroup::~QAnimationGroup() { + Q_D(QAnimationGroup); + // We need to clear the animations now while we are still a valid QAnimationGroup. + // If we wait until ~QObject() the QAbstractAnimation's pointer back to us would + // point to a QObject, not a valid QAnimationGroup. + d->clear(true); } /*! @@ -256,7 +261,7 @@ QAbstractAnimation *QAnimationGroup::takeAnimation(int index) void QAnimationGroup::clear() { Q_D(QAnimationGroup); - qDeleteAll(d->animations); + d->clear(false); } /*! @@ -284,6 +289,24 @@ bool QAnimationGroup::event(QEvent *event) return QAbstractAnimation::event(event); } +void QAnimationGroupPrivate::clear(bool onDestruction) +{ + const QList<QAbstractAnimation *> animationsCopy = animations; // taking a copy + animations.clear(); + // Clearing backwards so the indices doesn't change while we remove animations. + for (int i = animationsCopy.count() - 1; i >= 0; --i) { + QAbstractAnimation *animation = animationsCopy.at(i); + animation->setParent(nullptr); + QAbstractAnimationPrivate::get(animation)->group = nullptr; + // If we are in ~QAnimationGroup() it is not safe to called the virtual + // animationRemoved method, which can still be a method in a + // QAnimationGroupPrivate derived class that assumes q_ptr is still + // a valid derived class of QAnimationGroup. + if (!onDestruction) + animationRemoved(i, animation); + delete animation; + } +} void QAnimationGroupPrivate::animationRemoved(int index, QAbstractAnimation *) { diff --git a/src/corelib/animation/qanimationgroup_p.h b/src/corelib/animation/qanimationgroup_p.h index ff759d11fd..4d1d690e69 100644 --- a/src/corelib/animation/qanimationgroup_p.h +++ b/src/corelib/animation/qanimationgroup_p.h @@ -73,10 +73,12 @@ public: virtual void animationInsertedAt(int) { } virtual void animationRemoved(int, QAbstractAnimation *); + void clear(bool onDestruction); + void disconnectUncontrolledAnimation(QAbstractAnimation *anim) { //0 for the signal here because we might be called from the animation destructor - QObject::disconnect(anim, 0, q_func(), SLOT(_q_uncontrolledAnimationFinished())); + QObject::disconnect(anim, nullptr, q_func(), SLOT(_q_uncontrolledAnimationFinished())); } void connectUncontrolledAnimation(QAbstractAnimation *anim) diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 28c03553c5..a1baa112fc 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -277,15 +277,20 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, if (oldState == Stopped) { d->setDefaultStartEndValue(d->targetValue->property(d->propertyName.constData())); //let's check if we have a start value and an end value + const char *what = nullptr; if (!startValue().isValid() && (d->direction == Backward || !d->defaultStartEndValue.isValid())) { - qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without start value", - d->propertyName.constData(), d->target.data()->metaObject()->className(), - qPrintable(d->target.data()->objectName())); + what = "start"; } if (!endValue().isValid() && (d->direction == Forward || !d->defaultStartEndValue.isValid())) { - qWarning("QPropertyAnimation::updateState (%s, %s, %s): starting an animation without end value", + if (what) + what = "start and end"; + else + what = "end"; + } + if (Q_UNLIKELY(what)) { + qWarning("QPropertyAnimation::updateState (%s, %s, %ls): starting an animation without %s value", d->propertyName.constData(), d->target.data()->metaObject()->className(), - qPrintable(d->target.data()->objectName())); + qUtf16Printable(d->target.data()->objectName()), what); } } } else if (hash.value(key) == this) { @@ -303,6 +308,6 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State newState, } } -#include "moc_qpropertyanimation.cpp" - QT_END_NAMESPACE + +#include "moc_qpropertyanimation.cpp" diff --git a/src/corelib/animation/qpropertyanimation_p.h b/src/corelib/animation/qpropertyanimation_p.h index 479762f573..cbd3ce287d 100644 --- a/src/corelib/animation/qpropertyanimation_p.h +++ b/src/corelib/animation/qpropertyanimation_p.h @@ -64,7 +64,7 @@ class QPropertyAnimationPrivate : public QVariantAnimationPrivate Q_DECLARE_PUBLIC(QPropertyAnimation) public: QPropertyAnimationPrivate() - : targetValue(0), propertyType(0), propertyIndex(-1) + : targetValue(nullptr), propertyType(0), propertyIndex(-1) { } diff --git a/src/corelib/animation/qsequentialanimationgroup.cpp b/src/corelib/animation/qsequentialanimationgroup.cpp index 150e74d7d6..66e346a2fe 100644 --- a/src/corelib/animation/qsequentialanimationgroup.cpp +++ b/src/corelib/animation/qsequentialanimationgroup.cpp @@ -532,7 +532,8 @@ void QSequentialAnimationGroupPrivate::animationRemoved(int index, QAbstractAnim Q_Q(QSequentialAnimationGroup); QAnimationGroupPrivate::animationRemoved(index, anim); - Q_ASSERT(currentAnimation); // currentAnimation should always be set + if (!currentAnimation) + return; if (actualDuration.size() > index) actualDuration.removeAt(index); diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h index 88dac4f566..c082d6b524 100644 --- a/src/corelib/animation/qsequentialanimationgroup_p.h +++ b/src/corelib/animation/qsequentialanimationgroup_p.h @@ -63,7 +63,7 @@ class QSequentialAnimationGroupPrivate : public QAnimationGroupPrivate Q_DECLARE_PUBLIC(QSequentialAnimationGroup) public: QSequentialAnimationGroupPrivate() - : currentAnimation(0), currentAnimationIndex(-1), lastLoop(0) + : currentAnimation(nullptr), currentAnimationIndex(-1), lastLoop(0) { } diff --git a/src/corelib/animation/qvariantanimation.cpp b/src/corelib/animation/qvariantanimation.cpp index e935ac711e..01a699c5dc 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -283,11 +283,11 @@ void QVariantAnimationPrivate::setCurrentValueForProgress(const qreal progress) qSwap(currentValue, ret); q->updateCurrentValue(currentValue); static QBasicAtomicInt changedSignalIndex = Q_BASIC_ATOMIC_INITIALIZER(0); - if (!changedSignalIndex.load()) { + if (!changedSignalIndex.loadRelaxed()) { //we keep the mask so that we emit valueChanged only when needed (for performance reasons) changedSignalIndex.testAndSetRelaxed(0, signalIndex("valueChanged(QVariant)")); } - if (isSignalConnected(changedSignalIndex.load()) && currentValue != ret) { + if (isSignalConnected(changedSignalIndex.loadRelaxed()) && currentValue != ret) { //the value has changed emit q->valueChanged(currentValue); } @@ -399,7 +399,7 @@ static QBasicMutex registeredInterpolatorsMutex; Registers a custom interpolator \a func for the template type \c{T}. The interpolator has to be registered before the animation is constructed. - To unregister (and use the default interpolator) set \a func to 0. + To unregister (and use the default interpolator) set \a func to \nullptr. */ /*! @@ -416,7 +416,7 @@ static QBasicMutex registeredInterpolatorsMutex; * \internal * Registers a custom interpolator \a func for the specific \a interpolationType. * The interpolator has to be registered before the animation is constructed. - * To unregister (and use the default interpolator) set \a func to 0. + * To unregister (and use the default interpolator) set \a func to \nullptr. */ void QVariantAnimation::registerInterpolator(QVariantAnimation::Interpolator func, int interpolationType) { diff --git a/src/corelib/codecs/qbig5codec_p.h b/src/corelib/codecs/qbig5codec_p.h index 2db8377ee3..c17afae1c4 100644 --- a/src/corelib/codecs/qbig5codec_p.h +++ b/src/corelib/codecs/qbig5codec_p.h @@ -69,12 +69,12 @@ public: static QList<QByteArray> _aliases(); static int _mibEnum(); - QByteArray name() const { return _name(); } - QList<QByteArray> aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList<QByteArray> aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; class QBig5hkscsCodec : public QTextCodec { @@ -83,12 +83,12 @@ public: static QList<QByteArray> _aliases() { return QList<QByteArray>(); } static int _mibEnum(); - QByteArray name() const { return _name(); } - QList<QByteArray> aliases() const { return _aliases(); } - int mibEnum() const { return _mibEnum(); } + QByteArray name() const override { return _name(); } + QList<QByteArray> aliases() const override { return _aliases(); } + int mibEnum() const override { return _mibEnum(); } - QString convertToUnicode(const char *, int, ConverterState *) const; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; QT_END_NAMESPACE diff --git a/src/corelib/codecs/qlatincodec.cpp b/src/corelib/codecs/qlatincodec.cpp index 1b53d26ef4..463c5a56ae 100644 --- a/src/corelib/codecs/qlatincodec.cpp +++ b/src/corelib/codecs/qlatincodec.cpp @@ -48,7 +48,7 @@ QLatin1Codec::~QLatin1Codec() QString QLatin1Codec::convertToUnicode(const char *chars, int len, ConverterState *) const { - if (chars == 0) + if (chars == nullptr) return QString(); return QString::fromLatin1(chars, len); @@ -104,7 +104,7 @@ QLatin15Codec::~QLatin15Codec() QString QLatin15Codec::convertToUnicode(const char* chars, int len, ConverterState *) const { - if (chars == 0) + if (chars == nullptr) return QString(); QString str = QString::fromLatin1(chars, len); diff --git a/src/corelib/codecs/qsimplecodec.cpp b/src/corelib/codecs/qsimplecodec.cpp index 9ab545d783..16a9b8a7c3 100644 --- a/src/corelib/codecs/qsimplecodec.cpp +++ b/src/corelib/codecs/qsimplecodec.cpp @@ -610,7 +610,7 @@ QSimpleTextCodec::QSimpleTextCodec(int i) : forwardIndex(i), reverseMap(0) QSimpleTextCodec::~QSimpleTextCodec() { - delete reverseMap.load(); + delete reverseMap.loadAcquire(); } static QByteArray *buildReverseMap(int forwardIndex) @@ -662,12 +662,12 @@ QByteArray QSimpleTextCodec::convertFromUnicode(const QChar *in, int length, Con const char replacement = (state && state->flags & ConvertInvalidToNull) ? 0 : '?'; int invalid = 0; - QByteArray *rmap = reverseMap.load(); + QByteArray *rmap = reverseMap.loadAcquire(); if (!rmap){ rmap = buildReverseMap(this->forwardIndex); if (!reverseMap.testAndSetRelease(0, rmap)) { delete rmap; - rmap = reverseMap.load(); + rmap = reverseMap.loadAcquire(); } } diff --git a/src/corelib/codecs/qtextcodec.cpp b/src/corelib/codecs/qtextcodec.cpp index eb05446beb..85cfcdbf48 100644 --- a/src/corelib/codecs/qtextcodec.cpp +++ b/src/corelib/codecs/qtextcodec.cpp @@ -159,7 +159,7 @@ static QTextCodec *setupLocaleMapper() { QCoreGlobalData *globalData = QCoreGlobalData::instance(); - QTextCodec *locale = 0; + QTextCodec *locale = nullptr; { QMutexLocker locker(textCodecsMutex()); @@ -208,7 +208,7 @@ static QTextCodec *setupLocaleMapper() // First part is getting that locale name. First try setlocale() which // definitely knows it, but since we cannot fully trust it, get ready // to fall back to environment variables. - const QByteArray ctype = setlocale(LC_CTYPE, 0); + const QByteArray ctype = setlocale(LC_CTYPE, nullptr); // Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG // environment variables. @@ -505,9 +505,9 @@ QTextCodec::~QTextCodec() globalData->allCodecs.removeOne(this); - auto it = globalData->codecCache.cbegin(); + auto it = globalData->codecCache.begin(); - while (it != globalData->codecCache.cend()) { + while (it != globalData->codecCache.end()) { if (it.value() == this) it = globalData->codecCache.erase(it); else @@ -532,13 +532,13 @@ QTextCodec::~QTextCodec() QTextCodec *QTextCodec::codecForName(const QByteArray &name) { if (name.isEmpty()) - return 0; + return nullptr; QMutexLocker locker(textCodecsMutex()); QCoreGlobalData *globalData = QCoreGlobalData::instance(); if (!globalData) - return 0; + return nullptr; setup(); #if !QT_CONFIG(icu) @@ -567,7 +567,7 @@ QTextCodec *QTextCodec::codecForName(const QByteArray &name) } } - return 0; + return nullptr; #else return QIcuCodec::codecForNameUnlocked(name); #endif @@ -585,7 +585,7 @@ QTextCodec* QTextCodec::codecForMib(int mib) QCoreGlobalData *globalData = QCoreGlobalData::instance(); if (!globalData) - return 0; + return nullptr; if (globalData->allCodecs.isEmpty()) setup(); @@ -611,7 +611,7 @@ QTextCodec* QTextCodec::codecForMib(int mib) #if QT_CONFIG(icu) return QIcuCodec::codecForMibUnlocked(mib); #else - return 0; + return nullptr; #endif } @@ -678,7 +678,7 @@ QList<int> QTextCodec::availableMibs() \nonreentrant Set the codec to \a c; this will be returned by - codecForLocale(). If \a c is a null pointer, the codec is reset to + codecForLocale(). If \a c is \nullptr, the codec is reset to the default. This might be needed for some applications that want to use their @@ -695,18 +695,16 @@ void QTextCodec::setCodecForLocale(QTextCodec *c) \threadsafe Returns a pointer to the codec most suitable for this locale. - On Windows, the codec will be based on a system locale. On Unix - systems, the codec will might fall back to using the \e iconv - library if no builtin codec for the locale can be found. - - Note that in these cases the codec's name will be "System". + The codec will be retrieved from ICU where that backend is in use, otherwise + it may be obtained from an OS-specific API. In the latter case, the codec's + name may be "System". */ QTextCodec* QTextCodec::codecForLocale() { QCoreGlobalData *globalData = QCoreGlobalData::instance(); if (!globalData) - return 0; + return nullptr; QTextCodec *codec = globalData->codecForLocale.loadAcquire(); if (!codec) { @@ -766,7 +764,7 @@ QList<QByteArray> QTextCodec::aliases() const encoding of the subclass to Unicode, and returns the result in a QString. - \a state can be 0, in which case the conversion is stateless and + \a state can be \nullptr, in which case the conversion is stateless and default conversion rules should be used. If state is not 0, the codec should save the state after the conversion in \a state, and adjust the \c remainingChars and \c invalidChars members of the struct. @@ -782,7 +780,7 @@ QList<QByteArray> QTextCodec::aliases() const from Unicode to the encoding of the subclass, and returns the result in a QByteArray. - \a state can be 0 in which case the conversion is stateless and + \a state can be \nullptr in which case the conversion is stateless and default conversion rules should be used. If state is not 0, the codec should save the state after the conversion in \a state, and adjust the \c remainingChars and \c invalidChars members of the struct. @@ -832,7 +830,7 @@ QTextEncoder* QTextCodec::makeEncoder(QTextCodec::ConversionFlags flags) const */ QByteArray QTextCodec::fromUnicode(const QString& str) const { - return convertFromUnicode(str.constData(), str.length(), 0); + return convertFromUnicode(str.constData(), str.length(), nullptr); } #endif @@ -865,7 +863,7 @@ QByteArray QTextCodec::fromUnicode(QStringView str) const */ QString QTextCodec::toUnicode(const QByteArray& a) const { - return convertToUnicode(a.constData(), a.length(), 0); + return convertToUnicode(a.constData(), a.length(), nullptr); } /*! @@ -917,7 +915,7 @@ bool QTextCodec::canEncode(QStringView s) const QString QTextCodec::toUnicode(const char *chars) const { int len = qstrlen(chars); - return convertToUnicode(chars, len, 0); + return convertToUnicode(chars, len, nullptr); } @@ -1063,7 +1061,7 @@ QString QTextDecoder::toUnicode(const char *chars, int len) } // in qstring.cpp: -void qt_from_latin1(ushort *dst, const char *str, size_t size) Q_DECL_NOTHROW; +void qt_from_latin1(ushort *dst, const char *str, size_t size) noexcept; /*! \overload @@ -1112,7 +1110,7 @@ QString QTextDecoder::toUnicode(const QByteArray &ba) QTextCodec *QTextCodec::codecForHtml(const QByteArray &ba, QTextCodec *defaultCodec) { // determine charset - QTextCodec *c = QTextCodec::codecForUtfText(ba, 0); + QTextCodec *c = QTextCodec::codecForUtfText(ba, nullptr); if (!c) { static Q_RELAXED_CONSTEXPR auto matcher = qMakeStaticByteArrayMatcher("meta "); QByteArray header = ba.left(1024).toLower(); diff --git a/src/corelib/codecs/qtextcodec_p.h b/src/corelib/codecs/qtextcodec_p.h index 0e449d994c..7fcf6df984 100644 --- a/src/corelib/codecs/qtextcodec_p.h +++ b/src/corelib/codecs/qtextcodec_p.h @@ -98,7 +98,7 @@ public: struct ConverterState { ConverterState(ConversionFlags f = DefaultConversion) - : flags(f), remainingChars(0), invalidChars(0), d(0) { state_data[0] = state_data[1] = state_data[2] = 0; } + : flags(f), remainingChars(0), invalidChars(0), d(nullptr) { state_data[0] = state_data[1] = state_data[2] = 0; } ~ConverterState() { } ConversionFlags flags; int remainingChars; diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp index 643c8ee475..85736fdf02 100644 --- a/src/corelib/codecs/qutfcodec.cpp +++ b/src/corelib/codecs/qutfcodec.cpp @@ -54,7 +54,7 @@ static const uchar utf8bom[] = { 0xef, 0xbb, 0xbf }; #if (defined(__SSE2__) && defined(QT_COMPILER_SUPPORTS_SSE2)) \ || (defined(__ARM_NEON__) && defined(Q_PROCESSOR_ARM_64)) -static Q_ALWAYS_INLINE uint qBitScanReverse(unsigned v) Q_DECL_NOTHROW +static Q_ALWAYS_INLINE uint qBitScanReverse(unsigned v) noexcept { uint result = qCountLeadingZeroBits(v); // Now Invert the result: clz will count *down* from the msb to the lsb, so the msb index is 31 @@ -504,7 +504,7 @@ QString QUtf8::convertToUnicode(const char *chars, int len) This function never throws. */ -QChar *QUtf8::convertToUnicode(QChar *buffer, const char *chars, int len) Q_DECL_NOTHROW +QChar *QUtf8::convertToUnicode(QChar *buffer, const char *chars, int len) noexcept { ushort *dst = reinterpret_cast<ushort *>(buffer); const uchar *src = reinterpret_cast<const uchar *>(chars); diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h index b24283ac5e..083e16317a 100644 --- a/src/corelib/codecs/qutfcodec_p.h +++ b/src/corelib/codecs/qutfcodec_p.h @@ -291,7 +291,7 @@ enum DataEndianness struct QUtf8 { - static QChar *convertToUnicode(QChar *, const char *, int) Q_DECL_NOTHROW; + static QChar *convertToUnicode(QChar *, const char *, int) noexcept; static QString convertToUnicode(const char *, int); static QString convertToUnicode(const char *, int, QTextCodec::ConverterState *); static QByteArray convertFromUnicode(const QChar *, int); diff --git a/src/corelib/configure.json b/src/corelib/configure.json index 5f5a00a64f..88c7bbfbed 100644 --- a/src/corelib/configure.json +++ b/src/corelib/configure.json @@ -11,7 +11,8 @@ "icu": "boolean", "inotify": "boolean", "journald": "boolean", - "pcre": { "type": "enum", "values": [ "qt", "system" ] }, + "mimetype-database": "boolean", + "pcre": { "type": "enum", "values": [ "no", "qt", "system" ] }, "posix-ipc": { "type": "boolean", "name": "ipc_posix" }, "pps": { "type": "boolean", "name": "qqnx_pps" }, "slog2": "boolean", @@ -234,6 +235,66 @@ "sources": [ "-lslog2" ] + }, + "advapi32": { + "label": "advapi32", + "sources": [ + "-ladvapi32" + ] + }, + "gdi32": { + "label": "gdi32", + "sources": [ + "-lgdi32" + ] + }, + "kernel32": { + "label": "kernel32", + "sources": [ + "-lkernel32" + ] + }, + "netapi32": { + "label": "netapi32", + "sources": [ + "-lnetapi32" + ] + }, + "ole32": { + "label": "ole32", + "sources": [ + "-lole32" + ] + }, + "shell32": { + "label": "shell32", + "sources": [ + "-lshell32" + ] + }, + "uuid": { + "label": "uuid", + "sources": [ + "-luuid" + ] + }, + "user32": { + "label": "user32", + "sources": [ + "-luser32" + ] + }, + "winmm": { + "label": "winmm", + "sources": [ + "-lwinmm" + ] + }, + "ws2_32": { + "label": "ws2_32", + "sources": [ + "-lws2_32" + ] } }, @@ -678,15 +739,23 @@ "condition": "features.textcodec", "output": [ "publicFeature", "feature" ] }, + "mimetype-database": { + "label": "Built-in copy of the MIME database", + "condition": "features.mimetype", + "output": [ "privateFeature" ] + }, + "pcre2": { + "label": "PCRE2", + "disable": "input.pcre == 'no' || input.pcre == 'system'", + "enable": "input.pcre == 'qt'", + "output": [ "privateConfig" ] + }, "system-pcre2": { - "label": "Using system PCRE2", - "disable": "input.pcre == 'qt'", + "label": " Using system PCRE2", + "disable": "input.pcre == 'no' || input.pcre == 'qt'", "enable": "input.pcre == 'system'", "condition": "libs.pcre2", - "output": [ - "privateFeature", - { "type": "privateConfig", "negative": true, "name": "pcre2" } - ] + "output": [ "privateFeature" ] }, "poll_ppoll": { "label": "Native ppoll()", @@ -765,6 +834,7 @@ "label": "QRegularExpression", "purpose": "Provides an API to Perl-compatible regular expressions.", "section": "Kernel", + "condition": "features.system-pcre2 || features.pcre2", "output": [ "publicFeature", "feature" ] }, "sharedmemory": { @@ -781,7 +851,7 @@ "purpose": "Provides a general counting system semaphore.", "section": "Kernel", "condition": [ - "!config.integrity && !config.vxworks", + "!config.integrity && !config.vxworks && !config.rtems", "config.android || config.win32 || tests.ipc_sysv || tests.ipc_posix" ], "output": [ "publicFeature", "feature" ] @@ -823,14 +893,14 @@ "label": "QProcess", "purpose": "Supports external process invocation.", "section": "File I/O", - "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks", + "condition": "features.processenvironment && !config.winrt && !config.uikit && !config.integrity && !config.vxworks && !config.rtems", "output": [ "publicFeature", "feature" ] }, "processenvironment": { "label": "QProcessEnvironment", "purpose": "Provides a higher-level abstraction of environment variables.", "section": "File I/O", - "condition": "!config.winrt && !config.integrity", + "condition": "!config.winrt && !config.integrity && !config.rtems", "output": [ "publicFeature" ] }, "temporaryfile": { @@ -892,6 +962,20 @@ "condition": "features.proxymodel", "output": [ "publicFeature", "feature" ] }, + "transposeproxymodel": { + "label": "QTransposeProxyModel", + "purpose": "Provides a proxy to swap rows and columns of a model.", + "section": "ItemViews", + "condition": "features.proxymodel", + "output": [ "publicFeature", "feature" ] + }, + "concatenatetablesproxymodel": { + "label": "QConcatenateTablesProxyModel", + "purpose": "Supports concatenating source models.", + "section": "ItemViews", + "condition": "features.proxymodel", + "output": [ "publicFeature", "feature" ] + }, "stringlistmodel": { "label": "QStringListModel", "purpose": "Provides a model that supplies strings to views.", @@ -993,6 +1077,10 @@ If enabled, a binary dump of the Public Suffix List (http://www.publicsuffix.org Mozilla License) is included. The data is then also used in QNetworkCookieJar::validateCookie.", "section": "Utilities", "output": [ "publicFeature" ] + }, + "win32_system_libs": { + "label": "Windows System Libraries", + "condition": "config.win32 && libs.advapi32 && libs.gdi32 && libs.kernel32 && libs.netapi32 && libs.ole32 && libs.shell32 && libs.uuid && libs.user32 && libs.winmm && libs.ws2_32" } }, @@ -1034,6 +1122,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in "glib", "iconv", "icu", + "mimetype-database", { "message": "Tracing backend", "type": "firstAvailableFeature", @@ -1050,6 +1139,7 @@ Please apply the patch corresponding to your Standard Library vendor, found in "args": "qqnx_pps", "condition": "config.qnx" }, + "pcre2", "system-pcre2" ] } diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 181780c475..521f840292 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -36,6 +36,7 @@ qtConfig(animation): include(animation/animation.pri) include(global/global.pri) include(thread/thread.pri) include(tools/tools.pri) +include(time/time.pri) include(io/io.pri) include(itemmodels/itemmodels.pri) include(plugin/plugin.pri) @@ -44,12 +45,11 @@ include(codecs/codecs.pri) include(serialization/serialization.pri) include(statemachine/statemachine.pri) include(mimetypes/mimetypes.pri) +include(platform/platform.pri) win32 { - LIBS_PRIVATE += -lws2_32 - !winrt { - LIBS_PRIVATE += -lkernel32 -luser32 -lshell32 -luuid -lole32 -ladvapi32 -lwinmm - } + QMAKE_USE_PRIVATE += ws2_32 + !winrt: QMAKE_USE_PRIVATE += advapi32 kernel32 ole32 shell32 uuid user32 winmm } darwin { @@ -67,8 +67,6 @@ integrity { QMAKE_DYNAMIC_LIST_FILE = $$PWD/QtCore.dynlist -contains(DEFINES,QT_EVAL):include(eval.pri) - HOST_BINS = $$[QT_HOST_BINS] host_bins.name = host_bins host_bins.variable = HOST_BINS diff --git a/src/corelib/doc/snippets/code/doc_src_qset.cpp b/src/corelib/doc/snippets/code/doc_src_qset.cpp index 4cd84d7330..7f7cec8b45 100644 --- a/src/corelib/doc/snippets/code/doc_src_qset.cpp +++ b/src/corelib/doc/snippets/code/doc_src_qset.cpp @@ -133,7 +133,7 @@ QSet<QString> set; ... QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette"); if (it != set.end()) - cout << "Found Jeanette" << endl; + cout << "Found Jeanette" << Qt::endl; //! [10] @@ -152,7 +152,7 @@ QSet<QString> set; ... QSet<QString>::iterator it = qFind(set.begin(), set.end(), "Jeanette"); if (it != set.constEnd()) - cout << "Found Jeanette" << endl; + cout << "Found Jeanette" << Qt::endl; //! [12] diff --git a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp index 03904659f5..eb75a29ca2 100644 --- a/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_global_qglobal.cpp @@ -773,16 +773,16 @@ bool readConfiguration(const QFile &file) //! [qdecloverride] // generate error if this doesn't actually override anything: - virtual void MyWidget::paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + virtual void MyWidget::paintEvent(QPaintEvent*) override; //! [qdecloverride] //! [qdeclfinal-1] // more-derived classes no longer permitted to override this: - virtual void MyWidget::paintEvent(QPaintEvent*) Q_DECL_FINAL; + virtual void MyWidget::paintEvent(QPaintEvent*) final; //! [qdeclfinal-1] //! [qdeclfinal-2] - class QRect Q_DECL_FINAL { // cannot be derived from + class QRect final { // cannot be derived from // ... }; //! [qdeclfinal-2] diff --git a/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp b/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp index 625c1cf9bc..c30f13df5a 100644 --- a/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_io_qtextstream.cpp @@ -124,12 +124,12 @@ in >> ch1 >> ch2 >> ch3; //! [8] QTextStream out(stdout); -out << "Qt rocks!" << endl; +out << "Qt rocks!" << Qt::endl; //! [8] //! [9] -stream << '\n' << flush; +stream << '\n' << Qt::flush; //! [9] diff --git a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp index 382b08fdb7..dfa9b670e7 100644 --- a/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_thread_qfuture.cpp @@ -53,7 +53,7 @@ QFuture<QString> future = ...; QFuture<QString>::const_iterator i; for (i = future.constBegin(); i != future.constEnd(); ++i) - cout << *i << endl; + cout << *i << Qt::endl; //! [0] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp index 32fccbefbf..11ab50687d 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qbytearray.cpp @@ -71,7 +71,7 @@ ba[4] = 0xca; //! [2] for (int i = 0; i < ba.size(); ++i) { if (ba.at(i) >= 'a' && ba.at(i) <= 'f') - cout << "Found character in range [a-f]" << endl; + cout << "Found character in range [a-f]" << Qt::endl; } //! [2] @@ -88,7 +88,7 @@ x.replace(5, 3, "&"); // x == "rock & roll" QByteArray ba("We must be <b>bold</b>, very <b>bold</b>"); int j = 0; while ((j = ba.indexOf("<b>", j)) != -1) { - cout << "Found <b> tag at index position " << j << endl; + cout << "Found <b> tag at index position " << j << Qt::endl; ++j; } //! [4] @@ -126,17 +126,17 @@ QByteArray("abc").isEmpty(); // returns false QByteArray ba("Hello world"); char *data = ba.data(); while (*data) { - cout << "[" << *data << "]" << endl; + cout << "[" << *data << "]" << Qt::endl; ++data; } //! [8] //! [9] -QByteArray ba; -for (int i = 0; i < 10; ++i) - ba[i] = 'A' + i; -// ba == "ABCDEFGHIJ" +QByteArray ba("Hello, world"); +cout << ba[0]; // prints H +ba[7] = 'W'; +// ba == "Hello, World" //! [9] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp index 3ecb67a48f..a477e91548 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qdatetime.cpp @@ -128,7 +128,7 @@ qDebug("Time elapsed: %d ms", t.elapsed()); //! [11] QDateTime now = QDateTime::currentDateTime(); -QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0)); +QDateTime xmas(QDate(now.date().year(), 12, 25).startOfDay()); qDebug("There are %d seconds to Christmas", now.secsTo(xmas)); //! [11] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp index a3d2dd7f9e..9813cc98d5 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qhash.cpp @@ -89,7 +89,7 @@ QHash<int, QWidget *> hash; ... for (int i = 0; i < 1000; ++i) { if (hash[i] == okButton) - cout << "Found button at index " << i << endl; + cout << "Found button at index " << i << Qt::endl; } //! [6] @@ -98,7 +98,7 @@ for (int i = 0; i < 1000; ++i) { QHashIterator<QString, int> i(hash); while (i.hasNext()) { i.next(); - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; } //! [7] @@ -106,7 +106,7 @@ while (i.hasNext()) { //! [8] QHash<QString, int>::const_iterator i = hash.constBegin(); while (i != hash.constEnd()) { - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; ++i; } //! [8] @@ -122,14 +122,14 @@ hash.insert("plenty", 2000); //! [10] QList<int> values = hash.values("plenty"); for (int i = 0; i < values.size(); ++i) - cout << values.at(i) << endl; + cout << values.at(i) << Qt::endl; //! [10] //! [11] QHash<QString, int>::iterator i = hash.find("plenty"); while (i != hash.end() && i.key() == "plenty") { - cout << i.value() << endl; + cout << i.value() << Qt::endl; ++i; } //! [11] @@ -139,7 +139,7 @@ while (i != hash.end() && i.key() == "plenty") { QHash<QString, int> hash; ... foreach (int value, hash) - cout << value << endl; + cout << value << Qt::endl; //! [12] @@ -201,7 +201,7 @@ QHash<QString, int> hash; ... QHash<QString, int>::const_iterator i = hash.find("HDR"); while (i != hash.end() && i.key() == "HDR") { - cout << i.value() << endl; + cout << i.value() << Qt::endl; ++i; } //! [16] @@ -216,7 +216,7 @@ hash.insert("December", 12); QHash<QString, int>::iterator i; for (i = hash.begin(); i != hash.end(); ++i) - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; //! [17] @@ -274,7 +274,7 @@ hash.insert("December", 12); QHash<QString, int>::const_iterator i; for (i = hash.constBegin(); i != hash.constEnd(); ++i) - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; //! [23] @@ -296,23 +296,23 @@ hash3 = hash1 + hash2; //! [25] QList<int> values = hash.values("plenty"); for (int i = 0; i < values.size(); ++i) - cout << values.at(i) << endl; + cout << values.at(i) << Qt::endl; //! [25] //! [26] QMultiHash<QString, int>::iterator i = hash.find("plenty"); while (i != hash.end() && i.key() == "plenty") { - cout << i.value() << endl; + cout << i.value() << Qt::endl; ++i; } //! [26] //! [27] for (QHash<int, QString>::const_iterator it = hash.cbegin(), end = hash.cend(); it != end; ++it) { - cout << "The key: " << it.key() << endl - cout << "The value: " << it.value() << endl; - cout << "Also the value: " << (*it) << endl; + cout << "The key: " << it.key() << Qt::endl + cout << "The value: " << it.value() << Qt::endl; + cout << "Also the value: " << (*it) << Qt::endl; } //! [27] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp index 7f743bbd25..e0d3c71dc5 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qlinkedlist.cpp @@ -112,7 +112,7 @@ list.append("December"); QLinkedList<QString>::iterator i; for (i = list.begin(); i != list.end(); ++i) - cout << *i << endl; + cout << *i << Qt::endl; //! [7] @@ -122,7 +122,7 @@ QLinkedList<QString> list; QLinkedList<QString>::iterator it = qFind(list.begin(), list.end(), "Joel"); if (it != list.end()) - cout << "Found Joel" << endl; + cout << "Found Joel" << Qt::endl; //! [8] @@ -182,7 +182,7 @@ list.append("December"); QLinkedList<QString>::const_iterator i; for (i = list.constBegin(); i != list.constEnd(); ++i) - cout << *i << endl; + cout << *i << Qt::endl; //! [14] @@ -192,7 +192,7 @@ QLinkedList<QString> list; QLinkedList<QString>::iterator it = qFind(list.constBegin(), list.constEnd(), "Joel"); if (it != list.constEnd()) - cout << "Found Joel" << endl; + cout << "Found Joel" << Qt::endl; //! [15] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp index cc3f689710..a24e599f2f 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qlistdata.cpp @@ -73,7 +73,7 @@ if (list[0] == "Bob") //! [3] for (int i = 0; i < list.size(); ++i) { if (list.at(i) == "Jane") - cout << "Found Jane at position " << i << endl; + cout << "Found Jane at position " << i << Qt::endl; } //! [3] @@ -89,7 +89,7 @@ while (!list.isEmpty()) //! [5] int i = list.indexOf("Jane"); if (i != -1) - cout << "First occurrence of Jane is at position " << i << endl; + cout << "First occurrence of Jane is at position " << i << Qt::endl; //! [5] @@ -146,7 +146,7 @@ list.move(1, 4); //! [12] QList<QString> list; list << "A" << "B" << "C" << "D" << "E" << "F"; -list.swap(1, 4); +list.swapItemsAt(1, 4); // list: ["A", "E", "C", "D", "B", "F"] //! [12] @@ -180,7 +180,7 @@ list.append("December"); QList<QString>::iterator i; for (i = list.begin(); i != list.end(); ++i) - cout << *i << endl; + cout << *i << Qt::endl; //! [15] @@ -213,7 +213,7 @@ list.append("December"); QList<QString>::const_iterator i; for (i = list.constBegin(); i != list.constEnd(); ++i) - cout << *i << endl; + cout << *i << Qt::endl; //! [19] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp index bd59758f71..506022f082 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qmap.cpp @@ -89,7 +89,7 @@ QMap<int, QWidget *> map; ... for (int i = 0; i < 1000; ++i) { if (map[i] == okButton) - cout << "Found button at index " << i << endl; + cout << "Found button at index " << i << Qt::endl; } //! [6] @@ -98,7 +98,7 @@ for (int i = 0; i < 1000; ++i) { QMapIterator<QString, int> i(map); while (i.hasNext()) { i.next(); - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; } //! [7] @@ -106,7 +106,7 @@ while (i.hasNext()) { //! [8] QMap<QString, int>::const_iterator i = map.constBegin(); while (i != map.constEnd()) { - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; ++i; } //! [8] @@ -122,14 +122,14 @@ map.insert("plenty", 2000); //! [10] QList<int> values = map.values("plenty"); for (int i = 0; i < values.size(); ++i) - cout << values.at(i) << endl; + cout << values.at(i) << Qt::endl; //! [10] //! [11] QMap<QString, int>::iterator i = map.find("plenty"); while (i != map.end() && i.key() == "plenty") { - cout << i.value() << endl; + cout << i.value() << Qt::endl; ++i; } //! [11] @@ -139,7 +139,7 @@ while (i != map.end() && i.key() == "plenty") { QMap<QString, int> map; ... foreach (int value, map) - cout << value << endl; + cout << value << Qt::endl; //! [12] @@ -175,7 +175,7 @@ QMap<QString, int> map; ... QMap<QString, int>::const_iterator i = map.find("HDR"); while (i != map.end() && i.key() == "HDR") { - cout << i.value() << endl; + cout << i.value() << Qt::endl; ++i; } //! [14] @@ -201,7 +201,7 @@ QMap<QString, int> map; QMap<QString, int>::const_iterator i = map.lowerBound("HDR"); QMap<QString, int>::const_iterator upperBound = map.upperBound("HDR"); while (i != upperBound) { - cout << i.value() << endl; + cout << i.value() << Qt::endl; ++i; } //! [16] @@ -230,7 +230,7 @@ map.insert("December", 12); QMap<QString, int>::iterator i; for (i = map.begin(); i != map.end(); ++i) - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; //! [18] @@ -288,7 +288,7 @@ map.insert("December", 12); QMap<QString, int>::const_iterator i; for (i = map.constBegin(); i != map.constEnd(); ++i) - cout << i.key() << ": " << i.value() << endl; + cout << i.key() << ": " << i.value() << Qt::endl; //! [24] @@ -310,23 +310,23 @@ map3 = map1 + map2; //! [26] QList<int> values = map.values("plenty"); for (int i = 0; i < values.size(); ++i) - cout << values.at(i) << endl; + cout << values.at(i) << Qt::endl; //! [26] //! [27] QMultiMap<QString, int>::iterator i = map.find("plenty"); while (i != map.end() && i.key() == "plenty") { - cout << i.value() << endl; + cout << i.value() << Qt::endl; ++i; } //! [27] //! [keyiterator1] for (QMap<int, QString>::const_iterator it = map.cbegin(), end = map.cend(); it != end; ++it) { - cout << "The key: " << it.key() << endl - cout << "The value: " << it.value() << endl; - cout << "Also the value: " << (*it) << endl; + cout << "The key: " << it.key() << Qt::endl + cout << "The value: " << it.value() << Qt::endl; + cout << "Also the value: " << (*it) << Qt::endl; } //! [keyiterator1] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp index b74ac31933..6046c73b0f 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qqueue.cpp @@ -54,5 +54,5 @@ queue.enqueue(1); queue.enqueue(2); queue.enqueue(3); while (!queue.isEmpty()) - cout << queue.dequeue() << endl; + cout << queue.dequeue() << Qt::endl; //! [0] diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp index afdd9c3d25..99cd4ea7a2 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qregularexpression.cpp @@ -286,15 +286,11 @@ if (!invalidRe.isValid()) { { //! [24] -QRegularExpression re("^this pattern must match exactly$"); -//! [24] -} - -{ -//! [25] QString p("a .*|pattern"); -QRegularExpression re("\\A(?:" + p + ")\\z"); // re matches exactly the pattern string p -//! [25] + +// re matches exactly the pattern string p +QRegularExpression re(QRegularExpression::anchoredPattern(p)); +//! [24] } { diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp index 7a2b4812ef..eb09fb99e2 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qstringiterator.cpp @@ -72,9 +72,9 @@ while (i.hasNext()) { //! [2] QStringIterator i(u"𝄞 is the G clef"); -qDebug() << hex << i.next(); // will print 1d11e (U+1D11E, MUSICAL SYMBOL G CLEF) -qDebug() << hex << i.next(); // will print 20 (U+0020, SPACE) -qDebug() << hex << i.next(); // will print 69 (U+0069, LATIN SMALL LETTER I) +qDebug() << Qt::hex << i.next(); // will print 1d11e (U+1D11E, MUSICAL SYMBOL G CLEF) +qDebug() << Qt::hex << i.next(); // will print 20 (U+0020, SPACE) +qDebug() << Qt::hex << i.next(); // will print 69 (U+0069, LATIN SMALL LETTER I) //! [2] } diff --git a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp index 1f2af4a408..a05233049f 100644 --- a/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp +++ b/src/corelib/doc/snippets/code/src_corelib_tools_qvector.cpp @@ -73,7 +73,7 @@ if (vector[0] == "Liz") //! [4] for (int i = 0; i < vector.size(); ++i) { if (vector.at(i) == "Alfonso") - cout << "Found Alfonso at position " << i << endl; + cout << "Found Alfonso at position " << i << Qt::endl; } //! [4] @@ -81,7 +81,7 @@ for (int i = 0; i < vector.size(); ++i) { //! [5] int i = vector.indexOf("Harumi"); if (i != -1) - cout << "First occurrence of Harumi is at position " << i << endl; + cout << "First occurrence of Harumi is at position " << i << Qt::endl; //! [5] diff --git a/src/corelib/doc/snippets/qstack/main.cpp b/src/corelib/doc/snippets/qstack/main.cpp index af6b960e57..66823bcb59 100644 --- a/src/corelib/doc/snippets/qstack/main.cpp +++ b/src/corelib/doc/snippets/qstack/main.cpp @@ -60,6 +60,6 @@ int main(int argc, char *argv[]) stack.push(2); stack.push(3); while (!stack.isEmpty()) - cout << stack.pop() << endl; + cout << stack.pop() << Qt::endl; //! [0] } diff --git a/src/corelib/doc/snippets/qstringlist/main.cpp b/src/corelib/doc/snippets/qstringlist/main.cpp index 55c60650fe..80788ccd76 100644 --- a/src/corelib/doc/snippets/qstringlist/main.cpp +++ b/src/corelib/doc/snippets/qstringlist/main.cpp @@ -71,20 +71,20 @@ Widget::Widget(QWidget *parent) //! [1] for (int i = 0; i < fonts.size(); ++i) - cout << fonts.at(i).toLocal8Bit().constData() << endl; + cout << fonts.at(i).toLocal8Bit().constData() << Qt::endl; //! [1] //! [2] QStringListIterator javaStyleIterator(fonts); while (javaStyleIterator.hasNext()) - cout << javaStyleIterator.next().toLocal8Bit().constData() << endl; + cout << javaStyleIterator.next().toLocal8Bit().constData() << Qt::endl; //! [2] //! [3] QStringList::const_iterator constIterator; for (constIterator = fonts.constBegin(); constIterator != fonts.constEnd(); ++constIterator) - cout << (*constIterator).toLocal8Bit().constData() << endl; + cout << (*constIterator).toLocal8Bit().constData() << Qt::endl; //! [3] //! [4] diff --git a/src/corelib/doc/snippets/resource-system/mainwindow.cpp b/src/corelib/doc/snippets/resource-system/mainwindow.cpp index bbeeec64ac..86e93aaa62 100644 --- a/src/corelib/doc/snippets/resource-system/mainwindow.cpp +++ b/src/corelib/doc/snippets/resource-system/mainwindow.cpp @@ -338,11 +338,11 @@ void MainWindow::loadFile(const QString &fileName) QTextStream in(&file); #ifndef QT_NO_CURSOR - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); #endif textEdit->setPlainText(in.readAll()); #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif setCurrentFile(fileName); @@ -365,11 +365,11 @@ bool MainWindow::saveFile(const QString &fileName) QTextStream out(&file); #ifndef QT_NO_CURSOR - QApplication::setOverrideCursor(Qt::WaitCursor); + QGuiApplication::setOverrideCursor(Qt::WaitCursor); #endif out << textEdit->toPlainText(); #ifndef QT_NO_CURSOR - QApplication::restoreOverrideCursor(); + QGuiApplication::restoreOverrideCursor(); #endif setCurrentFile(fileName); diff --git a/src/corelib/doc/src/containers.qdoc b/src/corelib/doc/src/containers.qdoc index a1c32bb007..e6c95129db 100644 --- a/src/corelib/doc/src/containers.qdoc +++ b/src/corelib/doc/src/containers.qdoc @@ -171,8 +171,9 @@ The values stored in the various containers can be of any \e{assignable data type}. To qualify, a type must provide a - default constructor, a copy constructor, and an assignment - operator. This covers most data types you are likely to want to + copy constructor, and an assignment operator. For some + operations a default constructor is also required. This + covers most data types you are likely to want to store in a container, including basic types such as \c int and \c double, pointer types, and Qt data types such as QString, QDate, and QTime, but it doesn't cover QObject or any QObject subclass diff --git a/src/corelib/doc/src/datastreamformat.qdoc b/src/corelib/doc/src/datastreamformat.qdoc index 73ca51974d..d6b60f10ce 100644 --- a/src/corelib/doc/src/datastreamformat.qdoc +++ b/src/corelib/doc/src/datastreamformat.qdoc @@ -28,357 +28,71 @@ /*! \page datastreamformat.html \title Serializing Qt Data Types - \brief Representations of data types that can be serialized by QDataStream. + \brief List of data types that can be serialized by QDataStream. - The \l QDataStream allows you to serialize some of the Qt data types. - The table below lists the data types that QDataStream can serialize - and how they are represented. The format described below is - \l{QDataStream::setVersion()}{version 13}. + The \l QDataStream class allows you to serialize the Qt data types + listed in this section as of \l{QDataStream::setVersion()}{version 18}. It is always best to cast integers to a Qt integer type, such as - qint16 or quint32, when reading and writing. This ensures that + \l{qint16} or \l{quint32}, when reading and writing. This ensures that you always know exactly what size integers you are reading and writing, no matter what the underlying platform and architecture the application happens to be running on. - \table - \row \li bool - \li \list - \li boolean - \endlist - \row \li qint8 - \li \list - \li signed byte - \endlist - \row \li qint16 - \li \list - \li signed 16-bit integer - \endlist - \row \li qint32 - \li \list - \li signed 32-bit integer - \endlist - \row \li qint64 - \li \list - \li signed 64-bit integer - \endlist - \row \li quint8 - \li \list - \li unsigned byte - \endlist - \row \li quint16 - \li \list - \li unsigned 16-bit integer - \endlist - \row \li quint32 - \li \list - \li unsigned 32-bit integer - \endlist - \row \li quint64 - \li \list - \li unsigned 64-bit integer - \endlist - \row \li \c float - \li \list - \li 32-bit floating point number using the standard IEEE 754 format - \endlist - \row \li \c double - \li \list - \li 64-bit floating point number using the standard IEEE 754 format - \endlist - \row \li \c {const char *} - \li \list - \li The string length (quint32) - \li The string bytes, excluding the terminating 0 - \endlist - \row \li QBitArray - \li \list - \li The array size (quint32) - \li The array bits, i.e. (size + 7)/8 bytes - \endlist - \row \li QBrush - \li \list - \li The brush style (quint8) - \li The brush color (QColor) - \li If style is CustomPattern, the brush pixmap (QPixmap) - \endlist - \row \li QByteArray - \li \list - \li If the byte array is null: 0xFFFFFFFF (quint32) - \li Otherwise: the array size (quint32) followed by the array bytes, i.e. size bytes - \endlist - \row \li \l QColor - \li \list - \li Color spec (qint8) - \li Alpha value (quint16) - \li Red value (quint16) - \li Green value (quint16) - \li Blue value (quint16) - \li Pad value (quint16) - \endlist - \row \li QCursor - \li \list - \li Shape ID (qint16) - \li If shape is BitmapCursor: The bitmap (QPixmap), mask (QPixmap), and hot spot (QPoint) - \endlist - \row \li QDate - \li \list - \li Julian day (quint32) - \endlist - \row \li QDateTime - \li \list - \li Date (QDate) - \li Time (QTime) - \li The \l{Qt::TimeSpec}{time spec} - offsetFromUtc (qint32) if Qt::TimeSpec is offsetFromUtc - TimeZone(QTimeZone) if Qt::TimeSpec is TimeZone - \endlist - \row \li QEasingCurve - \li \list - \li type (quint8) - \li func (quint64) - \li hasConfig (bool) - \li If hasConfig is true then these fields follow: - \li list - \li period (double) - \li amplitude (double) - \li overshoot (double) - \endlist - \row \li QFont - \li \list - \li The family (QString) - \li The style name (QString) - \li The point size (double) - \li The pixel size (qint32) - \li The style hint (quint8) - \li The style strategy (quint16) - \li The char set (quint8) - \li The weight (quint8) - \li The font bits (quint8) - \li The font stretch (quint16) - \li The extended font bits (quint8) - \li The letter spacing (double) - \li The word spacing (double) - \li The hinting preference (quint8) - \endlist - \row \li QHash<Key, T> - \li \list - \li The number of items (quint32) - \li For all items, the key (Key) and value (T) - \endlist - \row \li QIcon - \li \list - \li The number of pixmap entries (quint32) - \li For all pixmap entries: - \list - \li The pixmap (QPixmap) - \li The file name (QString) - \li The pixmap size (QSize) - \li The \l{QIcon::Mode}{mode} (quint32) - \li The \l{QIcon::State}{state} (quint32) - \endlist - \endlist - \row \li QImage - \li \list - \li If the image is null a "null image" marker is saved; - otherwise the image is saved in PNG or BMP format (depending - on the stream version). If you want control of the format, - stream the image into a QBuffer (using QImageIOHandler/QImageIOPlugin) and stream - that. - \endlist - \row \li QKeySequence - \li \list - \li A QList<int>, where each integer is a key in the key sequence - \endlist - \row \li QLinkedList<T> - \li \list - \li The number of items (quint32) - \li The items (T) - \endlist - \row \li QList<T> - \li \list - \li The number of items (quint32) - \li The items (T) - \endlist - \row \li QMap<Key, T> - \li \list - \li The number of items (quint32) - \li For all items, the key (Key) and value (T) - \endlist - \row \li QMargins - \li \list - \li left (int) - \li top (int) - \li right (int) - \li bottom (int) - \endlist - \row \li QMatrix - \li \list - \li m11 (double) - \li m12 (double) - \li m21 (double) - \li m22 (double) - \li dx (double) - \li dy (double) - \endlist - \row \li QMatrix4x4 - \li \list - \li m11 (float) - \li m12 (float) - \li m13 (float) - \li m14 (float) - \li m21 (float) - \li m22 (float) - \li m23 (float) - \li m24 (float) - \li m31 (float) - \li m32 (float) - \li m33 (float) - \li m34 (float) - \li m41 (float) - \li m42 (float) - \li m43 (float) - \li m44 (float) - \endlist - \row \li QPair<T1, T2> - \li \list - \li first (T1) - \li second (T2) - \endlist - \row \li QPalette - \li The disabled, active, and inactive color groups, each of which consists - of the following: - \list - \li foreground (QBrush) - \li button (QBrush) - \li light (QBrush) - \li midlight (QBrush) - \li dark (QBrush) - \li mid (QBrush) - \li text (QBrush) - \li brightText (QBrush) - \li buttonText (QBrush) - \li base (QBrush) - \li background (QBrush) - \li shadow (QBrush) - \li highlight (QBrush) - \li highlightedText (QBrush) - \li link (QBrush) - \li linkVisited (QBrush) - \endlist - \row \li QPen - \li \list - \li The pen styles (quint8) - \li The pen width (quint16) - \li The pen color (QColor) - \endlist - \row \li QPicture - \li \list - \li The size of the picture data (quint32) - \li The raw bytes of picture data (char) - \endlist - \row \li QPixmap - \li \list - \li Save it as a PNG image. - \endlist - \row \li QPoint - \li \list - \li The x coordinate (qint32) - \li The y coordinate (qint32) - \endlist - \row \li QQuaternion - \li \list - \li The scalar component (float) - \li The x coordinate (float) - \li The y coordinate (float) - \li The z coordinate (float) - \endlist - \row \li QRect - \li \list - \li left (qint32) - \li top (qint32) - \li right (qint32) - \li bottom (qint32) - \endlist - \row \li QRegExp - \li \list - \li The regexp pattern (QString) - \li Case sensitivity (quint8) - \li Regular expression syntax (quint8) - \li Minimal matching (quint8) - \endlist - \row \li QRegularExpression - \li \list - \li The regular expression pattern (QString) - \li The pattern options (quint32) - \endlist - \row \li QRegion - \li \list - \li The size of the data, i.e. 8 + 16 * (number of rectangles) (quint32) - \li 10 (qint32) - \li The number of rectangles (quint32) - \li The rectangles in sequential order (QRect) - \endlist - \row \li QSize - \li \list - \li width (qint32) - \li height (qint32) - \endlist - \row \li QString - \li \list - \li If the string is null: 0xFFFFFFFF (quint32) - \li Otherwise: The string length in bytes (quint32) followed by the data in UTF-16 - \endlist - \row \li QTime - \li \list - \li Milliseconds since midnight (quint32) - \endlist - \row \li QTransform - \li \list - \li m11 (double) - \li m12 (double) - \li m13 (double) - \li m21 (double) - \li m22 (double) - \li m23 (double) - \li m31 (double) - \li m32 (double) - \li m33 (double) - \endlist - \row \li QUrl - \li \list - \li Holds an URL (QString) - \endlist - \row \li QVariant - \li \list - \li The type of the data (quint32) - \li The null flag (qint8) - \li The data of the specified type - \endlist - \row \li QVector2D - \li \list - \li the x coordinate (float) - \li the y coordinate (float) - \endlist - \row \li QVector3D - \li \list - \li the x coordinate (float) - \li the y coordinate (float) - \li the z coordinate (float) - \endlist - \row \li QVector4D - \li \list - \li the x coordinate (float) - \li the y coordinate (float) - \li the z coordinate (float) - \li the w coordinate (float) - \endlist - \row \li QVector<T> - \li \list - \li The number of items (quint32) - \li The items (T) - \endlist - \endtable + \list + \li bool + \li \l{qint8} + \li \l{qint16} + \li \l{qint32} + \li \l{qint64} + \li \l{quint8} + \li \l{quint16} + \li \l{quint32} + \li \l{quint64} + \li \c float + \li \c double + \li \c {const char *} + \li QBitArray + \li QBrush + \li QByteArray + \li QColor + \li QCursor + \li QDate + \li QDateTime + \li QEasingCurve + \li QFont + \li QGenericMatrix + \li QHash<Key, T> + \li QIcon + \li QImage + \li QKeySequence + \li QLinkedList<T> + \li QList<T> + \li QMap<Key, T> + \li QMargins + \li QMatrix4x4 + \li QPair<T1, T2> + \li QPalette + \li QPen + \li QPicture + \li QPixmap + \li QPoint + \li QQuaternion + \li QRect + \li QRegExp + \li QRegularExpression + \li QRegion + \li QSize + \li QString + \li QTime + \li QTransform + \li QUrl + \li QVariant + \li QVector2D + \li QVector3D + \li QVector4D + \li QVector<T> + \endlist \sa {JSON Support in Qt} */ diff --git a/src/corelib/doc/src/dontdocument.qdoc b/src/corelib/doc/src/dontdocument.qdoc new file mode 100644 index 0000000000..19ca7db299 --- /dev/null +++ b/src/corelib/doc/src/dontdocument.qdoc @@ -0,0 +1,41 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \dontdocument (QMacAutoReleasePool QIncompatibleFlag QGenericAtomicOps QAtomicTraits + QAtomicOps QBasicAtomicInteger QBasicAtomicPointer QBasicMutex QInternal + QArgument QReturnArgument QArrayData QTypedArrayData QStaticByteArrayData + QByteRef QStaticStringData QListSpecialMethods QListData QScopedPointerDeleter + QScopedPointerArrayDeleter QScopedPointerPodDeleter QScopedPointerObjectDeleteLater + QMetaTypeId2 QObjectData QObjectUserData QMapNodeBase QMapNode QMapDataBase + QMapData QHashData QHashNode QArrayDataPointer QTextStreamManipulator + QContiguousCacheData QContiguousCacheTypedData QNoDebug QUrlTwoFlags + QCborValueRef qfloat16 QDeferredDeleteEvent QSpecialInteger QLittleEndianStorageType + QBigEndianStorageType QFactoryInterface QFutureWatcherBase QJsonValuePtr + QJsonValueRefPtr QLinkedListNode QAbstractConcatenable QStringBuilderCommon + QTextCodec::ConverterState QThreadStorageData) +*/ diff --git a/src/corelib/doc/src/objectmodel/metaobjects.qdoc b/src/corelib/doc/src/objectmodel/metaobjects.qdoc index 5b3d8f9863..53b34fe120 100644 --- a/src/corelib/doc/src/objectmodel/metaobjects.qdoc +++ b/src/corelib/doc/src/objectmodel/metaobjects.qdoc @@ -86,7 +86,7 @@ that it doesn't require RTTI support and it works across dynamic library boundaries. It attempts to cast its argument to the pointer type specified in angle-brackets, returning a non-zero pointer if the - object is of the correct type (determined at run-time), or 0 + object is of the correct type (determined at run-time), or \nullptr if the object's type is incompatible. For example, let's assume \c MyWidget inherits from QWidget and diff --git a/src/corelib/doc/src/resource-system.qdoc b/src/corelib/doc/src/resource-system.qdoc index 9b6b613f79..69ec5e556b 100644 --- a/src/corelib/doc/src/resource-system.qdoc +++ b/src/corelib/doc/src/resource-system.qdoc @@ -100,6 +100,9 @@ See the QLocale documentation for a description of the format to use for locale strings. + See QFileSelector for an additional mechanism to select locale-specific + resources, in addition to the ability to select OS-specific and other + features. \section2 External Binary Resources @@ -143,24 +146,70 @@ \section1 Compression - Resources are compressed by default (in the \c ZIP format). It is - possible to turn off compression. This can be useful if your - resources already contain a compressed format, such as \c .png - files. You do this by giving the \c {-no-compress} command line - argument. + \c rcc attempts to compress the content to optimize disk space usage in the + final binaries. By default, it will perform a heuristic check to determine + whether compressing is worth it and will store the content uncompressed if + it fails to sufficiently compress. To control the threshold, you can use + the \c {-threshold} option, which tells \c rcc the percentage of the + original file size that must be gained for it to store the file in + compressed form. + + \code + rcc -threshold 25 myresources.qrc + \endcode + + The default value is "70", indicating that the compressed file must be 70% + smaller than the original (no more than 30% of the original file size). + + It is possible to turn off compression, if desired. This can be useful if + your resources already contain a compressed format, such as \c .png files, + and you do not want to incur the CPU cost at build time to confirm that it + can't be compressed. Another reason is if disk usage is not a problem and + the application would prefer to keep the content as clean memory pages at + runtime. You do this by giving the \c {-no-compress} command line argument. \code rcc -no-compress myresources.qrc \endcode - \c rcc also gives you some control over the compression. You can - specify the compression level and the threshold level to consider - while compressing files, for example: + \c rcc also gives you some control over the compression level and + compression algorithm, for example: \code - rcc -compress 2 -threshold 3 myresources.qrc + rcc -compress 2 -compress-algo zlib myresources.qrc \endcode + \c rcc supports the following compression algorithms and compression + levels: + + \list + \li \c{best}: use the best algorithm among the ones below, at its highest + compression level, to achieve the most compression at the expense of + using a lot of CPU time during compilation. This value is useful in the + XML file to indicate a file should be most compressed, regardless of + which algorithms \c rcc supports. + + \li \c{zstd}: use the \l{Zstandard}{https://zstd.net} library to compress + contents. Valid compression levels range from 1 to 19, 1 is least + compression (least CPU time) and 19 is the most compression (most CPU + time). The default level is 14. A special value of 0 tells the \c{zstd} + library to choose an implementation-defined default. + + \li \c{zlib}: use the \l{zlib}{https://zlib.net} library to compress + contents. Valid compression levels range from 1 to 9, with 1the least + compression (least CPU time) and 9 the most compression (most CPU time). + The special value 0 means "no compression" and should not be used. The + default is implementation-defined, but usually is level 6. + + \li \c{none}: no compression. This is the same as the \c{-no-compress} + option. + \endlist + + Support for both Zstandard and zlib are optional. If a given library was + not detected at compile time, attempting to pass \c {-compress-algo} for + that library will result in an error. The default compression algorithm is + \c zstd if it is enabled, \c zlib if not. + \section1 Using Resources in the Application In the application, resource paths can be used in most places diff --git a/src/corelib/eval.pri b/src/corelib/eval.pri deleted file mode 100644 index efda56b16a..0000000000 --- a/src/corelib/eval.pri +++ /dev/null @@ -1,4 +0,0 @@ -SOURCES += \ - $$QT_SOURCE_TREE/src/corelib/kernel/qtcore_eval.cpp -INCLUDEPATH += \ - $$QT_BUILD_TREE/src/corelib/global diff --git a/src/corelib/global/archdetect.cpp b/src/corelib/global/archdetect.cpp index 66a5e074f6..1d00b7f5a5 100644 --- a/src/corelib/global/archdetect.cpp +++ b/src/corelib/global/archdetect.cpp @@ -67,6 +67,10 @@ # define ARCH_PROCESSOR "power" #elif defined(Q_PROCESSOR_POWER_64) # define ARCH_PROCESSOR "power64" +#elif defined(Q_PROCESSOR_RISCV_32) +# define ARCH_PROCESSOR "riscv32" +#elif defined(Q_PROCESSOR_RISCV_64) +# define ARCH_PROCESSOR "riscv64" #elif defined(Q_PROCESSOR_S390_X) # define ARCH_PROCESSOR "s390x" #elif defined(Q_PROCESSOR_S390) diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 029357ff43..1da69aba9b 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -7,12 +7,12 @@ HEADERS += \ global/qsystemdetection.h \ global/qcompilerdetection.h \ global/qprocessordetection.h \ + global/qmemory_p.h \ global/qnamespace.h \ global/qendian.h \ global/qendian_p.h \ global/qnumeric_p.h \ global/qnumeric.h \ - global/qfloat16_p.h \ global/qfloat16.h \ global/qglobalstatic.h \ global/qlibraryinfo.h \ @@ -40,6 +40,10 @@ SOURCES += \ global/qrandom.cpp \ global/qhooks.cpp +# To get listed in IDEs +false: SOURCES += \ + global/qfloat16tables.cpp + # Only add global/qfloat16_f16c.c if qfloat16.cpp can't #include it. # Any compiler: if it is already generating F16C code, let qfloat16.cpp do it # Clang: ICE if not generating F16C code, so use qfloat16_f16c.c @@ -124,14 +128,3 @@ gcc:ltcg { } else { SOURCES += $$VERSIONTAGGING_SOURCES } - -QMAKE_QFLOAT16_TABLES_GENERATE = global/qfloat16.h - -qtPrepareTool(QMAKE_QFLOAT16_TABLES, qfloat16-tables) - -qfloat16_tables.commands = $$QMAKE_QFLOAT16_TABLES ${QMAKE_FILE_OUT} -qfloat16_tables.output = global/qfloat16tables.cpp -qfloat16_tables.depends = $$QMAKE_QFLOAT16_TABLES_EXE -qfloat16_tables.input = QMAKE_QFLOAT16_TABLES_GENERATE -qfloat16_tables.variable_out = SOURCES -QMAKE_EXTRA_COMPILERS += qfloat16_tables diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 345ab9e8ad..e47f284a42 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -110,12 +110,6 @@ # define Q_CC_INTEL __INTEL_COMPILER # endif -/* only defined for MSVC since that's the only compiler that actually optimizes for this */ -/* might get overridden further down when Q_COMPILER_NOEXCEPT is detected */ -# ifdef __cplusplus -# define Q_DECL_NOTHROW throw() -# endif - #elif defined(__BORLANDC__) || defined(__TURBOC__) # define Q_CC_BOR # define Q_INLINE_TEMPLATE @@ -1128,16 +1122,11 @@ #ifdef Q_COMPILER_NOEXCEPT # define Q_DECL_NOEXCEPT noexcept # define Q_DECL_NOEXCEPT_EXPR(x) noexcept(x) -# ifdef Q_DECL_NOTHROW -# undef Q_DECL_NOTHROW /* override with C++11 noexcept if available */ -# endif #else # define Q_DECL_NOEXCEPT # define Q_DECL_NOEXCEPT_EXPR(x) #endif -#ifndef Q_DECL_NOTHROW -# define Q_DECL_NOTHROW Q_DECL_NOEXCEPT -#endif +#define Q_DECL_NOTHROW Q_DECL_NOEXCEPT #if defined(Q_COMPILER_ALIGNOF) # undef Q_ALIGNOF diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h index dfcc3c9c7f..10458e41d7 100644 --- a/src/corelib/global/qconfig-bootstrapped.h +++ b/src/corelib/global/qconfig-bootstrapped.h @@ -122,6 +122,11 @@ #define QT_NO_TRANSLATION #define QT_FEATURE_translation -1 +// rcc.pro will DEFINES+= this +#ifndef QT_FEATURE_zstd +#define QT_FEATURE_zstd -1 +#endif + #ifdef QT_BUILD_QMAKE #define QT_FEATURE_commandlineparser -1 #define QT_NO_COMPRESS diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index e9fee5f23e..bd3c219968 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -42,9 +42,7 @@ #ifndef QFLAGS_H #define QFLAGS_H -#ifdef Q_COMPILER_INITIALIZER_LISTS #include <initializer_list> -#endif QT_BEGIN_NAMESPACE @@ -54,21 +52,21 @@ class QFlag { int i; public: - Q_DECL_CONSTEXPR inline QFlag(int value) Q_DECL_NOTHROW : i(value) {} - Q_DECL_CONSTEXPR inline operator int() const Q_DECL_NOTHROW { return i; } + Q_DECL_CONSTEXPR inline QFlag(int value) noexcept : i(value) {} + Q_DECL_CONSTEXPR inline operator int() const noexcept { return i; } #if !defined(Q_CC_MSVC) // Microsoft Visual Studio has buggy behavior when it comes to // unsigned enums: even if the enum is unsigned, the enum tags are // always signed # if !defined(__LP64__) && !defined(Q_CLANG_QDOC) - Q_DECL_CONSTEXPR inline QFlag(long value) Q_DECL_NOTHROW : i(int(value)) {} - Q_DECL_CONSTEXPR inline QFlag(ulong value) Q_DECL_NOTHROW : i(int(long(value))) {} + Q_DECL_CONSTEXPR inline QFlag(long value) noexcept : i(int(value)) {} + Q_DECL_CONSTEXPR inline QFlag(ulong value) noexcept : i(int(long(value))) {} # endif - Q_DECL_CONSTEXPR inline QFlag(uint value) Q_DECL_NOTHROW : i(int(value)) {} - Q_DECL_CONSTEXPR inline QFlag(short value) Q_DECL_NOTHROW : i(int(value)) {} - Q_DECL_CONSTEXPR inline QFlag(ushort value) Q_DECL_NOTHROW : i(int(uint(value))) {} - Q_DECL_CONSTEXPR inline operator uint() const Q_DECL_NOTHROW { return uint(i); } + Q_DECL_CONSTEXPR inline QFlag(uint value) noexcept : i(int(value)) {} + Q_DECL_CONSTEXPR inline QFlag(short value) noexcept : i(int(value)) {} + Q_DECL_CONSTEXPR inline QFlag(ushort value) noexcept : i(int(uint(value))) {} + Q_DECL_CONSTEXPR inline operator uint() const noexcept { return uint(i); } #endif }; Q_DECLARE_TYPEINFO(QFlag, Q_PRIMITIVE_TYPE); @@ -77,12 +75,12 @@ class QIncompatibleFlag { int i; public: - Q_DECL_CONSTEXPR inline explicit QIncompatibleFlag(int i) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline operator int() const Q_DECL_NOTHROW { return i; } + Q_DECL_CONSTEXPR inline explicit QIncompatibleFlag(int i) noexcept; + Q_DECL_CONSTEXPR inline operator int() const noexcept { return i; } }; Q_DECLARE_TYPEINFO(QIncompatibleFlag, Q_PRIMITIVE_TYPE); -Q_DECL_CONSTEXPR inline QIncompatibleFlag::QIncompatibleFlag(int value) Q_DECL_NOTHROW : i(value) {} +Q_DECL_CONSTEXPR inline QIncompatibleFlag::QIncompatibleFlag(int value) noexcept : i(value) {} #ifndef Q_NO_TYPESAFE_FLAGS @@ -117,51 +115,47 @@ public: Q_DECL_CONSTEXPR inline QFlags(const QFlags &other); Q_DECL_CONSTEXPR inline QFlags &operator=(const QFlags &other); #endif - Q_DECL_CONSTEXPR inline QFlags(Enum flags) Q_DECL_NOTHROW : i(Int(flags)) {} - Q_DECL_CONSTEXPR inline QFlags(Zero = Q_NULLPTR) Q_DECL_NOTHROW : i(0) {} - Q_DECL_CONSTEXPR inline QFlags(QFlag flag) Q_DECL_NOTHROW : i(flag) {} + Q_DECL_CONSTEXPR inline QFlags(Enum flags) noexcept : i(Int(flags)) {} + Q_DECL_CONSTEXPR inline QFlags(Zero = nullptr) noexcept : i(0) {} + Q_DECL_CONSTEXPR inline QFlags(QFlag flag) noexcept : i(flag) {} -#ifdef Q_COMPILER_INITIALIZER_LISTS - Q_DECL_CONSTEXPR inline QFlags(std::initializer_list<Enum> flags) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR inline QFlags(std::initializer_list<Enum> flags) noexcept : i(initializer_list_helper(flags.begin(), flags.end())) {} -#endif - Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(int mask) Q_DECL_NOTHROW { i &= mask; return *this; } - Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(uint mask) Q_DECL_NOTHROW { i &= mask; return *this; } - Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(Enum mask) Q_DECL_NOTHROW { i &= Int(mask); return *this; } - Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(QFlags other) Q_DECL_NOTHROW { i |= other.i; return *this; } - Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(Enum other) Q_DECL_NOTHROW { i |= Int(other); return *this; } - Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(QFlags other) Q_DECL_NOTHROW { i ^= other.i; return *this; } - Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(Enum other) Q_DECL_NOTHROW { i ^= Int(other); return *this; } - - Q_DECL_CONSTEXPR inline operator Int() const Q_DECL_NOTHROW { return i; } - - Q_DECL_CONSTEXPR inline QFlags operator|(QFlags other) const Q_DECL_NOTHROW { return QFlags(QFlag(i | other.i)); } - Q_DECL_CONSTEXPR inline QFlags operator|(Enum other) const Q_DECL_NOTHROW { return QFlags(QFlag(i | Int(other))); } - Q_DECL_CONSTEXPR inline QFlags operator^(QFlags other) const Q_DECL_NOTHROW { return QFlags(QFlag(i ^ other.i)); } - Q_DECL_CONSTEXPR inline QFlags operator^(Enum other) const Q_DECL_NOTHROW { return QFlags(QFlag(i ^ Int(other))); } - Q_DECL_CONSTEXPR inline QFlags operator&(int mask) const Q_DECL_NOTHROW { return QFlags(QFlag(i & mask)); } - Q_DECL_CONSTEXPR inline QFlags operator&(uint mask) const Q_DECL_NOTHROW { return QFlags(QFlag(i & mask)); } - Q_DECL_CONSTEXPR inline QFlags operator&(Enum other) const Q_DECL_NOTHROW { return QFlags(QFlag(i & Int(other))); } - Q_DECL_CONSTEXPR inline QFlags operator~() const Q_DECL_NOTHROW { return QFlags(QFlag(~i)); } - - Q_DECL_CONSTEXPR inline bool operator!() const Q_DECL_NOTHROW { return !i; } - - Q_DECL_CONSTEXPR inline bool testFlag(Enum flag) const Q_DECL_NOTHROW { return (i & Int(flag)) == Int(flag) && (Int(flag) != 0 || i == Int(flag) ); } - Q_DECL_RELAXED_CONSTEXPR inline QFlags &setFlag(Enum flag, bool on = true) Q_DECL_NOTHROW + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(int mask) noexcept { i &= mask; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(uint mask) noexcept { i &= mask; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator&=(Enum mask) noexcept { i &= Int(mask); return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(QFlags other) noexcept { i |= other.i; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator|=(Enum other) noexcept { i |= Int(other); return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(QFlags other) noexcept { i ^= other.i; return *this; } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &operator^=(Enum other) noexcept { i ^= Int(other); return *this; } + + Q_DECL_CONSTEXPR inline operator Int() const noexcept { return i; } + + Q_DECL_CONSTEXPR inline QFlags operator|(QFlags other) const noexcept { return QFlags(QFlag(i | other.i)); } + Q_DECL_CONSTEXPR inline QFlags operator|(Enum other) const noexcept { return QFlags(QFlag(i | Int(other))); } + Q_DECL_CONSTEXPR inline QFlags operator^(QFlags other) const noexcept { return QFlags(QFlag(i ^ other.i)); } + Q_DECL_CONSTEXPR inline QFlags operator^(Enum other) const noexcept { return QFlags(QFlag(i ^ Int(other))); } + Q_DECL_CONSTEXPR inline QFlags operator&(int mask) const noexcept { return QFlags(QFlag(i & mask)); } + Q_DECL_CONSTEXPR inline QFlags operator&(uint mask) const noexcept { return QFlags(QFlag(i & mask)); } + Q_DECL_CONSTEXPR inline QFlags operator&(Enum other) const noexcept { return QFlags(QFlag(i & Int(other))); } + Q_DECL_CONSTEXPR inline QFlags operator~() const noexcept { return QFlags(QFlag(~i)); } + + Q_DECL_CONSTEXPR inline bool operator!() const noexcept { return !i; } + + Q_DECL_CONSTEXPR inline bool testFlag(Enum flag) const noexcept { return (i & Int(flag)) == Int(flag) && (Int(flag) != 0 || i == Int(flag) ); } + Q_DECL_RELAXED_CONSTEXPR inline QFlags &setFlag(Enum flag, bool on = true) noexcept { return on ? (*this |= flag) : (*this &= ~Int(flag)); } private: -#ifdef Q_COMPILER_INITIALIZER_LISTS Q_DECL_CONSTEXPR static inline Int initializer_list_helper(typename std::initializer_list<Enum>::const_iterator it, typename std::initializer_list<Enum>::const_iterator end) - Q_DECL_NOTHROW + noexcept { return (it == end ? Int(0) : (Int(*it) | initializer_list_helper(it + 1, end))); } -#endif Int i; }; @@ -172,13 +166,13 @@ typedef QFlags<Enum> Flags; #endif #define Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) \ -Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) Q_DECL_NOTHROW \ +Q_DECL_CONSTEXPR inline QIncompatibleFlag operator|(Flags::enum_type f1, int f2) noexcept \ { return QIncompatibleFlag(int(f1) | f2); } #define Q_DECLARE_OPERATORS_FOR_FLAGS(Flags) \ -Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, Flags::enum_type f2) Q_DECL_NOTHROW \ +Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, Flags::enum_type f2) noexcept \ { return QFlags<Flags::enum_type>(f1) | f2; } \ -Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, QFlags<Flags::enum_type> f2) Q_DECL_NOTHROW \ +Q_DECL_CONSTEXPR inline QFlags<Flags::enum_type> operator|(Flags::enum_type f1, QFlags<Flags::enum_type> f2) noexcept \ { return f2 | f1; } Q_DECLARE_INCOMPATIBLE_FLAGS(Flags) diff --git a/src/corelib/global/qfloat16.cpp b/src/corelib/global/qfloat16.cpp index 87ff796368..ff2997b73a 100644 --- a/src/corelib/global/qfloat16.cpp +++ b/src/corelib/global/qfloat16.cpp @@ -1,5 +1,6 @@ /**************************************************************************** ** +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 by Southwest Research Institute (R) ** Contact: http://www.qt-project.org/legal ** @@ -37,8 +38,9 @@ ** ****************************************************************************/ -#include "qfloat16_p.h" +#include "qfloat16.h" #include "private/qsimd_p.h" +#include <cmath> // for fpclassify()'s return values QT_BEGIN_NAMESPACE @@ -78,28 +80,42 @@ QT_BEGIN_NAMESPACE */ /*! - Returns true if the \c qfloat16 \a {f} is equivalent to infinity. + \fn bool qIsInf(qfloat16 f) \relates <QFloat16> + Returns true if the \c qfloat16 \a {f} is equivalent to infinity. + \sa qIsInf */ -Q_REQUIRED_RESULT bool qIsInf(qfloat16 f) Q_DECL_NOTHROW { return qt_is_inf(f); } /*! - Returns true if the \c qfloat16 \a {f} is not a number (NaN). + \fn bool qIsNaN(qfloat16 f) \relates <QFloat16> + Returns true if the \c qfloat16 \a {f} is not a number (NaN). + \sa qIsNaN */ -Q_REQUIRED_RESULT bool qIsNaN(qfloat16 f) Q_DECL_NOTHROW { return qt_is_nan(f); } /*! - Returns true if the \c qfloat16 \a {f} is a finite number. + \fn bool qIsFinite(qfloat16 f) \relates <QFloat16> + Returns true if the \c qfloat16 \a {f} is a finite number. + \sa qIsFinite */ -Q_REQUIRED_RESULT bool qIsFinite(qfloat16 f) Q_DECL_NOTHROW { return qt_is_finite(f); } + +/*! + \internal + Implements qFpClassify() for qfloat16. + */ + +int qfloat16::fpClassify() const noexcept +{ + return isInf() ? FP_INFINITE : isNaN() ? FP_NAN + : !b16 ? FP_ZERO : isNormal() ? FP_NORMAL : FP_SUBNORMAL; +} /*! \fn int qRound(qfloat16 value) \relates <QFloat16> @@ -142,8 +158,8 @@ extern "C" { # define f16cextern extern #endif -f16cextern void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW; -f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOTHROW; +f16cextern void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) noexcept; +f16cextern void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) noexcept; #undef f16cextern } @@ -154,7 +170,7 @@ static inline bool hasFastF16() return true; } -static void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW +static void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) noexcept { __fp16 *out_f16 = reinterpret_cast<__fp16 *>(out); qsizetype i = 0; @@ -164,7 +180,7 @@ static void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q out_f16[i] = __fp16(in[i]); } -static void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOTHROW +static void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) noexcept { const __fp16 *in_f16 = reinterpret_cast<const __fp16 *>(in); qsizetype i = 0; @@ -179,12 +195,12 @@ static inline bool hasFastF16() return false; } -static void qFloatToFloat16_fast(quint16 *, const float *, qsizetype) Q_DECL_NOTHROW +static void qFloatToFloat16_fast(quint16 *, const float *, qsizetype) noexcept { Q_UNREACHABLE(); } -static void qFloatFromFloat16_fast(float *, const quint16 *, qsizetype) Q_DECL_NOTHROW +static void qFloatFromFloat16_fast(float *, const quint16 *, qsizetype) noexcept { Q_UNREACHABLE(); } @@ -196,7 +212,7 @@ static void qFloatFromFloat16_fast(float *, const quint16 *, qsizetype) Q_DECL_N Converts \a len floats from \a in to qfloat16 and stores them in \a out. Both \a in and \a out must have \a len allocated entries. */ -Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW +Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *out, const float *in, qsizetype len) noexcept { if (hasFastF16()) return qFloatToFloat16_fast(reinterpret_cast<quint16 *>(out), in, len); @@ -212,7 +228,7 @@ Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *out, const float *in, qsizetype len Converts \a len qfloat16 from \a in to floats and stores them in \a out. Both \a in and \a out must have \a len allocated entries. */ -Q_CORE_EXPORT void qFloatFromFloat16(float *out, const qfloat16 *in, qsizetype len) Q_DECL_NOTHROW +Q_CORE_EXPORT void qFloatFromFloat16(float *out, const qfloat16 *in, qsizetype len) noexcept { if (hasFastF16()) return qFloatFromFloat16_fast(out, reinterpret_cast<const quint16 *>(in), len); @@ -223,6 +239,7 @@ Q_CORE_EXPORT void qFloatFromFloat16(float *out, const qfloat16 *in, qsizetype l QT_END_NAMESPACE +#include "qfloat16tables.cpp" #ifdef QFLOAT16_INCLUDE_FAST # include "qfloat16_f16c.c" #endif diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h index b76d2b9616..4d1aa91349 100644 --- a/src/corelib/global/qfloat16.h +++ b/src/corelib/global/qfloat16.h @@ -1,5 +1,6 @@ /**************************************************************************** ** +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 by Southwest Research Institute (R) ** Contact: http://www.qt-project.org/legal ** @@ -66,15 +67,37 @@ QT_BEGIN_NAMESPACE class qfloat16 { + struct Wrap + { + // To let our private constructor work, without other code seeing + // ambiguity when constructing from int, double &c. + quint16 b16; + constexpr inline explicit Wrap(int value) : b16(value) {} + }; public: -#ifndef Q_QDOC - Q_DECL_CONSTEXPR inline qfloat16() Q_DECL_NOTHROW : b16(0) { } - inline qfloat16(float f) Q_DECL_NOTHROW; - inline operator float() const Q_DECL_NOTHROW; -#endif - + constexpr inline qfloat16() noexcept : b16(0) {} + inline qfloat16(float f) noexcept; + inline operator float() const noexcept; + + // Support for qIs{Inf,NaN,Finite}: + bool isInf() const noexcept { return ((b16 >> 8) & 0x7e) == 0x7c; } + bool isNaN() const noexcept { return ((b16 >> 8) & 0x7e) == 0x7e; } + bool isFinite() const noexcept { return ((b16 >> 8) & 0x7c) != 0x7c; } + Q_CORE_EXPORT int fpClassify() const noexcept; + // Support for std::numeric_limits<qfloat16> + static constexpr qfloat16 _limit_epsilon() noexcept { return qfloat16(Wrap(0x1400)); } + static constexpr qfloat16 _limit_min() noexcept { return qfloat16(Wrap(0x400)); } + static constexpr qfloat16 _limit_denorm_min() noexcept { return qfloat16(Wrap(1)); } + static constexpr qfloat16 _limit_max() noexcept { return qfloat16(Wrap(0x7bff)); } + static constexpr qfloat16 _limit_lowest() noexcept { return qfloat16(Wrap(0xfbff)); } + static constexpr qfloat16 _limit_infinity() noexcept { return qfloat16(Wrap(0x7c00)); } + static constexpr qfloat16 _limit_quiet_NaN() noexcept { return qfloat16(Wrap(0x7e00)); } + // Signalling NaN is 0x7f00 + inline constexpr bool isNormal() const noexcept + { return b16 == 0 || ((b16 & 0x7c00) && (b16 & 0x7c00) != 0x7c00); } private: quint16 b16; + constexpr inline explicit qfloat16(Wrap nibble) noexcept : b16(nibble.b16) {} Q_CORE_EXPORT static const quint32 mantissatable[]; Q_CORE_EXPORT static const quint32 exponenttable[]; @@ -82,29 +105,32 @@ private: Q_CORE_EXPORT static const quint32 basetable[]; Q_CORE_EXPORT static const quint32 shifttable[]; - friend bool qIsNull(qfloat16 f) Q_DECL_NOTHROW; + friend bool qIsNull(qfloat16 f) noexcept; #if !defined(QT_NO_FLOAT16_OPERATORS) - friend qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW; + friend qfloat16 operator-(qfloat16 a) noexcept; #endif }; Q_DECLARE_TYPEINFO(qfloat16, Q_PRIMITIVE_TYPE); -Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *, const float *, qsizetype length) Q_DECL_NOTHROW; -Q_CORE_EXPORT void qFloatFromFloat16(float *, const qfloat16 *, qsizetype length) Q_DECL_NOTHROW; +Q_CORE_EXPORT void qFloatToFloat16(qfloat16 *, const float *, qsizetype length) noexcept; +Q_CORE_EXPORT void qFloatFromFloat16(float *, const qfloat16 *, qsizetype length) noexcept; -Q_REQUIRED_RESULT Q_CORE_EXPORT bool qIsInf(qfloat16 f) Q_DECL_NOTHROW; // complements qnumeric.h -Q_REQUIRED_RESULT Q_CORE_EXPORT bool qIsNaN(qfloat16 f) Q_DECL_NOTHROW; // complements qnumeric.h -Q_REQUIRED_RESULT Q_CORE_EXPORT bool qIsFinite(qfloat16 f) Q_DECL_NOTHROW; // complements qnumeric.h +// Complement qnumeric.h: +Q_REQUIRED_RESULT inline bool qIsInf(qfloat16 f) noexcept { return f.isInf(); } +Q_REQUIRED_RESULT inline bool qIsNaN(qfloat16 f) noexcept { return f.isNaN(); } +Q_REQUIRED_RESULT inline bool qIsFinite(qfloat16 f) noexcept { return f.isFinite(); } +Q_REQUIRED_RESULT inline int qFpClassify(qfloat16 f) noexcept { return f.fpClassify(); } +// Q_REQUIRED_RESULT quint32 qFloatDistance(qfloat16 a, qfloat16 b); // The remainder of these utility functions complement qglobal.h -Q_REQUIRED_RESULT inline int qRound(qfloat16 d) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline int qRound(qfloat16 d) noexcept { return qRound(static_cast<float>(d)); } -Q_REQUIRED_RESULT inline qint64 qRound64(qfloat16 d) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline qint64 qRound64(qfloat16 d) noexcept { return qRound64(static_cast<float>(d)); } -Q_REQUIRED_RESULT inline bool qFuzzyCompare(qfloat16 p1, qfloat16 p2) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool qFuzzyCompare(qfloat16 p1, qfloat16 p2) noexcept { float f1 = static_cast<float>(p1); float f2 = static_cast<float>(p2); @@ -117,19 +143,19 @@ Q_REQUIRED_RESULT inline bool qFuzzyCompare(qfloat16 p1, qfloat16 p2) Q_DECL_NOT return (qAbs(f1 - f2) * 102.5f <= qMin(qAbs(f1), qAbs(f2))); } -Q_REQUIRED_RESULT inline bool qIsNull(qfloat16 f) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool qIsNull(qfloat16 f) noexcept { return (f.b16 & static_cast<quint16>(0x7fff)) == 0; } -inline int qIntCast(qfloat16 f) Q_DECL_NOTHROW +inline int qIntCast(qfloat16 f) noexcept { return int(static_cast<float>(f)); } #ifndef Q_QDOC QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wc99-extensions") QT_WARNING_DISABLE_GCC("-Wold-style-cast") -inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW +inline qfloat16::qfloat16(float f) noexcept { #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) __m128 packsingle = _mm_set_ss(f); @@ -147,7 +173,7 @@ inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW } QT_WARNING_POP -inline qfloat16::operator float() const Q_DECL_NOTHROW +inline qfloat16::operator float() const noexcept { #if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__) __m128i packhalf = _mm_cvtsi32_si128(b16); @@ -168,23 +194,23 @@ inline qfloat16::operator float() const Q_DECL_NOTHROW #endif #if !defined(QT_NO_FLOAT16_OPERATORS) -inline qfloat16 operator-(qfloat16 a) Q_DECL_NOTHROW +inline qfloat16 operator-(qfloat16 a) noexcept { qfloat16 f; f.b16 = a.b16 ^ quint16(0x8000); return f; } -inline qfloat16 operator+(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) + static_cast<float>(b)); } -inline qfloat16 operator-(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) - static_cast<float>(b)); } -inline qfloat16 operator*(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) * static_cast<float>(b)); } -inline qfloat16 operator/(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return qfloat16(static_cast<float>(a) / static_cast<float>(b)); } +inline qfloat16 operator+(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) + static_cast<float>(b)); } +inline qfloat16 operator-(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) - static_cast<float>(b)); } +inline qfloat16 operator*(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) * static_cast<float>(b)); } +inline qfloat16 operator/(qfloat16 a, qfloat16 b) noexcept { return qfloat16(static_cast<float>(a) / static_cast<float>(b)); } #define QF16_MAKE_ARITH_OP_FP(FP, OP) \ - inline FP operator OP(qfloat16 lhs, FP rhs) Q_DECL_NOTHROW { return static_cast<FP>(lhs) OP rhs; } \ - inline FP operator OP(FP lhs, qfloat16 rhs) Q_DECL_NOTHROW { return lhs OP static_cast<FP>(rhs); } + inline FP operator OP(qfloat16 lhs, FP rhs) noexcept { return static_cast<FP>(lhs) OP rhs; } \ + inline FP operator OP(FP lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<FP>(rhs); } #define QF16_MAKE_ARITH_OP_EQ_FP(FP, OP_EQ, OP) \ - inline qfloat16& operator OP_EQ(qfloat16& lhs, FP rhs) Q_DECL_NOTHROW \ + inline qfloat16& operator OP_EQ(qfloat16& lhs, FP rhs) noexcept \ { lhs = qfloat16(float(static_cast<FP>(lhs) OP rhs)); return lhs; } #define QF16_MAKE_ARITH_OP(FP) \ QF16_MAKE_ARITH_OP_FP(FP, +) \ @@ -202,8 +228,8 @@ QF16_MAKE_ARITH_OP(float) #undef QF16_MAKE_ARITH_OP_FP #define QF16_MAKE_ARITH_OP_INT(OP) \ - inline double operator OP(qfloat16 lhs, int rhs) Q_DECL_NOTHROW { return static_cast<double>(lhs) OP rhs; } \ - inline double operator OP(int lhs, qfloat16 rhs) Q_DECL_NOTHROW { return lhs OP static_cast<double>(rhs); } + inline double operator OP(qfloat16 lhs, int rhs) noexcept { return static_cast<double>(lhs) OP rhs; } \ + inline double operator OP(int lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<double>(rhs); } QF16_MAKE_ARITH_OP_INT(+) QF16_MAKE_ARITH_OP_INT(-) QF16_MAKE_ARITH_OP_INT(*) @@ -214,16 +240,16 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wfloat-equal") QT_WARNING_DISABLE_GCC("-Wfloat-equal") -inline bool operator>(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) > static_cast<float>(b); } -inline bool operator<(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) < static_cast<float>(b); } -inline bool operator>=(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) >= static_cast<float>(b); } -inline bool operator<=(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) <= static_cast<float>(b); } -inline bool operator==(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) == static_cast<float>(b); } -inline bool operator!=(qfloat16 a, qfloat16 b) Q_DECL_NOTHROW { return static_cast<float>(a) != static_cast<float>(b); } +inline bool operator>(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) > static_cast<float>(b); } +inline bool operator<(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) < static_cast<float>(b); } +inline bool operator>=(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) >= static_cast<float>(b); } +inline bool operator<=(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) <= static_cast<float>(b); } +inline bool operator==(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) == static_cast<float>(b); } +inline bool operator!=(qfloat16 a, qfloat16 b) noexcept { return static_cast<float>(a) != static_cast<float>(b); } #define QF16_MAKE_BOOL_OP_FP(FP, OP) \ - inline bool operator OP(qfloat16 lhs, FP rhs) Q_DECL_NOTHROW { return static_cast<FP>(lhs) OP rhs; } \ - inline bool operator OP(FP lhs, qfloat16 rhs) Q_DECL_NOTHROW { return lhs OP static_cast<FP>(rhs); } + inline bool operator OP(qfloat16 lhs, FP rhs) noexcept { return static_cast<FP>(lhs) OP rhs; } \ + inline bool operator OP(FP lhs, qfloat16 rhs) noexcept { return lhs OP static_cast<FP>(rhs); } #define QF16_MAKE_BOOL_OP(FP) \ QF16_MAKE_BOOL_OP_FP(FP, <) \ QF16_MAKE_BOOL_OP_FP(FP, >) \ @@ -238,8 +264,8 @@ QF16_MAKE_BOOL_OP(float) #undef QF16_MAKE_BOOL_OP_FP #define QF16_MAKE_BOOL_OP_INT(OP) \ - inline bool operator OP(qfloat16 a, int b) Q_DECL_NOTHROW { return static_cast<float>(a) OP b; } \ - inline bool operator OP(int a, qfloat16 b) Q_DECL_NOTHROW { return a OP static_cast<float>(b); } + inline bool operator OP(qfloat16 a, int b) noexcept { return static_cast<float>(a) OP b; } \ + inline bool operator OP(int a, qfloat16 b) noexcept { return a OP static_cast<float>(b); } QF16_MAKE_BOOL_OP_INT(>) QF16_MAKE_BOOL_OP_INT(<) QF16_MAKE_BOOL_OP_INT(>=) @@ -254,7 +280,7 @@ QT_WARNING_POP /*! \internal */ -Q_REQUIRED_RESULT inline bool qFuzzyIsNull(qfloat16 f) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool qFuzzyIsNull(qfloat16 f) noexcept { return qAbs(static_cast<float>(f)) <= 0.001f; } @@ -263,4 +289,55 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(qfloat16) +namespace std { +template<> +class numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> : public numeric_limits<float> +{ +public: + /* + Treat quint16 b16 as if it were: + uint S: 1; // b16 >> 15 (sign) + uint E: 5; // (b16 >> 10) & 0x1f (offset exponent) + uint M: 10; // b16 & 0x3ff (adjusted mantissa) + + for E == 0: magnitude is M / 2.^{24} + for 0 < E < 31: magnitude is (1. + M / 2.^{10}) * 2.^{E - 15) + for E == 31: not finite + */ + static constexpr int digits = 11; + static constexpr int min_exponent = -13; + static constexpr int max_exponent = 16; + + static constexpr int digits10 = 3; + static constexpr int max_digits10 = 5; + static constexpr int min_exponent10 = -4; + static constexpr int max_exponent10 = 4; + + static constexpr QT_PREPEND_NAMESPACE(qfloat16) epsilon() + { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_epsilon(); } + static constexpr QT_PREPEND_NAMESPACE(qfloat16) (min)() + { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_min(); } + static constexpr QT_PREPEND_NAMESPACE(qfloat16) denorm_min() + { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_denorm_min(); } + static constexpr QT_PREPEND_NAMESPACE(qfloat16) (max)() + { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_max(); } + static constexpr QT_PREPEND_NAMESPACE(qfloat16) lowest() + { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_lowest(); } + static constexpr QT_PREPEND_NAMESPACE(qfloat16) infinity() + { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_infinity(); } + static constexpr QT_PREPEND_NAMESPACE(qfloat16) quiet_NaN() + { return QT_PREPEND_NAMESPACE(qfloat16)::_limit_quiet_NaN(); } +}; + +template<> class numeric_limits<const QT_PREPEND_NAMESPACE(qfloat16)> + : public numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> {}; +template<> class numeric_limits<volatile QT_PREPEND_NAMESPACE(qfloat16)> + : public numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> {}; +template<> class numeric_limits<const volatile QT_PREPEND_NAMESPACE(qfloat16)> + : public numeric_limits<QT_PREPEND_NAMESPACE(qfloat16)> {}; + +// Adding overloads to std isn't allowed, so we can't extend this to support +// for fpclassify(), isnormal() &c. (which, furthermore, are macros on MinGW). +} // namespace std + #endif // QFLOAT16_H diff --git a/src/corelib/global/qfloat16_f16c.c b/src/corelib/global/qfloat16_f16c.c index a7eadc71b7..ba1e16f481 100644 --- a/src/corelib/global/qfloat16_f16c.c +++ b/src/corelib/global/qfloat16_f16c.c @@ -54,7 +54,7 @@ extern "C" { #endif QT_FUNCTION_TARGET(F16C) -void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOTHROW +void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_NOEXCEPT { qsizetype i = 0; int epilog_i; @@ -70,7 +70,7 @@ void qFloatToFloat16_fast(quint16 *out, const float *in, qsizetype len) Q_DECL_N } QT_FUNCTION_TARGET(F16C) -void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOTHROW +void qFloatFromFloat16_fast(float *out, const quint16 *in, qsizetype len) Q_DECL_NOEXCEPT { qsizetype i = 0; int epilog_i; diff --git a/src/corelib/global/qfloat16tables.cpp b/src/corelib/global/qfloat16tables.cpp new file mode 100644 index 0000000000..3d764937d7 --- /dev/null +++ b/src/corelib/global/qfloat16tables.cpp @@ -0,0 +1,3266 @@ +/**************************************************************************** +** +** Copyright (C) 2016 by Southwest Research Institute (R) +** Copyright (C) 2019 Intel Corporation. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/* This file was generated by gen_qfloat16_tables.cpp */ + +#include <QtCore/qfloat16.h> + +QT_BEGIN_NAMESPACE + +#if !defined(__F16C__) && !defined(__ARM_FP16_FORMAT_IEEE) + +const quint32 qfloat16::mantissatable[2048] = { +0, +0x33800000U, +0x34000000U, +0x34400000U, +0x34800000U, +0x34A00000U, +0x34C00000U, +0x34E00000U, +0x35000000U, +0x35100000U, +0x35200000U, +0x35300000U, +0x35400000U, +0x35500000U, +0x35600000U, +0x35700000U, +0x35800000U, +0x35880000U, +0x35900000U, +0x35980000U, +0x35A00000U, +0x35A80000U, +0x35B00000U, +0x35B80000U, +0x35C00000U, +0x35C80000U, +0x35D00000U, +0x35D80000U, +0x35E00000U, +0x35E80000U, +0x35F00000U, +0x35F80000U, +0x36000000U, +0x36040000U, +0x36080000U, +0x360C0000U, +0x36100000U, +0x36140000U, +0x36180000U, +0x361C0000U, +0x36200000U, +0x36240000U, +0x36280000U, +0x362C0000U, +0x36300000U, +0x36340000U, +0x36380000U, +0x363C0000U, +0x36400000U, +0x36440000U, +0x36480000U, +0x364C0000U, +0x36500000U, +0x36540000U, +0x36580000U, +0x365C0000U, +0x36600000U, +0x36640000U, +0x36680000U, +0x366C0000U, +0x36700000U, +0x36740000U, +0x36780000U, +0x367C0000U, +0x36800000U, +0x36820000U, +0x36840000U, +0x36860000U, +0x36880000U, +0x368A0000U, +0x368C0000U, +0x368E0000U, +0x36900000U, +0x36920000U, +0x36940000U, +0x36960000U, +0x36980000U, +0x369A0000U, +0x369C0000U, +0x369E0000U, +0x36A00000U, +0x36A20000U, +0x36A40000U, +0x36A60000U, +0x36A80000U, +0x36AA0000U, +0x36AC0000U, +0x36AE0000U, +0x36B00000U, +0x36B20000U, +0x36B40000U, +0x36B60000U, +0x36B80000U, +0x36BA0000U, +0x36BC0000U, +0x36BE0000U, +0x36C00000U, +0x36C20000U, +0x36C40000U, +0x36C60000U, +0x36C80000U, +0x36CA0000U, +0x36CC0000U, +0x36CE0000U, +0x36D00000U, +0x36D20000U, +0x36D40000U, +0x36D60000U, +0x36D80000U, +0x36DA0000U, +0x36DC0000U, +0x36DE0000U, +0x36E00000U, +0x36E20000U, +0x36E40000U, +0x36E60000U, +0x36E80000U, +0x36EA0000U, +0x36EC0000U, +0x36EE0000U, +0x36F00000U, +0x36F20000U, +0x36F40000U, +0x36F60000U, +0x36F80000U, +0x36FA0000U, +0x36FC0000U, +0x36FE0000U, +0x37000000U, +0x37010000U, +0x37020000U, +0x37030000U, +0x37040000U, +0x37050000U, +0x37060000U, +0x37070000U, +0x37080000U, +0x37090000U, +0x370A0000U, +0x370B0000U, +0x370C0000U, +0x370D0000U, +0x370E0000U, +0x370F0000U, +0x37100000U, +0x37110000U, +0x37120000U, +0x37130000U, +0x37140000U, +0x37150000U, +0x37160000U, +0x37170000U, +0x37180000U, +0x37190000U, +0x371A0000U, +0x371B0000U, +0x371C0000U, +0x371D0000U, +0x371E0000U, +0x371F0000U, +0x37200000U, +0x37210000U, +0x37220000U, +0x37230000U, +0x37240000U, +0x37250000U, +0x37260000U, +0x37270000U, +0x37280000U, +0x37290000U, +0x372A0000U, +0x372B0000U, +0x372C0000U, +0x372D0000U, +0x372E0000U, +0x372F0000U, +0x37300000U, +0x37310000U, +0x37320000U, +0x37330000U, +0x37340000U, +0x37350000U, +0x37360000U, +0x37370000U, +0x37380000U, +0x37390000U, +0x373A0000U, +0x373B0000U, +0x373C0000U, +0x373D0000U, +0x373E0000U, +0x373F0000U, +0x37400000U, +0x37410000U, +0x37420000U, +0x37430000U, +0x37440000U, +0x37450000U, +0x37460000U, +0x37470000U, +0x37480000U, +0x37490000U, +0x374A0000U, +0x374B0000U, +0x374C0000U, +0x374D0000U, +0x374E0000U, +0x374F0000U, +0x37500000U, +0x37510000U, +0x37520000U, +0x37530000U, +0x37540000U, +0x37550000U, +0x37560000U, +0x37570000U, +0x37580000U, +0x37590000U, +0x375A0000U, +0x375B0000U, +0x375C0000U, +0x375D0000U, +0x375E0000U, +0x375F0000U, +0x37600000U, +0x37610000U, +0x37620000U, +0x37630000U, +0x37640000U, +0x37650000U, +0x37660000U, +0x37670000U, +0x37680000U, +0x37690000U, +0x376A0000U, +0x376B0000U, +0x376C0000U, +0x376D0000U, +0x376E0000U, +0x376F0000U, +0x37700000U, +0x37710000U, +0x37720000U, +0x37730000U, +0x37740000U, +0x37750000U, +0x37760000U, +0x37770000U, +0x37780000U, +0x37790000U, +0x377A0000U, +0x377B0000U, +0x377C0000U, +0x377D0000U, +0x377E0000U, +0x377F0000U, +0x37800000U, +0x37808000U, +0x37810000U, +0x37818000U, +0x37820000U, +0x37828000U, +0x37830000U, +0x37838000U, +0x37840000U, +0x37848000U, +0x37850000U, +0x37858000U, +0x37860000U, +0x37868000U, +0x37870000U, +0x37878000U, +0x37880000U, +0x37888000U, +0x37890000U, +0x37898000U, +0x378A0000U, +0x378A8000U, +0x378B0000U, +0x378B8000U, +0x378C0000U, +0x378C8000U, +0x378D0000U, +0x378D8000U, +0x378E0000U, +0x378E8000U, +0x378F0000U, +0x378F8000U, +0x37900000U, +0x37908000U, +0x37910000U, +0x37918000U, +0x37920000U, +0x37928000U, +0x37930000U, +0x37938000U, +0x37940000U, +0x37948000U, +0x37950000U, +0x37958000U, +0x37960000U, +0x37968000U, +0x37970000U, +0x37978000U, +0x37980000U, +0x37988000U, +0x37990000U, +0x37998000U, +0x379A0000U, +0x379A8000U, +0x379B0000U, +0x379B8000U, +0x379C0000U, +0x379C8000U, +0x379D0000U, +0x379D8000U, +0x379E0000U, +0x379E8000U, +0x379F0000U, +0x379F8000U, +0x37A00000U, +0x37A08000U, +0x37A10000U, +0x37A18000U, +0x37A20000U, +0x37A28000U, +0x37A30000U, +0x37A38000U, +0x37A40000U, +0x37A48000U, +0x37A50000U, +0x37A58000U, +0x37A60000U, +0x37A68000U, +0x37A70000U, +0x37A78000U, +0x37A80000U, +0x37A88000U, +0x37A90000U, +0x37A98000U, +0x37AA0000U, +0x37AA8000U, +0x37AB0000U, +0x37AB8000U, +0x37AC0000U, +0x37AC8000U, +0x37AD0000U, +0x37AD8000U, +0x37AE0000U, +0x37AE8000U, +0x37AF0000U, +0x37AF8000U, +0x37B00000U, +0x37B08000U, +0x37B10000U, +0x37B18000U, +0x37B20000U, +0x37B28000U, +0x37B30000U, +0x37B38000U, +0x37B40000U, +0x37B48000U, +0x37B50000U, +0x37B58000U, +0x37B60000U, +0x37B68000U, +0x37B70000U, +0x37B78000U, +0x37B80000U, +0x37B88000U, +0x37B90000U, +0x37B98000U, +0x37BA0000U, +0x37BA8000U, +0x37BB0000U, +0x37BB8000U, +0x37BC0000U, +0x37BC8000U, +0x37BD0000U, +0x37BD8000U, +0x37BE0000U, +0x37BE8000U, +0x37BF0000U, +0x37BF8000U, +0x37C00000U, +0x37C08000U, +0x37C10000U, +0x37C18000U, +0x37C20000U, +0x37C28000U, +0x37C30000U, +0x37C38000U, +0x37C40000U, +0x37C48000U, +0x37C50000U, +0x37C58000U, +0x37C60000U, +0x37C68000U, +0x37C70000U, +0x37C78000U, +0x37C80000U, +0x37C88000U, +0x37C90000U, +0x37C98000U, +0x37CA0000U, +0x37CA8000U, +0x37CB0000U, +0x37CB8000U, +0x37CC0000U, +0x37CC8000U, +0x37CD0000U, +0x37CD8000U, +0x37CE0000U, +0x37CE8000U, +0x37CF0000U, +0x37CF8000U, +0x37D00000U, +0x37D08000U, +0x37D10000U, +0x37D18000U, +0x37D20000U, +0x37D28000U, +0x37D30000U, +0x37D38000U, +0x37D40000U, +0x37D48000U, +0x37D50000U, +0x37D58000U, +0x37D60000U, +0x37D68000U, +0x37D70000U, +0x37D78000U, +0x37D80000U, +0x37D88000U, +0x37D90000U, +0x37D98000U, +0x37DA0000U, +0x37DA8000U, +0x37DB0000U, +0x37DB8000U, +0x37DC0000U, +0x37DC8000U, +0x37DD0000U, +0x37DD8000U, +0x37DE0000U, +0x37DE8000U, +0x37DF0000U, +0x37DF8000U, +0x37E00000U, +0x37E08000U, +0x37E10000U, +0x37E18000U, +0x37E20000U, +0x37E28000U, +0x37E30000U, +0x37E38000U, +0x37E40000U, +0x37E48000U, +0x37E50000U, +0x37E58000U, +0x37E60000U, +0x37E68000U, +0x37E70000U, +0x37E78000U, +0x37E80000U, +0x37E88000U, +0x37E90000U, +0x37E98000U, +0x37EA0000U, +0x37EA8000U, +0x37EB0000U, +0x37EB8000U, +0x37EC0000U, +0x37EC8000U, +0x37ED0000U, +0x37ED8000U, +0x37EE0000U, +0x37EE8000U, +0x37EF0000U, +0x37EF8000U, +0x37F00000U, +0x37F08000U, +0x37F10000U, +0x37F18000U, +0x37F20000U, +0x37F28000U, +0x37F30000U, +0x37F38000U, +0x37F40000U, +0x37F48000U, +0x37F50000U, +0x37F58000U, +0x37F60000U, +0x37F68000U, +0x37F70000U, +0x37F78000U, +0x37F80000U, +0x37F88000U, +0x37F90000U, +0x37F98000U, +0x37FA0000U, +0x37FA8000U, +0x37FB0000U, +0x37FB8000U, +0x37FC0000U, +0x37FC8000U, +0x37FD0000U, +0x37FD8000U, +0x37FE0000U, +0x37FE8000U, +0x37FF0000U, +0x37FF8000U, +0x38000000U, +0x38004000U, +0x38008000U, +0x3800C000U, +0x38010000U, +0x38014000U, +0x38018000U, +0x3801C000U, +0x38020000U, +0x38024000U, +0x38028000U, +0x3802C000U, +0x38030000U, +0x38034000U, +0x38038000U, +0x3803C000U, +0x38040000U, +0x38044000U, +0x38048000U, +0x3804C000U, +0x38050000U, +0x38054000U, +0x38058000U, +0x3805C000U, +0x38060000U, +0x38064000U, +0x38068000U, +0x3806C000U, +0x38070000U, +0x38074000U, +0x38078000U, +0x3807C000U, +0x38080000U, +0x38084000U, +0x38088000U, +0x3808C000U, +0x38090000U, +0x38094000U, +0x38098000U, +0x3809C000U, +0x380A0000U, +0x380A4000U, +0x380A8000U, +0x380AC000U, +0x380B0000U, +0x380B4000U, +0x380B8000U, +0x380BC000U, +0x380C0000U, +0x380C4000U, +0x380C8000U, +0x380CC000U, +0x380D0000U, +0x380D4000U, +0x380D8000U, +0x380DC000U, +0x380E0000U, +0x380E4000U, +0x380E8000U, +0x380EC000U, +0x380F0000U, +0x380F4000U, +0x380F8000U, +0x380FC000U, +0x38100000U, +0x38104000U, +0x38108000U, +0x3810C000U, +0x38110000U, +0x38114000U, +0x38118000U, +0x3811C000U, +0x38120000U, +0x38124000U, +0x38128000U, +0x3812C000U, +0x38130000U, +0x38134000U, +0x38138000U, +0x3813C000U, +0x38140000U, +0x38144000U, +0x38148000U, +0x3814C000U, +0x38150000U, +0x38154000U, +0x38158000U, +0x3815C000U, +0x38160000U, +0x38164000U, +0x38168000U, +0x3816C000U, +0x38170000U, +0x38174000U, +0x38178000U, +0x3817C000U, +0x38180000U, +0x38184000U, +0x38188000U, +0x3818C000U, +0x38190000U, +0x38194000U, +0x38198000U, +0x3819C000U, +0x381A0000U, +0x381A4000U, +0x381A8000U, +0x381AC000U, +0x381B0000U, +0x381B4000U, +0x381B8000U, +0x381BC000U, +0x381C0000U, +0x381C4000U, +0x381C8000U, +0x381CC000U, +0x381D0000U, +0x381D4000U, +0x381D8000U, +0x381DC000U, +0x381E0000U, +0x381E4000U, +0x381E8000U, +0x381EC000U, +0x381F0000U, +0x381F4000U, +0x381F8000U, +0x381FC000U, +0x38200000U, +0x38204000U, +0x38208000U, +0x3820C000U, +0x38210000U, +0x38214000U, +0x38218000U, +0x3821C000U, +0x38220000U, +0x38224000U, +0x38228000U, +0x3822C000U, +0x38230000U, +0x38234000U, +0x38238000U, +0x3823C000U, +0x38240000U, +0x38244000U, +0x38248000U, +0x3824C000U, +0x38250000U, +0x38254000U, +0x38258000U, +0x3825C000U, +0x38260000U, +0x38264000U, +0x38268000U, +0x3826C000U, +0x38270000U, +0x38274000U, +0x38278000U, +0x3827C000U, +0x38280000U, +0x38284000U, +0x38288000U, +0x3828C000U, +0x38290000U, +0x38294000U, +0x38298000U, +0x3829C000U, +0x382A0000U, +0x382A4000U, +0x382A8000U, +0x382AC000U, +0x382B0000U, +0x382B4000U, +0x382B8000U, +0x382BC000U, +0x382C0000U, +0x382C4000U, +0x382C8000U, +0x382CC000U, +0x382D0000U, +0x382D4000U, +0x382D8000U, +0x382DC000U, +0x382E0000U, +0x382E4000U, +0x382E8000U, +0x382EC000U, +0x382F0000U, +0x382F4000U, +0x382F8000U, +0x382FC000U, +0x38300000U, +0x38304000U, +0x38308000U, +0x3830C000U, +0x38310000U, +0x38314000U, +0x38318000U, +0x3831C000U, +0x38320000U, +0x38324000U, +0x38328000U, +0x3832C000U, +0x38330000U, +0x38334000U, +0x38338000U, +0x3833C000U, +0x38340000U, +0x38344000U, +0x38348000U, +0x3834C000U, +0x38350000U, +0x38354000U, +0x38358000U, +0x3835C000U, +0x38360000U, +0x38364000U, +0x38368000U, +0x3836C000U, +0x38370000U, +0x38374000U, +0x38378000U, +0x3837C000U, +0x38380000U, +0x38384000U, +0x38388000U, +0x3838C000U, +0x38390000U, +0x38394000U, +0x38398000U, +0x3839C000U, +0x383A0000U, +0x383A4000U, +0x383A8000U, +0x383AC000U, +0x383B0000U, +0x383B4000U, +0x383B8000U, +0x383BC000U, +0x383C0000U, +0x383C4000U, +0x383C8000U, +0x383CC000U, +0x383D0000U, +0x383D4000U, +0x383D8000U, +0x383DC000U, +0x383E0000U, +0x383E4000U, +0x383E8000U, +0x383EC000U, +0x383F0000U, +0x383F4000U, +0x383F8000U, +0x383FC000U, +0x38400000U, +0x38404000U, +0x38408000U, +0x3840C000U, +0x38410000U, +0x38414000U, +0x38418000U, +0x3841C000U, +0x38420000U, +0x38424000U, +0x38428000U, +0x3842C000U, +0x38430000U, +0x38434000U, +0x38438000U, +0x3843C000U, +0x38440000U, +0x38444000U, +0x38448000U, +0x3844C000U, +0x38450000U, +0x38454000U, +0x38458000U, +0x3845C000U, +0x38460000U, +0x38464000U, +0x38468000U, +0x3846C000U, +0x38470000U, +0x38474000U, +0x38478000U, +0x3847C000U, +0x38480000U, +0x38484000U, +0x38488000U, +0x3848C000U, +0x38490000U, +0x38494000U, +0x38498000U, +0x3849C000U, +0x384A0000U, +0x384A4000U, +0x384A8000U, +0x384AC000U, +0x384B0000U, +0x384B4000U, +0x384B8000U, +0x384BC000U, +0x384C0000U, +0x384C4000U, +0x384C8000U, +0x384CC000U, +0x384D0000U, +0x384D4000U, +0x384D8000U, +0x384DC000U, +0x384E0000U, +0x384E4000U, +0x384E8000U, +0x384EC000U, +0x384F0000U, +0x384F4000U, +0x384F8000U, +0x384FC000U, +0x38500000U, +0x38504000U, +0x38508000U, +0x3850C000U, +0x38510000U, +0x38514000U, +0x38518000U, +0x3851C000U, +0x38520000U, +0x38524000U, +0x38528000U, +0x3852C000U, +0x38530000U, +0x38534000U, +0x38538000U, +0x3853C000U, +0x38540000U, +0x38544000U, +0x38548000U, +0x3854C000U, +0x38550000U, +0x38554000U, +0x38558000U, +0x3855C000U, +0x38560000U, +0x38564000U, +0x38568000U, +0x3856C000U, +0x38570000U, +0x38574000U, +0x38578000U, +0x3857C000U, +0x38580000U, +0x38584000U, +0x38588000U, +0x3858C000U, +0x38590000U, +0x38594000U, +0x38598000U, +0x3859C000U, +0x385A0000U, +0x385A4000U, +0x385A8000U, +0x385AC000U, +0x385B0000U, +0x385B4000U, +0x385B8000U, +0x385BC000U, +0x385C0000U, +0x385C4000U, +0x385C8000U, +0x385CC000U, +0x385D0000U, +0x385D4000U, +0x385D8000U, +0x385DC000U, +0x385E0000U, +0x385E4000U, +0x385E8000U, +0x385EC000U, +0x385F0000U, +0x385F4000U, +0x385F8000U, +0x385FC000U, +0x38600000U, +0x38604000U, +0x38608000U, +0x3860C000U, +0x38610000U, +0x38614000U, +0x38618000U, +0x3861C000U, +0x38620000U, +0x38624000U, +0x38628000U, +0x3862C000U, +0x38630000U, +0x38634000U, +0x38638000U, +0x3863C000U, +0x38640000U, +0x38644000U, +0x38648000U, +0x3864C000U, +0x38650000U, +0x38654000U, +0x38658000U, +0x3865C000U, +0x38660000U, +0x38664000U, +0x38668000U, +0x3866C000U, +0x38670000U, +0x38674000U, +0x38678000U, +0x3867C000U, +0x38680000U, +0x38684000U, +0x38688000U, +0x3868C000U, +0x38690000U, +0x38694000U, +0x38698000U, +0x3869C000U, +0x386A0000U, +0x386A4000U, +0x386A8000U, +0x386AC000U, +0x386B0000U, +0x386B4000U, +0x386B8000U, +0x386BC000U, +0x386C0000U, +0x386C4000U, +0x386C8000U, +0x386CC000U, +0x386D0000U, +0x386D4000U, +0x386D8000U, +0x386DC000U, +0x386E0000U, +0x386E4000U, +0x386E8000U, +0x386EC000U, +0x386F0000U, +0x386F4000U, +0x386F8000U, +0x386FC000U, +0x38700000U, +0x38704000U, +0x38708000U, +0x3870C000U, +0x38710000U, +0x38714000U, +0x38718000U, +0x3871C000U, +0x38720000U, +0x38724000U, +0x38728000U, +0x3872C000U, +0x38730000U, +0x38734000U, +0x38738000U, +0x3873C000U, +0x38740000U, +0x38744000U, +0x38748000U, +0x3874C000U, +0x38750000U, +0x38754000U, +0x38758000U, +0x3875C000U, +0x38760000U, +0x38764000U, +0x38768000U, +0x3876C000U, +0x38770000U, +0x38774000U, +0x38778000U, +0x3877C000U, +0x38780000U, +0x38784000U, +0x38788000U, +0x3878C000U, +0x38790000U, +0x38794000U, +0x38798000U, +0x3879C000U, +0x387A0000U, +0x387A4000U, +0x387A8000U, +0x387AC000U, +0x387B0000U, +0x387B4000U, +0x387B8000U, +0x387BC000U, +0x387C0000U, +0x387C4000U, +0x387C8000U, +0x387CC000U, +0x387D0000U, +0x387D4000U, +0x387D8000U, +0x387DC000U, +0x387E0000U, +0x387E4000U, +0x387E8000U, +0x387EC000U, +0x387F0000U, +0x387F4000U, +0x387F8000U, +0x387FC000U, +0x38000000U, +0x38002000U, +0x38004000U, +0x38006000U, +0x38008000U, +0x3800A000U, +0x3800C000U, +0x3800E000U, +0x38010000U, +0x38012000U, +0x38014000U, +0x38016000U, +0x38018000U, +0x3801A000U, +0x3801C000U, +0x3801E000U, +0x38020000U, +0x38022000U, +0x38024000U, +0x38026000U, +0x38028000U, +0x3802A000U, +0x3802C000U, +0x3802E000U, +0x38030000U, +0x38032000U, +0x38034000U, +0x38036000U, +0x38038000U, +0x3803A000U, +0x3803C000U, +0x3803E000U, +0x38040000U, +0x38042000U, +0x38044000U, +0x38046000U, +0x38048000U, +0x3804A000U, +0x3804C000U, +0x3804E000U, +0x38050000U, +0x38052000U, +0x38054000U, +0x38056000U, +0x38058000U, +0x3805A000U, +0x3805C000U, +0x3805E000U, +0x38060000U, +0x38062000U, +0x38064000U, +0x38066000U, +0x38068000U, +0x3806A000U, +0x3806C000U, +0x3806E000U, +0x38070000U, +0x38072000U, +0x38074000U, +0x38076000U, +0x38078000U, +0x3807A000U, +0x3807C000U, +0x3807E000U, +0x38080000U, +0x38082000U, +0x38084000U, +0x38086000U, +0x38088000U, +0x3808A000U, +0x3808C000U, +0x3808E000U, +0x38090000U, +0x38092000U, +0x38094000U, +0x38096000U, +0x38098000U, +0x3809A000U, +0x3809C000U, +0x3809E000U, +0x380A0000U, +0x380A2000U, +0x380A4000U, +0x380A6000U, +0x380A8000U, +0x380AA000U, +0x380AC000U, +0x380AE000U, +0x380B0000U, +0x380B2000U, +0x380B4000U, +0x380B6000U, +0x380B8000U, +0x380BA000U, +0x380BC000U, +0x380BE000U, +0x380C0000U, +0x380C2000U, +0x380C4000U, +0x380C6000U, +0x380C8000U, +0x380CA000U, +0x380CC000U, +0x380CE000U, +0x380D0000U, +0x380D2000U, +0x380D4000U, +0x380D6000U, +0x380D8000U, +0x380DA000U, +0x380DC000U, +0x380DE000U, +0x380E0000U, +0x380E2000U, +0x380E4000U, +0x380E6000U, +0x380E8000U, +0x380EA000U, +0x380EC000U, +0x380EE000U, +0x380F0000U, +0x380F2000U, +0x380F4000U, +0x380F6000U, +0x380F8000U, +0x380FA000U, +0x380FC000U, +0x380FE000U, +0x38100000U, +0x38102000U, +0x38104000U, +0x38106000U, +0x38108000U, +0x3810A000U, +0x3810C000U, +0x3810E000U, +0x38110000U, +0x38112000U, +0x38114000U, +0x38116000U, +0x38118000U, +0x3811A000U, +0x3811C000U, +0x3811E000U, +0x38120000U, +0x38122000U, +0x38124000U, +0x38126000U, +0x38128000U, +0x3812A000U, +0x3812C000U, +0x3812E000U, +0x38130000U, +0x38132000U, +0x38134000U, +0x38136000U, +0x38138000U, +0x3813A000U, +0x3813C000U, +0x3813E000U, +0x38140000U, +0x38142000U, +0x38144000U, +0x38146000U, +0x38148000U, +0x3814A000U, +0x3814C000U, +0x3814E000U, +0x38150000U, +0x38152000U, +0x38154000U, +0x38156000U, +0x38158000U, +0x3815A000U, +0x3815C000U, +0x3815E000U, +0x38160000U, +0x38162000U, +0x38164000U, +0x38166000U, +0x38168000U, +0x3816A000U, +0x3816C000U, +0x3816E000U, +0x38170000U, +0x38172000U, +0x38174000U, +0x38176000U, +0x38178000U, +0x3817A000U, +0x3817C000U, +0x3817E000U, +0x38180000U, +0x38182000U, +0x38184000U, +0x38186000U, +0x38188000U, +0x3818A000U, +0x3818C000U, +0x3818E000U, +0x38190000U, +0x38192000U, +0x38194000U, +0x38196000U, +0x38198000U, +0x3819A000U, +0x3819C000U, +0x3819E000U, +0x381A0000U, +0x381A2000U, +0x381A4000U, +0x381A6000U, +0x381A8000U, +0x381AA000U, +0x381AC000U, +0x381AE000U, +0x381B0000U, +0x381B2000U, +0x381B4000U, +0x381B6000U, +0x381B8000U, +0x381BA000U, +0x381BC000U, +0x381BE000U, +0x381C0000U, +0x381C2000U, +0x381C4000U, +0x381C6000U, +0x381C8000U, +0x381CA000U, +0x381CC000U, +0x381CE000U, +0x381D0000U, +0x381D2000U, +0x381D4000U, +0x381D6000U, +0x381D8000U, +0x381DA000U, +0x381DC000U, +0x381DE000U, +0x381E0000U, +0x381E2000U, +0x381E4000U, +0x381E6000U, +0x381E8000U, +0x381EA000U, +0x381EC000U, +0x381EE000U, +0x381F0000U, +0x381F2000U, +0x381F4000U, +0x381F6000U, +0x381F8000U, +0x381FA000U, +0x381FC000U, +0x381FE000U, +0x38200000U, +0x38202000U, +0x38204000U, +0x38206000U, +0x38208000U, +0x3820A000U, +0x3820C000U, +0x3820E000U, +0x38210000U, +0x38212000U, +0x38214000U, +0x38216000U, +0x38218000U, +0x3821A000U, +0x3821C000U, +0x3821E000U, +0x38220000U, +0x38222000U, +0x38224000U, +0x38226000U, +0x38228000U, +0x3822A000U, +0x3822C000U, +0x3822E000U, +0x38230000U, +0x38232000U, +0x38234000U, +0x38236000U, +0x38238000U, +0x3823A000U, +0x3823C000U, +0x3823E000U, +0x38240000U, +0x38242000U, +0x38244000U, +0x38246000U, +0x38248000U, +0x3824A000U, +0x3824C000U, +0x3824E000U, +0x38250000U, +0x38252000U, +0x38254000U, +0x38256000U, +0x38258000U, +0x3825A000U, +0x3825C000U, +0x3825E000U, +0x38260000U, +0x38262000U, +0x38264000U, +0x38266000U, +0x38268000U, +0x3826A000U, +0x3826C000U, +0x3826E000U, +0x38270000U, +0x38272000U, +0x38274000U, +0x38276000U, +0x38278000U, +0x3827A000U, +0x3827C000U, +0x3827E000U, +0x38280000U, +0x38282000U, +0x38284000U, +0x38286000U, +0x38288000U, +0x3828A000U, +0x3828C000U, +0x3828E000U, +0x38290000U, +0x38292000U, +0x38294000U, +0x38296000U, +0x38298000U, +0x3829A000U, +0x3829C000U, +0x3829E000U, +0x382A0000U, +0x382A2000U, +0x382A4000U, +0x382A6000U, +0x382A8000U, +0x382AA000U, +0x382AC000U, +0x382AE000U, +0x382B0000U, +0x382B2000U, +0x382B4000U, +0x382B6000U, +0x382B8000U, +0x382BA000U, +0x382BC000U, +0x382BE000U, +0x382C0000U, +0x382C2000U, +0x382C4000U, +0x382C6000U, +0x382C8000U, +0x382CA000U, +0x382CC000U, +0x382CE000U, +0x382D0000U, +0x382D2000U, +0x382D4000U, +0x382D6000U, +0x382D8000U, +0x382DA000U, +0x382DC000U, +0x382DE000U, +0x382E0000U, +0x382E2000U, +0x382E4000U, +0x382E6000U, +0x382E8000U, +0x382EA000U, +0x382EC000U, +0x382EE000U, +0x382F0000U, +0x382F2000U, +0x382F4000U, +0x382F6000U, +0x382F8000U, +0x382FA000U, +0x382FC000U, +0x382FE000U, +0x38300000U, +0x38302000U, +0x38304000U, +0x38306000U, +0x38308000U, +0x3830A000U, +0x3830C000U, +0x3830E000U, +0x38310000U, +0x38312000U, +0x38314000U, +0x38316000U, +0x38318000U, +0x3831A000U, +0x3831C000U, +0x3831E000U, +0x38320000U, +0x38322000U, +0x38324000U, +0x38326000U, +0x38328000U, +0x3832A000U, +0x3832C000U, +0x3832E000U, +0x38330000U, +0x38332000U, +0x38334000U, +0x38336000U, +0x38338000U, +0x3833A000U, +0x3833C000U, +0x3833E000U, +0x38340000U, +0x38342000U, +0x38344000U, +0x38346000U, +0x38348000U, +0x3834A000U, +0x3834C000U, +0x3834E000U, +0x38350000U, +0x38352000U, +0x38354000U, +0x38356000U, +0x38358000U, +0x3835A000U, +0x3835C000U, +0x3835E000U, +0x38360000U, +0x38362000U, +0x38364000U, +0x38366000U, +0x38368000U, +0x3836A000U, +0x3836C000U, +0x3836E000U, +0x38370000U, +0x38372000U, +0x38374000U, +0x38376000U, +0x38378000U, +0x3837A000U, +0x3837C000U, +0x3837E000U, +0x38380000U, +0x38382000U, +0x38384000U, +0x38386000U, +0x38388000U, +0x3838A000U, +0x3838C000U, +0x3838E000U, +0x38390000U, +0x38392000U, +0x38394000U, +0x38396000U, +0x38398000U, +0x3839A000U, +0x3839C000U, +0x3839E000U, +0x383A0000U, +0x383A2000U, +0x383A4000U, +0x383A6000U, +0x383A8000U, +0x383AA000U, +0x383AC000U, +0x383AE000U, +0x383B0000U, +0x383B2000U, +0x383B4000U, +0x383B6000U, +0x383B8000U, +0x383BA000U, +0x383BC000U, +0x383BE000U, +0x383C0000U, +0x383C2000U, +0x383C4000U, +0x383C6000U, +0x383C8000U, +0x383CA000U, +0x383CC000U, +0x383CE000U, +0x383D0000U, +0x383D2000U, +0x383D4000U, +0x383D6000U, +0x383D8000U, +0x383DA000U, +0x383DC000U, +0x383DE000U, +0x383E0000U, +0x383E2000U, +0x383E4000U, +0x383E6000U, +0x383E8000U, +0x383EA000U, +0x383EC000U, +0x383EE000U, +0x383F0000U, +0x383F2000U, +0x383F4000U, +0x383F6000U, +0x383F8000U, +0x383FA000U, +0x383FC000U, +0x383FE000U, +0x38400000U, +0x38402000U, +0x38404000U, +0x38406000U, +0x38408000U, +0x3840A000U, +0x3840C000U, +0x3840E000U, +0x38410000U, +0x38412000U, +0x38414000U, +0x38416000U, +0x38418000U, +0x3841A000U, +0x3841C000U, +0x3841E000U, +0x38420000U, +0x38422000U, +0x38424000U, +0x38426000U, +0x38428000U, +0x3842A000U, +0x3842C000U, +0x3842E000U, +0x38430000U, +0x38432000U, +0x38434000U, +0x38436000U, +0x38438000U, +0x3843A000U, +0x3843C000U, +0x3843E000U, +0x38440000U, +0x38442000U, +0x38444000U, +0x38446000U, +0x38448000U, +0x3844A000U, +0x3844C000U, +0x3844E000U, +0x38450000U, +0x38452000U, +0x38454000U, +0x38456000U, +0x38458000U, +0x3845A000U, +0x3845C000U, +0x3845E000U, +0x38460000U, +0x38462000U, +0x38464000U, +0x38466000U, +0x38468000U, +0x3846A000U, +0x3846C000U, +0x3846E000U, +0x38470000U, +0x38472000U, +0x38474000U, +0x38476000U, +0x38478000U, +0x3847A000U, +0x3847C000U, +0x3847E000U, +0x38480000U, +0x38482000U, +0x38484000U, +0x38486000U, +0x38488000U, +0x3848A000U, +0x3848C000U, +0x3848E000U, +0x38490000U, +0x38492000U, +0x38494000U, +0x38496000U, +0x38498000U, +0x3849A000U, +0x3849C000U, +0x3849E000U, +0x384A0000U, +0x384A2000U, +0x384A4000U, +0x384A6000U, +0x384A8000U, +0x384AA000U, +0x384AC000U, +0x384AE000U, +0x384B0000U, +0x384B2000U, +0x384B4000U, +0x384B6000U, +0x384B8000U, +0x384BA000U, +0x384BC000U, +0x384BE000U, +0x384C0000U, +0x384C2000U, +0x384C4000U, +0x384C6000U, +0x384C8000U, +0x384CA000U, +0x384CC000U, +0x384CE000U, +0x384D0000U, +0x384D2000U, +0x384D4000U, +0x384D6000U, +0x384D8000U, +0x384DA000U, +0x384DC000U, +0x384DE000U, +0x384E0000U, +0x384E2000U, +0x384E4000U, +0x384E6000U, +0x384E8000U, +0x384EA000U, +0x384EC000U, +0x384EE000U, +0x384F0000U, +0x384F2000U, +0x384F4000U, +0x384F6000U, +0x384F8000U, +0x384FA000U, +0x384FC000U, +0x384FE000U, +0x38500000U, +0x38502000U, +0x38504000U, +0x38506000U, +0x38508000U, +0x3850A000U, +0x3850C000U, +0x3850E000U, +0x38510000U, +0x38512000U, +0x38514000U, +0x38516000U, +0x38518000U, +0x3851A000U, +0x3851C000U, +0x3851E000U, +0x38520000U, +0x38522000U, +0x38524000U, +0x38526000U, +0x38528000U, +0x3852A000U, +0x3852C000U, +0x3852E000U, +0x38530000U, +0x38532000U, +0x38534000U, +0x38536000U, +0x38538000U, +0x3853A000U, +0x3853C000U, +0x3853E000U, +0x38540000U, +0x38542000U, +0x38544000U, +0x38546000U, +0x38548000U, +0x3854A000U, +0x3854C000U, +0x3854E000U, +0x38550000U, +0x38552000U, +0x38554000U, +0x38556000U, +0x38558000U, +0x3855A000U, +0x3855C000U, +0x3855E000U, +0x38560000U, +0x38562000U, +0x38564000U, +0x38566000U, +0x38568000U, +0x3856A000U, +0x3856C000U, +0x3856E000U, +0x38570000U, +0x38572000U, +0x38574000U, +0x38576000U, +0x38578000U, +0x3857A000U, +0x3857C000U, +0x3857E000U, +0x38580000U, +0x38582000U, +0x38584000U, +0x38586000U, +0x38588000U, +0x3858A000U, +0x3858C000U, +0x3858E000U, +0x38590000U, +0x38592000U, +0x38594000U, +0x38596000U, +0x38598000U, +0x3859A000U, +0x3859C000U, +0x3859E000U, +0x385A0000U, +0x385A2000U, +0x385A4000U, +0x385A6000U, +0x385A8000U, +0x385AA000U, +0x385AC000U, +0x385AE000U, +0x385B0000U, +0x385B2000U, +0x385B4000U, +0x385B6000U, +0x385B8000U, +0x385BA000U, +0x385BC000U, +0x385BE000U, +0x385C0000U, +0x385C2000U, +0x385C4000U, +0x385C6000U, +0x385C8000U, +0x385CA000U, +0x385CC000U, +0x385CE000U, +0x385D0000U, +0x385D2000U, +0x385D4000U, +0x385D6000U, +0x385D8000U, +0x385DA000U, +0x385DC000U, +0x385DE000U, +0x385E0000U, +0x385E2000U, +0x385E4000U, +0x385E6000U, +0x385E8000U, +0x385EA000U, +0x385EC000U, +0x385EE000U, +0x385F0000U, +0x385F2000U, +0x385F4000U, +0x385F6000U, +0x385F8000U, +0x385FA000U, +0x385FC000U, +0x385FE000U, +0x38600000U, +0x38602000U, +0x38604000U, +0x38606000U, +0x38608000U, +0x3860A000U, +0x3860C000U, +0x3860E000U, +0x38610000U, +0x38612000U, +0x38614000U, +0x38616000U, +0x38618000U, +0x3861A000U, +0x3861C000U, +0x3861E000U, +0x38620000U, +0x38622000U, +0x38624000U, +0x38626000U, +0x38628000U, +0x3862A000U, +0x3862C000U, +0x3862E000U, +0x38630000U, +0x38632000U, +0x38634000U, +0x38636000U, +0x38638000U, +0x3863A000U, +0x3863C000U, +0x3863E000U, +0x38640000U, +0x38642000U, +0x38644000U, +0x38646000U, +0x38648000U, +0x3864A000U, +0x3864C000U, +0x3864E000U, +0x38650000U, +0x38652000U, +0x38654000U, +0x38656000U, +0x38658000U, +0x3865A000U, +0x3865C000U, +0x3865E000U, +0x38660000U, +0x38662000U, +0x38664000U, +0x38666000U, +0x38668000U, +0x3866A000U, +0x3866C000U, +0x3866E000U, +0x38670000U, +0x38672000U, +0x38674000U, +0x38676000U, +0x38678000U, +0x3867A000U, +0x3867C000U, +0x3867E000U, +0x38680000U, +0x38682000U, +0x38684000U, +0x38686000U, +0x38688000U, +0x3868A000U, +0x3868C000U, +0x3868E000U, +0x38690000U, +0x38692000U, +0x38694000U, +0x38696000U, +0x38698000U, +0x3869A000U, +0x3869C000U, +0x3869E000U, +0x386A0000U, +0x386A2000U, +0x386A4000U, +0x386A6000U, +0x386A8000U, +0x386AA000U, +0x386AC000U, +0x386AE000U, +0x386B0000U, +0x386B2000U, +0x386B4000U, +0x386B6000U, +0x386B8000U, +0x386BA000U, +0x386BC000U, +0x386BE000U, +0x386C0000U, +0x386C2000U, +0x386C4000U, +0x386C6000U, +0x386C8000U, +0x386CA000U, +0x386CC000U, +0x386CE000U, +0x386D0000U, +0x386D2000U, +0x386D4000U, +0x386D6000U, +0x386D8000U, +0x386DA000U, +0x386DC000U, +0x386DE000U, +0x386E0000U, +0x386E2000U, +0x386E4000U, +0x386E6000U, +0x386E8000U, +0x386EA000U, +0x386EC000U, +0x386EE000U, +0x386F0000U, +0x386F2000U, +0x386F4000U, +0x386F6000U, +0x386F8000U, +0x386FA000U, +0x386FC000U, +0x386FE000U, +0x38700000U, +0x38702000U, +0x38704000U, +0x38706000U, +0x38708000U, +0x3870A000U, +0x3870C000U, +0x3870E000U, +0x38710000U, +0x38712000U, +0x38714000U, +0x38716000U, +0x38718000U, +0x3871A000U, +0x3871C000U, +0x3871E000U, +0x38720000U, +0x38722000U, +0x38724000U, +0x38726000U, +0x38728000U, +0x3872A000U, +0x3872C000U, +0x3872E000U, +0x38730000U, +0x38732000U, +0x38734000U, +0x38736000U, +0x38738000U, +0x3873A000U, +0x3873C000U, +0x3873E000U, +0x38740000U, +0x38742000U, +0x38744000U, +0x38746000U, +0x38748000U, +0x3874A000U, +0x3874C000U, +0x3874E000U, +0x38750000U, +0x38752000U, +0x38754000U, +0x38756000U, +0x38758000U, +0x3875A000U, +0x3875C000U, +0x3875E000U, +0x38760000U, +0x38762000U, +0x38764000U, +0x38766000U, +0x38768000U, +0x3876A000U, +0x3876C000U, +0x3876E000U, +0x38770000U, +0x38772000U, +0x38774000U, +0x38776000U, +0x38778000U, +0x3877A000U, +0x3877C000U, +0x3877E000U, +0x38780000U, +0x38782000U, +0x38784000U, +0x38786000U, +0x38788000U, +0x3878A000U, +0x3878C000U, +0x3878E000U, +0x38790000U, +0x38792000U, +0x38794000U, +0x38796000U, +0x38798000U, +0x3879A000U, +0x3879C000U, +0x3879E000U, +0x387A0000U, +0x387A2000U, +0x387A4000U, +0x387A6000U, +0x387A8000U, +0x387AA000U, +0x387AC000U, +0x387AE000U, +0x387B0000U, +0x387B2000U, +0x387B4000U, +0x387B6000U, +0x387B8000U, +0x387BA000U, +0x387BC000U, +0x387BE000U, +0x387C0000U, +0x387C2000U, +0x387C4000U, +0x387C6000U, +0x387C8000U, +0x387CA000U, +0x387CC000U, +0x387CE000U, +0x387D0000U, +0x387D2000U, +0x387D4000U, +0x387D6000U, +0x387D8000U, +0x387DA000U, +0x387DC000U, +0x387DE000U, +0x387E0000U, +0x387E2000U, +0x387E4000U, +0x387E6000U, +0x387E8000U, +0x387EA000U, +0x387EC000U, +0x387EE000U, +0x387F0000U, +0x387F2000U, +0x387F4000U, +0x387F6000U, +0x387F8000U, +0x387FA000U, +0x387FC000U, +0x387FE000U, +}; + +const quint32 qfloat16::exponenttable[64] = { +0, +0x800000U, +0x1000000U, +0x1800000U, +0x2000000U, +0x2800000U, +0x3000000U, +0x3800000U, +0x4000000U, +0x4800000U, +0x5000000U, +0x5800000U, +0x6000000U, +0x6800000U, +0x7000000U, +0x7800000U, +0x8000000U, +0x8800000U, +0x9000000U, +0x9800000U, +0xA000000U, +0xA800000U, +0xB000000U, +0xB800000U, +0xC000000U, +0xC800000U, +0xD000000U, +0xD800000U, +0xE000000U, +0xE800000U, +0xF000000U, +0x47800000U, +0x80000000U, +0x80800000U, +0x81000000U, +0x81800000U, +0x82000000U, +0x82800000U, +0x83000000U, +0x83800000U, +0x84000000U, +0x84800000U, +0x85000000U, +0x85800000U, +0x86000000U, +0x86800000U, +0x87000000U, +0x87800000U, +0x88000000U, +0x88800000U, +0x89000000U, +0x89800000U, +0x8A000000U, +0x8A800000U, +0x8B000000U, +0x8B800000U, +0x8C000000U, +0x8C800000U, +0x8D000000U, +0x8D800000U, +0x8E000000U, +0x8E800000U, +0x8F000000U, +0xC7800000U, +}; + +const quint32 qfloat16::offsettable[64] = { +0, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +0, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +1024U, +}; + +const quint32 qfloat16::basetable[512] = { +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x0U, +0x1U, +0x2U, +0x4U, +0x8U, +0x10U, +0x20U, +0x40U, +0x80U, +0x100U, +0x200U, +0x400U, +0x800U, +0xC00U, +0x1000U, +0x1400U, +0x1800U, +0x1C00U, +0x2000U, +0x2400U, +0x2800U, +0x2C00U, +0x3000U, +0x3400U, +0x3800U, +0x3C00U, +0x4000U, +0x4400U, +0x4800U, +0x4C00U, +0x5000U, +0x5400U, +0x5800U, +0x5C00U, +0x6000U, +0x6400U, +0x6800U, +0x6C00U, +0x7000U, +0x7400U, +0x7800U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x7C00U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8000U, +0x8001U, +0x8002U, +0x8004U, +0x8008U, +0x8010U, +0x8020U, +0x8040U, +0x8080U, +0x8100U, +0x8200U, +0x8400U, +0x8800U, +0x8C00U, +0x9000U, +0x9400U, +0x9800U, +0x9C00U, +0xA000U, +0xA400U, +0xA800U, +0xAC00U, +0xB000U, +0xB400U, +0xB800U, +0xBC00U, +0xC000U, +0xC400U, +0xC800U, +0xCC00U, +0xD000U, +0xD400U, +0xD800U, +0xDC00U, +0xE000U, +0xE400U, +0xE800U, +0xEC00U, +0xF000U, +0xF400U, +0xF800U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +0xFC00U, +}; + +const quint32 qfloat16::shifttable[512] = { +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x17U, +0x16U, +0x15U, +0x14U, +0x13U, +0x12U, +0x11U, +0x10U, +0xFU, +0xEU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0xDU, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x17U, +0x16U, +0x15U, +0x14U, +0x13U, +0x12U, +0x11U, +0x10U, +0xFU, +0xEU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0xDU, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0x18U, +0xDU, +}; + +#endif // !__F16C__ && !__ARM_FP16_FORMAT_IEEE + +QT_END_NAMESPACE diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 555b04dcd5..a8ed8ca6fd 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -525,6 +525,31 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value)); made private. In that case, no error would be reported, but your application would probably crash when you called a member function of \c{w}. + + \sa Q_DISABLE_COPY_MOVE, Q_DISABLE_MOVE +*/ + +/*! + \macro Q_DISABLE_MOVE(Class) + \relates QObject + + Disables the use of move constructors and move assignment operators + for the given \a Class. + + \sa Q_DISABLE_COPY, Q_DISABLE_COPY_MOVE + \since 5.13 +*/ + +/*! + \macro Q_DISABLE_COPY_MOVE(Class) + \relates QObject + + A convenience macro that disables the use of copy constructors, assignment + operators, move constructors and move assignment operators for the given + \a Class, combining Q_DISABLE_COPY and Q_DISABLE_MOVE. + + \sa Q_DISABLE_COPY, Q_DISABLE_MOVE + \since 5.13 */ /*! @@ -1122,12 +1147,12 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value)); \sa QT_VERSION_STR, QLibraryInfo::version() */ -const char *qVersion() Q_DECL_NOTHROW +const char *qVersion() noexcept { return QT_VERSION_STR; } -bool qSharedBuild() Q_DECL_NOTHROW +bool qSharedBuild() noexcept { #ifdef QT_SHARED return true; @@ -1528,6 +1553,13 @@ bool qSharedBuild() Q_DECL_NOTHROW */ /*! + \macro Q_OS_WASM + \relates <QtGlobal> + + Defined on Web Assembly. +*/ + +/*! \macro Q_CC_SYM \relates <QtGlobal> @@ -1866,6 +1898,42 @@ bool qSharedBuild() Q_DECL_NOTHROW */ /*! + \macro Q_PROCESSOR_RISCV + \relates <QtGlobal> + \since 5.13 + + Defined if the application is compiled for RISC-V processors. Qt currently + supports two RISC-V variants: \l Q_PROCESSOR_RISCV_32 and \l + Q_PROCESSOR_RISCV_64. + + \sa QSysInfo::buildCpuArchitecture() +*/ + +/*! + \macro Q_PROCESSOR_RISCV_32 + \relates <QtGlobal> + \since 5.13 + + Defined if the application is compiled for 32-bit RISC-V processors. The \l + Q_PROCESSOR_RISCV macro is also defined when Q_PROCESSOR_RISCV_32 is + defined. + + \sa QSysInfo::buildCpuArchitecture() +*/ + +/*! + \macro Q_PROCESSOR_RISCV_64 + \relates <QtGlobal> + \since 5.13 + + Defined if the application is compiled for 64-bit RISC-V processors. The \l + Q_PROCESSOR_RISCV macro is also defined when Q_PROCESSOR_RISCV_64 is + defined. + + \sa QSysInfo::buildCpuArchitecture() +*/ + +/*! \macro Q_PROCESSOR_S390 \relates <QtGlobal> @@ -1961,11 +2029,11 @@ bool qSharedBuild() Q_DECL_NOTHROW a specified version of Qt or any earlier version. The default version number is 5.0, meaning that functions deprecated in or before Qt 5.0 will not be included. - Examples: - When using a future release of Qt 5, set QT_DISABLE_DEPRECATED_BEFORE=0x050100 to - disable functions deprecated in Qt 5.1 and earlier. In any release, set - QT_DISABLE_DEPRECATED_BEFORE=0x000000 to enable any functions, including the ones - deprecated in Qt 5.0 + For instance, when using a future release of Qt 5, set + \c{QT_DISABLE_DEPRECATED_BEFORE=0x050100} to disable functions deprecated in + Qt 5.1 and earlier. In any release, set + \c{QT_DISABLE_DEPRECATED_BEFORE=0x000000} to enable all functions, including + the ones deprecated in Qt 5.0. \sa QT_DEPRECATED_WARNINGS */ @@ -1975,12 +2043,24 @@ bool qSharedBuild() Q_DECL_NOTHROW \macro QT_DEPRECATED_WARNINGS \relates <QtGlobal> - If this macro is defined, the compiler will generate warnings if API declared as + Since Qt 5.13, this macro has no effect. In Qt 5.12 and before, if this macro + is defined, the compiler will generate warnings if any API declared as deprecated by Qt is used. - \sa QT_DISABLE_DEPRECATED_BEFORE + \sa QT_DISABLE_DEPRECATED_BEFORE, QT_NO_DEPRECATED_WARNINGS */ +/*! + \macro QT_NO_DEPRECATED_WARNINGS + \relates <QtGlobal> + \since 5.13 + + This macro can be used to suppress deprecation warnings that would otherwise + be generated when using deprecated APIs. + + \sa QT_DISABLE_DEPRECATED_BEFORE +*/ + #if defined(QT_BUILD_QMAKE) // needed to bootstrap qmake static const unsigned int qt_one = 1; @@ -2151,11 +2231,20 @@ struct QUnixOSVersion static QString unquote(const char *begin, const char *end) { + // man os-release says: + // Variable assignment values must be enclosed in double + // or single quotes if they include spaces, semicolons or + // other special characters outside of A–Z, a–z, 0–9. Shell + // special characters ("$", quotes, backslash, backtick) + // must be escaped with backslashes, following shell style. + // All strings should be in UTF-8 format, and non-printable + // characters should not be used. It is not supported to + // concatenate multiple individually quoted strings. if (*begin == '"') { Q_ASSERT(end[-1] == '"'); - return QString::fromLatin1(begin + 1, end - begin - 2); + return QString::fromUtf8(begin + 1, end - begin - 2); } - return QString::fromLatin1(begin, end - begin); + return QString::fromUtf8(begin, end - begin); } static QByteArray getEtcFileContent(const char *filename) { @@ -2863,6 +2952,7 @@ QString QSysInfo::machineHostName() struct utsname u; if (uname(&u) == 0) return QString::fromLocal8Bit(u.nodename); + return QString(); #else # ifdef Q_OS_WIN // Important: QtNetwork depends on machineHostName() initializing ws2_32.dll @@ -2875,7 +2965,6 @@ QString QSysInfo::machineHostName() hostName[sizeof(hostName) - 1] = '\0'; return QString::fromLocal8Bit(hostName); #endif - return QString(); } #endif // QT_BOOTSTRAPPED @@ -3167,7 +3256,7 @@ QByteArray QSysInfo::bootUniqueId() The Q_CHECK_PTR macro calls this function if an allocation check fails. */ -void qt_check_pointer(const char *n, int l) Q_DECL_NOTHROW +void qt_check_pointer(const char *n, int l) noexcept { // make separate printing calls so that the first one may flush; // the second one could want to allocate memory (fputs prints a @@ -3194,7 +3283,7 @@ void qBadAlloc() Allows you to call std::terminate() without including <exception>. Called internally from QT_TERMINATE_ON_EXCEPTION */ -Q_NORETURN void qTerminate() Q_DECL_NOTHROW +Q_NORETURN void qTerminate() noexcept { std::terminate(); } @@ -3203,7 +3292,7 @@ Q_NORETURN void qTerminate() Q_DECL_NOTHROW /* The Q_ASSERT macro calls this function when the test fails. */ -void qt_assert(const char *assertion, const char *file, int line) Q_DECL_NOTHROW +void qt_assert(const char *assertion, const char *file, int line) noexcept { QMessageLogger(file, line, nullptr).fatal("ASSERT: \"%s\" in file %s, line %d", assertion, file, line); } @@ -3211,7 +3300,7 @@ void qt_assert(const char *assertion, const char *file, int line) Q_DECL_NOTHROW /* The Q_ASSERT_X macro calls this function when the test fails. */ -void qt_assert_x(const char *where, const char *what, const char *file, int line) Q_DECL_NOTHROW +void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept { QMessageLogger(file, line, nullptr).fatal("ASSERT failure in %s: \"%s\", file %s, line %d", where, what, file, line); } @@ -3252,6 +3341,34 @@ void *qMemSet(void *dest, int c, size_t n) { return memset(dest, c, n); } // add thread-safety for the Qt wrappers. static QBasicMutex environmentMutex; +/* + Wraps tzset(), which accesses the environment, so should only be called while + we hold the lock on the environment mutex. +*/ +void qTzSet() +{ + QMutexLocker locker(&environmentMutex); +#if defined(Q_OS_WIN) + _tzset(); +#else + tzset(); +#endif // Q_OS_WIN +} + +/* + Wrap mktime(), which is specified to behave as if it called tzset(), hence + shares its implicit environment-dependence. +*/ +time_t qMkTime(struct tm *when) +{ + QMutexLocker locker(&environmentMutex); + return mktime(when); +} + +// Also specified to behave as if they call tzset(): +// localtime() -- but not localtime_r(), which we use when threaded +// strftime() -- not used (except in tests) + /*! \relates <QtGlobal> \threadsafe @@ -3390,7 +3507,7 @@ QString qEnvironmentVariable(const char *varName) \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsSet() */ -bool qEnvironmentVariableIsEmpty(const char *varName) Q_DECL_NOEXCEPT +bool qEnvironmentVariableIsEmpty(const char *varName) noexcept { QMutexLocker locker(&environmentMutex); #ifdef Q_CC_MSVC @@ -3425,7 +3542,7 @@ bool qEnvironmentVariableIsEmpty(const char *varName) Q_DECL_NOEXCEPT \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsSet() */ -int qEnvironmentVariableIntValue(const char *varName, bool *ok) Q_DECL_NOEXCEPT +int qEnvironmentVariableIntValue(const char *varName, bool *ok) noexcept { static const int NumBinaryDigitsPerOctalDigit = 3; static const int MaxDigitsForOctalInt = @@ -3494,7 +3611,7 @@ int qEnvironmentVariableIntValue(const char *varName, bool *ok) Q_DECL_NOEXCEPT \sa qgetenv(), qEnvironmentVariable(), qEnvironmentVariableIsEmpty() */ -bool qEnvironmentVariableIsSet(const char *varName) Q_DECL_NOEXCEPT +bool qEnvironmentVariableIsSet(const char *varName) noexcept { QMutexLocker locker(&environmentMutex); #ifdef Q_CC_MSVC @@ -3502,7 +3619,7 @@ bool qEnvironmentVariableIsSet(const char *varName) Q_DECL_NOEXCEPT (void)getenv_s(&requiredSize, 0, 0, varName); return requiredSize != 0; #else - return ::getenv(varName) != 0; + return ::getenv(varName) != nullptr; #endif } @@ -3696,6 +3813,56 @@ bool qunsetenv(const char *varName) */ /*! + \fn template <typename T, typename U = T> T qExchange(T &obj, U &&newValue) + \relates <QtGlobal> + \since 5.14 + + Replaces the value of \a obj with \a newValue and returns the old value of \a obj. + + This is Qt's implementation of std::exchange(). It differs from std::exchange() + only in that it is \c constexpr already in C++14, and available on all supported + compilers. + + Here is how to use qExchange() to implement move constructors: + \code + MyClass(MyClass &&other) + : m_pointer{qExchange(other.m_pointer, nullptr)}, + m_int{qExchange(other.m_int, 0)}, + m_vector{std::move(other.m_vector)}, + ... + \endcode + + For members of class type, we can use std::move(), as their move-constructor will + do the right thing. But for scalar types such as raw pointers or integer type, move + is the same as copy, which, particularly for pointers, is not what we expect. So, we + cannot use std::move() for such types, but we can use std::exchange()/qExchange() to + make sure the source object's member is already reset by the time we get to the + initialization of our next data member, which might come in handy if the constructor + exits with an exception. + + Here is how to use qExchange() to write a loop that consumes the collection it + iterates over: + \code + for (auto &e : qExchange(collection, {}) + doSomethingWith(e); + \endcode + + Which is equivalent to the following, much more verbose code: + \code + { + auto tmp = std::move(collection); + collection = {}; // or collection.clear() + for (auto &e : tmp) + doSomethingWith(e); + } // destroys 'tmp' + \endcode + + This is perfectly safe, as the for-loop keeps the result of qExchange() alive for as + long as the loop runs, saving the declaration of a temporary variable. Be aware, though, + that qExchange() returns a non-const object, so Qt containers may detach. +*/ + +/*! \macro QT_TR_NOOP(sourceText) \relates <QtGlobal> @@ -4050,6 +4217,13 @@ bool qunsetenv(const char *varName) Example of a movable type: \snippet code/src_corelib_global_qglobal.cpp 39 + + Qt will try to detect the class of a type using std::is_trivial or + std::is_trivially_copyable. Use this macro to tune the behavior. + For instance many types would be candidates for Q_MOVABLE_TYPE despite + not being trivially-copyable. For binary compatibility reasons, QList + optimizations are only enabled if there is an explicit + Q_DECLARE_TYPEINFO even for trivially-copyable types. */ /*! diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index ccab228804..15f4621cc0 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -287,7 +287,7 @@ typedef double qreal; # undef QT_DEPRECATED_X # undef QT_DEPRECATED_VARIABLE # undef QT_DEPRECATED_CONSTRUCTOR -#elif defined(QT_DEPRECATED_WARNINGS) +#elif !defined(QT_NO_DEPRECATED_WARNINGS) # undef QT_DEPRECATED # define QT_DEPRECATED Q_DECL_DEPRECATED # undef QT_DEPRECATED_X @@ -307,6 +307,14 @@ typedef double qreal; # define QT_DEPRECATED_CONSTRUCTOR #endif +#ifndef QT_DEPRECATED_WARNINGS_SINCE +# ifdef QT_DISABLE_DEPRECATED_BEFORE +# define QT_DEPRECATED_WARNINGS_SINCE QT_DISABLE_DEPRECATED_BEFORE +# else +# define QT_DEPRECATED_WARNINGS_SINCE QT_VERSION +# endif +#endif + #ifndef QT_DISABLE_DEPRECATED_BEFORE #define QT_DISABLE_DEPRECATED_BEFORE QT_VERSION_CHECK(5, 0, 0) #endif @@ -330,6 +338,51 @@ typedef double qreal; #endif /* + QT_DEPRECATED_VERSION(major, minor) and QT_DEPRECATED_VERSION_X(major, minor, text) + outputs a deprecation warning if QT_DEPRECATED_WARNINGS_SINCE is equal or greater + than the version specified as major, minor. This makes it possible to deprecate a + function without annoying a user who needs to stick at a specified minimum version + and therefore can't use the new function. +*/ +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 12, 0) +# define QT_DEPRECATED_VERSION_X_5_12(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_5_12 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_5_12(text) +# define QT_DEPRECATED_VERSION_5_12 +#endif + +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 13, 0) +# define QT_DEPRECATED_VERSION_X_5_13(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_5_13 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_5_13(text) +# define QT_DEPRECATED_VERSION_5_13 +#endif + +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 14, 0) +# define QT_DEPRECATED_VERSION_X_5_14(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_5_14 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_5_14(text) +# define QT_DEPRECATED_VERSION_5_14 +#endif + +#if QT_DEPRECATED_WARNINGS_SINCE >= QT_VERSION_CHECK(5, 15, 0) +# define QT_DEPRECATED_VERSION_X_5_15(text) QT_DEPRECATED_X(text) +# define QT_DEPRECATED_VERSION_5_15 QT_DEPRECATED +#else +# define QT_DEPRECATED_VERSION_X_5_15(text) +# define QT_DEPRECATED_VERSION_5_15 +#endif + +#define QT_DEPRECATED_VERSION_X_5(minor, text) QT_DEPRECATED_VERSION_X_5_##minor(text) +#define QT_DEPRECATED_VERSION_X(major, minor, text) QT_DEPRECATED_VERSION_X_##major(minor, text) + +#define QT_DEPRECATED_VERSION_5(minor) QT_DEPRECATED_VERSION_5_##minor +#define QT_DEPRECATED_VERSION(major, minor) QT_DEPRECATED_VERSION_##major(minor) + +/* The Qt modules' export macros. The options are: - defined(QT_STATIC): Qt was built or is being built in static mode @@ -369,8 +422,16 @@ typedef double qreal; operator to disable copying (the compiler gives an error message). */ #define Q_DISABLE_COPY(Class) \ - Class(const Class &) Q_DECL_EQ_DELETE;\ - Class &operator=(const Class &) Q_DECL_EQ_DELETE; + Class(const Class &) = delete;\ + Class &operator=(const Class &) = delete; + +#define Q_DISABLE_MOVE(Class) \ + Class(Class &&) = delete; \ + Class &operator=(Class &&) = delete; + +#define Q_DISABLE_COPY_MOVE(Class) \ + Q_DISABLE_COPY(Class) \ + Q_DISABLE_MOVE(Class) /* No, this is not an evil backdoor. QT_BUILD_INTERNAL just exports more symbols @@ -403,7 +464,7 @@ typedef double qreal; #if !defined(QT_NAMESPACE) && defined(__cplusplus) && !defined(Q_QDOC) extern "C" #endif -Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOTHROW; +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION const char *qVersion(void) Q_DECL_NOEXCEPT; #if defined(__cplusplus) @@ -448,11 +509,8 @@ namespace QtPrivate { template <class T> struct AlignOf : AlignOf_Default<T> { }; template <class T> struct AlignOf<T &> : AlignOf<T> {}; - template <size_t N, class T> struct AlignOf<T[N]> : AlignOf<T> {}; - -#ifdef Q_COMPILER_RVALUE_REFS template <class T> struct AlignOf<T &&> : AlignOf<T> {}; -#endif + template <size_t N, class T> struct AlignOf<T[N]> : AlignOf<T> {}; #if defined(Q_PROCESSOR_X86_32) && !defined(Q_OS_WIN) template <class T> struct AlignOf_WorkaroundForI386Abi { enum { Value = sizeof(T) }; }; @@ -591,11 +649,11 @@ Q_DECL_CONSTEXPR inline qint64 qRound64(float d) { return d >= 0.0f ? qint64(d + 0.5f) : qint64(d - float(qint64(d-1)) + 0.5f) + qint64(d-1); } template <typename T> -Q_DECL_CONSTEXPR inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; } +constexpr inline const T &qMin(const T &a, const T &b) { return (a < b) ? a : b; } template <typename T> -Q_DECL_CONSTEXPR inline const T &qMax(const T &a, const T &b) { return (a < b) ? b : a; } +constexpr inline const T &qMax(const T &a, const T &b) { return (a < b) ? b : a; } template <typename T> -Q_DECL_CONSTEXPR inline const T &qBound(const T &min, const T &val, const T &max) +constexpr inline const T &qBound(const T &min, const T &val, const T &max) { return qMax(min, qMin(max, val)); } #ifndef Q_FORWARD_DECLARE_OBJC_CLASS @@ -722,7 +780,7 @@ inline void qt_noop(void) {} # define QT_CATCH(A) catch (A) # define QT_THROW(A) throw A # define QT_RETHROW throw -Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() Q_DECL_NOTHROW; +Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() noexcept; # ifdef Q_COMPILER_NOEXCEPT # define QT_TERMINATE_ON_EXCEPTION(expr) do { expr; } while (false) # else @@ -730,7 +788,7 @@ Q_NORETURN Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qTerminate() Q_DECL_NOTHROW; # endif #endif -Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() Q_DECL_NOTHROW; +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qSharedBuild() noexcept; #ifndef Q_OUTOFLINE_TEMPLATE # define Q_OUTOFLINE_TEMPLATE @@ -773,7 +831,7 @@ Q_CORE_EXPORT QString qt_error_string(int errorCode = -1); Q_NORETURN #endif Q_DECL_COLD_FUNCTION -Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line) Q_DECL_NOTHROW; +Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line) noexcept; #if !defined(Q_ASSERT) # if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) @@ -791,7 +849,7 @@ Q_CORE_EXPORT void qt_assert(const char *assertion, const char *file, int line) Q_NORETURN #endif Q_DECL_COLD_FUNCTION -Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *file, int line) Q_DECL_NOTHROW; +Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char *file, int line) noexcept; #if !defined(Q_ASSERT_X) # if defined(QT_NO_DEBUG) && !defined(QT_FORCE_ASSERTS) @@ -801,7 +859,7 @@ Q_CORE_EXPORT void qt_assert_x(const char *where, const char *what, const char * # endif #endif -Q_NORETURN Q_CORE_EXPORT void qt_check_pointer(const char *, int) Q_DECL_NOTHROW; +Q_NORETURN Q_CORE_EXPORT void qt_check_pointer(const char *, int) noexcept; Q_DECL_COLD_FUNCTION Q_CORE_EXPORT void qBadAlloc(); @@ -844,38 +902,23 @@ Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED bool qFuzzyIsNul return qAbs(f) <= 0.00001f; } -/* - This function tests a double for a null value. It doesn't - check whether the actual value is 0 or close to 0, but whether - it is binary 0, disregarding sign. -*/ -Q_REQUIRED_RESULT static inline Q_DECL_UNUSED bool qIsNull(double d) +QT_WARNING_PUSH +QT_WARNING_DISABLE_CLANG("-Wfloat-equal") +QT_WARNING_DISABLE_GCC("-Wfloat-equal") +QT_WARNING_DISABLE_INTEL(1572) + +Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED bool qIsNull(double d) noexcept { - union U { - double d; - quint64 u; - }; - U val; - val.d = d; - return (val.u & Q_UINT64_C(0x7fffffffffffffff)) == 0; + return d == 0.0; } -/* - This function tests a float for a null value. It doesn't - check whether the actual value is 0 or close to 0, but whether - it is binary 0, disregarding sign. -*/ -Q_REQUIRED_RESULT static inline Q_DECL_UNUSED bool qIsNull(float f) +Q_REQUIRED_RESULT Q_DECL_CONSTEXPR static inline Q_DECL_UNUSED bool qIsNull(float f) noexcept { - union U { - float f; - quint32 u; - }; - U val; - val.f = f; - return (val.u & 0x7fffffff) == 0; + return f == 0.0f; } +QT_WARNING_POP + /* Compilers which follow outdated template instantiation rules require a class to have a comparison operator to exist when @@ -902,14 +945,14 @@ namespace SwapExceptionTester { // insulate users from the "using std::swap" bel using std::swap; // import std::swap template <typename T> void checkSwap(T &t) - Q_DECL_NOEXCEPT_EXPR(noexcept(swap(t, t))); + noexcept(noexcept(swap(t, t))); // declared, but not implemented (only to be used in unevaluated contexts (noexcept operator)) } } // namespace QtPrivate template <typename T> inline void qSwap(T &value1, T &value2) - Q_DECL_NOEXCEPT_EXPR(noexcept(QtPrivate::SwapExceptionTester::checkSwap(value1))) + noexcept(noexcept(QtPrivate::SwapExceptionTester::checkSwap(value1))) { using std::swap; swap(value1, value2); @@ -960,10 +1003,19 @@ QT_WARNING_DISABLE_MSVC(4530) /* C++ exception handler used, but unwind semantic // this adds const to non-const objects (like std::as_const) template <typename T> -Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) Q_DECL_NOTHROW { return t; } +Q_DECL_CONSTEXPR typename std::add_const<T>::type &qAsConst(T &t) noexcept { return t; } // prevent rvalue arguments: template <typename T> -void qAsConst(const T &&) Q_DECL_EQ_DELETE; +void qAsConst(const T &&) = delete; + +// like std::exchange +template <typename T, typename U = T> +Q_DECL_RELAXED_CONSTEXPR T qExchange(T &t, U &&newValue) +{ + T old = std::move(t); + t = std::forward<U>(newValue); + return old; +} #ifndef QT_NO_FOREACH @@ -1005,6 +1057,15 @@ QForeachContainer<typename std::decay<T>::type> qMakeForeachContainer(T &&t) } } + +#if __cplusplus >= 201703L +// Use C++17 if statement with initializer. User's code ends up in a else so +// scoping of different ifs is not broken +#define Q_FOREACH(variable, container) \ +for (auto _container_ = QtPrivate::qMakeForeachContainer(container); \ + _container_.i != _container_.e; ++_container_.i) \ + if (variable = *_container_.i; false) {} else +#else // Explanation of the control word: // - it's initialized to 1 // - that means both the inner and outer loops start @@ -1019,7 +1080,7 @@ for (auto _container_ = QtPrivate::qMakeForeachContainer(container); \ _container_.control && _container_.i != _container_.e; \ ++_container_.i, _container_.control ^= 1) \ for (variable = *_container_.i; _container_.control; _container_.control = 0) - +#endif #endif // QT_NO_FOREACH #define Q_FOREVER for(;;) @@ -1035,7 +1096,7 @@ for (auto _container_ = QtPrivate::qMakeForeachContainer(container); \ #endif template <typename T> inline T *qGetPtrHelper(T *ptr) { return ptr; } -template <typename Ptr> inline auto qGetPtrHelper(const Ptr &ptr) -> decltype(ptr.operator->()) { return ptr.operator->(); } +template <typename Ptr> inline auto qGetPtrHelper(Ptr &ptr) -> decltype(ptr.operator->()) { return ptr.operator->(); } // The body must be a statement: #define Q_CAST_IGNORE_ALIGN(body) QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wcast-align") body QT_WARNING_POP @@ -1113,11 +1174,11 @@ template <typename... Args> struct QNonConstOverload { template <typename R, typename T> - Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr) + Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...)) const noexcept -> decltype(ptr) { return ptr; } template <typename R, typename T> - static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr) + static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...)) noexcept -> decltype(ptr) { return ptr; } }; @@ -1125,11 +1186,11 @@ template <typename... Args> struct QConstOverload { template <typename R, typename T> - Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const Q_DECL_NOTHROW -> decltype(ptr) + Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args...) const) const noexcept -> decltype(ptr) { return ptr; } template <typename R, typename T> - static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) Q_DECL_NOTHROW -> decltype(ptr) + static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args...) const) noexcept -> decltype(ptr) { return ptr; } }; @@ -1142,11 +1203,11 @@ struct QOverload : QConstOverload<Args...>, QNonConstOverload<Args...> using QNonConstOverload<Args...>::operator(); template <typename R> - Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const Q_DECL_NOTHROW -> decltype(ptr) + Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args...)) const noexcept -> decltype(ptr) { return ptr; } template <typename R> - static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) Q_DECL_NOTHROW -> decltype(ptr) + static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args...)) noexcept -> decltype(ptr) { return ptr; } }; @@ -1167,9 +1228,9 @@ Q_CORE_EXPORT QString qEnvironmentVariable(const char *varName, const QString &d Q_CORE_EXPORT bool qputenv(const char *varName, const QByteArray& value); Q_CORE_EXPORT bool qunsetenv(const char *varName); -Q_CORE_EXPORT bool qEnvironmentVariableIsEmpty(const char *varName) Q_DECL_NOEXCEPT; -Q_CORE_EXPORT bool qEnvironmentVariableIsSet(const char *varName) Q_DECL_NOEXCEPT; -Q_CORE_EXPORT int qEnvironmentVariableIntValue(const char *varName, bool *ok=nullptr) Q_DECL_NOEXCEPT; +Q_CORE_EXPORT bool qEnvironmentVariableIsEmpty(const char *varName) noexcept; +Q_CORE_EXPORT bool qEnvironmentVariableIsSet(const char *varName) noexcept; +Q_CORE_EXPORT int qEnvironmentVariableIntValue(const char *varName, bool *ok=nullptr) noexcept; inline int qIntCast(double f) { return int(f); } inline int qIntCast(float f) { return int(f); } @@ -1192,9 +1253,6 @@ namespace QtPrivate { //like std::enable_if template <bool B, typename T = void> struct QEnableIf; template <typename T> struct QEnableIf<true, T> { typedef T Type; }; - -template <bool B, typename T, typename F> struct QConditional { typedef T Type; }; -template <typename T, typename F> struct QConditional<false, T, F> { typedef F Type; }; } QT_END_NAMESPACE diff --git a/src/corelib/global/qglobal_p.h b/src/corelib/global/qglobal_p.h index 0f092e9006..58bc8b7bf3 100644 --- a/src/corelib/global/qglobal_p.h +++ b/src/corelib/global/qglobal_p.h @@ -61,6 +61,19 @@ #endif #if defined(__cplusplus) +#ifdef Q_CC_MINGW +# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r() +#endif +#include <time.h> + +QT_BEGIN_NAMESPACE + +// These behave as if they consult the environment, so need to share its locking: +Q_CORE_EXPORT void qTzSet(); +Q_CORE_EXPORT time_t qMkTime(struct tm *when); + +QT_END_NAMESPACE + #if !QT_HAS_BUILTIN(__builtin_available) #include <initializer_list> #include <QtCore/qoperatingsystemversion.h> diff --git a/src/corelib/global/qglobalstatic.h b/src/corelib/global/qglobalstatic.h index 555bdf04c1..7a7d65ed76 100644 --- a/src/corelib/global/qglobalstatic.h +++ b/src/corelib/global/qglobalstatic.h @@ -79,16 +79,16 @@ enum GuardValues { Q_GLOBAL_STATIC_INTERNAL_DECORATION Type *innerFunction() \ { \ struct HolderBase { \ - ~HolderBase() Q_DECL_NOTHROW \ - { if (guard.load() == QtGlobalStatic::Initialized) \ - guard.store(QtGlobalStatic::Destroyed); } \ + ~HolderBase() noexcept \ + { if (guard.loadRelaxed() == QtGlobalStatic::Initialized) \ + guard.storeRelaxed(QtGlobalStatic::Destroyed); } \ }; \ static struct Holder : public HolderBase { \ Type value; \ Holder() \ - Q_DECL_NOEXCEPT_EXPR(noexcept(Type ARGS)) \ + noexcept(noexcept(Type ARGS)) \ : value ARGS \ - { guard.store(QtGlobalStatic::Initialized); } \ + { guard.storeRelaxed(QtGlobalStatic::Initialized); } \ } holder; \ return &holder.value; \ } @@ -108,12 +108,12 @@ QT_BEGIN_NAMESPACE int x = guard.loadAcquire(); \ if (Q_UNLIKELY(x >= QtGlobalStatic::Uninitialized)) { \ QMutexLocker locker(&mutex); \ - if (guard.load() == QtGlobalStatic::Uninitialized) { \ + if (guard.loadRelaxed() == QtGlobalStatic::Uninitialized) { \ d = new Type ARGS; \ static struct Cleanup { \ ~Cleanup() { \ delete d; \ - guard.store(QtGlobalStatic::Destroyed); \ + guard.storeRelaxed(QtGlobalStatic::Destroyed); \ } \ } cleanup; \ guard.storeRelease(QtGlobalStatic::Initialized); \ @@ -129,10 +129,10 @@ struct QGlobalStatic { typedef T Type; - bool isDestroyed() const { return guard.load() <= QtGlobalStatic::Destroyed; } - bool exists() const { return guard.load() == QtGlobalStatic::Initialized; } - operator Type *() { if (isDestroyed()) return 0; return innerFunction(); } - Type *operator()() { if (isDestroyed()) return 0; return innerFunction(); } + bool isDestroyed() const { return guard.loadRelaxed() <= QtGlobalStatic::Destroyed; } + bool exists() const { return guard.loadRelaxed() == QtGlobalStatic::Initialized; } + operator Type *() { if (isDestroyed()) return nullptr; return innerFunction(); } + Type *operator()() { if (isDestroyed()) return nullptr; return innerFunction(); } Type *operator->() { Q_ASSERT_X(!isDestroyed(), "Q_GLOBAL_STATIC", "The global static was used after being destroyed"); diff --git a/src/corelib/global/qhooks.cpp b/src/corelib/global/qhooks.cpp index bbddb1cbf1..020dee3710 100644 --- a/src/corelib/global/qhooks.cpp +++ b/src/corelib/global/qhooks.cpp @@ -67,7 +67,7 @@ quintptr Q_CORE_EXPORT qtHookData[] = { // The required sizes and offsets are tested in tests/auto/other/toolsupport. // When this fails and the change was intentional, adjust the test and // adjust this value here. - 16 + 17 }; Q_STATIC_ASSERT(QHooks::LastHookIndex == sizeof(qtHookData) / sizeof(qtHookData[0])); diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index d19e54154e..e82939dcd9 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -350,7 +350,7 @@ QLibraryInfo::buildDate() \since 5.3 */ -const char *QLibraryInfo::build() Q_DECL_NOTHROW +const char *QLibraryInfo::build() noexcept { return QT_BUILD_STR; } @@ -377,7 +377,7 @@ QLibraryInfo::isDebugBuild() \sa qVersion() */ -QVersionNumber QLibraryInfo::version() Q_DECL_NOTHROW +QVersionNumber QLibraryInfo::version() noexcept { return QVersionNumber(QT_VERSION_MAJOR, QT_VERSION_MINOR, QT_VERSION_PATCH); } @@ -726,11 +726,6 @@ void qt_core_boilerplate() QT_PREPEND_NAMESPACE(qDumpCPUFeatures)(); -#ifdef QT_EVAL - extern void qt_core_eval_init(QCoreApplicationPrivate::Type); - qt_core_eval_init(QCoreApplicationPrivate::Tty); -#endif - exit(0); } diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index 9414af9b7d..ed60b170a5 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -62,12 +62,12 @@ public: #endif // QT_DEPRECATED_SINCE(5, 5) #endif // datestring - static const char * build() Q_DECL_NOTHROW; + static const char * build() noexcept; static bool isDebugBuild(); #ifndef QT_BOOTSTRAPPED - static QVersionNumber version() Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static QVersionNumber version() noexcept Q_DECL_CONST_FUNCTION; #endif enum LibraryLocation diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 30232170fb..621b6d7d13 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -44,6 +44,7 @@ #include "qlogging_p.h" #include "qlist.h" #include "qbytearray.h" +#include "qscopeguard.h" #include "qstring.h" #include "qvarlengtharray.h" #include "qdebug.h" @@ -158,6 +159,9 @@ static QT_PREPEND_NAMESPACE(qint64) qt_gettid() #endif // !QT_BOOTSTRAPPED #include <cstdlib> +#include <algorithm> +#include <memory> +#include <vector> #include <stdio.h> @@ -194,7 +198,7 @@ static bool isFatal(QtMsgType msgType) // it's fatal if the current value is exactly 1, // otherwise decrement if it's non-zero - return fatalCriticals.load() && fatalCriticals.fetchAndAddRelaxed(-1) == 1; + return fatalCriticals.loadRelaxed() && fatalCriticals.fetchAndAddRelaxed(-1) == 1; } if (msgType == QtWarningMsg || msgType == QtCriticalMsg) { @@ -202,7 +206,7 @@ static bool isFatal(QtMsgType msgType) // it's fatal if the current value is exactly 1, // otherwise decrement if it's non-zero - return fatalWarnings.load() && fatalWarnings.fetchAndAddRelaxed(-1) == 1; + return fatalWarnings.loadRelaxed() && fatalWarnings.fetchAndAddRelaxed(-1) == 1; } return false; @@ -240,7 +244,7 @@ static bool systemHasStderr() \note Qt Creator does not implement a pseudo TTY, nor does it launch apps with the override environment variable set, but it will read stderr and print it to - the user, so in effect this function can not be used to conclude that stderr + the user, so in effect this function cannot be used to conclude that stderr output will _not_ be visible to the user, as even if this function returns false, the output might still end up visible to the user. For this reason, we don't guard the stderr output in the default message handler with stderrHasConsoleAttached(). @@ -347,7 +351,7 @@ using namespace QtPrivate; */ #if defined(Q_CC_MSVC) && defined(QT_DEBUG) && defined(_DEBUG) && defined(_CRT_ERROR) -static inline void convert_to_wchar_t_elided(wchar_t *d, size_t space, const char *s) Q_DECL_NOEXCEPT +static inline void convert_to_wchar_t_elided(wchar_t *d, size_t space, const char *s) noexcept { size_t len = qstrlen(s); if (len + 1 > space) { @@ -439,7 +443,7 @@ void QMessageLogger::debug(const QLoggingCategory &cat, const char *msg, ...) co return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -466,7 +470,7 @@ void QMessageLogger::debug(QMessageLogger::CategoryFunction catFunc, return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -489,7 +493,7 @@ QDebug QMessageLogger::debug() const { QDebug dbg = QDebug(QtDebugMsg); QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); return dbg; } @@ -506,7 +510,7 @@ QDebug QMessageLogger::debug(const QLoggingCategory &cat) const dbg.stream->message_output = false; QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); return dbg; @@ -530,7 +534,7 @@ QDebug QMessageLogger::debug(QMessageLogger::CategoryFunction catFunc) const \sa QNoDebug, qDebug() */ -QNoDebug QMessageLogger::noDebug() const Q_DECL_NOTHROW +QNoDebug QMessageLogger::noDebug() const noexcept { return QNoDebug(); } @@ -550,7 +554,7 @@ void QMessageLogger::info(const QLoggingCategory &cat, const char *msg, ...) con return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -577,7 +581,7 @@ void QMessageLogger::info(QMessageLogger::CategoryFunction catFunc, return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -601,7 +605,7 @@ QDebug QMessageLogger::info() const { QDebug dbg = QDebug(QtInfoMsg); QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); return dbg; } @@ -618,7 +622,7 @@ QDebug QMessageLogger::info(const QLoggingCategory &cat) const dbg.stream->message_output = false; QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); return dbg; @@ -668,7 +672,7 @@ void QMessageLogger::warning(const QLoggingCategory &cat, const char *msg, ...) return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -695,7 +699,7 @@ void QMessageLogger::warning(QMessageLogger::CategoryFunction catFunc, return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -717,7 +721,7 @@ QDebug QMessageLogger::warning() const { QDebug dbg = QDebug(QtWarningMsg); QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); return dbg; } @@ -733,7 +737,7 @@ QDebug QMessageLogger::warning(const QLoggingCategory &cat) const dbg.stream->message_output = false; QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); return dbg; @@ -784,7 +788,7 @@ void QMessageLogger::critical(const QLoggingCategory &cat, const char *msg, ...) return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -811,7 +815,7 @@ void QMessageLogger::critical(QMessageLogger::CategoryFunction catFunc, return; QMessageLogContext ctxt; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); va_list ap; @@ -833,7 +837,7 @@ QDebug QMessageLogger::critical() const { QDebug dbg = QDebug(QtCriticalMsg); QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); return dbg; } @@ -850,7 +854,7 @@ QDebug QMessageLogger::critical(const QLoggingCategory &cat) const dbg.stream->message_output = false; QMessageLogContext &ctxt = dbg.stream->context; - ctxt.copy(context); + ctxt.copyContextFrom(context); ctxt.category = cat.categoryName(); return dbg; @@ -876,7 +880,7 @@ QDebug QMessageLogger::critical(QMessageLogger::CategoryFunction catFunc) const \sa qFatal() */ -void QMessageLogger::fatal(const char *msg, ...) const Q_DECL_NOTHROW +void QMessageLogger::fatal(const char *msg, ...) const noexcept { QString message; @@ -1076,8 +1080,8 @@ struct QMessagePattern { void setPattern(const QString &pattern); // 0 terminated arrays of literal tokens / literal or placeholder tokens - const char **literals; - const char **tokens; + std::unique_ptr<std::unique_ptr<const char[]>[]> literals; + std::unique_ptr<const char*[]> tokens; QList<QString> timeArgs; // timeFormats in sequence of %{time #ifndef QT_BOOTSTRAPPED QElapsedTimer timer; @@ -1100,9 +1104,6 @@ Q_DECLARE_TYPEINFO(QMessagePattern::BacktraceParams, Q_MOVABLE_TYPE); QBasicMutex QMessagePattern::mutex; QMessagePattern::QMessagePattern() - : literals(0) - , tokens(0) - , fromEnvironment(false) { #ifndef QT_BOOTSTRAPPED timer.start(); @@ -1110,6 +1111,7 @@ QMessagePattern::QMessagePattern() const QString envPattern = QString::fromLocal8Bit(qgetenv("QT_MESSAGE_PATTERN")); if (envPattern.isEmpty()) { setPattern(QLatin1String(defaultPattern)); + fromEnvironment = false; } else { setPattern(envPattern); fromEnvironment = true; @@ -1117,23 +1119,10 @@ QMessagePattern::QMessagePattern() } QMessagePattern::~QMessagePattern() -{ - for (int i = 0; literals[i]; ++i) - delete [] literals[i]; - delete [] literals; - literals = 0; - delete [] tokens; - tokens = 0; -} + = default; void QMessagePattern::setPattern(const QString &pattern) { - if (literals) { - for (int i = 0; literals[i]; ++i) - delete [] literals[i]; - delete [] literals; - } - delete [] tokens; timeArgs.clear(); #ifdef QLOGGING_HAVE_BACKTRACE backtraceArgs.clear(); @@ -1171,9 +1160,9 @@ void QMessagePattern::setPattern(const QString &pattern) lexemes.append(lexeme); // tokenizer - QVarLengthArray<const char*> literalsVar; - tokens = new const char*[lexemes.size() + 1]; - tokens[lexemes.size()] = 0; + std::vector<std::unique_ptr<const char[]>> literalsVar; + tokens.reset(new const char*[lexemes.size() + 1]); + tokens[lexemes.size()] = nullptr; bool nestedIfError = false; bool inIf = false; @@ -1267,7 +1256,7 @@ void QMessagePattern::setPattern(const QString &pattern) char *literal = new char[lexeme.size() + 1]; strncpy(literal, lexeme.toLatin1().constData(), lexeme.size()); literal[lexeme.size()] = '\0'; - literalsVar.append(literal); + literalsVar.emplace_back(literal); tokens[i] = literal; } } @@ -1279,9 +1268,8 @@ void QMessagePattern::setPattern(const QString &pattern) if (!error.isEmpty()) qt_message_print(error); - literals = new const char*[literalsVar.size() + 1]; - literals[literalsVar.size()] = 0; - memcpy(literals, literalsVar.constData(), literalsVar.size() * sizeof(const char*)); + literals.reset(new std::unique_ptr<const char[]>[literalsVar.size() + 1]); + std::move(literalsVar.begin(), literalsVar.end(), &literals[0]); } #if defined(QLOGGING_HAVE_BACKTRACE) && !defined(QT_BOOTSTRAPPED) @@ -1406,7 +1394,7 @@ QString qFormatLogMessage(QtMsgType type, const QMessageLogContext &context, con #endif // we do not convert file, function, line literals to local encoding due to overhead - for (int i = 0; pattern->tokens[i] != 0; ++i) { + for (int i = 0; pattern->tokens[i]; ++i) { const char *token = pattern->tokens[i]; if (token == endifTokenC) { skip = false; @@ -1512,9 +1500,9 @@ static void qDefaultMsgHandler(QtMsgType type, const char *buf); static void qDefaultMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &buf); // pointer to QtMsgHandler debug handler (without context) -static QBasicAtomicPointer<void (QtMsgType, const char*)> msgHandler = Q_BASIC_ATOMIC_INITIALIZER(qDefaultMsgHandler); +static QBasicAtomicPointer<void (QtMsgType, const char*)> msgHandler = Q_BASIC_ATOMIC_INITIALIZER(nullptr); // pointer to QtMessageHandler debug handler (with context) -static QBasicAtomicPointer<void (QtMsgType, const QMessageLogContext &, const QString &)> messageHandler = Q_BASIC_ATOMIC_INITIALIZER(qDefaultMessageHandler); +static QBasicAtomicPointer<void (QtMsgType, const QMessageLogContext &, const QString &)> messageHandler = Q_BASIC_ATOMIC_INITIALIZER(nullptr); // ------------------------ Alternate logging sinks ------------------------- @@ -1826,14 +1814,15 @@ static void qt_message_print(QtMsgType msgType, const QMessageLogContext &contex // prevent recursion in case the message handler generates messages // itself, e.g. by using Qt API if (grabMessageHandler()) { + const auto ungrab = qScopeGuard([]{ ungrabMessageHandler(); }); + auto oldStyle = msgHandler.loadAcquire(); + auto newStye = messageHandler.loadAcquire(); // prefer new message handler over the old one - if (msgHandler.load() == qDefaultMsgHandler - || messageHandler.load() != qDefaultMessageHandler) { - (*messageHandler.load())(msgType, context, message); + if (newStye || !oldStyle) { + (newStye ? newStye : qDefaultMessageHandler)(msgType, context, message); } else { - (*msgHandler.load())(msgType, message.toLocal8Bit().constData()); + (oldStyle ? oldStyle : qDefaultMsgHandler)(msgType, message.toLocal8Bit().constData()); } - ungrabMessageHandler(); } else { fprintf(stderr, "%s\n", message.toLocal8Bit().constData()); } @@ -2084,18 +2073,20 @@ void qErrnoWarning(int code, const char *msg, ...) QtMessageHandler qInstallMessageHandler(QtMessageHandler h) { - if (!h) - h = qDefaultMessageHandler; - //set 'h' and return old message handler - return messageHandler.fetchAndStoreRelaxed(h); + const auto old = messageHandler.fetchAndStoreOrdered(h); + if (old) + return old; + else + return qDefaultMessageHandler; } QtMsgHandler qInstallMsgHandler(QtMsgHandler h) { - if (!h) - h = qDefaultMsgHandler; - //set 'h' and return old message handler - return msgHandler.fetchAndStoreRelaxed(h); + const auto old = msgHandler.fetchAndStoreOrdered(h); + if (old) + return old; + else + return qDefaultMsgHandler; } void qSetMessagePattern(const QString &pattern) @@ -2108,15 +2099,20 @@ void qSetMessagePattern(const QString &pattern) /*! - Copies context information from \a logContext into this QMessageLogContext + Copies context information from \a logContext into this QMessageLogContext. + Returns a reference to this object. + + Note that the version is \b not copied, only the context information. + \internal */ -void QMessageLogContext::copy(const QMessageLogContext &logContext) +QMessageLogContext &QMessageLogContext::copyContextFrom(const QMessageLogContext &logContext) noexcept { this->category = logContext.category; this->file = logContext.file; this->line = logContext.line; this->function = logContext.function; + return *this; } /*! diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index 16e01183bd..4a528a2973 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -63,20 +63,19 @@ class QMessageLogContext { Q_DISABLE_COPY(QMessageLogContext) public: - Q_DECL_CONSTEXPR QMessageLogContext() - : version(2), line(0), file(nullptr), function(nullptr), category(nullptr) {} - Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName, const char *categoryName) - : version(2), line(lineNumber), file(fileName), function(functionName), category(categoryName) {} + Q_DECL_CONSTEXPR QMessageLogContext() noexcept = default; + Q_DECL_CONSTEXPR QMessageLogContext(const char *fileName, int lineNumber, const char *functionName, const char *categoryName) noexcept + : line(lineNumber), file(fileName), function(functionName), category(categoryName) {} - void copy(const QMessageLogContext &logContext); - - int version; - int line; - const char *file; - const char *function; - const char *category; + int version = 2; + int line = 0; + const char *file = nullptr; + const char *function = nullptr; + const char *category = nullptr; private: + QMessageLogContext ©ContextFrom(const QMessageLogContext &logContext) noexcept; + friend class QMessageLogger; friend class QDebug; }; @@ -121,7 +120,7 @@ public: Q_NORETURN #endif Q_DECL_COLD_FUNCTION - void fatal(const char *msg, ...) const Q_DECL_NOTHROW Q_ATTRIBUTE_FORMAT_PRINTF(2, 3); + void fatal(const char *msg, ...) const noexcept Q_ATTRIBUTE_FORMAT_PRINTF(2, 3); #ifndef QT_NO_DEBUG_STREAM QDebug debug() const; @@ -137,7 +136,7 @@ public: QDebug critical(const QLoggingCategory &cat) const; QDebug critical(CategoryFunction catFunc) const; - QNoDebug noDebug() const Q_DECL_NOTHROW; + QNoDebug noDebug() const noexcept; #endif // QT_NO_DEBUG_STREAM private: @@ -153,9 +152,9 @@ private: #endif #ifdef QT_MESSAGELOGCONTEXT - #define QT_MESSAGELOG_FILE __FILE__ + #define QT_MESSAGELOG_FILE static_cast<const char *>(__FILE__) #define QT_MESSAGELOG_LINE __LINE__ - #define QT_MESSAGELOG_FUNC Q_FUNC_INFO + #define QT_MESSAGELOG_FUNC static_cast<const char *>(Q_FUNC_INFO) #else #define QT_MESSAGELOG_FILE nullptr #define QT_MESSAGELOG_LINE 0 diff --git a/src/corelib/global/qmalloc.cpp b/src/corelib/global/qmalloc.cpp index 05676a0da2..b071c1df62 100644 --- a/src/corelib/global/qmalloc.cpp +++ b/src/corelib/global/qmalloc.cpp @@ -74,18 +74,18 @@ void *qRealloc(void *ptr, size_t size) void *qMallocAligned(size_t size, size_t alignment) { - return qReallocAligned(0, size, 0, alignment); + return qReallocAligned(nullptr, size, 0, alignment); } void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t alignment) { // fake an aligned allocation - void *actualptr = oldptr ? static_cast<void **>(oldptr)[-1] : 0; + void *actualptr = oldptr ? static_cast<void **>(oldptr)[-1] : nullptr; if (alignment <= sizeof(void*)) { // special, fast case void **newptr = static_cast<void **>(realloc(actualptr, newsize + sizeof(void*))); if (!newptr) - return 0; + return nullptr; if (newptr == actualptr) { // realloc succeeded without reallocating return oldptr; @@ -105,7 +105,7 @@ void *qReallocAligned(void *oldptr, size_t newsize, size_t oldsize, size_t align void *real = realloc(actualptr, newsize + alignment); if (!real) - return 0; + return nullptr; quintptr faked = reinterpret_cast<quintptr>(real) + alignment; faked &= ~(alignment - 1); diff --git a/src/corelib/global/qfloat16_p.h b/src/corelib/global/qmemory_p.h index f3fc96e119..ac791385bd 100644 --- a/src/corelib/global/qfloat16_p.h +++ b/src/corelib/global/qmemory_p.h @@ -1,7 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 by Southwest Research Institute (R) -** Contact: http://www.qt-project.org/legal +** Copyright (C) 2019 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. ** @@ -36,9 +36,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - -#ifndef QFLOAT16_P_H -#define QFLOAT16_P_H +#ifndef QMEMORY_P_H +#define QMEMORY_P_H // // W A R N I N G @@ -51,45 +50,22 @@ // We mean it. // -#include <QtCore/qfloat16.h> -#include <QtCore/qsysinfo.h> - -QT_BEGIN_NAMESPACE +#include <QtCore/qglobal.h> -static inline bool qt_is_inf(qfloat16 d) Q_DECL_NOTHROW -{ - bool is_inf; - uchar *ch = (uchar *)&d; - if (QSysInfo::ByteOrder == QSysInfo::BigEndian) - is_inf = (ch[0] & 0x7c) == 0x7c && (ch[0] & 0x02) == 0; - else - is_inf = (ch[1] & 0x7c) == 0x7c && (ch[1] & 0x02) == 0; - return is_inf; -} +#include <memory> +#include <type_traits> +#include <utility> -static inline bool qt_is_nan(qfloat16 d) Q_DECL_NOTHROW -{ - bool is_nan; - uchar *ch = (uchar *)&d; - if (QSysInfo::ByteOrder == QSysInfo::BigEndian) - is_nan = (ch[0] & 0x7c) == 0x7c && (ch[0] & 0x02) != 0; - else - is_nan = (ch[1] & 0x7c) == 0x7c && (ch[1] & 0x02) != 0; - return is_nan; -} +QT_BEGIN_NAMESPACE -static inline bool qt_is_finite(qfloat16 d) Q_DECL_NOTHROW +// Like std::make_unique, but less ambitious, so keep as private API, for use in Qt itself: +template <typename T, typename... Args> +typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type +qt_make_unique(Args &&...args) { - bool is_finite; - uchar *ch = (uchar *)&d; - if (QSysInfo::ByteOrder == QSysInfo::BigEndian) - is_finite = (ch[0] & 0x7c) != 0x7c; - else - is_finite = (ch[1] & 0x7c) != 0x7c; - return is_finite; + return std::unique_ptr<T>{new T(std::forward<Args>(args)...)}; } - QT_END_NAMESPACE -#endif // QFLOAT16_P_H +#endif /* QMEMORY_P_H */ diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index dec2c44637..f5f7176670 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -50,10 +50,10 @@ QT_BEGIN_NAMESPACE #if !defined(Q_QDOC) && !defined(Q_MOC_RUN) struct QMetaObject; -const QMetaObject *qt_getQtMetaObject() Q_DECL_NOEXCEPT; // defined in qobject.h (which can't be included here) +const QMetaObject *qt_getQtMetaObject() noexcept; // defined in qobject.h (which can't be included here) #define QT_Q_ENUM(ENUM) \ - inline const QMetaObject *qt_getEnumMetaObject(ENUM) Q_DECL_NOEXCEPT { return qt_getQtMetaObject(); } \ - inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) Q_DECL_NOEXCEPT { return #ENUM; } + inline const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return qt_getQtMetaObject(); } \ + inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; } #define QT_Q_FLAG(ENUM) QT_Q_ENUM(ENUM) #else #define QT_Q_ENUM Q_ENUM @@ -194,6 +194,13 @@ public: DescendingOrder }; + enum SplitBehaviorFlags { + KeepEmptyParts = 0, + SkipEmptyParts = 0x1, + }; + Q_DECLARE_FLAGS(SplitBehavior, SplitBehaviorFlags) + Q_DECLARE_OPERATORS_FOR_FLAGS(SplitBehavior) + enum TileRule { StretchTile, RepeatTile, @@ -351,14 +358,18 @@ public: WA_MouseTracking = 2, WA_ContentsPropagated = 3, // ## deprecated WA_OpaquePaintEvent = 4, - WA_NoBackground = WA_OpaquePaintEvent, // ## deprecated +#if QT_DEPRECATED_SINCE(5, 14) + WA_NoBackground Q_DECL_ENUMERATOR_DEPRECATED = WA_OpaquePaintEvent, +#endif WA_StaticContents = 5, WA_LaidOut = 7, WA_PaintOnScreen = 8, WA_NoSystemBackground = 9, WA_UpdatesDisabled = 10, WA_Mapped = 11, - WA_MacNoClickThrough = 12, // Mac only +#if QT_DEPRECATED_SINCE(5, 14) + WA_MacNoClickThrough Q_DECL_ENUMERATOR_DEPRECATED = 12, +#endif WA_InputMethodEnabled = 14, WA_WState_Visible = 15, WA_WState_Hidden = 16, @@ -376,8 +387,10 @@ public: WA_Moved = 43, WA_PendingUpdate = 44, WA_InvalidSize = 45, - WA_MacBrushedMetal = 46, // Mac only - WA_MacMetalStyle = WA_MacBrushedMetal, // obsolete +#if QT_DEPRECATED_SINCE(5, 14) + WA_MacBrushedMetal Q_DECL_ENUMERATOR_DEPRECATED = 46, + WA_MacMetalStyle Q_DECL_ENUMERATOR_DEPRECATED = 46, +#endif WA_CustomWhatsThis = 47, WA_LayoutOnEntireRect = 48, WA_OutsideWSRange = 49, @@ -434,7 +447,9 @@ public: WA_LayoutUsesWidgetRect = 92, WA_StyledBackground = 93, // internal - WA_MSWindowsUseDirect3D = 94, // Win only +#if QT_DEPRECATED_SINCE(5, 14) + WA_MSWindowsUseDirect3D Q_DECL_ENUMERATOR_DEPRECATED = 94, +#endif WA_CanHostQMdiSubWindowTitleBar = 95, // Internal WA_MacAlwaysShowToolWindow = 96, // Mac only @@ -466,9 +481,9 @@ public: WA_X11NetWmWindowTypeNotification = 114, WA_X11NetWmWindowTypeCombo = 115, WA_X11NetWmWindowTypeDND = 116, - - WA_MacFrameworkScaled = 117, - +#if QT_DEPRECATED_SINCE(5, 14) + WA_MacFrameworkScaled Q_DECL_ENUMERATOR_DEPRECATED = 117, +#endif WA_SetWindowModality = 118, WA_WState_WindowOpacitySet = 119, // internal WA_TranslucentBackground = 120, @@ -495,16 +510,22 @@ public: enum ApplicationAttribute { AA_ImmediateWidgetCreation = 0, - AA_MSWindowsUseDirect3DByDefault = 1, // Win only +#if QT_DEPRECATED_SINCE(5, 14) + AA_MSWindowsUseDirect3DByDefault Q_DECL_ENUMERATOR_DEPRECATED = 1, +#endif AA_DontShowIconsInMenus = 2, AA_NativeWindows = 3, AA_DontCreateNativeWidgetSiblings = 4, AA_PluginApplication = 5, - AA_MacPluginApplication = AA_PluginApplication, // ### Qt 6: remove me +#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove me + AA_MacPluginApplication Q_DECL_ENUMERATOR_DEPRECATED = AA_PluginApplication, +#endif AA_DontUseNativeMenuBar = 6, AA_MacDontSwapCtrlAndMeta = 7, AA_Use96Dpi = 8, - AA_X11InitThreads = 10, +#if QT_DEPRECATED_SINCE(5, 14) + AA_X11InitThreads Q_DECL_ENUMERATOR_DEPRECATED = 10, +#endif AA_SynthesizeTouchForUnhandledMouseEvents = 11, AA_SynthesizeMouseForUnhandledTouchEvents = 12, AA_UseHighDpiPixmaps = 13, @@ -516,7 +537,7 @@ public: AA_SetPalette = 19, AA_EnableHighDpiScaling = 20, AA_DisableHighDpiScaling = 21, - AA_UseStyleSheetPropagationInWidgetStyles = 22, // ### Qt 6: remove me + AA_UseStyleSheetPropagationInWidgetStyles = 22, AA_DontUseNativeDialogs = 23, AA_SynthesizeMouseForUnhandledTabletEvents = 24, AA_CompressHighFrequencyEvents = 25, @@ -525,6 +546,7 @@ public: AA_DontShowShortcutsInContextMenus = 28, AA_CompressTabletEvents = 29, AA_DisableWindowContextHelpButton = 30, // ### Qt 6: remove me + AA_DisableSessionManager = 31, // Add new attributes before this line AA_AttributeCount @@ -1196,7 +1218,8 @@ public: enum TextFormat { PlainText, RichText, - AutoText + AutoText, + MarkdownText }; enum AspectRatioMode { @@ -1377,7 +1400,9 @@ public: enum InputMethodQuery { ImEnabled = 0x1, ImCursorRectangle = 0x2, - ImMicroFocus = 0x2, // deprecated +#if QT_DEPRECATED_SINCE(5, 14) + ImMicroFocus Q_DECL_ENUMERATOR_DEPRECATED = 0x2, +#endif ImFont = 0x4, ImCursorPosition = 0x8, ImSurroundingText = 0x10, @@ -1504,10 +1529,12 @@ public: // Metadata FontRole = 6, TextAlignmentRole = 7, - BackgroundColorRole = 8, BackgroundRole = 8, - TextColorRole = 9, ForegroundRole = 9, +#if QT_DEPRECATED_SINCE(5, 13) // ### Qt 6: remove me + BackgroundColorRole Q_DECL_ENUMERATOR_DEPRECATED = BackgroundRole, + TextColorRole Q_DECL_ENUMERATOR_DEPRECATED = ForegroundRole, +#endif CheckStateRole = 10, // Accessibility AccessibleTextRole = 11, @@ -1610,7 +1637,7 @@ public: TitleBarArea // For move }; -#if defined(Q_COMPILER_CLASS_ENUM) && defined(Q_COMPILER_CONSTEXPR) +#if defined(Q_COMPILER_CONSTEXPR) enum class Initialization { Uninitialized }; @@ -1753,6 +1780,7 @@ public: QT_Q_FLAG(Alignment) QT_Q_ENUM(TextFlag) QT_Q_FLAG(Orientations) + QT_Q_FLAG(SplitBehavior) QT_Q_FLAG(DropActions) QT_Q_FLAG(Edges) QT_Q_FLAG(DockWidgetAreas) diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 5bba8c5fe5..45d79902c7 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -286,6 +286,13 @@ This value was added in Qt 5.10. In Qt 6, WindowContextHelpButtonHint will not be set by default. + \value AA_DisableSessionManager Disables the QSessionManager. + By default Qt will connect to a running session manager for a GUI + application on supported platforms, use of a session manager may be + redundant for system services. + This attribute must be set before QGuiApplication is constructed. + This value was added in 5.13 + The following values are deprecated or obsolete: \value AA_ImmediateWidgetCreation This attribute is no longer fully @@ -2362,6 +2369,19 @@ */ /*! + \enum Qt::SplitBehavior + \since 5.14 + + This enum specifies how the split() functions should behave with + respect to empty strings. + + \value KeepEmptyParts If a field is empty, keep it in the result. + \value SkipEmptyParts If a field is empty, don't include it in the result. + + \sa QString::split() +*/ + +/*! \enum Qt::ClipOperation \value NoClip This operation turns clipping off. @@ -2464,6 +2484,9 @@ \value AutoText The text string is interpreted as for Qt::RichText if Qt::mightBeRichText() returns \c true, otherwise as Qt::PlainText. + + \value MarkdownText The text string is interpreted as Markdown-formatted text. + This enum value was added in Qt 5.14. */ /*! diff --git a/src/corelib/global/qnumeric.cpp b/src/corelib/global/qnumeric.cpp index fc2b052edf..11440f40a4 100644 --- a/src/corelib/global/qnumeric.cpp +++ b/src/corelib/global/qnumeric.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE /*! Returns \c true if the double \a {d} is equivalent to infinity. \relates <QtGlobal> + \sa qInf() */ Q_CORE_EXPORT bool qIsInf(double d) { return qt_is_inf(d); } @@ -64,6 +65,7 @@ Q_CORE_EXPORT bool qIsFinite(double d) { return qt_is_finite(d); } /*! Returns \c true if the float \a {f} is equivalent to infinity. \relates <QtGlobal> + \sa qInf() */ Q_CORE_EXPORT bool qIsInf(float f) { return qt_is_inf(f); } @@ -88,15 +90,37 @@ Q_CORE_EXPORT double qSNaN() { return qt_snan(); } /*! Returns the bit pattern of a quiet NaN as a double. \relates <QtGlobal> + \sa qIsNaN() */ Q_CORE_EXPORT double qQNaN() { return qt_qnan(); } /*! Returns the bit pattern for an infinite number as a double. \relates <QtGlobal> + \sa qIsInf() */ Q_CORE_EXPORT double qInf() { return qt_inf(); } +/*! + \relates <QtGlobal> + Classifies a floating-point value. + + The return values are defined in \c{<cmath>}: returns one of the following, + determined by the floating-point class of \a val: + \list + \li FP_NAN not a number + \li FP_INFINITE infinities (positive or negative) + \li FP_ZERO zero (positive or negative) + \li FP_NORMAL finite with a full mantissa + \li FP_SUBNORMAL finite with a reduced mantissa + \endlist +*/ +Q_CORE_EXPORT int qFpClassify(double val) { return qt_fpclassify(val); } + +/*! + \overload +*/ +Q_CORE_EXPORT int qFpClassify(float val) { return qt_fpclassify(val); } /*! diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h index 535a96aaec..6a0c64712f 100644 --- a/src/corelib/global/qnumeric.h +++ b/src/corelib/global/qnumeric.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,9 +48,11 @@ QT_BEGIN_NAMESPACE Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsInf(double d); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsNaN(double d); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsFinite(double d); +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION int qFpClassify(double val); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsInf(float f); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsNaN(float f); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION bool qIsFinite(float f); +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION int qFpClassify(float val); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION double qSNaN(); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION double qQNaN(); Q_CORE_EXPORT Q_DECL_CONST_FUNCTION double qInf(); diff --git a/src/corelib/global/qnumeric_p.h b/src/corelib/global/qnumeric_p.h index 4a225b2599..21f9cfbef0 100644 --- a/src/corelib/global/qnumeric_p.h +++ b/src/corelib/global/qnumeric_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -85,9 +85,11 @@ namespace qnumeric_std_wrapper { Q_DECL_CONST_FUNCTION static inline bool math_h_isnan(double d) { using namespace std; return isnan(d); } Q_DECL_CONST_FUNCTION static inline bool math_h_isinf(double d) { using namespace std; return isinf(d); } Q_DECL_CONST_FUNCTION static inline bool math_h_isfinite(double d) { using namespace std; return isfinite(d); } +Q_DECL_CONST_FUNCTION static inline int math_h_fpclassify(double d) { using namespace std; return fpclassify(d); } Q_DECL_CONST_FUNCTION static inline bool math_h_isnan(float f) { using namespace std; return isnan(f); } Q_DECL_CONST_FUNCTION static inline bool math_h_isinf(float f) { using namespace std; return isinf(f); } Q_DECL_CONST_FUNCTION static inline bool math_h_isfinite(float f) { using namespace std; return isfinite(f); } +Q_DECL_CONST_FUNCTION static inline int math_h_fpclassify(float f) { using namespace std; return fpclassify(f); } } QT_END_NAMESPACE // These macros from math.h conflict with the real functions in the std namespace. @@ -95,6 +97,7 @@ QT_END_NAMESPACE # undef isnan # undef isinf # undef isfinite +# undef fpclassify # endif // defined(isnan) #endif @@ -106,20 +109,24 @@ namespace qnumeric_std_wrapper { Q_DECL_CONST_FUNCTION static inline bool isnan(double d) { return math_h_isnan(d); } Q_DECL_CONST_FUNCTION static inline bool isinf(double d) { return math_h_isinf(d); } Q_DECL_CONST_FUNCTION static inline bool isfinite(double d) { return math_h_isfinite(d); } +Q_DECL_CONST_FUNCTION static inline int fpclassify(double d) { return math_h_fpclassify(d); } Q_DECL_CONST_FUNCTION static inline bool isnan(float f) { return math_h_isnan(f); } Q_DECL_CONST_FUNCTION static inline bool isinf(float f) { return math_h_isinf(f); } Q_DECL_CONST_FUNCTION static inline bool isfinite(float f) { return math_h_isfinite(f); } +Q_DECL_CONST_FUNCTION static inline int fpclassify(float f) { return math_h_fpclassify(f); } #else Q_DECL_CONST_FUNCTION static inline bool isnan(double d) { return std::isnan(d); } Q_DECL_CONST_FUNCTION static inline bool isinf(double d) { return std::isinf(d); } Q_DECL_CONST_FUNCTION static inline bool isfinite(double d) { return std::isfinite(d); } +Q_DECL_CONST_FUNCTION static inline int fpclassify(double d) { return std::fpclassify(d); } Q_DECL_CONST_FUNCTION static inline bool isnan(float f) { return std::isnan(f); } Q_DECL_CONST_FUNCTION static inline bool isinf(float f) { return std::isinf(f); } Q_DECL_CONST_FUNCTION static inline bool isfinite(float f) { return std::isfinite(f); } +Q_DECL_CONST_FUNCTION static inline int fpclassify(float f) { return std::fpclassify(f); } #endif } -Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_inf() Q_DECL_NOEXCEPT +Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_inf() noexcept { Q_STATIC_ASSERT_X(std::numeric_limits<double>::has_infinity, "platform has no definition for infinity for type double"); @@ -127,7 +134,7 @@ Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_inf() Q_DECL_NOEX } // Signaling NaN -Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_snan() Q_DECL_NOEXCEPT +Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_snan() noexcept { Q_STATIC_ASSERT_X(std::numeric_limits<double>::has_signaling_NaN, "platform has no definition for signaling NaN for type double"); @@ -135,7 +142,7 @@ Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_snan() Q_DECL_NOE } // Quiet NaN -Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_qnan() Q_DECL_NOEXCEPT +Q_DECL_CONSTEXPR Q_DECL_CONST_FUNCTION static inline double qt_qnan() noexcept { Q_STATIC_ASSERT_X(std::numeric_limits<double>::has_quiet_NaN, "platform has no definition for quiet NaN for type double"); @@ -157,6 +164,11 @@ Q_DECL_CONST_FUNCTION static inline bool qt_is_finite(double d) return qnumeric_std_wrapper::isfinite(d); } +Q_DECL_CONST_FUNCTION static inline int qt_fpclassify(double d) +{ + return qnumeric_std_wrapper::fpclassify(d); +} + Q_DECL_CONST_FUNCTION static inline bool qt_is_inf(float f) { return qnumeric_std_wrapper::isinf(f); @@ -172,6 +184,11 @@ Q_DECL_CONST_FUNCTION static inline bool qt_is_finite(float f) return qnumeric_std_wrapper::isfinite(f); } +Q_DECL_CONST_FUNCTION static inline int qt_fpclassify(float f) +{ + return qnumeric_std_wrapper::fpclassify(f); +} + #ifndef Q_CLANG_QDOC namespace { /*! diff --git a/src/corelib/global/qoperatingsystemversion.cpp b/src/corelib/global/qoperatingsystemversion.cpp index 94dc261b41..42a1275621 100644 --- a/src/corelib/global/qoperatingsystemversion.cpp +++ b/src/corelib/global/qoperatingsystemversion.cpp @@ -340,7 +340,6 @@ QString QOperatingSystemVersion::name() const } } -#ifdef Q_COMPILER_INITIALIZER_LISTS /*! \fn bool QOperatingSystemVersion::isAnyOfType(std::initializer_list<OSType> types) const @@ -355,7 +354,6 @@ bool QOperatingSystemVersion::isAnyOfType(std::initializer_list<OSType> types) c } return false; } -#endif /*! \variable QOperatingSystemVersion::Windows7 diff --git a/src/corelib/global/qoperatingsystemversion.h b/src/corelib/global/qoperatingsystemversion.h index df01e5438a..e99e4f8997 100644 --- a/src/corelib/global/qoperatingsystemversion.h +++ b/src/corelib/global/qoperatingsystemversion.h @@ -119,9 +119,7 @@ public: Q_DECL_CONSTEXPR int segmentCount() const { return m_micro >= 0 ? 3 : m_minor >= 0 ? 2 : m_major >= 0 ? 1 : 0; } -#ifdef Q_COMPILER_INITIALIZER_LISTS bool isAnyOfType(std::initializer_list<OSType> types) const; -#endif Q_DECL_CONSTEXPR OSType type() const { return m_os; } QString name() const; diff --git a/src/corelib/global/qoperatingsystemversion_win.cpp b/src/corelib/global/qoperatingsystemversion_win.cpp index 2da190da48..798d985a76 100644 --- a/src/corelib/global/qoperatingsystemversion_win.cpp +++ b/src/corelib/global/qoperatingsystemversion_win.cpp @@ -84,7 +84,6 @@ static inline OSVERSIONINFOEX determineWinOsVersion() #define pGetModuleHandle GetModuleHandleW #endif -#ifndef Q_OS_WINCE HMODULE ntdll = pGetModuleHandle(L"ntdll.dll"); if (Q_UNLIKELY(!ntdll)) return result; @@ -104,9 +103,6 @@ static inline OSVERSIONINFOEX determineWinOsVersion() // GetVersionEx() has been deprecated in Windows 8.1 and will return // only Windows 8 from that version on, so use the kernel API function. pRtlGetVersion(reinterpret_cast<LPOSVERSIONINFO>(&result)); // always returns STATUS_SUCCESS -#else // !Q_OS_WINCE - GetVersionEx(&result); -#endif return result; } diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index 77b3ba36b0..8d65720850 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -282,6 +282,20 @@ // Q_BYTE_ORDER not defined, use endianness auto-detection /* + RISC-V family, known variants: 32- and 64-bit + + RISC-V is little-endian. +*/ +#elif defined(__riscv) +# define Q_PROCESSOR_RISCV +# if __riscv_xlen == 64 +# define Q_PROCESSOR_RISCV_64 +# else +# define Q_PROCESSOR_RISCV_32 +# endif +# define Q_BYTE_ORDER Q_LITTLE_ENDIAN + +/* S390 family, known variant: S390X (64-bit) S390 is big-endian. @@ -324,7 +338,6 @@ // -- Web Assembly -- #elif defined(__EMSCRIPTEN__) # define Q_PROCESSOR_WASM -# define Q_PROCESSOR_X86 6 // enables SIMD support # define Q_BYTE_ORDER Q_LITTLE_ENDIAN # define Q_PROCESSOR_WORDSIZE 8 #endif diff --git a/src/corelib/global/qrandom.cpp b/src/corelib/global/qrandom.cpp index 90df8653a7..84cf960f2d 100644 --- a/src/corelib/global/qrandom.cpp +++ b/src/corelib/global/qrandom.cpp @@ -91,7 +91,7 @@ DECLSPEC_IMPORT BOOLEAN WINAPI SystemFunction036(PVOID RandomBuffer, ULONG Rando QT_BEGIN_NAMESPACE #if defined(Q_PROCESSOR_X86) && QT_COMPILER_SUPPORTS_HERE(RDRND) -static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW; +static qsizetype qt_random_cpu(void *buffer, qsizetype count) noexcept; # ifdef Q_PROCESSOR_X86_64 # define _rdrandXX_step _rdrand64_step @@ -99,7 +99,7 @@ static qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW; # define _rdrandXX_step _rdrand32_step # endif -static QT_FUNCTION_TARGET(RDRND) qsizetype qt_random_cpu(void *buffer, qsizetype count) Q_DECL_NOTHROW +static QT_FUNCTION_TARGET(RDRND) qsizetype qt_random_cpu(void *buffer, qsizetype count) noexcept { unsigned *ptr = reinterpret_cast<unsigned *>(buffer); unsigned *end = ptr + count; @@ -134,7 +134,7 @@ enum { struct QRandomGenerator::SystemGenerator { #if QT_CONFIG(getentropy) - static qsizetype fillBuffer(void *buffer, qsizetype count) Q_DECL_NOTHROW + static qsizetype fillBuffer(void *buffer, qsizetype count) noexcept { // getentropy can read at most 256 bytes, so break the reading qsizetype read = 0; @@ -186,7 +186,7 @@ struct QRandomGenerator::SystemGenerator #endif static void closeDevice() { - int fd = self().fdp1.load() - 1; + int fd = self().fdp1.loadRelaxed() - 1; if (fd >= 0) qt_safe_close(fd); } @@ -204,13 +204,13 @@ struct QRandomGenerator::SystemGenerator } #elif defined(Q_OS_WIN) && !defined(Q_OS_WINRT) - qsizetype fillBuffer(void *buffer, qsizetype count) Q_DECL_NOTHROW + qsizetype fillBuffer(void *buffer, qsizetype count) noexcept { auto RtlGenRandom = SystemFunction036; return RtlGenRandom(buffer, ULONG(count)) ? count: 0; } #elif defined(Q_OS_WINRT) - qsizetype fillBuffer(void *, qsizetype) Q_DECL_NOTHROW + qsizetype fillBuffer(void *, qsizetype) noexcept { // always use the fallback return 0; @@ -219,7 +219,7 @@ struct QRandomGenerator::SystemGenerator static SystemGenerator &self(); typedef quint32 result_type; - void generate(quint32 *begin, quint32 *end) Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept); + void generate(quint32 *begin, quint32 *end) noexcept(FillBufferNoexcept); // For std::mersenne_twister_engine implementations that use something // other than quint32 (unsigned int) to fill their buffers. @@ -242,7 +242,7 @@ struct QRandomGenerator::SystemGenerator #if defined(Q_OS_WIN) static void fallback_update_seed(unsigned) {} -static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW +static void fallback_fill(quint32 *ptr, qsizetype left) noexcept { // on Windows, rand_s is a high-quality random number generator // and it requires no seeding @@ -254,14 +254,14 @@ static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW } #elif QT_CONFIG(getentropy) static void fallback_update_seed(unsigned) {} -static void fallback_fill(quint32 *, qsizetype) Q_DECL_NOTHROW +static void fallback_fill(quint32 *, qsizetype) noexcept { // no fallback necessary, getentropy cannot fail under normal circumstances Q_UNREACHABLE(); } #elif defined(Q_OS_BSD4) && !defined(__GLIBC__) static void fallback_update_seed(unsigned) {} -static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW +static void fallback_fill(quint32 *ptr, qsizetype left) noexcept { // BSDs have arc4random(4) and these work even in chroot(2) arc4random_buf(ptr, left * sizeof(*ptr)); @@ -280,7 +280,7 @@ Q_NEVER_INLINE #ifdef Q_CC_GNU __attribute__((cold)) // this function is pretty big, so optimize for size #endif -static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW +static void fallback_fill(quint32 *ptr, qsizetype left) noexcept { quint32 scratch[12]; // see element count below quint32 *end = scratch; @@ -310,7 +310,7 @@ static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW *end++ = quint32(nsecs); // 5 #endif - if (quint32 v = seed.load()) + if (quint32 v = seed.loadRelaxed()) *end++ = v; // 6 #if QT_CONFIG(getauxval) @@ -354,7 +354,7 @@ static void fallback_fill(quint32 *ptr, qsizetype left) Q_DECL_NOTHROW #endif Q_NEVER_INLINE void QRandomGenerator::SystemGenerator::generate(quint32 *begin, quint32 *end) - Q_DECL_NOEXCEPT_EXPR(FillBufferNoexcept) + noexcept(FillBufferNoexcept) { quint32 *buffer = begin; qsizetype count = end - begin; @@ -1167,7 +1167,7 @@ QRandomGenerator &QRandomGenerator::operator=(const QRandomGenerator &other) return *this; } -QRandomGenerator::QRandomGenerator(std::seed_seq &sseq) Q_DECL_NOTHROW +QRandomGenerator::QRandomGenerator(std::seed_seq &sseq) noexcept : type(MersenneTwister) { Q_ASSERT(this != system()); diff --git a/src/corelib/global/qrandom.h b/src/corelib/global/qrandom.h index 46d3e0e152..2f72528266 100644 --- a/src/corelib/global/qrandom.h +++ b/src/corelib/global/qrandom.h @@ -68,7 +68,7 @@ public: QRandomGenerator(const quint32 *seedBuffer, qsizetype len) : QRandomGenerator(seedBuffer, seedBuffer + len) {} - Q_CORE_EXPORT QRandomGenerator(std::seed_seq &sseq) Q_DECL_NOTHROW; + Q_CORE_EXPORT QRandomGenerator(std::seed_seq &sseq) noexcept; Q_CORE_EXPORT QRandomGenerator(const quint32 *begin, const quint32 *end); // copy constructor & assignment operator (move unnecessary) @@ -165,7 +165,7 @@ public: typedef quint32 result_type; result_type operator()() { return generate(); } void seed(quint32 s = 1) { *this = { s }; } - void seed(std::seed_seq &sseq) Q_DECL_NOTHROW { *this = { sseq }; } + void seed(std::seed_seq &sseq) noexcept { *this = { sseq }; } Q_CORE_EXPORT void discard(unsigned long long z); static Q_DECL_CONSTEXPR result_type min() { return std::numeric_limits<result_type>::min(); } static Q_DECL_CONSTEXPR result_type max() { return std::numeric_limits<result_type>::max(); } @@ -228,7 +228,7 @@ public: QRandomGenerator64(const quint32 *seedBuffer, qsizetype len) : QRandomGenerator(seedBuffer, len) {} - QRandomGenerator64(std::seed_seq &sseq) Q_DECL_NOTHROW + QRandomGenerator64(std::seed_seq &sseq) noexcept : QRandomGenerator(sseq) {} QRandomGenerator64(const quint32 *begin, const quint32 *end) diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index a2e51fa330..02e2f77c6b 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -166,6 +166,8 @@ # define Q_OS_QNX #elif defined(__INTEGRITY) # define Q_OS_INTEGRITY +#elif defined(__rtems__) +# define Q_OS_RTEMS #elif defined(VXWORKS) /* there is no "real" VxWorks define - this has to be set in the mkspec! */ # define Q_OS_VXWORKS #elif defined(__HAIKU__) diff --git a/src/corelib/global/qt_pch.h b/src/corelib/global/qt_pch.h index 76e46374c3..3972991618 100644 --- a/src/corelib/global/qt_pch.h +++ b/src/corelib/global/qt_pch.h @@ -60,12 +60,18 @@ # undef _POSIX_ #endif #include <qcoreapplication.h> +#include <qcoreevent.h> +#include <qiodevice.h> #include <qlist.h> #include <qvariant.h> /* All moc genereated code has this include */ #include <qobject.h> #include <qregexp.h> +#include <qscopedpointer.h> +#include <qshareddata.h> #include <qstring.h> #include <qstringlist.h> +#include <qtimer.h> +#include <qvector.h> #if QT_CONFIG(textcodec) #include <qtextcodec.h> #endif diff --git a/src/corelib/global/qtrace_p.h b/src/corelib/global/qtrace_p.h index 4cef126bb6..d9011c6066 100644 --- a/src/corelib/global/qtrace_p.h +++ b/src/corelib/global/qtrace_p.h @@ -122,6 +122,7 @@ QT_BEGIN_NAMESPACE #if defined(Q_TRACEPOINT) && !defined(QT_BOOTSTRAPPED) +# define Q_HAS_TRACEPOINTS 1 # define Q_TRACE(x, ...) QtPrivate::trace_ ## x(__VA_ARGS__) # define Q_TRACE_EXIT(x, ...) \ const auto qTraceExit_ ## x ## __COUNTER__ = qScopeGuard([&]() { Q_TRACE(x, __VA_ARGS__); }); @@ -131,6 +132,7 @@ QT_BEGIN_NAMESPACE # define Q_UNCONDITIONAL_TRACE(x, ...) QtPrivate::do_trace_ ## x(__VA_ARGS__) # define Q_TRACE_ENABLED(x) QtPrivate::trace_ ## x ## _enabled() #else +# define Q_HAS_TRACEPOINTS 0 # define Q_TRACE(x, ...) # define Q_TRACE_EXIT(x, ...) # define Q_TRACE_SCOPE(x, ...) diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 4f79c48c51..30be47296e 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -49,6 +49,26 @@ QT_BEGIN_NAMESPACE QTypeInfo - type trait functionality */ +template <typename T> +static constexpr bool qIsRelocatable() +{ +#if defined(Q_CC_CLANG) || !defined(Q_CC_GNU) || Q_CC_GNU >= 501 + return std::is_trivially_copyable<T>::value && std::is_trivially_destructible<T>::value; +#else + return std::is_enum<T>::value || std::is_integral<T>::value; +#endif +} + +template <typename T> +static constexpr bool qIsTrivial() +{ +#if defined(Q_CC_CLANG) || !defined(Q_CC_GNU) || Q_CC_GNU >= 501 + return std::is_trivial<T>::value; +#else + return std::is_enum<T>::value || std::is_integral<T>::value; +#endif +} + /* The catch-all template. */ @@ -61,9 +81,9 @@ public: isSpecialized = std::is_enum<T>::value, // don't require every enum to be marked manually isPointer = false, isIntegral = std::is_integral<T>::value, - isComplex = !isIntegral && !std::is_enum<T>::value, + isComplex = !qIsTrivial<T>(), isStatic = true, - isRelocatable = std::is_enum<T>::value, + isRelocatable = qIsRelocatable<T>(), isLarge = (sizeof(T)>sizeof(void*)), isDummy = false, //### Qt6: remove sizeOf = sizeof(T) @@ -193,7 +213,6 @@ Q_DECLARE_MOVABLE_CONTAINER(QList); Q_DECLARE_MOVABLE_CONTAINER(QVector); Q_DECLARE_MOVABLE_CONTAINER(QQueue); Q_DECLARE_MOVABLE_CONTAINER(QStack); -Q_DECLARE_MOVABLE_CONTAINER(QLinkedList); Q_DECLARE_MOVABLE_CONTAINER(QSet); #undef Q_DECLARE_MOVABLE_CONTAINER @@ -248,9 +267,9 @@ class QTypeInfo<TYPE > \ public: \ enum { \ isSpecialized = true, \ - isComplex = (((FLAGS) & Q_PRIMITIVE_TYPE) == 0), \ + isComplex = (((FLAGS) & Q_PRIMITIVE_TYPE) == 0) && !qIsTrivial<TYPE>(), \ isStatic = (((FLAGS) & (Q_MOVABLE_TYPE | Q_PRIMITIVE_TYPE)) == 0), \ - isRelocatable = !isStatic || ((FLAGS) & Q_RELOCATABLE_TYPE), \ + isRelocatable = !isStatic || ((FLAGS) & Q_RELOCATABLE_TYPE) || qIsRelocatable<TYPE>(), \ isLarge = (sizeof(TYPE)>sizeof(void*)), \ isPointer = false, \ isIntegral = std::is_integral< TYPE >::value, \ @@ -288,7 +307,7 @@ Q_DECLARE_TYPEINFO_BODY(QFlags<T>, Q_PRIMITIVE_TYPE); #define Q_DECLARE_SHARED_IMPL(TYPE, FLAGS) \ Q_DECLARE_TYPEINFO(TYPE, FLAGS); \ inline void swap(TYPE &value1, TYPE &value2) \ - Q_DECL_NOEXCEPT_EXPR(noexcept(value1.swap(value2))) \ + noexcept(noexcept(value1.swap(value2))) \ { value1.swap(value2); } #define Q_DECLARE_SHARED(TYPE) Q_DECLARE_SHARED_IMPL(TYPE, Q_MOVABLE_TYPE) #define Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(TYPE) \ diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index 086d642c26..fe81689932 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -79,6 +79,8 @@ SOURCES += \ io/qloggingcategory.cpp \ io/qloggingregistry.cpp +qtConfig(zstd): QMAKE_USE_PRIVATE += zstd + qtConfig(filesystemwatcher) { HEADERS += \ io/qfilesystemwatcher.h \ @@ -156,7 +158,8 @@ win32 { io/qwindowspipereader.cpp \ io/qwindowspipewriter.cpp - LIBS += -lmpr -lnetapi32 -luserenv + LIBS += -lmpr -luserenv + QMAKE_USE_PRIVATE += netapi32 } else { SOURCES += \ io/qstandardpaths_winrt.cpp \ @@ -169,7 +172,7 @@ win32 { io/qlockfile_unix.cpp \ io/qfilesystemiterator_unix.cpp - !integrity:!uikit { + !integrity:!uikit:!rtems { SOURCES += io/forkfd_qt.cpp HEADERS += \ ../3rdparty/forkfd/forkfd.h diff --git a/src/corelib/io/qabstractfileengine.cpp b/src/corelib/io/qabstractfileengine.cpp index f2a895bbb8..8a1679c5af 100644 --- a/src/corelib/io/qabstractfileengine.cpp +++ b/src/corelib/io/qabstractfileengine.cpp @@ -159,7 +159,7 @@ QAbstractFileEngineHandler::~QAbstractFileEngineHandler() */ QAbstractFileEngine *qt_custom_file_engine_handler_create(const QString &path) { - QAbstractFileEngine *engine = 0; + QAbstractFileEngine *engine = nullptr; if (qt_file_engine_handlers_in_use) { QReadLocker locker(fileEngineHandlerMutex()); @@ -658,7 +658,7 @@ QStringList QAbstractFileEngine::entryList(QDir::Filters filters, const QStringL QAbstractFileEngine::FileFlags QAbstractFileEngine::fileFlags(FileFlags type) const { Q_UNUSED(type); - return 0; + return nullptr; } /*! @@ -838,7 +838,7 @@ uchar *QAbstractFileEngine::map(qint64 offset, qint64 size, QFile::MemoryMapFlag option.flags = flags; MapExtensionReturn r; if (!extension(MapExtension, &option, &r)) - return 0; + return nullptr; return r.address; } @@ -1118,7 +1118,7 @@ QAbstractFileEngine::Iterator *QAbstractFileEngine::beginEntryList(QDir::Filters { Q_UNUSED(filters); Q_UNUSED(filterNames); - return 0; + return nullptr; } /*! @@ -1126,7 +1126,7 @@ QAbstractFileEngine::Iterator *QAbstractFileEngine::beginEntryList(QDir::Filters */ QAbstractFileEngine::Iterator *QAbstractFileEngine::endEntryList() { - return 0; + return nullptr; } /*! diff --git a/src/corelib/io/qabstractfileengine_p.h b/src/corelib/io/qabstractfileengine_p.h index 00c415b521..c88b66c7ce 100644 --- a/src/corelib/io/qabstractfileengine_p.h +++ b/src/corelib/io/qabstractfileengine_p.h @@ -193,7 +193,7 @@ public: uchar *address; }; - virtual bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0); + virtual bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr); virtual bool supportsExtension(Extension extension) const; // Factory @@ -208,7 +208,7 @@ protected: QScopedPointer<QAbstractFileEnginePrivate> d_ptr; private: Q_DECLARE_PRIVATE(QAbstractFileEngine) - Q_DISABLE_COPY(QAbstractFileEngine) + Q_DISABLE_COPY_MOVE(QAbstractFileEngine) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractFileEngine::FileFlags) @@ -245,7 +245,7 @@ protected: virtual QVariant entryInfo(EntryInfoType type) const; private: - Q_DISABLE_COPY(QAbstractFileEngineIterator) + Q_DISABLE_COPY_MOVE(QAbstractFileEngineIterator) friend class QDirIterator; friend class QDirIteratorPrivate; void setPath(const QString &path); diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp index e0b9c41323..8e980733de 100644 --- a/src/corelib/io/qbuffer.cpp +++ b/src/corelib/io/qbuffer.cpp @@ -50,7 +50,7 @@ class QBufferPrivate : public QIODevicePrivate public: QBufferPrivate() - : buf(0) + : buf(nullptr) #ifndef QT_NO_QOBJECT , writtenSinceLastEmit(0), signalConnectionCount(0), signalsEmitted(false) #endif @@ -60,8 +60,8 @@ public: QByteArray *buf; QByteArray defaultBuf; - virtual qint64 peek(char *data, qint64 maxSize) override; - virtual QByteArray peek(qint64 maxSize) override; + qint64 peek(char *data, qint64 maxSize) override; + QByteArray peek(qint64 maxSize) override; #ifndef QT_NO_QOBJECT // private slots diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp index 4d56d1a179..d13e94e096 100644 --- a/src/corelib/io/qdebug.cpp +++ b/src/corelib/io/qdebug.cpp @@ -147,7 +147,7 @@ using QtMiscUtils::fromHex; // Has been defined in the header / inlined before Qt 5.4 QDebug::~QDebug() { - if (!--stream->ref) { + if (stream && !--stream->ref) { if (stream->space && stream->buffer.endsWith(QLatin1Char(' '))) stream->buffer.chop(1); if (stream->message_output) { @@ -166,7 +166,7 @@ void QDebug::putUcs4(uint ucs4) { maybeQuote('\''); if (ucs4 < 0x20) { - stream->ts << "\\x" << hex << ucs4 << reset; + stream->ts << "\\x" << Qt::hex << ucs4 << Qt::reset; } else if (ucs4 < 0x80) { stream->ts << char(ucs4); } else { @@ -174,7 +174,7 @@ void QDebug::putUcs4(uint ucs4) stream->ts << "\\u" << qSetFieldWidth(4); else stream->ts << "\\U" << qSetFieldWidth(8); - stream->ts << hex << qSetPadChar(QLatin1Char('0')) << ucs4 << reset; + stream->ts << Qt::hex << qSetPadChar(QLatin1Char('0')) << ucs4 << Qt::reset; } maybeQuote('\''); } @@ -356,7 +356,7 @@ QDebug &QDebug::resetFormat() stream->space = true; if (stream->context.version > 1) stream->flags = 0; - stream->setVerbosity(Stream::DefaultVerbosity); + stream->setVerbosity(DefaultVerbosity); return *this; } @@ -461,7 +461,7 @@ QDebug &QDebug::resetFormat() The allowed range is from 0 to 7. The default value is 2. - \sa setVerbosity() + \sa setVerbosity(), VerbosityLevel */ /*! @@ -472,7 +472,31 @@ QDebug &QDebug::resetFormat() The allowed range is from 0 to 7. The default value is 2. - \sa verbosity() + \sa verbosity(), VerbosityLevel +*/ + +/*! + \fn QDebug &QDebug::verbosity(int verbosityLevel) + \since 5.13 + + Sets the verbosity of the stream to \a verbosityLevel and returns a reference to the stream. + + The allowed range is from 0 to 7. The default value is 2. + + \sa verbosity(), setVerbosity(), VerbosityLevel +*/ + +/*! + \enum QDebug::VerbosityLevel + \since 5.13 + + This enum describes the range of verbosity levels. + + \value MinimumVerbosity + \value DefaultVerbosity + \value MaximumVerbosity + + \sa verbosity(), setVerbosity() */ /*! @@ -810,7 +834,7 @@ QDebug &QDebug::resetFormat() that QDebugStateSaver stores for the duration of the current block. The settings of the internal QTextStream are also saved and restored, - so that using << hex in a QDebug operator doesn't affect other QDebug + so that using << Qt::hex in a QDebug operator doesn't affect other QDebug operators. \since 5.1 @@ -819,36 +843,34 @@ QDebug &QDebug::resetFormat() class QDebugStateSaverPrivate { public: - QDebugStateSaverPrivate(QDebug &dbg) - : m_dbg(dbg), - m_spaces(dbg.autoInsertSpaces()), - m_flags(0), - m_streamParams(dbg.stream->ts.d_ptr->params) + QDebugStateSaverPrivate(QDebug::Stream *stream) + : m_stream(stream), + m_spaces(stream->space), + m_flags(stream->context.version > 1 ? stream->flags : 0), + m_streamParams(stream->ts.d_ptr->params) { - if (m_dbg.stream->context.version > 1) - m_flags = m_dbg.stream->flags; } void restoreState() { - const bool currentSpaces = m_dbg.autoInsertSpaces(); + const bool currentSpaces = m_stream->space; if (currentSpaces && !m_spaces) - if (m_dbg.stream->buffer.endsWith(QLatin1Char(' '))) - m_dbg.stream->buffer.chop(1); + if (m_stream->buffer.endsWith(QLatin1Char(' '))) + m_stream->buffer.chop(1); - m_dbg.setAutoInsertSpaces(m_spaces); - m_dbg.stream->ts.d_ptr->params = m_streamParams; - if (m_dbg.stream->context.version > 1) - m_dbg.stream->flags = m_flags; + m_stream->space = m_spaces; + m_stream->ts.d_ptr->params = m_streamParams; + if (m_stream->context.version > 1) + m_stream->flags = m_flags; if (!currentSpaces && m_spaces) - m_dbg.stream->ts << ' '; + m_stream->ts << ' '; } - QDebug &m_dbg; + QDebug::Stream *m_stream; // QDebug state const bool m_spaces; - int m_flags; + const int m_flags; // QTextStream state const QTextStreamPrivate::Params m_streamParams; @@ -862,7 +884,7 @@ public: \sa QDebug::setAutoInsertSpaces(), QDebug::autoInsertSpaces() */ QDebugStateSaver::QDebugStateSaver(QDebug &dbg) - : d(new QDebugStateSaverPrivate(dbg)) + : d(new QDebugStateSaverPrivate(dbg.stream)) { } @@ -892,37 +914,127 @@ void qt_QMetaEnum_flagDebugOperator(QDebug &debug, size_t sizeofT, int value) #ifndef QT_NO_QOBJECT /*! + \fn QDebug qt_QMetaEnum_debugOperator(QDebug &, int value, const QMetaObject *, const char *name) \internal + + Formats the given enum \a value for debug output. + + The supported verbosity are: + + 0: Just the key, or value with enum name if no key is found: + + MyEnum2 + MyEnum(123) + MyScopedEnum::Enum3 + MyScopedEnum(456) + + 1: Same as 0, but treating all enums as scoped: + + MyEnum::MyEnum2 + MyEnum(123) + MyScopedEnum::Enum3 + MyScopedEnum(456) + + 2: The QDebug default. Same as 0, and includes class/namespace scope: + + MyNamespace::MyClass::MyEnum2 + MyNamespace::MyClass::MyEnum(123) + MyNamespace::MyClass::MyScopedEnum::Enum3 + MyNamespace::MyClass::MyScopedEnum(456) + + 3: Same as 2, but treating all enums as scoped: + + MyNamespace::MyClass::MyEnum::MyEnum2 + MyNamespace::MyClass::MyEnum(123) + MyNamespace::MyClass::MyScopedEnum::Enum3 + MyNamespace::MyClass::MyScopedEnum(456) */ QDebug qt_QMetaEnum_debugOperator(QDebug &dbg, int value, const QMetaObject *meta, const char *name) { QDebugStateSaver saver(dbg); dbg.nospace(); QMetaEnum me = meta->enumerator(meta->indexOfEnumerator(name)); - const char *key = me.valueToKey(value); - if (key) { + + const int verbosity = dbg.verbosity(); + if (verbosity >= QDebug::DefaultVerbosity) { if (const char *scope = me.scope()) dbg << scope << "::"; - if (me.isScoped()) - dbg << me.enumName() << "::"; - dbg << key; - } else { - dbg << meta->className() << "::" << name << "(" << value << ")"; } + + const char *key = me.valueToKey(value); + const bool scoped = me.isScoped() || verbosity & 1; + if (scoped || !key) + dbg << me.enumName() << (!key ? "(" : "::"); + + if (key) + dbg << key; + else + dbg << value << ")"; + return dbg; } +/*! + \fn QDebug qt_QMetaEnum_flagDebugOperator(QDebug &, quint64 value, const QMetaObject *, const char *name) + \internal + + Formats the given flag \a value for debug output. + + The supported verbosity are: + + 0: Just the key(s): + + MyFlag1 + MyFlag2|MyFlag3 + MyScopedFlag(MyFlag2) + MyScopedFlag(MyFlag2|MyFlag3) + + 1: Same as 0, but treating all flags as scoped: + + MyFlag(MyFlag1) + MyFlag(MyFlag2|MyFlag3) + MyScopedFlag(MyFlag2) + MyScopedFlag(MyFlag2|MyFlag3) + + 2: The QDebug default. Same as 1, and includes class/namespace scope: + + QFlags<MyNamespace::MyClass::MyFlag>(MyFlag1) + QFlags<MyNamespace::MyClass::MyFlag>(MyFlag2|MyFlag3) + QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2) + QFlags<MyNamespace::MyClass::MyScopedFlag>(MyFlag2|MyFlag3) + */ QDebug qt_QMetaEnum_flagDebugOperator(QDebug &debug, quint64 value, const QMetaObject *meta, const char *name) { + const int verbosity = debug.verbosity(); + QDebugStateSaver saver(debug); debug.resetFormat(); debug.noquote(); debug.nospace(); - debug << "QFlags<"; + const QMetaEnum me = meta->enumerator(meta->indexOfEnumerator(name)); - if (const char *scope = me.scope()) - debug << scope << "::"; - debug << me.enumName() << ">(" << me.valueToKeys(value) << ')'; + + const bool classScope = verbosity >= QDebug::DefaultVerbosity; + if (classScope) { + debug << "QFlags<"; + + if (const char *scope = me.scope()) + debug << scope << "::"; + } + + const bool enumScope = me.isScoped() || verbosity > QDebug::MinimumVerbosity; + if (enumScope) { + debug << me.enumName(); + if (classScope) + debug << ">"; + debug << "("; + } + + debug << me.valueToKeys(value); + + if (enumScope) + debug << ')'; + return debug; } #endif // !QT_NO_QOBJECT diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 9d1ce51da5..421c5d933b 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -65,9 +65,10 @@ QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QDebug { friend class QMessageLogger; + friend class QDebugStateSaver; friend class QDebugStateSaverPrivate; struct Stream { - enum { DefaultVerbosity = 2, VerbosityShift = 29, VerbosityMask = 0x7 }; + enum { VerbosityShift = 29, VerbosityMask = 0x7 }; Stream(QIODevice *device) : ts(device), ref(1), type(QtDebugMsg), space(true), message_output(false), flags(DefaultVerbosity << VerbosityShift) {} @@ -92,7 +93,7 @@ class Q_CORE_EXPORT QDebug void setFlag(FormatFlag flag) { if (context.version > 1) { flags |= flag; } } void unsetFlag(FormatFlag flag) { if (context.version > 1) { flags &= ~flag; } } int verbosity() const - { return context.version > 1 ? (flags >> VerbosityShift) & VerbosityMask : int(Stream::DefaultVerbosity); } + { return context.version > 1 ? (flags >> VerbosityShift) & VerbosityMask : int(DefaultVerbosity); } void setVerbosity(int v) { if (context.version > 1) { @@ -114,17 +115,22 @@ public: inline QDebug(QString *string) : stream(new Stream(string)) {} inline QDebug(QtMsgType t) : stream(new Stream(t)) {} inline QDebug(const QDebug &o):stream(o.stream) { ++stream->ref; } + QDebug(QDebug &&other) noexcept : stream{qExchange(other.stream, nullptr)} {} inline QDebug &operator=(const QDebug &other); + QDebug &operator=(QDebug &&other) noexcept + { QDebug{std::move(other)}.swap(*this); return *this; } ~QDebug(); - inline void swap(QDebug &other) Q_DECL_NOTHROW { qSwap(stream, other.stream); } + inline void swap(QDebug &other) noexcept { qSwap(stream, other.stream); } QDebug &resetFormat(); inline QDebug &space() { stream->space = true; stream->ts << ' '; return *this; } inline QDebug &nospace() { stream->space = false; return *this; } inline QDebug &maybeSpace() { if (stream->space) stream->ts << ' '; return *this; } + inline QDebug &verbosity(int verbosityLevel) { setVerbosity(verbosityLevel); return *this; } int verbosity() const { return stream->verbosity(); } void setVerbosity(int verbosityLevel) { stream->setVerbosity(verbosityLevel); } + enum VerbosityLevel { MinimumVerbosity = 0, DefaultVerbosity = 2, MaximumVerbosity = 7 }; bool autoInsertSpaces() const { return stream->space; } void setAutoInsertSpaces(bool b) { stream->space = b; } @@ -159,9 +165,7 @@ public: inline QDebug &operator<<(QLatin1String t) { putByteArray(t.latin1(), t.size(), ContainsLatin1); return maybeSpace(); } inline QDebug &operator<<(const QByteArray & t) { putByteArray(t.constData(), t.size(), ContainsBinary); return maybeSpace(); } inline QDebug &operator<<(const void * t) { stream->ts << t; return maybeSpace(); } -#ifdef Q_COMPILER_NULLPTR inline QDebug &operator<<(std::nullptr_t) { stream->ts << "(nullptr)"; return maybeSpace(); } -#endif inline QDebug &operator<<(QTextStreamFunction f) { stream->ts << f; return *this; @@ -195,6 +199,7 @@ public: inline QNoDebug "e() { return *this; } inline QNoDebug &noquote() { return *this; } inline QNoDebug &maybeQuote(const char = '"') { return *this; } + inline QNoDebug &verbosity(int) { return *this; } template<typename T> inline QNoDebug &operator<<(const T &) { return *this; } @@ -202,10 +207,7 @@ public: inline QDebug &QDebug::operator=(const QDebug &other) { - if (this != &other) { - QDebug copy(other); - qSwap(stream, copy.stream); - } + QDebug{other}.swap(*this); return *this; } @@ -349,7 +351,7 @@ void qt_QMetaEnum_flagDebugOperator(QDebug &debug, size_t sizeofT, Int value) { const QDebugStateSaver saver(debug); debug.resetFormat(); - debug.nospace() << "QFlags(" << hex << showbase; + debug.nospace() << "QFlags(" << Qt::hex << Qt::showbase; bool needSeparator = false; for (uint i = 0; i < sizeofT * 8; ++i) { if (value & (Int(1) << i)) { diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index f7778943c9..62dae3577c 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1069,6 +1069,7 @@ void QDir::setNameFilters(const QStringList &nameFilters) d->nameFilters = nameFilters; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -1083,11 +1084,15 @@ void QDir::setNameFilters(const QStringList &nameFilters) void QDir::addResourceSearchPath(const QString &path) { #ifdef QT_BUILD_CORE_LIB +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED QResource::addSearchPath(path); +QT_WARNING_POP #else Q_UNUSED(path) #endif } +#endif #ifdef QT_BUILD_CORE_LIB /*! @@ -1426,7 +1431,7 @@ QStringList QDir::entryList(const QStringList &nameFilters, Filters filters, l.append(it.fileInfo()); } QStringList ret; - d->sortFileList(sort, l, &ret, 0); + d->sortFileList(sort, l, &ret, nullptr); return ret; } @@ -1468,7 +1473,7 @@ QFileInfoList QDir::entryInfoList(const QStringList &nameFilters, Filters filter l.append(it.fileInfo()); } QFileInfoList ret; - d->sortFileList(sort, l, 0, &ret); + d->sortFileList(sort, l, nullptr, &ret); return ret; } @@ -1815,6 +1820,7 @@ QDir &QDir::operator=(const QDir &dir) return *this; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \overload \obsolete @@ -1828,6 +1834,7 @@ QDir &QDir::operator=(const QString &path) d_ptr->setPath(path); return *this; } +#endif /*! \fn void QDir::swap(QDir &other) diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 45c59d9e1d..45a40995f8 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -105,12 +105,13 @@ public: ~QDir(); QDir &operator=(const QDir &); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDir::setPath() instead") QDir &operator=(const QString &path); -#ifdef Q_COMPILER_RVALUE_REFS - QDir &operator=(QDir &&other) Q_DECL_NOTHROW { swap(other); return *this; } #endif + QDir &operator=(QDir &&other) noexcept { swap(other); return *this; } - void swap(QDir &other) Q_DECL_NOTHROW + void swap(QDir &other) noexcept { qSwap(d_ptr, other.d_ptr); } void setPath(const QString &path); @@ -118,7 +119,10 @@ public: QString absolutePath() const; QString canonicalPath() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDir::addSearchPath() instead") static void addResourceSearchPath(const QString &path); +#endif static void setSearchPaths(const QString &prefix, const QStringList &searchPaths); static void addSearchPath(const QString &prefix, const QString &path); @@ -184,7 +188,7 @@ public: static QFileInfoList drives(); - Q_DECL_CONSTEXPR static inline QChar listSeparator() Q_DECL_NOTHROW + Q_DECL_CONSTEXPR static inline QChar listSeparator() noexcept { #if defined(Q_OS_WIN) return QLatin1Char(';'); diff --git a/src/corelib/io/qdiriterator.cpp b/src/corelib/io/qdiriterator.cpp index ccde9745bf..21214ee273 100644 --- a/src/corelib/io/qdiriterator.cpp +++ b/src/corelib/io/qdiriterator.cpp @@ -93,6 +93,7 @@ #include "qdir_p.h" #include "qabstractfileengine_p.h" +#include <QtCore/qregexp.h> #include <QtCore/qset.h> #include <QtCore/qstack.h> #include <QtCore/qvariant.h> diff --git a/src/corelib/io/qfile.cpp b/src/corelib/io/qfile.cpp index 1fb9af576c..9f9a9e3040 100644 --- a/src/corelib/io/qfile.cpp +++ b/src/corelib/io/qfile.cpp @@ -61,6 +61,13 @@ QT_BEGIN_NAMESPACE +Q_DECL_COLD_FUNCTION +static bool file_already_open(QFile &file, const char *where = nullptr) +{ + qWarning("QFile::%s: File (%ls) already open", where ? where : "open", qUtf16Printable(file.fileName())); + return false; +} + //************* QFilePrivate QFilePrivate::QFilePrivate() { @@ -79,7 +86,7 @@ QFilePrivate::openExternalFile(int flags, int fd, QFile::FileHandleFlags handleF return false; #else delete fileEngine; - fileEngine = 0; + fileEngine = nullptr; QFSFileEngine *fe = new QFSFileEngine; fileEngine = fe; return fe->open(QIODevice::OpenMode(flags), fd, handleFlags); @@ -95,7 +102,7 @@ QFilePrivate::openExternalFile(int flags, FILE *fh, QFile::FileHandleFlags handl return false; #else delete fileEngine; - fileEngine = 0; + fileEngine = nullptr; QFSFileEngine *fe = new QFSFileEngine; fileEngine = fe; return fe->open(QIODevice::OpenMode(flags), fh, handleFlags); @@ -324,13 +331,12 @@ QFile::setFileName(const QString &name) { Q_D(QFile); if (isOpen()) { - qWarning("QFile::setFileName: File (%s) is already opened", - qPrintable(fileName())); + file_already_open(*this, "setFileName"); close(); } if(d->fileEngine) { //get a new file engine later delete d->fileEngine; - d->fileEngine = 0; + d->fileEngine = nullptr; } d->fileName = name; } @@ -454,7 +460,13 @@ QFile::exists(const QString &fileName) \sa fileName(), setFileName() */ +QString QFile::symLinkTarget() const +{ + Q_D(const QFile); + return d->engine()->fileName(QAbstractFileEngine::LinkName); +} +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -463,9 +475,9 @@ QFile::exists(const QString &fileName) QString QFile::readLink() const { - Q_D(const QFile); - return d->engine()->fileName(QAbstractFileEngine::LinkName); + return symLinkTarget(); } +#endif /*! \fn static QString QFile::symLinkTarget(const QString &fileName) @@ -478,7 +490,12 @@ QFile::readLink() const This name may not represent an existing file; it is only a string. QFile::exists() returns \c true if the symlink points to an existing file. */ +QString QFile::symLinkTarget(const QString &fileName) +{ + return QFileInfo(fileName).symLinkTarget(); +} +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -487,8 +504,9 @@ QFile::readLink() const QString QFile::readLink(const QString &fileName) { - return QFileInfo(fileName).readLink(); + return symLinkTarget(fileName); } +#endif /*! Removes the file specified by fileName(). Returns \c true if successful; @@ -792,7 +810,7 @@ QFile::copy(const QString &newName) error = true; d->setError(QFile::CopyError, tr("Cannot open %1 for input").arg(d->fileName)); } else { - QString fileTemplate = QLatin1String("%1/qt_temp.XXXXXX"); + const auto fileTemplate = QLatin1String("%1/qt_temp.XXXXXX"); #ifdef QT_NO_TEMPORARYFILE QFile out(fileTemplate.arg(QFileInfo(newName).path())); if (!out.open(QIODevice::ReadWrite)) @@ -808,7 +826,7 @@ QFile::copy(const QString &newName) if (error) { out.close(); close(); - d->setError(QFile::CopyError, tr("Cannot open for output")); + d->setError(QFile::CopyError, tr("Cannot open for output: %1").arg(out.errorString())); } else { if (!d->engine()->cloneTo(out.d_func()->engine())) { char block[4096]; @@ -898,10 +916,8 @@ QFile::copy(const QString &fileName, const QString &newName) bool QFile::open(OpenMode mode) { Q_D(QFile); - if (isOpen()) { - qWarning("QFile::open: File (%s) already open", qPrintable(fileName())); - return false; - } + if (isOpen()) + return file_already_open(*this); // Either Append or NewOnly implies WriteOnly if (mode & (Append | NewOnly)) mode |= WriteOnly; @@ -970,10 +986,8 @@ bool QFile::open(OpenMode mode) bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags) { Q_D(QFile); - if (isOpen()) { - qWarning("QFile::open: File (%s) already open", qPrintable(fileName())); - return false; - } + if (isOpen()) + return file_already_open(*this); // Either Append or NewOnly implies WriteOnly if (mode & (Append | NewOnly)) mode |= WriteOnly; @@ -1029,10 +1043,8 @@ bool QFile::open(FILE *fh, OpenMode mode, FileHandleFlags handleFlags) bool QFile::open(int fd, OpenMode mode, FileHandleFlags handleFlags) { Q_D(QFile); - if (isOpen()) { - qWarning("QFile::open: File (%s) already open", qPrintable(fileName())); - return false; - } + if (isOpen()) + return file_already_open(*this); // Either Append or NewOnly implies WriteOnly if (mode & (Append | NewOnly)) mode |= WriteOnly; diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index e6f3d942fe..cf1465ec70 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -107,10 +107,14 @@ public: bool exists() const; static bool exists(const QString &fileName); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QFile::symLinkTarget() instead") QString readLink() const; + QT_DEPRECATED_X("Use QFile::symLinkTarget(QString) instead") static QString readLink(const QString &fileName); - inline QString symLinkTarget() const { return readLink(); } - inline static QString symLinkTarget(const QString &fileName) { return readLink(fileName); } +#endif + QString symLinkTarget() const; + static QString symLinkTarget(const QString &fileName); bool remove(); static bool remove(const QString &fileName); diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp index 2f99775c65..2f74547054 100644 --- a/src/corelib/io/qfiledevice.cpp +++ b/src/corelib/io/qfiledevice.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE #endif QFileDevicePrivate::QFileDevicePrivate() - : fileEngine(0), + : fileEngine(nullptr), cachedSize(0), error(QFile::NoError), lastWasWrite(false) { @@ -63,7 +63,7 @@ QFileDevicePrivate::QFileDevicePrivate() QFileDevicePrivate::~QFileDevicePrivate() { delete fileEngine; - fileEngine = 0; + fileEngine = nullptr; } QAbstractFileEngine * QFileDevicePrivate::engine() const @@ -700,7 +700,7 @@ bool QFileDevice::setPermissions(Permissions permissions) Any mapping options can be passed through \a flags. - Returns a pointer to the memory or 0 if there is an error. + Returns a pointer to the memory or \nullptr if there is an error. \sa unmap() */ @@ -711,11 +711,11 @@ uchar *QFileDevice::map(qint64 offset, qint64 size, MemoryMapFlags flags) && d->fileEngine->supportsExtension(QAbstractFileEngine::MapExtension)) { unsetError(); uchar *address = d->fileEngine->map(offset, size, flags); - if (address == 0) + if (address == nullptr) d->setError(d->fileEngine->error(), d->fileEngine->errorString()); return address; } - return 0; + return nullptr; } /*! diff --git a/src/corelib/io/qfiledevice.h b/src/corelib/io/qfiledevice.h index af41bec2f6..2d524193c5 100644 --- a/src/corelib/io/qfiledevice.h +++ b/src/corelib/io/qfiledevice.h @@ -100,7 +100,7 @@ public: FileError error() const; void unsetError(); - virtual void close() override; + void close() override; bool isSequential() const override; diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 185e061d8f..f5b398feae 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -52,7 +52,7 @@ QString QFileInfoPrivate::getFileName(QAbstractFileEngine::FileName name) const return fileNames[(int)name]; QString ret; - if (fileEngine == 0) { // local file; use the QFileSystemEngine directly + if (fileEngine == nullptr) { // local file; use the QFileSystemEngine directly switch (name) { case QAbstractFileEngine::CanonicalName: case QAbstractFileEngine::CanonicalPathName: { @@ -103,7 +103,7 @@ QString QFileInfoPrivate::getFileOwner(QAbstractFileEngine::FileOwner own) const if (cache_enabled && !fileOwners[(int)own].isNull()) return fileOwners[(int)own]; QString ret; - if (fileEngine == 0) { + if (fileEngine == nullptr) { switch (own) { case QAbstractFileEngine::OwnerUser: ret = QFileSystemEngine::resolveUserName(fileEntry, metaData); @@ -134,7 +134,7 @@ uint QFileInfoPrivate::getFileFlags(QAbstractFileEngine::FileFlags request) cons // extra syscall. Bundle detecton on Mac can be slow, expecially on network // paths, so we separate out that as well. - QAbstractFileEngine::FileFlags req = 0; + QAbstractFileEngine::FileFlags req = nullptr; uint cachedFlags = 0; if (request & (QAbstractFileEngine::FlagsMask | QAbstractFileEngine::TypesMask)) { @@ -434,7 +434,7 @@ bool QFileInfo::operator==(const QFileInfo &fileinfo) const return true; Qt::CaseSensitivity sensitive; - if (d->fileEngine == 0 || fileinfo.d_ptr->fileEngine == 0) { + if (d->fileEngine == nullptr || fileinfo.d_ptr->fileEngine == nullptr) { if (d->fileEngine != fileinfo.d_ptr->fileEngine) // one is native, the other is a custom file-engine return false; @@ -649,7 +649,7 @@ bool QFileInfo::isRelative() const Q_D(const QFileInfo); if (d->isDefaultConstructed) return true; - if (d->fileEngine == 0) + if (d->fileEngine == nullptr) return d->fileEntry.isRelative(); return d->fileEngine->isRelativePath(); } @@ -682,7 +682,7 @@ bool QFileInfo::exists() const Q_D(const QFileInfo); if (d->isDefaultConstructed) return false; - if (d->fileEngine == 0) { + if (d->fileEngine == nullptr) { if (!d->cache_enabled || !d->metaData.hasFlags(QFileSystemMetaData::ExistsAttribute)) QFileSystemEngine::fillMetaData(d->fileEntry, d->metaData, QFileSystemMetaData::ExistsAttribute); return d->metaData.exists(); @@ -982,7 +982,7 @@ bool QFileInfo::isNativePath() const Q_D(const QFileInfo); if (d->isDefaultConstructed) return false; - if (d->fileEngine == 0) + if (d->fileEngine == nullptr) return true; return d->getFileFlags(QAbstractFileEngine::LocalDiskFlag); } @@ -1075,7 +1075,7 @@ bool QFileInfo::isRoot() const Q_D(const QFileInfo); if (d->isDefaultConstructed) return false; - if (d->fileEngine == 0) { + if (d->fileEngine == nullptr) { if (d->fileEntry.isRoot()) { #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT) //the path is a drive root, but the drive may not exist @@ -1107,6 +1107,7 @@ bool QFileInfo::isRoot() const \sa exists(), isSymLink(), isDir(), isFile() */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -1114,6 +1115,12 @@ bool QFileInfo::isRoot() const */ QString QFileInfo::readLink() const { + return symLinkTarget(); +} +#endif + +QString QFileInfo::symLinkTarget() const +{ Q_D(const QFileInfo); if (d->isDefaultConstructed) return QLatin1String(""); diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index f295a86015..111517325d 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -67,11 +67,9 @@ public: ~QFileInfo(); QFileInfo &operator=(const QFileInfo &fileinfo); -#ifdef Q_COMPILER_RVALUE_REFS - QFileInfo &operator=(QFileInfo &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QFileInfo &operator=(QFileInfo &&other) noexcept { swap(other); return *this; } - void swap(QFileInfo &other) Q_DECL_NOTHROW + void swap(QFileInfo &other) noexcept { qSwap(d_ptr, other.d_ptr); } bool operator==(const QFileInfo &fileinfo) const; @@ -116,8 +114,11 @@ public: bool isRoot() const; bool isBundle() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QFileInfo::symLinkTarget() instead") QString readLink() const; - inline QString symLinkTarget() const { return readLink(); } +#endif + QString symLinkTarget() const; QString owner() const; uint ownerId() const; diff --git a/src/corelib/io/qfileinfo_p.h b/src/corelib/io/qfileinfo_p.h index e4b28f4519..36f440812f 100644 --- a/src/corelib/io/qfileinfo_p.h +++ b/src/corelib/io/qfileinfo_p.h @@ -80,7 +80,7 @@ public: }; inline QFileInfoPrivate() - : QSharedData(), fileEngine(0), + : QSharedData(), fileEngine(nullptr), cachedFlags(0), isDefaultConstructed(true), cache_enabled(true), fileFlags(0), fileSize(0) diff --git a/src/corelib/io/qfilesystemengine.cpp b/src/corelib/io/qfilesystemengine.cpp index 7abdf90bf5..21847c2a7c 100644 --- a/src/corelib/io/qfilesystemengine.cpp +++ b/src/corelib/io/qfilesystemengine.cpp @@ -124,7 +124,7 @@ static inline bool _q_checkEntry(QAbstractFileEngine *&engine, bool resolvingEnt if (resolvingEntry) { if (!(engine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::ExistsFlag)) { delete engine; - engine = 0; + engine = nullptr; return false; } } @@ -191,7 +191,7 @@ static bool _q_resolveEntryAndCreateLegacyEngine_recursive(QFileSystemEntry &ent QAbstractFileEngine *QFileSystemEngine::resolveEntryAndCreateLegacyEngine( QFileSystemEntry &entry, QFileSystemMetaData &data) { QFileSystemEntry copy = entry; - QAbstractFileEngine *engine = 0; + QAbstractFileEngine *engine = nullptr; if (_q_resolveEntryAndCreateLegacyEngine_recursive(copy, data, engine)) // Reset entry to resolved copy. diff --git a/src/corelib/io/qfilesystemengine_p.h b/src/corelib/io/qfilesystemengine_p.h index 09ec2d6a10..e44837747c 100644 --- a/src/corelib/io/qfilesystemengine_p.h +++ b/src/corelib/io/qfilesystemengine_p.h @@ -130,7 +130,7 @@ public: static bool removeFile(const QFileSystemEntry &entry, QSystemError &error); static bool setPermissions(const QFileSystemEntry &entry, QFile::Permissions permissions, QSystemError &error, - QFileSystemMetaData *data = 0); + QFileSystemMetaData *data = nullptr); // unused, therefore not implemented static bool setFileTime(const QFileSystemEntry &entry, const QDateTime &newDate, diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp index 5bab897d43..066a7c3f01 100644 --- a/src/corelib/io/qfilesystemengine_unix.cpp +++ b/src/corelib/io/qfilesystemengine_unix.cpp @@ -695,52 +695,36 @@ QFileSystemEntry QFileSystemEngine::canonicalName(const QFileSystemEntry &entry, Q_UNUSED(data); return QFileSystemEntry(slowCanonicalized(absoluteName(entry).filePath())); #else - char *ret = 0; -# if defined(Q_OS_DARWIN) - ret = (char*)malloc(PATH_MAX + 1); - if (ret && realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) { - const int savedErrno = errno; // errno is checked below, and free() might change it - free(ret); - errno = savedErrno; - ret = 0; - } -# elif defined(Q_OS_ANDROID) - // On some Android versions, realpath() will return a path even if it does not exist - // To work around this, we check existence in advance. + char stack_result[PATH_MAX+1]; + char *resolved_name = nullptr; +# if defined(Q_OS_DARWIN) || defined(Q_OS_ANDROID) + // On some Android and macOS versions, realpath() will return a path even if + // it does not exist. To work around this, we check existence in advance. if (!data.hasFlags(QFileSystemMetaData::ExistsAttribute)) fillMetaData(entry, data, QFileSystemMetaData::ExistsAttribute); if (!data.exists()) { - ret = 0; errno = ENOENT; } else { - ret = (char*)malloc(PATH_MAX + 1); - if (realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) { - const int savedErrno = errno; // errno is checked below, and free() might change it - free(ret); - errno = savedErrno; - ret = 0; - } + resolved_name = stack_result; } - + if (resolved_name && realpath(entry.nativeFilePath().constData(), resolved_name) == nullptr) + resolved_name = nullptr; # else -# if _POSIX_VERSION >= 200801L - ret = realpath(entry.nativeFilePath().constData(), (char*)0); +# if _POSIX_VERSION >= 200801L // ask realpath to allocate memory + resolved_name = realpath(entry.nativeFilePath().constData(), nullptr); # else - ret = (char*)malloc(PATH_MAX + 1); - if (realpath(entry.nativeFilePath().constData(), (char*)ret) == 0) { - const int savedErrno = errno; // errno is checked below, and free() might change it - free(ret); - errno = savedErrno; - ret = 0; - } + resolved_name = stack_result; + if (realpath(entry.nativeFilePath().constData(), resolved_name) == nullptr) + resolved_name = nullptr; # endif # endif - if (ret) { + if (resolved_name) { data.knownFlagsMask |= QFileSystemMetaData::ExistsAttribute; data.entryFlags |= QFileSystemMetaData::ExistsAttribute; - QString canonicalPath = QDir::cleanPath(QFile::decodeName(ret)); - free(ret); + QString canonicalPath = QDir::cleanPath(QFile::decodeName(resolved_name)); + if (resolved_name != stack_result) + free(resolved_name); return QFileSystemEntry(canonicalPath); } else if (errno == ENOENT || errno == ENOTDIR) { // file doesn't exist data.knownFlagsMask |= QFileSystemMetaData::ExistsAttribute; @@ -829,7 +813,7 @@ QString QFileSystemEngine::resolveUserName(uint userId) #endif #if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_WASM) - struct passwd *pw = 0; + struct passwd *pw = nullptr; #if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) struct passwd entry; getpwuid_r(userId, &entry, buf.data(), buf.size(), &pw); @@ -853,7 +837,7 @@ QString QFileSystemEngine::resolveGroupName(uint groupId) #endif #if !defined(Q_OS_INTEGRITY) && !defined(Q_OS_WASM) - struct group *gr = 0; + struct group *gr = nullptr; #if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD) && !defined(Q_OS_VXWORKS) && (!defined(Q_OS_ANDROID) || defined(Q_OS_ANDROID) && (__ANDROID_API__ >= 24)) size_max = sysconf(_SC_GETGR_R_SIZE_MAX); if (size_max == -1) diff --git a/src/corelib/io/qfilesystemiterator_p.h b/src/corelib/io/qfilesystemiterator_p.h index 081487e66e..5e4e424e69 100644 --- a/src/corelib/io/qfilesystemiterator_p.h +++ b/src/corelib/io/qfilesystemiterator_p.h @@ -96,7 +96,7 @@ private: int lastError; #endif - Q_DISABLE_COPY(QFileSystemIterator) + Q_DISABLE_COPY_MOVE(QFileSystemIterator) }; QT_END_NAMESPACE diff --git a/src/corelib/io/qfilesystemiterator_unix.cpp b/src/corelib/io/qfilesystemiterator_unix.cpp index a9acf542d4..5ac7e13a2e 100644 --- a/src/corelib/io/qfilesystemiterator_unix.cpp +++ b/src/corelib/io/qfilesystemiterator_unix.cpp @@ -50,15 +50,15 @@ QT_BEGIN_NAMESPACE QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters, const QStringList &nameFilters, QDirIterator::IteratorFlags flags) : nativePath(entry.nativeFilePath()) - , dir(0) - , dirEntry(0) + , dir(nullptr) + , dirEntry(nullptr) , lastError(0) { Q_UNUSED(filters) Q_UNUSED(nameFilters) Q_UNUSED(flags) - if ((dir = QT_OPENDIR(nativePath.constData())) == 0) { + if ((dir = QT_OPENDIR(nativePath.constData())) == nullptr) { lastError = errno; } else { if (!nativePath.endsWith('/')) diff --git a/src/corelib/io/qfilesystemmetadata_p.h b/src/corelib/io/qfilesystemmetadata_p.h index 4d2a5acb9b..81f4b3ba13 100644 --- a/src/corelib/io/qfilesystemmetadata_p.h +++ b/src/corelib/io/qfilesystemmetadata_p.h @@ -76,7 +76,7 @@ class Q_AUTOTEST_EXPORT QFileSystemMetaData { public: QFileSystemMetaData() - : knownFlagsMask(0), + : knownFlagsMask(nullptr), size_(-1) { } @@ -184,7 +184,7 @@ public: void clear() { - knownFlagsMask = 0; + knownFlagsMask = nullptr; } void clearFlags(MetaDataFlags flags = AllMetaDataFlags) diff --git a/src/corelib/io/qfilesystemwatcher.cpp b/src/corelib/io/qfilesystemwatcher.cpp index f40e166d9f..e3e4433a6b 100644 --- a/src/corelib/io/qfilesystemwatcher.cpp +++ b/src/corelib/io/qfilesystemwatcher.cpp @@ -311,6 +311,17 @@ bool QFileSystemWatcher::addPath(const QString &path) return paths.isEmpty(); } +static QStringList empty_paths_pruned(const QStringList &paths) +{ + QStringList p; + p.reserve(paths.size()); + const auto isEmpty = [](const QString &s) { return s.isEmpty(); }; + std::remove_copy_if(paths.begin(), paths.end(), + std::back_inserter(p), + isEmpty); + return p; +} + /*! Adds each path in \a paths to the file system watcher. Paths are not added if they not exist, or if they are already being @@ -338,47 +349,41 @@ QStringList QFileSystemWatcher::addPaths(const QStringList &paths) { Q_D(QFileSystemWatcher); - QStringList p = paths; - QMutableListIterator<QString> it(p); - - while (it.hasNext()) { - const QString &path = it.next(); - if (path.isEmpty()) - it.remove(); - } + QStringList p = empty_paths_pruned(paths); if (p.isEmpty()) { qWarning("QFileSystemWatcher::addPaths: list is empty"); - return QStringList(); + return p; } - QFileSystemWatcherEngine *engine = 0; - - const QString on = objectName(); - - if (!on.startsWith(QLatin1String("_qt_autotest_force_engine_"))) { + const auto selectEngine = [this, d]() -> QFileSystemWatcherEngine* { +#ifdef QT_BUILD_INTERNAL + const QString on = objectName(); + + if (Q_UNLIKELY(on.startsWith(QLatin1String("_qt_autotest_force_engine_")))) { + // Autotest override case - use the explicitly selected engine only + const QStringRef forceName = on.midRef(26); + if (forceName == QLatin1String("poller")) { + qDebug("QFileSystemWatcher: skipping native engine, using only polling engine"); + d_func()->initPollerEngine(); + return d->poller; + } else if (forceName == QLatin1String("native")) { + qDebug("QFileSystemWatcher: skipping polling engine, using only native engine"); + return d->native; + } + return nullptr; + } +#endif // Normal runtime case - search intelligently for best engine if(d->native) { - engine = d->native; + return d->native; } else { d_func()->initPollerEngine(); - engine = d->poller; - } - - } else { - // Autotest override case - use the explicitly selected engine only - const QStringRef forceName = on.midRef(26); - if(forceName == QLatin1String("poller")) { - qDebug("QFileSystemWatcher: skipping native engine, using only polling engine"); - d_func()->initPollerEngine(); - engine = d->poller; - } else if(forceName == QLatin1String("native")) { - qDebug("QFileSystemWatcher: skipping polling engine, using only native engine"); - engine = d->native; + return d->poller; } - } + }; - if(engine) + if (auto engine = selectEngine()) p = engine->addPaths(p, &d->files, &d->directories); return p; @@ -420,18 +425,11 @@ QStringList QFileSystemWatcher::removePaths(const QStringList &paths) { Q_D(QFileSystemWatcher); - QStringList p = paths; - QMutableListIterator<QString> it(p); - - while (it.hasNext()) { - const QString &path = it.next(); - if (path.isEmpty()) - it.remove(); - } + QStringList p = empty_paths_pruned(paths); if (p.isEmpty()) { qWarning("QFileSystemWatcher::removePaths: list is empty"); - return QStringList(); + return p; } if (d->native) diff --git a/src/corelib/io/qfilesystemwatcher_fsevents.mm b/src/corelib/io/qfilesystemwatcher_fsevents.mm index f594fad803..fb3b6f86fd 100644 --- a/src/corelib/io/qfilesystemwatcher_fsevents.mm +++ b/src/corelib/io/qfilesystemwatcher_fsevents.mm @@ -407,7 +407,7 @@ QStringList QFseventsFileSystemWatcherEngine::addPaths(const QStringList &paths, stopStream(); if (!startStream()) { // ok, something went wrong, let's try to restore the previous state - watchingState = qMove(oldState); + watchingState = std::move(oldState); // and because we don't know which path caused the issue (if any), fail on all of them p = paths; @@ -474,7 +474,7 @@ QStringList QFseventsFileSystemWatcherEngine::removePaths(const QStringList &pat if (needsRestart) { if (!restartStream()) { - watchingState = qMove(oldState); + watchingState = std::move(oldState); startStream(); } } diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp index a5e629b646..5fb5685f42 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify.cpp +++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp @@ -46,6 +46,7 @@ #include <qdebug.h> #include <qfile.h> #include <qfileinfo.h> +#include <qscopeguard.h> #include <qsocketnotifier.h> #include <qvarlengtharray.h> @@ -268,12 +269,11 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths, QStringList *files, QStringList *directories) { - QStringList p = paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { QFileInfo fi(path); bool isDir = fi.isDir(); + auto sg = qScopeGuard([&]{ unhandled.push_back(path); }); if (isDir) { if (directories->contains(path)) continue; @@ -305,7 +305,7 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths, continue; } - it.remove(); + sg.dismiss(); int id = isDir ? -wd : wd; if (id < 0) { @@ -318,19 +318,19 @@ QStringList QInotifyFileSystemWatcherEngine::addPaths(const QStringList &paths, idToPath.insert(id, path); } - return p; + return unhandled; } QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &paths, QStringList *files, QStringList *directories) { - QStringList p = paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { int id = pathToID.take(path); + auto sg = qScopeGuard([&]{ unhandled.push_back(path); }); + // Multiple paths could be associated to the same watch descriptor // when a file is moved and added with the new name. // So we should find and delete the correct one by using @@ -349,7 +349,8 @@ QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &path inotify_rm_watch(inotifyFd, wd); } - it.remove(); + sg.dismiss(); + if (id < 0) { directories->removeAll(path); } else { @@ -357,7 +358,7 @@ QStringList QInotifyFileSystemWatcherEngine::removePaths(const QStringList &path } } - return p; + return unhandled; } void QInotifyFileSystemWatcherEngine::readFromInotify() @@ -388,7 +389,7 @@ void QInotifyFileSystemWatcherEngine::readFromInotify() const inotify_event &event = **it; ++it; - // qDebug() << "inotify event, wd" << event.wd << "mask" << hex << event.mask; + // qDebug() << "inotify event, wd" << event.wd << "mask" << Qt::hex << event.mask; int id = event.wd; QString path = getPathFromID(id); diff --git a/src/corelib/io/qfilesystemwatcher_kqueue.cpp b/src/corelib/io/qfilesystemwatcher_kqueue.cpp index 423b88cb7f..c2028e3641 100644 --- a/src/corelib/io/qfilesystemwatcher_kqueue.cpp +++ b/src/corelib/io/qfilesystemwatcher_kqueue.cpp @@ -45,6 +45,7 @@ #include <qdebug.h> #include <qfile.h> +#include <qscopeguard.h> #include <qsocketnotifier.h> #include <qvarlengtharray.h> @@ -94,10 +95,9 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths, QStringList *files, QStringList *directories) { - QStringList p = paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { + auto sg = qScopeGuard([&]{unhandled.push_back(path);}); int fd; #if defined(O_EVTONLY) fd = qt_safe_open(QFile::encodeName(path), O_EVTONLY); @@ -149,7 +149,8 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths, continue; } - it.remove(); + sg.dismiss(); + if (id < 0) { DEBUG() << "QKqueueFileSystemWatcherEngine: added directory path" << path; directories->append(path); @@ -162,20 +163,19 @@ QStringList QKqueueFileSystemWatcherEngine::addPaths(const QStringList &paths, idToPath.insert(id, path); } - return p; + return unhandled; } QStringList QKqueueFileSystemWatcherEngine::removePaths(const QStringList &paths, QStringList *files, QStringList *directories) { - QStringList p = paths; if (pathToID.isEmpty()) - return p; + return paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { + auto sg = qScopeGuard([&]{unhandled.push_back(path);}); int id = pathToID.take(path); QString x = idToPath.take(id); if (x.isEmpty() || x != path) @@ -183,14 +183,15 @@ QStringList QKqueueFileSystemWatcherEngine::removePaths(const QStringList &paths ::close(id < 0 ? -id : id); - it.remove(); + sg.dismiss(); + if (id < 0) directories->removeAll(path); else files->removeAll(path); } - return p; + return unhandled; } void QKqueueFileSystemWatcherEngine::readFromKqueue() diff --git a/src/corelib/io/qfilesystemwatcher_polling.cpp b/src/corelib/io/qfilesystemwatcher_polling.cpp index 903c15f4a9..e07b02f7c2 100644 --- a/src/corelib/io/qfilesystemwatcher_polling.cpp +++ b/src/corelib/io/qfilesystemwatcher_polling.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qfilesystemwatcher_polling_p.h" +#include <QtCore/qscopeguard.h> #include <QtCore/qtimer.h> QT_BEGIN_NAMESPACE @@ -53,10 +54,9 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths, QStringList *files, QStringList *directories) { - QStringList p = paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { + auto sg = qScopeGuard([&]{ unhandled.push_back(path); }); QFileInfo fi(path); if (!fi.exists()) continue; @@ -73,7 +73,7 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths, files->append(path); this->files.insert(path, fi); } - it.remove(); + sg.dismiss(); } if ((!this->files.isEmpty() || @@ -82,23 +82,21 @@ QStringList QPollingFileSystemWatcherEngine::addPaths(const QStringList &paths, timer.start(PollingInterval); } - return p; + return unhandled; } QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &paths, QStringList *files, QStringList *directories) { - QStringList p = paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { if (this->directories.remove(path)) { directories->removeAll(path); - it.remove(); } else if (this->files.remove(path)) { files->removeAll(path); - it.remove(); + } else { + unhandled.push_back(path); } } @@ -107,38 +105,37 @@ QStringList QPollingFileSystemWatcherEngine::removePaths(const QStringList &path timer.stop(); } - return p; + return unhandled; } void QPollingFileSystemWatcherEngine::timeout() { - QMutableHashIterator<QString, FileInfo> fit(files); - while (fit.hasNext()) { - QHash<QString, FileInfo>::iterator x = fit.next(); + for (auto it = files.begin(), end = files.end(); it != end; /*erasing*/) { + auto x = it++; QString path = x.key(); QFileInfo fi(path); if (!fi.exists()) { - fit.remove(); + files.erase(x); emit fileChanged(path, true); } else if (x.value() != fi) { x.value() = fi; emit fileChanged(path, false); } } - QMutableHashIterator<QString, FileInfo> dit(directories); - while (dit.hasNext()) { - QHash<QString, FileInfo>::iterator x = dit.next(); + + for (auto it = directories.begin(), end = directories.end(); it != end; /*erasing*/) { + auto x = it++; QString path = x.key(); QFileInfo fi(path); if (!path.endsWith(QLatin1Char('/'))) fi = QFileInfo(path + QLatin1Char('/')); if (!fi.exists()) { - dit.remove(); + directories.erase(x); emit directoryChanged(path, true); } else if (x.value() != fi) { fi.refresh(); if (!fi.exists()) { - dit.remove(); + directories.erase(x); emit directoryChanged(path, true); } else { x.value() = fi; diff --git a/src/corelib/io/qfilesystemwatcher_win.cpp b/src/corelib/io/qfilesystemwatcher_win.cpp index 66985f8982..c22a003931 100644 --- a/src/corelib/io/qfilesystemwatcher_win.cpp +++ b/src/corelib/io/qfilesystemwatcher_win.cpp @@ -44,6 +44,7 @@ #include <qfileinfo.h> #include <qstringlist.h> #include <qset.h> +#include <qscopeguard.h> #include <qdatetime.h> #include <qdir.h> #include <qtextstream.h> @@ -79,7 +80,7 @@ static Qt::HANDLE createChangeNotification(const QString &path, uint flags) nativePath.append(QLatin1Char('\\')); const HANDLE result = FindFirstChangeNotification(reinterpret_cast<const wchar_t *>(nativePath.utf16()), FALSE, flags); - DEBUG() << __FUNCTION__ << nativePath << hex <<showbase << flags << "returns" << result; + DEBUG() << __FUNCTION__ << nativePath << Qt::hex <<showbase << flags << "returns" << result; return result; } @@ -108,7 +109,11 @@ public: // Call from QFileSystemWatcher::addPaths() to set up notifications on drives void addPath(const QString &path); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool nativeEventFilter(const QByteArray &, void *messageIn, qintptr *) override; +#else bool nativeEventFilter(const QByteArray &, void *messageIn, long *) override; +#endif signals: void driveAdded(); @@ -255,7 +260,11 @@ inline void QWindowsRemovableDriveListener::handleDbtDriveArrivalRemoval(const M } } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QWindowsRemovableDriveListener::nativeEventFilter(const QByteArray &, void *messageIn, qintptr *) +#else bool QWindowsRemovableDriveListener::nativeEventFilter(const QByteArray &, void *messageIn, long *) +#endif { const MSG *msg = reinterpret_cast<const MSG *>(messageIn); if (msg->message == WM_DEVICECHANGE) { @@ -297,8 +306,7 @@ void QWindowsRemovableDriveListener::addPath(const QString &p) OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, // Volume requires BACKUP_SEMANTICS 0); if (volumeHandle == INVALID_HANDLE_VALUE) { - qErrnoWarning("CreateFile %s failed.", - qPrintable(QString::fromWCharArray(devicePath))); + qErrnoWarning("CreateFile %ls failed.", devicePath); return; } @@ -315,8 +323,7 @@ void QWindowsRemovableDriveListener::addPath(const QString &p) // closed. Do it here to avoid having to close/reopen in lock message handling. CloseHandle(volumeHandle); if (!re.devNotify) { - qErrnoWarning("RegisterDeviceNotification %s failed.", - qPrintable(QString::fromWCharArray(devicePath))); + qErrnoWarning("RegisterDeviceNotification %ls failed.", devicePath); return; } @@ -369,10 +376,9 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, QStringList *directories) { DEBUG() << "Adding" << paths.count() << "to existing" << (files->count() + directories->count()) << "watchers"; - QStringList p = paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { + auto sg = qScopeGuard([&] { unhandled.push_back(path); }); QString normalPath = path; if ((normalPath.endsWith(QLatin1Char('/')) && !normalPath.endsWith(QLatin1String(":/"))) || (normalPath.endsWith(QLatin1Char('\\')) && !normalPath.endsWith(QLatin1String(":\\")))) { @@ -424,7 +430,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, // Requesting to add a file whose directory has been added previously. // Recreate the notification handle to add the missing notification attributes // for files (FILE_NOTIFY_CHANGE_ATTRIBUTES...) - DEBUG() << "recreating" << absolutePath << hex << showbase << hit.value().flags + DEBUG() << "recreating" << absolutePath << Qt::hex << Qt::showbase << hit.value().flags << "->" << flags; const Qt::HANDLE fileHandle = createChangeNotification(absolutePath, flags); if (fileHandle != INVALID_HANDLE_VALUE) { @@ -455,7 +461,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, else files->append(path); } - it.remove(); + sg.dismiss(); thread->wakeup(); break; } @@ -485,7 +491,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, else files->append(path); - it.remove(); + sg.dismiss(); found = true; thread->wakeup(); break; @@ -511,7 +517,7 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, thread->msg = '@'; thread->start(); threads.append(thread); - it.remove(); + sg.dismiss(); } } } @@ -519,12 +525,12 @@ QStringList QWindowsFileSystemWatcherEngine::addPaths(const QStringList &paths, #ifndef Q_OS_WINRT if (Q_LIKELY(m_driveListener)) { for (const QString &path : paths) { - if (!p.contains(path)) + if (!unhandled.contains(path)) m_driveListener->addPath(path); } } #endif // !Q_OS_WINRT - return p; + return unhandled; } QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &paths, @@ -532,10 +538,9 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path QStringList *directories) { DEBUG() << "removePaths" << paths; - QStringList p = paths; - QMutableListIterator<QString> it(p); - while (it.hasNext()) { - QString path = it.next(); + QStringList unhandled; + for (const QString &path : paths) { + auto sg = qScopeGuard([&] { unhandled.push_back(path); }); QString normalPath = path; if (normalPath.endsWith(QLatin1Char('/')) || normalPath.endsWith(QLatin1Char('\\'))) normalPath.chop(1); @@ -564,7 +569,7 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path // ### files->removeAll(path); directories->removeAll(path); - it.remove(); + sg.dismiss(); if (h.isEmpty()) { DEBUG() << "Closing handle" << handle.handle; @@ -605,7 +610,7 @@ QStringList QWindowsFileSystemWatcherEngine::removePaths(const QStringList &path } threads.removeAll(0); - return p; + return unhandled; } /////////// @@ -634,15 +639,15 @@ QWindowsFileSystemWatcherEngineThread::~QWindowsFileSystemWatcherEngineThread() } } -static inline QString msgFindNextFailed(const QWindowsFileSystemWatcherEngineThread::PathInfoHash &pathInfos) +Q_DECL_COLD_FUNCTION +static QString msgFindNextFailed(const QWindowsFileSystemWatcherEngineThread::PathInfoHash &pathInfos) { - QString result; - QTextStream str(&result); - str << "QFileSystemWatcher: FindNextChangeNotification failed for"; + QString str; + str += QLatin1String("QFileSystemWatcher: FindNextChangeNotification failed for"); for (const QWindowsFileSystemWatcherEngine::PathInfo &pathInfo : pathInfos) - str << " \"" << QDir::toNativeSeparators(pathInfo.absolutePath) << '"'; - str << ' '; - return result; + str += QLatin1String(" \"") + QDir::toNativeSeparators(pathInfo.absolutePath) + QLatin1Char('"'); + str += QLatin1Char(' '); + return str; } void QWindowsFileSystemWatcherEngineThread::run() @@ -688,11 +693,10 @@ void QWindowsFileSystemWatcherEngineThread::run() fakeRemove = true; } - qErrnoWarning(error, "%s", qPrintable(msgFindNextFailed(h))); + qErrnoWarning(error, "%ls", qUtf16Printable(msgFindNextFailed(h))); } - QMutableHashIterator<QFileSystemWatcherPathKey, QWindowsFileSystemWatcherEngine::PathInfo> it(h); - while (it.hasNext()) { - QWindowsFileSystemWatcherEngineThread::PathInfoHash::iterator x = it.next(); + for (auto it = h.begin(), end = h.end(); it != end; /*erasing*/ ) { + auto x = it++; QString absolutePath = x.value().absolutePath; QFileInfo fileInfo(x.value().path); DEBUG() << "checking" << x.key(); @@ -718,6 +722,7 @@ void QWindowsFileSystemWatcherEngineThread::run() handleForDir.remove(QFileSystemWatcherPathKey(absolutePath)); // h is now invalid + break; } } else if (x.value().isDir) { DEBUG() << x.key() << "directory changed!"; diff --git a/src/corelib/io/qfilesystemwatcher_win_p.h b/src/corelib/io/qfilesystemwatcher_win_p.h index 1d3224614c..272591ce7a 100644 --- a/src/corelib/io/qfilesystemwatcher_win_p.h +++ b/src/corelib/io/qfilesystemwatcher_win_p.h @@ -77,8 +77,8 @@ public: explicit QWindowsFileSystemWatcherEngine(QObject *parent); ~QWindowsFileSystemWatcherEngine(); - QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories); - QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories); + QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override; + QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override; class Handle { @@ -154,7 +154,7 @@ public: QWindowsFileSystemWatcherEngineThread(); ~QWindowsFileSystemWatcherEngineThread(); - void run(); + void run() override; void stop(); void wakeup(); diff --git a/src/corelib/io/qfsfileengine.cpp b/src/corelib/io/qfsfileengine.cpp index 387990ed79..0db27f3e25 100644 --- a/src/corelib/io/qfsfileengine.cpp +++ b/src/corelib/io/qfsfileengine.cpp @@ -127,7 +127,7 @@ void QFSFileEnginePrivate::init() is_link = 0; openMode = QIODevice::NotOpen; fd = -1; - fh = 0; + fh = nullptr; lastIOCommand = IOFlushCommand; lastFlushFailed = false; closeFileHandle = false; @@ -240,7 +240,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode) d->openMode = openMode; d->lastFlushFailed = false; d->tried_stat = 0; - d->fh = 0; + d->fh = nullptr; d->fd = -1; return d->nativeOpen(openMode); @@ -299,7 +299,7 @@ bool QFSFileEnginePrivate::openFh(QIODevice::OpenMode openMode, FILE *fh) QSystemError::stdString()); this->openMode = QIODevice::NotOpen; - this->fh = 0; + this->fh = nullptr; return false; } @@ -328,7 +328,7 @@ bool QFSFileEngine::open(QIODevice::OpenMode openMode, int fd, QFile::FileHandle d->lastFlushFailed = false; d->closeFileHandle = (handleFlags & QFile::AutoCloseHandle); d->fileEntry.clear(); - d->fh = 0; + d->fh = nullptr; d->fd = -1; d->tried_stat = 0; @@ -344,7 +344,7 @@ bool QFSFileEnginePrivate::openFd(QIODevice::OpenMode openMode, int fd) { Q_Q(QFSFileEngine); this->fd = fd; - fh = 0; + fh = nullptr; // Seek to the end when in Append mode. if (openMode & QFile::Append) { @@ -405,7 +405,7 @@ bool QFSFileEnginePrivate::closeFdFh() // We must reset these guys regardless; calling close again after a // failed close causes crashes on some systems. - fh = 0; + fh = nullptr; fd = -1; closed = (ret == 0); } @@ -822,7 +822,7 @@ QAbstractFileEngine::Iterator *QFSFileEngine::beginEntryList(QDir::Filters filte */ QAbstractFileEngine::Iterator *QFSFileEngine::endEntryList() { - return 0; + return nullptr; } #endif // QT_NO_FILESYSTEMITERATOR @@ -870,7 +870,7 @@ bool QFSFileEngine::extension(Extension extension, const ExtensionOption *option const MapExtensionOption *options = (const MapExtensionOption*)(option); MapExtensionReturn *returnValue = static_cast<MapExtensionReturn*>(output); returnValue->address = d->map(options->offset, options->size, options->flags); - return (returnValue->address != 0); + return (returnValue->address != nullptr); } if (extension == UnMapExtension) { const UnMapExtensionOption *options = (const UnMapExtensionOption*)option; diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 6b091a8eef..0f416f4886 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -115,7 +115,7 @@ public: virtual bool isUnnamedFile() const { return false; } - bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; + bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr) override; bool supportsExtension(Extension extension) const override; //FS only!! diff --git a/src/corelib/io/qfsfileengine_unix.cpp b/src/corelib/io/qfsfileengine_unix.cpp index 90ad0126d6..d4983c72af 100644 --- a/src/corelib/io/qfsfileengine_unix.cpp +++ b/src/corelib/io/qfsfileengine_unix.cpp @@ -153,7 +153,7 @@ bool QFSFileEnginePrivate::nativeOpen(QIODevice::OpenMode openMode) } } - fh = 0; + fh = nullptr; } closeFileHandle = true; @@ -451,14 +451,14 @@ QAbstractFileEngine::FileFlags QFSFileEngine::fileFlags(FileFlags type) const if (type & Refresh) d->metaData.clear(); - QAbstractFileEngine::FileFlags ret = 0; + QAbstractFileEngine::FileFlags ret = { }; if (type & FlagsMask) ret |= LocalDiskFlag; bool exists; { - QFileSystemMetaData::MetaDataFlags queryFlags = 0; + QFileSystemMetaData::MetaDataFlags queryFlags = { }; queryFlags |= QFileSystemMetaData::MetaDataFlags(uint(type)) & QFileSystemMetaData::Permissions; @@ -590,9 +590,9 @@ bool QFSFileEngine::setPermissions(uint perms) QSystemError error; bool ok; if (d->fd != -1) - ok = QFileSystemEngine::setPermissions(d->fd, QFile::Permissions(perms), error, 0); + ok = QFileSystemEngine::setPermissions(d->fd, QFile::Permissions(perms), error); else - ok = QFileSystemEngine::setPermissions(d->fileEntry, QFile::Permissions(perms), error, 0); + ok = QFileSystemEngine::setPermissions(d->fileEntry, QFile::Permissions(perms), error); if (!ok) { setError(QFile::PermissionsError, error.toString()); return false; @@ -651,13 +651,13 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla Q_Q(QFSFileEngine); if (openMode == QIODevice::NotOpen) { q->setError(QFile::PermissionsError, qt_error_string(int(EACCES))); - return 0; + return nullptr; } if (offset < 0 || offset > maxFileOffset || size < 0 || quint64(size) > quint64(size_t(-1))) { q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL))); - return 0; + return nullptr; } // If we know the mapping will extend beyond EOF, fail early to avoid @@ -685,14 +685,14 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla if (quint64(size + extra) > quint64((size_t)-1)) { q->setError(QFile::UnspecifiedError, qt_error_string(int(EINVAL))); - return 0; + return nullptr; } size_t realSize = (size_t)size + extra; QT_OFF_T realOffset = QT_OFF_T(offset); realOffset &= ~(QT_OFF_T(pageSize - 1)); - void *mapAddress = QT_MMAP((void*)0, realSize, + void *mapAddress = QT_MMAP((void*)nullptr, realSize, access, sharemode, nativeHandle(), realOffset); if (MAP_FAILED != mapAddress) { uchar *address = extra + static_cast<uchar*>(mapAddress); @@ -714,7 +714,7 @@ uchar *QFSFileEnginePrivate::map(qint64 offset, qint64 size, QFile::MemoryMapFla q->setError(QFile::UnspecifiedError, qt_error_string(int(errno))); break; } - return 0; + return nullptr; } bool QFSFileEnginePrivate::unmap(uchar *ptr) diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index 86e21f0a66..e26508e631 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -169,7 +169,7 @@ QIODevicePrivate::QIODevicePrivate() , baseReadLineDataCalled(false) , accessMode(Unset) #ifdef QT_NO_QOBJECT - , q_ptr(0) + , q_ptr(nullptr) #endif { } @@ -194,7 +194,7 @@ QIODevicePrivate::~QIODevicePrivate() QIODevice provides both a common implementation and an abstract interface for devices that support reading and writing of blocks of data, such as QFile, QBuffer and QTcpSocket. QIODevice is - abstract and can not be instantiated, but it is common to use the + abstract and cannot be instantiated, but it is common to use the interface it defines to provide device-independent I/O features. For example, Qt's XML classes operate on a QIODevice pointer, allowing them to be used with various devices (such as files and diff --git a/src/corelib/io/qipaddress.cpp b/src/corelib/io/qipaddress.cpp index 039e291b43..b3421fca8f 100644 --- a/src/corelib/io/qipaddress.cpp +++ b/src/corelib/io/qipaddress.cpp @@ -67,7 +67,7 @@ static const QChar *checkedToAscii(Buffer &buffer, const QChar *begin, const QCh *dst++ = *src++; } *dst = '\0'; - return 0; + return nullptr; } static bool parseIp4Internal(IPv4Address &address, const char *ptr, bool acceptLeadingZero); @@ -175,7 +175,7 @@ const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end memset(address, 0, sizeof address); if (colonCount == 2 && end - begin == 2) // "::" - return 0; + return nullptr; // if there's a double colon ("::"), this is how many zeroes it means int zeroWordsToFill; @@ -236,7 +236,7 @@ const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end address[13] = ip4 >> 16; address[14] = ip4 >> 8; address[15] = ip4; - return 0; + return nullptr; } address[pos++] = x >> 8; @@ -248,15 +248,15 @@ const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end return begin + (endptr - buffer.data()); ptr = endptr + 1; } - return pos == 16 ? 0 : end; + return pos == 16 ? nullptr : end; } static inline QChar toHex(uchar c) { - return QtMiscUtils::toHexLower(c); + return QChar::fromLatin1(QtMiscUtils::toHexLower(c)); } -void toString(QString &appendTo, IPv6Address address) +void toString(QString &appendTo, const IPv6Address address) { // the longest IPv6 address possible is: // "1111:2222:3333:4444:5555:6666:255.255.255.255" diff --git a/src/corelib/io/qipaddress_p.h b/src/corelib/io/qipaddress_p.h index d95cccb3bd..ea31e5883d 100644 --- a/src/corelib/io/qipaddress_p.h +++ b/src/corelib/io/qipaddress_p.h @@ -64,7 +64,7 @@ typedef quint8 IPv6Address[16]; Q_CORE_EXPORT bool parseIp4(IPv4Address &address, const QChar *begin, const QChar *end); Q_CORE_EXPORT const QChar *parseIp6(IPv6Address &address, const QChar *begin, const QChar *end); Q_CORE_EXPORT void toString(QString &appendTo, IPv4Address address); -Q_CORE_EXPORT void toString(QString &appendTo, IPv6Address address); +Q_CORE_EXPORT void toString(QString &appendTo, const IPv6Address address); } // namespace diff --git a/src/corelib/io/qlockfile_unix.cpp b/src/corelib/io/qlockfile_unix.cpp index 418b7d22ba..b2bf77c0da 100644 --- a/src/corelib/io/qlockfile_unix.cpp +++ b/src/corelib/io/qlockfile_unix.cpp @@ -58,6 +58,11 @@ #include <sys/file.h> // flock #endif +#if defined(Q_OS_RTEMS) +# undef LOCK_EX +# undef LOCK_NB +#endif + #include <sys/types.h> // kill #include <signal.h> // kill #include <unistd.h> // gethostname @@ -169,7 +174,7 @@ QLockFile::LockError QLockFilePrivate::tryLock_sys() if (qt_write_loop(fd, fileData.constData(), fileData.size()) < fileData.size()) { qt_safe_close(fd); if (!QFile::remove(fileName)) - qWarning("QLockFile: Could not remove our own lock file %s.", qPrintable(fileName)); + qWarning("QLockFile: Could not remove our own lock file %ls.", qUtf16Printable(fileName)); return QLockFile::UnknownError; // partition full } diff --git a/src/corelib/io/qloggingcategory.cpp b/src/corelib/io/qloggingcategory.cpp index 33253429a2..f6ff56c83c 100644 --- a/src/corelib/io/qloggingcategory.cpp +++ b/src/corelib/io/qloggingcategory.cpp @@ -214,8 +214,8 @@ static void setBoolLane(QBasicAtomicInt *atomic, bool enable, int shift) Note that \a category must be kept valid during the lifetime of this object. */ QLoggingCategory::QLoggingCategory(const char *category) - : d(0), - name(0) + : d(nullptr), + name(nullptr) { init(category, QtDebugMsg); } @@ -231,15 +231,15 @@ QLoggingCategory::QLoggingCategory(const char *category) \since 5.4 */ QLoggingCategory::QLoggingCategory(const char *category, QtMsgType enableForLevel) - : d(0), - name(0) + : d(nullptr), + name(nullptr) { init(category, enableForLevel); } void QLoggingCategory::init(const char *category, QtMsgType severityLevel) { - enabled.store(0x01010101); // enabledDebug = enabledWarning = enabledCritical = true; + enabled.storeRelaxed(0x01010101); // enabledDebug = enabledWarning = enabledCritical = true; if (category) name = category; @@ -342,10 +342,10 @@ void QLoggingCategory::setEnabled(QtMsgType type, bool enable) { switch (type) { #ifdef Q_ATOMIC_INT8_IS_SUPPORTED - case QtDebugMsg: bools.enabledDebug.store(enable); break; - case QtInfoMsg: bools.enabledInfo.store(enable); break; - case QtWarningMsg: bools.enabledWarning.store(enable); break; - case QtCriticalMsg: bools.enabledCritical.store(enable); break; + case QtDebugMsg: bools.enabledDebug.storeRelaxed(enable); break; + case QtInfoMsg: bools.enabledInfo.storeRelaxed(enable); break; + case QtWarningMsg: bools.enabledWarning.storeRelaxed(enable); break; + case QtCriticalMsg: bools.enabledCritical.storeRelaxed(enable); break; #else case QtDebugMsg: setBoolLane(&enabled, enable, DebugShift); break; case QtInfoMsg: setBoolLane(&enabled, enable, InfoShift); break; diff --git a/src/corelib/io/qloggingcategory.h b/src/corelib/io/qloggingcategory.h index 91e3144300..1c3e10b493 100644 --- a/src/corelib/io/qloggingcategory.h +++ b/src/corelib/io/qloggingcategory.h @@ -58,15 +58,15 @@ public: void setEnabled(QtMsgType type, bool enable); #ifdef Q_ATOMIC_INT8_IS_SUPPORTED - bool isDebugEnabled() const { return bools.enabledDebug.load(); } - bool isInfoEnabled() const { return bools.enabledInfo.load(); } - bool isWarningEnabled() const { return bools.enabledWarning.load(); } - bool isCriticalEnabled() const { return bools.enabledCritical.load(); } + bool isDebugEnabled() const { return bools.enabledDebug.loadRelaxed(); } + bool isInfoEnabled() const { return bools.enabledInfo.loadRelaxed(); } + bool isWarningEnabled() const { return bools.enabledWarning.loadRelaxed(); } + bool isCriticalEnabled() const { return bools.enabledCritical.loadRelaxed(); } #else - bool isDebugEnabled() const { return enabled.load() >> DebugShift & 1; } - bool isInfoEnabled() const { return enabled.load() >> InfoShift & 1; } - bool isWarningEnabled() const { return enabled.load() >> WarningShift & 1; } - bool isCriticalEnabled() const { return enabled.load() >> CriticalShift & 1; } + bool isDebugEnabled() const { return enabled.loadRelaxed() >> DebugShift & 1; } + bool isInfoEnabled() const { return enabled.loadRelaxed() >> InfoShift & 1; } + bool isWarningEnabled() const { return enabled.loadRelaxed() >> WarningShift & 1; } + bool isCriticalEnabled() const { return enabled.loadRelaxed() >> CriticalShift & 1; } #endif const char *categoryName() const { return name; } @@ -111,8 +111,6 @@ private: #define Q_DECLARE_LOGGING_CATEGORY(name) \ extern const QLoggingCategory &name(); -#if defined(Q_COMPILER_VARIADIC_MACROS) || defined(Q_MOC_RUN) - #define Q_LOGGING_CATEGORY(name, ...) \ const QLoggingCategory &name() \ { \ @@ -148,39 +146,6 @@ private: for (bool qt_category_enabled = category().isCriticalEnabled(); qt_category_enabled; qt_category_enabled = false) \ QMessageLogger(QT_MESSAGELOG_FILE, QT_MESSAGELOG_LINE, QT_MESSAGELOG_FUNC, category().categoryName()).critical(__VA_ARGS__) -#else // defined(Q_COMPILER_VARIADIC_MACROS) || defined(Q_MOC_RUN) - -// Optional msgType argument not supported -#define Q_LOGGING_CATEGORY(name, string) \ - const QLoggingCategory &name() \ - { \ - static const QLoggingCategory category(string); \ - return category; \ - } - -// check for enabled category inside QMessageLogger. -#if !defined(QT_NO_DEBUG_OUTPUT) -# define qCDebug qDebug -#else -# define qCDebug(category) QT_NO_QDEBUG_MACRO() -#endif - -#if !defined(QT_NO_INFO_OUTPUT) -# define qCInfo qInfo -#else -# define qCInfo(category) QT_NO_QDEBUG_MACRO() -#endif - -#if !defined(QT_NO_WARNING_OUTPUT) -# define qCWarning qWarning -#else -# define qCWarning(category) QT_NO_QDEBUG_MACRO() -#endif - -#define qCCritical qCritical - -#endif // Q_COMPILER_VARIADIC_MACROS || defined(Q_MOC_RUN) - QT_END_NAMESPACE #endif // QLOGGINGCATEGORY_H diff --git a/src/corelib/io/qloggingregistry.cpp b/src/corelib/io/qloggingregistry.cpp index 9792d956cc..7849dfd14c 100644 --- a/src/corelib/io/qloggingregistry.cpp +++ b/src/corelib/io/qloggingregistry.cpp @@ -165,7 +165,7 @@ void QLoggingRule::parse(const QStringRef &pattern) p = QStringRef(p.string(), p.position() + 1, p.length() - 1); } if (p.contains(QLatin1Char('*'))) // '*' only supported at start/end - flags = 0; + flags = PatternFlags(); } category = p.toString(); @@ -415,7 +415,7 @@ QLoggingRegistry::installFilter(QLoggingCategory::CategoryFilter filter) { QMutexLocker locker(®istryMutex); - if (filter == 0) + if (!filter) filter = defaultCategoryFilter; QLoggingCategory::CategoryFilter old = categoryFilter; diff --git a/src/corelib/io/qnoncontiguousbytedevice.cpp b/src/corelib/io/qnoncontiguousbytedevice.cpp index beca6ccbf7..d1806aa12b 100644 --- a/src/corelib/io/qnoncontiguousbytedevice.cpp +++ b/src/corelib/io/qnoncontiguousbytedevice.cpp @@ -534,7 +534,7 @@ QNonContiguousByteDevice* QNonContiguousByteDeviceFactory::create(QSharedPointer */ QSharedPointer<QNonContiguousByteDevice> QNonContiguousByteDeviceFactory::createShared(QSharedPointer<QRingBuffer> ringBuffer) { - return QSharedPointer<QNonContiguousByteDeviceRingBufferImpl>::create(qMove(ringBuffer)); + return QSharedPointer<QNonContiguousByteDeviceRingBufferImpl>::create(std::move(ringBuffer)); } /*! diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h index ebed1120db..bbc4ea5ae2 100644 --- a/src/corelib/io/qnoncontiguousbytedevice_p.h +++ b/src/corelib/io/qnoncontiguousbytedevice_p.h @@ -179,13 +179,13 @@ class QByteDeviceWrappingIoDevice : public QIODevice public: QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd); ~QByteDeviceWrappingIoDevice (); - virtual bool isSequential () const override; - virtual bool atEnd () const override; - virtual bool reset () override; - virtual qint64 size () const override; + bool isSequential() const override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; protected: - virtual qint64 readData ( char * data, qint64 maxSize ) override; - virtual qint64 writeData ( const char * data, qint64 maxSize ) override; + qint64 readData(char *data, qint64 maxSize) override; + qint64 writeData(const char *data, qint64 maxSize) override; QNonContiguousByteDevice *byteDevice; }; diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index 7b2de02d1d..0b964e6a21 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -42,6 +42,7 @@ #include <qdebug.h> #include <qdir.h> +#include <qscopedvaluerollback.h> #if defined(Q_OS_WIN) #include <qtimer.h> #endif @@ -814,6 +815,7 @@ void QProcessPrivate::Channel::clear() \a newState argument is the state QProcess changed to. */ +#if QT_DEPRECATED_SINCE(5, 13) /*! \fn void QProcess::finished(int exitCode) \obsolete @@ -821,6 +823,7 @@ void QProcessPrivate::Channel::clear() Use finished(int exitCode, QProcess::ExitStatus status) instead. */ +#endif /*! \fn void QProcess::finished(int exitCode, QProcess::ExitStatus exitStatus) @@ -996,7 +999,12 @@ void QProcessPrivate::setErrorAndEmit(QProcess::ProcessError error, const QStrin Q_ASSERT(error != QProcess::UnknownError); setError(error, description); emit q->errorOccurred(processError); +#if QT_DEPRECATED_SINCE(5, 6) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit q->error(processError); +QT_WARNING_POP +#endif } /*! @@ -1061,9 +1069,8 @@ bool QProcessPrivate::tryReadFromChannel(Channel *channel) if (currentReadChannel == channelIdx) { didRead = true; if (!emittedReadyRead) { - emittedReadyRead = true; + QScopedValueRollback<bool> guard(emittedReadyRead, true); emit q->readyRead(); - emittedReadyRead = false; } } emit q->channelReadyRead(int(channelIdx)); @@ -1173,7 +1180,12 @@ bool QProcessPrivate::_q_processDied() //emit q->standardOutputClosed(); //emit q->standardErrorClosed(); +#if QT_DEPRECATED_SINCE(5, 13) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit q->finished(exitCode); +QT_WARNING_POP +#endif emit q->finished(exitCode, exitStatus); } #if defined QPROCESS_DEBUG @@ -1265,6 +1277,7 @@ QProcess::~QProcess() d->cleanup(); } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete Returns the read channel mode of the QProcess. This function is @@ -1288,6 +1301,7 @@ void QProcess::setReadChannelMode(ProcessChannelMode mode) { setProcessChannelMode(mode); } +#endif /*! \since 4.2 @@ -2474,7 +2488,7 @@ QProcess::ExitStatus QProcess::exitStatus() const int QProcess::execute(const QString &program, const QStringList &arguments) { QProcess process; - process.setReadChannelMode(ForwardedChannels); + process.setProcessChannelMode(ForwardedChannels); process.start(program, arguments); if (!process.waitForFinished(-1) || process.error() == FailedToStart) return -2; @@ -2497,7 +2511,7 @@ int QProcess::execute(const QString &program, const QStringList &arguments) int QProcess::execute(const QString &command) { QProcess process; - process.setReadChannelMode(ForwardedChannels); + process.setProcessChannelMode(ForwardedChannels); process.start(command); if (!process.waitForFinished(-1) || process.error() == FailedToStart) return -2; diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index 474fc87de8..9fda5fba11 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -48,34 +48,34 @@ QT_REQUIRE_CONFIG(processenvironment); -QT_BEGIN_NAMESPACE - -class QProcessPrivate; - -#if !defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) -typedef qint64 Q_PID; -#else -QT_END_NAMESPACE +#ifdef Q_OS_WIN typedef struct _PROCESS_INFORMATION *Q_PID; +#endif + +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) typedef struct _SECURITY_ATTRIBUTES Q_SECURITY_ATTRIBUTES; typedef struct _STARTUPINFOW Q_STARTUPINFO; -QT_BEGIN_NAMESPACE #endif +QT_BEGIN_NAMESPACE + +class QProcessPrivate; class QProcessEnvironmentPrivate; +#ifndef Q_OS_WIN +typedef qint64 Q_PID; +#endif + class Q_CORE_EXPORT QProcessEnvironment { public: QProcessEnvironment(); QProcessEnvironment(const QProcessEnvironment &other); ~QProcessEnvironment(); -#ifdef Q_COMPILER_RVALUE_REFS - QProcessEnvironment &operator=(QProcessEnvironment && other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QProcessEnvironment &operator=(QProcessEnvironment && other) noexcept { swap(other); return *this; } QProcessEnvironment &operator=(const QProcessEnvironment &other); - void swap(QProcessEnvironment &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QProcessEnvironment &other) noexcept { qSwap(d, other.d); } bool operator==(const QProcessEnvironment &other) const; inline bool operator!=(const QProcessEnvironment &other) const @@ -172,8 +172,12 @@ public: QStringList arguments() const; void setArguments(const QStringList & arguments); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QProcess::processChannelMode() instead") ProcessChannelMode readChannelMode() const; + QT_DEPRECATED_X("Use QProcess::setProcessChannelMode() instead") void setReadChannelMode(ProcessChannelMode mode); +#endif ProcessChannelMode processChannelMode() const; void setProcessChannelMode(ProcessChannelMode mode); InputChannelMode inputChannelMode() const; @@ -269,7 +273,10 @@ public Q_SLOTS: Q_SIGNALS: void started(QPrivateSignal); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QProcess::finished(int, QProcess::ExitStatus) instead") void finished(int exitCode); // ### Qt 6: merge the two signals with a default value +#endif void finished(int exitCode, QProcess::ExitStatus exitStatus); #if QT_DEPRECATED_SINCE(5,6) void error(QProcess::ProcessError error); diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h index aa7ecbe91d..d02e87837c 100644 --- a/src/corelib/io/qprocess_p.h +++ b/src/corelib/io/qprocess_p.h @@ -108,8 +108,7 @@ using QProcEnvKey = QByteArray; class QProcEnvValue { public: - QProcEnvValue() {} - QProcEnvValue(const QProcEnvValue &other) { *this = other; } + QProcEnvValue() = default; explicit QProcEnvValue(const QString &value) : stringValue(value) {} explicit QProcEnvValue(const QByteArray &value) : byteValue(value) {} bool operator==(const QProcEnvValue &other) const @@ -221,7 +220,7 @@ public: template<> Q_INLINE_TEMPLATE void QSharedDataPointer<QProcessEnvironmentPrivate>::detach() { - if (d && d->ref.load() == 1) + if (d && d->ref.loadRelaxed() == 1) return; QProcessEnvironmentPrivate *x = (d ? new QProcessEnvironmentPrivate(*d) : new QProcessEnvironmentPrivate); @@ -247,7 +246,7 @@ public: // if you add "= 4" here, increase the number of bits below }; - Channel() : process(0), notifier(0), type(Normal), closed(false), append(false) + Channel() : process(nullptr), notifier(nullptr), type(Normal), closed(false), append(false) { pipe[0] = INVALID_Q_PIPE; pipe[1] = INVALID_Q_PIPE; diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 7a2daa2a57..3a29a0d842 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -202,8 +202,7 @@ static int qt_create_pipe(int *pipe) qt_safe_close(pipe[1]); int pipe_ret = qt_safe_pipe(pipe); if (pipe_ret != 0) { - qWarning("QProcessPrivate::createPipe: Cannot create pipe %p: %s", - pipe, qPrintable(qt_error_string(errno))); + qErrnoWarning("QProcessPrivate::createPipe: Cannot create pipe %p", pipe); } return pipe_ret; } @@ -473,7 +472,7 @@ void QProcessPrivate::startProcess() if (forkfd == -1) { // Cleanup, report error and return #if defined (QPROCESS_DEBUG) - qDebug("fork failed: %s", qPrintable(qt_error_string(lastForkErrno))); + qDebug("fork failed: %ls", qUtf16Printable(qt_error_string(lastForkErrno))); #endif q->setProcessState(QProcess::NotRunning); setErrorAndEmit(QProcess::FailedToStart, @@ -652,7 +651,7 @@ bool QProcessPrivate::writeToStdin() qDebug("QProcessPrivate::writeToStdin(), write(%p \"%s\", %lld) == %lld", data, qt_prettyDebug(data, bytesToWrite, 16).constData(), bytesToWrite, written); if (written == -1) - qDebug("QProcessPrivate::writeToStdin(), failed to write (%s)", qPrintable(qt_error_string(errno))); + qDebug("QProcessPrivate::writeToStdin(), failed to write (%ls)", qUtf16Printable(qt_error_string(errno))); #endif if (written == -1) { // If the O_NONBLOCK flag is set and If some data can be written without blocking diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 564a3e5f51..d143f7fda3 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -56,16 +57,46 @@ #include "private/qabstractfileengine_p.h" #include "private/qnumeric_p.h" #include "private/qsimd_p.h" +#include "private/qtools_p.h" #include "private/qsystemerror_p.h" +#if QT_CONFIG(zstd) +# include <zstd.h> +#endif + #ifdef Q_OS_UNIX # include "private/qcore_unix_p.h" #endif +#if defined(Q_OS_UNIX) && !defined(Q_OS_NACL) && !defined(Q_OS_INTEGRITY) +# define QT_USE_MMAP +# include <sys/mman.h> +#endif + //#define DEBUG_RESOURCE_MATCH QT_BEGIN_NAMESPACE +// Symbols used by code generated by RCC. +// They cause compilation errors if the RCC content couldn't +// be interpreted by this QtCore version. +#if defined(__ELF__) || defined(__APPLE__) // same as RCC generates +# define RCC_FEATURE_SYMBOL(feature) \ + extern Q_CORE_EXPORT const quint8 qt_resourceFeature ## feature; \ + const quint8 qt_resourceFeature ## feature = 0; +#else +# define RCC_FEATURE_SYMBOL(feature) \ + Q_CORE_EXPORT quint8 qResourceFeature ## feature() { return 0; } +#endif + +#ifndef QT_NO_COMPRESS +RCC_FEATURE_SYMBOL(Zlib) +#endif +#if QT_CONFIG(zstd) +RCC_FEATURE_SYMBOL(Zstd) +#endif + +#undef RCC_FEATURE_SYMBOL class QStringSplitter { @@ -98,11 +129,15 @@ public: //resource glue class QResourceRoot { +public: enum Flags { + // must match rcc.h Compressed = 0x01, - Directory = 0x02 + Directory = 0x02, + CompressedZstd = 0x04 }; +private: const uchar *tree, *names, *payloads; int version; inline int findOffset(int node) const { return node * (14 + (version >= 0x02 ? 8 : 0)); } //sizeof each tree element @@ -112,17 +147,25 @@ class QResourceRoot public: mutable QAtomicInt ref; - inline QResourceRoot(): tree(0), names(0), payloads(0), version(0) {} + inline QResourceRoot(): tree(nullptr), names(nullptr), payloads(nullptr), version(0) {} inline QResourceRoot(int version, const uchar *t, const uchar *n, const uchar *d) { setSource(version, t, n, d); } virtual ~QResourceRoot() { } int findNode(const QString &path, const QLocale &locale=QLocale()) const; inline bool isContainer(int node) const { return flags(node) & Directory; } - inline bool isCompressed(int node) const { return flags(node) & Compressed; } + QResource::Compression compressionAlgo(int node) + { + uint compressionFlags = flags(node) & (Compressed | CompressedZstd); + if (compressionFlags == Compressed) + return QResource::ZlibCompression; + if (compressionFlags == CompressedZstd) + return QResource::ZstdCompression; + return QResource::NoCompression; + } const uchar *data(int node, qint64 *size) const; quint64 lastModified(int node) const; QStringList children(int node) const; virtual QString mappingRoot() const { return QString(); } - bool mappingRootSubdir(const QString &path, QString *match=0) const; + bool mappingRootSubdir(const QString &path, QString *match = nullptr) const; inline bool operator==(const QResourceRoot &other) const { return tree == other.tree && names == other.names && payloads == other.payloads && version == other.version; } inline bool operator!=(const QResourceRoot &other) const @@ -229,6 +272,23 @@ static inline QStringList *resourceSearchPaths() \sa {The Qt Resource System}, QFile, QDir, QFileInfo */ +/*! + \enum QResource::Compression + \since 5.13 + + This enum is used by compressionAlgorithm() to indicate which algorithm the + RCC tool used to compress the payload. + + \value NoCompression Contents are not compressed (isCompressed() is false). + \value ZlibCompression Contents are compressed using \l{zlib}{https://zlib.net} and can + be decompressed using the qUncompress() function. + \value ZstdCompression Contents are compressed using \l{zstd}{https://zstd.net}. To + decompress, use the \c{ZSTD_decompress} function from the zstd + library. + + \sa compressionAlgorithm(), isCompressed() +*/ + class QResourcePrivate { public: inline QResourcePrivate(QResource *_q) : q_ptr(_q) { clear(); } @@ -243,12 +303,13 @@ public: QLocale locale; QString fileName, absoluteFilePath; QList<QResourceRoot*> related; - uint container : 1; - mutable uint compressed : 1; mutable qint64 size; + mutable quint64 lastModified; mutable const uchar *data; mutable QStringList children; - mutable quint64 lastModified; + mutable quint8 compressionAlgo; + bool container; + /* 2 or 6 padding bytes */ QResource *q_ptr; Q_DECLARE_PUBLIC(QResource) @@ -258,8 +319,8 @@ void QResourcePrivate::clear() { absoluteFilePath.clear(); - compressed = 0; - data = 0; + compressionAlgo = QResource::NoCompression; + data = nullptr; size = 0; children.clear(); lastModified = 0; @@ -287,11 +348,11 @@ QResourcePrivate::load(const QString &file) container = res->isContainer(node); if(!container) { data = res->data(node, &size); - compressed = res->isCompressed(node); + compressionAlgo = res->compressionAlgo(node); } else { - data = 0; + data = nullptr; size = 0; - compressed = 0; + compressionAlgo = QResource::NoCompression; } lastModified = res->lastModified(node); } else if(res->isContainer(node) != container) { @@ -301,9 +362,9 @@ QResourcePrivate::load(const QString &file) related.append(res); } else if(res->mappingRootSubdir(file)) { container = true; - data = 0; + data = nullptr; size = 0; - compressed = 0; + compressionAlgo = QResource::NoCompression; lastModified = 0; res->ref.ref(); related.append(res); @@ -493,16 +554,41 @@ bool QResource::isValid() const /*! Returns \c true if the resource represents a file and the data backing it - is in a compressed format, false otherwise. + is in a compressed format, false otherwise. If the data is compressed, + check compressionAlgorithm() to verify what algorithm to use to decompress + the data. - \sa data(), isFile() + \sa data(), compressionAlgorithm(), isFile() */ bool QResource::isCompressed() const { + return compressionAlgorithm() != NoCompression; +} + +/*! + \since 5.13 + + Returns the compression type that this resource is compressed with, if any. + If it is not compressed, this function returns QResource::NoCompression. + + If this function returns QResource::ZlibCompression, you may decompress the + data using the qUncompress() function. Up until Qt 5.13, this was the only + possible compression algorithm. + + If this function returns QResource::ZstdCompression, you need to use the + Zstandard library functios (\c{<zstd.h> header). Qt does not provide a + wrapper. + + See \l{http://facebook.github.io/zstd/zstd_manual.html}{Zstandard manual}. + + \sa isCompressed(), data(), isFile() +*/ +QResource::Compression QResource::compressionAlgorithm() const +{ Q_D(const QResource); d->ensureInitialized(); - return d->compressed; + return Compression(d->compressionAlgo); } /*! @@ -522,7 +608,7 @@ qint64 QResource::size() const Returns direct access to a read only segment of data that this resource represents. If the resource is compressed the data returns is compressed and qUncompress() must be used to access the data. If the - resource is a directory 0 is returned. + resource is a directory \nullptr is returned. \sa size(), isCompressed(), isFile() */ @@ -573,6 +659,7 @@ QStringList QResource::children() const return d->children; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -614,6 +701,7 @@ QResource::searchPaths() QMutexLocker lock(resourceMutex()); return *resourceSearchPaths(); } +#endif inline uint QResourceRoot::hash(int node) const { @@ -776,7 +864,7 @@ const uchar *QResourceRoot::data(int node, qint64 *size) const { if(node == -1) { *size = 0; - return 0; + return nullptr; } int offset = findOffset(node) + 4; //jump past name @@ -793,7 +881,7 @@ const uchar *QResourceRoot::data(int node, qint64 *size) const return ret; } *size = 0; - return 0; + return nullptr; } quint64 QResourceRoot::lastModified(int node) const @@ -853,7 +941,7 @@ Q_CORE_EXPORT bool qRegisterResourceData(int version, const unsigned char *tree, const unsigned char *name, const unsigned char *data) { QMutexLocker lock(resourceMutex()); - if ((version == 0x01 || version == 0x2) && resourceList()) { + if (version >= 0x01 && version <= 0x3 && resourceList()) { bool found = false; QResourceRoot res(version, tree, name, data); for(int i = 0; i < resourceList()->size(); ++i) { @@ -879,7 +967,7 @@ Q_CORE_EXPORT bool qUnregisterResourceData(int version, const unsigned char *tre return false; QMutexLocker lock(resourceMutex()); - if ((version == 0x01 || version == 0x02) && resourceList()) { + if (version >= 0x01 && version <= 0x3 && resourceList()) { QResourceRoot res(version, tree, name, data); for(int i = 0; i < resourceList()->size(); ) { if(*resourceList()->at(i) == res) { @@ -903,14 +991,14 @@ class QDynamicBufferResourceRoot: public QResourceRoot const uchar *buffer; public: - inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { } + inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(nullptr) { } inline ~QDynamicBufferResourceRoot() { } inline const uchar *mappingBuffer() const { return buffer; } - virtual QString mappingRoot() const override { return root; } - virtual ResourceRootType type() const override { return Resource_Buffer; } + QString mappingRoot() const override { return root; } + ResourceRootType type() const override { return Resource_Buffer; } // size == -1 means "unknown" - bool registerSelf(const uchar *b, int size) + bool registerSelf(const uchar *b, qsizetype size) { // 5 int "pointers" if (size >= 0 && size < 20) @@ -938,11 +1026,27 @@ public: const int name_offset = qFromBigEndian<qint32>(b + offset); offset += 4; + quint32 file_flags = 0; + if (version >= 3) { + file_flags = qFromBigEndian<qint32>(b + offset); + offset += 4; + } + // Some sanity checking for sizes. This is _not_ a security measure. if (size >= 0 && (tree_offset >= size || data_offset >= size || name_offset >= size)) return false; - if (version == 0x01 || version == 0x02) { + // And some sanity checking for features + quint32 acceptableFlags = 0; +#ifndef QT_NO_COMPRESS + acceptableFlags |= Compressed; +#endif + if (QT_CONFIG(zstd)) + acceptableFlags |= CompressedZstd; + if (file_flags & ~acceptableFlags) + return false; + + if (version >= 0x01 && version <= 0x03) { buffer = b; setSource(version, b+tree_offset, b+name_offset, b+data_offset); return true; @@ -951,36 +1055,22 @@ public: } }; -#if defined(Q_OS_UNIX) && !defined (Q_OS_NACL) && !defined(Q_OS_INTEGRITY) -#define QT_USE_MMAP -#endif - -// most of the headers below are already included in qplatformdefs.h -// also this lacks Large File support but that's probably irrelevant -#if defined(QT_USE_MMAP) -// for mmap -QT_BEGIN_INCLUDE_NAMESPACE -#include <sys/mman.h> -#include <errno.h> -QT_END_INCLUDE_NAMESPACE -#endif - - - class QDynamicFileResourceRoot: public QDynamicBufferResourceRoot { QString fileName; // for mmap'ed files, this is what needs to be unmapped. uchar *unmapPointer; - unsigned int unmapLength; + qsizetype unmapLength; public: - inline QDynamicFileResourceRoot(const QString &_root) : QDynamicBufferResourceRoot(_root), unmapPointer(0), unmapLength(0) { } + QDynamicFileResourceRoot(const QString &_root) + : QDynamicBufferResourceRoot(_root), unmapPointer(nullptr), unmapLength(0) + { } ~QDynamicFileResourceRoot() { #if defined(QT_USE_MMAP) if (unmapPointer) { munmap((char*)unmapPointer, unmapLength); - unmapPointer = 0; + unmapPointer = nullptr; unmapLength = 0; } else #endif @@ -989,76 +1079,78 @@ public: } } QString mappingFile() const { return fileName; } - virtual ResourceRootType type() const override { return Resource_File; } + ResourceRootType type() const override { return Resource_File; } - bool registerSelf(const QString &f) { - bool fromMM = false; - uchar *data = 0; - unsigned int data_len = 0; - -#ifdef QT_USE_MMAP + bool registerSelf(const QString &f); +}; #ifndef MAP_FILE -#define MAP_FILE 0 +# define MAP_FILE 0 #endif #ifndef MAP_FAILED -#define MAP_FAILED -1 +# define MAP_FAILED reinterpret_cast<void *>(-1) #endif - int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY, +bool QDynamicFileResourceRoot::registerSelf(const QString &f) +{ + bool fromMM = false; + uchar *data = nullptr; + qsizetype data_len = 0; + +#ifdef QT_USE_MMAP + int fd = QT_OPEN(QFile::encodeName(f), O_RDONLY, #if defined(Q_OS_WIN) - _S_IREAD | _S_IWRITE + _S_IREAD | _S_IWRITE #else - 0666 + 0666 #endif - ); - if (fd >= 0) { - QT_STATBUF st; - if (!QT_FSTAT(fd, &st)) { - uchar *ptr; - ptr = reinterpret_cast<uchar *>( - mmap(0, st.st_size, // any address, whole file - PROT_READ, // read-only memory - MAP_FILE | MAP_PRIVATE, // swap-backed map from file - fd, 0)); // from offset 0 of fd - if (ptr && ptr != reinterpret_cast<uchar *>(MAP_FAILED)) { - data = ptr; - data_len = st.st_size; - fromMM = true; - } + ); + if (fd >= 0) { + QT_STATBUF st; + if (!QT_FSTAT(fd, &st) && st.st_size <= std::numeric_limits<qsizetype>::max()) { + int protection = PROT_READ; // read-only memory + int flags = MAP_FILE | MAP_PRIVATE; // swap-backed map from file + void *ptr = QT_MMAP(nullptr, st.st_size, // any address, whole file + protection, flags, + fd, 0); // from offset 0 of fd + if (ptr != MAP_FAILED) { + data = static_cast<uchar *>(ptr); + data_len = st.st_size; + fromMM = true; } - ::close(fd); } + QT_CLOSE(fd); + } #endif // QT_USE_MMAP - if(!data) { - QFile file(f); - if (!file.exists()) - return false; - data_len = file.size(); - data = new uchar[data_len]; - - bool ok = false; - if (file.open(QIODevice::ReadOnly)) - ok = (data_len == (uint)file.read((char*)data, data_len)); - if (!ok) { - delete [] data; - data = 0; - data_len = 0; - return false; + if (!data) { + QFile file(f); + bool ok = false; + if (file.open(QIODevice::ReadOnly)) { + qint64 fsize = file.size(); + if (fsize <= std::numeric_limits<qsizetype>::max()) { + data_len = file.size(); + data = new uchar[data_len]; + ok = (data_len == file.read((char*)data, data_len)); } - fromMM = false; } - if (data && QDynamicBufferResourceRoot::registerSelf(data, data_len)) { - if(fromMM) { - unmapPointer = data; - unmapLength = data_len; - } - fileName = f; - return true; + if (!ok) { + delete [] data; + data = nullptr; + data_len = 0; + return false; } - return false; + fromMM = false; } -}; + if (data && QDynamicBufferResourceRoot::registerSelf(data, data_len)) { + if (fromMM) { + unmapPointer = data; + unmapLength = data_len; + } + fileName = f; + return true; + } + return false; +} static QString qt_resource_fixResourceRoot(QString r) { if(!r.isEmpty()) { @@ -1531,12 +1623,40 @@ bool QResourceFileEnginePrivate::unmap(uchar *ptr) void QResourceFileEnginePrivate::uncompress() const { - if (resource.isCompressed() && uncompressed.isEmpty() && resource.size()) { + if (uncompressed.isEmpty() && resource.size()) { + quint64 size; + switch (resource.compressionAlgorithm()) { + case QResource::NoCompression: + return; // nothing to do + + case QResource::ZlibCompression: #ifndef QT_NO_COMPRESS - uncompressed = qUncompress(resource.data(), resource.size()); + uncompressed = qUncompress(resource.data(), resource.size()); +#else + Q_ASSERT(!"QResourceFileEngine::open: Qt built without support for Zlib compression"); +#endif + break; + + case QResource::ZstdCompression: +#if QT_CONFIG(zstd) + size = ZSTD_getFrameContentSize(resource.data(), resource.size()); + if (!ZSTD_isError(size)) { + if (size >= MaxAllocSize) { + qWarning("QResourceFileEngine::open: content bigger than memory (size %lld)", size); + } else { + uncompressed = QByteArray(size, Qt::Uninitialized); + size = ZSTD_decompress(const_cast<char *>(uncompressed.data()), size, + resource.data(), resource.size()); + } + } + if (ZSTD_isError(size)) + qWarning("QResourceFileEngine::open: error decoding: %s", ZSTD_getErrorName(size)); #else - Q_ASSERT(!"QResourceFileEngine::open: Qt built without support for compression"); + Q_UNUSED(size); + Q_ASSERT(!"QResourceFileEngine::open: Qt built without support for Zstd compression"); #endif + break; + } } } diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h index 895cf0456e..5e798de436 100644 --- a/src/corelib/io/qresource.h +++ b/src/corelib/io/qresource.h @@ -54,6 +54,12 @@ class QResourcePrivate; class Q_CORE_EXPORT QResource { public: + enum Compression { + NoCompression, + ZlibCompression, + ZstdCompression + }; + QResource(const QString &file=QString(), const QLocale &locale=QLocale()); ~QResource(); @@ -67,12 +73,17 @@ public: bool isValid() const; bool isCompressed() const; + Compression compressionAlgorithm() const; qint64 size() const; const uchar *data() const; QDateTime lastModified() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDir::addSearchPath() instead") static void addSearchPath(const QString &path); + QT_DEPRECATED_X("Use QDir::searchPaths() instead") static QStringList searchPaths(); +#endif static bool registerResource(const QString &rccFilename, const QString &resourceRoot=QString()); static bool unregisterResource(const QString &rccFilename, const QString &resourceRoot=QString()); diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index dcfe46704c..fedf95bb33 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -64,51 +64,51 @@ public: explicit QResourceFileEngine(const QString &path); ~QResourceFileEngine(); - virtual void setFileName(const QString &file) override; + void setFileName(const QString &file) override; - virtual bool open(QIODevice::OpenMode flags) override ; - virtual bool close() override; - virtual bool flush() override; - virtual qint64 size() const override; - virtual qint64 pos() const override; + bool open(QIODevice::OpenMode flags) override; + bool close() override; + bool flush() override; + qint64 size() const override; + qint64 pos() const override; virtual bool atEnd() const; - virtual bool seek(qint64) override; - virtual qint64 read(char *data, qint64 maxlen) override; - virtual qint64 write(const char *data, qint64 len) override; + bool seek(qint64) override; + qint64 read(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; - virtual bool remove() override; - virtual bool copy(const QString &newName) override; - virtual bool rename(const QString &newName) override; - virtual bool link(const QString &newName) override; + bool remove() override; + bool copy(const QString &newName) override; + bool rename(const QString &newName) override; + bool link(const QString &newName) override; - virtual bool isSequential() const override; + bool isSequential() const override; - virtual bool isRelativePath() const override; + bool isRelativePath() const override; - virtual bool mkdir(const QString &dirName, bool createParentDirectories) const override; - virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; + bool mkdir(const QString &dirName, bool createParentDirectories) const override; + bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; - virtual bool setSize(qint64 size) override; + bool setSize(qint64 size) override; - virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; + QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; - virtual bool caseSensitive() const override; + bool caseSensitive() const override; - virtual FileFlags fileFlags(FileFlags type) const override; + FileFlags fileFlags(FileFlags type) const override; - virtual bool setPermissions(uint perms) override; + bool setPermissions(uint perms) override; - virtual QString fileName(QAbstractFileEngine::FileName file) const override; + QString fileName(QAbstractFileEngine::FileName file) const override; - virtual uint ownerId(FileOwner) const override; - virtual QString owner(FileOwner) const override; + uint ownerId(FileOwner) const override; + QString owner(FileOwner) const override; - virtual QDateTime fileTime(FileTime time) const override; + QDateTime fileTime(FileTime time) const override; - virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; - virtual Iterator *endEntryList() override; + Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + Iterator *endEntryList() override; - bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; + bool extension(Extension extension, const ExtensionOption *option = nullptr, ExtensionReturn *output = nullptr) override; bool supportsExtension(Extension extension) const override; }; diff --git a/src/corelib/io/qsavefile.cpp b/src/corelib/io/qsavefile.cpp index 0cbc8c2234..915d0a0a00 100644 --- a/src/corelib/io/qsavefile.cpp +++ b/src/corelib/io/qsavefile.cpp @@ -151,7 +151,7 @@ QSaveFile::~QSaveFile() if (d->fileEngine) { d->fileEngine->remove(); delete d->fileEngine; - d->fileEngine = 0; + d->fileEngine = nullptr; } } @@ -193,7 +193,7 @@ bool QSaveFile::open(OpenMode mode) { Q_D(QSaveFile); if (isOpen()) { - qWarning("QSaveFile::open: File (%s) already open", qPrintable(fileName())); + qWarning("QSaveFile::open: File (%ls) already open", qUtf16Printable(fileName())); return false; } unsetError(); @@ -252,7 +252,7 @@ bool QSaveFile::open(OpenMode mode) return true; d->setError(d->fileEngine->error(), d->fileEngine->errorString()); delete d->fileEngine; - d->fileEngine = 0; + d->fileEngine = nullptr; } else { QString msg = QSaveFile::tr("QSaveFile cannot open '%1' without direct write fallback " @@ -285,7 +285,7 @@ bool QSaveFile::open(OpenMode mode) err = QFileDevice::OpenError; d->setError(err, d->fileEngine->errorString()); delete d->fileEngine; - d->fileEngine = 0; + d->fileEngine = nullptr; return false; } @@ -326,7 +326,7 @@ bool QSaveFile::commit() return false; if (!isOpen()) { - qWarning("QSaveFile::commit: File (%s) is not open", qPrintable(fileName())); + qWarning("QSaveFile::commit: File (%ls) is not open", qUtf16Printable(fileName())); return false; } QFileDevice::close(); // calls flush() @@ -339,7 +339,7 @@ bool QSaveFile::commit() d->fileEngine->remove(); d->writeError = QFileDevice::NoError; delete d->fileEngine; - d->fileEngine = 0; + d->fileEngine = nullptr; return false; } // atomically replace old file with new file @@ -349,12 +349,12 @@ bool QSaveFile::commit() d->setError(d->fileEngine->error(), d->fileEngine->errorString()); d->fileEngine->remove(); delete d->fileEngine; - d->fileEngine = 0; + d->fileEngine = nullptr; return false; } } delete d->fileEngine; - d->fileEngine = 0; + d->fileEngine = nullptr; return true; } diff --git a/src/corelib/io/qsettings.cpp b/src/corelib/io/qsettings.cpp index ed61c4aca0..9234a23f3a 100644 --- a/src/corelib/io/qsettings.cpp +++ b/src/corelib/io/qsettings.cpp @@ -62,8 +62,8 @@ #include "qrect.h" #endif // !QT_NO_GEOM_VARIANT -#ifndef QT_NO_QOBJECT -#include "qcoreapplication.h" +#ifndef QT_BUILD_QMAKE +# include "qcoreapplication.h" #endif #ifndef QT_BOOTSTRAPPED @@ -2667,9 +2667,10 @@ QSettings::QSettings(const QString &fileName, Format format, QObject *parent) called, the QSettings object will not be able to read or write any settings, and status() will return AccessError. - On \macos and iOS, if both a name and an Internet domain are specified - for the organization, the domain is preferred over the name. On - other platforms, the name is preferred over the domain. + You should supply both the domain (used by default on \macos and iOS) and + the name (used by default elsewhere), although the code will cope if you + supply only one, which will then be used (on all platforms), at odds with + the usual naming of the file on platforms for which it isn't the default. \sa QCoreApplication::setOrganizationName(), QCoreApplication::setOrganizationDomain(), @@ -2677,8 +2678,21 @@ QSettings::QSettings(const QString &fileName, Format format, QObject *parent) setDefaultFormat() */ QSettings::QSettings(QObject *parent) - : QObject(*QSettingsPrivate::create(globalDefaultFormat, UserScope, -#ifdef Q_OS_MAC + : QSettings(UserScope, parent) +{ +} + +/*! + \since 5.13 + + Constructs a QSettings object in the same way as + QSettings(QObject *parent) but with the given \a scope. + + \sa QSettings(QObject *parent) +*/ +QSettings::QSettings(Scope scope, QObject *parent) + : QObject(*QSettingsPrivate::create(globalDefaultFormat, scope, +#ifdef Q_OS_DARWIN QCoreApplication::organizationDomain().isEmpty() ? QCoreApplication::organizationName() : QCoreApplication::organizationDomain() @@ -2717,6 +2731,25 @@ QSettings::QSettings(const QString &fileName, Format format) { d_ptr->q_ptr = this; } + +# ifndef QT_BUILD_QMAKE +QSettings::QSettings(Scope scope) + : d_ptr(QSettingsPrivate::create(globalDefaultFormat, scope, +# ifdef Q_OS_DARWIN + QCoreApplication::organizationDomain().isEmpty() + ? QCoreApplication::organizationName() + : QCoreApplication::organizationDomain() +# else + QCoreApplication::organizationName().isEmpty() + ? QCoreApplication::organizationDomain() + : QCoreApplication::organizationName() +# endif + , QCoreApplication::applicationName()) + ) +{ + d_ptr->q_ptr = this; +} +# endif #endif /*! @@ -2886,7 +2919,7 @@ void QSettings::setIniCodec(const char *codecName) \since 4.5 Returns the codec that is used for accessing INI files. By default, - no codec is used, so a null pointer is returned. + no codec is used, so \nullptr is returned. */ QTextCodec *QSettings::iniCodec() const @@ -3417,6 +3450,7 @@ QSettings::Format QSettings::defaultFormat() return globalDefaultFormat; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete @@ -3450,7 +3484,7 @@ void QSettings::setUserIniPath(const QString &dir) setPath(NativeFormat, UserScope, dir); #endif } - +#endif /*! \since 4.1 diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index 7a9eebe11b..07c746d043 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -129,6 +129,7 @@ public: const QString &application = QString(), QObject *parent = nullptr); QSettings(const QString &fileName, Format format, QObject *parent = nullptr); explicit QSettings(QObject *parent = nullptr); + explicit QSettings(Scope scope, QObject *parent = nullptr); #else explicit QSettings(const QString &organization, const QString &application = QString()); @@ -137,6 +138,9 @@ public: QSettings(Format format, Scope scope, const QString &organization, const QString &application = QString()); QSettings(const QString &fileName, Format format); +# ifndef QT_BUILD_QMAKE + explicit QSettings(Scope scope = UserScope); +# endif #endif ~QSettings(); @@ -183,8 +187,12 @@ public: static void setDefaultFormat(Format format); static Format defaultFormat(); - static void setSystemIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) - static void setUserIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead) +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QSettings::setPath() instead") + static void setSystemIniPath(const QString &dir); + QT_DEPRECATED_X("Use QSettings::setPath() instead") + static void setUserIniPath(const QString &dir); +#endif static void setPath(Format format, Scope scope, const QString &path); typedef QMap<QString, QVariant> SettingsMap; diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp index dd3468e1f8..679212ea21 100644 --- a/src/corelib/io/qsettings_win.cpp +++ b/src/corelib/io/qsettings_win.cpp @@ -166,8 +166,8 @@ static HKEY createOrOpenKey(HKEY parentHandle, REGSAM perms, const QString &rSub if (res == ERROR_SUCCESS) return resultHandle; - //qWarning("QSettings: Failed to create subkey \"%s\": %s", - // qPrintable(rSubKey), qPrintable(qt_error_string(int(res)))); + //qErrnoWarning(int(res), "QSettings: Failed to create subkey \"%ls\"", + // qUtf16Printable(rSubKey)); return 0; } @@ -207,7 +207,7 @@ static QStringList childKeysOrGroups(HKEY parentHandle, QSettingsPrivate::ChildS &numKeys, &maxKeySize, 0, 0, 0); if (res != ERROR_SUCCESS) { - qWarning("QSettings: RegQueryInfoKey() failed: %s", qPrintable(qt_error_string(int(res)))); + qErrnoWarning(int(res), "QSettings: RegQueryInfoKey() failed"); return result; } @@ -241,7 +241,7 @@ static QStringList childKeysOrGroups(HKEY parentHandle, QSettingsPrivate::ChildS item = QString::fromWCharArray((const wchar_t *)buff.constData(), l); if (res != ERROR_SUCCESS) { - qWarning("QSettings: RegEnumValue failed: %s", qPrintable(qt_error_string(int(res)))); + qErrnoWarning(int(res), "QSettings: RegEnumValue failed"); continue; } if (item.isEmpty()) @@ -295,8 +295,8 @@ static void deleteChildGroups(HKEY parentHandle, REGSAM access = 0) // delete group itself LONG res = RegDeleteKey(parentHandle, reinterpret_cast<const wchar_t *>(group.utf16())); if (res != ERROR_SUCCESS) { - qWarning("QSettings: RegDeleteKey failed on subkey \"%s\": %s", - qPrintable(group), qPrintable(qt_error_string(int(res)))); + qErrnoWarning(int(res), "QSettings: RegDeleteKey failed on subkey \"%ls\"", + qUtf16Printable(group)); return; } } @@ -596,8 +596,8 @@ QWinSettingsPrivate::~QWinSettingsPrivate() QString emptyKey; DWORD res = RegDeleteKey(writeHandle(), reinterpret_cast<const wchar_t *>(emptyKey.utf16())); if (res != ERROR_SUCCESS) { - qWarning("QSettings: Failed to delete key \"%s\": %s", - qPrintable(regList.at(0).key()), qPrintable(qt_error_string(int(res)))); + qErrnoWarning(int(res), "QSettings: Failed to delete key \"%ls\"", + qUtf16Printable(regList.constFirst().key())); } } @@ -633,16 +633,16 @@ void QWinSettingsPrivate::remove(const QString &uKey) for (const QString &group : childKeys) { LONG res = RegDeleteValue(handle, reinterpret_cast<const wchar_t *>(group.utf16())); if (res != ERROR_SUCCESS) { - qWarning("QSettings: RegDeleteValue failed on subkey \"%s\": %s", - qPrintable(group), qPrintable(qt_error_string(int(res)))); + qErrnoWarning(int(res), "QSettings: RegDeleteValue failed on subkey \"%ls\"", + qUtf16Printable(group)); } } } else { res = RegDeleteKey(writeHandle(), reinterpret_cast<const wchar_t *>(rKey.utf16())); if (res != ERROR_SUCCESS) { - qWarning("QSettings: RegDeleteKey failed on key \"%s\": %s", - qPrintable(rKey), qPrintable(qt_error_string(int(res)))); + qErrnoWarning(int(res), "QSettings: RegDeleteKey failed on key \"%ls\"", + qUtf16Printable(rKey)); } } RegCloseKey(handle); @@ -739,8 +739,8 @@ void QWinSettingsPrivate::set(const QString &uKey, const QVariant &value) if (res == ERROR_SUCCESS) { deleteWriteHandleOnExit = false; } else { - qWarning("QSettings: failed to set subkey \"%s\": %s", - qPrintable(rKey), qPrintable(qt_error_string(int(res)))); + qErrnoWarning(int(res), "QSettings: failed to set subkey \"%ls\"", + qUtf16Printable(rKey)); setStatus(QSettings::AccessError); } diff --git a/src/corelib/io/qstandardpaths_android.cpp b/src/corelib/io/qstandardpaths_android.cpp index 0667d170c7..1f4e0de1e7 100644 --- a/src/corelib/io/qstandardpaths_android.cpp +++ b/src/corelib/io/qstandardpaths_android.cpp @@ -136,7 +136,7 @@ static QString getExternalStoragePublicDirectory(const char *directoryField) */ static QString getExternalFilesDir(const char *directoryField = 0) { - QString &path = (*androidDirCache)[QString(QLatin1String("APPNAME_%1")).arg(QLatin1String(directoryField))]; + QString &path = (*androidDirCache)[QLatin1String("APPNAME_%1").arg(QLatin1String(directoryField))]; if (!path.isEmpty()) return path; @@ -239,10 +239,7 @@ QString QStandardPaths::writableLocation(StandardLocation type) case QStandardPaths::PicturesLocation: return getExternalStoragePublicDirectory("DIRECTORY_PICTURES"); case QStandardPaths::DocumentsLocation: - if (QtAndroidPrivate::androidSdkVersion() > 18) - return getExternalStoragePublicDirectory("DIRECTORY_DOCUMENTS"); - else - return getExternalStorageDirectory() + QLatin1String("/Documents"); + return getExternalStoragePublicDirectory("DIRECTORY_DOCUMENTS"); case QStandardPaths::DownloadLocation: return getExternalStoragePublicDirectory("DIRECTORY_DOWNLOADS"); case QStandardPaths::GenericConfigLocation: @@ -295,13 +292,8 @@ QStringList QStandardPaths::standardLocations(StandardLocation type) } if (type == DocumentsLocation) { - if (QtAndroidPrivate::androidSdkVersion() > 18) { - return QStringList() << writableLocation(type) - << getExternalFilesDir("DIRECTORY_DOCUMENTS"); - } else { - return QStringList() << writableLocation(type) - << getExternalFilesDir() + QLatin1String("/Documents"); - } + return QStringList() << writableLocation(type) + << getExternalFilesDir("DIRECTORY_DOCUMENTS"); } if (type == DownloadLocation) { diff --git a/src/corelib/io/qstandardpaths_unix.cpp b/src/corelib/io/qstandardpaths_unix.cpp index 748ce67dac..f4f8787968 100644 --- a/src/corelib/io/qstandardpaths_unix.cpp +++ b/src/corelib/io/qstandardpaths_unix.cpp @@ -130,27 +130,31 @@ QString QStandardPaths::writableLocation(StandardLocation type) fileInfo.setFile(xdgRuntimeDir); if (!fileInfo.isDir()) { if (!QDir().mkdir(xdgRuntimeDir)) { - qWarning("QStandardPaths: error creating runtime directory %s: %s", qPrintable(xdgRuntimeDir), qPrintable(qt_error_string(errno))); + qErrnoWarning("QStandardPaths: error creating runtime directory %ls", + qUtf16Printable(xdgRuntimeDir)); return QString(); } } - qWarning("QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '%s'", qPrintable(xdgRuntimeDir)); +#ifndef Q_OS_WASM + qWarning("QStandardPaths: XDG_RUNTIME_DIR not set, defaulting to '%ls'", qUtf16Printable(xdgRuntimeDir)); +#endif } else { fileInfo.setFile(xdgRuntimeDir); if (!fileInfo.exists()) { - qWarning("QStandardPaths: XDG_RUNTIME_DIR points to non-existing path '%s', " - "please create it with 0700 permissions.", qPrintable(xdgRuntimeDir)); + qWarning("QStandardPaths: XDG_RUNTIME_DIR points to non-existing path '%ls', " + "please create it with 0700 permissions.", qUtf16Printable(xdgRuntimeDir)); return QString(); } if (!fileInfo.isDir()) { - qWarning("QStandardPaths: XDG_RUNTIME_DIR points to '%s' which is not a directory", - qPrintable(xdgRuntimeDir)); + qWarning("QStandardPaths: XDG_RUNTIME_DIR points to '%ls' which is not a directory", + qUtf16Printable(xdgRuntimeDir)); return QString(); } } // "The directory MUST be owned by the user" if (fileInfo.ownerId() != myUid) { - qWarning("QStandardPaths: wrong ownership on runtime directory %s, %d instead of %d", qPrintable(xdgRuntimeDir), + qWarning("QStandardPaths: wrong ownership on runtime directory %ls, %d instead of %d", + qUtf16Printable(xdgRuntimeDir), fileInfo.ownerId(), myUid); return QString(); } @@ -161,8 +165,8 @@ QString QStandardPaths::writableLocation(StandardLocation type) if (fileInfo.permissions() != wantedPerms) { QFile file(xdgRuntimeDir); if (!file.setPermissions(wantedPerms)) { - qWarning("QStandardPaths: could not set correct permissions on runtime directory %s: %s", - qPrintable(xdgRuntimeDir), qPrintable(file.errorString())); + qWarning("QStandardPaths: could not set correct permissions on runtime directory %ls: %ls", + qUtf16Printable(xdgRuntimeDir), qUtf16Printable(file.errorString())); return QString(); } } @@ -282,16 +286,12 @@ static QStringList xdgDataDirs() dirs.append(QString::fromLatin1("/usr/local/share")); dirs.append(QString::fromLatin1("/usr/share")); } else { - dirs = xdgDataDirsEnv.split(QLatin1Char(':'), QString::SkipEmptyParts); + const auto parts = xdgDataDirsEnv.splitRef(QLatin1Char(':'), QString::SkipEmptyParts); // Normalize paths, skip relative paths - QMutableListIterator<QString> it(dirs); - while (it.hasNext()) { - const QString dir = it.next(); - if (!dir.startsWith(QLatin1Char('/'))) - it.remove(); - else - it.setValue(QDir::cleanPath(dir)); + for (const QStringRef &dir : parts) { + if (dir.startsWith(QLatin1Char('/'))) + dirs.push_back(QDir::cleanPath(dir.toString())); } // Remove duplicates from the list, there's no use for duplicated diff --git a/src/corelib/io/qstorageinfo.h b/src/corelib/io/qstorageinfo.h index 4ab7a353ef..237e68d2a1 100644 --- a/src/corelib/io/qstorageinfo.h +++ b/src/corelib/io/qstorageinfo.h @@ -62,11 +62,9 @@ public: ~QStorageInfo(); QStorageInfo &operator=(const QStorageInfo &other); -#ifdef Q_COMPILER_RVALUE_REFS - QStorageInfo &operator=(QStorageInfo &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QStorageInfo &operator=(QStorageInfo &&other) noexcept { swap(other); return *this; } - inline void swap(QStorageInfo &other) Q_DECL_NOTHROW + inline void swap(QStorageInfo &other) noexcept { qSwap(d, other.d); } void setPath(const QString &path); diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp index 11b5af069a..b6413d7902 100644 --- a/src/corelib/io/qstorageinfo_unix.cpp +++ b/src/corelib/io/qstorageinfo_unix.cpp @@ -812,7 +812,7 @@ void QStorageInfoPrivate::retrieveVolumeInfo() valid = true; ready = true; -#if defined(Q_OS_INTEGRITY) || (defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)) +#if defined(Q_OS_INTEGRITY) || (defined(Q_OS_BSD4) && !defined(Q_OS_NETBSD)) || defined(Q_OS_RTEMS) bytesTotal = statfs_buf.f_blocks * statfs_buf.f_bsize; bytesFree = statfs_buf.f_bfree * statfs_buf.f_bsize; bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_bsize; @@ -822,7 +822,7 @@ void QStorageInfoPrivate::retrieveVolumeInfo() bytesAvailable = statfs_buf.f_bavail * statfs_buf.f_frsize; #endif blockSize = statfs_buf.f_bsize; -#if defined(Q_OS_ANDROID) || defined(Q_OS_BSD4) || defined(Q_OS_INTEGRITY) +#if defined(Q_OS_ANDROID) || defined(Q_OS_BSD4) || defined(Q_OS_INTEGRITY) || defined(Q_OS_RTEMS) #if defined(_STATFS_F_FLAGS) readOnly = (statfs_buf.f_flags & ST_RDONLY) != 0; #endif diff --git a/src/corelib/io/qt_attribution.json b/src/corelib/io/qt_attribution.json index e9eb9c85e4..9b7dcc6b54 100644 --- a/src/corelib/io/qt_attribution.json +++ b/src/corelib/io/qt_attribution.json @@ -2,7 +2,7 @@ "Id": "psl", "Name": "The Public Suffix List", "QDocModule": "qtcore", - "Description": "The Public Suffix List is an initiative of the Mozilla Project, + "Description": "The Public Suffix List is an initiative of Mozilla, but is maintained as a community resource. It is available for use in any software, but was originally created to meet the needs of browser manufacturers. It allows browsers to, for example: @@ -14,11 +14,13 @@ It allows browsers to, for example: - Accurately sort history entries by site", "Files": "qurltlds_p.h", - "QtUsage": "Used in Qt Core to avoid \"supercookies\" being set in the cookie jar + "QtUsage": "See util/corelib/qurl-generateTLDs/ for code-generator", + "QtUsage": "Used in Qt Core to avoid setting \"supercookies\" in the cookie jar supported by Qt (by the QNetworkCookieJar class).", + "Homepage": "Consult https://github.com/publicsuffix/list for the sha1 but download from ...", "Homepage": "http://publicsuffix.org/", - "Version": "Generated on 2018-01-04", + "Version": "d6331e2b65fffbe9fe299dae1689db8de8fd6190, fetched on 2019-02-20", "License": "Mozilla Public License 2.0", "LicenseFile": "PSL-LICENSE.txt", "LicenseId": "MPL-2.0", diff --git a/src/corelib/io/qtemporaryfile.cpp b/src/corelib/io/qtemporaryfile.cpp index ced08a9a87..c89ad06a1f 100644 --- a/src/corelib/io/qtemporaryfile.cpp +++ b/src/corelib/io/qtemporaryfile.cpp @@ -327,7 +327,7 @@ bool QTemporaryFileEngine::isReallyOpen() const { Q_D(const QFSFileEngine); - if (!((0 == d->fh) && (-1 == d->fd) + if (!((nullptr == d->fh) && (-1 == d->fd) #if defined Q_OS_WIN && (INVALID_HANDLE_VALUE == d->fileHandle) #endif @@ -902,7 +902,7 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file) { if (QAbstractFileEngine *engine = file.d_func()->engine()) { if(engine->fileFlags(QAbstractFileEngine::FlagsMask) & QAbstractFileEngine::LocalDiskFlag) - return 0; //native already + return nullptr; // native already //cache bool wasOpen = file.isOpen(); qint64 old_off = 0; @@ -934,7 +934,7 @@ QTemporaryFile *QTemporaryFile::createNativeFile(QFile &file) //done return ret; } - return 0; + return nullptr; } /*! diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 6d82981fd6..d9ebc6c750 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -421,6 +421,7 @@ #include "private/qipaddress_p.h" #include "qurlquery.h" #include "private/qdir_p.h" +#include <private/qmemory_p.h> QT_BEGIN_NAMESPACE @@ -520,10 +521,10 @@ public: bool isEmpty() const { return sectionIsPresent == 0 && port == -1 && path.isEmpty(); } - Error *cloneError() const; + std::unique_ptr<Error> cloneError() const; void clearError(); void setError(ErrorCode errorCode, const QString &source, int supplement = -1); - ErrorCode validityError(QString *source = 0, int *position = 0) const; + ErrorCode validityError(QString *source = nullptr, int *position = nullptr) const; bool validateComponent(Section section, const QString &input, int begin, int end); bool validateComponent(Section section, const QString &input) { return validateComponent(section, input, 0, uint(input.length())); } @@ -576,7 +577,7 @@ public: QString query; QString fragment; - Error *error; + std::unique_ptr<Error> error; // not used for: // - Port (port == -1 means absence) @@ -591,7 +592,6 @@ public: inline QUrlPrivate::QUrlPrivate() : ref(1), port(-1), - error(0), sectionIsPresent(0), flags(0) { @@ -613,19 +613,16 @@ inline QUrlPrivate::QUrlPrivate(const QUrlPrivate ©) } inline QUrlPrivate::~QUrlPrivate() -{ - delete error; -} + = default; -inline QUrlPrivate::Error *QUrlPrivate::cloneError() const +std::unique_ptr<QUrlPrivate::Error> QUrlPrivate::cloneError() const { - return error ? new Error(*error) : 0; + return error ? qt_make_unique<Error>(*error) : nullptr; } inline void QUrlPrivate::clearError() { - delete error; - error = 0; + error.reset(); } inline void QUrlPrivate::setError(ErrorCode errorCode, const QString &source, int supplement) @@ -634,7 +631,7 @@ inline void QUrlPrivate::setError(ErrorCode errorCode, const QString &source, in // don't overwrite an error set in a previous section during parsing return; } - error = new Error; + error = qt_make_unique<Error>(); error->code = errorCode; error->source = source; error->position = supplement; @@ -826,7 +823,7 @@ recodeFromUser(const QString &input, const ushort *actions, int from, int to) QString output; const QChar *begin = input.constData() + from; const QChar *end = input.constData() + to; - if (qt_urlRecode(output, begin, end, 0, actions)) + if (qt_urlRecode(output, begin, end, nullptr, actions)) return output; return input.mid(from, to - from); @@ -954,7 +951,7 @@ inline void QUrlPrivate::appendFragment(QString &appendTo, QUrl::FormattingOptio { appendToUser(appendTo, fragment, options, options & QUrl::EncodeDelimiters ? fragmentInUrl : - appendingTo == FullUrl ? 0 : fragmentInIsolation); + appendingTo == FullUrl ? nullptr : fragmentInIsolation); } inline void QUrlPrivate::appendQuery(QString &appendTo, QUrl::FormattingOptions options, Section appendingTo) const @@ -1179,7 +1176,7 @@ inline void QUrlPrivate::appendHost(QString &appendTo, QUrl::FormattingOptions o if (host.at(0).unicode() == '[') { // IPv6 addresses might contain a zone-id which needs to be recoded if (options != 0) - if (qt_urlRecode(appendTo, host.constBegin(), host.constEnd(), options, 0)) + if (qt_urlRecode(appendTo, host.constBegin(), host.constEnd(), options, nullptr)) return; appendTo += host; } else { @@ -1221,7 +1218,7 @@ static const QChar *parseIpFuture(QString &host, const QChar *begin, const QChar --end; QString decoded; - if (mode == QUrl::TolerantMode && qt_urlRecode(decoded, begin, end, QUrl::FullyDecoded, 0)) { + if (mode == QUrl::TolerantMode && qt_urlRecode(decoded, begin, end, QUrl::FullyDecoded, nullptr)) { begin = decoded.constBegin(); end = decoded.constEnd(); } @@ -1233,13 +1230,13 @@ static const QChar *parseIpFuture(QString &host, const QChar *begin, const QChar host += *begin; else if (begin->unicode() >= '0' && begin->unicode() <= '9') host += *begin; - else if (begin->unicode() < 0x80 && strchr(acceptable, begin->unicode()) != 0) + else if (begin->unicode() < 0x80 && strchr(acceptable, begin->unicode()) != nullptr) host += *begin; else return decoded.isEmpty() ? begin : &origBegin[2]; } host += QLatin1Char(']'); - return 0; + return nullptr; } return &origBegin[2]; } @@ -1286,7 +1283,7 @@ static const QChar *parseIp6(QString &host, const QChar *begin, const QChar *end host += zoneId; } host += QLatin1Char(']'); - return 0; + return nullptr; } inline bool QUrlPrivate::setHost(const QString &value, int from, int iend, QUrl::ParsingMode mode) @@ -1352,7 +1349,7 @@ inline bool QUrlPrivate::setHost(const QString &value, int from, int iend, QUrl: // check for percent-encoding first QString s; - if (mode == QUrl::TolerantMode && qt_urlRecode(s, begin, end, 0, 0)) { + if (mode == QUrl::TolerantMode && qt_urlRecode(s, begin, end, { }, nullptr)) { // something was decoded // anything encoded left? int pos = s.indexOf(QChar(0x25)); // '%' @@ -1837,7 +1834,7 @@ inline void QUrlPrivate::validate() const \sa setUrl(), fromEncoded(), TolerantMode */ -QUrl::QUrl(const QString &url, ParsingMode parsingMode) : d(0) +QUrl::QUrl(const QString &url, ParsingMode parsingMode) : d(nullptr) { setUrl(url, parsingMode); } @@ -1845,7 +1842,7 @@ QUrl::QUrl(const QString &url, ParsingMode parsingMode) : d(0) /*! Constructs an empty QUrl object. */ -QUrl::QUrl() : d(0) +QUrl::QUrl() : d(nullptr) { } @@ -1879,7 +1876,7 @@ QUrl::~QUrl() bool QUrl::isValid() const { if (isEmpty()) { - // also catches d == 0 + // also catches d == nullptr return false; } return d->validityError() == QUrlPrivate::NoError; @@ -1907,7 +1904,7 @@ void QUrl::clear() { if (d && !d->ref.deref()) delete d; - d = 0; + d = nullptr; } /*! @@ -3266,10 +3263,10 @@ QUrl QUrl::resolved(const QUrl &relative) const removeDotsFromPath(&t.d->path); #if defined(QURL_DEBUG) - qDebug("QUrl(\"%s\").resolved(\"%s\") = \"%s\"", - qPrintable(url()), - qPrintable(relative.url()), - qPrintable(t.url())); + qDebug("QUrl(\"%ls\").resolved(\"%ls\") = \"%ls\"", + qUtf16Printable(url()), + qUtf16Printable(relative.url()), + qUtf16Printable(t.url())); #endif return t; } @@ -3805,7 +3802,7 @@ void QUrl::detach() */ bool QUrl::isDetached() const { - return !d || d->ref.load() == 1; + return !d || d->ref.loadRelaxed() == 1; } @@ -3994,21 +3991,21 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err return QString(); case QUrlPrivate::InvalidSchemeError: { - QString msg = QStringLiteral("Invalid scheme (character '%1' not permitted)"); + auto msg = QLatin1String("Invalid scheme (character '%1' not permitted)"); return msg.arg(c); } case QUrlPrivate::InvalidUserNameError: - return QString(QStringLiteral("Invalid user name (character '%1' not permitted)")) + return QLatin1String("Invalid user name (character '%1' not permitted)") .arg(c); case QUrlPrivate::InvalidPasswordError: - return QString(QStringLiteral("Invalid password (character '%1' not permitted)")) + return QLatin1String("Invalid password (character '%1' not permitted)") .arg(c); case QUrlPrivate::InvalidRegNameError: if (errorPosition != -1) - return QString(QStringLiteral("Invalid hostname (character '%1' not permitted)")) + return QLatin1String("Invalid hostname (character '%1' not permitted)") .arg(c); else return QStringLiteral("Invalid hostname (contains invalid characters)"); @@ -4017,9 +4014,9 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err case QUrlPrivate::InvalidIPv6AddressError: return QStringLiteral("Invalid IPv6 address"); case QUrlPrivate::InvalidCharacterInIPv6Error: - return QStringLiteral("Invalid IPv6 address (character '%1' not permitted)").arg(c); + return QLatin1String("Invalid IPv6 address (character '%1' not permitted)").arg(c); case QUrlPrivate::InvalidIPvFutureError: - return QStringLiteral("Invalid IPvFuture address (character '%1' not permitted)").arg(c); + return QLatin1String("Invalid IPvFuture address (character '%1' not permitted)").arg(c); case QUrlPrivate::HostMissingEndBracket: return QStringLiteral("Expected ']' to match '[' in hostname"); @@ -4029,15 +4026,15 @@ static QString errorMessage(QUrlPrivate::ErrorCode errorCode, const QString &err return QStringLiteral("Port field was empty"); case QUrlPrivate::InvalidPathError: - return QString(QStringLiteral("Invalid path (character '%1' not permitted)")) + return QLatin1String("Invalid path (character '%1' not permitted)") .arg(c); case QUrlPrivate::InvalidQueryError: - return QString(QStringLiteral("Invalid query (character '%1' not permitted)")) + return QLatin1String("Invalid query (character '%1' not permitted)") .arg(c); case QUrlPrivate::InvalidFragmentError: - return QString(QStringLiteral("Invalid fragment (character '%1' not permitted)")) + return QLatin1String("Invalid fragment (character '%1' not permitted)") .arg(c); case QUrlPrivate::AuthorityPresentAndPathIsRelative: @@ -4159,7 +4156,7 @@ QList<QUrl> QUrl::fromStringList(const QStringList &urls, ParsingMode mode) \relates QHash \since 5.0 */ -uint qHash(const QUrl &url, uint seed) Q_DECL_NOTHROW +uint qHash(const QUrl &url, uint seed) noexcept { if (!url.d) return qHash(-1, seed); // the hash of an unset port (-1) @@ -4187,7 +4184,7 @@ static QUrl adjustFtpPath(QUrl url) static bool isIp6(const QString &text) { QIPAddressUtils::IPv6Address address; - return !text.isEmpty() && QIPAddressUtils::parseIp6(address, text.begin(), text.end()) == 0; + return !text.isEmpty() && QIPAddressUtils::parseIp6(address, text.begin(), text.end()) == nullptr; } /*! diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index 5062ef7905..94269e4369 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -119,7 +119,7 @@ class QTypeInfo<QUrlTwoFlags<E1, E2> > : public QTypeInfoMerger<QUrlTwoFlags<E1, class QUrl; // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4) -Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed = 0) noexcept; class Q_CORE_EXPORT QUrl { @@ -182,15 +182,13 @@ public: QUrl(const QString &url, ParsingMode mode = TolerantMode); QUrl &operator=(const QString &url); #endif -#ifdef Q_COMPILER_RVALUE_REFS - QUrl(QUrl &&other) Q_DECL_NOTHROW : d(other.d) + QUrl(QUrl &&other) noexcept : d(other.d) { other.d = nullptr; } - inline QUrl &operator=(QUrl &&other) Q_DECL_NOTHROW + inline QUrl &operator=(QUrl &&other) noexcept { qSwap(d, other.d); return *this; } -#endif ~QUrl(); - inline void swap(QUrl &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + inline void swap(QUrl &other) noexcept { qSwap(d, other.d); } void setUrl(const QString &url, ParsingMode mode = TolerantMode); QString url(FormattingOptions options = FormattingOptions(PrettyDecoded)) const; @@ -361,7 +359,7 @@ public: static QList<QUrl> fromStringList(const QStringList &uris, ParsingMode mode = TolerantMode); static void setIdnWhitelist(const QStringList &); - friend Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed) Q_DECL_NOTHROW; + friend Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed) noexcept; private: QUrlPrivate *d; diff --git a/src/corelib/io/qurl_p.h b/src/corelib/io/qurl_p.h index 1b9237e58a..e75de32e03 100644 --- a/src/corelib/io/qurl_p.h +++ b/src/corelib/io/qurl_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE // in qurlrecode.cpp extern Q_AUTOTEST_EXPORT int qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end, - QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications = 0); + QUrl::ComponentFormattingOptions encoding, const ushort *tableModifications = nullptr); // in qurlidna.cpp enum AceLeadingDot { AllowLeadingDot, ForbidLeadingDot }; diff --git a/src/corelib/io/qurlidna.cpp b/src/corelib/io/qurlidna.cpp index 2305e66407..2f89d22660 100644 --- a/src/corelib/io/qurlidna.cpp +++ b/src/corelib/io/qurlidna.cpp @@ -1444,7 +1444,7 @@ static void mapToLowerCase(QString *str, int from) { int N = sizeof(NameprepCaseFolding) / sizeof(NameprepCaseFolding[0]); - ushort *d = 0; + ushort *d = nullptr; for (int i = from; i < str->size(); ++i) { uint uc = str->at(i).unicode(); if (uc < 0x80) { @@ -1474,7 +1474,7 @@ static void mapToLowerCase(QString *str, int from) else str->replace(--i, 2, reinterpret_cast<const QChar *>(&entry->mapping[0]), l); i += l - 1; - d = 0; + d = nullptr; } else { if (!d) d = reinterpret_cast<ushort *>(str->data()); @@ -2404,7 +2404,7 @@ static const char * const idn_whitelist[] = { }; static const size_t idn_whitelist_size = sizeof idn_whitelist / sizeof *idn_whitelist; -static QStringList *user_idn_whitelist = 0; +static QStringList *user_idn_whitelist = nullptr; static bool lessThan(const QChar *a, int l, const char *c) { diff --git a/src/corelib/io/qurlquery.cpp b/src/corelib/io/qurlquery.cpp index 97e7b8a4eb..36a2880bf1 100644 --- a/src/corelib/io/qurlquery.cpp +++ b/src/corelib/io/qurlquery.cpp @@ -145,6 +145,14 @@ QT_BEGIN_NAMESPACE \since 5.2 */ +/*! + \fn QUrlQuery(std::initializer_list<QPair<QString, QString>> list) + + \since 5.13 + + Constructs a QUrlQuery object from the \a list of key/value pair. +*/ + typedef QList<QPair<QString, QString> > Map; class QUrlQueryPrivate : public QSharedData @@ -181,7 +189,7 @@ public: template<> void QSharedDataPointer<QUrlQueryPrivate>::detach() { - if (d && d->ref.load() == 1) + if (d && d->ref.loadRelaxed() == 1) return; QUrlQueryPrivate *x = (d ? new QUrlQueryPrivate(*d) : new QUrlQueryPrivate); @@ -254,7 +262,7 @@ inline QString QUrlQueryPrivate::recodeToUser(const QString &input, QUrl::Compon if (!(encoding & QUrl::EncodeDelimiters)) { QString output; if (qt_urlRecode(output, input.constData(), input.constData() + input.length(), - encoding, 0)) + encoding, nullptr)) return output; return input; } @@ -282,7 +290,7 @@ void QUrlQueryPrivate::setQuery(const QString &query) const QChar *const end = pos + query.size(); while (pos != end) { const QChar *begin = pos; - const QChar *delimiter = 0; + const QChar *delimiter = nullptr; while (pos != end) { // scan for the component parts of this pair if (!delimiter && pos->unicode() == valueDelimiter) @@ -337,7 +345,7 @@ QSharedDataPointer<QUrlQueryPrivate>::clone() \sa setQuery(), addQueryItem() */ QUrlQuery::QUrlQuery() - : d(0) + : d(nullptr) { } @@ -348,7 +356,7 @@ QUrlQuery::QUrlQuery() set the query with setQuery(). */ QUrlQuery::QUrlQuery(const QString &queryString) - : d(queryString.isEmpty() ? 0 : new QUrlQueryPrivate(queryString)) + : d(queryString.isEmpty() ? nullptr : new QUrlQueryPrivate(queryString)) { } @@ -361,7 +369,7 @@ QUrlQuery::QUrlQuery(const QString &queryString) \sa QUrl::query() */ QUrlQuery::QUrlQuery(const QUrl &url) - : d(0) + : d(nullptr) { // use internals to avoid unnecessary recoding // ### FIXME: actually do it @@ -426,7 +434,7 @@ bool QUrlQuery::operator ==(const QUrlQuery &other) const Returns the hash value for \a key, using \a seed to seed the calculation. */ -uint qHash(const QUrlQuery &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QUrlQuery &key, uint seed) noexcept { if (const QUrlQueryPrivate *d = key.d) { QtPrivate::QHashCombine hash; @@ -454,7 +462,7 @@ bool QUrlQuery::isEmpty() const */ bool QUrlQuery::isDetached() const { - return d && d->ref.load() == 1; + return d && d->ref.loadRelaxed() == 1; } /*! diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h index 092d002543..89d0f88059 100644 --- a/src/corelib/io/qurlquery.h +++ b/src/corelib/io/qurlquery.h @@ -48,9 +48,11 @@ #include <QtCore/qstringlist.h> #endif +#include <initializer_list> + QT_BEGIN_NAMESPACE -Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed = 0) noexcept; class QUrlQueryPrivate; class Q_CORE_EXPORT QUrlQuery @@ -59,18 +61,23 @@ public: QUrlQuery(); explicit QUrlQuery(const QUrl &url); explicit QUrlQuery(const QString &queryString); + QUrlQuery(std::initializer_list<QPair<QString, QString>> list) + : QUrlQuery() + { + for (const QPair<QString, QString> &item : list) + addQueryItem(item.first, item.second); + } + QUrlQuery(const QUrlQuery &other); QUrlQuery &operator=(const QUrlQuery &other); -#ifdef Q_COMPILER_RVALUE_REFS - QUrlQuery &operator=(QUrlQuery &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QUrlQuery &operator=(QUrlQuery &&other) noexcept { swap(other); return *this; } ~QUrlQuery(); bool operator==(const QUrlQuery &other) const; bool operator!=(const QUrlQuery &other) const { return !(*this == other); } - void swap(QUrlQuery &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QUrlQuery &other) noexcept { qSwap(d, other.d); } bool isEmpty() const; bool isDetached() const; @@ -102,7 +109,7 @@ public: private: friend class QUrl; - friend Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed) Q_DECL_NOTHROW; + friend Q_CORE_EXPORT uint qHash(const QUrlQuery &key, uint seed) noexcept; QSharedDataPointer<QUrlQueryPrivate> d; public: typedef QSharedDataPointer<QUrlQueryPrivate> DataPtr; diff --git a/src/corelib/io/qurlrecode.cpp b/src/corelib/io/qurlrecode.cpp index 443ae18b21..35ede8d078 100644 --- a/src/corelib/io/qurlrecode.cpp +++ b/src/corelib/io/qurlrecode.cpp @@ -377,7 +377,7 @@ static int recode(QString &result, const ushort *begin, const ushort *end, QUrl: { const int origSize = result.size(); const ushort *input = begin; - ushort *output = 0; + ushort *output = nullptr; EncodingAction action = EncodeCharacter; for ( ; input != end; ++input) { @@ -692,7 +692,7 @@ qt_urlRecode(QString &appendTo, const QChar *begin, const QChar *end, } // qstring.cpp -bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW; +bool qt_is_ascii(const char *&ptr, const char *end) noexcept; /*! \internal diff --git a/src/corelib/io/qurltlds_p.h b/src/corelib/io/qurltlds_p.h index 5453644225..043e84e5ab 100644 --- a/src/corelib/io/qurltlds_p.h +++ b/src/corelib/io/qurltlds_p.h @@ -1,7 +1,7 @@ -// Version: MPL 1.1/GPL 2.0/LGPL 2.1 +// License: MPL 2.0/GPL 2.0/LGPL 3 // // The contents of this file are subject to the Mozilla Public License Version -// 1.1 (the "License"); you may not use this file except in compliance with +// 2.0 (the "License"); you may not use this file except in compliance with // the License. You may obtain a copy of the License at // http://www.mozilla.org/MPL/ // @@ -59,14106 +59,14139 @@ QT_BEGIN_NAMESPACE // note to maintainer: // this file should be updated before each release -> // for instructions see the program at -// util/corelib/qurl-generateTLDs +// util/corelib/qurl-generateTLDs/ -static const quint16 tldCount = 8621; +static const quint16 tldCount = 8666; static const quint32 tldIndices[] = { 0, -0, -26, -26, -26, -26, -40, -40, -54, -54, -54, -59, +7, +24, +31, +58, 65, -75, -75, -109, -117, -132, -149, -149, -149, -159, -166, -193, -193, -235, -235, -235, -241, -276, -282, -287, -309, -339, -349, -349, -390, -402, -420, -452, -468, -489, -489, -503, -508, -531, -551, -551, -574, -605, -605, -605, -615, -615, -615, -633, -655, -661, -661, -684, -702, -714, -736, +79, +103, +137, +137, +158, +194, +220, +255, +255, +298, +298, +298, +298, +298, +311, +311, +311, +311, +323, +359, +383, +383, +400, +400, +421, +421, +441, +441, +448, +490, +490, +497, +502, +520, +542, +549, +597, +611, +611, +635, +642, +649, +668, +683, +683, +683, +700, +705, +712, +724, +724, +740, 765, 765, 776, -794, -826, -847, -866, -866, -882, -895, -901, -960, -994, -994, -1012, -1012, -1012, -1032, -1048, -1048, -1068, -1090, -1090, -1090, -1101, -1114, -1114, -1133, -1133, -1140, -1140, -1147, -1147, -1156, -1163, -1163, -1163, -1173, -1185, -1185, -1201, -1201, -1208, -1225, -1230, -1285, -1316, -1374, -1394, -1417, -1417, -1417, -1424, -1438, -1476, -1532, -1549, -1556, -1563, -1570, -1590, -1590, -1597, -1604, -1617, -1617, -1629, -1629, -1641, -1648, -1662, -1662, -1680, -1706, -1722, +787, +802, +810, +820, +841, +848, +848, +858, +858, +864, +871, +871, +871, +881, +898, +930, +958, +972, +985, +999, +1006, +1013, +1030, +1056, +1063, +1086, +1086, +1086, +1093, +1100, +1107, +1117, +1117, +1117, +1117, +1128, +1153, +1153, +1180, +1186, +1186, +1193, +1221, +1239, +1239, +1252, +1279, +1286, +1286, +1293, +1307, +1325, +1348, +1348, +1348, +1355, +1355, +1355, +1355, +1373, +1395, +1395, +1413, +1440, +1440, +1440, +1440, +1447, +1457, +1464, +1498, +1498, +1498, +1572, +1606, +1613, +1613, +1613, +1620, +1625, +1632, +1651, +1658, +1672, +1688, +1704, +1712, +1712, 1729, -1745, -1745, +1751, 1757, -1779, -1779, -1786, -1835, -1848, +1771, +1787, +1831, +1831, +1831, +1831, 1848, -1875, -1895, -1895, -1923, -1943, -1943, -1950, -2004, -2023, -2023, -2030, -2051, -2068, -2083, -2100, +1919, +1926, +1926, +1926, +1949, +1961, +1961, +1981, +2001, +2001, +2001, +2009, +2028, +2028, +2035, +2054, +2054, +2077, 2107, -2142, -2155, -2155, -2155, -2162, -2174, -2174, -2174, +2121, +2137, +2157, 2196, 2196, -2218, -2254, -2281, -2287, -2303, -2313, -2313, -2313, -2333, -2354, -2367, -2367, -2367, -2420, -2442, -2460, -2483, -2494, -2513, -2521, -2521, -2538, -2545, -2555, -2583, -2610, -2610, -2617, -2631, -2638, +2217, +2235, +2235, +2243, +2243, +2259, +2259, +2283, +2290, +2290, +2316, +2329, +2356, +2356, +2356, +2356, +2356, +2393, +2414, +2428, +2428, +2440, +2481, +2487, +2487, +2487, +2507, +2507, +2507, +2546, +2562, +2562, +2580, +2607, +2614, +2626, +2649, 2649, -2661, -2661, -2668, -2699, -2705, -2705, -2705, -2712, +2665, +2675, +2682, 2721, +2731, 2737, -2749, -2768, -2775, -2792, -2815, -2825, -2841, -2841, -2868, -2868, -2905, -2905, -2934, -2957, -2957, -2975, -3005, -3012, -3037, -3046, -3046, -3053, -3053, -3066, -3073, -3083, -3083, -3105, -3123, -3123, -3181, -3226, -3245, -3245, -3301, -3323, -3332, -3360, -3370, -3370, -3370, -3380, -3380, -3387, -3387, -3394, -3394, -3394, -3402, -3409, -3416, -3431, -3448, +2765, +2770, +2770, +2803, +2803, +2813, +2833, +2855, +2855, +2855, +2863, +2863, +2863, +2880, +2888, +2896, +2896, +2903, +2903, +2910, +2910, +2928, +2928, +2935, +2999, +2999, +3031, +3031, +3050, +3100, +3141, +3141, +3141, +3147, +3185, +3185, +3197, +3197, +3234, +3241, +3248, +3257, +3272, +3272, +3272, +3309, +3328, +3328, +3346, +3356, +3356, +3356, +3356, +3364, +3392, +3392, +3413, +3441, +3465, +3465, +3465, +3465, +3482, +3482, +3487, +3487, +3487, +3487, +3487, +3497, +3497, +3510, +3510, +3519, +3519, 3519, -3543, -3569, -3607, -3607, -3613, -3625, -3625, -3682, -3689, -3696, -3734, -3750, -3750, -3760, -3760, -3769, -3786, -3786, -3786, -3793, -3809, -3816, -3822, -3829, -3829, -3836, -3852, -3852, -3867, -3874, -3892, -3892, -3902, -3935, -3960, -3980, -4005, -4019, -4032, -4059, -4089, -4089, -4122, -4122, -4151, -4151, -4151, -4151, -4158, -4158, -4158, -4158, -4158, -4158, -4158, -4173, -4191, -4200, -4200, -4224, -4232, -4265, -4281, -4288, -4309, -4348, -4370, -4377, -4396, -4396, -4403, -4403, -4419, -4439, -4446, -4462, -4469, -4469, -4469, -4476, -4483, -4511, -4518, +3519, +3519, +3519, +3530, +3530, +3541, +3568, +3568, +3568, +3586, +3586, +3606, +3627, +3637, +3637, +3645, +3667, +3667, +3708, +3721, +3740, +3762, +3762, +3762, +3762, +3762, +3762, +3775, +3775, +3790, +3812, +3812, +3818, +3818, +3834, +3845, +3881, +3904, +3904, +3910, +3937, +3937, +3937, +3943, +3950, +3950, +3969, +3999, +4017, +4017, +4017, +4017, +4033, +4033, +4033, +4033, +4098, +4135, +4159, +4159, +4159, +4159, +4159, +4169, +4189, +4205, +4239, +4261, +4261, +4261, +4261, +4261, +4261, +4278, +4278, +4293, +4308, +4317, +4336, +4343, +4371, +4371, +4376, +4376, +4376, +4399, +4409, +4424, +4451, +4473, +4473, +4473, +4489, +4489, +4526, +4532, +4532, 4538, -4563, -4580, -4580, -4587, -4608, -4608, -4624, -4640, -4664, -4664, -4664, -4680, -4690, -4699, -4707, -4707, -4707, -4717, -4717, -4741, -4741, -4741, -4741, -4766, -4778, -4778, -4794, -4801, -4834, -4854, -4867, -4874, -4874, -4888, -4888, -4888, -4936, -4942, -4963, -5001, -5008, -5008, -5008, -5008, -5008, -5017, -5024, -5062, -5069, -5074, -5095, -5139, -5146, -5156, -5175, -5182, -5193, +4570, +4570, +4570, +4613, +4632, +4643, +4688, +4688, +4726, +4771, +4783, +4799, +4799, +4865, +4865, +4865, +4885, +4909, +4909, +4926, +4926, +4956, +4994, +5010, +5010, +5020, +5041, +5056, +5075, +5092, +5122, +5122, +5122, +5122, +5130, +5157, +5164, +5177, +5194, 5200, -5212, -5225, -5238, -5261, -5268, -5298, -5298, -5305, -5305, -5315, -5315, -5329, -5329, -5349, -5363, -5363, -5399, -5399, -5418, -5445, -5466, +5200, +5211, +5224, +5241, +5241, +5273, +5273, +5273, +5294, +5294, +5294, +5343, +5343, +5350, +5386, +5396, +5403, +5417, +5449, +5463, +5463, +5480, 5490, -5505, -5505, -5505, -5530, -5530, -5546, -5546, -5582, -5610, -5610, -5634, -5676, -5676, -5722, -5735, -5774, -5774, -5828, -5828, -5828, -5828, -5851, -5881, -5894, -5894, -5901, -5901, -5906, -5906, -5937, +5541, +5591, +5597, +5604, +5604, +5625, +5639, +5649, +5649, +5649, +5666, +5685, +5705, +5705, +5705, +5723, +5772, +5783, +5790, +5804, +5837, +5878, +5915, +5915, +5915, 5937, -5950, -5950, -5950, -5956, -5956, -5956, -5998, -5998, -6030, -6055, -6074, -6090, -6090, -6103, -6103, -6155, -6177, +5984, +5989, +5989, +5989, +6006, +6051, +6051, +6073, +6080, +6080, +6089, +6100, +6149, +6164, +6169, 6207, -6207, -6214, 6214, -6226, -6244, -6266, -6303, +6242, +6278, +6284, +6290, 6303, -6330, -6330, -6344, -6360, -6387, -6410, -6410, -6410, -6410, -6438, -6451, -6451, -6451, -6465, -6477, -6477, +6326, +6383, +6399, +6416, +6416, +6437, +6444, +6457, +6463, +6463, 6477, -6484, -6500, -6500, -6519, -6519, -6530, -6548, -6567, -6567, -6567, -6586, -6604, +6520, +6535, +6555, +6555, +6555, +6555, +6603, 6652, 6652, -6672, -6683, -6716, -6716, -6727, -6727, -6727, -6727, -6727, -6747, -6747, -6781, -6781, -6791, -6821, -6821, -6827, -6827, -6843, +6670, +6691, +6698, +6698, +6712, +6712, +6719, +6719, +6726, +6739, +6778, +6778, +6797, +6797, +6807, +6807, +6830, +6830, +6842, +6865, +6865, +6865, 6869, -6877, -6877, -6877, -6877, -6896, -6896, -6903, -6919, -6919, -6919, -6935, -6935, -6935, -6935, -6935, -6935, -6935, -6966, -6983, -6983, -6999, -6999, -6999, -7013, -7022, -7022, -7022, -7022, -7022, -7022, -7070, -7085, -7105, -7105, -7122, -7139, -7148, -7162, -7162, -7172, -7172, -7210, -7210, -7230, -7242, -7242, -7249, -7259, -7259, -7279, -7279, -7294, -7311, -7317, -7353, -7369, -7375, -7395, -7395, -7431, -7496, -7496, -7505, -7505, -7505, -7505, -7511, -7539, -7551, +6875, +6888, +6888, +6888, +6910, +6926, +6933, +6944, +6964, +6980, +6980, +7024, +7024, +7024, +7024, +7036, +7058, +7068, +7068, +7083, +7087, +7109, +7117, +7124, +7143, +7159, +7194, +7194, +7194, +7201, +7208, +7224, +7231, +7262, +7309, +7323, +7352, +7352, +7359, +7366, +7366, +7381, +7381, +7412, +7412, +7449, +7459, +7459, +7487, +7487, +7487, +7487, +7527, +7545, +7559, +7559, +7559, +7559, +7559, +7564, 7564, -7583, -7595, -7595, 7595, -7628, -7628, -7628, -7665, -7674, -7686, -7711, -7737, -7755, -7755, -7794, -7805, -7811, -7811, -7831, -7831, -7850, -7850, -7858, -7874, -7879, -7903, -7923, -7958, -7958, -7972, -7987, -7987, -7998, -8008, -8008, -8042, -8042, -8059, -8059, -8076, -8096, -8096, -8096, -8114, -8114, -8132, -8132, -8148, -8163, -8175, -8194, -8194, -8205, -8214, -8218, -8246, -8246, -8246, -8286, -8286, -8286, -8286, -8286, +7602, +7626, +7643, +7655, +7655, +7682, +7701, +7725, +7736, +7751, +7765, +7832, +7852, +7906, +7965, +7965, +7976, +7976, +8024, +8041, +8058, +8071, +8084, +8105, +8105, +8115, +8144, +8160, +8182, +8210, +8216, +8229, +8229, +8234, +8282, +8282, +8282, +8289, 8305, 8312, 8312, 8312, 8312, -8335, -8357, -8357, -8366, -8382, -8390, -8394, -8394, -8407, -8414, -8446, -8453, -8466, -8466, -8500, -8500, -8522, +8319, +8363, +8401, +8408, +8415, +8415, +8425, +8454, +8464, +8464, +8482, +8505, 8542, -8554, -8577, -8588, -8608, -8614, -8621, -8652, -8675, -8675, -8687, -8687, -8712, -8712, -8734, -8744, -8798, -8808, -8827, -8827, -8827, +8542, +8557, +8603, +8629, +8629, +8643, +8643, +8667, +8690, +8690, +8714, +8721, +8721, +8726, +8746, +8766, +8783, +8790, +8804, +8833, 8840, -8855, -8855, -8880, -8880, -8897, -8897, -8897, -8930, -8968, -8968, -8968, -8968, -8992, -9055, +8863, +8870, +8884, +8934, +8956, +8956, +8956, +8956, +8965, +8991, +8991, +8997, +9007, +9007, +9013, +9031, +9031, +9038, +9059, +9066, 9073, -9085, -9094, -9116, +9090, +9105, +9109, 9116, -9145, -9164, -9175, -9187, -9214, -9214, -9226, -9242, -9272, -9291, -9305, -9324, -9324, -9324, -9324, -9331, -9368, -9374, -9393, -9415, -9415, -9415, -9428, -9428, -9434, -9451, -9451, -9451, -9486, -9486, -9486, -9486, -9503, -9503, -9503, -9509, -9509, -9541, -9548, -9548, -9548, -9597, -9597, -9604, -9619, -9646, -9657, -9664, -9701, -9730, -9737, -9743, -9755, -9774, -9795, -9802, -9816, -9816, -9824, -9847, -9865, -9865, +9120, +9120, +9178, +9233, +9241, +9259, +9275, +9275, +9275, +9292, +9299, +9299, +9318, +9332, +9351, +9358, +9400, +9422, +9497, +9513, +9517, +9517, +9530, +9537, +9552, +9592, +9592, +9608, +9627, +9643, +9643, +9643, +9653, +9653, +9683, +9691, +9723, +9733, +9758, +9762, +9762, +9762, +9842, +9842, +9871, +9871, 9890, 9904, 9911, -9931, -9955, +9918, +9932, +9949, 9969, -10008, -10015, -10032, -10032, -10039, -10046, -10065, -10065, -10113, -10120, -10128, -10135, -10142, -10142, -10167, -10178, -10198, -10232, -10251, -10307, -10325, -10325, -10325, -10332, -10338, -10360, -10372, -10379, -10412, -10443, -10443, -10460, -10468, -10490, -10490, -10500, -10519, -10534, -10541, -10574, -10598, -10633, -10653, -10673, -10694, -10694, -10694, +10000, +10024, +10024, +10055, +10055, +10082, +10098, +10098, +10126, +10126, +10138, +10138, +10147, +10174, +10174, +10174, +10174, +10196, +10203, +10210, +10210, +10210, +10233, +10245, +10252, +10252, +10282, +10289, +10300, +10346, +10369, +10375, +10402, +10402, +10402, +10402, +10423, +10444, +10453, +10473, +10497, +10503, +10513, +10531, +10579, +10595, +10602, +10602, +10602, +10627, +10648, +10659, +10659, +10674, +10674, +10681, 10706, 10706, -10715, -10725, -10725, -10736, -10743, -10750, -10782, -10798, -10814, -10833, -10833, -10848, -10858, -10858, -10858, -10863, +10722, +10760, +10760, +10772, +10785, +10785, +10785, +10796, +10815, +10836, +10836, +10844, 10875, -10900, -10907, -10930, -10961, -10989, -11020, -11068, -11075, -11082, -11114, -11131, -11156, -11176, -11184, -11212, -11218, -11235, -11235, -11247, -11247, -11254, -11265, -11269, -11304, -11311, -11340, -11340, -11354, -11384, -11384, -11409, -11409, -11422, -11439, -11449, -11449, -11462, -11469, -11469, -11477, -11488, -11488, -11502, -11522, -11589, -11628, -11657, -11670, -11670, +10875, +10875, +10875, +10885, +10885, +10892, +10892, +10892, +10892, +10920, +10920, +10963, +10963, +10963, +10970, +10977, +11007, +11007, +11007, +11007, +11007, +11031, +11041, +11051, +11070, +11078, +11078, +11078, +11091, +11101, +11101, +11123, +11129, +11139, +11155, +11191, +11233, +11233, +11233, +11244, +11244, +11256, +11262, +11262, +11262, +11262, +11278, +11285, +11285, +11314, +11335, +11341, +11359, +11359, +11387, +11401, +11408, +11442, +11442, +11463, +11463, +11470, +11492, +11492, +11492, +11492, +11503, +11537, +11547, +11572, +11572, +11591, +11610, +11610, +11618, +11636, +11652, +11652, +11652, +11675, +11675, +11675, +11675, 11699, -11706, -11723, -11723, -11763, -11763, -11763, -11790, -11825, -11844, -11875, -11875, -11891, -11891, -11898, -11898, -11898, -11898, -11898, -11911, -11911, -11932, -11939, -11939, -11946, -11946, -11957, -11957, -11964, -11988, -11995, -12047, -12110, -12117, -12124, -12131, -12131, -12147, -12173, -12192, -12228, -12235, -12252, -12252, -12284, -12284, -12299, -12299, -12312, -12336, -12343, -12367, -12374, -12400, -12417, -12417, -12437, -12437, -12444, -12479, -12513, -12527, -12541, -12541, -12564, -12607, -12614, -12625, -12632, -12670, -12698, -12739, -12753, -12760, -12791, -12791, -12791, -12791, -12818, -12818, -12818, -12839, -12851, -12851, -12851, -12861, +11710, +11710, +11738, +11748, +11748, +11748, +11768, +11768, +11768, +11768, +11768, +11778, +11778, +11788, +11812, +11820, +11820, +11835, +11852, +11872, +11872, +11929, +11929, +11933, +11952, +11962, +11962, +11979, +11979, +11979, +11992, +11999, +12014, +12014, +12023, +12023, +12023, +12023, +12023, +12023, +12041, +12041, +12066, +12066, +12076, +12076, +12076, +12076, +12087, +12099, +12114, +12137, +12137, +12146, +12166, +12175, +12185, +12201, +12220, +12239, +12253, +12291, +12304, +12304, +12315, +12323, +12342, +12342, +12351, +12357, +12361, +12381, +12381, +12397, +12424, +12452, +12475, +12481, +12481, +12481, +12485, +12502, +12535, +12535, +12552, +12566, +12570, +12601, +12605, +12605, +12611, +12623, +12633, +12633, +12642, +12642, +12642, +12642, +12646, +12656, +12656, +12656, +12656, +12677, +12677, +12714, +12720, +12734, +12734, +12734, +12751, +12774, +12794, +12806, +12806, +12819, +12819, +12819, +12819, +12836, +12836, +12877, +12877, 12877, -12899, -12899, -12906, -12906, -12918, -12925, -12925, -12925, -12925, -12945, -12949, -12968, -12968, -12980, -12996, -12996, -13003, -13030, -13037, -13044, -13080, -13084, -13137, -13156, -13175, -13197, -13213, -13220, -13227, -13227, -13245, -13245, -13245, -13262, -13277, -13304, -13311, -13311, -13319, -13319, -13319, -13324, -13324, -13324, -13324, -13335, -13342, -13342, -13347, -13378, -13390, -13408, -13413, -13413, -13413, -13420, +12893, +12909, +12936, +12936, +12936, +12936, +12950, +12950, +12950, +12950, +12969, +12974, +13000, +13000, +13028, +13034, +13051, +13051, +13051, +13051, +13051, +13067, +13067, +13071, +13071, +13087, +13113, +13164, +13204, +13204, +13211, +13226, +13226, +13230, +13230, +13260, +13276, +13301, +13332, +13340, +13357, +13357, +13357, +13374, +13397, +13410, 13433, -13440, -13447, -13466, -13511, -13525, -13537, -13555, -13600, -13600, -13618, -13629, -13636, -13636, -13679, -13686, -13725, -13757, -13757, -13800, -13826, -13836, -13847, -13867, -13867, -13882, -13911, -13925, -13925, -13942, -13954, -13991, -14001, -14016, -14057, -14073, -14095, -14095, -14104, -14118, -14124, -14124, -14130, -14156, -14156, -14179, -14201, -14201, +13445, +13481, +13503, +13532, +13532, +13584, +13602, +13622, +13650, +13675, +13682, +13682, +13701, +13710, +13721, +13721, +13735, +13735, +13771, +13777, +13797, +13817, +13817, +13817, +13837, +13837, +13842, +13861, +13892, +13892, +13937, +13955, +13994, +13994, +13994, +14023, +14035, +14042, +14052, +14052, +14052, +14074, +14074, +14074, +14074, +14074, +14082, +14116, +14123, +14160, +14174, +14191, +14197, +14197, 14205, 14205, -14209, -14216, -14224, -14231, -14249, -14253, +14205, +14205, +14205, +14243, +14256, +14256, +14256, +14256, +14256, +14291, +14291, 14291, -14338, -14366, +14302, +14302, +14316, +14330, +14330, 14370, -14375, -14407, -14427, -14427, -14434, -14447, -14463, -14473, -14473, -14484, -14484, -14501, -14501, -14501, -14510, -14529, -14543, -14543, -14555, -14559, -14585, -14585, -14601, -14614, -14618, +14370, +14370, +14370, +14387, +14399, +14433, +14441, +14458, +14458, +14458, +14458, +14458, +14458, +14476, +14514, +14527, +14527, +14537, +14560, +14590, +14590, +14590, +14590, 14622, -14642, -14711, -14711, -14730, -14730, -14730, -14730, -14743, -14764, -14764, -14782, -14817, -14829, -14829, -14829, -14835, -14839, -14839, -14839, -14839, -14851, -14859, -14859, -14888, -14888, -14888, +14622, +14648, +14648, +14648, +14656, +14667, +14687, +14705, +14705, +14705, +14705, +14718, +14733, +14759, +14766, +14795, +14795, +14795, +14795, +14801, +14801, +14824, +14832, +14832, +14832, +14832, +14832, +14848, +14860, +14870, 14888, -14927, -14939, -14951, -14951, -14971, +14934, +14952, +14959, +14977, +14977, +14994, +14994, 15007, 15007, -15018, -15034, -15034, -15045, +15007, +15007, +15017, 15045, -15067, -15106, -15106, -15141, -15147, -15163, -15195, -15195, -15209, -15209, -15216, -15216, -15224, -15224, -15224, -15243, -15243, -15243, -15253, -15285, -15285, -15306, -15324, -15382, -15403, -15403, -15407, -15407, -15435, -15435, -15468, -15472, -15499, -15516, -15516, +15052, +15062, +15072, +15094, +15101, +15101, +15125, +15125, +15133, +15140, +15164, +15183, +15201, +15201, +15207, +15211, +15228, +15228, +15242, +15251, +15260, +15260, +15266, +15266, +15266, +15290, +15290, +15290, +15290, +15303, +15317, +15317, +15317, +15323, +15323, +15330, +15343, +15383, +15390, +15390, +15397, +15397, +15397, +15412, +15420, +15427, +15451, +15467, +15467, +15503, +15509, 15528, -15533, -15533, -15538, -15538, -15550, -15568, -15579, -15603, +15528, +15537, +15537, +15537, +15542, +15542, +15542, +15558, +15558, +15558, +15580, +15580, +15580, 15603, -15611, -15621, -15621, -15621, -15621, -15631, -15647, -15655, -15655, -15655, -15655, -15655, -15707, -15707, -15713, -15713, -15733, -15774, -15774, -15784, -15784, -15784, -15784, -15784, -15795, -15795, -15800, -15800, -15800, -15825, -15825, -15825, -15857, -15884, -15884, -15884, -15884, -15884, -15903, -15922, -15937, -15937, +15615, +15615, +15615, +15657, +15690, +15712, +15741, +15741, +15757, +15757, +15792, +15792, +15819, +15819, +15839, +15860, +15867, +15874, +15888, +15888, +15900, +15913, +15927, +15938, +15938, +15956, +15971, +15993, +15993, +15993, +15993, 15997, -16004, -16019, -16065, -16065, -16065, -16086, -16100, -16112, -16112, -16129, -16138, -16138, -16138, -16153, -16169, +16020, +16020, +16033, +16033, +16033, +16069, +16069, +16097, +16109, +16109, +16109, +16145, +16145, +16145, 16186, -16186, -16228, -16228, -16228, -16259, -16270, -16306, -16316, -16322, -16322, -16383, -16393, -16393, -16423, -16423, -16423, -16433, -16448, -16448, -16472, -16472, -16477, -16487, -16528, -16537, -16547, -16552, -16574, +16230, +16250, +16269, +16276, +16283, +16295, +16329, +16359, +16391, +16404, +16404, +16453, +16470, +16480, +16480, +16480, +16499, +16512, +16530, +16530, +16541, +16541, +16563, 16579, +16586, 16596, -16603, -16651, -16686, -16686, -16686, -16703, -16703, -16753, -16753, -16753, -16767, -16767, +16618, +16633, +16665, +16665, +16690, +16721, +16733, +16733, +16740, +16762, +16762, +16762, +16762, +16762, +16762, +16762, +16762, +16777, +16777, 16784, -16825, -16832, -16843, -16843, +16812, +16830, 16851, -16862, -16879, -16898, -16898, -16917, -16917, -16924, -16932, -16970, -17008, -17016, -17034, -17034, -17034, -17034, -17063, -17098, -17127, -17142, -17142, -17160, -17160, -17160, -17160, -17186, -17213, -17240, -17254, -17259, -17259, -17259, +16870, +16870, +16901, +16908, +16908, +16908, +16929, +16953, +16953, +16959, +16959, +16986, +16986, +16986, +16996, +16996, +16996, +16996, +17010, +17030, +17050, +17057, +17057, +17057, +17057, +17066, +17076, +17093, +17093, +17122, +17122, +17138, +17138, +17157, +17164, +17179, +17179, +17198, +17198, +17218, +17236, +17236, +17266, +17283, +17294, 17294, -17350, -17376, -17414, -17443, -17459, -17459, -17477, -17482, -17495, -17508, -17508, -17515, -17521, -17544, -17544, -17544, -17544, -17550, -17573, -17580, -17587, -17631, -17673, -17673, -17691, -17733, -17743, -17762, -17762, -17771, -17771, -17771, -17780, -17807, -17807, -17840, -17847, -17847, -17855, -17867, -17883, -17900, -17900, -17924, -17964, -17964, -17970, -17970, -17998, -18006, -18006, -18006, -18006, -18006, -18035, -18084, -18110, -18110, -18127, -18135, -18167, -18167, -18203, -18203, -18208, -18208, -18238, -18238, -18255, -18267, -18267, -18298, -18314, -18344, -18344, -18352, -18352, -18352, -18352, -18392, -18398, -18437, -18437, -18449, -18463, -18497, -18497, -18546, -18553, -18566, -18616, -18647, -18647, -18663, -18663, -18663, -18696, -18730, -18749, -18749, -18759, -18771, -18771, +17294, +17311, +17321, +17336, +17336, +17336, +17336, +17336, +17347, +17353, +17353, +17353, +17353, +17361, +17361, +17361, +17361, +17374, +17374, +17374, +17388, +17388, +17388, +17395, +17411, +17411, +17411, +17428, +17440, +17457, +17471, +17492, +17492, +17529, +17533, +17546, +17546, +17558, +17566, +17566, +17566, +17578, +17604, +17620, +17650, +17650, +17669, +17695, +17695, +17741, +17741, +17741, +17769, +17774, +17774, +17779, +17785, +17795, +17795, +17803, +17819, +17859, +17859, +17916, +17916, +17955, +17963, +17977, +17977, +18009, +18009, +18021, +18044, +18044, +18044, +18044, +18044, +18044, +18064, +18079, +18079, +18096, +18096, +18132, +18138, +18138, +18171, +18171, +18171, +18171, +18177, +18200, +18220, +18220, +18220, +18234, +18234, +18234, +18270, +18286, +18332, +18343, +18343, +18348, +18367, +18409, +18464, +18486, +18493, +18544, +18544, +18544, +18550, +18575, +18580, +18634, +18646, +18672, +18695, +18695, +18695, +18713, +18744, +18762, +18762, +18770, +18770, +18777, +18781, 18785, 18785, 18785, 18785, -18803, -18803, -18803, -18803, -18803, -18826, -18832, -18832, -18861, -18861, -18870, -18887, -18897, +18791, +18839, +18850, +18864, +18864, +18881, +18881, 18897, -18903, +18912, +18919, 18926, -18933, -18933, -18941, -18957, -18983, -19025, -19034, -19034, -19055, -19122, -19122, -19152, +18944, +18944, +18944, +18951, +18951, +18958, +18969, +18994, +19010, +19054, +19054, +19086, +19097, +19115, +19129, +19129, 19152, -19163, -19163, -19198, -19198, -19198, -19198, -19198, -19210, -19218, -19238, -19238, +19183, +19189, +19226, +19226, +19226, +19226, +19236, +19260, 19266, -19274, -19303, -19317, -19317, -19329, -19329, -19329, -19329, -19355, -19355, -19410, -19410, -19410, -19433, -19450, -19450, -19450, -19463, -19463, -19490, -19524, -19531, -19558, -19597, -19609, -19609, +19273, +19291, +19298, +19298, +19298, +19335, +19352, +19352, +19363, +19383, +19383, +19399, +19409, +19430, +19430, +19447, +19469, +19485, +19485, +19493, +19499, +19499, +19506, +19506, +19516, +19537, +19549, +19588, +19588, 19633, -19642, -19642, -19642, -19642, -19658, -19671, -19703, -19710, -19710, -19727, -19741, -19741, -19748, -19748, -19748, -19755, -19791, -19808, -19827, -19835, -19859, -19869, -19869, +19655, +19676, +19676, +19720, +19723, +19739, +19742, +19745, +19768, +19768, +19771, +19788, +19795, +19823, +19843, +19850, 19869, -19886, -19900, +19893, 19919, -19931, -19940, -19960, -19974, -19983, -20002, -20002, -20002, -20002, -20011, -20011, -20011, -20018, -20031, -20049, -20049, -20049, -20065, +19936, +19939, +19942, +19963, +19966, +19982, +19995, +20004, +20010, +20010, +20045, +20048, +20062, +20071, +20071, +20074, 20084, -20139, -20152, -20159, -20177, -20191, -20202, -20202, -20229, -20248, -20248, -20254, -20254, -20265, -20265, -20275, -20275, -20295, -20322, -20322, -20347, -20377, -20377, -20377, -20401, -20412, -20412, -20419, -20419, -20419, +20090, +20108, +20108, +20114, +20120, +20147, +20153, +20156, +20166, +20169, +20184, +20187, +20195, +20210, +20221, +20246, +20246, +20246, +20273, +20293, +20296, +20313, +20331, +20337, +20346, +20362, +20395, +20395, +20423, +20423, +20429, +20429, 20432, -20455, -20462, -20514, -20514, -20514, -20582, -20588, -20603, -20603, -20603, -20615, -20657, +20443, +20465, +20465, +20468, +20479, +20479, +20497, +20537, +20546, +20558, +20614, +20621, +20639, +20639, +20658, +20661, +20671, 20674, -20691, +20674, +20674, +20674, +20677, +20677, +20677, +20696, +20699, +20699, +20702, +20702, 20705, 20711, -20711, -20711, +20724, 20727, -20727, -20727, -20747, -20769, -20775, -20775, -20790, -20790, -20807, -20826, -20834, -20843, -20856, -20859, -20862, -20873, -20903, -20926, -20926, -20929, -20948, -20982, -21012, -21012, -21018, -21024, -21046, -21062, -21087, -21117, -21151, -21157, -21160, -21166, -21182, -21193, +20730, +20753, +20763, +20766, +20783, +20783, +20783, +20806, +20809, +20819, +20819, +20822, +20911, +20944, +20961, +20992, +21004, +21014, +21017, +21033, +21036, +21036, +21067, +21074, +21094, +21119, +21162, +21179, 21204, -21207, -21223, -21223, -21283, -21304, -21310, -21316, -21316, -21358, -21364, -21371, -21377, -21386, -21386, -21389, -21427, -21490, -21493, -21493, -21517, -21539, -21545, -21545, +21230, +21239, +21250, +21256, +21290, +21297, +21297, +21297, +21333, +21333, +21349, +21352, +21378, +21393, +21411, +21414, +21424, +21435, +21438, +21461, +21461, +21489, +21504, +21511, +21511, +21511, +21511, +21516, +21516, +21526, +21529, +21538, +21538, 21551, -21554, -21592, -21608, -21611, -21617, -21636, -21636, -21646, -21650, +21606, +21609, +21609, +21612, +21634, 21662, -21688, -21700, -21736, -21739, -21766, +21737, +21737, +21756, +21759, 21787, -21805, +21808, +21811, 21814, -21831, -21852, -21871, -21884, -21901, -21901, -21924, -21932, -21932, -21964, -21964, -21967, -21970, -21973, -21973, -21973, -22007, -22026, -22039, -22056, -22063, -22076, -22115, -22152, -22152, -22155, -22179, -22179, -22182, -22185, -22201, -22204, -22237, -22240, -22257, -22257, +21820, +21841, +21860, +21860, +21867, +21875, +21894, +21900, +21921, +21936, +21936, +21945, +21945, +21945, +21986, +22001, +22021, +22027, +22033, +22059, +22080, +22105, +22127, +22130, +22146, +22171, +22174, +22202, +22222, +22244, +22253, 22285, -22288, -22306, -22306, -22309, -22322, 22325, -22328, -22331, -22334, -22334, +22347, 22359, -22366, -22386, -22399, -22414, -22437, -22440, -22450, -22459, -22475, -22485, -22488, -22495, +22371, +22395, +22401, +22404, +22433, +22465, +22465, +22468, +22468, 22507, -22513, -22513, -22513, -22513, -22518, -22518, -22530, -22533, -22536, -22539, -22556, -22587, -22590, -22605, -22620, -22641, -22644, -22644, -22644, -22674, -22674, -22685, -22716, -22732, -22748, -22748, -22764, +22522, +22546, +22546, +22580, +22580, +22612, +22615, +22622, +22622, +22622, +22634, +22655, +22655, +22687, +22699, +22711, +22711, +22731, +22734, +22740, 22767, -22783, -22799, -22799, -22799, -22813, -22825, -22838, -22851, -22854, -22854, -22854, -22899, -22918, -22921, -22921, -22924, -22927, -22975, -22978, -22988, -22988, +22795, +22798, +22801, +22822, +22845, +22883, +22883, +22886, +22916, +22919, +22938, +22947, +22947, +22962, 22994, 22997, -23004, -23010, +23000, 23013, -23016, -23016, -23024, -23024, -23035, -23070, -23073, +23026, +23029, +23029, +23032, +23042, +23042, +23069, +23076, 23087, -23104, -23119, -23150, -23153, -23156, -23173, -23198, -23225, -23241, -23256, -23256, -23259, -23284, -23324, -23340, -23374, -23380, -23383, -23389, -23415, -23421, -23429, -23450, -23453, -23453, -23456, -23456, -23456, -23468, -23485, -23498, -23517, -23529, -23536, -23539, -23553, -23565, -23571, -23571, -23589, -23611, -23611, -23631, -23647, -23670, -23670, -23673, -23700, -23700, -23706, -23709, -23712, -23712, -23715, -23732, -23743, -23746, -23761, -23774, -23777, -23783, -23783, -23800, -23803, -23806, +23094, +23107, +23124, +23142, +23149, +23149, +23152, +23159, +23159, +23181, +23181, +23212, +23219, +23233, +23233, +23255, +23265, +23265, +23279, +23307, +23339, +23349, +23376, +23401, +23451, +23514, +23524, +23552, +23555, +23575, +23591, +23601, +23604, +23620, +23627, +23630, +23640, +23659, +23674, +23714, +23747, +23776, +23786, +23802, +23809, +23812, 23827, -23827, -23837, -23844, +23863, +23882, 23882, -23891, -23907, -23914, -23938, -23948, -23948, -23948, -23948, -23948, -23948, -23963, -23963, -23980, -23989, -24003, -24012, -24030, -24036, -24065, +23892, +23917, +23949, +23974, +23974, +24009, +24039, +24039, +24052, +24060, 24081, -24102, -24102, -24134, -24134, -24137, -24158, -24185, -24255, +24100, +24131, +24131, +24138, +24138, +24148, +24169, +24175, +24233, +24262, +24262, +24265, +24272, 24278, -24287, -24320, -24333, -24350, -24357, -24399, -24425, -24464, -24467, -24470, -24470, -24470, -24488, -24491, -24497, -24500, -24506, -24529, -24535, -24563, -24576, -24579, -24582, +24300, +24321, +24332, +24339, +24349, +24349, +24349, +24353, +24370, +24370, +24370, +24373, +24376, +24405, +24405, +24414, +24454, +24461, +24461, +24461, +24461, +24484, +24504, +24511, +24543, +24558, +24558, +24558, +24571, +24584, 24591, -24594, -24614, -24614, -24617, -24620, -24620, -24623, -24629, -24647, -24669, -24669, -24669, -24711, -24734, -24753, -24758, -24781, -24781, -24805, -24828, -24871, -24895, -24895, -24911, -24911, -24942, -24952, -24984, -25004, -25016, -25029, -25036, -25039, -25039, -25039, -25061, -25061, -25067, -25094, -25118, -25121, -25121, -25121, -25126, -25126, +24619, +24626, +24626, +24678, +24703, +24714, +24729, +24757, +24765, +24769, +24794, +24794, +24827, +24827, +24827, +24834, +24834, +24834, +24834, +24834, +24834, +24852, +24894, +24912, +24919, +24919, +24919, +24922, +24932, +24966, +24982, +25019, +25044, +25059, +25081, +25096, 25145, 25145, -25145, -25145, -25145, -25176, -25196, +25162, +25168, +25188, +25188, +25188, +25200, +25200, 25218, -25259, -25259, -25259, -25259, -25259, -25269, -25306, -25306, -25306, -25313, -25313, -25336, -25346, -25356, -25366, -25366, -25386, -25386, -25397, -25397, -25411, -25439, -25439, -25439, -25439, +25226, +25226, +25233, +25250, +25250, +25250, +25250, +25264, +25264, +25293, +25300, +25311, +25333, +25347, +25347, +25347, +25364, +25403, +25414, +25443, +25460, +25477, +25494, 25511, -25515, -25515, -25521, -25521, -25521, -25521, -25536, -25539, -25549, -25549, -25573, -25608, -25608, -25608, -25608, -25643, -25646, -25646, -25646, -25656, -25656, -25656, -25672, -25672, -25692, -25709, -25729, -25729, -25746, -25766, -25766, -25766, -25793, -25793, -25806, -25806, -25817, -25847, -25847, -25873, -25873, -25884, -25892, -25892, -25892, -25892, -25902, -25909, -25917, -25917, -25949, -25949, -25949, -25953, -25953, -25959, -25959, -25974, -25974, -25974, -25985, -25992, -26003, -26003, -26003, -26003, -26003, -26003, -26003, -26019, -26025, -26033, -26041, -26053, -26053, -26067, +25511, +25522, +25555, +25576, +25583, +25623, +25630, +25630, +25630, +25630, +25630, +25645, +25652, +25659, +25666, +25693, +25723, +25763, +25780, +25788, +25801, +25801, +25821, +25828, +25828, +25835, +25852, +25852, +25859, +25859, +25878, +25896, +25920, +25937, +25969, +25998, +26012, +26049, +26070, 26076, -26092, -26105, -26105, -26105, -26105, -26138, -26163, -26163, -26169, -26182, -26200, -26200, -26205, -26215, +26088, +26088, +26088, +26088, +26088, +26101, +26128, +26149, +26158, +26177, +26183, 26219, -26231, -26231, -26231, -26256, -26277, -26277, -26295, -26295, -26299, -26329, -26336, -26342, -26342, -26366, -26413, -26413, -26413, -26434, -26455, -26455, -26472, -26472, -26483, -26497, -26497, -26497, -26508, -26508, -26512, -26532, -26532, -26532, -26536, -26536, -26545, -26545, -26565, -26565, -26565, -26576, -26586, -26595, -26595, -26608, -26612, -26612, -26639, -26639, -26639, -26639, -26655, -26655, -26676, -26676, -26692, -26707, -26707, -26707, -26707, -26722, -26722, -26730, -26739, -26739, -26739, -26739, -26759, -26759, -26759, -26769, -26769, -26769, -26781, -26796, -26815, -26815, -26815, -26826, -26839, -26839, -26869, -26873, -26914, -26921, -26933, -26950, -26975, -26980, -27007, -27007, -27007, -27042, -27042, -27042, -27046, -27046, -27062, -27070, -27086, -27086, -27086, -27098, -27098, -27105, -27105, -27133, -27133, -27138, -27147, -27147, -27154, -27154, -27154, -27154, -27170, -27170, -27192, -27269, -27269, -27269, -27312, -27312, -27319, -27332, -27345, -27393, -27410, -27410, -27432, -27452, -27452, -27452, -27452, -27452, -27479, -27479, -27507, -27507, -27513, -27513, -27530, -27535, -27535, -27535, -27535, -27535, -27548, -27563, -27579, -27601, -27601, -27611, -27611, -27624, -27624, -27624, -27629, -27648, -27648, -27648, -27656, -27656, -27666, -27683, -27683, -27683, -27704, -27723, -27729, -27729, -27762, -27798, -27798, +26236, +26243, +26253, +26261, +26268, +26278, +26278, +26296, +26307, +26307, +26307, +26315, +26378, +26385, +26402, +26409, +26439, +26459, +26466, +26485, +26485, +26492, +26499, +26499, +26511, +26556, +26572, +26596, +26621, +26621, +26621, +26621, +26659, +26659, +26675, +26700, +26716, +26741, +26755, +26755, +26755, +26785, +26785, +26785, +26825, +26825, +26846, +26864, +26891, +26898, +26936, +26936, +26951, +26951, +26971, +26978, +27008, +27054, +27068, +27075, +27089, +27089, +27120, +27127, +27127, +27127, +27144, +27151, +27169, +27176, +27183, +27208, +27225, +27272, +27272, +27279, +27308, +27354, +27358, +27358, +27374, +27388, +27388, +27388, +27395, +27419, +27426, +27430, +27465, +27472, +27508, +27515, +27529, +27558, +27580, +27590, +27590, +27590, +27605, +27605, +27615, +27615, +27625, +27625, +27625, +27631, +27681, +27681, +27688, +27688, +27707, +27711, +27742, +27749, +27749, +27765, +27793, +27839, +27839, +27839, +27849, +27849, 27864, 27864, -27877, -27907, -27946, -27972, -27972, -27972, -27983, -27983, -27983, -27991, -27998, -28014, +27871, +27871, +27871, +27871, +27871, +27871, +27884, +27903, +27928, +27949, +27949, +27963, +27963, +27975, +27982, +27982, +27982, +27982, +27982, +28019, +28019, 28040, 28040, -28064, -28064, -28080, -28092, -28101, -28101, -28123, -28141, -28161, -28168, -28185, -28196, -28209, -28238, -28259, -28259, -28286, -28304, -28304, -28331, -28348, -28348, -28366, -28379, -28389, -28398, -28398, -28398, -28423, -28449, -28472, -28514, -28523, -28523, -28542, -28542, -28551, -28551, -28565, -28579, -28579, -28589, -28597, -28601, -28633, -28633, -28651, -28679, -28696, -28759, -28759, -28759, -28759, -28759, -28778, -28793, -28836, -28842, -28852, -28859, -28859, -28885, -28885, -28915, -28915, -28915, -28919, -28923, -28971, -28971, -28978, -28982, -28987, -28991, +28040, +28040, +28108, +28134, +28134, +28134, +28174, +28183, +28197, +28197, +28197, +28220, +28230, +28241, +28241, +28257, +28257, +28263, +28290, +28290, +28361, +28368, +28368, +28368, +28373, +28397, +28421, +28433, +28440, +28440, +28450, +28450, +28466, +28481, +28481, +28490, +28532, +28532, +28539, +28548, +28555, +28573, +28573, +28603, +28627, +28645, +28645, +28658, +28684, +28684, +28722, +28749, +28767, +28774, +28774, +28788, +28801, +28844, +28844, +28844, +28850, +28870, +28870, +28877, +28883, +28893, +28893, +28893, +28918, +28918, +28931, +28931, +28931, +28959, +28973, +28973, 28991, -29008, -29031, -29041, -29081, -29081, -29081, -29081, -29088, -29088, -29088, -29100, -29110, -29124, -29147, -29147, -29147, -29153, -29153, -29153, -29175, -29185, -29190, -29214, -29231, -29231, -29231, -29231, -29237, -29265, +29010, +29029, +29038, +29048, +29099, +29099, +29109, +29109, +29109, +29109, +29109, +29109, +29128, +29139, +29162, +29162, +29176, +29176, +29194, +29194, +29194, +29205, +29205, +29227, +29227, +29227, +29227, +29248, +29254, +29270, +29270, 29302, -29333, -29333, -29374, -29421, -29446, -29446, -29456, -29456, -29473, -29489, -29497, -29497, -29530, -29538, -29571, -29602, -29623, -29631, -29631, -29642, -29655, -29702, -29702, -29702, -29702, -29720, -29720, -29731, -29753, -29753, -29753, -29765, +29309, +29326, +29343, +29359, +29369, +29369, +29386, +29411, +29411, +29411, +29411, +29452, +29463, +29463, +29468, +29468, +29492, +29492, +29523, +29535, +29535, +29539, +29539, +29546, +29557, +29557, +29564, +29570, +29579, +29595, +29601, +29608, +29608, +29608, +29664, +29683, +29698, +29698, +29698, +29698, +29706, +29706, +29721, +29746, +29775, 29793, -29800, -29849, -29884, -29884, -29884, -29894, -29919, -29940, -29973, -30037, -30037, -30054, -30054, -30054, -30054, -30054, -30066, -30090, -30103, -30144, -30144, -30144, -30165, -30189, -30189, -30189, -30189, -30189, -30208, -30222, +29813, +29831, +29831, +29852, +29852, +29897, +29916, +29955, +29971, +29971, +30000, +30040, +30040, +30055, +30064, +30071, +30071, +30071, +30071, +30071, +30088, +30088, +30118, +30118, +30130, +30130, +30141, +30164, +30171, +30178, +30194, +30194, +30204, +30223, 30231, -30241, -30241, -30259, 30269, -30276, -30298, -30298, -30298, -30304, -30304, -30314, -30314, -30314, -30314, -30314, -30314, -30321, -30321, -30321, -30321, -30327, -30327, -30334, -30340, -30340, -30362, -30378, -30385, -30385, -30385, -30385, +30308, +30308, +30308, +30352, +30374, +30394, +30394, +30406, 30406, -30412, -30424, -30464, +30406, +30414, +30431, +30431, +30437, +30443, +30461, +30483, 30483, 30483, -30492, -30498, -30522, -30529, -30554, -30554, -30554, -30554, -30572, -30572, -30584, -30584, -30606, -30626, -30665, -30678, -30678, -30697, -30725, +30514, +30519, +30553, +30553, +30558, +30563, +30563, +30604, +30604, +30610, +30610, +30610, +30631, +30642, +30646, +30646, +30646, +30650, +30650, +30681, +30681, +30681, +30698, +30714, +30714, +30714, +30714, +30714, +30721, +30732, +30732, +30732, +30745, +30745, +30751, 30765, -30771, -30771, -30771, -30791, -30791, -30824, -30840, -30844, -30872, -30896, -30896, -30922, -30946, -30946, -30970, +30782, +30805, +30805, +30821, +30821, +30842, +30855, +30881, +30881, +30903, +30903, +30912, +30965, +30965, +30980, +30980, +30980, +30987, 30998, -30998, -31028, -31047, -31070, -31070, -31070, -31076, -31113, -31134, -31140, -31151, -31158, +31002, +31064, +31075, +31087, +31103, +31109, +31109, +31109, +31122, +31122, +31122, +31135, +31150, +31150, +31165, 31165, -31185, -31185, -31185, -31203, -31218, -31233, -31233, -31233, -31256, -31263, -31263, -31287, -31287, -31287, -31297, -31309, -31317, -31327, -31343, -31353, -31353, -31389, -31389, -31389, -31406, -31406, -31406, -31423, -31439, -31439, -31459, -31469, -31476, -31493, -31499, -31515, -31515, -31534, -31534, +31175, +31175, +31175, +31189, +31220, +31220, +31230, +31240, +31274, +31281, +31307, +31307, +31313, +31342, +31349, +31372, +31413, +31413, +31429, +31435, +31435, +31435, +31447, +31454, +31454, +31454, +31461, +31461, +31488, +31488, +31488, +31488, +31488, +31507, +31537, +31546, +31546, +31546, 31566, -31585, -31608, -31608, -31626, -31641, -31648, +31590, +31602, +31602, +31602, +31622, +31622, 31648, -31665, -31665, -31665, -31665, -31681, -31705, -31746, -31768, -31841, -31851, -31927, -31927, -31934, -31962, -31986, -31992, -32008, -32021, -32021, -32021, -32021, -32027, -32027, -32053, -32053, -32057, -32088, -32088, -32098, -32098, -32098, -32129, -32172, -32193, -32208, -32208, -32228, -32228, -32248, -32254, -32274, -32274, -32287, -32309, -32319, -32350, -32355, -32391, -32397, -32397, -32412, -32412, -32419, -32461, -32468, -32468, -32468, -32485, -32485, -32510, -32553, -32565, -32578, -32586, -32591, -32591, -32595, -32608, -32608, -32636, -32636, -32636, -32658, -32676, +31677, +31692, +31701, +31717, +31728, +31728, +31744, +31744, +31754, +31783, +31816, +31827, +31827, +31834, +31834, +31863, +31884, +31884, +31898, +31954, +32001, +32023, +32023, +32041, +32054, +32076, +32086, +32121, +32128, +32135, +32135, +32158, +32188, +32203, +32203, +32255, +32255, +32255, +32279, +32308, +32346, +32374, +32394, +32394, +32394, +32394, +32414, +32431, +32431, +32447, +32447, +32447, +32462, +32462, +32462, +32462, +32505, +32522, +32522, +32522, +32539, +32544, +32569, +32569, +32569, +32598, +32614, +32633, +32633, +32633, +32648, +32648, +32659, 32680, 32680, -32695, -32695, -32695, -32695, -32695, +32720, +32720, +32726, +32726, 32726, 32726, -32768, -32779, -32804, -32821, -32835, -32835, -32835, -32851, -32866, -32881, -32881, -32886, -32886, -32886, -32893, -32893, -32912, -32924, -32935, -32935, -32955, -32975, -32993, +32769, +32803, +32803, +32803, +32803, +32803, +32819, +32819, +32836, +32836, +32836, +32856, +32856, +32871, +32871, +32889, +32913, +32919, +32919, +32919, +32919, +32942, +32942, +32942, +32942, +32942, +32963, +32984, 33012, -33020, -33038, -33046, -33069, -33069, -33118, -33131, -33131, -33157, -33157, -33172, -33177, -33182, -33197, -33204, +33018, +33018, +33018, +33018, +33034, +33060, +33060, +33077, +33110, +33110, +33120, +33120, +33144, +33181, +33195, +33195, +33195, +33212, +33225, 33238, -33254, -33281, -33294, -33309, -33320, -33360, -33360, -33364, -33379, -33379, -33397, -33415, -33415, -33415, -33415, -33415, -33415, -33441, -33465, +33248, +33248, +33248, +33248, +33259, +33259, +33259, +33273, +33273, +33273, +33273, +33273, +33273, +33273, +33273, +33273, +33273, +33293, +33303, +33303, +33313, +33325, +33325, +33325, +33336, +33342, +33347, +33347, +33357, +33370, +33403, +33442, +33467, +33477, +33477, +33491, +33491, 33508, 33508, -33508, -33525, -33531, -33558, -33572, -33572, -33579, -33579, -33607, -33636, -33642, -33642, -33663, -33663, -33663, -33663, -33670, -33670, -33670, -33670, -33677, -33677, -33677, -33688, -33688, -33688, -33709, -33723, -33741, -33741, -33741, -33741, -33741, -33741, -33752, -33752, -33752, -33771, -33771, -33771, -33790, +33560, +33569, +33569, +33569, +33589, +33628, +33654, +33665, +33681, +33700, +33719, +33719, +33742, +33760, +33760, +33760, +33760, +33760, +33788, +33788, +33804, 33804, -33824, -33864, -33875, -33886, -33903, -33903, -33916, -33928, -33948, -33961, -34011, -34048, -34065, -34097, -34112, -34112, -34112, -34112, -34130, -34148, -34148, -34148, -34178, -34191, -34223, -34228, -34228, -34260, -34260, -34260, -34260, -34282, -34305, -34315, -34315, -34336, -34356, -34373, -34373, -34379, -34401, -34419, -34419, -34419, -34419, -34432, -34432, -34438, -34460, -34489, -34508, -34515, -34515, -34515, -34515, -34537, -34546, -34546, -34546, -34546, -34546, -34562, -34573, -34573, -34583, -34621, +33804, +33830, +33854, +33854, +33854, +33860, +33860, +33878, +33898, +33898, +33898, +33898, +33898, +33941, +33941, +33955, +33982, +33982, +34002, +34002, +34017, +34030, +34090, +34104, +34104, +34140, +34180, +34195, +34214, +34214, +34214, +34244, +34244, +34263, +34263, +34263, +34263, +34263, +34263, +34263, +34263, +34279, +34312, +34341, +34345, +34351, +34374, +34386, +34407, +34407, +34407, +34417, +34437, +34437, +34449, +34459, +34465, +34484, +34484, +34494, +34534, +34556, +34556, +34556, +34566, +34576, +34576, +34582, +34607, +34607, +34628, 34634, -34644, -34664, -34664, -34695, -34719, -34719, -34762, -34762, -34762, -34805, -34811, -34832, -34836, -34836, -34836, -34836, -34865, +34646, +34646, +34655, +34673, +34673, +34686, +34686, +34697, +34697, +34714, +34714, +34714, +34714, +34714, +34731, +34731, +34731, +34731, +34731, +34741, +34767, +34767, +34767, +34783, +34783, +34792, +34792, +34847, +34862, +34876, +34876, +34891, 34891, -34911, -34916, -34916, -34916, -34916, -34933, -34963, -34979, -34979, -35021, -35035, -35035, -35044, -35055, -35092, -35120, -35120, -35120, -35120, -35120, -35139, -35179, -35208, -35218, +34902, +34919, +34919, +34939, +34939, +34939, +34954, +34954, +34954, +34954, +34971, +34971, +34988, +34988, +34998, +35006, +35006, +35006, +35017, +35023, +35023, +35028, +35028, +35047, +35066, +35066, +35076, +35128, +35137, +35158, +35174, +35174, +35181, +35181, +35223, 35233, -35249, -35249, -35298, -35309, -35325, +35248, +35258, +35277, +35277, +35282, +35300, +35316, +35335, +35335, 35344, -35344, -35358, -35358, -35395, -35410, -35410, -35419, -35419, -35419, -35419, +35378, +35400, 35419, -35451, -35470, -35470, -35494, -35523, -35523, -35573, -35573, -35597, -35609, -35644, -35662, -35662, -35676, -35680, -35680, -35680, -35680, -35685, -35694, -35694, -35694, -35729, -35747, -35747, -35754, -35761, -35761, -35771, -35793, -35802, -35837, -35889, -35889, -35889, -35889, -35899, -35915, -35947, -35947, -35947, -35957, -35957, -35980, -35986, -35986, -35986, -36002, -36050, -36050, -36074, -36084, -36092, -36092, -36117, -36117, +35433, +35433, +35448, +35461, +35477, +35498, +35522, +35533, +35554, +35569, +35569, +35586, +35595, +35608, +35608, +35608, +35618, +35623, +35635, +35645, +35645, +35645, +35682, +35682, +35682, +35682, +35687, +35701, +35705, +35705, +35705, +35715, +35715, +35715, +35753, +35766, +35808, +35821, +35825, +35835, +35857, +35877, +35877, +35877, +35888, +35888, +35905, +35967, +35967, +35974, +35974, +36001, +36027, +36027, +36038, +36038, +36054, +36064, +36064, +36064, +36083, +36111, +36133, 36133, 36156, -36171, -36184, -36227, -36247, -36288, -36288, -36317, -36325, -36342, -36342, -36342, -36349, -36349, -36369, -36378, -36397, -36410, -36410, -36449, -36473, -36473, -36488, -36488, -36500, -36527, -36538, -36538, -36578, -36610, -36632, -36651, -36651, -36651, -36651, -36664, -36664, -36682, -36682, -36682, -36713, -36732, -36732, -36732, -36732, -36732, -36745, -36745, -36751, -36751, -36770, +36178, +36198, +36198, +36198, +36202, +36255, +36276, +36282, +36290, +36290, +36313, +36334, +36334, +36334, +36345, +36411, +36424, +36450, +36472, +36472, +36472, +36479, +36495, +36511, +36575, +36575, +36593, +36593, +36593, +36593, +36602, +36616, +36628, +36628, +36656, +36672, +36719, +36719, +36719, +36719, +36719, +36737, +36737, +36737, +36750, +36750, +36750, +36758, 36770, 36770, -36776, -36807, -36827, -36827, -36844, -36844, -36853, -36863, -36873, -36873, -36880, -36880, -36880, -36884, -36897, -36928, -36928, -36950, -36968, -36973, -36973, -36989, -37055, -37055, -37073, -37085, -37094, -37106, -37157, -37163, +36778, +36778, +36778, +36778, +36826, +36835, +36835, +36835, +36850, +36850, +36855, +36872, +36872, +36903, +36919, +36934, +36939, +36939, +36954, +36954, +36986, +37016, +37043, +37051, +37062, +37062, +37062, +37069, +37069, +37069, +37069, +37069, +37069, +37069, +37069, +37096, +37096, +37115, +37115, +37149, +37177, 37193, -37232, +37214, +37228, +37228, +37228, +37228, +37228, 37241, -37265, -37265, -37272, -37281, -37324, -37359, -37391, -37415, -37429, -37429, -37457, -37457, -37463, -37463, -37469, -37469, -37498, -37498, -37498, -37498, -37498, -37498, -37498, -37498, -37498, -37515, -37526, -37541, -37559, -37597, -37617, -37627, -37634, -37668, -37668, -37668, -37668, -37699, -37706, -37706, -37706, +37245, +37245, +37245, +37250, +37250, +37268, +37294, +37299, +37314, +37328, +37335, +37335, +37372, +37380, +37396, +37410, +37416, +37428, +37468, +37490, +37511, +37516, +37516, +37528, +37528, +37528, +37528, +37534, +37534, +37562, +37589, +37589, +37589, +37611, +37611, +37611, +37625, +37631, +37654, +37654, +37654, +37658, +37685, +37685, 37706, -37715, -37724, -37733, -37751, -37767, -37767, +37717, +37717, +37717, +37732, +37732, +37732, +37758, 37783, -37783, -37793, -37793, -37793, -37806, -37806, -37828, -37841, -37841, -37841, -37841, -37866, -37879, -37879, -37896, -37903, -37910, -37910, +37803, +37822, +37840, +37840, +37840, +37840, +37863, +37881, +37894, 37926, -37971, -37971, -37981, -38033, -38082, -38113, -38122, -38122, -38122, -38122, -38144, -38144, -38144, -38169, -38210, -38244, -38284, +37949, +37949, +37949, +37970, +37970, +37991, +37991, +37991, +37991, +38025, +38025, +38025, +38025, +38045, +38058, +38058, +38080, +38080, +38095, +38095, +38142, +38179, +38187, +38211, +38218, +38225, +38232, +38277, +38298, +38298, 38328, -38339, -38339, -38377, -38402, -38412, -38429, -38429, -38452, -38474, -38481, -38488, -38488, -38488, -38488, -38511, -38525, -38568, -38568, -38575, -38592, -38613, -38629, -38629, -38654, -38684, -38684, -38703, -38710, -38710, -38735, -38748, -38755, -38762, -38776, -38776, -38776, -38776, -38776, -38812, -38819, -38834, -38847, -38854, -38861, -38868, -38868, -38888, -38888, -38908, -38908, +38352, +38352, +38371, +38371, +38378, +38407, +38428, +38448, +38448, +38458, +38458, +38458, +38489, +38489, +38489, +38489, +38499, +38515, +38532, +38532, +38578, +38578, +38586, +38606, +38606, +38624, +38624, +38624, +38642, +38647, +38647, +38658, +38665, +38682, +38723, +38767, +38767, +38795, +38795, +38801, +38801, +38801, +38837, +38837, +38856, +38856, +38894, 38915, -38926, -38942, -38949, -38956, -38956, -38956, -38963, -38980, -38980, -39003, -39009, +38941, +38965, +38965, +38965, +38965, +38992, +39015, 39039, -39052, -39059, -39077, -39084, -39084, -39091, -39091, -39108, -39115, -39115, -39150, -39150, -39179, -39184, -39184, -39240, -39240, -39277, -39284, -39284, -39284, -39309, -39351, +39045, +39045, +39053, +39058, +39058, +39088, +39088, +39118, +39118, +39129, +39129, +39129, +39147, +39155, +39155, +39178, +39182, +39222, +39222, +39230, +39230, +39230, +39230, +39238, +39238, +39260, +39260, +39260, +39281, +39295, +39310, +39328, +39335, +39342, 39358, -39363, -39395, -39408, -39421, -39421, -39427, -39427, -39440, -39453, -39461, -39461, -39473, -39473, -39473, -39490, -39497, -39510, -39510, -39516, -39516, -39523, -39523, -39535, -39544, -39551, -39561, -39561, -39568, +39371, +39386, +39386, +39415, +39415, +39422, +39454, +39471, +39471, +39471, +39478, +39520, +39520, +39534, +39541, +39541, +39548, +39548, +39548, 39568, -39585, -39585, -39592, -39592, -39599, -39622, -39622, -39637, -39677, -39715, -39736, -39765, -39765, -39775, -39793, -39793, -39814, -39850, -39864, -39889, -39893, -39917, -39927, -39934, -39934, -39952, -39959, -39977, -39984, -39991, -40009, -40009, -40013, -40013, -40032, -40032, -40032, -40032, -40032, -40032, -40047, -40062, -40078, -40078, -40095, -40131, -40137, -40151, -40186, -40201, -40208, -40227, -40236, -40236, -40243, -40250, -40250, -40359, -40366, -40373, +39581, +39605, +39613, +39627, +39634, +39672, +39699, +39705, +39712, +39728, +39741, +39748, +39755, +39762, +39799, +39843, +39884, +39891, +39905, +39922, +39922, +39929, +39936, +39943, +39970, +39970, +39970, +39988, +40002, +40022, +40026, +40026, +40043, +40073, +40097, +40107, +40107, +40166, +40178, +40184, +40211, +40234, +40260, +40260, +40285, +40310, +40310, +40331, +40348, +40348, +40362, 40380, -40404, -40404, -40415, -40422, -40434, -40458, -40465, -40472, -40472, -40472, +40380, +40394, +40414, +40414, +40421, +40421, +40460, 40472, +40483, +40490, 40497, -40502, -40509, -40527, +40512, 40527, -40540, -40547, -40562, -40569, -40584, -40591, -40591, -40598, -40605, -40605, -40612, -40619, -40630, -40660, -40667, -40674, -40690, -40714, -40721, -40748, -40763, -40770, -40784, -40795, -40827, -40827, -40841, -40841, -40870, -40870, -40889, -40889, -40889, +40546, +40587, +40587, +40587, +40587, +40607, +40614, +40614, +40614, +40614, +40614, +40635, +40635, +40635, +40653, +40673, +40673, +40673, +40673, +40673, +40680, +40680, +40694, +40708, +40731, +40731, +40738, +40757, +40757, +40764, +40803, +40812, +40825, +40825, +40832, +40838, +40869, +40922, 40936, -40942, -40952, -40982, -40991, -41001, -41017, -41033, -41040, -41060, -41073, -41104, -41114, -41114, -41149, -41149, -41149, -41149, -41149, -41156, -41221, -41244, -41266, -41292, -41292, -41309, -41309, +40955, +40990, +40997, +41010, +41053, +41071, +41101, +41107, +41119, +41194, +41208, +41208, +41208, +41215, +41233, +41265, +41285, +41295, 41318, -41325, -41361, -41389, -41415, -41415, -41442, -41457, -41471, -41478, -41478, -41478, -41487, -41487, -41502, -41518, -41553, -41553, -41575, -41575, -41575, -41596, -41596, -41596, -41596, -41603, -41603, -41603, -41603, -41617, -41625, -41638, -41671, -41704, -41721, -41752, -41788, -41810, -41828, -41842, -41849, -41849, -41859, -41874, -41881, -41881, -41881, -41881, -41881, -41906, -41919, -41935, -41942, -41942, -41959, -41959, -41966, -41973, -41980, -41980, -41987, -42017, -42024, -42031, -42031, -42038, -42045, -42055, -42092, -42125, -42144, -42151, -42162, -42181, -42192, -42215, -42215, -42241, -42255, -42255, -42255, -42255, -42255, -42279, +41318, +41336, +41356, +41356, +41363, +41379, +41407, +41439, +41469, +41500, +41500, +41524, +41524, +41524, +41524, +41529, +41578, +41616, +41616, +41631, +41672, +41677, +41711, +41726, +41787, +41787, +41787, +41818, +41845, +41845, +41845, +41900, +41930, +41937, +41937, +41937, +41937, +41986, +42025, +42037, +42059, +42073, +42080, +42148, +42148, +42163, +42179, +42186, +42197, +42219, +42226, +42240, +42240, +42240, +42259, +42264, +42280, 42290, -42297, -42315, -42315, -42315, -42356, -42356, -42356, -42382, -42382, -42389, -42398, -42398, -42398, -42408, -42426, -42426, -42437, -42443, -42448, -42448, -42448, -42470, -42470, -42478, -42520, -42546, +42313, +42313, +42328, +42346, +42373, +42380, +42399, +42406, +42406, +42413, +42427, +42476, +42494, +42533, +42533, +42540, +42540, 42556, -42571, -42588, -42594, -42645, -42656, -42656, -42656, -42656, -42673, -42680, -42680, -42680, -42688, -42688, -42719, -42758, -42758, -42758, -42768, -42794, -42794, -42794, -42806, -42822, -42846, -42865, -42865, -42874, -42874, -42887, -42887, -42894, -42920, -42932, -42932, -42966, -42987, -42987, -42987, -43015, -43030, -43041, -43041, -43049, -43069, -43082, -43082, -43082, -43082, -43108, -43125, -43147, -43155, -43174, -43180, -43193, -43193, -43193, -43193, -43193, -43193, -43220, -43232, -43232, -43232, -43246, -43262, -43270, -43278, -43278, -43278, -43278, -43301, -43301, -43320, -43320, -43366, -43370, -43388, -43388, -43388, -43433, +42567, +42587, +42601, +42615, +42622, +42643, +42664, +42664, +42664, +42702, +42718, +42718, +42734, +42746, +42761, +42781, +42793, +42810, +42815, +42841, +42890, +42897, +42905, +42917, +42924, +42931, +42936, +42941, +42951, +42967, +42988, +42988, +43012, +43028, +43054, +43070, +43123, +43127, +43144, +43175, +43199, +43199, +43236, +43244, +43244, +43273, +43280, +43287, +43302, +43318, +43318, +43318, +43331, +43353, +43373, +43373, +43390, +43390, +43390, +43390, +43425, +43437, +43437, 43447, -43462, -43462, -43462, -43462, -43462, -43495, -43495, -43521, -43528, -43528, -43552, -43612, -43612, -43632, -43648, -43659, -43666, -43693, -43710, -43723, -43728, -43757, -43768, -43780, -43797, -43797, -43797, -43809, -43816, -43821, -43849, -43871, -43890, -43923, -43923, -43932, -43940, -43940, -43958, -43979, -43979, -43979, -43979, -44002, -44002, -44002, -44002, -44058, -44077, -44099, -44129, -44140, -44146, -44146, -44146, -44165, -44178, -44178, -44202, -44202, -44220, -44238, -44255, -44255, -44263, +43464, +43504, +43504, +43504, +43504, +43504, +43504, +43512, +43587, +43587, +43613, +43620, +43620, +43669, +43684, +43698, +43711, +43732, +43752, +43766, +43773, +43796, +43811, +43820, +43840, +43840, +43856, +43876, +43891, +43922, +43922, +43945, +43970, +43984, +44011, +44024, +44024, +44048, +44055, +44055, +44060, +44067, +44074, +44094, +44094, +44106, +44126, +44136, +44149, +44149, +44149, +44190, +44232, +44232, +44250, +44264, +44264, +44264, 44280, -44298, -44302, -44302, -44330, -44351, -44351, -44363, -44363, -44363, -44378, -44385, -44406, +44280, +44280, +44303, +44335, +44361, +44361, +44398, 44406, -44434, -44444, -44472, -44472, -44472, -44488, -44492, -44523, -44561, -44592, -44611, -44611, -44632, -44644, -44644, -44651, -44651, -44651, +44425, +44425, +44452, +44459, +44459, +44459, +44459, +44466, +44481, +44516, +44550, +44556, +44576, +44576, +44583, +44583, +44599, +44621, +44642, 44651, -44651, -44684, -44684, -44690, -44706, -44725, -44731, -44731, -44731, -44731, -44746, -44746, -44757, -44757, -44757, -44757, -44787, -44787, -44787, -44787, -44787, -44799, -44812, -44812, -44827, -44847, -44856, -44856, -44856, -44856, -44884, +44661, +44661, +44661, +44679, +44679, +44710, +44728, +44740, +44747, +44761, +44772, +44795, +44804, +44804, +44804, +44804, +44804, +44808, +44814, +44814, +44814, +44832, +44832, +44832, +44844, +44872, 44899, -44911, -44911, -44911, -44928, -44958, -44958, -44981, -44981, -44990, -45012, -45037, -45037, -45046, -45046, -45073, -45073, -45085, -45096, -45096, -45100, -45113, -45123, -45158, +44924, +44931, +44931, +44939, +44983, +44988, +44988, +44998, +45008, +45015, +45015, +45028, +45028, +45045, +45045, +45074, +45091, +45091, +45091, +45091, +45095, +45141, +45141, +45155, +45155, +45155, 45173, -45206, -45214, -45230, -45230, -45258, -45268, -45295, -45307, -45307, -45307, -45307, -45307, -45307, -45338, -45338, -45355, -45372, -45372, -45393, -45393, -45393, -45403, -45403, -45403, -45414, -45455, -45455, -45455, -45455, +45196, +45209, +45226, +45238, +45266, +45266, +45266, +45266, +45302, +45308, +45312, +45312, +45333, +45365, +45377, +45386, +45409, +45409, +45409, +45409, +45445, 45455, -45463, -45463, 45478, -45497, -45514, -45514, -45524, -45540, -45540, -45540, -45558, -45558, -45558, -45558, -45574, -45574, -45574, -45590, -45654, -45674, -45686, -45686, -45686, -45705, -45705, -45711, -45721, -45732, -45732, -45732, -45732, -45732, -45738, -45748, -45748, -45769, -45789, -45789, -45800, -45837, -45856, -45868, -45876, -45885, -45902, -45908, -45918, -45918, -45918, -45948, -45976, +45478, +45494, +45511, +45511, +45511, +45523, +45523, +45538, +45538, +45553, +45553, +45589, +45589, +45600, +45610, +45629, +45657, +45720, +45725, +45725, +45755, +45777, +45777, +45791, +45814, +45840, +45890, +45890, +45890, +45927, +45927, +45934, +45934, +45954, +45954, 45976, 45976, 45976, -45981, -46009, +45998, +46007, +46016, 46016, -46027, -46027, -46027, 46034, -46050, -46090, -46108, -46108, -46112, -46119, -46126, -46149, -46149, -46149, -46149, +46034, +46066, +46081, +46102, +46117, +46146, +46146, +46162, +46162, 46169, -46193, -46193, -46193, -46204, -46213, -46222, -46222, -46238, -46245, -46257, -46257, -46301, -46301, -46322, -46322, -46322, -46327, -46345, -46359, +46174, +46215, +46215, +46234, +46239, +46286, +46286, +46300, +46313, +46370, +46370, +46370, 46374, -46384, -46417, -46417, -46428, -46458, -46458, -46458, -46493, -46493, -46500, -46505, -46555, -46567, -46567, -46580, -46580, -46580, -46595, -46595, -46595, -46595, -46628, -46628, -46652, -46652, -46669, -46669, -46698, -46718, -46718, -46718, -46738, -46753, -46761, -46776, -46776, -46776, +46379, +46393, +46401, +46416, +46416, +46446, +46467, +46482, +46482, +46496, +46538, +46538, +46581, +46581, +46629, +46629, +46629, +46640, +46644, +46649, +46649, +46659, +46659, +46673, +46700, +46731, +46731, +46731, +46741, +46766, +46766, +46771, +46771, +46782, 46794, 46794, -46802, -46816, -46846, -46863, -46899, -46899, -46899, -46907, -46907, -46917, -46930, -46957, -46957, -46961, -46961, -46969, -46975, -46975, -46975, -46991, -46999, -46999, -47012, -47018, -47018, -47048, -47058, -47076, -47145, -47145, -47162, -47183, -47228, -47244, -47267, -47267, -47295, -47295, -47295, -47316, -47316, -47316, -47353, -47361, -47385, -47385, -47415, -47419, -47430, -47450, -47465, -47470, -47470, -47470, -47470, -47479, -47501, -47521, -47529, -47536, -47554, -47572, -47572, -47597, -47606, -47614, -47614, -47614, -47623, -47623, -47660, -47660, -47669, -47681, -47694, -47694, -47694, -47698, -47702, -47720, -47720, -47730, -47749, -47767, -47790, -47808, -47824, -47824, -47824, -47830, -47830, -47836, -47869, -47869, -47875, -47898, -47898, -47958, -47962, -47978, -47978, -47985, -48019, -48023, -48023, -48023, -48023, -48043, -48043, -48058, -48058, -48058, -48058, +46812, +46812, +46828, +46851, +46851, +46851, +46851, +46851, +46855, +46868, +46875, +46875, +46886, +46890, +46925, +46925, +46925, +46936, +46954, +46972, +46972, +46972, +46998, +47068, +47068, +47068, +47098, +47107, +47122, +47128, +47151, +47156, +47156, +47170, +47177, +47182, +47193, +47200, +47226, +47226, +47253, +47273, +47283, +47283, +47290, +47303, +47303, +47303, +47320, +47327, +47327, +47335, +47335, +47344, +47344, +47356, +47356, +47360, +47360, +47369, +47394, +47425, +47425, +47425, +47443, +47466, +47466, +47481, +47495, +47513, +47513, +47532, +47532, +47543, +47590, +47603, +47613, +47618, +47618, +47635, +47641, +47641, +47679, +47727, +47740, +47753, +47769, +47779, +47801, +47809, +47829, +47859, +47859, +47878, +47885, +47906, +47906, +47906, +47940, +47950, +47950, +47950, +47950, +47984, +47991, +47991, +47991, +47991, +48029, +48029, +48029, +48038, +48038, +48038, +48055, +48055, 48065, -48070, -48101, -48101, -48116, -48127, -48127, -48139, -48139, -48163, -48163, -48177, -48177, -48204, -48218, -48246, -48262, -48262, -48262, -48283, -48283, -48306, -48306, -48312, -48312, -48317, -48331, -48347, -48354, -48364, -48364, -48364, -48394, -48447, -48452, -48452, -48476, -48476, -48476, -48542, -48572, -48582, -48622, -48658, -48669, -48669, -48669, -48686, -48686, -48686, -48693, -48693, -48699, -48724, -48741, +48065, +48065, +48065, +48105, +48105, +48123, +48138, +48164, +48179, +48179, +48179, +48205, +48211, +48250, +48310, +48343, +48368, +48368, +48374, +48381, +48397, +48397, +48397, +48406, +48426, +48426, +48439, +48458, +48458, +48485, +48485, +48494, +48520, +48532, +48578, +48595, +48608, +48608, +48608, +48623, +48636, +48636, +48636, +48636, +48648, +48687, +48703, +48711, +48727, 48741, -48752, -48764, -48784, -48784, -48794, -48799, -48799, -48799, -48799, -48820, -48830, -48866, -48884, -48894, -48913, -48913, -48913, -48913, -48925, -48966, -48975, +48746, +48746, +48746, +48746, +48746, +48746, +48771, +48771, +48771, +48806, +48847, +48847, +48847, +48847, +48847, +48886, +48886, +48886, +48886, +48886, +48886, +48899, +48933, +48933, +48933, 48975, -48975, -48980, -48987, -49020, -49028, -49054, -49060, -49060, -49086, -49110, -49110, -49121, -49121, -49121, -49134, -49134, -49134, -49141, +48979, +48986, +48986, +49019, +49019, +49019, +49040, +49040, +49040, +49059, +49076, +49103, +49103, +49132, +49132, +49132, +49132, +49132, +49132, +49154, 49171, -49185, -49197, -49228, -49254, -49254, -49286, -49302, -49315, -49315, -49353, -49362, +49191, +49216, +49226, +49264, +49264, +49278, +49278, +49301, +49340, +49340, +49360, +49370, +49370, 49374, -49385, -49412, +49381, +49381, +49399, +49406, 49419, -49447, -49447, -49489, -49514, -49526, -49526, -49559, -49559, -49603, -49615, -49655, -49667, -49667, -49682, -49699, -49743, -49743, -49755, +49428, +49428, +49464, +49464, +49497, +49497, +49497, +49497, +49501, +49501, +49501, +49518, +49548, +49548, +49579, +49594, +49619, +49619, +49639, +49665, +49665, +49665, +49665, +49671, +49671, +49671, +49686, +49686, +49686, +49701, +49701, +49701, +49724, +49738, 49755, 49755, -49768, -49778, -49799, -49816, -49816, -49816, -49822, -49822, -49835, -49854, -49872, -49872, -49872, -49882, -49882, -49945, -49969, -49978, -49993, -49993, +49765, +49785, +49795, +49807, +49807, +49842, +49862, +49862, +49876, +49899, +49899, +49899, +49929, +49929, +49929, +49959, +49959, +49959, +49990, +49994, +50012, 50028, -50044, -50054, -50076, -50083, -50108, -50108, -50120, -50120, -50143, -50143, -50202, -50202, -50214, +50071, +50071, +50081, +50081, +50081, +50091, +50099, +50139, +50139, +50139, +50139, +50156, +50184, +50209, +50209, +50209, +50216, +50216, +50223, +50231, +50231, +50231, +50231, +50251, 50265, -50279, -50279, -50291, -50291, -50316, -50366, -50366, -50387, -50387, -50387, -50387, -50387, -50405, -50405, -50425, -50425, -50432, -50432, -50432, -50439, -50439, -50463, -50470, -50470, -50470, -50470, -50474, -50486, -50495, -50495, -50518, -50518, -50518, -50533, -50558, -50579, -50579, -50601, -50611, -50645, -50674, -50674, -50692, -50729, -50748, -50784, -50784, -50801, -50814, -50831, -50831, -50831, -50831, -50844, +50273, +50295, +50311, +50311, +50330, +50330, +50339, +50348, +50373, +50373, +50406, +50406, +50406, +50422, +50422, +50433, +50494, +50526, +50542, +50542, +50542, +50542, +50542, +50552, +50552, +50586, +50586, +50586, +50612, +50619, +50619, +50644, +50659, +50659, +50676, +50676, +50676, +50676, +50676, +50723, +50736, +50736, +50736, +50736, +50755, +50778, +50778, +50778, +50785, +50785, +50793, +50815, +50856, 50856, -50860, -50872, +50874, +50886, 50909, -50921, -50921, -50964, -50964, -50986, -51006, -51006, -51006, -51021, -51021, -51029, -51035, -51047, -51058, -51058, -51062, -51089, -51089, -51120, -51120, -51120, -51126, -51126, -51139, -51139, -51153, -51153, -51153, -51153, -51165, -51186, -51186, -51208, -51247, -51247, -51247, -51261, -51273, -51273, -51298, -51298, -51298, -51321, -51321, -51321, -51338, -51343, -51371, -51395, -51417, -51417, -51417, -51426, -51426, -51426, -51445, -51455, -51469, -51469, -51488, -51492, -51492, -51511, -51529, -51529, -51549, -51549, -51564, -51583, -51611, -51622, -51644, -51644, -51644, -51656, -51674, -51674, +50918, +50973, +50998, +51014, +51030, +51030, +51030, +51036, +51036, +51046, +51072, +51072, +51078, +51118, +51118, +51118, +51118, +51134, +51182, +51203, +51219, +51219, +51230, +51240, +51240, +51260, +51260, +51260, +51260, +51260, +51260, +51260, +51275, +51275, +51301, +51358, +51374, +51386, +51393, +51402, +51402, +51402, +51441, +51471, +51507, +51507, +51531, +51547, +51547, +51571, +51571, +51571, +51571, +51571, +51571, +51587, +51612, +51626, +51642, +51665, +51681, +51681, +51681, +51681, 51700, -51733, -51741, -51768, -51822, -51829, -51850, -51850, -51857, -51857, +51713, +51734, +51742, +51746, +51746, +51746, +51759, +51759, +51799, +51799, +51811, +51811, +51816, +51816, +51851, +51851, 51867, -51874, -51874, -51874, -51874, -51888, -51910, -51938, -51945, -51958, -51976, -51990, -51990, +51879, +51879, +51885, +51902, +51918, +51940, +51940, +51946, +51966, +51997, 52007, -52033, -52043, -52055, -52055, -52095, -52111, -52123, -52128, -52128, -52147, -52153, -52175, -52199, -52223, -52223, -52223, -52223, -52223, -52223, -52262, -52283, -52324, -52346, -52346, -52380, -52380, +52018, +52018, +52049, +52049, +52049, +52064, +52064, +52084, +52104, +52130, +52168, +52204, +52236, +52249, +52249, +52276, +52276, +52309, +52328, +52328, +52338, +52364, +52364, +52377, 52395, -52395, -52407, -52407, -52419, -52426, -52439, -52483, -52495, -52495, -52514, -52514, -52523, -52523, -52535, -52559, -52559, -52563, -52563, -52582, -52594, -52644, -52661, -52661, -52720, -52732, -52740, -52740, -52740, -52740, -52759, -52782, -52809, -52809, -52821, -52833, -52853, -52853, -52853, -52887, -52899, -52903, -52930, -52930, -52942, -52942, -52972, -53012, -53012, -53054, -53066, +52402, +52418, +52441, +52441, +52485, +52524, +52524, +52567, +52567, +52567, +52567, +52614, +52628, +52628, +52642, +52654, +52680, +52699, +52760, +52765, +52765, +52765, +52785, +52785, +52785, +52785, +52806, +52832, +52832, +52871, +52871, +52885, +52885, +52892, +52911, +52935, +52958, +52976, +52996, +53005, +53005, +53022, +53022, +53022, 53066, -53066, -53092, -53106, -53124, +53081, +53088, +53102, +53109, +53109, +53120, 53124, -53131, -53171, -53176, -53176, -53176, -53176, -53186, -53186, -53210, -53230, -53230, -53230, -53240, -53277, -53291, -53291, -53291, -53302, -53320, -53320, -53347, -53347, -53364, -53378, -53382, -53399, -53424, -53437, -53437, -53437, -53470, -53470, -53470, -53477, -53477, -53484, -53484, -53484, -53499, -53499, -53499, -53504, -53510, -53528, -53528, -53528, -53537, -53537, -53537, -53542, +53158, +53174, +53174, +53185, +53185, +53221, +53249, +53256, +53256, +53285, +53290, +53309, +53309, +53309, +53317, +53322, +53322, +53322, +53360, +53369, +53369, +53369, +53386, +53405, +53405, +53405, +53412, +53432, +53444, +53464, +53472, +53494, +53494, +53494, +53531, 53547, -53570, -53576, -53601, -53601, -53606, +53547, +53547, +53547, +53556, +53556, +53556, +53556, +53556, +53564, +53587, 53606, -53625, -53625, -53643, -53650, -53686, -53686, -53693, -53724, -53743, -53759, -53764, -53764, -53774, +53610, +53628, +53651, +53651, +53667, +53667, +53674, +53674, +53681, +53697, +53701, +53701, +53722, +53722, +53729, +53741, +53749, +53749, +53749, +53749, +53765, 53774, -53794, -53800, -53835, -53851, -53851, -53871, -53892, -53917, -53917, -53925, -53925, -53925, -53973, -53973, -53977, +53785, +53799, +53799, +53821, +53831, +53847, +53902, +53902, +53902, +53902, +53941, +53962, +53972, +53972, 53998, -54018, -54036, -54054, -54062, -54123, -54123, -54123, -54142, -54194, -54194, -54208, +54016, +54033, +54049, +54066, +54066, +54079, +54089, +54089, +54089, +54096, +54118, +54139, +54163, +54179, +54184, +54210, 54232, -54242, -54259, -54259, -54268, -54275, -54282, -54305, -54312, -54335, -54348, -54355, -54369, -54369, -54369, -54382, -54382, -54382, -54410, -54436, -54456, -54456, -54456, -54463, -54463, -54472, -54497, -54537, +54254, +54278, +54278, +54292, +54325, +54337, +54371, +54396, +54421, +54434, +54455, +54462, +54495, +54507, +54507, +54523, +54542, +54552, +54552, +54552, +54552, +54552, +54559, +54559, 54569, -54591, -54591, -54591, -54591, -54617, -54617, -54664, -54664, -54664, -54664, -54693, -54700, -54700, -54736, -54746, -54771, -54782, -54804, -54850, -54868, -54901, -54901, -54921, -54921, -54921, -54960, -54987, -54993, -55000, -55000, -55028, +54620, +54692, +54710, +54721, +54721, +54759, +54773, +54787, +54787, +54803, +54808, +54834, +54834, +54848, +54848, +54848, +54855, +54855, +54879, +54891, +54891, +54891, +54891, +54900, +54910, +54949, +54962, +54978, +54978, +54985, +55005, +55018, +55037, 55037, +55044, +55049, +55049, +55056, 55066, -55118, -55133, -55133, -55133, -55138, -55138, -55138, -55138, -55138, -55159, -55191, -55191, -55191, -55226, -55232, -55232, -55242, -55257, -55257, -55270, -55270, -55270, -55298, -55317, -55317, -55317, -55317, -55317, -55317, -55331, -55350, -55350, -55350, +55073, +55081, +55143, +55151, +55161, +55168, +55190, +55196, +55213, +55213, +55230, +55237, +55247, +55267, +55272, +55279, +55279, +55286, +55306, +55334, +55341, +55348, +55354, 55363, -55387, -55387, -55411, -55411, -55422, -55435, -55481, -55490, -55502, -55502, +55363, +55378, +55386, +55395, +55432, +55432, +55437, +55446, +55458, +55479, 55502, -55520, +55512, +55512, 55532, -55554, -55563, -55570, -55585, -55585, -55603, -55610, -55610, -55662, -55662, -55684, -55700, -55707, -55707, -55749, -55765, -55784, -55784, -55784, -55791, -55791, -55791, -55816, -55823, -55852, -55852, -55906, -55941, -55971, -55971, -55978, -55978, -55978, -55987, -56011, -56018, -56024, -56024, -56024, -56055, -56071, -56071, -56078, -56078, -56085, -56092, -56122, -56141, -56141, -56141, -56141, -56146, -56146, -56155, -56178, -56209, -56238, -56257, -56257, -56257, -56262, -56275, -56275, -56275, -56275, -56290, -56307, -56323, -56341, -56341, -56347, -56366, -56375, -56375, -56375, -56375, -56413, -56445, -56450, -56450, -56450, -56454, +55543, +55565, +55573, +55580, +55580, +55618, +55638, +55645, +55657, +55657, +55657, +55691, +55708, +55708, +55708, +55708, +55729, +55735, +55758, +55758, +55767, +55772, +55820, +55830, +55830, +55854, +55854, +55866, +55886, +55886, +55886, +55886, +55910, +55910, +55914, +55929, +55939, +55965, +56006, +56025, +56037, +56037, +56037, +56064, +56115, +56115, +56128, +56133, +56133, +56133, +56133, +56133, +56140, +56140, +56140, +56151, +56177, +56205, +56205, +56219, +56219, +56219, +56236, +56250, +56250, +56250, +56260, +56264, +56271, +56271, +56283, +56292, +56312, +56329, +56338, +56338, +56338, +56364, +56371, +56382, +56382, +56389, +56389, +56389, +56417, +56417, +56417, +56417, +56417, +56437, +56437, +56444, +56460, 56460, -56467, -56490, -56510, -56517, -56527, -56534, -56534, -56534, -56565, -56577, -56577, -56584, -56608, -56608, -56615, -56615, -56640, -56658, -56658, -56658, -56677, -56677, -56701, -56701, -56722, -56750, -56757, -56757, -56802, -56802, -56802, -56821, -56839, -56863, -56863, +56474, +56503, +56511, +56524, +56594, +56599, +56659, +56685, +56700, +56707, +56707, +56738, +56761, +56774, +56785, +56792, +56805, +56829, +56829, +56840, +56868, +56868, +56868, +56868, 56874, 56874, -56905, -56941, -56976, -57006, -57006, -57025, -57032, -57037, -57037, -57061, -57061, -57067, -57067, -57074, -57093, -57131, -57138, +56874, +56874, +56881, +56881, +56893, +56922, +56934, +56934, +56944, +56944, +56944, +56944, +56965, +56973, +57005, +57081, +57126, 57138, -57158, -57158, -57158, -57169, -57169, -57177, -57191, -57191, -57191, -57191, -57226, -57248, -57261, -57278, -57306, -57306, -57329, -57329, -57349, -57349, -57356, -57356, -57409, -57416, -57422, -57422, -57446, -57463, -57463, -57463, -57487, -57507, -57507, -57507, -57528, -57528, -57528, -57535, -57542, -57542, -57578, -57578, -57592, -57592, -57598, -57598, -57645, +57159, +57175, +57199, +57216, +57216, +57222, +57222, +57222, +57237, +57259, +57282, +57282, +57296, +57312, +57312, +57341, +57397, +57405, +57442, +57442, +57442, +57456, +57466, +57482, +57500, +57512, +57537, +57537, +57575, +57575, +57575, +57582, +57609, +57633, 57651, -57665, -57665, -57684, -57684, -57692, -57692, -57692, -57709, -57724, -57724, -57766, -57766, -57773, -57773, -57780, -57780, -57797, -57842, -57842, -57842, -57842, -57852, -57852, -57852, +57688, +57714, +57767, +57775, +57783, +57783, +57810, +57849, +57856, 57869, -57882, -57899, -57899, -57936, -57943, -57943, -57973, -57989, -58001, -58001, -58001, -58001, -58024, -58024, -58024, -58024, -58051, -58051, -58051, -58082, -58091, -58091, -58091, -58097, -58097, -58097, -58130, -58130, -58130, -58130, -58130, -58150, -58150, -58166, -58166, -58171, -58171, -58203, -58209, -58216, -58229, -58235, -58242, -58249, -58260, -58267, -58322, -58332, -58372, -58372, -58384, -58384, -58384, -58405, -58430, -58449, -58476, -58492, -58492, -58499, -58506, -58520, -58554, -58560, -58579, -58595, -58627, -58651, -58651, -58651, +57889, +57916, +57941, +57941, +57941, +57948, +57956, +57974, +57996, +58017, +58048, +58048, +58048, +58048, +58070, +58070, +58094, +58151, +58192, +58224, +58224, +58224, +58224, +58263, +58263, +58273, +58283, +58314, +58356, +58356, +58363, +58363, +58363, +58380, +58396, +58396, +58417, +58417, +58417, +58423, +58423, +58450, +58461, +58461, +58470, +58470, +58514, +58514, +58537, +58544, +58557, +58557, +58557, +58557, +58557, +58591, +58615, +58636, +58636, 58658, 58679, 58686, 58686, 58686, -58714, -58714, -58728, -58735, -58753, -58753, -58770, -58777, -58842, -58842, -58859, -58879, -58886, -58886, -58940, -58940, -58964, -58964, -58982, -58988, -59002, -59032, -59056, -59067, -59083, -59112, -59112, -59121, -59152, -59152, +58700, +58717, +58732, +58739, +58739, +58745, +58752, +58762, +58784, +58811, +58825, +58832, +58839, +58863, +58899, +58905, +58912, +58912, +58912, +58939, +58939, +58939, +58960, +58973, +58973, +58973, +58973, +58973, +58980, +58980, +58987, +58994, +59012, +59012, +59019, +59055, +59110, +59110, +59110, +59110, +59135, +59153, +59153, 59180, -59185, -59192, -59192, -59192, -59219, -59229, -59229, -59229, -59229, -59229, -59239, -59239, -59250, -59265, -59288, -59306, -59306, -59318, -59329, -59329, -59350, -59368, -59377, -59394, -59417, +59186, +59196, +59210, +59236, +59244, +59244, +59244, +59276, +59282, +59300, +59300, +59342, +59351, +59372, +59390, +59402, +59418, +59444, +59444, 59444, -59465, -59465, -59472, -59472, -59472, -59479, -59479, -59479, -59497, -59514, -59514, -59514, -59528, -59528, -59554, -59554, -59592, -59597, -59628, -59669, -59676, -59683, -59690, -59690, -59719, -59757, -59757, -59764, +59444, +59482, +59495, +59495, +59525, +59545, +59568, +59578, +59584, +59584, +59596, +59596, +59596, +59596, +59615, +59625, +59663, +59663, +59670, +59711, +59731, +59731, +59761, 59782, -59793, -59819, -59823, -59835, -59850, -59879, -59886, -59893, -59903, -59903, -59918, -59918, -59935, -59963, -59963, -60006, -60030, -60034, -60041, -60041, -60060, -60060, -60074, -60074, -60103, -60103, -60110, -60124, -60138, -60138, -60138, -60152, -60162, -60171, -60186, -60186, -60192, -60240, -60260, -60298, -60298, -60298, -60340, -60354, -60361, -60390, -60390, -60408, -60446, -60452, -60452, -60475, -60482, -60489, -60509, -60509, -60509, -60524, -60531, -60531, -60557, -60564, -60581, -60586, -60629, -60629, -60629, -60629, -60629, -60636, -60663, -60675, -60675, -60682, -60704, -60704, -60724, -60776, -60809, -60832, -60849, -60870, -60877, -60907, -60956, -60956, -60989, +59837, +59837, +59862, +59904, +59931, +59931, +59931, +59931, +59946, +59958, +59958, +59958, +59958, +59958, +59981, +60003, +60003, +60003, +60012, +60012, +60012, +60039, +60047, +60088, +60116, +60161, +60195, +60195, +60227, +60238, +60256, +60283, +60292, +60296, +60301, +60325, +60325, +60325, +60335, +60335, +60368, +60368, +60368, +60399, +60440, +60449, +60470, +60485, +60499, +60535, +60535, +60542, +60550, +60550, +60562, +60562, +60569, +60614, +60614, +60614, +60634, +60634, +60648, +60648, +60648, +60669, +60669, +60690, +60698, +60698, +60723, +60752, +60772, +60772, +60772, +60788, +60788, +60810, +60821, +60846, +60869, +60899, +60916, +60916, +60916, +60916, +60925, +60931, +60931, +60931, +60931, +60938, +60972, +60972, +60972, +60985, +60985, +61003, +61003, +61003, +61003, +61003, +61003, 61003, -61024, -61048, -61062, -61069, -61101, -61101, -61101, -61101, -61125, -61138, -61155, -61162, -61162, -61184, -61184, -61184, -61184, -61184, -61184, -61216, -61242, -61296, -61296, -61296, -61303, -61303, -61303, -61334, -61360, -61360, -61397, -61416, -61423, -61448, -61476, -61483, -61483, +61003, +61003, +61031, +61031, +61044, +61056, +61072, +61108, +61146, +61146, +61146, +61146, +61207, +61231, +61231, +61250, +61257, +61257, +61288, +61288, +61322, +61322, +61338, +61338, +61343, +61352, +61352, +61373, +61383, +61389, +61436, +61443, +61449, +61503, +61520, +61520, +61520, +61520, 61532, -61539, -61560, -61578, -61578, -61578, -61617, -61624, +61544, +61557, +61557, +61557, +61557, +61563, +61563, +61591, +61610, +61631, 61631, -61681, -61706, -61721, -61721, -61729, -61729, -61764, -61776, -61776, -61776, -61808, -61831, -61831, -61837, -61846, -61846, +61631, +61651, +61659, +61691, +61726, +61744, +61744, +61748, +61758, +61794, +61829, +61836, +61856, +61856, 61864, -61883, -61890, -61910, -61910, -61910, -61917, -61917, -61954, -61954, -61954, -61961, -61968, -61978, -62000, -62007, -62014, -62028, -62042, -62077, -62102, -62109, -62109, -62116, -62116, -62123, -62156, -62163, -62197, -62197, -62197, -62218, -62218, -62232, -62250, -62257, -62286, -62286, -62293, -62300, -62320, -62382, -62430, -62437, -62484, -62484, -62498, -62540, -62552, -62559, -62559, -62559, -62573, -62583, -62592, -62592, -62596, -62628, -62649, -62674, -62674, -62694, -62699, -62699, -62734, +61897, +61924, +61924, +61924, +61924, +61924, +61946, +61946, +61962, +61977, +62005, +62015, +62015, +62033, +62033, +62033, +62065, +62075, +62075, +62087, +62104, +62104, +62104, +62104, +62138, +62138, +62165, +62165, +62193, +62220, +62235, +62235, +62255, +62262, +62269, +62269, +62269, +62269, +62269, +62282, +62282, +62291, +62307, +62307, +62307, +62316, +62316, +62333, +62333, +62344, +62370, +62392, +62392, +62392, +62396, +62411, +62411, +62411, +62418, +62422, +62463, +62463, +62486, +62500, +62504, +62512, +62512, +62522, +62539, +62544, +62557, +62567, +62567, +62567, +62571, +62571, +62571, +62575, +62575, +62575, +62575, +62591, +62591, +62632, +62638, +62638, +62638, +62648, +62675, +62675, +62675, +62675, +62696, +62696, +62715, +62715, +62732, 62745, -62752, -62759, -62773, -62773, -62804, -62821, -62821, -62825, -62836, -62874, +62801, +62828, +62853, +62853, +62863, +62863, +62879, 62884, -62911, -62923, -62923, -62935, -62941, -62963, -62987, -63002, -63002, -63027, -63027, -63027, -63027, +62884, +62893, +62929, +62949, +62949, +62961, +62980, +62998, +63007, +63017, 63027, -63045, -63045, -63057, -63064, -63064, -63108, -63121, -63136, -63136, -63136, -63136, -63136, -63136, -63143, -63143, -63178, -63178, -63178, -63215, -63238, -63264, -63279, -63315, -63337, -63337, -63360, -63360, -63364, -63378, -63378, -63426, -63440, -63460, -63460, -63460, -63460, +63034, +63034, +63050, +63050, +63050, +63050, +63088, +63111, +63111, +63111, +63111, +63111, +63111, +63111, +63111, +63142, +63155, +63155, +63165, +63165, +63165, +63172, +63172, +63172, +63172, +63172, +63172, +63172, +63191, +63191, +63201, +63221, +63230, +63230, +63230, +63230, +63249, +63254, +63254, +63266, +63266, +63287, +63287, +63313, +63327, +63327, +63327, +63327, +63346, +63377, +63377, +63377, +63392, +63392, +63392, +63392, +63392, +63412, +63412, +63431, +63437, +63437, 63464, -63468, -63491, -63517, -63517, -63535, -63548, -63548, -63601, -63624, -63643, -63660, -63660, -63702, -63714, -63714, -63714, -63723, -63742, -63742, -63742, -63761, -63779, -63790, -63805, -63805, -63805, +63473, +63479, +63494, +63509, +63509, +63520, +63520, +63520, +63520, +63520, +63547, +63547, +63547, +63547, +63547, +63582, +63614, +63632, +63632, +63640, +63640, +63664, +63664, +63664, +63677, +63690, +63690, +63713, +63738, +63738, +63771, +63788, +63788, +63811, +63811, +63818, +63818, +63818, +63818, +63830, 63852, -63858, -63880, -63910, -63927, -63938, -63938, -63985, -63985, -64010, -64010, -64010, -64017, -64017, -64049, -64049, -64065, -64083, -64083, -64102, -64102, -64102, -64110, -64110, -64122, -64122, -64156, -64186, -64186, +63863, +63863, +63883, +63883, +63887, +63887, +63920, +63931, +63956, +63956, +63956, +63975, +64026, +64030, +64067, +64067, +64067, +64080, +64080, +64097, +64124, +64124, +64139, +64139, +64139, +64139, +64148, +64148, +64148, +64148, +64173, 64193, -64232, -64249, -64269, -64287, -64287, -64330, -64361, -64379, -64407, -64412, -64412, -64431, -64453, -64461, -64498, -64512, -64512, -64512, -64553, -64558, -64558, -64614, +64200, +64217, +64231, +64235, +64241, +64241, +64279, +64313, +64332, +64345, +64368, +64424, +64430, +64448, +64479, +64496, +64514, +64574, +64574, +64595, +64599, +64618, +64643, 64657, -64657, -64657, -64694, -64694, -64694, -64710, -64710, -64717, -64735, -64735, -64745, -64755, -64763, -64782, -64782, -64782, -64782, -64782, -64796, -64796, -64796, -64822, -64822, -64839, -64839, -64855, -64866, +64672, +64691, +64691, +64691, +64691, +64728, +64742, +64760, +64760, +64787, +64819, +64819, +64837, +64844, +64860, 64874, -64889, -64906, -64934, -64963, -64963, -64963, -64963, -64969, -64982, -64982, -64982, -64996, -64996, -64996, -65008, -65033, -65045, -65045, -65045, -65060, -65075, -65075, -65075, -65075, -65100, -65121, -65121, -65126, +64885, +64885, +64891, +64901, +64953, +64953, +64953, +64967, +64997, +64997, +64997, +65020, +65027, +65044, +65051, +65062, +65078, +65099, +65099, +65099, 65126, -65126, -65150, -65159, -65159, -65184, -65184, -65206, -65206, -65222, -65228, -65247, -65256, -65263, -65275, -65275, -65294, -65308, +65133, +65162, +65209, +65217, +65234, +65265, +65265, +65265, +65285, +65285, +65291, +65291, +65291, 65308, -65359, -65359, -65359, -65381, -65381, -65397, -65415, -65465, -65476, -65482, -65490, -65490, +65328, +65335, +65341, +65353, +65366, +65390, +65408, +65418, +65429, +65440, +65440, +65457, +65466, 65496, -65532, -65559, -65603, +65502, +65508, +65508, +65517, +65535, +65554, +65558, +65564, +65564, +65570, +65581, 65607, -65607, -65633, -65643, -65715, -65721, -65782, -65782, -65782, -65810, -65825, -65825, -65831, -65831, -65831, -65831, -65845, -65850, -65863, -65873, -65882, -65882, -65886, -65904, -65923, -65923, -65939, -65983, -65995, -65995, -66004, -66035, -66061, -66092, -66112, -66112, -66121, -66150, -66162, -66166, -66166, -66175, -66175, -66200, -66230, -66249, -66275, -66292, -66313, -66317, -66317, -66337, -66344, -66344, -66351, +65627, +65635, +65635, +65635, +65635, +65647, +65685, +65693, +65712, +65729, +65729, +65734, +65734, +65734, +65755, +65776, +65776, +65793, +65808, +65828, +65842, +65878, +65891, +65891, +65891, +65982, +65989, +66003, +66003, +66003, +66023, +66057, +66088, +66101, +66132, +66139, +66146, +66146, +66159, +66159, +66182, +66182, +66182, +66189, +66217, +66259, +66271, +66271, +66285, +66297, +66332, +66349, +66349, 66364, 66364, -66381, -66391, -66391, -66391, -66400, -66400, -66411, -66411, -66416, -66416, -66436, -66448, -66455, -66469, -66478, -66478, -66478, -66482, -66482, -66482, -66482, -66492, -66492, -66501, -66511, -66518, -66531, -66541, -66541, -66561, -66561, -66561, -66576, -66576, -66576, -66576, -66576, -66576, -66602, -66602, -66614, -66619, -66619, -66619, -66680, -66685, -66685, -66685, -66707, -66716, -66716, -66716, -66716, -66716, -66729, -66748, -66748, -66804, -66814, -66814, -66814, -66822, -66832, -66876, -66876, -66895, -66895, -66905, -66914, -66933, -66942, -66967, -66987, -66987, -66998, +66421, +66449, +66463, +66503, +66535, +66548, +66555, +66555, +66570, +66570, +66580, +66580, +66587, +66587, +66587, +66603, +66631, +66631, +66650, +66650, +66675, +66695, +66702, +66702, +66702, +66702, +66709, +66709, +66739, +66755, +66762, +66762, +66775, +66805, +66823, +66835, +66841, +66841, +66841, +66841, +66841, +66841, +66861, +66907, +66907, +66907, +66907, +66907, +66922, +66940, +66940, +66940, +66940, +66975, +66975, +66975, +67002, 67016, -67024, -67034, -67034, -67043, -67043, -67043, -67062, -67103, -67103, -67112, -67145, -67145, -67160, -67168, -67168, -67168, -67176, -67205, -67242, -67242, -67242, -67256, -67276, -67276, -67276, -67276, -67297, -67345, -67345, -67345, -67345, -67345, -67358, -67362, -67382, -67382, -67382, -67388, -67422, -67422, -67454, -67454, -67472, -67488, -67506, -67506, -67506, -67506, -67525, -67525, -67544, -67560, -67578, -67578, -67578, -67583, -67600, -67614, -67641, -67659, -67675, -67706, +67032, +67032, +67039, +67069, +67075, +67086, +67119, +67146, +67146, +67151, +67167, +67197, +67197, +67214, +67214, +67221, +67236, +67236, +67249, +67265, +67279, +67306, +67313, +67336, +67353, +67404, +67420, +67420, +67420, +67420, +67420, +67420, +67429, +67429, +67446, +67446, +67462, +67462, +67473, +67480, +67490, +67511, +67511, +67568, +67605, +67639, +67646, +67682, +67689, +67696, +67702, +67720, 67744, -67761, -67801, -67801, -67837, -67837, -67844, -67844, -67844, -67844, -67844, -67854, -67873, -67907, -67907, -67922, -67922, -67929, -67947, -67947, -67977, -67984, -67994, -67994, -67994, -68022, -68038, -68038, -68046, -68087, -68098, -68104, -68104, -68120, -68120, -68120, -68126, -68126, -68138, -68143, -68169, -68169, -68199, -68241, -68256, -68279, -68279, -68279, +67763, +67763, +67782, +67806, +67806, +67806, +67810, +67817, +67817, +67827, +67840, +67840, +67840, +67840, +67840, +67847, +67867, +67874, +67874, +67886, +67886, +67920, +67927, +67932, +67960, +67967, +67974, +67992, +67992, +68004, +68004, +68031, +68031, +68063, +68088, +68095, +68112, +68112, +68112, +68127, +68135, +68146, +68176, +68193, +68200, +68221, +68228, +68245, +68245, +68280, +68280, 68320, -68330, -68330, -68335, -68335, -68356, -68390, -68390, -68407, -68434, -68434, +68345, +68352, +68383, +68425, +68445, +68445, 68452, -68475, -68484, -68514, -68524, -68524, -68524, -68524, -68524, -68532, -68532, -68532, -68556, -68572, -68587, -68587, -68594, -68594, -68604, -68604, -68621, -68693, -68703, -68737, -68759, -68784, -68784, -68808, -68808, -68808, -68822, -68822, -68881, -68881, -68881, -68919, -68919, +68479, +68503, +68510, +68517, +68576, +68583, +68628, +68642, +68646, +68662, +68701, +68717, +68724, +68724, +68733, +68740, +68756, +68777, +68777, +68777, +68777, +68791, +68803, +68803, +68825, +68843, +68857, +68879, +68907, +68907, +68907, 68919, -68934, -68934, -68934, -68951, -68969, -68991, -69022, -69022, -69022, -69022, -69043, -69052, -69052, -69123, -69141, -69141, -69155, -69177, -69194, -69194, -69194, -69212, -69223, -69223, -69241, -69257, -69271, -69300, -69300, -69300, -69300, -69332, -69367, -69377, -69377, -69381, -69427, -69427, -69427, -69459, -69476, -69524, -69543, -69573, -69573, -69585, -69585, -69585, +68959, +68994, +69006, +69023, +69023, +69040, +69055, +69055, +69076, +69102, +69102, +69140, +69149, +69165, +69183, +69221, +69228, +69235, +69256, +69256, +69256, +69268, +69292, +69326, +69363, +69380, +69380, +69380, +69380, +69405, +69417, +69445, +69445, +69464, +69464, +69464, +69464, +69464, +69480, +69508, +69544, +69544, +69557, +69557, +69557, +69587, 69607, -69683, -69698, -69698, -69698, -69698, -69756, -69778, -69792, -69818, -69828, -69853, -69853, -69876, +69628, +69655, +69725, +69749, +69760, +69796, +69803, +69847, +69872, +69872, 69893, -69916, -69916, -69916, -69916, -69931, -69944, -69952, -69952, -69982, -69982, -69987, -70026, -70042, -70042, -70059, -70078, -70078, -70135, -70143, -70143, -70158, -70167, -70167, -70167, -70188, -70224, -70260, -70260, -70260, -70287, -70298, -70298, -70314, -70323, -70351, -70382, -70382, -70393, -70402, -70440, -70440, -70440, -70440, -70440, -70448, -70448, -70448, -70472, -70472, -70472, -70472, -70503, -70503, -70503, +69893, +69893, +69893, +69893, +69902, +69926, +69941, +69948, +69948, +69965, +69979, +69986, +69993, +70000, +70005, +70030, +70050, +70057, +70064, +70091, +70117, +70163, +70163, +70170, +70180, +70211, +70218, +70264, +70264, +70278, +70285, +70285, +70332, +70332, +70337, +70337, +70337, +70361, +70368, +70385, +70392, +70410, +70429, +70435, +70435, +70435, +70435, +70442, +70442, +70456, +70485, 70503, -70551, -70551, -70564, -70564, -70564, -70564, -70564, +70512, +70521, +70521, +70525, +70525, +70563, +70575, +70586, +70586, +70586, +70603, 70609, -70609, -70620, -70620, -70627, -70634, -70651, -70651, -70657, -70663, -70663, -70681, -70687, -70694, -70694, -70701, -70714, -70724, -70724, -70724, -70755, -70755, -70755, -70755, -70755, -70755, -70755, -70755, -70786, -70786, -70808, -70808, -70826, -70826, -70826, -70852, -70852, -70852, -70852, -70852, -70852, -70852, -70852, -70860, -70908, -70918, -70926, -70943, -70943, -71014, -71014, -71014, -71023, -71031, -71049, -71049, -71073, -71073, -71094, -71094, -71103, -71103, -71132, -71149, -71149, -71167, +70640, +70656, +70664, +70664, +70670, +70685, +70692, +70710, +70731, +70750, +70767, +70785, +70816, +70823, +70839, +70839, +70853, +70853, +70853, +70871, +70889, +70889, +70889, +70907, +70916, +70955, +70955, +70970, +70970, +70990, +70998, +70998, +70998, +71024, +71045, +71051, +71058, +71058, +71058, +71058, +71058, +71058, +71058, +71074, +71096, +71096, +71105, +71105, +71112, +71112, +71119, +71135, +71135, +71152, +71152, +71152, +71152, +71170, 71177, -71195, -71204, -71204, -71224, -71248, -71248, -71252, -71273, -71279, -71279, -71279, -71313, -71319, -71319, -71319, -71319, -71336, -71336, -71336, -71336, -71336, -71357, -71367, -71367, -71391, -71457, -71457, -71465, -71465, -71469, +71199, +71199, +71199, +71210, +71210, +71238, +71238, +71238, +71238, +71243, +71243, +71243, +71261, +71288, +71302, +71318, +71361, +71361, +71361, +71389, +71389, +71389, +71410, +71422, +71439, +71439, +71439, +71439, +71439, +71449, +71449, +71449, 71469, -71487, -71521, -71521, -71559, -71559, -71559, -71559, -71559, -71591, -71618, -71618, -71624, -71650, -71650, -71650, -71680, -71680, -71680, -71680, -71708, -71720, +71483, +71490, +71490, +71494, +71506, +71544, +71544, +71571, +71580, +71580, +71580, +71580, +71593, +71611, +71626, +71626, +71640, +71653, +71653, +71653, +71665, +71684, +71700, +71729, +71729, +71729, 71729, -71752, -71752, -71752, -71752, -71757, -71757, -71793, -71805, -71805, -71805, -71805, -71805, -71805, -71805, -71810, -71810, -71820, -71840, -71888, -71911, -71911, -71921, -71932, -71968, -71992, -71992, -72002, -72002, -72002, -72013, -72013, +71741, +71741, +71748, +71809, +71818, +71818, +71836, +71876, +71926, +71946, +71946, +71946, +71946, +71946, +71971, +71984, +71984, +71994, +72010, +72010, +72010, +72010, +72010, +72010, 72035, -72046, -72074, -72099, -72099, -72135, -72135, -72135, -72145, -72202, -72202, -72202, -72227, -72234, +72079, +72079, +72102, +72129, +72138, +72151, +72151, +72151, +72151, +72162, +72162, +72166, +72166, +72166, +72175, +72175, +72175, +72191, +72191, +72191, +72191, +72191, +72191, 72242, -72247, -72255, -72255, -72255, -72277, -72277, -72277, -72284, -72284, -72329, +72242, +72242, +72248, +72264, +72282, +72290, +72308, +72324, +72345, +72345, +72345, 72345, -72382, -72382, -72382, -72393, +72351, +72370, +72370, +72401, +72401, 72407, 72407, -72428, -72436, -72436, -72467, -72495, -72495, -72504, -72504, -72504, -72526, -72553, +72407, +72407, +72435, +72453, +72453, +72453, +72468, +72486, +72506, +72512, +72512, +72537, +72537, +72556, +72567, 72579, -72585, 72601, -72640, -72650, -72656, -72661, -72661, -72669, -72688, -72688, -72688, -72730, -72743, -72743, -72764, -72779, -72803, -72813, -72813, -72813, -72825, -72825, -72857, -72866, -72895, -72895, -72934, -72969, -72969, -72969, -72969, -73020, -73020, -73033, -73046, -73057, -73057, -73057, -73069, -73078, -73082, -73082, -73109, -73129, -73174, -73180, -73180, -73180, -73186, -73186, -73196, -73196, -73196, -73212, -73230, -73230, -73254, -73260, -73260, -73274, -73281, -73311, -73311, -73311, -73337, -73368, -73381, +72613, +72619, +72625, +72625, +72631, +72637, +72667, +72680, +72692, +72692, +72692, +72710, +72720, +72720, +72733, +72733, +72741, +72741, +72752, +72765, +72771, +72771, +72771, +72771, +72785, +72785, +72807, +72807, +72827, +72834, +72843, +72878, +72878, +72892, +72901, +72901, +72901, +72906, +72916, +72916, +72916, +72927, +72927, +72927, +72927, +72963, +72963, +72963, +72963, +72963, +72963, +72985, +73029, +73044, +73064, +73064, +73064, +73064, +73064, +73064, +73073, +73073, +73093, +73120, +73126, +73144, +73144, +73159, +73159, +73165, +73165, +73203, +73213, +73238, +73258, +73273, +73273, +73273, +73273, +73273, +73287, +73303, +73335, +73359, +73365, +73387, +73402, 73402, -73435, -73456, -73456, -73456, -73456, -73472, -73472, -73488, -73488, -73488, -73488, -73488, -73488, +73402, +73413, +73413, +73413, +73423, +73442, +73468, +73485, +73485, 73503, -73522, -73522, -73522, -73530, -73530, -73559, -73616, -73637, -73662, -73685, -73700, -73700, -73711, -73745, -73755, -73790, -73815, -73815, -73815, -73815, -73821, -73844, -73867, -73883, -73907, -73907, -73942, -73974, -73974, -73974, -74007, -74026, -74043, -74043, -74057, -74063, -74079, -74079, -74102, -74102, -74102, -74125, -74136, -74136, -74136, -74136, -74158, -74164, -74164, -74164, -74172, -74188, -74188, -74210, -74246, -74256, -74256, -74256, -74264, -74300, -74312, -74320, -74328, -74360, -74360, +73537, +73575, +73575, +73610, +73629, +73635, +73635, +73635, +73635, +73658, +73658, +73681, +73687, +73687, +73712, +73736, +73753, +73780, +73797, +73816, +73838, +73850, +73850, +73863, +73909, +73918, +73930, +73946, +73976, +73986, +73986, +73986, +73986, +73990, +74017, +74017, +74017, +74025, +74025, +74025, +74025, +74055, +74073, +74073, +74073, +74084, +74095, +74095, +74095, +74123, +74150, +74150, +74155, +74155, +74155, +74155, +74161, +74170, +74176, +74193, +74216, +74224, +74266, +74266, +74277, +74277, +74289, +74289, +74295, +74330, +74330, +74342, +74348, 74383, -74389, -74401, -74413, -74430, -74430, -74430, -74460, -74486, -74486, -74486, -74486, -74486, -74510, -74531, -74531, -74561, -74601, -74620, -74631, -74631, -74674, -74674, -74684, -74684, -74695, -74710, -74710, -74719, -74748, -74773, -74781, -74789, -74789, -74809, -74809, -74809, -74825, -74845, -74845, -74857, -74891, -74891, -74891, -74891, -74891, -74925, +74420, +74420, +74426, +74426, +74451, +74469, +74483, +74500, +74500, +74515, +74520, +74520, +74537, +74547, +74547, +74547, +74558, +74558, +74571, +74578, +74590, +74590, +74603, +74619, +74628, +74628, +74634, +74634, +74634, +74655, +74667, +74691, +74702, +74725, +74725, +74725, +74725, +74730, +74730, +74730, +74730, +74736, +74758, +74764, +74764, +74764, +74764, +74784, +74803, +74803, +74832, +74832, +74856, +74867, +74867, +74885, +74890, +74890, +74910, 74925, 74925, -74943, -74988, -75011, -75011, -75011, -75011, -75011, -75021, -75021, -75037, -75037, -75064, -75097, -75102, -75102, -75140, -75140, -75158, -75158, -75172, -75172, -75193, -75193, -75212, -75227, -75245, -75256, -75272, +74939, +74939, +74954, +74963, +74989, +74996, +74996, +75013, +75013, +75013, +75042, +75059, +75067, +75108, +75128, +75136, +75155, +75160, +75160, +75173, +75173, +75173, +75173, +75179, +75179, +75190, +75213, +75217, +75236, +75236, +75265, +75265, 75283, -75293, -75308, -75315, -75315, -75341, -75356, -75367, -75397, -75397, -75453, -75471, -75471, -75471, -75485, -75534, -75534, -75534, -75545, -75551, -75551, -75551, -75564, -75576, -75609, -75621, -75638, -75671, -75681, -75696, -75702, -75702, -75714, -75714, -75721, -75736, -75736, -75743, +75294, +75311, +75311, +75317, +75317, +75325, +75345, +75370, +75370, +75382, +75382, +75382, +75411, +75417, +75434, +75443, +75449, +75455, +75478, +75484, +75517, +75542, +75548, +75561, +75561, +75567, +75573, +75573, +75579, +75579, +75593, +75593, +75593, +75593, +75599, +75615, +75651, +75685, +75692, +75713, +75719, +75725, +75737, +75746, +75750, +75750, 75761, -75770, -75778, -75778, -75778, -75778, -75778, -75805, -75805, -75823, -75834, -75840, -75857, -75893, -75893, -75893, -75893, -75893, +75783, +75789, +75804, +75814, +75814, +75814, +75833, +75833, +75867, +75867, +75867, +75867, 75904, +75909, +75928, +75928, +75928, +75928, +75928, 75945, -75945, -75958, -75958, -75958, -75977, -76016, -76031, -76037, -76037, -76051, -76051, -76079, -76084, -76084, -76102, -76120, +75959, +75973, +75973, +75995, +76066, +76066, +76066, +76082, +76082, +76082, +76098, +76109, 76120, 76120, 76120, -76134, -76166, -76175, -76205, -76216, -76216, -76227, -76244, -76275, -76284, -76318, -76337, -76343, -76389, -76389, -76389, -76389, -76402, -76416, -76416, -76434, -76434, -76444, -76497, -76497, -76509, -76519, -76566, -76604, -76611, -76611, -76611, -76640, -76654, -76654, -76654, -76654, -76671, -76671, -76676, -76676, -76697, -76697, -76697, -76697, -76707, -76751, -76751, -76751, -76774, -76778, -76807, -76807, -76807, -76830, -76830, -76848, +76129, +76149, +76170, +76170, +76170, +76170, +76170, +76186, +76199, +76199, +76199, +76218, +76235, +76249, +76261, +76300, +76305, +76328, +76342, +76366, +76366, +76399, +76413, +76413, +76413, +76431, +76437, +76459, +76459, +76475, +76475, +76475, +76475, +76475, +76475, +76482, +76493, +76493, +76501, +76501, +76515, +76532, +76532, +76544, +76544, +76578, +76603, +76603, +76612, +76628, +76644, +76657, +76666, +76705, +76705, +76730, +76730, +76740, +76740, +76757, +76804, +76816, +76832, +76832, +76832, +76832, +76847, 76864, -76897, -76913, -76932, -76932, -76944, -76970, -76986, -76986, -77002, -77017, -77022, -77039, -77049, -77049, -77049, -77067, -77067, -77067, -77081, -77081, -77081, -77089, -77089, -77105, -77121, -77121, -77156, -77156, -77156, -77156, -77156, -77165, -77173, -77173, -77173, -77173, -77191, -77211, -77211, -77211, -77218, -77242, +76871, +76881, +76881, +76917, +76929, +76929, +76938, +76938, +76938, +76938, +76960, +76979, +77000, +77041, +77058, +77058, +77066, +77084, +77084, +77084, +77106, +77122, +77122, +77122, +77122, +77143, +77152, +77152, +77152, +77158, +77158, +77158, +77158, +77158, +77158, +77171, +77183, +77183, +77188, +77188, +77188, +77188, +77188, +77204, +77204, +77227, +77251, +77251, +77251, +77270, +77290, +77290, +77290, 77290, -77308, -77308, -77325, -77343, -77343, -77376, -77376, -77376, -77376, -77386, -77386, -77386, -77386, +77311, +77327, +77327, +77341, +77341, +77358, +77358, +77358, 77393, -77399, -77419, -77428, -77450, +77393, +77400, +77407, +77407, +77436, 77450, +77464, +77464, 77492, 77492, -77492, -77492, -77529, -77529, -77529, -77540, -77540, -77540, -77557, -77570, -77570, -77570, -77570, -77570, -77570, -77587, -77597, +77508, +77508, +77533, +77545, +77545, +77556, +77578, +77593, +77610, 77620, -77640, -77640, -77640, -77661, -77680, -77680, -77680, -77680, -77680, -77680, -77712, -77732, -77739, -77739, -77739, -77748, -77765, -77824, -77824, -77834, -77850, -77860, -77860, -77872, -77872, -77889, -77889, -77889, -77902, -77920, -77934, -77962, -77982, -77982, -77982, -77982, -78000, -78000, -78000, -78009, -78025, -78036, -78036, -78043, -78043, -78062, -78072, -78123, -78153, -78167, -78189, -78211, -78211, -78211, -78222, -78222, -78222, -78230, -78230, -78236, -78236, -78236, -78236, -78254, -78254, -78254, -78254, -78254, -78272, -78296, -78313, -78332, -78368, -78384, -78394, -78404, -78411, -78423, -78444, -78451, -78464, -78485, -78501, -78501, -78514, -78514, -78514, -78514, -78523, -78532, -78544, -78544, -78544, -78544, -78544, -78544, -78555, -78575, -78612, -78612, -78641, -78672, -78678, -78678, -78705, -78705, -78720, -78737, -78737, -78753, -78753, -78757, -78778, -78778, -78778, -78819, -78837, -78837, -78837, -78843, -78843, -78853, -78869, -78869, -78908, -78908, -78908, -78908, -78908, -78913, -78958, -78958, -78958, -78969, -78990, -79019, -79019, -79025, -79025, -79025, -79059, -79079, -79079, -79079, -79086, -79086, -79102, -79102, -79102, -79109, -79109, -79109, -79109, -79109, -79109, -79109, -79109, -79109, -79123, -79136, -79155, +77657, +77657, +77693, +77693, +77693, +77693, +77705, +77705, +77705, +77718, +77718, +77734, +77742, +77742, +77781, +77789, +77819, +77830, +77830, +77830, +77830, +77830, +77847, +77870, +77870, +77904, +77904, +77916, +77916, +77942, +77958, +77958, +77958, +77972, +77972, +77972, +77988, +77988, +77994, +78017, +78031, +78044, +78089, +78099, +78129, +78129, +78129, +78129, +78135, +78140, +78155, +78176, +78214, +78235, +78243, +78277, +78277, +78277, +78285, +78312, +78312, +78328, +78339, +78357, +78373, +78389, +78389, +78414, +78432, +78439, +78455, +78484, +78492, +78500, +78536, +78556, +78582, +78582, +78615, +78624, +78664, +78664, +78675, +78675, +78694, +78694, +78709, +78715, +78715, +78724, +78724, +78733, +78733, +78766, +78766, +78780, +78791, +78812, +78812, +78812, +78821, +78865, +78865, +78865, +78865, +78890, +78890, +78890, +78890, +78911, +78911, +78911, +78933, +78943, +78943, +78943, +78943, +78943, +78978, +78986, +78986, +78997, +79027, +79047, +79047, +79078, +79078, +79093, +79093, +79093, +79093, +79093, +79131, +79131, +79152, +79152, +79152, 79180, 79180, -79187, -79187, -79187, -79187, -79217, -79217, -79249, -79249, -79266, +79180, +79180, +79202, +79202, +79202, +79221, +79221, +79227, +79233, +79241, +79260, +79260, +79260, 79266, -79278, +79274, +79274, 79288, -79288, -79302, -79311, -79311, -79341, -79357, -79357, -79364, -79382, -79395, -79395, -79395, -79395, -79408, -79427, -79444, -79444, -79464, -79484, -79484, -79491, +79303, +79319, +79351, +79374, +79374, +79380, +79390, +79390, +79390, +79396, +79416, +79416, +79426, +79426, +79426, +79443, +79453, +79453, +79472, +79503, +79503, +79508, 79514, -79526, -79526, -79539, -79571, -79571, -79591, -79626, -79626, -79626, -79656, -79656, -79671, -79671, -79671, -79685, -79685, -79697, -79705, -79722, -79748, -79773, -79773, -79802, -79802, -79802, -79808, -79808, -79818, -79818, -79841, -79841, -79841, -79850, +79530, +79540, +79540, +79548, +79563, +79584, +79636, +79645, +79675, +79682, +79682, +79715, +79725, +79754, +79754, +79774, +79793, +79793, +79816, +79816, +79816, +79831, +79831, 79850, -79850, -79850, -79850, -79859, -79859, -79876, -79876, -79906, -79927, -79952, -79963, -79974, -79980, -79996, -79996, -79996, -79996, -80014, -80014, +79867, +79867, +79867, +79867, +79875, +79896, +79896, +79896, +79896, +79922, +79922, +79922, +79934, +79934, +79947, +79964, +79964, +80000, 80014, 80014, -80014, -80014, -80014, -80044, -80067, -80074, -80090, -80090, -80090, -80090, -80090, -80090, -80123, -80132, -80137, -80152, -80152, -80177, -80194, -80211, -80211, -80231, -80248, -80269, +80025, +80025, +80037, +80071, +80105, +80105, +80111, +80161, +80171, +80181, +80197, +80217, +80227, +80227, +80227, +80252, +80264, 80276, -80276, -80283, 80293, -80310, -80310, -80315, -80332, -80352, -80352, -80404, -80415, -80432, -80464, -80492, -80524, -80534, -80541, -80581, -80581, -80588, -80588, -80601, -80618, -80618, -80634, -80652, -80675, -80675, -80682, -80682, -80682, -80682, -80682, -80682, -80704, -80733, -80733, -80749, -80796, -80796, -80812, -80812, -80819, -80819, -80829, -80862, -80885, -80909, -80917, -80917, +80293, +80293, +80293, +80293, +80333, +80339, +80353, +80380, +80421, +80484, +80484, +80484, +80498, +80543, +80543, +80569, +80569, +80578, +80578, +80595, +80616, +80616, +80623, +80631, +80631, +80631, +80649, +80649, +80649, +80649, +80659, +80686, +80703, +80710, +80726, +80741, +80741, +80764, +80764, +80764, +80783, +80799, +80799, +80799, +80833, +80833, +80872, +80872, +80872, +80899, +80916, +80916, +80937, 80937, -80951, -80951, -80974, -80992, -81014, -81032, -81032, -81032, -81032, -81061, -81069, -81106, -81106, -81111, -81111, -81167, -81201, -81219, -81219, -81219, -81266, -81266, -81280, -81280, -81280, -81287, -81308, -81314, -81336, -81354, -81360, -81360, -81360, -81389, -81410, -81410, -81410, -81410, -81418, -81437, +80937, +80937, +80937, +80947, +80947, +80965, +80965, +80977, +80977, +80986, +80986, +80986, +81006, +81013, +81013, +81023, +81048, +81066, +81066, +81097, +81107, +81118, +81118, +81118, +81140, +81175, +81187, +81187, +81187, +81192, +81192, +81192, +81212, +81240, +81240, +81298, +81298, +81298, +81298, +81310, +81316, +81316, +81327, +81335, +81335, +81342, +81359, +81359, +81359, +81359, +81370, +81370, +81370, +81381, +81395, +81405, +81413, +81447, +81447, 81460, 81460, -81485, -81497, -81513, -81525, -81525, -81532, -81543, -81543, -81558, +81471, +81471, +81476, +81495, +81510, +81510, +81526, +81526, +81553, +81571, +81587, +81587, 81592, -81592, -81613, -81613, -81630, -81637, -81680, -81727, -81727, -81727, -81727, -81732, -81732, -81732, -81732, +81611, +81638, +81638, +81664, +81690, +81696, +81696, +81696, +81721, +81721, +81739, 81739, 81739, -81751, -81758, -81758, -81778, -81778, -81785, -81785, -81808, -81830, -81830, -81838, +81749, +81766, +81773, +81773, +81773, +81791, +81791, +81815, +81839, +81846, 81855, -81868, -81885, -81885, -81892, -81892, -81905, -81905, -81921, -81934, -81959, -81959, -81966, -82004, +81855, +81855, +81879, +81903, +81915, +81939, +81939, +81965, +81985, 82004, 82004, 82021, -82021, -82048, -82048, -82048, -82070, -82093, -82114, -82114, -82114, -82136, -82160, -82182, -82182, -82191, -82198, -82198, -82211, -82245, -82280, -82287, -82287, -82287, -82287, -82308, -82308, -82308, -82315, -82336, -82336, -82336, -82336, -82365, -82375, -82375, -82375, -82375, -82382, -82382, -82417, -82433, -82440, -82474, -82488, -82531, -82531, -82552, -82563, -82581, -82597, -82597, -82613, -82634, -82648, -82654, -82661, -82661, -82661, -82668, -82675, -82690, -82696, +82037, +82082, +82082, +82115, +82154, +82161, +82169, +82169, +82207, +82223, +82233, +82233, +82233, +82233, +82249, +82249, +82249, +82264, +82270, +82283, +82309, +82340, +82353, +82380, +82380, +82400, +82425, +82456, +82462, +82462, +82481, +82481, +82499, +82499, +82499, +82499, +82499, +82499, +82499, +82512, +82547, +82564, +82607, +82607, +82607, +82620, +82629, +82629, +82629, +82640, +82640, +82664, +82664, +82664, +82664, +82664, +82674, +82689, +82689, +82689, +82689, +82703, 82703, -82717, +82703, +82719, 82724, -82752, -82752, -82772, -82788, -82795, -82802, -82814, -82837, -82858, -82865, -82888, -82895, -82929, -82948, -82960, -82967, -82981, -82981, -82996, -83015, -83031, -83038, -83045, -83081, -83100, -83149, -83182, -83182, -83206, -83213, -83236, -83236, -83243, -83243, -83249, -83261, -83268, -83268, +82741, +82750, +82750, +82757, +82809, +82821, +82821, +82821, +82821, +82833, +82833, +82863, +82863, +82879, +82898, +82906, +82906, +82923, +82923, +82942, +82942, +82966, +83020, +83020, +83044, +83044, +83067, +83067, +83105, +83105, +83122, +83143, +83161, +83178, +83194, +83210, +83210, +83210, +83210, +83210, +83232, 83292, -83306, -83328, -83328, -83354, -83361, -83395, -83401, -83415, -83425, -83448, -83454, -83481, -83510, -83558, -83565, +83309, +83323, +83357, +83357, +83406, +83406, +83406, +83406, +83453, +83468, +83487, +83513, +83513, +83513, +83519, +83567, +83580, 83591, -83607, -83617, -83645, -83658, -83665, -83682, -83682, -83682, -83699, -83733, -83743, -83797, -83813, -83829, +83606, +83616, +83653, +83653, +83670, +83684, +83684, +83684, +83684, +83684, +83695, +83714, +83714, +83714, +83759, +83759, +83759, +83759, +83759, +83759, +83791, +83791, +83791, +83791, +83791, +83791, +83791, +83799, +83799, +83812, +83812, +83822, +83822, +83837, +83837, +83837, +83837, +83843, 83843, -83855, -83859, -83873, -83873, -83873, -83889, -83904, -83945, -83974, -84021, -84021, -84081, -84092, -84106, -84123, -84140, -84212, -84212, -84212, -84212, -84241, -84248, -84255, -84255, -84262, -84282, -84308, -84308, -84308, -84317, -84317, -84331, -84360, -84384, -84401, +83861, +83861, +83861, +83874, +83888, +83936, +83936, +83950, +83950, +83950, +83963, +83963, +83970, +83995, +83995, +84018, +84040, +84040, +84040, +84040, +84053, +84053, +84074, +84105, +84115, +84154, +84177, +84194, +84211, +84211, +84211, +84211, +84229, +84229, +84245, +84266, +84278, +84285, +84285, +84285, +84285, +84285, +84285, +84285, +84323, +84348, +84368, +84368, +84368, +84368, +84388, +84388, +84388, +84388, +84388, +84388, 84408, -84455, -84488, -84488, -84530, -84551, -84577, -84577, -84586, -84593, -84612, -84619, -84619, -84666, +84421, +84426, +84433, +84433, +84433, +84433, +84433, +84449, +84472, +84472, +84472, +84472, +84492, +84492, +84499, +84499, +84506, +84506, +84524, +84567, +84585, +84585, +84585, +84585, +84585, +84585, +84608, +84608, +84618, +84618, +84618, +84650, +84670, +84670, 84682, -84697, -84714, -84766, -84766, -84766, -84766, -84778, -84792, -84799, -84799, -84799, -84805, -84817, -84842, -84842, -84842, -84849, -84864, -84876, -84930, -84936, -84936, -84948, -84960, -84960, -84960, -84983, -84996, -85003, -85011, -85046, -85066, -85111, -85127, -85149, -85165, -85210, -85229, -85229, -85229, -85235, -85235, -85253, -85266, -85285, -85299, -85329, -85343, -85361, -85379, -85413, -85413, -85446, -85453, -85482, -85492, -85514, -85521, -85521, -85521, -85561, -85568, -85585, -85599, -85654, -85671, -85685, -85699, -85699, -85699, -85699, -85699, -85709, -85734, -85734, -85748, -85748, -85771, -85787, -85787, -85820, -85830, -85830, -85837, -85837, -85837, -85860, -85921, -85944, -85944, -85962, -85968, -85982, -86007, -86014, -86019, -86034, -86054, -86061, -86074, -86112, -86119, -86125, -86144, -86163, -86163, -86170, -86202, -86253, -86310, -86310, -86337, -86344, -86361, -86376, -86410, -86428, -86428, -86444, -86456, -86456, -86456, -86474, -86492, -86500, -86500, -86528, -86528, -86541, -86541, -86562, -86582, -86602, -86615, -86615, +84682, +84689, +84699, +84699, +84709, +84709, +84709, +84709, +84709, +84709, +84709, +84724, +84733, +84733, +84741, +84741, +84776, +84776, +84776, +84795, +84825, +84834, +84834, +84841, +84851, +84861, +84871, +84871, +84882, +84882, +84892, +84927, +84932, +84966, +84984, +84984, +85015, +85039, +85051, +85088, +85088, +85088, +85088, +85108, +85134, +85163, +85163, +85163, +85174, +85180, +85198, +85198, +85198, +85198, +85230, +85257, +85257, +85278, +85278, +85278, +85278, +85324, +85365, +85377, +85414, +85420, +85436, +85465, +85490, +85490, +85501, +85501, +85529, +85553, +85553, +85560, +85560, +85571, +85571, +85571, +85571, +85571, +85571, +85598, +85598, +85598, +85620, +85649, +85649, +85664, +85664, +85675, +85687, +85687, +85687, +85687, +85687, +85687, +85705, +85705, +85717, +85755, +85755, +85765, +85765, +85784, +85784, +85784, +85818, +85848, +85873, +85904, +85954, +85954, +85967, +85974, +85983, +86022, +86030, +86050, +86050, +86050, +86050, +86087, +86087, +86087, +86099, +86099, +86109, +86127, +86150, +86161, +86187, +86187, +86205, +86217, +86236, +86243, +86254, +86254, +86254, +86270, +86270, +86282, +86295, +86304, +86332, +86332, +86332, +86332, +86343, +86343, +86343, +86343, +86343, +86354, +86354, +86354, +86354, +86354, +86354, +86372, +86377, +86398, +86398, +86421, +86427, +86427, +86427, +86427, +86432, +86454, +86468, +86468, +86482, +86482, +86487, +86498, +86512, +86512, +86535, +86544, +86577, 86615, -86645, -86645, -86666, -86692, -86720, -86727, -86734, +86651, +86672, +86672, +86672, +86698, +86698, +86721, +86721, 86757, -86781, -86801, -86801, -86801, -86823, -86853, -86853, -86870, -86889, -86895, -86895, +86757, +86757, +86778, +86789, +86789, +86789, +86809, +86833, +86833, +86845, +86867, +86867, +86867, 86895, 86920, -86927, -86939, -86957, -86981, -86988, -87009, -87044, -87044, -87075, -87108, -87129, -87146, -87158, -87176, -87183, -87213, -87266, -87284, -87284, -87291, -87307, -87307, -87312, -87339, -87339, -87346, -87353, -87385, -87419, -87419, +86920, +86920, +86920, +86982, +86982, +87000, +87006, +87067, +87067, +87067, +87067, +87077, +87077, +87085, +87090, +87106, +87106, +87112, +87112, +87112, +87118, +87127, +87127, +87127, +87143, +87143, +87143, +87143, +87155, +87155, +87168, +87168, +87182, +87182, +87188, +87188, +87188, +87188, +87188, +87204, +87215, +87236, +87236, +87236, +87248, +87257, +87274, +87282, +87297, +87297, +87297, +87297, +87302, +87321, +87341, +87341, +87367, +87367, +87373, +87379, +87387, +87406, +87406, +87406, +87412, +87426, +87441, +87441, 87441, -87448, -87470, -87503, -87503, -87509, -87509, -87537, -87561, -87580, -87580, -87625, -87632, -87644, -87656, -87656, -87656, -87656, -87656, -87696, -87713, -87713, -87713, -87713, -87713, -87713, +87449, +87458, +87458, +87458, +87467, +87476, +87541, +87541, +87541, +87541, +87577, +87583, +87583, +87612, +87612, +87620, +87626, +87639, +87639, +87639, +87661, +87671, +87686, +87707, +87707, +87707, 87738, -87746, -87753, -87753, -87785, -87800, -87811, -87823, -87833, +87738, +87759, +87770, +87780, +87797, +87797, +87810, +87810, +87819, 87833, -87844, -87844, -87859, -87878, -87878, -87889, -87920, -87925, -87945, -87945, -87945, -87964, -87974, -87974, -87974, -87980, -87996, -87996, -87996, -87996, -88015, -88015, -88037, -88037, -88042, -88054, -88063, -88070, -88084, -88084, -88116, -88125, +87841, +87869, +87869, +87869, +87869, +87885, +87885, +87899, +87912, +87929, +87941, +87955, +87970, +87984, +87984, +88000, +88026, +88026, +88026, +88026, +88036, +88051, +88061, +88104, +88114, +88114, 88125, 88125, 88125, -88164, -88164, -88179, -88179, -88193, -88193, -88237, -88237, -88237, -88237, -88237, -88237, -88261, -88270, -88282, -88293, -88293, -88310, -88323, -88345, -88365, -88385, -88385, -88385, -88385, -88385, -88403, -88403, -88418, -88418, -88418, -88453, -88473, -88483, -88498, -88508, -88508, -88529, -88539, -88550, -88550, -88550, -88558, -88581, -88596, -88596, -88596, -88596, -88596, -88596, -88596, +88132, +88161, +88166, +88178, +88178, +88178, +88178, +88208, +88213, +88213, +88220, +88227, +88227, +88244, +88260, +88260, +88266, +88291, +88297, +88297, +88297, +88334, +88334, +88366, +88398, +88415, +88432, +88442, +88456, +88478, +88520, +88520, +88520, +88569, 88617, -88641, -88650, -88678, -88678, -88678, -88700, -88700, -88714, -88756, -88762, -88773, -88828, -88855, -88861, -88861, -88892, -88952, -88962, -88962, -88962, -88968, -88993, -88993, -89003, -89033, -89033, -89078, -89086, -89091, -89102, -89102, -89127, -89138, -89138, -89155, -89166, -89188, -89188, -89205, -89211, -89211, -89211, -89221, -89221, -89268, +88626, +88632, +88632, +88649, +88661, +88661, +88693, +88705, +88705, +88705, +88705, +88705, +88712, +88734, +88779, +88779, +88779, +88785, +88785, +88800, +88817, +88817, +88824, +88824, +88868, +88868, +88868, +88868, +88868, +88913, +88936, +88977, +88990, +89019, +89025, +89044, +89068, +89068, +89085, +89085, +89085, +89085, +89131, +89143, +89143, +89158, +89168, +89197, +89202, +89202, +89207, +89278, 89290, -89303, -89316, +89309, +89319, 89324, -89383, +89324, +89344, +89354, +89354, +89386, 89393, -89404, -89421, -89437, -89466, -89466, -89502, -89502, -89515, +89405, +89430, +89430, +89430, +89438, +89438, +89489, +89496, +89511, +89529, 89545, -89580, -89586, -89586, -89586, -89591, -89591, -89620, -89633, -89649, -89654, -89694, -89694, -89706, -89706, -89706, -89721, -89721, -89727, -89727, -89727, -89756, -89756, -89756, -89763, -89782, +89563, +89569, +89569, +89569, +89592, +89598, +89598, +89598, +89653, +89659, +89659, +89669, +89669, +89690, +89714, +89722, +89732, +89776, +89776, +89776, 89782, -89804, -89804, -89826, -89826, -89831, -89840, -89847, +89795, +89795, +89795, +89795, +89813, +89824, +89824, +89841, +89848, +89848, +89848, 89858, -89885, -89885, -89885, -89920, -89942, -89949, -89949, -89949, -89959, -89971, -89978, -89984, -89984, -89999, -90035, -90053, -90064, -90075, -90083, -90083, -90083, -90101, -90101, -90116, -90116, -90150, -90157, -90157, -90157, -90168, -90205, -90205, -90212, -90212, -90242, -90274, -90280, -90292, -90302, -90302, -90302, -90309, -90309, -90321, -90327, -90343, -90399, -90426, -90435, -90435, -90453, -90459, -90459, -90476, -90476, -90482, -90502, -90502, +89858, +89891, +89891, +89918, +89928, +89928, +89947, +89977, +89977, +89977, +89977, +89998, +90025, +90025, +90065, +90071, +90086, +90086, +90086, +90104, +90104, +90136, +90163, +90163, +90163, +90163, +90169, +90194, +90194, +90194, +90194, +90207, +90224, +90247, +90256, +90256, +90262, +90275, +90275, +90293, +90303, +90303, +90303, +90361, +90376, +90417, +90428, +90452, +90491, 90502, -90522, -90522, -90536, -90563, -90563, -90583, -90583, -90583, -90604, -90604, -90610, -90610, -90610, -90610, -90629, -90629, -90654, -90663, -90669, -90690, -90699, -90699, -90699, -90729, -90752, -90752, -90758, -90758, -90774, -90780, -90825, -90845, -90857, -90857, -90857, -90857, -90873, -90905, -90905, -90905, -90920, -90920, -90920, -90963, -90969, -90987, -90987, +90509, +90515, +90538, +90564, +90594, +90638, +90638, +90638, +90638, +90659, +90668, +90683, +90691, +90698, +90706, +90724, +90735, +90770, +90770, +90778, +90778, +90795, +90795, +90795, +90795, +90831, +90831, +90869, +90883, +90901, +90907, +90913, +90929, +90929, +90959, +90977, 90987, -91004, -91023, -91029, -91029, -91061, -91061, -91061, -91067, -91073, -91093, -91093, -91093, -91101, -91126, -91126, -91126, -91126, -91131, -91178, -91185, -91195, -91216, +91007, +91019, +91033, +91039, +91104, +91104, +91110, +91110, +91110, +91124, +91130, +91136, +91157, +91163, +91163, +91169, +91209, +91209, +91225, +91225, +91225, +91225, 91241, -91268, -91268, -91268, -91278, -91288, -91297, -91297, -91297, -91314, -91320, -91320, -91320, -91328, -91328, -91345, -91365, -91365, -91365, -91365, -91386, -91422, -91449, -91458, -91495, -91533, -91551, -91579, -91579, -91579, -91624, -91631, -91631, -91631, -91639, -91657, -91688, -91709, -91709, -91709, -91709, -91709, -91709, -91709, -91715, -91743, -91777, -91777, -91800, -91817, -91817, -91848, -91848, -91858, -91858, -91867, -91884, -91884, -91900, -91900, -91900, -91913, -91919, -91926, -91934, -91947, -91947, -91947, -91965, -91965, -91965, -91972, -91982, -92009, -92036, +91241, +91253, +91273, +91273, +91283, +91304, +91310, +91337, +91354, +91354, +91354, +91354, +91368, +91381, +91381, +91416, +91435, +91441, +91441, +91441, +91441, +91441, +91463, +91489, +91504, +91504, +91520, +91520, +91520, +91566, +91566, +91576, +91576, +91594, +91599, +91599, +91610, +91610, +91619, +91635, +91641, +91675, +91683, +91683, +91683, +91683, +91683, +91683, +91683, +91683, +91749, +91749, +91749, +91749, +91760, +91809, +91814, +91814, +91814, +91824, +91824, +91835, +91847, +91865, +91879, +91891, +91935, +91935, +91955, +91986, +91996, +91996, +91996, +92023, +92057, 92057, -92068, -92068, -92093, -92107, -92114, -92120, -92206, -92218, -92218, -92218, -92218, -92233, -92233, -92290, -92303, -92303, -92315, -92315, -92315, -92326, -92339, -92360, -92360, -92372, -92372, -92387, -92387, -92387, -92407, -92431, -92453, -92453, -92453, -92471, -92494, -92494, -92515, -92539, -92557, -92557, -92562, -92573, -92573, -92595, -92601, -92633, -92633, -92633, -92675, -92706, -92706, -92723, -92729, -92729, -92745, -92745, -92760, -92760, -92806, -92831, -92844, -92844, -92850, -92850, -92856, -92856, -92881, -92913, +92062, +92103, +92111, +92117, +92117, +92117, +92117, +92117, +92117, +92117, +92136, +92157, +92192, +92203, +92203, +92223, +92223, +92241, +92241, +92241, +92241, +92241, +92281, +92319, +92329, +92329, +92351, +92358, +92358, +92358, +92371, +92390, +92404, +92410, +92410, +92423, +92423, +92449, +92491, +92532, +92532, +92540, +92546, +92552, +92572, +92572, +92572, +92592, +92603, +92603, +92603, +92626, +92658, +92666, +92666, +92666, +92672, +92714, +92714, +92724, +92744, +92776, +92776, +92797, +92797, +92828, +92828, +92847, +92847, +92874, +92874, +92874, +92892, +92900, +92900, +92900, 92930, -92941, -92956, -92967, -92967, +92930, +92936, +92936, +92944, +92962, +92977, 92977, -93000, -93006, -93025, -93051, -93066, -93079, -93091, -93091, -93097, -93103, -93103, -93133, -93133, -93133, -93139, -93139, -93139, -93158, -93164, -93191, -93191, -93191, +92983, +93027, +93033, +93033, +93050, +93082, +93107, +93125, +93125, +93125, +93143, +93143, +93157, +93157, +93157, +93157, +93187, +93187, +93194, +93194, 93206, -93220, -93235, -93251, -93251, -93251, -93257, -93265, -93265, -93271, -93323, -93341, -93358, -93373, -93390, -93390, -93390, -93398, -93398, -93398, -93407, -93413, -93422, -93428, -93428, -93452, -93477, -93500, -93508, -93529, -93535, -93535, -93561, -93561, -93561, -93594, -93601, -93617, -93617, -93625, -93642, -93659, -93669, -93669, -93675, -93675, -93691, -93691, -93703, -93718, -93718, -93725, -93725, -93725, -93725, -93733, -93733, -93733, -93733, -93749, -93772, -93799, -93814, -93814, -93839, -93861, -93861, -93861, -93861, -93861, -93883, -93883, -93883, +93206, +93212, +93229, +93258, +93285, +93297, +93297, +93297, +93297, +93343, +93343, +93343, +93370, +93387, +93387, +93387, +93387, +93387, +93412, +93417, +93430, +93430, +93430, +93430, +93430, +93430, +93430, +93436, +93455, +93464, +93483, +93496, +93496, +93513, +93513, +93513, +93554, +93584, +93584, +93584, +93584, +93592, +93602, +93607, +93631, +93657, +93664, +93672, +93744, +93753, +93753, +93761, +93776, +93776, +93776, +93776, +93776, +93776, +93810, +93822, +93822, +93852, +93871, +93884, 93897, -93910, -93917, -93917, -93940, -93940, -93956, -93956, -93968, -93985, -94005, -94005, -94005, -94011, -94035, -94035, -94066, -94089, -94089, -94089, -94108, -94132, -94157, -94175, -94175, -94183, -94212, -94218, +93914, +93926, +93939, +93939, +93954, +93954, +93954, +93954, +93969, +93977, +93977, +93977, +93990, +93990, +94031, +94062, +94068, +94068, +94068, +94099, +94123, +94141, +94191, +94209, +94209, +94209, 94228, -94234, -94257, -94270, -94270, -94270, -94270, -94292, -94308, -94314, -94314, -94331, -94331, -94355, -94380, -94424, -94445, -94445, -94445, -94445, -94467, -94473, -94488, -94497, -94515, -94524, -94531, -94571, -94571, -94587, -94610, -94620, -94620, -94627, -94633, -94643, -94643, -94643, -94661, -94661, -94661, -94661, -94668, -94668, -94668, -94668, -94696, -94696, -94696, -94696, -94711, +94263, +94263, +94298, +94307, +94321, +94321, +94327, +94327, +94358, +94358, +94358, +94370, +94370, +94370, +94370, +94377, +94410, +94464, +94496, +94513, +94542, +94548, +94548, +94563, +94569, +94575, +94593, +94593, +94593, +94593, +94613, +94613, +94618, +94618, +94618, +94625, +94637, +94644, +94650, +94663, +94682, +94695, +94728, +94728, +94734, 94734, -94756, -94756, -94794, -94807, -94820, -94837, -94857, -94857, -94868, -94878, -94884, -94884, -94884, -94915, -94935, -94935, -94994, -95020, -95020, -95028, -95028, -95028, -95028, -95042, -95052, -95062, -95076, -95099, -95120, -95126, -95156, -95165, -95218, -95218, -95230, -95230, -95230, -95230, -95242, -95284, +94759, +94789, +94814, +94826, +94826, +94826, +94840, +94840, +94840, +94871, +94877, +94877, +94885, +94885, +94885, +94892, +94892, +94904, +94904, +94904, +94904, +94904, +94904, +94904, +94920, +94920, +94941, +94959, +94959, +94959, +94959, +94959, +94971, +95005, +95034, +95034, +95068, +95073, +95098, +95098, +95098, +95115, +95144, +95153, +95170, +95170, +95207, +95227, +95227, +95250, +95264, +95264, +95264, +95280, 95303, -95316, -95329, -95329, -95329, -95361, -95398, -95411, -95411, -95427, -95427, -95462, -95481, -95496, -95496, -95508, -95540, -95540, -95558, -95558, -95585, -95585, -95597, -95607, -95643, -95674, -95688, -95688, -95688, -95718, -95718, -95731, -95750, -95750, -95750, -95768, -95768, -95776, -95776, -95776, -95776, -95776, -95776, -95776, -95804, -95804, -95822, -95829, -95836, -95836, -95836, -95836, -95849, -95849, -95861, -95861, -95861, -95886, -95886, -95886, -95893, -95893, -95911, +95303, +95303, +95319, +95319, +95319, +95342, +95364, +95407, +95420, +95420, +95435, +95435, +95452, +95452, +95452, +95470, +95476, +95505, +95536, +95536, +95536, +95536, +95536, +95536, +95568, +95568, +95587, +95629, +95629, +95640, +95647, +95660, +95705, +95742, +95754, +95825, +95831, +95848, +95848, +95848, +95868, +95888, 95911, -95918, -95918, -95951, -95951, -95951, -95961, -95998, -95998, -95998, -95998, -96013, -96013, -96013, -96013, -96027, -96057, -96065, -96065, -96076, -96076, -96076, -96076, -96108, -96120, -96120, -96120, -96129, -96156, -96156, +95936, +95936, +95979, +96003, +96016, +96047, +96047, +96059, +96082, +96107, +96107, +96119, +96133, +96157, +96169, +96169, +96169, 96177, -96189, -96201, -96211, -96211, -96211, -96211, -96232, -96232, -96244, -96263, -96280, -96280, -96301, -96301, -96301, -96321, -96321, -96321, -96333, -96351, -96363, -96363, -96381, -96387, -96394, -96394, -96399, -96399, -96428, -96441, -96441, -96441, -96454, -96463, -96471, -96471, -96481, -96521, -96521, -96534, -96534, -96544, -96566, -96566, -96566, -96566, -96596, -96596, -96596, -96596, -96611, -96611, -96611, -96611, -96629, -96629, -96642, +96177, +96203, +96234, +96234, +96234, +96247, +96268, +96274, +96274, +96315, +96354, +96372, +96372, +96372, +96392, +96407, +96444, +96444, +96470, +96510, +96527, +96562, +96583, +96583, +96599, +96599, +96599, 96642, -96662, -96662, -96676, -96689, -96689, -96699, -96714, -96725, -96725, -96741, -96769, -96769, -96775, -96775, -96783, -96783, -96783, -96801, -96817, -96834, -96834, -96834, -96834, -96844, -96860, -96889, -96929, -96929, -96945, -96945, -96975, -96985, -97002, +96657, +96657, +96657, +96698, +96720, +96735, +96735, +96761, +96802, +96802, +96814, +96826, +96826, +96843, +96855, +96866, +96884, +96896, +96896, +96905, +96905, +96905, +96905, +96905, +96933, +96933, +96933, +96933, +96950, +96950, +96950, +96950, +96965, +96974, +96992, +96992, +97012, +97041, 97047, -97062, -97062, -97069, -97069, -97082, -97082, -97093, -97126, -97150, -97150, -97150, -97150, -97150, -97175, -97175, -97175, -97175, -97175, -97175, -97196, -97196, -97196, +97091, +97091, +97091, +97098, +97098, +97120, +97138, +97138, 97196, -97213, -97232, -97249, -97249, -97276, -97289, -97296, -97307, -97307, -97314, -97338, -97338, -97338, -97358, -97375, -97387, -97408, -97408, -97408, -97408, -97425, -97461, -97483, -97502, -97502, -97509, -97509, -97509, -97518, -97540, -97553, -97553, -97553, +97227, +97227, +97255, +97267, +97267, +97292, +97331, +97355, +97365, +97373, +97457, +97457, +97457, +97519, +97519, +97534, +97548, +97548, 97570, -97576, -97576, -97576, -97610, -97610, -97618, -97624, -97630, -97640, -97674, -97699, -97699, -97709, -97709, -97709, -97709, -97720, -97740, -97740, -97740, -97759, -97759, -97759, -97769, -97776, -97829, -97829, -97829, -97863, -97863, -97887, -97904, -97914, -97914, +97593, +97613, +97631, +97661, +97667, +97689, +97717, +97717, +97717, +97735, +97735, +97735, +97745, +97771, +97786, +97798, +97798, +97839, +97839, +97839, +97848, +97848, +97867, +97918, +97918, +97918, 97927, -97937, -97947, -97947, -97947, -97959, -97959, -97959, -97977, -98002, -98016, -98044, -98044, -98062, -98062, -98072, -98072, -98072, -98072, -98086, -98105, -98124, -98132, -98132, -98148, -98173, -98185, -98206, -98240, -98240, -98259, -98294, -98320, +97942, +97942, +97942, +97942, +97942, +97967, +97979, +98012, +98012, +98054, +98054, +98078, +98078, +98106, +98106, +98115, +98130, +98130, +98130, +98130, +98137, +98137, +98137, +98144, +98168, +98188, +98188, +98202, +98202, +98220, +98234, +98266, +98273, +98292, +98317, +98328, +98328, 98346, 98346, 98346, -98379, -98387, -98415, -98442, -98469, +98357, +98357, +98357, +98365, +98400, +98412, +98431, +98438, 98477, -98490, -98528, -98528, -98528, -98553, -98562, -98593, -98608, -98622, -98630, -98630, -98637, -98647, +98488, +98504, +98504, +98511, +98540, +98559, +98566, +98595, +98601, +98607, +98615, +98638, +98651, +98651, +98651, +98667, +98667, +98686, 98703, -98733, -98733, -98733, -98749, -98749, -98754, -98759, -98783, -98783, -98808, -98827, -98827, +98703, +98716, +98728, +98762, +98762, +98762, +98779, +98804, 98827, -98853, -98888, -98888, -98906, -98906, -98926, -98954, -98963, -98963, -98963, -98973, -98991, -98997, -98997, -98997, -98997, -99014, -99014, -99014, -99014, -99022, -99036, -99036, -99080, -99096, -99101, -99101, -99115, -99125, -99135, -99135, -99135, -99163, -99163, -99163, -99203, -99203, -99222, -99222, -99253, -99253, -99285, -99308, -99308, -99308, -99308, -99333, -99360, -99394, -99394, -99408, -99408, -99414, -99420, -99420, -99420, -99469, -99476, -99476, -99476, -99498, -99498, -99498, -99528, -99528, +98833, +98847, +98865, +98865, +98865, +98865, +98876, +98876, +98876, +98895, +98905, +98905, +98946, +98946, +98946, +98946, +98977, +99002, +99019, +99026, +99026, +99038, +99051, +99078, +99106, +99113, +99126, +99144, +99164, +99164, +99189, +99238, +99245, +99257, +99288, +99306, +99306, +99334, +99355, +99383, +99437, +99437, +99458, +99485, +99505, +99517, 99528, -99546, -99552, -99558, -99576, -99576, -99576, -99600, -99611, -99611, -99621, -99636, -99636, -99636, -99636, -99636, -99636, -99636, -99687, -99687, -99721, -99728, +99553, +99560, +99573, +99590, +99602, +99624, +99624, +99631, +99638, +99657, +99688, +99701, +99708, 99747, -99753, -99753, -99753, -99796, -99801, -99817, -99826, -99858, -99858, -99873, -99873, -99873, -99912, -99912, -99912, -99912, -99939, -99939, -99939, -99939, -99953, -99963, -100010, -100045, -100056, -100056, -100078, -100078, -100078, -100093, -100098, -100098, -100098, -100106, -100113, -100126, -100126, -100126, -100126, -100126, -100126, -100131, -100156, -100156, -100166, -100166, -100166, -100186, -100186, -100186, -100186, -100219, -100236, -100236, -100236, -100236, -100287, -100305, -100313, -100313, -100328, -100328, -100328, -100328, -100352, -100352, -100352, -100352, -100363, -100399, -100399, -100399, -100417, -100433, -100446, -100446, -100464, -100464, -100464, -100521, -100530, -100539, -100565, -100583, -100591, -100601, -100612, -100612, -100612, -100612, -100612, -100618, -100644, -100644, -100652, -100685, -100695, -100695, -100706, -100712, -100749, -100766, -100811, -100834, -100834, -100860, -100869, -100869, -100869, -100889, -100907, -100907, -100913, -100932, -100932, -100932, -100932, -100932, -100932, +99759, +99781, +99781, +99804, +99822, +99841, +99841, +99859, +99859, +99859, +99877, +99890, +99913, +99930, +99944, +99976, +100005, +100005, +100018, +100025, +100025, +100032, +100032, +100048, +100059, +100059, +100086, +100095, +100111, +100138, +100153, +100169, +100214, +100222, +100230, +100267, +100274, +100284, +100293, +100293, +100329, +100347, +100357, +100377, +100387, +100387, +100397, +100397, +100409, +100425, +100425, +100425, +100441, +100455, +100472, +100472, +100479, +100508, +100508, +100517, +100549, +100549, +100568, +100578, +100603, +100603, +100610, +100610, +100641, +100682, +100690, +100705, +100723, +100743, +100743, +100750, +100763, +100763, +100822, +100844, +100865, +100877, +100877, +100877, +100884, +100891, +100903, +100926, 100950, 100950, -100963, -100963, -101015, -101026, +100968, +100968, +100987, +101007, +101027, +101027, +101027, +101034, +101034, +101041, 101048, -101048, -101084, -101090, -101103, -101119, -101119, -101119, -101137, -101160, -101171, -101180, -101186, -101194, -101194, -101212, -101237, -101260, -101260, -101260}; +101055, +101105, +101126, +101142, +101149, +101156, +101163, +101163, +101205, +101205, +101228, +101228, +101228, +101228, +101228, +101228, +101250, +101275, +101282, +101282, +101310, +101316, +101316, +101316, +101323, +101344, +101366, +101392, +101399, +101424, +101441, +101441, +101441, +101441, +101464, +101500, +101520, +101537, +101544, +101552, +101552, +101580, +101580, +101610, +101620, +101627, +101634, +101649, +101656, +101663, +101670, +101670, +101686, +101686, +101693, +101720, +101720, +101748, +101765, +101786, +101802, +101809, +101828}; static const char *tldData[] = { -"ac.lk\0lu.eu.org\0me.eu.org\0" -"hazu.aichi.jp\0" -"ac.ma\0auto.pl\0" -"meme\0" -"ac.me\0" -"kuokgroup\0" -"trentinsu\xcc\x88""d-tirol.it\0holtalen.no\0" -"alibaba\0" -"\xd9\x85\xd9\x88\xd8\xa8\xd8\xa7\xd9\x8a\xd9\x84\xd9\x8a\0" -"k12.ct.us\0hu.com\0" -"lib.ar.us\0" -"bbs.tr\0" -"arao.kumamoto.jp\0no-ip.biz\0" -"js.cn\0s3-fips-us-gov-west-1.amazonaws.com\0" -"ac.mu\0" -"bato.tochigi.jp\0agriculture.museum\0" -"ac.mw\0" -"h.se\0" -"ac.ni\0home.dyndns.org\0" -"umi.fukuoka.jp\0ac.mz\0varoy.no\0" -"lv.eu.org\0" -"slg.br\0bando.ibaraki.jp\0community.museum\0" -"s\xc3\xb8rfold.no\0" -"nysa.pl\0travelers\0" -"krokstadelva.no\0is-a-lawyer.com\0" -"baseball.museum\0" -"southcarolina.museum\0" -"menu\0verisign\0" -"kddi\0" -"fc.it\0docs\0nfshost.com\0" -"outsystemscloud.com\0" -"larsson.museum\0med.pro\0" -"forli\xcc\x80""cesena.it\0arts.nf\0ac.nz\0" -"\xe3\x82\xb9\xe3\x83\x88\xe3\x82\xa2\0" -"tsuruta.aomori.jp\0" -"sp.it\0ac.pa\0fhapp.xyz\0" -"study\0" -"misato.akita.jp\0rocher\0" -"us-1.evennode.com\0" -"ralingen.no\0" -"nesna.no\0ddnsfree.com\0" -"urakawa.hokkaido.jp\0tychy.pl\0" -"webhop.org\0" -"artgallery.museum\0" -"saigawa.fukuoka.jp\0state.museum\0" -"contagem.br\0snasa.no\0" -"museum\0doomdns.org\0" -"tone.ibaraki.jp\0" -"bashkiria.ru\0" -"ac.pr\0" -"uchiko.ehime.jp\0sue.fukuoka.jp\0toyosato.shiga.jp\0es.leg.br\0" -"asahi.nagano.jp\0es.kr\0from-wa.com\0" -"ooshika.nagano.jp\0" -"kasukabe.saitama.jp\0" -"sumita.iwate.jp\0" -"nannestad.no\0\xe5\x81\xa5\xe5\xba\xb7\0" -"teshikaga.hokkaido.jp\0" -"slattum.no\0" -"bashkiria.su\0" -"trentinos-tirol.it\0" -"laz.it\0" -"edu.ac\0" -"memorial\0" -"edu.af\0" -"k12.id.us\0" -"from-la.net\0" -"edu.al\0feedback\0" -"vik.no\0" -"ketrzyn.pl\0ac.rs\0" -"doha\0" -"edu.ba\0okaya.nagano.jp\0ac.ru\0ac.se\0cloudcontrolled.com\0" -"edu.ar\0edu.bb\0kunisaki.oita.jp\0" -"ac.rw\0s3.dualstack.eu-central-1.amazonaws.com\0from-al.com\0" -"kouzushima.tokyo.jp\0" -"edu.au\0is-a-knight.org\0" -"edu.bh\0" -"edu.bi\0inc.hk\0" -"edu.az\0yamashina.kyoto.jp\0time.museum\0" -"ishikawa.fukushima.jp\0naruto.tokushima.jp\0myravendb.com\0" -"stage.nodeart.io\0" -"edu.bm\0" -"edu.bn\0" -"edu.bo\0" -"lplfinancial\0ltd.ua\0" -"edu.br\0" -"edu.bs\0" -"edu.bt\0ac.th\0" -"ac.sz\0ac.tj\0" -"taki.mie.jp\0" -"edu.ci\0" -"edu.bz\0ltd.uk\0" -"github.io\0""32-b.it\0" -"hidaka.hokkaido.jp\0school\0" -"edu.cn\0acct.pro\0" -"edu.co\0" -"windmill.museum\0" -"nittedal.no\0" -"r\xc3\xb8st.no\0ac.ug\0unicom\0" -"edu.cu\0" -"latina.it\0oristano.it\0shakotan.hokkaido.jp\0ac.tz\0" -"edu.cw\0ac.uk\0" -"anan.nagano.jp\0notteroy.no\0" -"miyawaka.fukuoka.jp\0" -"accident-investigation.aero\0" -"edu.dm\0gifu.gifu.jp\0" -"edu.do\0" -"kokubunji.tokyo.jp\0kawanishi.yamagata.jp\0thruhere.net\0" -"zentsuji.kagawa.jp\0" -"edu.ec\0" -"\xc3\xa5seral.no\0mincom.tn\0" -"edu.ee\0marine.ru\0" -"equipment.aero\0" -"edu.eg\0kr.eu.org\0" -"arq.br\0" -"tabuse.yamaguchi.jp\0hamburg.museum\0" -"edu.dz\0ac.vn\0" -"emr.it\0" -"from-mi.com\0" -"christiansburg.museum\0" -"edu.es\0kami.miyagi.jp\0" -"edu.et\0fitness\0*.kunden.ortsinfo.at\0" -"tokoname.aichi.jp\0daegu.kr\0" -"ck.ua\0" -"mobara.chiba.jp\0" -"hsbc\0icbc\0" -"\xe5\xa5\x88\xe8\x89\xaf.jp\0k12.mt.us\0" -"ven.it\0virgin\0yachts\0" -"bjerkreim.no\0" -"idv.hk\0namikata.ehime.jp\0tamatsukuri.ibaraki.jp\0luxe\0" -"macerata.it\0microsoft\0" -"minano.saitama.jp\0" -"f.bg\0oseto.nagasaki.jp\0" -"protection\0" -"edu.ge\0from-ak.com\0" -"aaa.pro\0" -"edu.gh\0novara.it\0" -"edu.gi\0" -"maceio.br\0" -"av.it\0turystyka.pl\0download\0" -"edu.gl\0ringsaker.no\0africa\0" -"edu.gn\0" -"movimiento.bo\0" -"edu.gp\0" -"camdvr.org\0" -"edu.gr\0skin\0" -"edu.gt\0" -"edu.gu\0usdecorativearts.museum\0" -"pc.it\0" -"edu.gy\0" -"flora.no\0" -"edu.hk\0perso.sn\0" -"moskenes.no\0" -"sk\xc3\xa5nland.no\0ac.za\0" -"edu.hn\0" -"annefrank.museum\0" -"higashikurume.tokyo.jp\0" -"powiat.pl\0" -"sandnessjoen.no\0" -"edu.ht\0yamagata.ibaraki.jp\0" -"inzai.chiba.jp\0koto.shiga.jp\0godaddy\0" -"niihama.ehime.jp\0flesberg.no\0" -"ac.zm\0community\0viajes\0" -"perso.tn\0observer\0" -"cesenaforli.it\0cloudfront.net\0" -"secure\0" -"edu.in\0zamami.okinawa.jp\0" -"volda.no\0" -"edu.iq\0" -"edu.is\0ac.zw\0" -"edu.it\0" -"fitjar.no\0" -"sukagawa.fukushima.jp\0" -"versailles.museum\0" -"satsumasendai.kagoshima.jp\0educational.museum\0myphotos.cc\0" -"shingu.fukuoka.jp\0shibata.miyagi.jp\0hemne.no\0" -"oyamazaki.kyoto.jp\0" -"nationalheritage.museum\0north-kazakhstan.su\0dscloud.biz\0" -"edu.jo\0diskstation.me\0" -"feira.br\0" -"\xe0\xb2\xad\xe0\xb2\xbe\xe0\xb2\xb0\xe0\xb2\xa4\0vladikavkaz.ru\0" -"tranby.no\0" -"lib.ca.us\0" -"edu.kg\0" -"edu.ki\0" -"windows\0" -"edu.km\0" -"edu.kn\0" -"diskstation.eu\0" -"edu.kp\0lib.pr.us\0" -"kyonan.chiba.jp\0munakata.fukuoka.jp\0edu.la\0andasuolo.no\0vladikavkaz.su\0" -"edu.lb\0schaeffler\0tushu\0" -"takatsuki.shiga.jp\0edu.lc\0" -"slz.br\0koya.wakayama.jp\0meeres.museum\0" -"aetna\0" -"edu.kw\0game\0" -"hanamaki.iwate.jp\0kuroiso.tochigi.jp\0edu.ky\0dscloud.mobi\0" -"edu.kz\0" -"edu.lk\0" -"in-addr.arpa\0soja.okayama.jp\0hamar.no\0" -"mito.ibaraki.jp\0" -"ic.gov.pl\0" -"cc.ga.us\0" -"edu.lr\0bindal.no\0" -"edu.me\0" -"edu.lv\0naroy.no\0" -"edu.mg\0" -"ts.it\0" -"edu.ly\0" -"edu.mk\0" -"edu.ml\0cc.tn.us\0" -"edu.mn\0cruises\0" -"edu.mo\0" -"hasuda.saitama.jp\0" -"um.gov.pl\0" -"edu.ms\0sande.m\xc3\xb8re-og-romsdal.no\0" -"kitagawa.kochi.jp\0edu.mt\0" -"spy.museum\0stryn.no\0" -"kamijima.ehime.jp\0edu.mv\0" -"edu.mw\0edu.ng\0" -"edu.mx\0house\0" -"saga.saga.jp\0edu.my\0edu.ni\0" -"edu.mz\0boldlygoingnowhere.org\0" -"yoshioka.gunma.jp\0lajolla.museum\0" -"pc.pl\0pagespeedmobilizer.com\0" -"edu.nr\0" -"minoh.osaka.jp\0" -"masuda.shimane.jp\0" -"commbank\0" -"oiso.kanagawa.jp\0edu.om\0" -"banamex\0" -"sobetsu.hokkaido.jp\0trust.museum\0" -"nesoddtangen.no\0" -"edu.pa\0" -"chesapeakebay.museum\0" -"trentino-su\xcc\x88""d-tirol.it\0pacific.museum\0" -"dyn.home-webserver.de\0" +"edu.mt\0" +"off.ai\0k12.dc.us\0" +"edu.mv\0" +"edu.mw\0edu.ng\0berlev\xc3\xa5g.no\0" +"edu.mx\0" +"edu.my\0edu.ni\0" +"edu.mz\0fastpanel.direct\0" +"suzuki\0s3-eu-west-1.amazonaws.com\0" +"livinghistory.museum\0" +"trentinoalto-adige.it\0dontexist.net\0" +"hamburg.museum\0muos\xc3\xa1t.no\0" +"cn-northwest-1.eb.amazonaws.com.cn\0" +"edu.nr\0\xe0\xb8\x98\xe0\xb8\xb8\xe0\xb8\xa3\xe0\xb8\x81\xe0\xb8\xb4\xe0\xb8\x88.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0direct\0" +"fl.us\0agency\0" +"from-ok.com\0" +"nishiizu.shizuoka.jp\0komae.tokyo.jp\0" +"edu.om\0team\0doomdns.com\0" +"vestre-slidre.no\0" +"sweden.museum\0edu.pa\0" +"newhampshire.museum\0" "edu.pe\0" -"edu.pf\0duckdns.org\0" +"pro.az\0ar.it\0nishihara.kumamoto.jp\0edu.pf\0" "edu.ph\0" -"\xe6\xa0\x83\xe6\x9c\xa8.jp\0mk.ua\0" -"edu.pk\0myiphost.com\0" +"page\0" +"hikimi.shimane.jp\0" +"santafe.museum\0edu.pk\0" "edu.pl\0" -"jdf.br\0\xd8\xb9\xd8\xb1\xd8\xa7\xd9\x82\0" -"edu.pn\0" +"s3-ap-southeast-1.amazonaws.com\0home.dyndns.org\0" +"pro.br\0edu.pn\0" +"kasai.hyogo.jp\0clan.rip\0" "edu.qa\0" "edu.pr\0" -"kunneppu.hokkaido.jp\0edu.ps\0" -"edu.pt\0" -"yabuki.fukushima.jp\0" -"kr\xc3\xb8""dsherad.no\0mel\xc3\xb8y.no\0" -"plurinacional.bo\0" +"edu.ps\0mordovia.ru\0" +"nysa.pl\0edu.pt\0" +"\xe7\xbd\x91\xe7\xbb\x9c.hk\0ing.pa\0" +"tech\0" "edu.py\0" -"shikokuchuo.ehime.jp\0" -"kiyose.tokyo.jp\0" -"miho.ibaraki.jp\0" -"bolzano.it\0versicherung\0" -"shisui.chiba.jp\0" -"us.gov.pl\0" -"cc.la.us\0" -"aure.no\0" -"\xe9\xb3\xa5\xe5\x8f\x96.jp\0" -"kawanishi.nara.jp\0av.tr\0" -"government.aero\0jampa.br\0" -"sortland.no\0" -"mymailer.com.tw\0" -"edu.sa\0" -"aerobatic.aero\0edu.sb\0defense.tn\0" -"in.na\0edu.rs\0edu.sc\0" -"sn.cn\0edu.sd\0" +"ugim.gov.pl\0" +"kameyama.mie.jp\0" +"madrid.museum\0gjesdal.no\0" +"elverum.no\0" +"saotome.st\0" +"sveio.no\0iveco\0" +"gifu.jp\0" +"k12.me.us\0" +"samsclub\0now-dns.top\0" +"pro.cy\0" +"solund.no\0" +"store\0" +"nym.gr\0" +"gjovik.no\0" +"miyoshi.aichi.jp\0" +"pro.ec\0convent.museum\0hopto.org\0" +"ichikawamisato.yamanashi.jp\0" +"edu.sa\0nym.gy\0" +"edu.sb\0lamer\0" +"edu.rs\0edu.sc\0" +"edu.sd\0" "edu.ru\0" -"edu.rw\0edu.sg\0" -"okuizumo.shimane.jp\0sykkylven.no\0weatherchannel\0" -"in.ni\0" -"edu.sl\0idv.tw\0review\0" -"higashitsuno.kochi.jp\0channelsdvr.net\0" +"map.fastlylb.net\0" +"langevag.no\0edu.rw\0edu.sg\0" +"bmd.br\0" +"brasil.museum\0cc.ar.us\0" +"edu.sl\0" +"nym.ie\0" "edu.sn\0" -"selje.no\0" -"edu.st\0" -"kawanishi.hyogo.jp\0\xe0\xae\x87\xe0\xae\xb2\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xaf\x88\0" -"edu.sv\0" -"free\0" -"b\xc3\xa5""d\xc3\xa5""ddj\xc3\xa5.no\0azure\0" -"kembuchi.hokkaido.jp\0edu.sy\0dev.static.land\0" -"edu.tj\0" -"k12.az.us\0" -"sells-for-less.com\0" -"edu.tm\0" -"cloud66.ws\0" +"muosat.no\0" +"usa.museum\0" +"oguni.kumamoto.jp\0edu.st\0" +"friuli-ve-giulia.it\0edu.sv\0" +"lg.ua\0" +"edu.sy\0" +"shiwa.iwate.jp\0edu.tj\0cheap\0" +"tysfjord.no\0miami\0" +"edu.tm\0apple\0" +"kunimi.fukushima.jp\0iwi.nz\0" "edu.to\0" -"surnadal.no\0" -"edu.ua\0dn.ua\0" -"hi.cn\0edu.tr\0" -"fukushima.fukushima.jp\0" -"edu.tt\0" -"kunstsammlung.museum\0bargains\0" +"edu.ua\0" +"cim.br\0edu.tr\0" +"bindal.no\0arts.ve\0" +"ikaruga.nara.jp\0edu.tt\0" "edu.tw\0" -"lib.ma.us\0" -"yabu.hyogo.jp\0" -"nagatoro.saitama.jp\0" -"y.bg\0marriott\0" -"associates\0builders\0diskstation.org\0" -"okegawa.saitama.jp\0" -"kikonai.hokkaido.jp\0edu.vc\0" -"fujikawa.shizuoka.jp\0" -"usculture.museum\0edu.ve\0" -"ci.it\0bomlo.no\0" -"omura.nagasaki.jp\0edu.uy\0" -"hashima.gifu.jp\0" -"casadelamoneda.museum\0hasura-app.io\0" -"bulsan-su\xcc\x88""dtirol.it\0edu.vn\0" -"friulivenezia-giulia.it\0" -"pv.it\0childrensgarden.museum\0stj\xc3\xb8rdal.no\0" -"shintoku.hokkaido.jp\0gs.va.no\0forgot.his.name\0" -"familyds.com\0" -"es.gov.br\0garden.museum\0edu.vu\0weather\0" -"kudamatsu.yamaguchi.jp\0is-a-democrat.com\0crafting.xyz\0" -"wa.gov.au\0taku.saga.jp\0" -"mitane.akita.jp\0taka.hyogo.jp\0" -"paris.museum\0" -"\xd5\xb0\xd5\xa1\xd5\xb5\0" -"f.se\0" -"komoro.nagano.jp\0edu.ws\0george\0" -"pmn.it\0in.rs\0" -"aa.no\0" -"kamisu.ibaraki.jp\0arai.shizuoka.jp\0iki.fi\0" -"tokai.ibaraki.jp\0shiwa.iwate.jp\0" -"telekommunikation.museum\0" -"rokunohe.aomori.jp\0" -"bounty-full.com\0" -"cyber.museum\0" -"chichibu.saitama.jp\0vantaa.museum\0jgora.pl\0hdfcbank\0" -"is-a-conservative.com\0" -"\xe9\xa6\x99\xe5\xb7\x9d.jp\0v\xc3\xa5gs\xc3\xb8y.no\0flights\0" -"emp.br\0" -"in.th\0movie\0" -"mediocampidano.it\0" -"frontdoor\0gbiz\0zappos\0" -"fie.ee\0military.museum\0ovre-eiker.no\0" -"shimosuwa.nagano.jp\0kep.tr\0" -"edu.za\0\xe5\xae\xb6\xe9\x9b\xbb\0" -"tajiri.osaka.jp\0" -"abashiri.hokkaido.jp\0in.ua\0" -"ikaruga.nara.jp\0\xc3\xa5s.no\0" -"ribeirao.br\0aya.miyazaki.jp\0" -"tokushima.jp\0" -"assisi.museum\0" -"edu.zm\0bofa\0" -"sch.ae\0" -"corvette.museum\0" -"mikasa.hokkaido.jp\0" -"in.us\0work\0" -"iwata.shizuoka.jp\0" -"amami.kagoshima.jp\0" -"miyoshi.saitama.jp\0" "eu-4.evennode.com\0" -"flekkefjord.no\0kvalsund.no\0*.spectrum.myjino.ru\0" -"ohtawara.tochigi.jp\0" -"poltava.ua\0" -"ikusaka.nagano.jp\0ikeda.osaka.jp\0" -"\xd8\xa7\xd9\x84\xd9\x8a\xd9\x85\xd9\x86\0" -"cc.va.us\0net.eu.org\0" -"film.hu\0moscow.museum\0from-nh.com\0" -"ris\xc3\xb8r.no\0" -"nagahama.shiga.jp\0kv.ua\0trade\0" -"e4.cz\0" -"*.statics.cloud\0" -"mitsue.nara.jp\0properties\0" -"osen.no\0" -"yoichi.hokkaido.jp\0" -"fam.pk\0" -"finearts.museum\0" -"berkeley.museum\0" -"furudono.fukushima.jp\0gs.ol.no\0" -"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd9\x87\0" -"monzabrianza.it\0" -"dontexist.com\0" -"penza.su\0" -"takasu.hokkaido.jp\0gyeongbuk.kr\0cc.wy.us\0spb.ru\0" -"motosu.gifu.jp\0" -"imakane.hokkaido.jp\0" -"servesarcasm.com\0" -"yashiro.hyogo.jp\0" -"naklo.pl\0" -"kicks-ass.net\0" -"equipment\0" -"moroyama.saitama.jp\0eu-3.evennode.com\0" -"avoues.fr\0lib.wa.us\0" -"poa.br\0zara\0" -"spb.su\0" -"tozsde.hu\0" -"homesecuritymac.com\0" -"bitballoon.com\0" -"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd8\xa9\0" -"tools\0" -"aizumisato.fukushima.jp\0dvrcam.info\0" -"nikaho.akita.jp\0" -"mi.it\0" -"is-a-linux-user.org\0" -"semboku.akita.jp\0iwanai.hokkaido.jp\0" -"himeshima.oita.jp\0house.museum\0vf.no\0unj\xc3\xa1rga.no\0cc.md.us\0gallup\0" -"attorney\0" -"gd.cn\0" -"audible\0richardli\0gdynia.pl\0" -"k\xc3\xa5""fjord.no\0" -"depot.museum\0" -"ashoro.hokkaido.jp\0" -"homeftp.org\0" -"friulivegiulia.it\0sakae.chiba.jp\0" +"shirahama.wakayama.jp\0" +"yoshioka.gunma.jp\0" +"stuttgart.museum\0sn\xc3\xa5sa.no\0" +"edu.vc\0" +"sicily.it\0" +"edu.ve\0" +"sakahogi.gifu.jp\0daigo.ibaraki.jp\0" +"indianapolis.museum\0edu.uy\0s3.dualstack.eu-central-1.amazonaws.com\0nym.la\0" +"iwamizawa.hokkaido.jp\0buzz\0piaget\0" +"nym.lc\0" +"edu.vn\0" +"o.bg\0" +"pro.ht\0" +"skanland.no\0nym.li\0" +"nym.kz\0" +"riik.ee\0audio\0" +"adachi.tokyo.jp\0" +"edu.vu\0exnet.su\0" +"iselect\0" +"sanjo.niigata.jp\0" +"jamison.museum\0abbvie\0" +"za.bz\0" +"sor-aurdal.no\0" +"adult.ht\0nym.lt\0" +"miners.museum\0is-an-actor.com\0nym.lu\0nym.me\0" +"*.cns.joyent.com\0" +"sv.it\0mukawa.hokkaido.jp\0oshu.iwate.jp\0kawanehon.shizuoka.jp\0krakow.pl\0" +"edu.ws\0" +"asahi.toyama.jp\0nym.mn\0" +"from-ak.com\0" +"preservation.museum\0" +"rec.br\0oga.akita.jp\0" +"okinawa\0" +"chikuho.fukuoka.jp\0" +"nym.mx\0" +"levanger.no\0living\0" +"8.bg\0space-to-rent.com\0" +"tokushima.jp\0wanouchi.gifu.jp\0" +"lifeinsurance\0" +"\xe7\xa6\x8f\xe5\xb3\xb6.jp\0jetzt\0" +"rec.co\0bible.museum\0" +"ibaraki.jp\0usui.fukuoka.jp\0chungbuk.kr\0" +"takamori.kumamoto.jp\0" +"eu-3.evennode.com\0" +"arts.ro\0" +"is-a-lawyer.com\0" +"edu.za\0is-a-student.com\0" +"nym.nz\0" +"nishikatsura.yamanashi.jp\0" +"app.lmpm.com\0" +"po.it\0nishigo.fukushima.jp\0" "s3.dualstack.us-east-2.amazonaws.com\0" -"d.bg\0aaa\0" -"limanowa.pl\0" -"kimitsu.chiba.jp\0digital\0" -"cust.testing.thingdust.io\0" -"chuo.yamanashi.jp\0" -"vic.edu.au\0dellogliastra.it\0war.museum\0" -"mitsubishi\0" -"at.it\0" -"hashikami.aomori.jp\0" -"geometre-expert.fr\0" -"ferrari\0" -"sch.id\0graphics\0" -"bond\0" -"nagareyama.chiba.jp\0abb\0" -"b\xc3\xb8.nordland.no\0abc\0" -"pa.it\0kanuma.tochigi.jp\0webhop.net\0" -"webhosting.be\0" -"tomi.nagano.jp\0" -"g\xc3\xa1ls\xc3\xa1.no\0" -"lib.ak.us\0" -"vibovalentia.it\0eu-2.evennode.com\0" -"sch.ir\0fujixerox\0" -"kamioka.akita.jp\0" -"saskatchewan.museum\0" -"kamikawa.hyogo.jp\0" -"asahi.yamagata.jp\0" -"harstad.no\0book\0" -"aisho.shiga.jp\0" -"dali.museum\0" -"sch.jo\0from-ks.com\0" -"lebesby.no\0" -"sampa.br\0" -"aco\0" -"cagliari.it\0olbia-tempio.it\0" -"obihiro.hokkaido.jp\0r\xc3\xb8ros.no\0kozow.com\0" -"kyotanabe.kyoto.jp\0" -"int.ar\0" -"ri.it\0imabari.ehime.jp\0" -"nakaniikawa.toyama.jp\0" -"vanguard\0" -"int.az\0""4lima.de\0" -"rost.no\0" -"ads\0" -"homeunix.net\0" -"int.bo\0" -"sch.lk\0snoasa.no\0aeg\0memset.net\0" -"bharti\0" -"batsfjord.no\0" -"katsuura.chiba.jp\0kashiba.nara.jp\0" -"niiza.saitama.jp\0y.se\0" -"hagebostad.no\0za.bz\0" -"flight.aero\0" -"int.ci\0dyndns-work.com\0" -"revista.bo\0" -"solund.no\0daplie.me\0" -"ubank\0" -"\xe7\xbd\x91\xe5\x9d\x80\0" -"sch.ly\0marburg.museum\0odesa.ua\0" -"int.co\0meguro.tokyo.jp\0" -"hi.us\0video\0" -"online.museum\0dvrdns.org\0" -"afl\0eu-1.evennode.com\0" -"nt.edu.au\0" -"wios.gov.pl\0beats\0ftpaccess.cc\0global.prod.fastly.net\0" -"\xe6\x96\xb0\xe6\xbd\x9f.jp\0" -"rindal.no\0""4lima.at\0" -"nl.ca\0sch.ng\0" -"blogspot.co.at\0" -"niigata.jp\0sydney.museum\0" -"pesaro-urbino.it\0" -"shizuoka.shizuoka.jp\0nerdpol.ovh\0" -"\xe5\x8d\x83\xe8\x91\x89.jp\0hemsedal.no\0sandvikcoromant\0" -"barreau.bj\0ohi.fukui.jp\0" -"viking.museum\0\xd8\xa7\xd9\x84\xd9\x85\xd8\xba\xd8\xb1\xd8\xa8\0from-wy.com\0synology-diskstation.de\0" -"shinjo.okayama.jp\0" -"from-co.net\0" -"4lima.ch\0" -"pharmacy.museum\0actor\0" -"muenster.museum\0embaixada.st\0" -"association.museum\0" -"dyndns.org\0" -"jessheim.no\0" -"\xd0\xbe\xd0\xb4.\xd1\x81\xd1\x80\xd0\xb1\0ieee\0\xe6\xb7\xa1\xe9\xa9\xac\xe9\x94\xa1\0" -"gyeonggi.kr\0" -"consultant.aero\0" -"s3-eu-central-1.amazonaws.com\0" -"bulsan-sudtirol.it\0" -"museet.museum\0" -"ecn.br\0brindisi.it\0" -"studio\0" -"ami.ibaraki.jp\0h\xc3\xa1mm\xc3\xa1rfeasta.no\0aig\0" -"cisco\0" -"ebetsu.hokkaido.jp\0" -"denmark.museum\0kr.com\0" -"sch.qa\0promo\0" -"mi.th\0" -"tomiya.miyagi.jp\0" -"vao.it\0kawasaki.miyagi.jp\0cc.vt.us\0" -"hekinan.aichi.jp\0" -"bd.se\0" -"nagaokakyo.kyoto.jp\0bill.museum\0" -"kinder\0" -"org.ac\0lib.ut.us\0accountant\0allstate\0from-ne.com\0" -"org.ae\0" -"org.af\0asso.fr\0" -"org.ag\0kakinoki.shimane.jp\0" -"wiw.gov.pl\0" -"org.ai\0" -"loyalist.museum\0gloppen.no\0fresenius\0" -"guam.gu\0miyoshi.hiroshima.jp\0" -"org.al\0" -"mi.us\0" -"aarborte.no\0" -"shimonita.gunma.jp\0" -"sch.sa\0\xe8\x87\xba\xe7\x81\xa3\0\xe7\x82\xb9\xe7\x9c\x8b\0" -"org.ba\0" -"org.ar\0org.bb\0" -"asso.gp\0" -"org.au\0sannan.hyogo.jp\0" -"miyama.fukuoka.jp\0" -"org.bh\0kosai.shizuoka.jp\0" -"org.bi\0etc.br\0" -"org.az\0" -"nakatsugawa.gifu.jp\0" -"futsu.nagasaki.jp\0paris\0" -"org.bm\0int.is\0" -"org.bn\0s3-ap-southeast-2.amazonaws.com\0" -"org.bo\0" -"minokamo.gifu.jp\0" -"org.br\0" -"org.bs\0" -"org.bt\0for-the.biz\0" -"karasuyama.tochigi.jp\0plants.museum\0static.land\0" -"org.bw\0" -"asso.ht\0" -"org.ci\0" -"org.bz\0" -"union.aero\0*.platform.sh\0" -"erotica.hu\0" -"org.cn\0ino.kochi.jp\0" -"org.co\0randaberg.no\0vindafjord.no\0" -"hiraizumi.iwate.jp\0" -"railway.museum\0swidnica.pl\0\xe0\xb8\xad\xe0\xb8\x87\xe0\xb8\x84\xe0\xb9\x8c\xe0\xb8\x81\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" -"friuli-vgiulia.it\0" -"org.cu\0" -"pa.us\0" -"org.cw\0blogspot.co.id\0" -"accountants\0" -"org.cy\0" -"kamimine.saga.jp\0naumburg.museum\0" -"int.la\0stor-elvdal.no\0property\0" -"org.dm\0statebank\0" -"asso.bj\0" -"org.do\0blogspot.co.il\0" -"d\xc3\xb8nna.no\0" -"misato.wakayama.jp\0" -"org.ec\0saga.jp\0" -"isa.us\0" -"org.ee\0int.lk\0rade.no\0bukhara.su\0" -"\xe6\xbb\x8b\xe8\xb3\x80.jp\0herokuapp.com\0" -"org.eg\0experts-comptables.fr\0lease\0" -"takarazuka.hyogo.jp\0" -"niyodogawa.kochi.jp\0" -"org.dz\0yasu.shiga.jp\0" -"asso.ci\0anz\0" -"w.bg\0aol\0" -"amsterdam\0" -"unjarga.no\0" -"org.es\0" -"org.et\0" -"s3.ap-northeast-2.amazonaws.com\0" -"gojome.akita.jp\0" -"nerima.tokyo.jp\0" -"\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\xe0\xa4\xae\xe0\xa5\x8d\0" -"val-d-aosta.it\0" -"jp.eu.org\0" -"sncf\0" -"ri.us\0dodge\0" -"mima.tokushima.jp\0int.mv\0" -"int.mw\0" -"pt.it\0southwest.museum\0" -"int.ni\0s\xc3\xb8r-fron.no\0app\0kindle\0" -"nishihara.okinawa.jp\0yandex\0" -"org.ge\0pisa.it\0doesntexist.com\0" -"watari.miyagi.jp\0yono.saitama.jp\0kosei.shiga.jp\0" -"org.gg\0" -"org.gh\0" -"org.gi\0zhitomir.ua\0karaganda.su\0" -"satte.saitama.jp\0" -"mitaka.tokyo.jp\0frogn.no\0" -"org.gl\0h\xc3\xb8yanger.no\0" -"systems\0" -"asso.dz\0org.gn\0sarpsborg.no\0" -"swiss\0" -"org.gp\0\xe6\x88\x91\xe7\x88\xb1\xe4\xbd\xa0\0" -"org.gr\0d.se\0" -"org.gt\0" -"org.gu\0bar\0" -"bbc\0" -"tempio-olbia.it\0tobishima.aichi.jp\0" -"elk.pl\0" -"org.gy\0trentinoalto-adige.it\0" -"aju.br\0org.hk\0" -"tanabe.wakayama.jp\0apartments\0" -"org.hn\0suginami.tokyo.jp\0" -"pimienta.org\0" -"fortworth.museum\0" -"\xe7\x9f\xb3\xe5\xb7\x9d.jp\0" -"org.ht\0nl.no\0" -"org.hu\0" -"art\0bbt\0" -"barsy.info\0" -"bcg\0education\0" -"itoigawa.niigata.jp\0" -"org.il\0hakusan.ishikawa.jp\0yamato.kanagawa.jp\0ina.nagano.jp\0sch.zm\0" -"org.im\0ap-south-1.elasticbeanstalk.com\0" -"org.in\0int.pt\0turen.tn\0chase\0" -"l\xc3\xa4ns.museum\0" -"org.iq\0valle\xcc\x81""edaoste.it\0bcn\0" -"org.ir\0" -"org.is\0byen.site\0" -"org.je\0environmentalconservation.museum\0" -"watchandclock.museum\0intel\0" -"minamidaito.okinawa.jp\0bonn.museum\0" -"doshi.yamanashi.jp\0" -"daito.osaka.jp\0katano.osaka.jp\0" -"taiwa.miyagi.jp\0" -"org.jo\0" -"a\xc3\xa9roport.ci\0" -"miyake.nara.jp\0il.us\0" -"org.kg\0" -"org.ki\0" -"q-a.eu.org\0" -"org.km\0" -"org.kn\0nuernberg.museum\0" -"int.ru\0" -"yamanashi.jp\0org.kp\0\xe0\xb8\x97\xe0\xb8\xab\xe0\xb8\xb2\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0pictures\0" -"ueno.gunma.jp\0chiyoda.tokyo.jp\0org.la\0int.rw\0wi.us\0lamborghini\0" -"org.lb\0" -"org.lc\0" -"eu.com\0" -"sakura.chiba.jp\0" -"org.kw\0bet\0virtualuser.de\0" -"saroma.hokkaido.jp\0" -"org.ky\0cincinnati.museum\0ybo.review\0" -"org.kz\0" -"org.lk\0gdansk.pl\0" -"design.museum\0vlaanderen.museum\0" -"society.museum\0" -"org.ma\0smart\0" -"org.lr\0australia.museum\0" -"org.ls\0" -"int.tj\0is-very-nice.org\0" -"org.me\0" -"marumori.miyagi.jp\0org.lv\0" -"org.mg\0dnsup.net\0" -"org.ly\0ddnsgeek.com\0" -"org.mk\0" -"org.ml\0\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86\0parts\0\xd8\xa8\xd8\xa7\xd8\xb2\xd8\xa7\xd8\xb1\0" -"\xe5\x92\x8c\xe6\xad\x8c\xe5\xb1\xb1.jp\0omotego.fukushima.jp\0" -"org.mn\0int.tt\0" -"org.mo\0center\0" -"freiburg.museum\0org.na\0" -"journalist.aero\0chuo.tokyo.jp\0estate\0party\0" -"org.ms\0" -"org.mt\0axa\0" -"org.mu\0" -"calabria.it\0org.mv\0aws\0googleapis.com\0" -"miners.museum\0org.mw\0org.ng\0" -"niimi.okayama.jp\0toyama.toyama.jp\0org.mx\0" -"org.my\0org.ni\0" -"org.mz\0" -"val-daosta.it\0oumu.hokkaido.jp\0" -"naganohara.gunma.jp\0int.ve\0" -"l\xc3\xb8renskog.no\0org.nr\0" -"ens.tn\0\xd0\xb1\xd0\xb3\0" -"\xe6\x9d\xb1\xe4\xba\xac.jp\0" -"principe.st\0bid\0" -"shiso.hyogo.jp\0int.vn\0" -"org.nz\0" -"olayangroup\0" -"org.om\0" -"org.pa\0\xd8\xa7\xd9\x85\xd8\xa7\xd8\xb1\xd8\xa7\xd8\xaa\0" -"bio\0" -"musashino.tokyo.jp\0" -"org.pe\0cafe\0" -"org.pf\0mytis.ru\0" -"org.ph\0" -"village.museum\0from-pr.com\0" -"\xe6\x9c\xba\xe6\x9e\x84\0" -"org.pk\0" -"name.hr\0org.pl\0browsersafetymark.io\0" -"biz\0" -"ogose.saitama.jp\0org.pn\0kicks-ass.org\0blogspot.co.uk\0" -"okagaki.fukuoka.jp\0" -"nayoro.hokkaido.jp\0" -"openair.museum\0org.qa\0" -"org.pr\0istanbul\0" -"org.ps\0" -"org.pt\0" -"bibai.hokkaido.jp\0" -"org.py\0k12.nh.us\0" -"tsuno.kochi.jp\0" -"tokamachi.niigata.jp\0wales\0" -"cng.br\0" -"name.et\0" -"b.bg\0" -"karpacz.pl\0" -"otsuka\0" -"mini\0" -"ar.it\0hikawa.shimane.jp\0\xe5\x95\x86\xe5\x9f\x8e\0" -"homeftp.net\0" -"video.hu\0gs.fm.no\0" -"b.br\0" -"org.ro\0" -"rennes\xc3\xb8y.no\0" -"org.sa\0" -"org.sb\0" -"org.rs\0org.sc\0mint\0" -"sayama.osaka.jp\0nirasaki.yamanashi.jp\0org.sd\0" -"org.se\0org.ru\0" -"gjerstad.no\0" -"kommune.no\0org.sg\0" -"takashima.shiga.jp\0fhs.no\0org.sh\0from-mn.com\0" -"bsb.br\0\xc3\xb8rskog.no\0" -"jfk.museum\0" -"org.sl\0" -"iwatsuki.saitama.jp\0nanto.toyama.jp\0org.sn\0" -"org.so\0" -"kurashiki.okayama.jp\0\xc3\xa5""fjord.no\0\xd2\x9b\xd0\xb0\xd0\xb7\0" -"civilaviation.aero\0clock.museum\0" -"name.cy\0traniandriabarletta.it\0pruszkow.pl\0" -"org.st\0fastvps-server.com\0" -"lib.mn.us\0" -"org.sv\0bms\0" -"mashiki.kumamoto.jp\0" -"asso.re\0org.sy\0" -"sogndal.no\0org.sz\0org.tj\0bmw\0" -"balestrand.no\0" -"org.tm\0insurance\0" -"org.tn\0\xd0\xb5\xd1\x8e\0" -"otofuke.hokkaido.jp\0org.to\0bnl\0citic\0" -"\xc3\xa5rdal.no\0" -"name.eg\0org.ua\0" -"cz.it\0toyohashi.aichi.jp\0skaun.no\0org.tr\0" -"mihama.aichi.jp\0" -"jewelry.museum\0org.tt\0" -"cc.de.us\0" -"org.tw\0org.ug\0" -"lupin\0" -"shoes\0" -"org.uk\0here-for-more.info\0" -"rg.it\0matta-varjjat.no\0" -"\xe5\x95\x86\xe6\xa5\xad.tw\0wedeploy.sh\0" -"bom\0" -"boo\0" -"org.vc\0" -"name.az\0" -"org.ve\0" -"tateyama.chiba.jp\0" -"bot\0" -"chungnam.kr\0blogspot.co.ke\0nhlfan.net\0" -"kanie.aichi.jp\0miura.kanagawa.jp\0org.uy\0org.vi\0" -"ishinomaki.miyagi.jp\0org.uz\0" -"box\0" -"call\0" -"national.museum\0stavern.no\0w.se\0" -"org.vn\0lima-city.de\0" -"aip.ee\0" -"kani.gifu.jp\0" -"wake.okayama.jp\0" -"\xe5\xbe\xb3\xe5\xb3\xb6.jp\0" -"org.vu\0cab\0" -"soeda.fukuoka.jp\0" -"terni.it\0" -"fr.it\0homeunix.org\0" -"\xd0\xbe\xd0\xb1\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0" -"from-sd.com\0" -"cal\0" -"cam\0camp\0blackbaudcdn.net\0" -"hidaka.kochi.jp\0" -"ut.us\0org.ws\0" -"cba\0" -"car\0" -"to.it\0servebeer.com\0" -"cat\0fukusaki.hyogo.jp\0takanezawa.tochigi.jp\0asso.nc\0*.ex.ortsinfo.at\0" -"klabu.no\0k12.ga.us\0" -"lima-city.at\0" -"higashiyama.kyoto.jp\0" -"shikatsu.aichi.jp\0" -"gorizia.it\0cbn\0*.hosting.myjino.ru\0" -"gjerdrum.no\0" -"ikano\0" -"cbs\0" -"wakayama.jp\0" -"mobi.gp\0" -"hasvik.no\0sosnowiec.pl\0apple\0" -"kaita.hiroshima.jp\0org.za\0lima-city.ch\0" -"eidsvoll.no\0" -"siracusa.it\0" +"fj.cn\0tome.miyagi.jp\0" +"edu.zm\0nym.pe\0" +"v-info.info\0" +"tomakomai.hokkaido.jp\0hosting-cluster.nl\0" +"click\0" "miharu.fukushima.jp\0" -"palmsprings.museum\0teaches-yoga.com\0" -"ibestad.no\0" -"kagami.kochi.jp\0" -"avocat.pro\0" -"org.zm\0blogspot.co.nz\0" -"foundation.museum\0style\0dattorelay.com\0" -"air-surveillance.aero\0for-more.biz\0" -"toray\0" -"zaporizhzhia.ua\0" -"sande.more-og-romsdal.no\0\xe7\xbd\x91\xe7\xab\x99\0" -"lib.gu.us\0ceb\0" -"org.zw\0" -"jeju.kr\0" -"haebaru.okinawa.jp\0" -"police.uk\0" -"nomi.ishikawa.jp\0is-a-green.com\0" -"divttasvuotna.no\0ceo\0" -"tree.museum\0zt.ua\0" -"yugawara.kanagawa.jp\0v\xc3\xa5gan.no\0cfa\0engineering\0""001www.com\0" -"choshi.chiba.jp\0care\0" -"cfd\0" -"usa.oita.jp\0lowicz.pl\0gifts\0" -"uscountryestate.museum\0is.eu.org\0" -"buy\0" -"kr.it\0missoula.museum\0sohu\0" -"iide.yamagata.jp\0" -"from-sc.com\0" -"casa\0" -"cars\0" -"per.la\0case\0" -"soma.fukushima.jp\0" -"romskog.no\0" -"izumisano.osaka.jp\0cash\0" -"booking\0" -"k12.la.us\0" -"\xe4\xbd\x90\xe8\xb3\x80.jp\0" -"ibigawa.gifu.jp\0" -"asso.km\0" -"muni.il\0karatsu.saga.jp\0science-fiction.museum\0xbox\0" +"r\xc3\xb8st.no\0s3.eu-central-1.amazonaws.com\0" +"midori.chiba.jp\0" +"moriyama.shiga.jp\0" +"natuurwetenschappen.museum\0" +"nym.pt\0" +"pro.na\0moto\0" +"aero.tt\0map.fastly.net\0" +"hidaka.kochi.jp\0" +"crew.aero\0" +"pro.mv\0" +"histoire.museum\0krokstadelva.no\0giving\0" +"microsoft\0" "ar.us\0" -"valle\xcc\x81""e-d-aoste.it\0" -"kozagawa.wakayama.jp\0it.eu.org\0myvnc.com\0" -"cog.mi.us\0" -"folldal.no\0" -"\xd1\x80\xd1\x84\0" -"honjo.saitama.jp\0asso.mc\0" -"cultural.museum\0per.nf\0cc.ne.us\0" -"tvedestrand.no\0wedeploy.me\0" -"he.cn\0spydeberg.no\0" -"kommunalforbund.se\0" -"rifu.miyagi.jp\0" -"inuyama.aichi.jp\0nishio.aichi.jp\0akagi.shimane.jp\0k12.ny.us\0" -"mormon\0" -"gs.svalbard.no\0" -"jevnaker.no\0lib.me.us\0office\0myshopblocks.com\0" -"shibecha.hokkaido.jp\0" -"tj\xc3\xb8me.no\0bzh\0" -"u.bg\0\xe9\xa3\x9f\xe5\x93\x81\0" -"takatori.nara.jp\0" -"czest.pl\0" -"modelling.aero\0" -"hammarfeasta.no\0" -"ce.it\0gausdal.no\0" -"\xd7\x99\xd7\xa8\xd7\x95\xd7\xa9\xd7\x9c\xd7\x99\xd7\x9d.museum\0square7.net\0edu.krd\0" -"shinjo.nara.jp\0is-very-bad.org\0" -"potenza.it\0" -"jelenia-gora.pl\0localhost.daplie.me\0" -"9guacu.br\0" -"audio\0" -"naples.it\0pr.it\0furano.hokkaido.jp\0kamikawa.hokkaido.jp\0song\0" -"ask\xc3\xb8y.no\0" -"orange\0telecity\0serveblog.net\0" -"orland.no\0" -"ikata.ehime.jp\0" -"name.vn\0mozilla-iot.org\0" -"fund\0" -"in.eu.org\0" -"matsushima.miyagi.jp\0c66.me\0dattoweb.com\0" -"realm.cz\0" -"\xe5\xba\x83\xe5\xb3\xb6.jp\0" -"b.se\0" -"myactivedirectory.com\0" -"sony\0" -"ookuwa.nagano.jp\0" -"berlin\0" -"xj.cn\0barletta-trani-andria.it\0is-a-painter.com\0" -"annaka.gunma.jp\0tsukui.kanagawa.jp\0" -"towada.aomori.jp\0" -"deporte.bo\0fukuyama.hiroshima.jp\0gent\0does-it.net\0" -"bieszczady.pl\0" -"b\xc3\xa1hccavuotna.no\0" -"kikuchi.kumamoto.jp\0surrey.museum\0piaget\0" -"tos.it\0" -"barsy.club\0" -"name.tj\0" -"republican\0" -"aquarelle\0dunlop\0" -"nakagawa.nagano.jp\0" -"environment.museum\0" -"per.sg\0" -"name.tr\0" -"verm\xc3\xb6gensberatung\0customer.enonic.io\0" -"samukawa.kanagawa.jp\0name.tt\0ericsson\0" -"compare\0" -"katagami.akita.jp\0" -"elburg.museum\0blogspot.co.za\0" -"mashiko.tochigi.jp\0imizu.toyama.jp\0" -"seika.kyoto.jp\0gildesk\xc3\xa5l.no\0" -"station.museum\0" -"elvendrell.museum\0" -"kitashiobara.fukushima.jp\0" -"nic.in\0iglesiascarbonia.it\0" -"sunagawa.hokkaido.jp\0bu.no\0" -"com\0\xe9\x9d\x92\xe6\xa3\xae.jp\0" -"ollo\0" -"kashiwa.chiba.jp\0otobe.hokkaido.jp\0" -"shibuya.tokyo.jp\0halsa.no\0\xd0\xbc\xd0\xbe\xd1\x81\xd0\xba\xd0\xb2\xd0\xb0\0*.cns.joyent.com\0" -"catering.aero\0dyn-ip24.de\0" -"s3.dualstack.ap-south-1.amazonaws.com\0" -"\xe7\xbd\x91\xe7\xb5\xa1.hk\0okoppe.hokkaido.jp\0" -"chosei.chiba.jp\0" -"agdenes.no\0\xe5\x85\xab\xe5\x8d\xa6\0" -"vana\0" -"riobranco.br\0" -"cam.it\0canon\0" -"airtel\0" -"vb.it\0" -"higashinaruse.akita.jp\0" -"pizza\0" -"fjell.no\0dad\0myjino.ru\0" -"career\0" -"\xe5\x8f\xb0\xe6\xb9\xbe\0" -"kitaakita.akita.jp\0kr.ua\0*.quipelements.com\0" -"nanmoku.gunma.jp\0musashimurayama.tokyo.jp\0" -"joetsu.niigata.jp\0" -"s3.dualstack.ap-southeast-1.amazonaws.com\0" -"k12.va.us\0" -"macapa.br\0ehime.jp\0" +"sc.cn\0higashiosaka.osaka.jp\0" +"pars\0" +"philadelphia.museum\0lima-city.de\0" +"lib.nv.us\0" +"nakagawa.fukuoka.jp\0" +"\xe4\xb8\xaa\xe4\xba\xba.hk\0nordkapp.no\0" +"aero.mv\0" +"baltimore.museum\0" +"arts.nf\0" +"shiksha\0" +"nym.ro\0" +"pro.om\0" +"eu-2.evennode.com\0" +"google\0" +"nisshin.aichi.jp\0oyamazaki.kyoto.jp\0higashimatsuyama.saitama.jp\0" +"vallee-d-aoste.it\0serveblog.net\0" +"agro.pl\0agrinet.tn\0" +"\xe3\x82\xb0\xe3\x83\xbc\xe3\x82\xb0\xe3\x83\xab\0verm\xc3\xb6gensberatung\0loginto.me\0nym.sk\0" +"kiyokawa.kanagawa.jp\0kagamino.okayama.jp\0" +"zt.ua\0" +"barletta-trani-andria.it\0lima-city.at\0" +"aeroport.fr\0" +"kikonai.hokkaido.jp\0shell\0boomla.net\0" +"nym.su\0" +"pro.pr\0" "yokohama\0" -"radoy.no\0" -"kiyama.saga.jp\0j\xc3\xb8lster.no\0" -"estate.museum\0serveminecraft.net\0" -"reg.dk\0" -"name.qa\0" -"name.pr\0day\0" -"yoshino.nara.jp\0" -"fedorapeople.org\0" -"gunma.jp\0vestv\xc3\xa5g\xc3\xb8y.no\0" -"lombardy.it\0gamo.shiga.jp\0my-gateway.de\0" -"mango\0" -"reisen\0is-an-accountant.com\0" -"crs\0csc\0" -"name.na\0fedorainfracloud.org\0" -"nagara.chiba.jp\0utashinai.hokkaido.jp\0creditcard\0" -"joyo.kyoto.jp\0katowice.pl\0" -"s3.amazonaws.com\0" -"name.mv\0" -"mihama.fukui.jp\0name.ng\0support\0" -"!city.kitakyushu.jp\0name.my\0company\0" -"8.bg\0" -"vix.br\0computerhistory.museum\0" -"fujimi.nagano.jp\0" -"contractors\0" -"nakai.kanagawa.jp\0\xd9\x85\xd9\x84\xd9\x8a\xd8\xb3\xd9\x8a\xd8\xa7\0" -"miyako.iwate.jp\0" -"okawa.fukuoka.jp\0gujo.gifu.jp\0" -"kids.us\0" -"campidano-medio.it\0mishima.fukushima.jp\0" -"nj.us\0" -"karuizawa.nagano.jp\0dds\0groks-the.info\0" -"lu.it\0me.it\0" -"dyndns-ip.com\0" -"campinagrande.br\0education.museum\0" -"trentin-su\xcc\x88""dtirol.it\0sekigahara.gifu.jp\0moss.no\0" -"makeup\0" -"bible.museum\0" -"parachuting.aero\0chikugo.fukuoka.jp\0chernivtsi.ua\0" -"us-west-2.elasticbeanstalk.com\0" -"ballooning.aero\0" -"galsa.no\0gok.pk\0cbre\0wedeploy.io\0" -"bjark\xc3\xb8y.no\0\xe3\x82\xbb\xe3\x83\xbc\xe3\x83\xab\0from-tx.com\0" -"sumoto.kumamoto.jp\0" -"me.ke\0dev\0" -"grosseto.it\0" -"sevastopol.ua\0" -"yakage.okayama.jp\0" -"abiko.chiba.jp\0name.mk\0" +"jobs.tt\0nym.sx\0" +"club.aero\0journalism.museum\0symantec\0" +"takamori.nagano.jp\0" +"kamigori.hyogo.jp\0" +"github.io\0" +"reviews\0" +"ariake.saga.jp\0lima-city.ch\0" +"trentinos\xc3\xbc""dtirol.it\0" +"mysecuritycamera.org\0nym.tw\0" +"inzai.chiba.jp\0verisign\0" +"nakagyo.kyoto.jp\0" +"surf\0" +"k12.tn.us\0" +"apps.lair.io\0" +"risor.no\0" +"finn\xc3\xb8y.no\0" +"kafjord.no\0" +"ujitawara.kyoto.jp\0""64-b.it\0" +"eu-1.evennode.com\0" +"hamburg\0dvrcam.info\0" +"minamiaiki.nagano.jp\0" +"mt.eu.org\0" +"abogado\0" +"shimokawa.hokkaido.jp\0" +"ninomiya.kanagawa.jp\0hatogaya.saitama.jp\0" +"batsfjord.no\0" +"kamikoani.akita.jp\0" +"\xd9\x85\xd9\x84\xd9\x8a\xd8\xb3\xd9\x8a\xd8\xa7\0lenug.su\0" +"samnanger.no\0" +"gs.ol.no\0glade\0" +"pro.tt\0\xd9\xbe\xd8\xa7\xd9\x83\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0" +"hn.cn\0" +"mihama.chiba.jp\0" +"stavern.no\0" +"bs.it\0kuji.iwate.jp\0kisosaki.mie.jp\0" +"tydal.no\0\xe5\x85\xac\xe5\x8f\xb8.\xe9\xa6\x99\xe6\xb8\xaf\0" +"cv.ua\0" +"sakado.saitama.jp\0hospital\0" +"sc.ke\0" +"rec.nf\0" +"takatsuki.shiga.jp\0" +"\xe7\xb5\x84\xe7\xb9\x94.\xe9\xa6\x99\xe6\xb8\xaf\0teva\0square7.de\0" +"yuasa.wakayama.jp\0" +"choshi.chiba.jp\0" +"shiroishi.miyagi.jp\0tottori.tottori.jp\0sc.kr\0pro.vn\0thruhere.net\0" +"balashov.su\0cust.disrec.thingdust.io\0" +"tw.cn\0yawara.ibaraki.jp\0" +"lib.pr.us\0" +"kitamoto.saitama.jp\0" +"hurdal.no\0sling\0" +"chonan.chiba.jp\0endofinternet.net\0" +"githubusercontent.com\0" +"sc.ls\0sogndal.no\0" +"judaica.museum\0" +"heguri.nara.jp\0" +"cc.sc.us\0" +"wajima.ishikawa.jp\0" +"sec.ps\0" +"masaki.ehime.jp\0augustow.pl\0" +"imdb\0" +"\xd1\x83\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0hdfcbank\0" +"landrover\0" +"costume.museum\0" +"*.compute.amazonaws.com.cn\0" +"history.museum\0alsace\0" +"karatsu.saga.jp\0" +"fukushima.fukushima.jp\0nabari.mie.jp\0" +"skype\0" +"cc.na\0" +"le.it\0rifu.miyagi.jp\0square7.ch\0" +"fla.no\0watches\0backplaneapp.io\0definima.io\0" +"mikasa.hokkaido.jp\0" +"nyc.museum\0" +"seranishi.hiroshima.jp\0nakatane.kagoshima.jp\0" +"aya.miyazaki.jp\0custom.metacentrum.cz\0" +"its.me\0harvestcelebration.museum\0abo.pa\0o.se\0" +"limanowa.pl\0" +"corvette.museum\0" +"artsandcrafts.museum\0watchandclock.museum\0pors\xc3\xa1\xc5\x8bgu.no\0vard\xc3\xb8.no\0" +"naruto.tokushima.jp\0" +"devices.resinstaging.io\0" +"rec.ro\0accenture\0" +"boston.museum\0sciences.museum\0" +"takayama.gifu.jp\0abashiri.hokkaido.jp\0" +"dyndns-wiki.com\0" +"solutions\0" +"minamata.kumamoto.jp\0" +"s\xc3\xb8r-aurdal.no\0" +"ibaraki.ibaraki.jp\0" +"fantasyleague.cc\0" +"vet.br\0\xe5\xb2\xa9\xe6\x89\x8b.jp\0inabe.mie.jp\0" +"pila.pl\0" +"balestrand.no\0hornindal.no\0" +"virgin\0" +"hepforge.org\0" +"ukiha.fukuoka.jp\0" +"ol.no\0" +"ufcfan.org\0" +"ino.kochi.jp\0" +"farmstead.museum\0" +"community.museum\0land-4-sale.us\0" +"kaneyama.yamagata.jp\0" +"topology.museum\0\xc3\xa1laheadju.no\0aurskog-h\xc3\xb8land.no\0" +"tec.ve\0" +"kumakogen.ehime.jp\0ujiie.tochigi.jp\0" +"idrett.no\0" +"esp.br\0" +"is-a-guru.com\0" +"ikawa.akita.jp\0kamitsue.oita.jp\0" +"\xe7\xb6\xb2\xe7\xb5\xa1.\xe9\xa6\x99\xe6\xb8\xaf\0" +"alt.za\0xnbay.com\0" +"ragusa.it\0" +"scienceandindustry.museum\0holmestrand.no\0lib.wi.us\0" +"minokamo.gifu.jp\0chikusei.ibaraki.jp\0definima.net\0" +"uz.ua\0" +"cal.it\0" +"trento.it\0twmail.net\0" +"aero\0halsa.no\0" +"\xe5\xae\xae\xe5\xb4\x8e.jp\0" +"rec.ve\0nohost.me\0" +"mifune.kumamoto.jp\0" +"skj\xc3\xa5k.no\0my.eu.org\0" +"kuzumaki.iwate.jp\0" +"net.ac\0academia.bo\0s3-ca-central-1.amazonaws.com\0" +"dnsking.ch\0" +"net.ae\0" +"net.af\0umb.it\0" +"net.ag\0alaheadju.no\0hobol.no\0aaa\0" +"ojiya.niigata.jp\0yamanakako.yamanashi.jp\0" +"net.ai\0communication.museum\0grong.no\0" +"net.al\0imb.br\0cartier\0" +"juif.museum\0bardu.no\0surnadal.no\0accesscam.org\0" +"read\0" +"net.ba\0kaluga.su\0" +"net.ar\0net.bb\0aquila.it\0kuriyama.hokkaido.jp\0" +"inazawa.aichi.jp\0chat\0" +"net.au\0" +"hemne.no\0" +"net.bh\0abb\0" +"windmill.museum\0spydeberg.no\0abc\0ditchyourip.com\0" +"net.az\0citadel\0" +"pccw\0" +"okagaki.fukuoka.jp\0ginowan.okinawa.jp\0" +"net.bm\0" +"net.bn\0takazaki.miyazaki.jp\0" +"net.bo\0askim.no\0l\xc3\xb8renskog.no\0sc.ug\0" "ap.it\0" -"tm.cy\0center.museum\0belau.pw\0" -"cc.ak.us\0" +"deals\0" +"net.br\0sc.tz\0" +"net.bs\0k12.al.us\0cc.ua\0" +"net.bt\0tainai.niigata.jp\0kakinoki.shimane.jp\0pcloud.host\0" +"stuff-4-sale.us\0" "gobo.wakayama.jp\0" -"ma.gov.br\0" -"pr.us\0" -"oshima.tokyo.jp\0no.com\0" -"\xe5\x9c\xa8\xe7\xba\xbf\0" -"taxi.br\0" -"columbus.museum\0" -"hamura.tokyo.jp\0utsira.no\0" -"minami.fukuoka.jp\0swinoujscie.pl\0cc.oh.us\0" -"bjugn.no\0" -"is-a-libertarian.com\0" -"name.jo\0s3-website-eu-west-1.amazonaws.com\0dattolocal.net\0sopot.pl\0" -"noboribetsu.hokkaido.jp\0we.bs\0" -"enebakk.no\0" -"soka.saitama.jp\0mobi.tt\0dhl\0\xeb\x8b\xb7\xec\xbb\xb4\0" -"krager\xc3\xb8.no\0" -"mobi.tz\0" -"minamiboso.chiba.jp\0" -"taa.it\0omihachiman.shiga.jp\0" -"flowers\0" -"\xe5\xae\xae\xe5\xb4\x8e.jp\0nakijin.okinawa.jp\0" -"kamo.kyoto.jp\0" -"londrina.br\0" -"tm.fr\0\xe9\xb9\xbf\xe5\x85\x90\xe5\xb3\xb6.jp\0\xe5\xa8\xb1\xe4\xb9\x90\0" -"kosuge.yamanashi.jp\0eng.pro\0naturbruksgymn.se\0cc.dc.us\0" -"oceanographique.museum\0" -"myhome-server.de\0" -"re.it\0nic.tj\0" -"toki.gifu.jp\0hapmir.no\0diy\0" -"akabira.hokkaido.jp\0\xe5\x85\xac\xe5\x8f\xb8\0\xe6\x97\xb6\xe5\xb0\x9a\0" -"uk.com\0" -"\xe3\x81\xbf\xe3\x82\x93\xe3\x81\xaa\0is-a-blogger.com\0" -"yamagata.gifu.jp\0tosa.kochi.jp\0fusa.no\0" -"psse.gov.pl\0" -"valleaosta.it\0ma.leg.br\0" -"stord.no\0" -"settlers.museum\0" -"gaivuotna.no\0" -"u.se\0s3-eu-west-2.amazonaws.com\0" -"nhs.uk\0" -"cesenaforli\xcc\x80.it\0" -"wolterskluwer\0" -"events\0" -"church\0" -"tm.hu\0ushiku.ibaraki.jp\0glas.museum\0" -"kafjord.no\0gu.us\0" -"aejrie.no\0computer\0" -"iselect\0" -"como.it\0re.kr\0komvux.se\0" -"utazas.hu\0" -"kurobe.toyama.jp\0" -"engineer.aero\0" -"duck\0travelchannel\0" -"from-ia.com\0" -"*.s5y.io\0" -"franziskaner.museum\0" -"omasvuotna.no\0" -"baseball\0" -"tawaramoto.nara.jp\0" -"lecce.it\0" -"pub.sa\0" -"mobi.na\0spot\0" -"midtre-gauldal.no\0" -"toyono.osaka.jp\0" -"k12.tn.us\0catering\0" -"asakawa.fukushima.jp\0pharmaciens.km\0nyc.museum\0mobi.ng\0" -"freeboxos.fr\0" -"realty\0" -"yakumo.shimane.jp\0" -"oshu.iwate.jp\0" -"usa.museum\0" -"trolley.museum\0skanland.no\0" +"takikawa.hokkaido.jp\0" +"net.ci\0" +"net.bz\0my.id\0" +"sc.us\0" +"net.cm\0energy\0" +"net.cn\0konan.aichi.jp\0biratori.hokkaido.jp\0" +"net.co\0coupons\0" +"ownip.net\0gotdns.ch\0" +"gonohe.aomori.jp\0inawashiro.fukushima.jp\0jp.net\0" +"net.cu\0coloradoplateau.museum\0giessen.museum\0aco\0" +"act.edu.au\0net.cw\0" +"shimodate.ibaraki.jp\0" +"net.cy\0" +"hjelmeland.no\0" +"net.dm\0" +"net.do\0" +"joinville.br\0" +"unj\xc3\xa1rga.no\0immo\0\xe5\xa4\xa7\xe6\x8b\xbf\0dyndns-web.com\0" +"net.ec\0rennesoy.no\0" +"komvux.se\0" +"net.eg\0memorial.museum\0" +"ads\0science\0" +"net.dz\0minato.tokyo.jp\0" +"aeg\0" +"quest\0" +"cymru.museum\0" +"trentin-s\xc3\xbc""d-tirol.it\0" +"muenchen.museum\0" +"net.et\0" +"h\xc3\xa1""bmer.no\0" +"yonabaru.okinawa.jp\0" +"loyalist.museum\0" +"galsa.no\0s3-website-sa-east-1.amazonaws.com\0" +"from-nv.com\0" +"trentino-s\xc3\xbc""dtirol.it\0" +"nl.eu.org\0" +"england.museum\0" +"afl\0" +"comunica\xc3\xa7\xc3\xb5""es.museum\0" +"theater\0" +"net.ge\0" +"yamaga.kumamoto.jp\0" +"urn.arpa\0net.gg\0" +"bozen-suedtirol.it\0honjyo.akita.jp\0" +"vik.no\0" +"net.gl\0" +"rindal.no\0glass\0" +"net.gn\0" +"tvedestrand.no\0internet-dns.de\0" +"net.gp\0kozaki.chiba.jp\0rzgw.gov.pl\0ravendb.run\0" +"dontexist.org\0" +"net.gr\0nishimera.miyazaki.jp\0" +"net.gt\0" +"net.gu\0" +"alabama.museum\0" +"net.gy\0asso.eu.org\0freeddns.us\0" +"net.hk\0gs.st.no\0fairwinds\0africa.com\0" +"morena.br\0" +"net.hn\0minamimaki.nagano.jp\0" +"tagami.niigata.jp\0nakagawa.tokushima.jp\0" +"name\0my-router.de\0" +"net.ht\0net.id\0" +"m.bg\0" +"eu-west-1.elasticbeanstalk.com\0" +"net.il\0" +"net.im\0stathelle.no\0aig\0" +"net.in\0modena.it\0" +"from-wv.com\0" +"net.iq\0\xc3\xa5lg\xc3\xa5rd.no\0hoteles\0" +"net.ir\0williamhill\0" +"net.is\0newspaper.museum\0" +"niteroi.br\0" +"net.je\0jewelry\0" +"chuo.osaka.jp\0" +"ap-southeast-1.elasticbeanstalk.com\0us-west-1.elasticbeanstalk.com\0" +"hirono.fukushima.jp\0" +"uri.arpa\0guernsey.museum\0lancashire.museum\0sn\xc3\xa5""ase.no\0" +"soma.fukushima.jp\0onomichi.hiroshima.jp\0urausu.hokkaido.jp\0" +"barreau.bj\0" +"fujioka.gunma.jp\0komatsushima.tokushima.jp\0reit\0" +"net.jo\0police.uk\0" +"niiza.saitama.jp\0" +"isa-geek.org\0" +"la-spezia.it\0" +"sm\xc3\xb8la.no\0barsy.info\0" +"travelers\0" +"ct.it\0kitagata.gifu.jp\0crown\0" +"net.kg\0valle.no\0" +"samegawa.fukushima.jp\0" +"net.ki\0is-an-accountant.com\0" +"nowtv\0" +"in-addr.arpa\0" +"6.bg\0" +"oamishirasato.chiba.jp\0tarama.okinawa.jp\0net.kn\0" +"net.la\0" +"lucca.it\0net.lb\0" +"net.lc\0" +"net.kw\0" +"midori.gunma.jp\0sayama.saitama.jp\0mincom.tn\0" +"net.ky\0encyclopedic.museum\0*.0emm.com\0" +"net.kz\0" +"net.lk\0" +"dgca.aero\0" +"shirataka.yamagata.jp\0kinder\0" +"ng.eu.org\0" +"net.ma\0air.museum\0" +"ogawa.nagano.jp\0net.lr\0" +"net.ls\0is-a-socialist.com\0co.network\0" +"net.me\0courses\0" +"ichinomiya.chiba.jp\0kishiwada.osaka.jp\0net.lv\0" +"sa.au\0fortmissoula.museum\0" +"emb.kw\0net.ly\0" +"net.mk\0lib.as.us\0luxury\0" +"osaki.miyagi.jp\0net.ml\0" +"hamura.tokyo.jp\0capital\0" +"net.mo\0" +"info\0" +"oishida.yamagata.jp\0" +"net.ms\0eigersund.no\0" +"biella.it\0net.mt\0" +"net.mu\0" +"net.mv\0net.nf\0" +"virtual.museum\0net.mw\0net.ng\0" +"net.mx\0" +"net.my\0net.ni\0cc.ct.us\0" +"net.mz\0" +"torino.museum\0" +"uruma.okinawa.jp\0stalowa-wola.pl\0azure-mobile.net\0" +"aarborte.no\0dnsfor.me\0" +"odesa.ua\0" +"nanbu.yamanashi.jp\0net.nr\0" +"sa.cr\0" +"lib.oh.us\0" +"st.no\0" +"taiji.wakayama.jp\0" +"net.nz\0" +"couchpotatofries.org\0" +"search\0" +"net.om\0" +"pinb.gov.pl\0rent\0" +"game-server.cc\0" +"anz\0" +"net.pa\0" +"aol\0" +"friuli-veneziagiulia.it\0oiso.kanagawa.jp\0muika.niigata.jp\0" +"artgallery.museum\0handson.museum\0net.pe\0on-aptible.com\0" +"enna.it\0" +"honefoss.no\0press\0" +"net.ph\0etisalat\0" +"s\xc3\xb8rum.no\0net.pk\0" +"net.pl\0" +"wios.gov.pl\0net.pn\0" +"servepics.com\0" +"marugame.kagawa.jp\0" +"net.qa\0" +"joso.ibaraki.jp\0tsubame.niigata.jp\0net.pr\0" +"net.ps\0myfirewall.org\0" +"bergamo.it\0rishirifuji.hokkaido.jp\0ina.nagano.jp\0kokubunji.tokyo.jp\0net.pt\0" +"sweetpepper.org\0" +"app\0" +"benevento.it\0" +"net.py\0" +"akita.akita.jp\0" +"s3-website-ap-northeast-1.amazonaws.com\0" +"forgot.her.name\0" "shinshiro.aichi.jp\0" -"tm.km\0" -"vistaprint\0" +"scotland.museum\0" +"\xe5\x85\xb5\xe5\xba\xab.jp\0" +"sassari.it\0okuma.fukushima.jp\0" +"mypi.co\0" +"numazu.shizuoka.jp\0\xe7\xbb\x84\xe7\xbb\x87\xe6\x9c\xba\xe6\x9e\x84\0" +"ris\xc3\xb8r.no\0" +"fuefuki.yamanashi.jp\0bar\0" +"bbc\0" +"toscana.it\0atsugi.kanagawa.jp\0settsu.osaka.jp\0kusatsu.shiga.jp\0yamada.toyama.jp\0" +"\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x90\xe0\xb8\x9a\xe0\xb8\xb2\xe0\xb8\xa5.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" +"omitama.ibaraki.jp\0" +"net.sa\0kindle\0" +"net.sb\0" +"net.sc\0" +"net.sd\0dunlop\0" +"net.ru\0myftp.org\0" +"sekikawa.niigata.jp\0" +"hemsedal.no\0net.rw\0net.sg\0navy\0" +"niimi.okayama.jp\0net.sh\0" +"kamifurano.hokkaido.jp\0art\0bbt\0" +"kumejima.okinawa.jp\0net.sl\0" +"broker.aero\0bcg\0" +"fet.no\0net.so\0nsupdate.info\0" +"dagestan.ru\0" +"property\0" +"iki.nagasaki.jp\0net.st\0bcn\0" +"prof.pr\0net.th\0walter\0" +"net.sy\0" +"net.tj\0" +"sor-varanger.no\0net.tm\0" +"net.tn\0rest\0" +"net.to\0" +"unjarga.no\0net.ua\0dagestan.su\0" +"net.tr\0" +"cargo.aero\0" +"aizubange.fukushima.jp\0kamo.niigata.jp\0net.tt\0" +"society.museum\0ebiz.tw\0" +"sa.it\0" +"net.tw\0localhost.daplie.me\0" +"net.uk\0cards\0organic\0" +"hl.cn\0\xd0\xba\xd0\xbe\xd0\xbc\0""32-b.it\0" +"diamonds\0" +"naganohara.gunma.jp\0" +"vennesla.no\0blogdns.org\0" +"ca.it\0" +"lib.co.us\0" +"kyotango.kyoto.jp\0" +"safety.aero\0net.vc\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\xe0\xa4\xae\xe0\xa5\x8d\0cyon.link\0" +"sandvikcoromant\0" +"net.ve\0" +"koge.tottori.jp\0guardian\0" +"hof.no\0net.uy\0net.vi\0" +"net.uz\0bet\0" +"sakae.chiba.jp\0" +"net.vn\0" +"ekloges.cy\0bryne.no\0kpmg\0" +"dyndns-home.com\0" +"\xe5\xa4\xa7\xe5\x88\x86.jp\0higashimatsushima.miyagi.jp\0" +"gmbh\0\xe7\xa7\xbb\xe5\x8a\xa8\0" +"ct.us\0net.vu\0" +"wsa.gov.pl\0" +"gemological.museum\0" +"pistoia.it\0travel.pl\0" +"realtor\0" +"vindafjord.no\0k12.mn.us\0viajes\0" "tysnes.no\0" -"pp.az\0pors\xc3\xa1\xc5\x8bgu.no\0" -"even\xc3\xa1\xc5\xa1\xc5\xa1i.no\0dnp\0tickets\0" -"datsun\0home-webserver.de\0" -"valer.ostfold.no\0blogsite.xyz\0" -"murmansk.su\0brasilia.me\0" -"dog\0schule\0" -"vic.au\0" -"space.museum\0" -"takata.fukuoka.jp\0zero\0" -"sel.no\0" -"shimokitayama.nara.jp\0tm.mc\0brandywinevalley.museum\0" -"nuremberg.museum\0homegoods\0kiwi\0ap-northeast-2.elasticbeanstalk.com\0" -"tm.mg\0" -"bergamo.it\0dot\0" -"from-tn.com\0" -"yatomi.aichi.jp\0narita.chiba.jp\0drobak.no\0" -"transport.museum\0" -"carrara-massa.it\0" -"me.tz\0wanggou\0" -"me.uk\0" -"gs.jan-mayen.no\0" -"ichinomiya.chiba.jp\0" -"uenohara.yamanashi.jp\0" -"me.us\0" -"ushuaia.museum\0" -"bizen.okayama.jp\0" -"koori.fukushima.jp\0" -"ac\0aarp\0" -"ad\0tm.no\0" -"ae\0orskog.no\0" +"net.ws\0" +"axa\0place\0visa\0isa-geek.com\0" +"civilisation.museum\0aws\0u2-local.xnbay.com\0" +"ppg.br\0" +"\xe5\x95\x86\xe5\xba\x97\0" +"kami.kochi.jp\0sado.niigata.jp\0" +"cc.ca.us\0kerrylogistics\0" +"puglia.it\0" +"siljan.no\0" +"toyohashi.aichi.jp\0" +"xfinity\0" +"lomza.pl\0bid\0" +"evenes.no\0" +"monmouth.museum\0ca.na\0" +"lc.it\0" +"lib.nm.us\0" +"cloudaccess.net\0" +"gs.hl.no\0lv.ua\0net.za\0""1337.pictures\0" +"iwafune.tochigi.jp\0tokushima.tokushima.jp\0" +"bio\0inc.hk\0" +"m.se\0online\0" +"seven\0" +"sukumo.kochi.jp\0" +"net.zm\0" +"rochester.museum\0dynserv.org\0" +"biz\0watari.miyagi.jp\0" +"tokyo\0" +"yasuoka.nagano.jp\0" +"koshigaya.saitama.jp\0tjmaxx\0" +"democracia.bo\0" +"tur.ar\0" +"stavanger.no\0theatre\0viva\0myds.me\0" +"bilbao.museum\0webcam\0" +"tienda\0" +"hashimoto.wakayama.jp\0" +"cosenza.it\0" +"louvre.museum\0askoy.no\0boxfuse.io\0" +"travel.tt\0" +"\xd0\xb1\xd0\xb3\0is-a-celticsfan.org\0" +"vivo\0cleverapps.io\0" +"riopreto.br\0tur.br\0" +"walmart\0" +"manchester.museum\0" +"asahi.nagano.jp\0" +"valer.hedmark.no\0fh.se\0" +"wiki.bo\0cc.ks.us\0\xe8\xb4\xad\xe7\x89\xa9\0" +"homeip.net\0" +"wiki.br\0imakane.hokkaido.jp\0" +"snoasa.no\0" +"kumagaya.saitama.jp\0" +"tromsa.no\0" +"hob\xc3\xb8l.no\0" +"ecn.br\0koza.wakayama.jp\0" +"krym.ua\0" +"filegear-de.me\0" +"toyama.toyama.jp\0" +"rygge.no\0istmein.de\0" +"jewish.museum\0usgarden.museum\0raisa.no\0endofinternet.org\0" +"bms\0" +"ryokami.saitama.jp\0" +"\xe0\xb8\x84\xe0\xb8\xad\xe0\xb8\xa1\0" +"haugesund.no\0bmw\0" +"homeunix.net\0" +"asn.au\0" +"messina.it\0bnl\0" +"lazio.it\0" +"*.in.futurecms.at\0" +"val-d-aosta.it\0pa.leg.br\0" +"\xe9\xa3\x9e\xe5\x88\xa9\xe6\xb5\xa6\0" +"gorlice.pl\0" +"assn.lk\0bom\0" +"kanna.gunma.jp\0" +"timekeeping.museum\0boo\0" +"ardal.no\0" +"monza.it\0fukuoka.jp\0" +"tksat.bo\0" +"an.it\0bot\0" +"sandnessjoen.no\0" +"calvinklein\0report\0" +"hl.no\0\xe9\x9b\xbb\xe8\xa8\x8a\xe7\x9b\x88\xe7\xa7\x91\0" +"genova.it\0box\0" +"epilepsy.museum\0geology.museum\0casino\0" +"pordenone.it\0" +"ostroda.pl\0" +"tana.no\0" +"tochigi.tochigi.jp\0" +"opole.pl\0" +"sucks\0" +"cab\0" +"artanddesign.museum\0" +"webredirect.org\0" +"kashiwa.chiba.jp\0pb.leg.br\0" +"tele.amune.org\0dnsalias.com\0" +"kiwi.nz\0\xd0\xb5\xd1\x8e\0honeywell\0" +"ca.us\0" +"cal\0" +"space.museum\0cam\0" +"rankoshi.hokkaido.jp\0rawa-maz.pl\0" +"zama.kanagawa.jp\0" +"k12.mi.us\0cba\0" +"car\0" +"journalist.aero\0synology-ds.de\0" +"cat\0" +"rehab\0" +"r\xc3\xb8mskog.no\0" +"dynv6.net\0" +"tychy.pl\0" +"cbn\0" +"\xe3\x82\xbb\xe3\x83\xbc\xe3\x83\xab\0" +"cbs\0stuff-4-sale.org\0" +"shell.museum\0cloud.fedoraproject.org\0" +"sport\0" +"rsc.cdn77.org\0" +"omachi.nagano.jp\0" +"biev\xc3\xa1t.no\0tennis\0tiaa\0" +"ichinoseki.iwate.jp\0" +"time.museum\0" +"trading.aero\0" +"citi\0from-ma.com\0" +"ks.ua\0twmail.org\0synology-diskstation.de\0" +"anani.br\0dupont\0" +"\xd0\xb8\xd0\xba\xd0\xbe\xd0\xbc.museum\0" +"jpmorgan\0router.management\0" +"lincoln\0lixil\0" +"valle-aosta.it\0ceb\0" +"city\0" +"nuoro.it\0iheya.okinawa.jp\0" +"saitama.jp\0kamimine.saga.jp\0" +"ks.us\0" +"nakano.nagano.jp\0" +"patria.bo\0md.ci\0" +"ceo\0" +"cfa\0from-pa.com\0" +"tono.iwate.jp\0r.cdn77.net\0" +"artdeco.museum\0civilization.museum\0bodo.no\0kiev.ua\0" +"fujisato.akita.jp\0obama.nagasaki.jp\0cfd\0" +"int.ar\0" +"klabu.no\0radio\0" +"buy\0" +"ddnsgeek.com\0servesarcasm.com\0" +"olbia-tempio.it\0" +"k.bg\0\xc3\xb8rsta.no\0skodje.no\0" +"int.az\0otsuki.kochi.jp\0""16-b.it\0" +"mine.nu\0" +"naie.hokkaido.jp\0" +"int.bo\0algard.no\0" +"trentino-s\xc3\xbc""d-tirol.it\0" +"khakassia.su\0" +"kure.hiroshima.jp\0land\0" +"s\xc3\xb8rfold.no\0" +"kaisei.kanagawa.jp\0ohira.tochigi.jp\0" +"grane.no\0codespot.com\0" +"shikabe.hokkaido.jp\0targi.pl\0" +"takayama.nagano.jp\0itoigawa.niigata.jp\0zachpomor.pl\0" +"empresa.bo\0int.ci\0" +"mochizuki.nagano.jp\0" +"is-very-good.org\0webhop.org\0" +"fortal.br\0sr.it\0\xda\x80\xd8\xa7\xd8\xb1\xd8\xaa\0" +"per.la\0" +"int.co\0gjerdrum.no\0" +"vanguard\0" +"saltdal.no\0" +"magazine.aero\0" +"sciencesnaturelles.museum\0\xc3\xa5snes.no\0" +"cr.it\0" +"bievat.no\0lib.fl.us\0" +"obihiro.hokkaido.jp\0" +"ringebu.no\0cc.wi.us\0" +"4.bg\0" +"higashi.fukuoka.jp\0" +"l\xc3\xb8""dingen.no\0est-le-patron.com\0" +"mod.gi\0naturalhistorymuseum.museum\0hemnes.no\0" +"tadotsu.kagawa.jp\0" +"missoula.museum\0supply\0cable-modem.org\0" +"schmidt\0dynu.net\0nerdpol.ovh\0" +"getmyip.com\0" +"asn.lv\0" +"zapto.org\0" +"kyowa.akita.jp\0now.sh\0" +"lancome\0" +"odo.br\0shunan.yamaguchi.jp\0per.nf\0" +"nsn.us\0" +"salvador.br\0omaezaki.shizuoka.jp\0bzh\0" +"circus.museum\0" +"unnan.shimane.jp\0" +"gripe\0" +"shriram\0" +"cnt.br\0nikaho.akita.jp\0meiwa.gunma.jp\0" +"omega\0otsuka\0" +"toyoake.aichi.jp\0omura.nagasaki.jp\0" +"extraspace\0" +"game-host.org\0" +"udine.it\0\xd1\x80\xd1\x84\0" +"bulsan-suedtirol.it\0iglesiascarbonia.it\0" +"niki.hokkaido.jp\0" +"from-va.com\0" +"noshiro.akita.jp\0agano.niigata.jp\0" +"vega.no\0" +"lt.it\0suwalki.pl\0" +"yahiko.niigata.jp\0" +"usarts.museum\0hoyanger.no\0from-wa.com\0" +"oita.oita.jp\0" +"\xe3\x81\xbf\xe3\x82\x93\xe3\x81\xaa\0" +"childrensgarden.museum\0" +"tarnobrzeg.pl\0\xe0\xa6\xac\xe0\xa6\xbe\xe0\xa6\x82\xe0\xa6\xb2\xe0\xa6\xbe\0" +"tajiri.osaka.jp\0toyono.osaka.jp\0" +"auto.pl\0cloudycluster.net\0" +"compare\0" +"barsy.club\0" +"r\xc3\xb8yrvik.no\0kids.us\0" +"trentinoaadige.it\0" +"saga.saga.jp\0" +"gs.vf.no\0zp.ua\0" +"tokyo.jp\0stargard.pl\0kred\0" +"int.is\0" +"nx.cn\0molise.it\0isa-geek.net\0" +"im.it\0" +"hyogo.jp\0toei.aichi.jp\0" +"vaga.no\0" +"jelenia-gora.pl\0" +"kvalsund.no\0" +"pi.leg.br\0" +"pilot.aero\0per.sg\0" +"trieste.it\0shimizu.hokkaido.jp\0seika.kyoto.jp\0" +"television.museum\0" +"coupon\0" +"bykle.no\0cc.md.us\0" +"com\0dscloud.mobi\0" +"dattoweb.com\0" +"tr.eu.org\0" +"tamba.hyogo.jp\0dynalias.net\0" +"int.la\0" +"teramo.it\0" +"lyngen.no\0" +"shimotsuke.tochigi.jp\0" +"secure\0" +"americanantiques.museum\0" +"cooking\0" +"\xd0\xbc\xd0\xba\xd0\xb4\0" +"int.lk\0ambulance.museum\0" +"takashima.shiga.jp\0" +"unusualperson.com\0" +"tushu\0" +"dad\0" +"2000.hu\0luroy.no\0" +"iamallama.com\0" +"radio.br\0" +"romsa.no\0" +"wi.us\0" +"noheji.aomori.jp\0nowruz\0" +"ozu.ehime.jp\0" +"arna.no\0ro.im\0" +"xj.cn\0" +"ato.br\0" +"vagan.no\0day\0" +"ro.it\0int.mv\0construction\0freebox-os.fr\0" +"int.mw\0" +"int.ni\0" +"gz.cn\0capetown\0" +"company\0" +"qsl.br\0" +"alfaromeo\0crs\0csc\0video\0" +"sp.gov.br\0bo.it\0" +"anamizu.ishikawa.jp\0sakae.nagano.jp\0" +"cr.ua\0" +"cloudfunctions.net\0" +"siena.it\0" +"tips\0" +"ashiya.hyogo.jp\0" +"myactivedirectory.com\0" +"kaminoyama.yamagata.jp\0" +"from-ca.com\0" +"tobe.ehime.jp\0nikko.tochigi.jp\0sko.gov.pl\0" +"otago.museum\0washingtondc.museum\0" +"shiranuka.hokkaido.jp\0" +"oceanographic.museum\0rana.no\0" +"divtasvuodna.no\0" +"vf.no\0meloy.no\0k12.mt.us\0insurance\0" +"koebenhavn.museum\0aigo\0dds\0" +"oyer.no\0netlify.com\0" +"shakotan.hokkaido.jp\0" +"\xd0\xbc\xd0\xbe\xd0\xbd\0" +"int.pt\0" +"\xe6\x95\x99\xe8\x82\xb2.\xe9\xa6\x99\xe6\xb8\xaf\0" +"from-ia.com\0" +"hita.oita.jp\0" +"\xd0\xbe\xd0\xb1\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0" +"\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86\0" +"seihi.nagasaki.jp\0" +"geekgalaxy.com\0" +"taketa.oita.jp\0mutual\0" +"dev\0" +"research.aero\0mytis.ru\0" +"gratangen.no\0" +"mihara.kochi.jp\0gyokuto.kumamoto.jp\0" +"takaishi.osaka.jp\0so.gov.pl\0" +"from-ga.com\0" +"furubira.hokkaido.jp\0ayabe.kyoto.jp\0" +"lt.ua\0s3-website.eu-west-3.amazonaws.com\0" +"tateyama.chiba.jp\0ohira.miyagi.jp\0pe.leg.br\0" +"larvik.no\0verdal.no\0" +"geometre-expert.fr\0" +"int.ru\0" +"biz.bb\0" +"int.rw\0k.se\0" +"hakata.fukuoka.jp\0czest.pl\0biz.at\0" +"wildlife.museum\0spreadbetting\0" +"otaki.chiba.jp\0suzu.ishikawa.jp\0" +"mydobiss.com\0" +"stpetersburg.museum\0cc.oh.us\0zone\0diskstation.me\0" +"biz.az\0miasta.pl\0" +"ask\xc3\xb8y.no\0" +"yoshimi.saitama.jp\0" +"md.us\0physio\0" +"maebashi.gunma.jp\0" +"ferrara.it\0" +"dhl\0scrapper-site.net\0" +"ann-arbor.mi.us\0" +"int.tj\0" +"lifestyle\0" +"ishikawa.fukushima.jp\0" +"diskstation.eu\0" +"toyooka.hyogo.jp\0oi.kanagawa.jp\0" +"maringa.br\0\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86.ir\0" +"kragero.no\0vinnica.ua\0co.place\0" +"blogdns.net\0" +"int.tt\0" +"baidar.no\0\xd0\xbe\xd0\xb4.\xd1\x81\xd1\x80\xd0\xb1\0" +"biz.cy\0law.pro\0" +"biz.dk\0" +"fuchu.tokyo.jp\0for-some.biz\0" +"*.sch.uk\0cc.la.us\0" +"shintoku.hokkaido.jp\0" +"airport.aero\0study\0" +"int.ve\0diy\0grocery\0certmgr.org\0" +"hiphop\0" +"booking\0homeunix.org\0" +"matsushige.tokushima.jp\0" +"ts.it\0" +"wajiki.tokushima.jp\0int.vn\0" +"ltd.co.im\0" +"hawaii.museum\0" +"chikuzen.fukuoka.jp\0" +"est-a-la-masion.com\0" +"biz.et\0" +"marriott\0" +"apigee.io\0" +"yuu.yamaguchi.jp\0" +"natal.br\0hachinohe.aomori.jp\0" +"sayama.osaka.jp\0" +"9guacu.br\0budapest\0" +"camera\0" +"showa.gunma.jp\0" +"eating-organic.net\0" +"hirata.fukushima.jp\0" +"wales\0dnsdojo.org\0" +"snasa.no\0stream\0dontexist.com\0" +"kuokgroup\0\xd8\xb9\xd8\xb1\xd8\xa8\0" +"m\xc3\xa5s\xc3\xb8y.no\0" +"nishi.fukuoka.jp\0" +"ddnss.org\0" +"ritto.shiga.jp\0" +"n\xc3\xa6r\xc3\xb8y.no\0" +"al.it\0" +"isla.pr\0" +"ide.kyoto.jp\0" +"tecnologia.bo\0" +"biz.id\0" +"zaporizhzhia.ua\0" +"kppsp.gov.pl\0dnp\0" +"birkenes.no\0" +"omuta.fukuoka.jp\0" +"\xe6\x94\xbf\xe5\xba\x9c.\xe9\xa6\x99\xe6\xb8\xaf\0" +"carbonia-iglesias.it\0" +"arai.shizuoka.jp\0hokuto.yamanashi.jp\0" +"dog\0" +"nara.nara.jp\0" +"swidnica.pl\0" +"storage\0" +"from-ny.net\0" +"brussel.museum\0stordal.no\0" +"mitane.akita.jp\0" +"botanicgarden.museum\0asker.no\0" +"judygarland.museum\0" +"ne.jp\0yono.saitama.jp\0dot\0" +"hiji.oita.jp\0oshima.tokyo.jp\0futurehosting.at\0" +"pri.ee\0ne.ke\0atlanta.museum\0" +"gold\0" +"golf\0" +"oh.us\0" +"sr.gov.pl\0" +"como.it\0" +"biz.ki\0cc.al.us\0" +"sarufutsu.hokkaido.jp\0arida.wakayama.jp\0" +"mashiko.tochigi.jp\0chizu.tottori.jp\0bosch\0global\0beep.pl\0" +"izumizaki.fukushima.jp\0ne.kr\0pr.leg.br\0" +"samsung\0" +"realestate.pl\0" +"daito.osaka.jp\0asaka.saitama.jp\0" +"kiho.mie.jp\0" +"gloppen.no\0porsangu.no\0" +"snaase.no\0uk.eu.org\0" +"bologna.it\0eat\0" +"yaita.tochigi.jp\0" +"kawagoe.mie.jp\0kalisz.pl\0tourism.tn\0" +"al.no\0" +"biz.ls\0cc.ne.us\0is-a-liberal.com\0" +"mb.ca\0" +"higashikurume.tokyo.jp\0" +"kv\xc3\xa6nangen.no\0la.us\0" +"ginan.gifu.jp\0" +"*.hosting.myjino.ru\0lima-city.rocks\0" +"!city.nagoya.jp\0" +"k12.vi.us\0ap-northeast-2.elasticbeanstalk.com\0" +"legnica.pl\0" +"rich\0" +"goog\0*.transurl.be\0" +"oketo.hokkaido.jp\0biz.mv\0starostwo.gov.pl\0" +"biz.mw\0vegarshei.no\0eco\0is-very-sweet.org\0blogsyte.com\0" +"fujikawa.yamanashi.jp\0" +"biz.ni\0" +"lig.it\0napoli.it\0aioi.hyogo.jp\0okuizumo.shimane.jp\0" +"gallo\0" +"tohma.hokkaido.jp\0rep.kp\0" +"i.bg\0" +"taishin.fukushima.jp\0sumita.iwate.jp\0hamatama.saga.jp\0" +"yk.ca\0reise\0" +"iwaki.fukushima.jp\0biz.nr\0" +"andebu.no\0karaganda.su\0" +"hamada.shimane.jp\0" +"finland.museum\0helsinki.museum\0" +"onagawa.miyagi.jp\0" +"zone.id\0" +"gob.ar\0" +"edu\0" +"dtv\0" +"sp.it\0" +"lib.tn.us\0s3-eu-west-3.amazonaws.com\0""001www.com\0" +"immobilien\0" +"gwiddle.co.uk\0" +"parachuting.aero\0" +"ip6.arpa\0gob.bo\0" +"chita.aichi.jp\0" +"biz.pk\0" +"biz.pl\0" +"lindas.no\0avianca\0" +"cri.br\0" +"biz.pr\0" +"2.bg\0ne.pw\0" +"musashimurayama.tokyo.jp\0" +"is-a-doctor.com\0" +"gob.cl\0bari.it\0tsuwano.shimane.jp\0ug.gov.pl\0" +"annaka.gunma.jp\0in-the-band.net\0" +"ski.museum\0" +"joyo.kyoto.jp\0dvr\0" +"indian.museum\0" +"servecounterstrike.com\0" +"date.hokkaido.jp\0zao.miyagi.jp\0" +"trade\0" +"bozen-s\xc3\xbc""dtirol.it\0warabi.saitama.jp\0" +"\xe4\xbd\x90\xe8\xb3\x80.jp\0" +"nesset.no\0*.transurl.eu\0" +"pi.it\0" +"no.com\0" +"yusuhara.kochi.jp\0" +"gob.do\0" +"yoshinogari.saga.jp\0johana.toyama.jp\0" +"gob.ec\0grozny.su\0" +"mad.museum\0" +"online.th\0a.run.app\0" +"nanto.toyama.jp\0" +"d\xc3\xb8nna.no\0" +"nhlfan.net\0myftp.biz\0" +"aguni.okinawa.jp\0" +"bergbau.museum\0rogers\0" +"oyabe.toyama.jp\0" +"univ.sn\0" +"prime\0" +"gob.es\0" +"gamvik.no\0" +"\xe7\xa6\x8f\xe4\xba\x95.jp\0memset.net\0" +"indigena.bo\0" +"okegawa.saitama.jp\0shimizu.shizuoka.jp\0" +"vix.br\0kyowa.hokkaido.jp\0nagaokakyo.kyoto.jp\0" +"al.us\0no-ip.org\0oy.lc\0" +"kunitomi.miyazaki.jp\0" +"balsan-suedtirol.it\0wakuya.miyagi.jp\0gb.net\0" +"ac\0" +"ad\0mb.it\0biz.tj\0" +"ae\0" "af\0" -"ag\0" -"perugia.it\0" -"ai\0lewismiller.museum\0monster\0" -"izumizaki.fukushima.jp\0" -"al\0" -"am\0karasjok.no\0eat\0" -"tas.edu.au\0ferrero\0dyn-o-saur.com\0" -"ao\0kiyokawa.kanagawa.jp\0cheap\0" -"aq\0ba\0" -"ar\0bb\0" -"as\0dupont\0from-wi.com\0" -"at\0leirfjord.no\0" -"au\0be\0sh.cn\0kunst.museum\0" -"bf\0shiojiri.nagano.jp\0mobi.ke\0" -"asn.au\0aw\0bg\0wakkanai.hokkaido.jp\0" -"ax\0bh\0" -"bi\0" +"ag\0yahoo\0dnsupdater.de\0" +"ai\0" +"tonami.toyama.jp\0" +"biz.ua\0" +"al\0kanuma.tochigi.jp\0biz.tr\0" +"am\0seljord.no\0ne.ug\0" +"biz.tt\0" +"ao\0creation.museum\0" +"otaru.hokkaido.jp\0ne.tz\0" +"aq\0ba\0stj\xc3\xb8rdalshalsen.no\0" +"ar\0bb\0schaeffler\0" +"as\0" +"at\0" +"au\0be\0jewelry.museum\0" +"bf\0" +"aw\0bg\0grozny.ru\0" +"ax\0bh\0gob.gt\0" +"bi\0ne.us\0" "az\0bj\0" -"forli-cesena.it\0" -"air.museum\0" -"bm\0jewelry\0" -"bn\0" -"bo\0lorenskog.no\0" -"ca\0kuroishi.aomori.jp\0hirono.fukushima.jp\0tm.pl\0credit\0ggee\0" -"br\0yawara.ibaraki.jp\0" +"*.yokohama.jp\0matsumae.hokkaido.jp\0" +"bm\0" +"bn\0webhop.net\0" +"bo\0of.by\0" +"ca\0" +"br\0gob.hn\0" "bs\0cc\0" -"bt\0cd\0" -"bv\0cf\0artsandcrafts.museum\0kosher\0neustar\0" +"bt\0cd\0szczytno.pl\0" +"bv\0cf\0" "bw\0cg\0" -"ch\0eco\0" +"ch\0vall\xc3\xa9""e-aoste.it\0biz.vn\0" "by\0ci\0" -"bz\0total\0" +"bz\0" +"k12.gu.us\0" "cl\0" -"media.aero\0cm\0cc.ms.us\0cc.nc.us\0hyatt\0" -"trading.aero\0cn\0isen.kagoshima.jp\0wegrow.pl\0northwesternmutual\0" -"co\0" -"mino.gifu.jp\0nflfan.org\0" -"cr\0assabu.hokkaido.jp\0" -"gs.cn\0" -"cu\0de\0" -"cv\0" -"cw\0s3-website-us-west-1.amazonaws.com\0" -"cx\0servebbs.net\0" -"cy\0" +"cm\0c.cdn77.org\0" +"cn\0" +"co\0java\0" +"tempioolbia.it\0" +"alesund.no\0" +"cr\0fukuyama.hiroshima.jp\0" +"cu\0de\0farmequipment.museum\0" +"cv\0iruma.saitama.jp\0" +"cw\0" +"cx\0seto.aichi.jp\0" +"cy\0ushuaia.museum\0" "cz\0dj\0" -"dk\0portland.museum\0" -"fst.br\0dm\0" -"edu\0" -"s.bg\0do\0dtv\0" -"hurum.no\0paroch.k12.ma.us\0" -"casacam.net\0" -"chihayaakasaka.osaka.jp\0cechire.com\0" +"dk\0games\0" +"mobara.chiba.jp\0" +"dm\0gjerstad.no\0naamesjevuemie.no\0" +"do\0lur\xc3\xb8y.no\0is-a-green.com\0" +"tools\0" "ec\0" -"cargo.aero\0tm.ro\0mypsx.net\0" -"ee\0historical.museum\0" -"uonuma.niigata.jp\0" -"eg\0bs.it\0" -"misawa.aomori.jp\0" -"\xe6\x95\x8e\xe8\x82\xb2.hk\0gs.oslo.no\0" -"dz\0nagano.jp\0tm.se\0" -"scrapping.cc\0" -"nankoku.kochi.jp\0" -"higashiyoshino.nara.jp\0" -"kiev.ua\0" -"miyazaki.jp\0kushiro.hokkaido.jp\0" +"okinawa.jp\0" +"ee\0vefsn.no\0k12.tx.us\0" +"eg\0" +"tourism.pl\0" +"dz\0kin.okinawa.jp\0" +"museumcenter.museum\0valley.museum\0bingo\0" +"baseball\0" +"noticias.bo\0" +"inagawa.hyogo.jp\0abu.yamaguchi.jp\0global.ssl.fastly.net\0" +"co.com\0" +"takahama.aichi.jp\0" +"kayabe.hokkaido.jp\0" "es\0" -"et\0" +"et\0school\0" "eu\0" -"higashiizumo.shimane.jp\0lib.az.us\0" -"fi\0is-uberleet.com\0" -"intuit\0volvo\0" -"dvr\0*.advisor.ws\0" -"nagoya\0" -"fm\0\xc3\xa5snes.no\0" -"andriatranibarletta.it\0nes.akershus.no\0" -"fo\0botany.museum\0alesund.no\0grane.no\0" +"fi\0" +"aikawa.kanagawa.jp\0" +"fm\0" +"fo\0" "ga\0" -"fr\0gb\0california.museum\0" +"fr\0gb\0" +"dep.no\0media\0" "gd\0" "ge\0" -"gf\0mx.na\0\xe9\xa4\x90\xe5\x8e\x85\0" -"gg\0" -"gh\0sanagochi.tokushima.jp\0active\0" -"gi\0" -"zama.kanagawa.jp\0" -"gl\0namegawa.saitama.jp\0duns\0" +"gf\0rm.it\0*.transurl.nl\0" +"gg\0biz.zm\0" +"gh\0" +"gi\0i.ng\0gs.of.no\0" +"gx.cn\0gl\0ouchi.saga.jp\0" "gm\0" -"gn\0florida.museum\0" +"adm.br\0gn\0" "gp\0" -"gq\0pt.eu.org\0" -"gr\0" -"gs\0" -"gt\0" -"gu\0" -"gw\0\xe4\xb8\xaa\xe4\xba\xba.hk\0winb.gov.pl\0" -"fed.us\0" -"gy\0iwama.ibaraki.jp\0" -"tr\xc3\xb8gstad.no\0" -"riopreto.br\0hk\0" -"student.aero\0lancaster\0" -"hm\0" -"hn\0madrid\0" -"cc.sc.us\0" -"futtsu.chiba.jp\0" -"sicily.it\0" -"hr\0" -"\xe5\x98\x89\xe9\x87\x8c\0" -"ht\0id\0cc.na\0" +"recreation.aero\0gq\0lib.dc.us\0fitness\0s3.dualstack.ap-northeast-1.amazonaws.com\0mypets.ws\0" +"gr\0saga.jp\0matsubushi.saitama.jp\0" +"gs\0\xe5\x80\x8b\xe4\xba\xba.\xe9\xa6\x99\xe6\xb8\xaf\0" +"gt\0trentino-aadige.it\0lukow.pl\0" +"gu\0cc.ut.us\0" +"to.gov.br\0" +"gw\0" +"miyazu.kyoto.jp\0" +"gy\0" +"hk\0elvendrell.museum\0mel\xc3\xb8y.no\0" +"gob.mx\0" +"hm\0gob.ni\0hadsel.no\0" +"hn\0aridagawa.wakayama.jp\0" +"ubank\0s3.dualstack.eu-west-3.amazonaws.com\0" +"kep.tr\0coach\0fan\0" +"wpdevcloud.com\0cyon.site\0" +"hr\0saarland\0dynathome.net\0" +"andoy.no\0" +"ht\0id\0akdn\0" "hu\0ie\0" -"talk\0" -"economia.bo\0" -"il\0" +"oarai.ibaraki.jp\0futuremailing.at\0" +"bnr.la\0" +"higashi.okinawa.jp\0i.ph\0winb.gov.pl\0" +"il\0for-more.biz\0" "im\0" -"in\0" -"io\0togo.aichi.jp\0" -"noda.chiba.jp\0augustow.pl\0dvag\0" +"in\0matsumoto.kagoshima.jp\0" +"io\0from-al.com\0" +"naka.hiroshima.jp\0" "iq\0" -"ir\0cody.museum\0" -"is\0flakstad.no\0" -"it\0misato.shimane.jp\0" -"je\0" -"aver\xc3\xb8y.no\0prochowice.pl\0able\0" -"lucania.it\0" -"fortmissoula.museum\0gleeze.com\0" -"khmelnytskyi.ua\0" -"hichiso.gifu.jp\0" -"jo\0glass.museum\0" +"ir\0cri.nz\0" +"is\0oldnavy\0" +"it\0" +"je\0gob.pa\0togliatti.su\0" +"varoy.no\0is-a-bruinsfan.org\0" +"watarai.mie.jp\0" +"gob.pe\0" +"news\0" +"jo\0gob.pk\0" "jp\0" -"chino.nagano.jp\0" -"internet-dns.de\0" -"ke\0opoczno.pl\0" -"griw.gov.pl\0" -"kg\0k12.il.us\0" -"rakkestad.no\0" -"ki\0" -"kikugawa.shizuoka.jp\0nasushiobara.tochigi.jp\0" -"km\0misconfused.org\0" -"kn\0" +"floro.no\0" +"radoy.no\0esq\0" +"treviso.it\0katori.chiba.jp\0toga.toyama.jp\0freeboxos.fr\0" +"ke\0" +"kg\0" +"furudono.fukushima.jp\0" +"ki\0tree.museum\0dynalias.org\0" +"mobi.gp\0trentinoa-adige.it\0toba.mie.jp\0ooshika.nagano.jp\0nagai.yamagata.jp\0" +"koshu.yamanashi.jp\0" +"km\0" +"kn\0club\0next\0blogspot.co.at\0" +"folldal.no\0lib.ma.us\0" "kp\0" "la\0" -"shimodate.ibaraki.jp\0nagasaki.nagasaki.jp\0kr\0lb\0" -"lc\0" -"tromso.no\0" -"tm.za\0" -"kw\0" -"\xe5\x85\xac\xe7\x9b\x8a\0" +"kr\0lb\0" +"lc\0naturbruksgymn.se\0" +"shonai.yamagata.jp\0" +"\xe6\xbe\xb3\xe9\x96\x80\0" +"kw\0i.se\0" +"haboro.hokkaido.jp\0" "ky\0li\0" -"kz\0" -"lk\0" -"realtor\0" -"storj.farm\0" -"!city.yokohama.jp\0is-a-student.com\0" -"ma\0" -"lr\0elverum.no\0" -"ls\0mc\0norddal.no\0" -"lt\0md\0gs.of.no\0" -"minamifurano.hokkaido.jp\0lu\0me\0" -"lv\0" -"mg\0" -"asn.lv\0mh\0hughes\0" -"tokorozawa.saitama.jp\0ly\0" -"ainan.ehime.jp\0mydrobo.com\0" -"airport.aero\0mk\0" -"ml\0mordovia.su\0" -"mn\0" -"kobayashi.miyazaki.jp\0mo\0" -"trainer.aero\0mp\0click\0technology\0\xe9\x9b\x86\xe5\x9b\xa2\0" -"milano.it\0mq\0na\0" -"workinggroup.aero\0mr\0togliatti.su\0" -"ms\0nc\0" -"mt\0" -"mu\0ne\0" -"togitsu.nagasaki.jp\0mv\0nf\0" +"chikuma.nagano.jp\0kz\0" +"lk\0motorcycles\0" +"cc.nv.us\0" +"kawamata.fukushima.jp\0nagasu.kumamoto.jp\0" +"ma\0protonet.io\0" +"friulivgiulia.it\0lr\0" +"ls\0mc\0" +"lt\0md\0" +"lu\0me\0\xc4\x8d\xc3\xa1hcesuolo.no\0eus\0" +"hachioji.tokyo.jp\0lv\0" +"mg\0alpha-myqnapcloud.com\0" +"takasu.hokkaido.jp\0mh\0" +"ly\0" +"soccer\0stcgroup\0" +"mk\0flakstad.no\0k12.vt.us\0" +"ml\0" +"ssl.origin.cdn77-secure.org\0" +"cesena-forl\xc3\xac.it\0mn\0" +"mo\0eidfjord.no\0\xd0\xbe\xd1\x80\xd0\xb3\0" +"mp\0dabur\0" +"mq\0na\0edu.eu.org\0tselinograd.su\0" +"anpachi.gifu.jp\0kamakura.kanagawa.jp\0mr\0" +"ms\0nc\0myqnapcloud.com\0" +"fermo.it\0mt\0" +"mu\0ne\0of.no\0" +"ranzan.saitama.jp\0mv\0nf\0" "mw\0ng\0" -"6.bg\0mx\0" -"my\0ni\0rana.no\0\xe5\xb9\xbf\xe4\xb8\x9c\0" -"mz\0" +"mx\0" +"z.bg\0my\0ni\0is-into-anime.com\0" +"asahikawa.hokkaido.jp\0mz\0gob.sv\0" "nl\0" -"no\0helsinki\0" -"uwajima.ehime.jp\0" -"dnsalias.net\0" -"tahara.aichi.jp\0nr\0" -"pp.se\0pp.ru\0" -"\xe5\x8f\xb0\xe7\x81\xa3\0" +"miyama.fukuoka.jp\0yanaizu.fukushima.jp\0" +"no\0from-il.com\0" +"nagano.nagano.jp\0makeup\0" +"aizumi.tokushima.jp\0nr\0nextdirect\0" +"yokawa.hyogo.jp\0yoshino.nara.jp\0" "nu\0" -"realestate.pl\0" -"medicina.bo\0" -"nh.us\0" -"awaji.hyogo.jp\0nz\0" -"mc.it\0kiyosu.aichi.jp\0" -"om\0is-a-teacher.com\0" -"sumida.tokyo.jp\0" -"sakai.osaka.jp\0avianca\0" +"tos.it\0" +"from-fl.com\0" +"nz\0trafficplex.cloud\0" +"sardegna.it\0oshima.yamaguchi.jp\0" +"masoy.no\0om\0" +"dnsdojo.net\0" +"takahagi.ibaraki.jp\0" "pa\0" -"tsubata.ishikawa.jp\0""4u.com\0" -"cc.ua\0" +"jl.cn\0" +"national.museum\0bygland.no\0" +"shimoichi.nara.jp\0lebork.pl\0" "pe\0" "pf\0" -"ph\0" -"myoko.niigata.jp\0" -"brescia.it\0" +"fosnes.no\0syno-ds.de\0" +"chitose.hokkaido.jp\0ph\0" +"quebec.museum\0aurland.no\0gob.ve\0money\0" "pk\0" -"pl\0mordovia.ru\0" -"\xe7\xbd\x91\xe7\xbb\x9c.cn\0pm\0" -"pn\0" -"pp.ua\0" -"ouchi.saga.jp\0qa\0" -"pr\0" +"koya.wakayama.jp\0pl\0financial\0" +"pm\0" +"shoo.okayama.jp\0pn\0" +"sogne.no\0" +"qa\0ut.us\0we.bs\0" +"taiki.mie.jp\0taiwa.miyagi.jp\0pr\0" "ps\0" -"takasago.hyogo.jp\0pt\0" -"\xe8\xaf\xba\xe5\x9f\xba\xe4\xba\x9a\0" -"pw\0fan\0" -"hachinohe.aomori.jp\0tsugaru.aomori.jp\0" -"an.it\0py\0" -"muenchen.museum\0" -"teo.br\0" -"tsurugashima.saitama.jp\0" -"\xe9\x9d\x99\xe5\xb2\xa1.jp\0" -"bristol.museum\0" -"miki.hyogo.jp\0re\0" -"security\0" -"lebtimnetz.de\0" -"cc.nv.us\0" -"flt.cloud.muni.cz\0" -"yahoo\0" -"floripa.br\0lezajsk.pl\0luxury\0" -"adachi.tokyo.jp\0" -"niikappu.hokkaido.jp\0" -"nara.nara.jp\0hattfjelldal.no\0ro\0" -"sa\0" -"mg.gov.br\0sb\0netflix\0" -"takamori.kumamoto.jp\0rs\0sc\0" -"la-spezia.it\0nishiokoppe.hokkaido.jp\0barcelona.museum\0\xc3\xb8ygarden.no\0sd\0" -"togura.nagano.jp\0ru\0se\0" -"donna.no\0" -"shiraoi.hokkaido.jp\0rw\0sg\0abbott\0" -"sn\xc3\xa5sa.no\0sh\0" -"si\0cleverapps.io\0" -"sj\0esq\0" -"usgarden.museum\0sk\0servecounterstrike.com\0" -"tank.museum\0v\xc3\xa6r\xc3\xb8y.no\0sl\0" -"tomigusuku.okinawa.jp\0sm\0azerbaijan.su\0" -"sn\0" +"pt\0" +"basel.museum\0" +"ulsan.kr\0fit\0" +"pw\0" +"py\0" +"\xe6\x9d\xb1\xe4\xba\xac.jp\0" +"shinto.gunma.jp\0gwangju.kr\0" +"org.ac\0" +"wif.gov.pl\0" +"org.ae\0" +"org.af\0pz.it\0" +"org.ag\0lib.sd.us\0" +"yaizu.shizuoka.jp\0" +"org.ai\0" +"re\0" +"org.al\0" +"kaminokawa.tochigi.jp\0" +"kyotamba.kyoto.jp\0fastlylb.net\0" +"org.ba\0" +"org.ar\0org.bb\0" +"\xe6\xbe\xb3\xe9\x97\xa8\0blogspot.co.id\0" +"org.au\0ro\0" +"tysv\xc3\xa6r.no\0sa\0" +"org.bh\0ashiya.fukuoka.jp\0sb\0" +"org.bi\0kopervik.no\0rs\0sc\0beauty\0" +"org.az\0sd\0" +"ru\0se\0fastly-terrarium.com\0" +"balsan.it\0blogspot.co.il\0" +"org.bm\0archaeological.museum\0trustee.museum\0rw\0sg\0" +"org.bn\0toki.gifu.jp\0kahoku.ishikawa.jp\0yoshikawa.saitama.jp\0sh\0" +"org.bo\0si\0" +"kaszuby.pl\0sj\0on-the-web.tv\0" +"sk\0" +"org.br\0mielno.pl\0sl\0" +"org.bs\0sm\0black\0" +"org.bt\0sn\0" "so\0" -"british.museum\0sr\0" -"tc\0" -"st\0td\0" -"su\0" -"sv\0tf\0" -"architecture.museum\0tg\0" -"sx\0th\0" -"pup.gov.pl\0sy\0*.transurl.be\0" -"sz\0tj\0vuelos\0" -"tk\0" +"df.gov.br\0sn.cn\0" +"org.bw\0" +"sr\0" +"org.ci\0tc\0" +"org.bz\0ms.it\0st\0td\0" +"b\xc3\xa1jddar.no\0su\0" +"\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86.ir\0asakuchi.okayama.jp\0sv\0tf\0" +"karmoy.no\0lier.no\0tg\0redumbrella\0" +"org.cn\0forl\xc3\xac""cesena.it\0sx\0th\0" +"org.co\0sy\0" +"slupsk.pl\0sz\0tj\0" +"tk\0fly\0" "tl\0" -"rc.it\0tm\0" -"tn\0" -"westfalen.museum\0to\0" -"ua\0" -"tr\0" -"tt\0" -"yk.ca\0" -"tv\0is-a-nurse.com\0" -"tw\0ug\0taxi\0boxfuse.io\0" -"\xe7\xbd\x91\xe7\xbb\x9c.hk\0arboretum.museum\0tz\0williamhill\0" -"oishida.yamagata.jp\0uk\0" -"profesional.bo\0eus\0" -"s.se\0" -"cooking\0cookingchannel\0" -"arita.saga.jp\0lahppi.no\0" -"riodejaneiro.museum\0va\0" -"hiraya.nagano.jp\0cinema.museum\0nyny.museum\0" -"kyotango.kyoto.jp\0us\0vc\0" -"pordenone.it\0ve\0" -"ontario.museum\0vg\0hepforge.org\0" -"zapto.xyz\0" -"fribourg.museum\0uy\0vi\0mg.leg.br\0" -"beauxarts.museum\0uz\0" -"no-ip.co.uk\0" -"frosinone.it\0" -"plc.ly\0" -"vn\0" -"trentino-suedtirol.it\0" -"nf.ca\0" -"nature.museum\0\xe9\x9b\xbb\xe8\xa8\x8a\xe7\x9b\x88\xe7\xa7\x91\0" -"sciencecenter.museum\0vu\0" -"wf\0" -"qpon\0" -"is-a-anarchist.com\0" -"us-east-1.elasticbeanstalk.com\0" -"tingvoll.no\0careers\0" -"*.nom.br\0essex.museum\0" -"kibichuo.okayama.jp\0birthplace.museum\0ws\0" -"rovigo.it\0" -"kagoshima.kagoshima.jp\0*.transurl.eu\0" -"its.me\0" -"oharu.aichi.jp\0brother\0" -"reklam.hu\0" -"rollag.no\0" -"afjord.no\0" -"yawatahama.ehime.jp\0" -"vpnplus.to\0" -"hino.tokyo.jp\0" -"kamiichi.toyama.jp\0cc.ia.us\0" -"leasing.aero\0yamato.fukushima.jp\0fuchu.toyama.jp\0media.museum\0logoip.de\0" -"fit\0" -"vs.it\0" -"valledaosta.it\0" -"yt\0" -"lib.hi.us\0" -"fuji.shizuoka.jp\0co.com\0" -"mutsuzawa.chiba.jp\0gotpantheon.com\0" -"showa.gunma.jp\0shimizu.shizuoka.jp\0" -"zm\0" -"teramo.it\0" -"arezzo.it\0zp.ua\0" -"aizumi.tokushima.jp\0" -"br\xc3\xb8nn\xc3\xb8ysund.no\0" -"nakagyo.kyoto.jp\0zw\0" -"r\xc3\xa1hkker\xc3\xa1vju.no\0" -"odawara.kanagawa.jp\0" -"insurance.aero\0from-ut.com\0" -"cloudapp.net\0" -"l\xc3\xa6rdal.no\0" -"aland.fi\0hachirogata.akita.jp\0" -"yazu.tottori.jp\0wielun.pl\0" -"bajddar.no\0" -"website\0" -"casino.hu\0" -"vda.it\0" -"lanxess\0" -"federation.aero\0koga.fukuoka.jp\0" -"fly\0" -"legal\0" -"ikawa.akita.jp\0" -"etnedal.no\0" -"gb.net\0" -"uzs.gov.pl\0" -"doesntexist.org\0" -"ok.us\0" -"starhub\0" -"frogans\0" -"linz.museum\0" -"mydissent.net\0" -"busan.kr\0" -"nakano.tokyo.jp\0" -"u2.xnbay.com\0" -"stj\xc3\xb8rdalshalsen.no\0cv.ua\0plc.uk\0" -"ha.cn\0hidaka.wakayama.jp\0" -"dy.fi\0" -"h\xc3\xb8nefoss.no\0" -"endofinternet.net\0" -"adac\0" -"lib.mi.us\0" +"tm\0brasilia.me\0" +"ven.it\0shinagawa.tokyo.jp\0atm.pl\0tn\0" +"org.cu\0to\0boutique\0" +"org.cw\0ua\0" +"shiga.jp\0gose.nara.jp\0tr\0" +"org.cy\0is-a-personaltrainer.com\0" +"tt\0olayan\0for-better.biz\0" +"hakodate.hokkaido.jp\0jeonbuk.kr\0tv\0" +"org.dm\0tw\0ug\0fedorapeople.org\0" +"org.do\0nv.us\0" +"tz\0hair\0" +"losangeles.museum\0uk\0" +"shimoji.okinawa.jp\0" +"org.ec\0berg.no\0b\xc3\xb8.nordland.no\0" +"org.ee\0" +"org.eg\0va\0" +"oto.fukuoka.jp\0ms.kr\0" +"us\0vc\0" +"org.dz\0sardinia.it\0trentins\xc3\xbc""dtirol.it\0kyotanabe.kyoto.jp\0" +"ve\0whoswho\0home-webserver.de\0" +"vg\0" +"sos.pl\0" +"uy\0vi\0" +"uz\0freetls.fastly.net\0" +"mysecuritycamera.com\0" +"ptplus.fit\0" +"org.es\0" +"org.et\0vn\0" "foo\0" -"nagasaki.jp\0" -"q.bg\0kannami.shizuoka.jp\0" -"chungbuk.kr\0dyroy.no\0" -"*.platformsh.site\0" -"fox\0" -"ohira.miyagi.jp\0onthewifi.com\0" -"\xe9\xa6\x99\xe6\xb8\xaf\0" -"ca.it\0" -"museumvereniging.museum\0" -"democracia.bo\0*.sendai.jp\0tachiarai.fukuoka.jp\0" -"beta.bounty-full.com\0" -"bauhaus\0apps.lair.io\0" -"meldal.no\0\xe8\x81\x94\xe9\x80\x9a\0" -"pn.it\0raid\0" -"*.transurl.nl\0" -"square7.de\0" -"gal\0" -"isehara.kanagawa.jp\0" +"kasugai.aichi.jp\0" +"vu\0" +"wf\0" +"cc.ms.us\0cc.nc.us\0mypep.link\0" +"smola.no\0" +"minamiawaji.hyogo.jp\0kami.miyagi.jp\0fox\0" +"fie.ee\0" +"org.ge\0mymailer.com.tw\0" +"niyodogawa.kochi.jp\0" +"org.gg\0" +"org.gh\0anan.nagano.jp\0ac.leg.br\0" +"org.gi\0ws\0lego\0" +"org.gl\0cloud\0" +"\xe9\xa6\x99\xe6\xa0\xbc\xe9\x87\x8c\xe6\x8b\x89\0" +"org.gn\0" +"bjerkreim.no\0filegear-au.me\0" +"org.gp\0" +"org.gr\0ge.it\0shikaoi.hokkaido.jp\0mitsuke.niigata.jp\0" +"l\xc3\xb8ten.no\0readthedocs.io\0" +"org.gt\0gal\0" +"org.gu\0bar.pro\0" +"mie.jp\0kunneppu.hokkaido.jp\0" +"holiday\0" "gap\0" -"tydal.no\0" -"yugawa.fukushima.jp\0" -"uber.space\0" -"sirdal.no\0" -"shopping\0" -"ddnsking.com\0" -"frl\0" -"\xe7\xb5\x84\xe7\xbb\x87.hk\0stuff-4-sale.org\0" -"otsuki.kochi.jp\0" -"couchpotatofries.org\0" -"*.vps.myjino.ru\0" -"asago.hyogo.jp\0" -"damnserver.com\0" -"zone.id\0" -"symantec\0" -"higashiomi.shiga.jp\0" -"lib.ct.us\0" -"ca.na\0if.ua\0" -"kin.okinawa.jp\0" -"cloudfunctions.net\0" -"square7.ch\0" -"gulen.no\0gdn\0" -"lib.ri.us\0is-a-republican.com\0" -"gea\0" -"otaki.chiba.jp\0hole.no\0ftr\0dynathome.net\0" -"\xe7\xbd\x91\xe7\xbb\x9c\0" -"skiptvet.no\0" -"nakano.nagano.jp\0" -"warmia.pl\0bananarepublic\0" -"gift\0" -"ouda.nara.jp\0jur.pro\0tours\0" -"shiroishi.miyagi.jp\0ritto.shiga.jp\0" -"fun\0" -"cards\0goldpoint\0" -"port.fr\0" -"joso.ibaraki.jp\0" -"nesodden.no\0" -"rec.br\0" -"otaki.nagano.jp\0bahn.museum\0" -"cern\0" -"engineer\0" -"lom.it\0" -"sowa.ibaraki.jp\0" -"rec.co\0umaji.kochi.jp\0" -"varese.it\0sosa.chiba.jp\0minnesota.museum\0posts-and-telecommunications.museum\0" -"modalen.no\0s3-ap-southeast-1.amazonaws.com\0" -"rnu.tn\0" -"asahi.mie.jp\0" -"dynalias.com\0" -"kamo.niigata.jp\0betainabox.com\0is-certified.com\0" -"hanno.saitama.jp\0" -"aridagawa.wakayama.jp\0" -"kamikawa.saitama.jp\0" -"trentinosuedtirol.it\0vegas\0" -"katashina.gunma.jp\0gs.nt.no\0" -"sf.no\0" -"miyada.nagano.jp\0" -"open\0" -"servebbs.org\0" -"otoyo.kochi.jp\0" -"cologne\0toshiba\0" -"hiratsuka.kanagawa.jp\0" -"lib.id.us\0" -"fyi\0hospital\0" -"4.bg\0" -"chikujo.fukuoka.jp\0" -"origins\0" -"lib.wi.us\0" -"is-very-good.org\0" -"biratori.hokkaido.jp\0" -"aukra.no\0lindas.no\0" -"ha.no\0" -"yamatokoriyama.nara.jp\0ddnss.org\0" -"suzu.ishikawa.jp\0yamagata.nagano.jp\0" -"tokai.aichi.jp\0saikai.nagasaki.jp\0americana.museum\0bearalvahki.no\0" -"plaza.museum\0" -"nemuro.hokkaido.jp\0klodzko.pl\0" -"itakura.gunma.jp\0nishihara.kumamoto.jp\0" -"maniwa.okayama.jp\0de.cool\0" -"salerno.it\0" -"android\0" -"lom.no\0" -"misaki.osaka.jp\0" -"nishinoomote.kagoshima.jp\0" -"hammerfest.no\0k12.nj.us\0" -"nago.okinawa.jp\0" -"sandcats.io\0" -"kutno.pl\0" -"stange.no\0vladimir.su\0" -"shika.ishikawa.jp\0" -"gle\0dyndns-free.com\0" -"k12.ec\0" -"s\xc3\xb8r-varanger.no\0" -"pointto.us\0" -"id.au\0\xd0\xba\xd0\xbe\xd0\xbc\0" -"kawaminami.miyazaki.jp\0ca.us\0" -"kawaue.gifu.jp\0deals\0" -"al.it\0tosashimizu.kochi.jp\0" -"kumatori.osaka.jp\0" -"iizuka.fukuoka.jp\0services\0" -"discovery.museum\0" -"ato.br\0twmail.net\0" -"wa.au\0hol.no\0" -"e164.arpa\0" -"ddnss.de\0" -"yokoshibahikari.chiba.jp\0" -"uruma.okinawa.jp\0gs.st.no\0" -"express.aero\0k12.as.us\0" -"sasaguri.fukuoka.jp\0kushimoto.wakayama.jp\0" -"rauma.no\0" -"suwa.nagano.jp\0gmo\0" -"wlocl.pl\0" -"cahcesuolo.no\0" -"masfjorden.no\0" -"k12.or.us\0" -"latrobe\0" +"g.bg\0org.gy\0priv.hu\0pics\0" +"org.hk\0computer.museum\0crimea.ua\0" +"org.hn\0" +"org.ht\0frl\0uk.net\0" +"org.hu\0arboretum.museum\0is-a-rockstar.com\0" +"sites.static.land\0" +"eun.eg\0" +"yt\0" +"\xe5\xa4\xa9\xe4\xb8\xbb\xe6\x95\x99\0" +"org.il\0tateshina.nagano.jp\0intuit\0" +"org.im\0naroy.no\0" +"org.in\0yawatahama.ehime.jp\0ms.leg.br\0" +"aeroclub.aero\0qld.gov.au\0" +"umi.fukuoka.jp\0" +"org.iq\0nordre-land.no\0" +"org.ir\0support\0" +"org.is\0kunst.museum\0zm\0cust.testing.thingdust.io\0" +"org.je\0ee.eu.org\0" +"cn.it\0" +"l\xc3\xa4ns.museum\0\xe4\xbd\x9b\xe5\xb1\xb1\0" +"ribeirao.br\0" +"miyako.fukuoka.jp\0" +"0.bg\0zw\0" +"org.jo\0" +"shibuya.tokyo.jp\0" +"saiki.oita.jp\0" +"monza-e-della-brianza.it\0gdn\0" +"org.kg\0" +"ketrzyn.pl\0" +"org.ki\0skedsmo.no\0gea\0" +"\xe9\xab\x98\xe7\x9f\xa5.jp\0ftr\0" +"org.km\0amsterdam\0" +"alessandria.it\0org.kn\0church\0mt.leg.br\0" +"cuisinella\0" +"pg.it\0hannan.osaka.jp\0org.kp\0" +"org.la\0lib.ri.us\0" +"org.lb\0no-ip.net\0" +"org.lc\0k12.ny.us\0" +"nomi.ishikawa.jp\0" +"waw.pl\0fun\0" +"org.kw\0anthro.museum\0from-mo.com\0" +"omihachiman.shiga.jp\0" +"org.ky\0" +"nahari.kochi.jp\0nagiso.nagano.jp\0org.kz\0" +"org.lk\0" +"chofu.tokyo.jp\0" +"org.ma\0" +"org.lr\0" +"org.ls\0" +"gen.in\0nobeoka.miyazaki.jp\0" +"org.me\0naumburg.museum\0gos.pk\0" +"belluno.it\0ashibetsu.hokkaido.jp\0org.lv\0" +"org.mg\0\xe5\x95\x86\xe6\xa5\xad.tw\0" +"priv.at\0" +"org.ly\0gives\0" +"org.mk\0field.museum\0" +"org.ml\0" +"org.mn\0" +"org.mo\0lenvik.no\0" +"org.na\0" +"org.ms\0arts.museum\0" +"caserta.it\0org.mt\0" +"org.mu\0museum\0lib.mn.us\0" +"\xe8\x8c\xa8\xe5\x9f\x8e.jp\0org.mv\0" +"humanities.museum\0org.mw\0org.ng\0" +"takko.aomori.jp\0org.mx\0nc.tr\0" +"org.my\0org.ni\0" +"mihama.wakayama.jp\0org.mz\0gniezno.pl\0" +"nt.au\0blogspot.co.uk\0" +"earth\0" +"z.se\0iki.fi\0" +"org.nr\0epost\0" +"s3.eu-west-3.amazonaws.com\0" +"trentins\xc3\xbc""d-tirol.it\0" +"frana.no\0" +"takatsuki.osaka.jp\0" +"nt.ca\0" +"kashihara.nara.jp\0verm\xc3\xb6gensberater\0" +"ms.us\0nc.us\0itau\0" +"org.nz\0" +"hareid.no\0" +"from.hr\0" +"org.om\0" +"miyagi.jp\0" +"saito.miyazaki.jp\0" +"org.pa\0fyi\0" +"mobi.tt\0" +"civilwar.museum\0rissa.no\0org.pe\0security\0\xd9\x85\xd9\x88\xd9\x82\xd8\xb9\0remotewd.com\0" +"org.pf\0" +"filatelia.museum\0" +"org.ph\0" +"dolls.museum\0rodoy.no\0tinn.no\0" +"mobi.tz\0creditunion\0" +"org.pk\0" +"org.pl\0vapor.cloud\0" +"org.pn\0" +"ski.no\0" +"org.qa\0haus\0" +"kumenan.okayama.jp\0yatsuka.shimane.jp\0org.pr\0" +"gulen.no\0org.ps\0" +"misawa.aomori.jp\0org.pt\0" +"ally\0bugatti\0filegear.me\0" +"usculture.museum\0org.py\0keymachine.de\0" +"military.museum\0" +"koto.shiga.jp\0restaurant\0" +"nt.edu.au\0volvo\0" +"sannan.hyogo.jp\0other.nf\0" +"swiss\0youtube\0" +"vb.it\0aizumisato.fukushima.jp\0" +"s3-website.ap-northeast-2.amazonaws.com\0" +"sch.ae\0panama.museum\0" +"hyuga.miyazaki.jp\0" +"s3-us-west-1.amazonaws.com\0" +"agr.br\0" +"s3-website.ca-central-1.amazonaws.com\0" +"gv.ao\0gle\0ping\0" +"org.ro\0pimienta.org\0" +"gen.nz\0" +"org.sa\0lexus\0pink\0nfshost.com\0" +"gv.at\0hiroshima.jp\0kawajima.saitama.jp\0org.sb\0" +"org.rs\0org.sc\0" +"org.sd\0" +"org.se\0org.ru\0" +"omaha.museum\0org.sg\0nflfan.org\0" +"org.sh\0" +"sandnessj\xc3\xb8""en.no\0" +"org.sl\0" +"sande.vestfold.no\0" +"org.sn\0" +"org.so\0" +"nakatombetsu.hokkaido.jp\0" +"nesna.no\0country\0" +"ancona.it\0kiryu.gunma.jp\0hitachiota.ibaraki.jp\0" +"org.st\0" +"karasjohka.no\0blogspot.co.ke\0" +"kitagawa.miyazaki.jp\0hasuda.saitama.jp\0org.sv\0" +"gmo\0" +"gs.nt.no\0org.sy\0" +"org.sz\0org.tj\0" +"org.tm\0" +"yorii.saitama.jp\0org.tn\0" +"org.to\0" "gmx\0" -"lib.mt.us\0lib.nd.us\0from-nm.com\0" -"tsuno.miyazaki.jp\0" -"kawanehon.shizuoka.jp\0rv.ua\0" -"artcenter.museum\0" -"yamakita.kanagawa.jp\0ternopil.ua\0homeunix.com\0fantasyleague.cc\0" -"tur.ar\0vladimir.ru\0" -"hara.nagano.jp\0" -"psi.br\0miyama.mie.jp\0katsuragi.wakayama.jp\0" -"ct.it\0" -"buzz\0star\0" -"the.br\0" -"abu.yamaguchi.jp\0cc.co.us\0" -"s3.ca-central-1.amazonaws.com\0" -"goo\0" +"mobi.na\0and\xc3\xb8y.no\0org.ua\0lib.de.us\0" +"org.tr\0" +"entomology.museum\0moskenes.no\0cn.ua\0" +"org.tt\0" +"modern.museum\0" +"\xe6\x96\xb0\xe6\xbd\x9f.jp\0hioki.kagoshima.jp\0" +"mobi.ng\0org.tw\0org.ug\0" +"olkusz.pl\0" +"org.uk\0tickets\0" +"1kapp.com\0" +"lardal.no\0" +"fedex\0" +"moareke.no\0org.vc\0ap-south-1.elasticbeanstalk.com\0" +"org.ve\0" +"goo\0hobby-site.com\0" "gop\0" -"ra.it\0matsumoto.kagoshima.jp\0shibata.niigata.jp\0" -"tur.br\0" -"got\0" -"mobi\0" -"gov\0" -"isleofman.museum\0" -"yamanashi.yamanashi.jp\0" -"osasco.br\0" -"aomori.aomori.jp\0sor-varanger.no\0\xe6\xb8\xb8\xe6\x88\x8f\0" -"k12.il\0" -"enterprises\0" -"is.gov.pl\0" -"\xc3\xa1laheadju.no\0" -"tranibarlettaandria.it\0" -"al.no\0" -"rec.nf\0americanfamily\0" -"slupsk.pl\0" -"moda\0" -"luzern.museum\0fairwinds\0" -"is-a-liberal.com\0" -"crown\0" -"museum.tt\0is-into-games.com\0" -"bio.br\0nakagawa.hokkaido.jp\0ilawa.pl\0" -"gliding.aero\0portlligat.museum\0" -"nishikatsura.yamanashi.jp\0seaport.museum\0" -"kasuya.fukuoka.jp\0hirado.nagasaki.jp\0barsy.net\0" -"higashiyodogawa.osaka.jp\0" -"lebork.pl\0" -"official.academy\0" -"mer\xc3\xa5ker.no\0hbo\0" -"aca.pro\0" -"aircraft.aero\0chattanooga.museum\0" -"nara.jp\0" -"\xe6\x94\xbf\xe5\xba\x9c.hk\0alaheadju.no\0\xe0\xa4\xa8\xe0\xa5\x87\xe0\xa4\x9f\0" -"issmarterthanyou.com\0al.eu.org\0" -"*.nagoya.jp\0capetown\0" -"rentals\0" -"budejju.no\0" -"construction\0" -"lib.sd.us\0dnsalias.org\0from-mt.com\0from-nd.com\0" -"tomisato.chiba.jp\0" -"liguria.it\0" -"tomakomai.hokkaido.jp\0" -"cloudns.biz\0" -"id.ir\0shinichi.hiroshima.jp\0" -"hiphop\0" -"showa.yamanashi.jp\0royrvik.no\0url.tw\0pcloud.host\0" -"iris.arpa\0ferrara.it\0oxford.museum\0" -"larvik.no\0" -"konan.shiga.jp\0school.na\0" -"yamanobe.yamagata.jp\0" -"lucca.it\0handson.museum\0dedyn.io\0" -"trentinsued-tirol.it\0kawaguchi.saitama.jp\0wv.us\0ann-arbor.mi.us\0" -"yuu.yamaguchi.jp\0" -"sor-odal.no\0" -"eu.int\0astronomy.museum\0" -"obu.aichi.jp\0" -"muroto.kochi.jp\0newspaper.museum\0amli.no\0" -"oum.gov.pl\0gotdns.ch\0" -"koryo.nara.jp\0lyngen.no\0" -"judygarland.museum\0" -"rec.ro\0aramco\0" -"olawa.pl\0" -"school.nz\0" -"oguni.yamagata.jp\0" -"rimini.it\0" -"now.sh\0" -"torsken.no\0mmafan.biz\0" -"ma.us\0" -"pgfog.com\0" -"gratis\0" -"id.lv\0" -"\xeb\x8b\xb7\xeb\x84\xb7\0" -"id.ly\0" -"k12.ks.us\0merseine.nu\0" -"wazuka.kyoto.jp\0" -"tattoo\0" -"trentino-sudtirol.it\0" -"sd.cn\0" -"tonsberg.no\0" -"tsunan.niigata.jp\0pl.eu.org\0protonet.io\0" -"midatlantic.museum\0" -"business\0" -"al.us\0" -"from-ms.com\0from-nc.com\0" -"iwi.nz\0" -"satosho.okayama.jp\0tires\0" -"tanohata.iwate.jp\0" -"is-leet.com\0" -"monmouth.museum\0ny.us\0" -"est-a-la-masion.com\0" -"indian.museum\0settlement.museum\0""2ix.at\0" -"mt.it\0rec.ve\0" -"nagaoka.niigata.jp\0" -"komforb.se\0linkitools.space\0" -"shishikui.tokushima.jp\0cc.mo.us\0farmers\0" -"go.ci\0" -"toyota.yamaguchi.jp\0" -"higashimatsushima.miyagi.jp\0page\0" -"aogaki.hyogo.jp\0" +"minnesota.museum\0org.uy\0org.vi\0" +"org.uz\0" +"got\0wedeploy.sh\0" +"plantation.museum\0k12.nh.us\0" +"gov\0fukui.fukui.jp\0matsuda.kanagawa.jp\0org.vn\0" +"rad\xc3\xb8y.no\0" +"readmyblog.org\0" +"org.vu\0" +"vic.au\0edeka\0" +"sekigahara.gifu.jp\0" +"telekommunikation.museum\0" +"kembuchi.hokkaido.jp\0" +"agakhan\0irish\0" +"piedmont.it\0" +"org.ws\0" +"shima.mie.jp\0ogose.saitama.jp\0gen.tr\0" +"qh.cn\0blogspot.co.nz\0" +"yokosuka.kanagawa.jp\0minamisanriku.miyagi.jp\0katano.osaka.jp\0swatch\0" +"overhalla.no\0baidu\0\xe9\x80\x9a\xe8\xb2\xa9\0" +"kamikitayama.nara.jp\0kimino.wakayama.jp\0" +"donna.no\0" +"ah.cn\0kitchen\0" +"berlin.museum\0g.se\0hbo\0" +"al.leg.br\0" +"int.eu.org\0" +"american.museum\0" +"toray\0" +"haibara.shizuoka.jp\0""2ix.at\0" +"aosta-valley.it\0oki.fukuoka.jp\0kitashiobara.fukushima.jp\0misugi.mie.jp\0" +"org.za\0" +"amex\0" +"mobi.ke\0herad.no\0aramco\0" +"sch.id\0bando.ibaraki.jp\0" +"glug.org.uk\0" +"madrid\0" +"szkola.pl\0" +"imizu.toyama.jp\0" +"osen.no\0org.zm\0" +"\xd8\xb4\xd8\xa8\xd9\x83\xd8\xa9\0" +"trentin-sudtirol.it\0uenohara.yamanashi.jp\0" +"2ix.ch\0" +"fidelity\0" +"sch.ir\0" +"frog.museum\0nt.no\0" +"org.zw\0cbg.ru\0stufftoread.com\0" +"urasoe.okinawa.jp\0mopar\0" +"council.aero\0x.bg\0" +"soundcast.me\0" +"savona.it\0kyuragi.saga.jp\0" +"miyakonojo.miyazaki.jp\0cookingchannel\0" +"is-an-anarchist.com\0""2ix.de\0" +"kurate.fukuoka.jp\0" +"sch.jo\0" +"theworkpc.com\0" +"lplfinancial\0" +"karate.museum\0kommunalforbund.se\0cn.eu.org\0" +"zj.cn\0" +"hoylandet.no\0law.za\0" +"family\0" +"to.it\0" +"lib.va.us\0" +"shinshinotsu.hokkaido.jp\0" +"ando.nara.jp\0" +"cranbrook.museum\0r\xc3\xa5holt.no\0" +"vald-aosta.it\0" +"erimo.hokkaido.jp\0" +"gs.ah.no\0k12.ca.us\0" +"hitachi.ibaraki.jp\0" +"cc.wv.us\0" +"rj.gov.br\0" +"sch.lk\0s3-website.eu-west-2.amazonaws.com\0hopto.me\0" +"lerdal.no\0" +"customer.enonic.io\0" +"trapani.it\0" +"vic.gov.au\0investments\0" +"gc.ca\0domains\0" +"sch.ly\0cloud66.ws\0" +"volkswagen\0" +"assedic.fr\0psp.gov.pl\0" +"fujishiro.ibaraki.jp\0" +"nt.ro\0" +"toyone.aichi.jp\0" +"nemuro.hokkaido.jp\0broke-it.net\0" +"sch.ng\0" +"okawa.fukuoka.jp\0" +"guovdageaidnu.no\0" +"kaho.fukuoka.jp\0" +"fage\0vote\0" +"wellbeingzone.eu\0" +"valle-d-aosta.it\0priv.pl\0" +"asaminami.hiroshima.jp\0notogawa.shiga.jp\0" +"karm\xc3\xb8y.no\0" +"voto\0" +"kerryhotels\0wedeploy.me\0" +"baghdad.museum\0amfam\0ro.eu.org\0" +"wakayama.jp\0" "hiv\0" -"salvadordali.museum\0lapy.pl\0" -"go.cr\0k12.ok.us\0gallery\0" -"higashikagura.hokkaido.jp\0" -"cnt.br\0itako.ibaraki.jp\0" -"vestby.no\0\xe5\xa4\xa7\xe6\x8b\xbf\0""2ix.ch\0" -"piemonte.it\0washtenaw.mi.us\0" -"o.bg\0r\xc3\xb8mskog.no\0vestvagoy.no\0" -"marugame.kagawa.jp\0" -"kuchinotsu.nagasaki.jp\0" -"ct.us\0" -"pol.dz\0museum.mv\0dev-myqnapcloud.com\0" -"museum.mw\0pomorze.pl\0" -"bo.it\0" -"dr\xc3\xb8""bak.no\0" -"2ix.de\0" -"\xe7\xbd\x91\xe5\xba\x97\0" -"lugansk.ua\0cc.az.us\0" -"museum.no\0bestbuy\0" -"culture.museum\0" -"quicksytes.com\0" -"shingu.wakayama.jp\0hkt\0" -"k12.tr\0" -"kisofukushima.nagano.jp\0" -"ancona.it\0" -"rennesoy.no\0" -"2038.io\0" -"museum.om\0" -"onna.okinawa.jp\0" -"hvaler.no\0" -"seihi.nagasaki.jp\0linkyard-cloud.ch\0" -"publishproxy.com\0" -"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xd8\xa9\0" -"servehumour.com\0" -"fosnes.no\0\xe4\xb8\xad\xe6\x96\x87\xe7\xbd\x91\0" -"and\xc3\xb8y.no\0" -"k12.vi\0" -"traeumtgerade.de\0" -"fl.us\0" -"koga.ibaraki.jp\0" -"moriyoshi.akita.jp\0" -"toyota.aichi.jp\0bahccavuotna.no\0" -"uchinomi.kagawa.jp\0" -"\xd9\xbe\xd8\xa7\xda\xa9\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0spiegel\0" -"moriya.ibaraki.jp\0" -"tempioolbia.it\0" -"villas\0" -"soo.kagoshima.jp\0" -"naka.ibaraki.jp\0" -"pol.ht\0murata.miyagi.jp\0" -"cherkasy.ua\0\xe0\xb8\xa3\xe0\xb8\xb1\xe0\xb8\x90\xe0\xb8\x9a\xe0\xb8\xb2\xe0\xb8\xa5.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" -"kusatsu.gunma.jp\0team\0" -"tenei.fukushima.jp\0misugi.mie.jp\0s3-website-ap-southeast-1.amazonaws.com\0" -"barsy.pro\0" -"tsukigata.hokkaido.jp\0misato.miyagi.jp\0s3.dualstack.eu-west-3.amazonaws.com\0" -"prd.fr\0" -"ru.com\0is-not-certified.com\0" -"matsushige.tokushima.jp\0" -"go.id\0" -"wakasa.fukui.jp\0" -"vinnytsia.ua\0" -"og.ao\0" -"beppu.oita.jp\0town.museum\0" -"hot\0" -"eu-west-3.elasticbeanstalk.com\0" -"id.us\0how\0" -"go.it\0minamiyamashiro.kyoto.jp\0" -"lodi.it\0shizuoka.jp\0cadaques.museum\0\xec\x82\xbc\xec\x84\xb1\0" -"namerikawa.toyama.jp\0" -"sa.edu.au\0tech\0" -"bandai.fukushima.jp\0" -"isahaya.nagasaki.jp\0" -"wa.us\0" -"hanawa.fukushima.jp\0" -"homelink.one\0" -"airtraffic.aero\0go.jp\0" -"barsy.pub\0" -"louvre.museum\0oystre-slidre.no\0" -"aero\0" -"sorocaba.br\0lakas.hu\0sydney\0i234.me\0" -"go.ke\0" -"oto.fukuoka.jp\0" -"hu.net\0" -"s3.dualstack.ap-northeast-1.amazonaws.com\0" +"lel.br\0" +"forsand.no\0" +"\xd1\x80\xd1\x83\xd1\x81\0" +"na.it\0" +"bradesco\0" +"ureshino.mie.jp\0" +"od.ua\0" "sic.it\0" -"iheya.okinawa.jp\0" -"hamatonbetsu.hokkaido.jp\0" -"news.hu\0nakanoto.ishikawa.jp\0rns.tn\0za.com\0" -"go.kr\0tirol\0" -"uji.kyoto.jp\0" -"organic\0" -"moto\0" -"ibm\0" -"tara.saga.jp\0" -"yurihonjo.akita.jp\0frana.no\0" -"kerrylogistics\0locker\0" -"chikuma.nagano.jp\0" -"ice\0" -"collegefan.org\0" -"trentinsudtirol.it\0navuotna.no\0" -"dnipropetrovsk.ua\0lilly\0endofinternet.org\0" -"tran\xc3\xb8y.no\0" -"forlicesena.it\0bievat.no\0" -"kijo.miyazaki.jp\0" -"prd.km\0nowruz\0" -"film.museum\0icu\0" -"kawagoe.mie.jp\0" -"birdart.museum\0" -"2.bg\0" -"pvt.ge\0" -"qld.au\0bridgestone\0" -"ecologia.bo\0" -"moareke.no\0" -"fujimino.saitama.jp\0" -"hikari.yamaguchi.jp\0" -"tohma.hokkaido.jp\0" -"numata.hokkaido.jp\0" -"city.hu\0" -"fujisato.akita.jp\0" -"govt.nz\0" -"vinnica.ua\0mt.us\0nd.us\0" -"arte.bo\0kaisei.kanagawa.jp\0higashine.yamagata.jp\0" -"lo.it\0prd.mg\0" -"*.compute-1.amazonaws.com\0" -"kanna.gunma.jp\0" -"chat\0" -"pars\0" -"kongsvinger.no\0" -"physio\0" -"urayasu.chiba.jp\0echizen.fukui.jp\0" -"fj.cn\0\xe6\x84\x9b\xe5\xaa\x9b.jp\0" -"science\0dyndns-at-home.com\0" -"kviteseid.no\0" -"\xd8\xa7\xd8\xaa\xd8\xb5\xd8\xa7\xd9\x84\xd8\xa7\xd8\xaa\0" -"varggat.no\0" -"raisa.no\0temasek\0ae.org\0in-the-band.net\0" -"ifm\0" -"amot.no\0imamat\0" -"oji.nara.jp\0pl.ua\0" -"naka.hiroshima.jp\0" -"kawakami.nara.jp\0esurance\0" -"m\xc4\x81ori.nz\0imdb\0clan.rip\0" -"gonohe.aomori.jp\0kariwa.niigata.jp\0jpn.com\0" -"matsuno.ehime.jp\0" -"go.pw\0" -"s3-us-west-1.amazonaws.com\0" -"snillfjord.no\0" -"\xd0\xbc\xd0\xba\xd0\xb4\0" -"alaska.museum\0isteingeek.de\0" -"transporte.bo\0boleslawiec.pl\0" -"og.it\0" -"iwate.jp\0ybo.science\0" -"n4t.co\0" -"\xe5\x95\x86\xe5\xba\x97\0" -"skedsmo.no\0" -"kitagawa.miyazaki.jp\0" -"yoka.hyogo.jp\0" -"tohnosho.chiba.jp\0" -"eidskog.no\0" -"kahoku.ishikawa.jp\0" -"cr.it\0otago.museum\0" -"homelinux.com\0" -"gs.hm.no\0capitalone\0" -"hirogawa.wakayama.jp\0is-a-therapist.com\0" -"\xd8\xb3\xd9\x88\xd8\xaf\xd8\xa7\xd9\x86\0" -"ravenna.it\0" -"biei.hokkaido.jp\0" -"sd.us\0moscow\0" -"curitiba.br\0" -"arteducation.museum\0" -"go.th\0pol.tr\0" -"esan.hokkaido.jp\0hannan.osaka.jp\0gotsu.shimane.jp\0" -"toyone.aichi.jp\0ostre-toten.no\0go.tj\0" -"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xdb\x83\0" -"kanmaki.nara.jp\0undersea.museum\0" -"academy.museum\0" -"sayama.saitama.jp\0" -"fermo.it\0maori.nz\0" -"iglesias-carbonia.it\0bryne.no\0" -"ogliastra.it\0" -"ando.nara.jp\0yao.osaka.jp\0go.ug\0" -"o.se\0" -"go.tz\0is-a-financialadvisor.com\0" -"kawamata.fukushima.jp\0" -"honjyo.akita.jp\0dealer\0" -"orkdal.no\0" -"lindesnes.no\0wedding\0" -"trentinosudtirol.it\0" -"namsos.no\0\xd0\xbc\xd0\xbe\xd0\xbd\0" -"nokia\0" -"onomichi.hiroshima.jp\0" -"tagawa.fukuoka.jp\0" -"blogspot.com\0" -"nb.ca\0" -"is-a-photographer.com\0" -"qsl.br\0tarumizu.kagoshima.jp\0" -"volkenkunde.museum\0" -"fin.ec\0" -"tuscany.it\0vicenza.it\0" -"akita.jp\0" -"brussels.museum\0" -"jab.br\0inc\0" -"k12.tx.us\0" -"s3-website.eu-central-1.amazonaws.com\0" -"ing\0barsy.me\0" -"no.eu.org\0" -"uchihara.ibaraki.jp\0" -"fuso.aichi.jp\0v\xc3\xa1rgg\xc3\xa1t.no\0ink\0" -"chuo.chiba.jp\0barsy.org\0" -"oamishirasato.chiba.jp\0hokuryu.hokkaido.jp\0" -"oz.au\0ogawa.saitama.jp\0oshino.yamanashi.jp\0" -"bosch\0" -"kamiizumi.saitama.jp\0" -"int\0" -"histoire.museum\0yolasite.com\0" -"\xe7\xa6\x8f\xe5\xb3\xb6.jp\0lea\xc5\x8bgaviika.no\0" -"schlesisches.museum\0" -"surf\0" -"smile\0pgafan.net\0" -"toda.saitama.jp\0babia-gora.pl\0" -"stuff-4-sale.us\0" -"k12.ia.us\0apps.fbsbx.com\0flynnhosting.net\0" -"sund.no\0phone\0" -"skjak.no\0" -"\xc3\xb8rland.no\0" -"blanco\0whoswho\0alpha.bounty-full.com\0" -"lombardia.it\0whaling.museum\0" -"tomari.hokkaido.jp\0" -"naturalhistorymuseum.museum\0from-fl.com\0" -"brasil.museum\0sibenik.museum\0" -"lib.tn.us\0" -"castres.museum\0" -"consulting.aero\0" -"countryestate.museum\0olecko.pl\0immo\0appchizi.com\0" -"twmail.org\0" -"ohda.shimane.jp\0" -"shimoji.okinawa.jp\0" -"mus.br\0expert\0" -"tatsuno.nagano.jp\0kawazu.shizuoka.jp\0" -"santafe.museum\0" -"lighting\0" -"valleedaoste.it\0kazuno.akita.jp\0" -"is-a-bulls-fan.com\0" -"nishiawakura.okayama.jp\0" -"livinghistory.museum\0bar.pro\0" -"shirakawa.gifu.jp\0sanuki.kagawa.jp\0carrier.museum\0" -"k12.ky.us\0\xe6\x94\xbf\xe5\xba\x9c.\xe9\xa6\x99\xe6\xb8\xaf\0" -"now-dns.net\0" -"cn-northwest-1.eb.amazonaws.com.cn\0" -"tsuiki.fukuoka.jp\0" -"fylkesbibl.no\0" -"jcb\0" -"teva\0" -"tksat.bo\0" -"saijo.ehime.jp\0kawajima.saitama.jp\0" -"oguni.kumamoto.jp\0" -"grp.lk\0" -"hk.org\0" -"bingo\0jcp\0" -"narusawa.yamanashi.jp\0" -"balat.no\0" -"ujitawara.kyoto.jp\0\xc3\xb8stre-toten.no\0" -"urbino-pesaro.it\0hamada.shimane.jp\0mo-i-rana.no\0ist\0" -"nz.eu.org\0" -"is-an-actor.com\0" -"asker.no\0extraspace\0from-ri.com\0" -"gaular.no\0" -"aizubange.fukushima.jp\0" -"cr.ua\0" -"ashiya.hyogo.jp\0" -"athleta\0s3.dualstack.ca-central-1.amazonaws.com\0" -"akkeshi.hokkaido.jp\0itv\0" -"solutions\0" -"rome.it\0" -"sagae.yamagata.jp\0atm.pl\0" -"tanabe.kyoto.jp\0" -"m.bg\0azurewebsites.net\0" -"georgia.museum\0" -"salem.museum\0" -"shiranuka.hokkaido.jp\0yoshikawa.saitama.jp\0" -"kumagaya.saitama.jp\0" -"\xe7\xbe\xa4\xe9\xa6\xac.jp\0s3-us-gov-west-1.amazonaws.com\0" -"rankoshi.hokkaido.jp\0hosting\0" -"hotmail\0" -"stockholm.museum\0" -"flickr\0" -"is-with-theband.com\0" -"catholic\0" -"snaase.no\0barsy.uk\0" -"london\0photo\0" -"minowa.nagano.jp\0skole.museum\0trana.no\0" -"kiryu.gunma.jp\0orsta.no\0" -"science.museum\0" -"rendalen.no\0" -"nozawaonsen.nagano.jp\0pccw\0" +"interactive.museum\0norfolk.museum\0\xd7\x99\xd7\xa8\xd7\x95\xd7\xa9\xd7\x9c\xd7\x99\xd7\x9d.museum\0" +"reggio-calabria.it\0" +"gs.svalbard.no\0" +"alibaba\0" +"priv.no\0sch.qa\0" +"sobetsu.hokkaido.jp\0fail\0" +"dominic.ua\0cy.eu.org\0goip.de\0" +"iz.hr\0square7.net\0" +"pe.ca\0masfjorden.no\0" +"tamayu.shimane.jp\0" +"padua.it\0static.land\0" +"marumori.miyagi.jp\0kamitonda.wakayama.jp\0hkt\0" +"aure.no\0onyourside\0" +"*.kobe.jp\0chihayaakasaka.osaka.jp\0lgbt\0" +"misconfused.org\0" +"canada.museum\0blogspot.co.za\0" +"itoman.okinawa.jp\0nakaniikawa.toyama.jp\0" +"avocat.fr\0jeep\0" +"trana.no\0" +"rel.ht\0" +"meraker.no\0km.ua\0" +"academy.museum\0miniserver.com\0" +"jevnaker.no\0" +"harstad.no\0" +"abruzzo.it\0hashbang.sh\0" +"sch.sa\0" +"nic.in\0" +"ah.no\0cz.eu.org\0" +"tranby.no\0" +"kunitachi.tokyo.jp\0" +"priv.me\0" +"kibichuo.okayama.jp\0mugi.tokushima.jp\0" +"si.eu.org\0app.os.stg.fedoraproject.org\0" +"minamiechizen.fukui.jp\0tsubetsu.hokkaido.jp\0" +"ostre-toten.no\0orange\0" +"nakatsugawa.gifu.jp\0" +"vs.it\0smart\0" +"cologne\0" +"tsuruga.fukui.jp\0" +"ln.cn\0" +"loans\0" +"fukusaki.hyogo.jp\0" +"lavagis.no\0cloudns.eu\0" +"itami.hyogo.jp\0wroclaw.pl\0cool\0" +"nico\0" +"udi.br\0tsuno.kochi.jp\0nowaruda.pl\0" +"coop\0" +"e.bg\0" +"eu-west-2.elasticbeanstalk.com\0dk.eu.org\0" +"wv.us\0" +"namerikawa.toyama.jp\0" "lyngdal.no\0" -"pa.gov.br\0frosta.no\0vaga.no\0wskr.gov.pl\0" -"shirosato.ibaraki.jp\0os\xc3\xb8yro.no\0" -"rikubetsu.hokkaido.jp\0" -"mihama.wakayama.jp\0" -"porsgrunn.no\0" -"unzen.nagasaki.jp\0" -"*.yokohama.jp\0etne.no\0zgora.pl\0" -"archaeology.museum\0" -"agrigento.it\0" -"watch\0" -"hasami.nagasaki.jp\0" -"mr.no\0" -"kashiwara.osaka.jp\0rhcloud.com\0" -"\xe7\xb6\xb2\xe7\xb5\xa1.\xe9\xa6\x99\xe6\xb8\xaf\0koeln\0" -"orkanger.no\0read\0" -"infiniti\0" -"pb.gov.br\0" -"horten.no\0" -"us.org\0" -"jio\0" -"dlugoleka.pl\0" -"osaki.miyagi.jp\0synology-ds.de\0" -"industries\0gotdns.org\0" -"pittsburgh.museum\0" -"info\0" -"kuki.saitama.jp\0" -"trentinosued-tirol.it\0yokaichiba.chiba.jp\0nagano.nagano.jp\0taobao\0" -"aeroport.fr\0linde\0" -"dsmynas.org\0" -"showtime\0" -"farm.museum\0" -"zj.cn\0osakikamijima.hiroshima.jp\0shari.hokkaido.jp\0" -"solar\0" -"ishigaki.okinawa.jp\0pa.leg.br\0" -"mad.museum\0name\0degree\0myqnapcloud.com\0" -"\xd0\xb4\xd0\xb5\xd1\x82\xd0\xb8\0" -"avellino.it\0c.cdn77.org\0" -"coupon\0" -"saarland\0" -"ranzan.saitama.jp\0biev\xc3\xa1t.no\0freebox-os.fr\0" -"itami.hyogo.jp\0hokuto.yamanashi.jp\0" -"saka.hiroshima.jp\0palace.museum\0" -"khmelnitskiy.ua\0capital\0" -"kuji.iwate.jp\0" -"koshimizu.hokkaido.jp\0green\0" -"nu.ca\0" -"ah.cn\0" -"ofunato.iwate.jp\0jlc\0qa2.com\0" -"jll\0familyds.net\0" -"donetsk.ua\0" -"\xd8\xa7\xd9\x84\xd8\xac\xd8\xb2\xd8\xa7\xd8\xa6\xd8\xb1\0" -"\xe7\xb6\xb2\xe7\xb5\xa1.cn\0samsung\0" -"k12.vi.us\0verm\xc3\xb6gensberater\0pb.leg.br\0" -"otsuki.yamanashi.jp\0" -"biella.it\0" -"fin.tn\0" -"hirakata.osaka.jp\0database.museum\0" -"airguard.museum\0loseyourip.com\0" -"jor.br\0" -"ip6.arpa\0" -"genoa.it\0" -"luroy.no\0" -"usarts.museum\0jmp\0" -"g\xc3\xa1\xc5\x8bgaviika.no\0" -"domains\0""16-b.it\0" -"b\xc3\xa6rum.no\0" -"servebbs.com\0" -"kamagaya.chiba.jp\0jnj\0" -"my-router.de\0" -"yaizu.shizuoka.jp\0walter\0" -"hyllestad.no\0" -"kai.yamanashi.jp\0" -"beauty\0" -"msk.ru\0" -"0.bg\0vpndns.net\0" -"tomioka.gunma.jp\0botanical.museum\0gjemnes.no\0" -"\xe9\xa3\x9e\xe5\x88\xa9\xe6\xb5\xa6\0" -"aisai.aichi.jp\0ayagawa.kagawa.jp\0mosjoen.no\0schmidt\0" -"noshiro.akita.jp\0kunimi.fukushima.jp\0witd.gov.pl\0" -"chieti.it\0fujisawa.kanagawa.jp\0" -"cityeats\0" -"naturalhistory.museum\0" -"kobierzyce.pl\0jot\0msk.su\0" -"yoshimi.saitama.jp\0giize.com\0forumz.info\0" -"montreal.museum\0sherbrooke.museum\0" -"kawahara.tottori.jp\0intelligence.museum\0" -"rishirifuji.hokkaido.jp\0bern.museum\0statoil\0" -"gov.ac\0joy\0" -"gov.ae\0porsangu.no\0gmbh\0homelinux.net\0" -"gov.af\0ilovecollege.info\0" -"school.za\0" -"iruma.saitama.jp\0" -"hembygdsforbund.museum\0" -"yufu.oita.jp\0zarow.pl\0" -"gov.al\0" -"rio.br\0" -"gov.ba\0guernsey.museum\0" -"gov.ar\0gov.bb\0" -"aerodrome.aero\0gov.as\0beeldengeluid.museum\0" -"gov.au\0" -"gov.bf\0\xe7\xb6\xb2\xe7\xb5\xa1.hk\0" -"matsumae.hokkaido.jp\0" -"gov.bh\0\xd1\x81\xd0\xb0\xd0\xb9\xd1\x82\0" -"gov.az\0azurecontainer.io\0" -"takaoka.toyama.jp\0calvinklein\0" -"gov.bm\0pinb.gov.pl\0" -"gov.bn\0" -"reit\0wellbeingzone.co.uk\0" -"\xe7\xa5\x9e\xe5\xa5\x88\xe5\xb7\x9d.jp\0" -"gov.br\0" -"gov.bs\0" -"gov.bt\0gov.cd\0" -"gov.by\0children.museum\0gorge.museum\0" -"gov.bz\0" -"scientist.aero\0" -"gov.cl\0nu.it\0" -"gov.cm\0" -"gov.cn\0" -"gov.co\0" -"cloudcontrolapp.com\0" -"legnica.pl\0barsy.bg\0" -"gov.cu\0" -"karacol.su\0" -"aviation.museum\0" -"gov.cx\0" -"gov.cy\0" -"ski.no\0" -"gov.dm\0lib.nh.us\0" -"gov.do\0oizumi.gunma.jp\0" -"sb.ua\0" -"kawagoe.saitama.jp\0seljord.no\0" -"wloclawek.pl\0" -"gov.ec\0" -"yokoze.saitama.jp\0" -"gov.ee\0" -"gov.eg\0" -"black\0armenia.su\0" -"gov.dz\0" -"kyowa.hokkaido.jp\0kurotaki.nara.jp\0" -"kadogawa.miyazaki.jp\0network\0" -"navy\0" -"yokkaichi.mie.jp\0kounosu.saitama.jp\0mup.gov.pl\0barsy.de\0" -"kihoku.ehime.jp\0takahata.yamagata.jp\0" -"gov.et\0" -"andria-trani-barletta.it\0" -"botanicalgarden.museum\0askim.no\0k12.co.us\0" -"leg.br\0" -"kpmg\0" -"automotive.museum\0hb.cldmail.ru\0" -"catanzaro.it\0" -"audnedaln.no\0" -"jx.cn\0" -"shima.mie.jp\0" -"kfh\0ddns.net\0" -"staples\0" -"gov.ge\0m.se\0" -"gov.gh\0umbria.it\0" -"gov.gi\0" -"blogsite.org\0" -"ah.no\0" -"gov.gn\0" -"bas.it\0rent\0" -"barsy.eu\0" -"gov.gr\0" -"pi.gov.br\0" -"gov.gu\0" +"hot\0" +"how\0" +"us-west-2.elasticbeanstalk.com\0" "oyama.tochigi.jp\0" -"gov.gy\0" -"gov.hk\0" -"eng.br\0mp.br\0krakow.pl\0" -"te.it\0merckmsd\0" -"yamada.fukuoka.jp\0iwamizawa.hokkaido.jp\0" -"miyazu.kyoto.jp\0bungoono.oita.jp\0citi\0" -"kouyama.kagoshima.jp\0" -"evje-og-hornnes.no\0mt.eu.org\0" -"aseral.no\0" -"gov.ie\0utwente.io\0" -"ryugasaki.ibaraki.jp\0" -"togane.chiba.jp\0hirata.fukushima.jp\0" -"sayo.hyogo.jp\0" -"iki.nagasaki.jp\0pharmacy\0" -"kia\0" -"gov.il\0ambulance.museum\0" -"\xe7\xbb\x84\xe7\xbb\x87.hk\0" -"gov.in\0" -"wales.museum\0city\0" -"gov.iq\0" -"gov.ir\0ise.mie.jp\0" -"gov.is\0" -"gov.it\0" -"otaru.hokkaido.jp\0" -"kim\0" -"sklep.pl\0szkola.pl\0" -"gov.jo\0gifu.jp\0" -"farmers.museum\0" -"kadoma.osaka.jp\0" -"semine.miyagi.jp\0" -"akiruno.tokyo.jp\0eating-organic.net\0" -"glade\0" -"anjo.aichi.jp\0" -"piacenza.it\0gov.kg\0cable-modem.org\0" -"kiso.nagano.jp\0" -"gov.ki\0" -"pi.leg.br\0barsy.in\0" -"barsy.io\0" -"gov.km\0" -"gov.kn\0" -"yaita.tochigi.jp\0tokushima.tokushima.jp\0gov.kp\0jan-mayen.no\0ap-northeast-1.elasticbeanstalk.com\0mytuleap.com\0" -"gov.la\0" -"gov.lb\0" -"gov.lc\0" -"\xe5\xb2\xa9\xe6\x89\x8b.jp\0landes.museum\0" -"tourism.tn\0" -"gov.kw\0" -"v-info.info\0" -"maizuru.kyoto.jp\0gov.ky\0" -"gov.kz\0" -"gov.lk\0" -"barrel-of-knowledge.info\0" -"rest\0" -"gov.ma\0" -"gov.lr\0finn\xc3\xb8y.no\0" -"gov.lt\0baidu\0" -"gov.me\0" -"gov.lv\0tana.no\0" -"gov.mg\0" -"judaica.museum\0" -"gov.ly\0" -"gov.mk\0" -"gov.ml\0" -"gov.mn\0" -"gov.mo\0" -"ski.museum\0" -"politica.bo\0tagami.niigata.jp\0" -"gov.mr\0" -"gov.ms\0" -"ascolipiceno.it\0" -"ujiie.tochigi.jp\0gov.mu\0" -"gov.mv\0" -"force.museum\0gov.mw\0gov.ng\0" -"ogata.akita.jp\0" -"gov.my\0" -"gov.mz\0\xd0\xbe\xd1\x80\xd0\xb3\0" -"sassari.it\0" -"off.ai\0pueblo.bo\0dnsiskinky.com\0" -"\xd1\x83\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0" -"hellas.museum\0virtual.museum\0" -"york.museum\0gov.nr\0" -"s3-ap-northeast-1.amazonaws.com\0redirectme.net\0" -"amfam\0" -"toyama.jp\0" -"baidar.no\0roan.no\0doomdns.com\0" -"broadway\0" -"aomori.jp\0" -"carraramassa.it\0" -"building.museum\0" -"gov.om\0" -"kumejima.okinawa.jp\0" -"dolls.museum\0" -"yamagata.yamagata.jp\0evenes.no\0" -"k12.al.us\0" -"pe.gov.br\0minami-alps.yamanashi.jp\0" -"gov.ph\0" -"shimada.shizuoka.jp\0nachikatsuura.wakayama.jp\0interactive.museum\0" -"kamifurano.hokkaido.jp\0" -"gov.pk\0coupons\0report\0" -"gov.pl\0k12.mo.us\0exchange\0" -"tysvar.no\0gov.pn\0" -"frontier\0" -"gov.qa\0" -"misaki.okayama.jp\0gov.pr\0mlbfan.org\0" -"shop.ht\0kvinesdal.no\0gov.ps\0" -"k.bg\0shop.hu\0gov.pt\0fh.se\0" -"tsukuba.ibaraki.jp\0lier.no\0" -"brussel.museum\0" -"\xe5\xa4\xa7\xe5\x88\x86.jp\0kpn\0" -"gov.py\0" -"lutsk.ua\0" -"*.uberspace.de\0" -"barsycenter.com\0" -"mukawa.hokkaido.jp\0stalbans.museum\0" -"okinoshima.shimane.jp\0" +"bellevue.museum\0" +"nyc.mn\0" +"fans\0style\0" +"\xd9\x81\xd9\x84\xd8\xb3\xd8\xb7\xd9\x8a\xd9\x86\0" +"cl.it\0" +"sevastopol.ua\0" +"okutama.tokyo.jp\0" +"stateofdelaware.museum\0" +"dyndns-work.com\0" +"sel.no\0co.technology\0" +"kwpsp.gov.pl\0" +"engine.aero\0design.museum\0" +"sorreisa.no\0sk.eu.org\0" +"vardo.no\0" +"karumai.iwate.jp\0akishima.tokyo.jp\0itabashi.tokyo.jp\0" +"sue.fukuoka.jp\0" +"\xe6\x94\xbf\xe5\x8a\xa1\0" +"cloudns.in\0" +"ibm\0" +"ba.gov.br\0cesena-forli.it\0hekinan.aichi.jp\0moriyoshi.akita.jp\0" +"inderoy.no\0" +"brindisi.it\0" +"dyndns.ddnss.de\0" +"pe.it\0" +"dyroy.no\0ice\0" +"\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa6\xb0\xe0\xa6\xa4\0" +"filegear-ie.me\0" +"simple-url.com\0" +"de.eu.org\0" +"hazu.aichi.jp\0" +"riodejaneiro.museum\0cloudns.cc\0" +"beardu.no\0" +"bulsan.it\0" +"arendal.no\0icu\0dynamisches-dns.de\0" +"rel.pl\0" +"sa.gov.au\0barsycenter.com\0" +"codes\0" +"takayama.gunma.jp\0olsztyn.pl\0" +"za.com\0" +"mamurogawa.yamagata.jp\0" +"intelligence.museum\0\xc3\xb8stre-toten.no\0farm\0" +"\xc3\xa1k\xc5\x8boluokta.no\0" +"pe.kr\0" +"mer\xc3\xa5ker.no\0" +"dental\0" +"sch.zm\0" +"yosemite.museum\0dyndns.org\0" +"katsuyama.fukui.jp\0" +"x.se\0afamilycompany\0vacations\0" +"rieti.it\0" +"ru.eu.org\0se.eu.org\0" +"kounosu.saitama.jp\0fast\0" +"bill.museum\0" +"akabira.hokkaido.jp\0" +"matsuno.ehime.jp\0fbxos.fr\0" +"\xe6\x95\x8e\xe8\x82\xb2.hk\0\xd1\x81\xd1\x80\xd0\xb1\0wedeploy.io\0" +"achi.nagano.jp\0" +"ifm\0nike\0" +"happou.akita.jp\0" +"gleeze.com\0" +"airforce\0hk.org\0" +"k12.wy.us\0" +"rr.gov.br\0tawaramoto.nara.jp\0" +"mansion.museum\0ulvik.no\0tunk.org\0" +"venezia.it\0" +"tel.tr\0" +"iwata.shizuoka.jp\0incheon.kr\0" +"castle.museum\0bostik\0" +"fhs.no\0h\xc3\xa5.no\0" +"nishiawakura.okayama.jp\0tabuse.yamaguchi.jp\0wskr.gov.pl\0" +"\xe0\xb6\xbd\xe0\xb6\x82\xe0\xb6\x9a\xe0\xb7\x8f\0*.compute.amazonaws.com\0webhop.me\0" +"karasuyama.tochigi.jp\0" +"zushi.kanagawa.jp\0" +"homeunix.com\0" +"trentino-sud-tirol.it\0" +"christmas\0" +"val-daosta.it\0iwakuni.yamaguchi.jp\0" +"joburg\0" +"nic.tj\0" +"jab.br\0*.kitakyushu.jp\0" +"donostia.museum\0kvinnherad.no\0" +"\xd0\xba\xd0\xb0\xd1\x82\xd0\xbe\xd0\xbb\xd0\xb8\xd0\xba\0" +"eti.br\0aizuwakamatsu.fukushima.jp\0kitakami.iwate.jp\0" +"belau.pw\0philips\0sa.com\0" +"cuiaba.br\0kamiichi.toyama.jp\0" +"her\xc3\xb8y.m\xc3\xb8re-og-romsdal.no\0vaksdal.no\0" +"rs.gov.br\0sc.gov.br\0asti.it\0" +"historisches.museum\0" +"nhs.uk\0flynnhub.com\0" +"soo.kagoshima.jp\0" +"pesarourbino.it\0" +"flekkefjord.no\0" +"americana.museum\0leangaviika.no\0torsken.no\0" +"zp.gov.pl\0center\0" +"myhome-server.de\0" +"rmit\0" +"hdfc\0\xe4\xb8\xad\xe4\xbf\xa1\0familyds.com\0" +"srv.br\0milan.it\0tosu.saga.jp\0" +"forgot.his.name\0" +"am.gov.br\0turen.tn\0" +"groks-the.info\0" +"h\xc3\xa1pmir.no\0" +"fujikawa.shizuoka.jp\0" +"tsukuba.ibaraki.jp\0kitadaito.okinawa.jp\0" +"ri.it\0" +"*.nom.br\0okazaki.aichi.jp\0izumo.shimane.jp\0" +"airline.aero\0ca.eu.org\0logoip.com\0" +"bi.it\0museum.tt\0" +"natori.miyagi.jp\0" +"namsskogan.no\0macys\0" +"sondre-land.no\0" +"historisch.museum\0" +"imari.saga.jp\0homedepot\0" +"shoes\0" +"kharkov.ua\0from-nj.com\0" "kawakita.ishikawa.jp\0" -"udi.br\0" -"gwiddle.co.uk\0" -"krd\0lat\0" -"barsy.online\0" -"hasama.oita.jp\0koebenhavn.museum\0" -"higashiosaka.osaka.jp\0gov.sa\0law\0" -"gov.sb\0my.eu.org\0" -"sanjo.niigata.jp\0gov.rs\0gov.sc\0" -"susaki.kochi.jp\0porsanger.no\0gov.sd\0" -"aga.niigata.jp\0gov.ru\0" -"obira.hokkaido.jp\0" -"gov.rw\0gov.sg\0" -"gov.sh\0" -"pe.leg.br\0" -"aichi.jp\0te.ua\0" -"gov.sl\0" -"okinawa.okinawa.jp\0coach\0" -"tjeldsund.no\0" -"shoo.okayama.jp\0" -"gov.st\0" -"valle\xcc\x81""eaoste.it\0" -"gov.sx\0" -"gov.sy\0" -"gov.tj\0" -"gov.tl\0" -"laspezia.it\0kragero.no\0gov.tm\0" -"gov.tn\0" -"gov.to\0" -"gov.ua\0" -"gov.tr\0" -"k12.fl.us\0" -"davvenj\xc3\xa1rga.no\0konskowola.pl\0gov.tt\0" -"fukushima.hokkaido.jp\0boomla.net\0" +"fedorainfracloud.org\0" +"osasco.br\0friuli-vgiulia.it\0" +"cymru\0" +"washtenaw.mi.us\0" +"tsuyama.okayama.jp\0boston\0" +"tokai.ibaraki.jp\0" +"sherbrooke.museum\0virtuel.museum\0" +"tm.cy\0inc\0" +"scholarships\0bryansk.su\0" +"komoro.nagano.jp\0kunigami.okinawa.jp\0" +"lib.al.us\0ing\0" +"uryu.hokkaido.jp\0" +"cc.ri.us\0ink\0" +"turystyka.pl\0" +"directory\0" +"cloudns.us\0" +"rn.gov.br\0int\0" +"kutchan.hokkaido.jp\0" +"verran.no\0" +"lib.me.us\0" +"oristano.it\0" +"bolivia.bo\0" +"group\0" +"play\0" +"e.se\0erni\0" +"ome.tokyo.jp\0" +"chicago.museum\0steiermark.museum\0" +"tm.fr\0yachimata.chiba.jp\0beppu.oita.jp\0" +"camdvr.org\0hb.cldmail.ru\0" +"ap.gov.br\0" +"omi.nagano.jp\0" +"eiheiji.fukui.jp\0" +"ro.gov.br\0seirou.niigata.jp\0nishinoshima.shimane.jp\0" +"somna.no\0" +"setouchi.okayama.jp\0" +"iris.arpa\0ravendb.community\0uklugs.org\0" +"fuji.shizuoka.jp\0gmina.pl\0" +"dvrdns.org\0" +"joboji.iwate.jp\0" +"gs.tm.no\0cd.eu.org\0" +"kawazu.shizuoka.jp\0" +"mo.cn\0chiyoda.tokyo.jp\0" +"dh.bytemark.co.uk\0" +"asahi.ibaraki.jp\0tsu.mie.jp\0" +"ap.gov.pl\0total\0" +"v.bg\0bus.museum\0namsos.no\0" +"nanmoku.gunma.jp\0bel.tr\0" +"tm.hu\0" +"drobak.no\0mex.com\0" +"hikone.shiga.jp\0jcb\0" +"malvik.no\0agric.za\0wang\0fastvps-server.com\0" +"is-a-chef.org\0" +"prato.it\0*.cryptonomic.net\0" +"!city.kitakyushu.jp\0" +"\xd9\x85\xd9\x88\xd8\xa8\xd8\xa7\xd9\x8a\xd9\x84\xd9\x8a\0" +"mayfirst.org\0" +"shirosato.ibaraki.jp\0izumisano.osaka.jp\0kiyose.tokyo.jp\0jcp\0" +"omasvuotna.no\0" +"schokoladen.museum\0official.academy\0" +"togane.chiba.jp\0yotsukaido.chiba.jp\0ist\0" +"wa.au\0clothing\0" +"hongo.hiroshima.jp\0" +"services.aero\0tas.au\0rivne.ua\0" "her\xc3\xb8y.nordland.no\0" -"gov.tw\0" -"mywire.org\0" +"conference.aero\0" +"andriatranibarletta.it\0museum.mv\0" +"museum.mw\0is-a-therapist.com\0" +"itv\0" +"tm.km\0" +"pomorskie.pl\0dyndns.tv\0" +"bonn.museum\0" +"kiyosato.hokkaido.jp\0" +"museum.no\0" +"nagato.yamaguchi.jp\0" +"casacam.net\0" +"bamble.no\0" +"pv.it\0" "is-a-candidate.org\0" -"boehringer\0" -"uto.kumamoto.jp\0gov.uk\0" -"ena.gifu.jp\0pa.gov.pl\0lds\0" -"kv\xc3\xa6nangen.no\0" -"kvafjord.no\0gov.vc\0visa\0" -"loginto.me\0" -"gov.ve\0" -"zoological.museum\0" -"trentin-sud-tirol.it\0sandoy.no\0panasonic\0" -"salat.no\0futuremailing.at\0" -"gov.vn\0" -"bardu.no\0" -"scjohnson\0" -"inabe.mie.jp\0aigo\0" -"ibaraki.jp\0" -"ns.ca\0" -"land\0" -"mandal.no\0now-dns.org\0" -"bokn.no\0" -"\xe7\xa7\xbb\xe5\x8a\xa8\0s3-website-sa-east-1.amazonaws.com\0" -"fukumitsu.toyama.jp\0stada\0" -"recht.pro\0" -"asahi.chiba.jp\0" -"vibo-valentia.it\0" -"kh.ua\0" -"nasu.tochigi.jp\0leka.no\0sorfold.no\0gov.ws\0yombo.me\0" -"tourism.pl\0" -"h\xc3\xa1""bmer.no\0onion\0" -"abbvie\0" -"yamaxun\0" -"tra.kp\0gs.aa.no\0net-freaks.com\0" -"kujukuri.chiba.jp\0fukagawa.hokkaido.jp\0" -"nl.eu.org\0" -"takaharu.miyazaki.jp\0viva\0" -"mydatto.com\0" -"is.it\0lifestyle\0" -"yamanakako.yamanashi.jp\0" -"itano.tokushima.jp\0" -"cc.in.us\0" -"zgorzelec.pl\0" -"br.com\0" -"far.br\0lib.ee\0notodden.no\0" -"gov.za\0vivo\0" -"act.au\0pr.gov.br\0nanbu.tottori.jp\0" -"moseushi.hokkaido.jp\0" -"padua.it\0susono.shizuoka.jp\0" -"ciscofreak.com\0" -"karm\xc3\xb8y.no\0" -"vang.no\0" -"haibara.shizuoka.jp\0" -"gov.zm\0lotte\0" -"kiho.mie.jp\0valley.museum\0" -"cambridge.museum\0" -"mol.it\0vagan.no\0glass\0" -"info.gu\0" -"takayama.nagano.jp\0" -"ox.rs\0" -"gov.zw\0lotto\0" -"zlg.br\0bungotakada.oita.jp\0" -"dabur\0kyoto\0" -"hawaii.museum\0" -"ninohe.iwate.jp\0" -"info.ht\0" -"info.hu\0" -"makinohara.shizuoka.jp\0" -"dazaifu.fukuoka.jp\0" -"bellevue.museum\0nativeamerican.museum\0theater\0" -"llc\0" -"k12.md.us\0courses\0" -"tas.gov.au\0shiki.saitama.jp\0eu.meteorapp.com\0" -"educator.aero\0" -"info.et\0sakura\0" -"egersund.no\0homelinux.org\0js.org\0" -"is-a-techie.com\0pr.leg.br\0" -"mobile\0" -"field.museum\0hamaroy.no\0" -"production.aero\0takamatsu.kagawa.jp\0wallonie.museum\0philips\0" -"ostroda.pl\0tgory.pl\0" -"\xd0\xb8\xd0\xba\xd0\xbe\xd0\xbc.museum\0" -"basketball\0" -"emb.kw\0" -"idf.il\0securitytactics.com\0" -"manaus.br\0hof.no\0" -"austrheim.no\0" -"kred\0" -"noheji.aomori.jp\0my-vigor.de\0" -"firenze.it\0" -"dnsdojo.com\0" -"giehtavuoatna.no\0" -"inder\xc3\xb8y.no\0" -"mobily\0" -"tiaa\0" -"azumino.nagano.jp\0nesset.no\0" -"ng.eu.org\0dsmynas.net\0" -"hn.cn\0\xe0\xac\xad\xe0\xac\xbe\xe0\xac\xb0\xe0\xac\xa4\0" -"\xe7\xa6\x8f\xe4\xba\x95.jp\0kashiwazaki.niigata.jp\0" -"no-ip.ca\0" -"info.cx\0" -"hakata.fukuoka.jp\0" -"m\xc3\xa5s\xc3\xb8y.no\0lib.nj.us\0" -"trentinosu\xcc\x88""d-tirol.it\0" -"info.ec\0higashimurayama.tokyo.jp\0stateofdelaware.museum\0" -"yachiyo.ibaraki.jp\0" -"tamakawa.fukushima.jp\0" -"parma.it\0firewall-gateway.com\0" -"psc.br\0lol\0" -"cn.it\0" -"cloud\0servemp3.com\0" -"\xe7\xbb\x84\xe7\xbb\x87\xe6\x9c\xba\xe6\x9e\x84\0" -"nsn.us\0azure-mobile.net\0" -"aurskog-holand.no\0" -"eniwa.hokkaido.jp\0" -"info.bb\0parti.se\0" -"info.at\0" -"info.au\0gs.vf.no\0" -"bari.it\0k12.de.us\0" -"lpl\0" -"palermo.it\0farmstead.museum\0" -"info.az\0familyds.org\0" -"engerdal.no\0" -"info.bo\0inf.br\0" -"\xd8\xb9\xd8\xb1\xd8\xa8\0" -"nakadomari.aomori.jp\0" -"minamiechizen.fukui.jp\0k.se\0" -"lib.or.us\0" -"north.museum\0rahkkeravju.no\0" -"mallorca.museum\0" -"man\0" -"chonan.chiba.jp\0bo.nordland.no\0" -"hayashima.okayama.jp\0map\0paris.eu.org\0" -"lavagis.no\0\xe0\xa6\xac\xe0\xa6\xbe\xe0\xa6\x82\xe0\xa6\xb2\xe0\xa6\xbe\0mba\0" -"bifuka.hokkaido.jp\0" -"info.co\0meiwa.mie.jp\0" -"b\xc3\xa1id\xc3\xa1r.no\0" -"inf.cu\0" -"ozu.ehime.jp\0storage\0from-oh.com\0" -"tx.us\0" -"lima-city.rocks\0" -"nagasu.kumamoto.jp\0" -"ss.it\0" -"okawa.kochi.jp\0" -"trapani.it\0" -"izumi.kagoshima.jp\0svelvik.no\0" -"rightathome\0" -"storfjord.no\0" -"tajimi.gifu.jp\0" -"otari.nagano.jp\0ltd\0" -"lubin.pl\0" -"yahaba.iwate.jp\0uzhgorod.ua\0" -"davvenjarga.no\0" -"engine.aero\0" -"is-a-caterer.com\0" -"huissier-justice.fr\0fjaler.no\0" -"kasumigaura.ibaraki.jp\0" -"cc.hi.us\0" -"reggiocalabria.it\0med\0" -"shimonoseki.yamaguchi.jp\0" -"rygge.no\0" -"press.cy\0static-access.net\0" -"from-md.com\0" -"mantova.it\0" -"men\0" -"l\xc3\xb8""dingen.no\0" -"lib.ga.us\0" -"valle\xcc\x81""e-aoste.it\0childrens.museum\0" -"uozu.toyama.jp\0" -"matsumoto.nagano.jp\0oita.oita.jp\0" -"shop.ro\0" -"dyndns-home.com\0" -"balsan-suedtirol.it\0hyundai\0" -"k12.vt.us\0" -"natuurwetenschappen.museum\0" -"kvits\xc3\xb8y.no\0" -"sekikawa.niigata.jp\0piw.gov.pl\0" -"stockholm\0tkmaxx\0" -"santacruz.museum\0" -"realestate\0dd-dns.de\0" -"\xe7\xb6\xb2\xe7\xbb\x9c.hk\0" -"sdn.gov.pl\0" -"nowaruda.pl\0nat.tn\0cartier\0mangyshlak.su\0" -"shop.pl\0" -"emergency.aero\0" -"shonai.yamagata.jp\0" -"sakai.ibaraki.jp\0" -"shangrila\0" -"development.run\0" -"office-on-the.net\0" -"tenkawa.nara.jp\0" -"sweetpepper.org\0" -"yomitan.okinawa.jp\0bus.museum\0philadelphiaarea.museum\0po.gov.pl\0" -"\xe5\xb1\xb1\xe5\x8f\xa3.jp\0bamble.no\0" -"from-ca.com\0" -"friuli-vegiulia.it\0" -"tv.bb\0" -"aquila.it\0" -"art.br\0mil\0" -"mn.it\0" -"ponpes.id\0" -"mit\0fastpanel.direct\0" -"cc.mi.us\0vlaanderen\0" -"tv.bo\0gold\0" -"is-a-hard-worker.com\0pantheonsite.io\0" -"zao.miyagi.jp\0golf\0" -"tv.br\0cn.ua\0" -"leclerc\0" -"\xd8\xb4\xd8\xa8\xd9\x83\xd8\xa9\0" -"johana.toyama.jp\0" -"lipsy\0" -"k12.ne.us\0" -"roma.it\0jaworzno.pl\0lib.la.us\0" -"kusu.oita.jp\0fuchu.tokyo.jp\0" -"i.bg\0" -"\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa7\0clinique\0beep.pl\0" -"art.do\0" -"\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa9\0" -"inf.mk\0" -"pesarourbino.it\0" -"bi.it\0kitayama.wakayama.jp\0baths.museum\0" -"saotome.st\0\xe4\xbd\x9b\xe5\xb1\xb1\0" -"mlb\0" -"jus.br\0" -"art.dz\0" -"trentino-sued-tirol.it\0" -"coal.museum\0myds.me\0" -"happou.akita.jp\0info.ve\0" -"tysv\xc3\xa6r.no\0" -"cc.pa.us\0" -"greta.fr\0" -"stargard.pl\0mma\0" -"aid.pl\0" -"info.vn\0mls\0" -"friuli-veneziagiulia.it\0shunan.yamaguchi.jp\0" -"elasticbeanstalk.com\0" -"goog\0" -"lib.ny.us\0pioneer\0" -"chuo.osaka.jp\0" -"ariake.saga.jp\0" -"xnbay.com\0" -"trentino-stirol.it\0usuki.oita.jp\0" -"istmein.de\0" -"shiraoka.saitama.jp\0olkusz.pl\0" -"s3-website.us-east-2.amazonaws.com\0" -"rep.kp\0" -"tips\0" -"ora.gunma.jp\0timekeeping.museum\0isa-hockeynut.com\0" -"uvic.museum\0" -"nord-odal.no\0" -"ayabe.kyoto.jp\0" -"rn.it\0gokase.miyazaki.jp\0info.tn\0" -"folkebibl.no\0moe\0own.pm\0" -"info.tr\0cc.ri.us\0" -"caltanissetta.it\0info.tt\0moi\0" -"shikabe.hokkaido.jp\0" -"mom\0dyndns.ddnss.de\0" -"art.ht\0intl.tn\0" -"info.tz\0" -"trustee.museum\0" -"wakasa.tottori.jp\0" -"theatre\0" -"mov\0statefarm\0" -"higashihiroshima.hiroshima.jp\0" -"agano.niigata.jp\0" -"hiranai.aomori.jp\0opencraft.hosting\0" -"shiksha\0" -"\xc3\xa1lt\xc3\xa1.no\0" -"kolobrzeg.pl\0" -"cci.fr\0fujieda.shizuoka.jp\0" -"nab\0" -"info.ro\0" -"tv.im\0" -"presidio.museum\0" -"info.sd\0" -"berlev\xc3\xa5g.no\0" -"tv.it\0" -"britishcolumbia.museum\0\xd1\x80\xd1\x83\xd1\x81\0" -"ybo.party\0" -"passagens\0trading\0" -"date.fukushima.jp\0futaba.fukushima.jp\0tokashiki.okinawa.jp\0iveco\0nba\0" -"alstom\0barcelona\0" -"kamikitayama.nara.jp\0" -"groundhandling.aero\0fujiyoshida.yamanashi.jp\0" -"hikone.shiga.jp\0" -"ushistory.museum\0rugby\0" -"ssl.origin.cdn77-secure.org\0" -"modern.museum\0energy\0" -"mihama.chiba.jp\0tsuruoka.yamagata.jp\0" -"info.pk\0" -"info.pl\0forgot.her.name\0" -"suli.hu\0sologne.museum\0inf.ua\0" -"msd\0" -"niteroi.br\0" -"shimoda.shizuoka.jp\0" -"abo.pa\0info.pr\0" -"akdn\0" -"gs.nl.no\0" -"izunokuni.shizuoka.jp\0" -"olsztyn.pl\0cc.il.us\0" -"conf.au\0" -"bmd.br\0" -"iwade.wakayama.jp\0" -"misasa.tottori.jp\0" -"county.museum\0logoip.com\0" -"agric.za\0" -"info.na\0" -"cc.wi.us\0" -"belluno.it\0info.mv\0info.nf\0lib.il.us\0" -"radom.pl\0" -"info.ni\0mtn\0" -"journal.aero\0" -"mtr\0" -"nec\0" -"nanyo.yamagata.jp\0" -"lib.va.us\0" -"arendal.no\0info.nr\0" -"hachioji.tokyo.jp\0" -"machida.tokyo.jp\0tv.na\0" -"kurogi.fukuoka.jp\0" -"\xc4\x8d\xc3\xa1hcesuolo.no\0" -"nadex\0" -"mn.us\0" -"trentino-su\xcc\x88""dtirol.it\0glogow.pl\0" -"li.it\0" -"net\0u2-local.xnbay.com\0" -"ac.gov.br\0puglia.it\0gushikami.okinawa.jp\0info.la\0iveland.no\0" -"new\0" -"is-a-soxfan.org\0" -"odo.br\0" -"kitahiroshima.hokkaido.jp\0finance\0" -"nfl\0" -"preservation.museum\0" -"meiwa.gunma.jp\0" -"art.pl\0" -"i.ng\0" -"cn-north-1.eb.amazonaws.com.cn\0" -"detroit.museum\0" -"karelia.su\0" -"nordkapp.no\0" -"ichinomiya.aichi.jp\0ngo\0" -"namsskogan.no\0" -"massacarrara.it\0suwalki.pl\0" -"living.museum\0" -"tozawa.yamagata.jp\0press.se\0" -"microlight.aero\0" -"nsw.edu.au\0verona.it\0" -"nhk\0from-in.com\0eu.org\0" -"ad.jp\0" -"club\0" -"ullensaker.no\0" -"kisosaki.mie.jp\0" -"\xe8\xb4\xad\xe7\x89\xa9\0" -"mw.gov.pl\0" -"hl.cn\0cesena-forli\xcc\x80.it\0jetzt\0" -"ishikari.hokkaido.jp\0java\0\xd9\x85\xd9\x88\xd9\x82\xd8\xb9\0serveexchange.com\0" -"i.ph\0" -"info.ke\0asmatart.museum\0" -"seirou.niigata.jp\0scienceandindustry.museum\0wiih.gov.pl\0ac.leg.br\0" -"udine.it\0info.ki\0stadt.museum\0" -"\xe5\x9f\xbc\xe7\x8e\x89.jp\0" -"s3-website-ap-southeast-2.amazonaws.com\0" -"minamiuonuma.niigata.jp\0blogspot.vn\0" -"barsy.shop\0" -"kitagata.gifu.jp\0" -"art.sn\0" -"cl.it\0" -"higashiagatsuma.gunma.jp\0" -"isernia.it\0tv.sd\0" -"abruzzo.it\0" -"roma.museum\0" -"mihara.hiroshima.jp\0" -"ntdll.top\0" -"zone\0" -"bolzano-altoadige.it\0" -"k12.dc.us\0" -"ms.gov.br\0chofu.tokyo.jp\0b\xc3\xa1l\xc3\xa1t.no\0" -"seki.gifu.jp\0rich\0" -"lib.as.us\0" -"ichikai.tochigi.jp\0" -"asso.eu.org\0" -"ind.br\0nichinan.miyazaki.jp\0balsfjord.no\0" -"reliance\0" -"i.se\0" -"cri.br\0" -"naturhistorisches.museum\0grue.no\0" -"zuerich\0" -"hakui.ishikawa.jp\0tcp4.me\0" -"tv.tr\0" -"siena.it\0kodaira.tokyo.jp\0" -"joinville.br\0caserta.it\0" -"kharkiv.ua\0" -"mie.jp\0tv.tz\0" -"co.krd\0" -"s\xc3\xb8r-aurdal.no\0service.gov.uk\0" -"austin.museum\0" -"blogspot.re\0" -"mt.gov.br\0etajima.hiroshima.jp\0" -"hachijo.tokyo.jp\0konin.pl\0" -"london.museum\0cloudycluster.net\0" -"chuo.fukuoka.jp\0" -"ta.it\0\xd1\x81\xd1\x80\xd0\xb1\0" -"shobara.hiroshima.jp\0sandnessj\xc3\xb8""en.no\0" -"press.ma\0" -"blogspot.ro\0" -"goiania.br\0" -"sport.hu\0notogawa.shiga.jp\0" -"bel.tr\0" -"haga.tochigi.jp\0blogspot.rs\0" -"!city.kawasaki.jp\0blogspot.ru\0blogspot.se\0" -"kmpsp.gov.pl\0from-wv.com\0" -"blogspot.sg\0" -"blogspot.si\0mysecuritycamera.net\0" -"hanamigawa.chiba.jp\0blogspot.sk\0freeddns.us\0" -"hjartdal.no\0" -"miyako.fukuoka.jp\0zhytomyr.ua\0ms.leg.br\0" -"blogspot.sn\0" -"ueda.nagano.jp\0" -"iwakura.aichi.jp\0" -"nishiarita.saga.jp\0stat.no\0tr.eu.org\0ras.ru\0" -"blogspot.td\0" -"shiftedit.io\0" -"hurdal.no\0" -"matsuura.nagasaki.jp\0" -"kasahara.gifu.jp\0" -"amica\0" -"myeffect.net\0" -"kazimierz-dolny.pl\0" -"hidaka.saitama.jp\0" -"vi.it\0now\0" -"takahashi.okayama.jp\0fujikawa.yamanashi.jp\0is-a-bookkeeper.com\0" -"blogspot.tw\0blogspot.ug\0" -"cc.ut.us\0" -"game-server.cc\0" -"sumoto.hyogo.jp\0tsuyama.okayama.jp\0" -"midori.chiba.jp\0" -"mt.leg.br\0" -"trentinosu\xcc\x88""dtirol.it\0" -"uk.net\0" -"ind.gt\0heroy.nordland.no\0" -"blogspot.mr\0" -"hjelmeland.no\0tokke.no\0" -"yoro.gifu.jp\0artanddesign.museum\0muncie.museum\0abkhazia.su\0" -"blogspot.mx\0" -"castle.museum\0monticello.museum\0soccer\0blogspot.my\0" -"iamallama.com\0" -"blogspot.nl\0" -"lunner.no\0nra\0university\0" -"pistoia.it\0mombetsu.hokkaido.jp\0ky.us\0blogspot.no\0" -"hadsel.no\0swiftcover\0" -"berlin.museum\0obi\0" -"ashikaga.tochigi.jp\0" -"ind.in\0" -"pictet\0" -"yuasa.wakayama.jp\0earth\0" -"\xe1\x83\x92\xe1\x83\x94\0" -"nrw\0" -"blogspot.pe\0" -"\xda\x80\xd8\xa7\xd8\xb1\xd8\xaa\0" -"fauske.no\0serveftp.net\0" -"likescandy.com\0" -"international\0syno-ds.de\0" -"lillehammer.no\0nikon\0" -"health-carereform.com\0" -"show.aero\0" -"matsuzaki.shizuoka.jp\0blogspot.qa\0" -"kawai.iwate.jp\0otsu.shiga.jp\0" -"hl.no\0blogspot.pt\0" -"s3.dualstack.eu-west-1.amazonaws.com\0" -"shinagawa.tokyo.jp\0" -"s3-website.ap-south-1.amazonaws.com\0" +"k12.or.us\0" +"shibetsu.hokkaido.jp\0shiojiri.nagano.jp\0" +"surrey.museum\0forsale\0" +"\xe5\xa4\xa7\xe9\x98\xaa.jp\0" +"museum.om\0" +"tm.mc\0" +"tajimi.gifu.jp\0edunet.tn\0" +"izumozaki.niigata.jp\0" +"tm.mg\0" +"hokkaido.jp\0" +"bozen.it\0" +"dyndns-remote.com\0" +"ri.us\0hotels\0" +"agdenes.no\0" +"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd9\x87\0" +"itakura.gunma.jp\0" +"dyndns.ws\0" +"mo.it\0toyoura.hokkaido.jp\0" +"tm.no\0k12.la.us\0" +"woodside\0" +"delaware.museum\0h\xc3\xa1mm\xc3\xa1rfeasta.no\0lamborghini\0reliance\0" +"cancerresearch\0" +"is-a-chef.com\0" +"arkhangelsk.su\0" +"s\xc3\xa1l\xc3\xa1t.no\0" +"hiraya.nagano.jp\0" +"yamato.fukushima.jp\0" +"webspace.rocks\0" +"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xd9\x8a\xd8\xa9\0" +"jio\0u2.xnbay.com\0" +"gen.mi.us\0" +"brother\0" +"cloudns.pw\0" +"tm.pl\0" +"town\0" +"kawanishi.hyogo.jp\0" +"charter.aero\0vegas\0" +"k12.id.us\0" +"sanuki.kagawa.jp\0agematsu.nagano.jp\0haga.tochigi.jp\0" +"holdings\0" +"higashi.fukushima.jp\0" +"nes.akershus.no\0" +"\xe6\x9b\xb8\xe7\xb1\x8d\0" +"profesional.bo\0lviv.ua\0homesecuritypc.com\0" +"dnsup.net\0" +"vossevangen.no\0" +"m\xc4\x81ori.nz\0" +"cc.mo.us\0pgfog.com\0" +"guge\0" +"kanonji.kagawa.jp\0" +"nebraska.museum\0" +"kawagoe.saitama.jp\0" +"download\0" +"southcarolina.museum\0bremanger.no\0" +"grosseto.it\0\xe0\xa4\x95\xe0\xa5\x89\xe0\xa4\xae\0" +"evje-og-hornnes.no\0" +"oyodo.nara.jp\0" +"hasama.oita.jp\0" +"chernigov.ua\0" +"sumoto.hyogo.jp\0" +"insurance.aero\0tm.ro\0" +"makurazaki.kagoshima.jp\0" +"\xd9\x87\xd9\x85\xd8\xb1\xd8\xa7\xd9\x87\0" +"aomori.aomori.jp\0jll\0" +"homegoods\0toys\0" +"tm.se\0cupcake.is\0" +"seoul.kr\0" +"neues.museum\0" +"se.gov.br\0" +"c.bg\0" +"upow.gov.pl\0" +"\xe6\xb7\xa1\xe9\xa9\xac\xe9\x94\xa1\0" +"tsuruoka.yamagata.jp\0goodyear\0pictet\0" +"lidl\0" +"jdevcloud.com\0" +"jmp\0" +"s\xc3\xa1lat.no\0" +"tahara.aichi.jp\0nakagusuku.okinawa.jp\0" +"steinkjer.no\0" +"yokoshibahikari.chiba.jp\0nanjo.okinawa.jp\0" +"press.museum\0" +"jnj\0" +"lpages.co\0" +"higashine.yamagata.jp\0" +"illustration.museum\0" +"mragowo.pl\0" +"bz.it\0mmafan.biz\0" +"amusement.aero\0s3.dualstack.ca-central-1.amazonaws.com\0cya.gg\0" +"villas\0" +"hyllestad.no\0cc.wa.us\0life\0" +"tatsuno.hyogo.jp\0maori.nz\0" +"kwp.gov.pl\0" +"uto.kumamoto.jp\0" +"dyr\xc3\xb8y.no\0" +"atsuma.hokkaido.jp\0" +"nsw.au\0inder\xc3\xb8y.no\0cc.ga.us\0" +"sabae.fukui.jp\0design\0" +"sasebo.nagasaki.jp\0jot\0" +"gucci\0*.alces.network\0" +"kannami.shizuoka.jp\0" +"joy\0" +"nanao.ishikawa.jp\0akagi.shimane.jp\0*.bzz.dapps.earth\0" +"iraq.museum\0esurance\0" +"pc.it\0" +"guam.gu\0" +"cust.prod.thingdust.io\0" +"horonobe.hokkaido.jp\0" +"ibestad.no\0" +"abc.br\0novara.it\0nichinan.tottori.jp\0fujikawaguchiko.yamanashi.jp\0" +"wales.museum\0" +"shikokuchuo.ehime.jp\0help\0" +"textile.museum\0c66.me\0" +"\xd1\x83\xd0\xba\xd1\x80\0" +"dyndns-free.com\0" +"uki.kumamoto.jp\0" +"anthropology.museum\0botanicalgarden.museum\0raholt.no\0gjemnes.no\0" +"us-4.evennode.com\0" +"deloitte\0" +"mydissent.net\0" +"kustanai.ru\0" +"veg\xc3\xa5rshei.no\0leitungsen.de\0" +"valleedaoste.it\0" +"settlers.museum\0sa-east-1.elasticbeanstalk.com\0" +"sa.gov.pl\0clubmed\0" +"paleo.museum\0" +"rnrt.tn\0" +"kustanai.su\0" +"kyiv.ua\0" +"control.aero\0tm.za\0data\0lundbeck\0dattolocal.com\0" +"chiba.jp\0" +"rollag.no\0date\0" +"plus\0" "maibara.shiga.jp\0" -"control.aero\0" -"ascoli-piceno.it\0" -"*.sapporo.jp\0" +"trani-andria-barletta.it\0epson\0" +"ruovat.no\0mo.us\0" +"ueda.nagano.jp\0" +"like\0" +"birdart.museum\0" +"gateway.museum\0pagefrontapp.com\0" +"higashihiroshima.hiroshima.jp\0" +"fribourg.museum\0etnedal.no\0" +"port.fr\0" +"union.aero\0" +"aju.br\0" +"higashichichibu.saitama.jp\0" +"furano.hokkaido.jp\0" +"yamanouchi.nagano.jp\0\xe0\xaa\xad\xe0\xaa\xbe\xe0\xaa\xb0\xe0\xaa\xa4\0" +"stange.no\0us-3.evennode.com\0" +"toda.saitama.jp\0" +"newport.museum\0locus\0" +"nose.osaka.jp\0" +"north.museum\0" +"kfh\0" +"here\0" +"bukhara.su\0ras.ru\0" +"nishinoomote.kagoshima.jp\0" +"c.la\0" +"oe.yamagata.jp\0" +"limo\0*.s5y.io\0" +"rocher\0" +"godo.gifu.jp\0shikama.miyagi.jp\0pc.pl\0" +"jur.pro\0" +"miasa.nagano.jp\0" +"n\xc3\xb8tter\xc3\xb8y.no\0" +"en.it\0" "design.aero\0" -"ntt\0" -"upow.gov.pl\0" -"ichihara.chiba.jp\0ind.kw\0blogspot.is\0" -"blogspot.it\0" -"shimizu.hokkaido.jp\0uslivinghistory.museum\0" -"bedzin.pl\0webhop.info\0" -"k12.ms.us\0k12.nc.us\0" -"lib.ks.us\0news\0" -"politie\0" -"codes\0" -"blogspot.jp\0" -"g.bg\0gripe\0" -"off\0" -"philately.museum\0dnsfor.me\0" -"ochi.kochi.jp\0democrat\0winners\0" -"bg.it\0" -"broke-it.net\0" -"cc.ar.us\0next\0" -"bale.museum\0" -"\xc3\xb8yer.no\0blogspot.kr\0" -"ot.it\0pd.it\0gitlab.io\0" -"godo.gifu.jp\0iwanuma.miyagi.jp\0hangout\0" -"toon.ehime.jp\0" -"blogspot.li\0" -"shinshinotsu.hokkaido.jp\0" -"sakaiminato.tottori.jp\0" -"omachi.nagano.jp\0" -"hair\0" -"al.gov.br\0toyokawa.aichi.jp\0" -"blogspot.lt\0blogspot.md\0" -"lib.ok.us\0blogspot.lu\0" -"turin.it\0" -"cri.nz\0blogspot.mk\0" -"ragusa.it\0" -"alto-adige.it\0" -"info.zm\0restaurant\0" -"nyc\0" -"niigata.niigata.jp\0" -"gallo\0filegear.me\0" -"qld.edu.au\0hobol.no\0" -"knx-server.net\0" -"yamaga.kumamoto.jp\0" -"epilepsy.museum\0blogspot.fi\0" -"kherson.ua\0" -"nishimera.miyazaki.jp\0" -"blackfriday\0" -"usantiques.museum\0" -"umb.it\0aogashima.tokyo.jp\0" -"media.hu\0rawa-maz.pl\0blogspot.fr\0" -"geek.nz\0" -"nom.ad\0trentin-sudtirol.it\0" -"uhren.museum\0bykle.no\0nom.ae\0customer.speedpartner.de\0" +"takinoue.hokkaido.jp\0shinjo.yamagata.jp\0" +"barcelona.museum\0guru\0" +"bas.it\0kita.kyoto.jp\0" +"link\0" +"nyny.museum\0" +"wa.us\0" +"show.aero\0usantiques.museum\0" +"asago.hyogo.jp\0wiih.gov.pl\0" +"heimatunduhren.museum\0" +"ikoma.nara.jp\0" +"ga.us\0" +"gyeongbuk.kr\0ybo.faith\0" +"kia\0" +"rg.it\0shizukuishi.iwate.jp\0" +"shobara.hiroshima.jp\0" +"uber.space\0" +"hb.cn\0store.nf\0" +"bushey.museum\0ashgabad.su\0" +"bg.it\0mimata.miyazaki.jp\0" +"kim\0promo\0ch.eu.org\0" +"matsubara.osaka.jp\0" +"us-2.evennode.com\0" +"logistics.aero\0windows\0" +"minano.saitama.jp\0" +"salem.museum\0" +"cremona.it\0higashiyama.kyoto.jp\0" +"watch-and-clock.museum\0" +"shibecha.hokkaido.jp\0" +"funagata.yamagata.jp\0" +"motosu.gifu.jp\0kuroiso.tochigi.jp\0" +"yoshida.shizuoka.jp\0" +"paris.eu.org\0" +"davvenj\xc3\xa1rga.no\0amica\0" +"western.museum\0" +"environmentalconservation.museum\0schule\0own.pm\0" +"noto.ishikawa.jp\0iwatsuki.saitama.jp\0" +"info.gu\0" +"nom.ad\0yuza.yamagata.jp\0" +"nom.ae\0" "nom.af\0" -"nom.ag\0kita.tokyo.jp\0" -"nom.ai\0" -"k12.sc.us\0" -"nom.al\0" -"aeroclub.aero\0" -"biz.bb\0history.museum\0" -"takino.hyogo.jp\0blogspot.gr\0" -"biz.at\0" -"altoadige.it\0" -"author.aero\0rocks\0" -"freesite.host\0" -"ab.ca\0malbork.pl\0" -"biz.az\0grandrapids.museum\0" -"al.leg.br\0" -"blogspot.hk\0" -"s3-website-ap-northeast-1.amazonaws.com\0" -"shingu.hyogo.jp\0" -"tt.im\0space\0" -"ally\0" -"webcam\0blogspot.hr\0" -"vi.us\0" -"kaminokawa.tochigi.jp\0" -"blogspot.hu\0blogspot.ie\0" -"ud.it\0homeoffice.gov.uk\0" -"yonago.tottori.jp\0mayfirst.info\0nom.cl\0" -"yukuhashi.fukuoka.jp\0" -"kitahata.saga.jp\0vennesla.no\0blogspot.in\0" -"nom.co\0\xe6\xbe\xb3\xe9\x96\x80\0tiffany\0" -"shimokawa.hokkaido.jp\0blogspot.ba\0" -"homebuilt.aero\0" -"blogspot.be\0" -"blogspot.bg\0" -"biz.cy\0" -"bydgoszcz.pl\0" -"unazuki.toyama.jp\0ind.tn\0biz.dk\0blogspot.bj\0" -"ashgabad.su\0" -"sakata.yamagata.jp\0" -"plumbing\0" -"blogspot.ca\0" -"kushima.miyazaki.jp\0one\0" -"ong\0" -"tmp.br\0blogspot.cf\0" -"zakopane.pl\0" -"rl.no\0s3-ap-northeast-2.amazonaws.com\0blogspot.ch\0" -"soni.nara.jp\0onl\0" -"amsterdam.museum\0archaeological.museum\0edeka\0jdevcloud.com\0" -"blogspot.cl\0" -"conf.lv\0" -"hongo.hiroshima.jp\0" -"maryland.museum\0juegos\0" -"nom.es\0biz.et\0for-some.biz\0" -"blogspot.de\0" -"blogspot.cv\0" -"*.bd\0tele.amune.org\0" -"oi.kanagawa.jp\0\xe4\xb8\xad\xe4\xbf\xa1\0blogspot.cz\0" -"blogspot.dk\0" -"ooo\0" -"campinas.br\0miniserver.com\0" -"lodingen.no\0" -"valleeaoste.it\0mitake.gifu.jp\0" -"nom.fr\0mizunami.gifu.jp\0kristiansund.no\0" -"gs.bu.no\0broker\0freetls.fastly.net\0nom.gd\0" -"lego\0nom.ge\0" -"bihoro.hokkaido.jp\0gub.uy\0" -"tobe.ehime.jp\0" -"bozen-sudtirol.it\0" +"nom.ag\0" +"isumi.chiba.jp\0shirakawa.gifu.jp\0witd.gov.pl\0" +"square.museum\0nom.ai\0" +"astronomy.museum\0vinnytsia.ua\0" +"kasahara.gifu.jp\0nom.al\0" +"funabashi.chiba.jp\0" +"\xe4\xb8\x96\xe7\x95\x8c\0" +"nature.museum\0bo.nordland.no\0" +"info.ht\0ono.fukui.jp\0" +"info.hu\0tank.museum\0" +"bloomberg\0" +"kofu.yamanashi.jp\0co.education\0" +"sp.leg.br\0" +"freiburg.museum\0" +"machida.tokyo.jp\0" +"obu.aichi.jp\0gifu.gifu.jp\0ashikaga.tochigi.jp\0" +"info.et\0" +"arte.bo\0homeftp.org\0" +"us-1.evennode.com\0" +"shika.ishikawa.jp\0" +"c.se\0" +"erotica.hu\0" +"nom.cl\0" +"is-very-nice.org\0" +"tagawa.fukuoka.jp\0shishikui.tokushima.jp\0" +"air-traffic-control.aero\0nom.co\0from-ne.com\0" +"colonialwilliamsburg.museum\0" +"homes\0" +"bifuka.hokkaido.jp\0ogawa.saitama.jp\0" +"yamashina.kyoto.jp\0" +"matsushima.miyagi.jp\0kodaira.tokyo.jp\0" +"imageandsound.museum\0" +"tado.mie.jp\0is-a-chef.net\0" +"live\0\xe5\x95\x86\xe6\xa0\x87\0murmansk.su\0" +"fr\xc3\xa6na.no\0nore-og-uvdal.no\0" +"kasumigaura.ibaraki.jp\0" +"niepce.museum\0s\xc3\xb8gne.no\0" +"gr.it\0" +"info.cx\0" +"room\0" +"nexus\0us-east-1.amazonaws.com\0" +"t.bg\0is-found.org\0forumz.info\0" +"ivanovo.su\0" +"campinas.br\0gr.jp\0" +"info.ec\0" +"nom.es\0ulm.museum\0baby\0" +"kpn\0" +"barsy.me\0serveexchange.com\0homelink.one\0" +"game.tw\0" +"voss.no\0" +"store.ve\0applinzi.com\0" +"info.bb\0frosinone.it\0" +"moscow.museum\0" +"nom.fr\0info.at\0" +"info.au\0at.eu.org\0" +"nom.gd\0" +"nom.ge\0" +"!city.sendai.jp\0" +"nannestad.no\0" +"info.az\0social\0" +"tsuchiura.ibaraki.jp\0krd\0lat\0" "nom.gl\0" -"trentino-s-tirol.it\0minami.tokushima.jp\0" -"*.ck\0" -"uk.eu.org\0" -"yaese.okinawa.jp\0nom.gt\0" -"iitate.fukushima.jp\0" -"directory\0" -"lg.jp\0kimobetsu.hokkaido.jp\0media.pl\0" -"cdn77-ssl.net\0" -"tatamotors\0" -"bryansk.su\0nom.hn\0" -"s3.eu-west-3.amazonaws.com\0" -"monza-brianza.it\0" -"biz.id\0shouji\0" -"org\0" -"urawa.saitama.jp\0" -"minamiaiki.nagano.jp\0pay\0" -"e12.ve\0games\0" -"ppg.br\0higashisumiyoshi.osaka.jp\0" -"nom.im\0" -"\xed\x95\x9c\xea\xb5\xad\0" -"fussa.tokyo.jp\0" -"*.er\0" -"no.it\0" -"\xe6\xbe\xb3\xe9\x97\xa8\0barsy.site\0" -"cc.nj.us\0" -"*.fj\0" -"*.fk\0" -"flatanger.no\0f\xc3\xb8rde.no\0" -"gz.cn\0" -"labour.museum\0skierva.no\0" -"haus\0" -"blogspot.ae\0nom.ke\0" -"\xc3\xb8ystre-slidre.no\0" -"biz.ki\0" -"nishiazai.shiga.jp\0cranbrook.museum\0" -"pro.az\0" -"z.bg\0celtic.museum\0blogspot.al\0" -"nom.km\0blogspot.am\0" -"virginia.museum\0" -"amex\0" -"ott\0rodeo\0" -"airline.aero\0pro.br\0" -"bz.it\0" -"fukudomi.saga.jp\0tendo.yamagata.jp\0" -"komaki.aichi.jp\0" -"indiana.museum\0itau\0" -"b\xc3\xa5tsfjord.no\0nom.li\0" -"rockart.museum\0ybo.trade\0" -"citadel\0" -"m\xc3\xa1tta-v\xc3\xa1rjjat.no\0privatizehealthinsurance.net\0" -"pet\0" -"juif.museum\0football\0" -"viterbo.it\0cc.pr.us\0" -"choyo.kumamoto.jp\0" -"krodsherad.no\0ovh\0" -"szex.hu\0" -"morioka.iwate.jp\0nom.mg\0s3.dualstack.us-east-1.amazonaws.com\0" -"pro.cy\0gets-it.net\0" -"tynset.no\0s3-website-us-east-1.amazonaws.com\0nom.mk\0" -"gsm.pl\0nym.by\0" -"frankfurt.museum\0nym.bz\0" -"g.se\0pics\0" -"group.aero\0epost\0" -"stcgroup\0" -"nom.nc\0" -"pro.ec\0" -"biz.mv\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa5\x8b\xe0\xa4\xa4\0" -"biz.mw\0" -"goshiki.hyogo.jp\0poker\0" -"biz.ni\0lamer\0" -"nom.ni\0" -"sebastopol.ua\0" -"yamaguchi.jp\0" -"friuliveneziagiulia.it\0*.jm\0" -"norfolk.museum\0biz.nr\0phd\0" -"historisches.museum\0" -"nom.nu\0" -"redstone\0" -"so.it\0kumenan.okayama.jp\0" -"takamori.nagano.jp\0funagata.yamagata.jp\0" -"natural.bo\0campobasso.it\0\xd1\x83\xd0\xba\xd1\x80\0" -"ojiya.niigata.jp\0*.kh\0" -"hirosaki.aomori.jp\0waw.pl\0" -"nagato.yamaguchi.jp\0nom.pa\0americanexpress\0pid\0" -"kr\xc3\xa5""anghke.no\0nom.pe\0agakhan\0" -"giving\0" -"tsuchiura.ibaraki.jp\0ina.saitama.jp\0" -"club.aero\0" -"historisch.museum\0biz.pk\0" -"biz.pl\0pin\0" -"pb.ao\0smola.no\0nom.pl\0" -"matsuyama.ehime.jp\0ikeda.fukui.jp\0mydatto.net\0" -"ikeda.hokkaido.jp\0" -"university.museum\0user.party.eus\0" -"or.at\0biz.pr\0nom.qa\0" -"omitama.ibaraki.jp\0kanegasaki.iwate.jp\0" -"higashichichibu.saitama.jp\0" -"or.bi\0" -"nom.pw\0" -"kartuzy.pl\0dynamic-dns.info\0" -"cc.gu.us\0" -"lincoln.museum\0veg\xc3\xa5rshei.no\0" -"sasebo.nagasaki.jp\0mysecuritycamera.org\0bloxcms.com\0" -"achi.nagano.jp\0" -"*.mm\0" -"pro.ht\0sos.pl\0nom.re\0" -"or.ci\0shimane.shimane.jp\0nym.gr\0" -"nishiaizu.fukushima.jp\0tashkent.su\0" -"lg.ua\0" -"institute\0" -"64-b.it\0nym.gy\0" -"or.cr\0nom.ro\0" -"verbania.it\0cloudaccess.net\0" -"*.np\0travel\0nom.rs\0" -"nym.ie\0nom.si\0" -"wajima.ishikawa.jp\0" -"mayfirst.org\0" -"research.aero\0spdns.org\0" -"nuoro.it\0pavia.it\0cymru\0" -"toscana.it\0" -"skjerv\xc3\xb8y.no\0" -"yoshida.shizuoka.jp\0osaka\0\xd8\xa7\xd8\xa8\xd9\x88\xd8\xb8\xd8\xa8\xd9\x8a\0nom.st\0" -"skien.no\0" -"indigena.bo\0" -"erotika.hu\0biz.tj\0" -"*.pg\0nom.tj\0" -"from.hr\0ikoma.nara.jp\0" -"ulsan.kr\0" -"nom.tm\0" -"sabae.fukui.jp\0" -"sci.eg\0pnc\0biz.ua\0" -"biz.tr\0" -"ozu.kumamoto.jp\0fujikawaguchiko.yamanashi.jp\0biz.tt\0" -"chikushino.fukuoka.jp\0" -"railroad.museum\0" -"nom.ug\0" -"nishinoshima.shimane.jp\0setagaya.tokyo.jp\0" -"geisei.kochi.jp\0" -"katsuyama.fukui.jp\0" -"pug.it\0" -"historicalsociety.museum\0" -"natura\0" -"tanagura.fukushima.jp\0nom.vc\0" -"surgeonshall.museum\0bjarkoy.no\0nym.la\0virtual-user.de\0" -"kameyama.mie.jp\0ryokami.saitama.jp\0" -"grocery\0youtube\0nym.lc\0nom.vg\0" -"nom.uy\0" -"cc.me.us\0" -"biz.vn\0dynns.com\0nym.li\0" -"nym.kz\0" -"tatar\0" -"kasaoka.okayama.jp\0pro.na\0fage\0" -"dyndns-wiki.com\0" -"gop.pk\0" -"pro.mv\0" -"nym.lt\0" -"kaho.fukuoka.jp\0nym.lu\0nym.me\0" -"wa.edu.au\0ipiranga\0" -"e.bg\0" -"monza.it\0" -"or.id\0dielddanuorri.no\0" -"rel.ht\0iijima.nagano.jp\0nym.mn\0" -"minamitane.kagoshima.jp\0ping\0" -"\xd8\xa8\xda\xbe\xd8\xa7\xd8\xb1\xd8\xaa\0lasalle\0" -"pink\0" -"samnanger.no\0" -"oldnavy\0nym.mx\0" -"inazawa.aichi.jp\0" -"bozen.it\0pro.om\0" -"losangeles.museum\0" -"or.it\0" -"nango.fukushima.jp\0" -"gs.tm.no\0" -"americanantiques.museum\0wzmiuw.gov.pl\0" -"certification.aero\0aki.kochi.jp\0" -"fail\0" -"pro\0" -"or.jp\0" -"nym.nz\0" -"k12.pa.us\0\xe0\xb6\xbd\xe0\xb6\x82\xe0\xb6\x9a\xe0\xb7\x8f\0" -"*.landing.myjino.ru\0" -"nom.za\0" -"or.ke\0pru\0" -"pro.pr\0" -"cool\0is-a-doctor.com\0half.host\0" -"satx.museum\0" -"nym.pe\0" -"coop\0ostrowiec.pl\0fedex\0" -"biz.zm\0" -"naval.museum\0balashov.su\0" -"or.kr\0stjordal.no\0" -"is-a-socialist.com\0" -"chippubetsu.hokkaido.jp\0" -"minamimaki.nagano.jp\0" -"historichouses.museum\0vista\0" -"nym.pt\0" -"kokonoe.oita.jp\0ringerike.no\0backplaneapp.io\0" -"medio-campidano.it\0" -"nogata.fukuoka.jp\0" -"embetsu.hokkaido.jp\0pub\0" -"dyndns1.de\0" -"\xe0\xaa\xad\xe0\xaa\xbe\xe0\xaa\xb0\xe0\xaa\xa4\0a.prod.fastly.net\0" -"agematsu.nagano.jp\0iizuna.nagano.jp\0" -"takayama.gunma.jp\0paderborn.museum\0" -"ichiba.tokushima.jp\0myftp.org\0" -"toyako.hokkaido.jp\0" -"doctor\0" -"z.se\0" -"homedns.org\0synology.me\0" -"or.na\0" -"tec.ve\0" -"ulm.museum\0goip.de\0" -"or.mu\0localhistory.museum\0playstation\0" -"nym.ro\0" -"hirokawa.fukuoka.jp\0" -"ge.it\0*.ye\0" -"bentley\0" -"fhv.se\0\xe6\x94\xbf\xe5\x8a\xa1\0" -"higashimatsuyama.saitama.jp\0nym.sk\0" -"urasoe.okinawa.jp\0pwc\0" -"ddnslive.com\0" -"iiyama.nagano.jp\0" -"tr.it\0shimotsuma.ibaraki.jp\0" -"kozaki.chiba.jp\0pro.tt\0" -"trentinsud-tirol.it\0" -"nym.su\0" -"harima.hyogo.jp\0serveftp.org\0cloud.fedoraproject.org\0" -"nym.sx\0" -"nm.cn\0" -"ogaki.gifu.jp\0\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" -"\xc3\xa5lg\xc3\xa5rd.no\0fans\0" -"ddr.museum\0is-slick.com\0" -"froland.no\0sochi.su\0" -"fukuchiyama.kyoto.jp\0" -"rel.pl\0" -"nym.tw\0" -"trentino-a-adige.it\0moka.tochigi.jp\0" -"eco.br\0pro.vn\0" -"im.it\0" -"owariasahi.aichi.jp\0jeep\0jp.net\0operaunite.com\0" -"or.pw\0" -"suisse.museum\0" -"r\xc3\xb8""d\xc3\xb8y.no\0markets\0" -"blog.bo\0" -"blog.br\0lundbeck\0" -"servequake.com\0" -"yusui.kagoshima.jp\0k12.in.us\0\xd8\xa7\xd9\x84\xd8\xa7\xd8\xb1\xd8\xaf\xd9\x86\0" -"gen.in\0" -"chanel\0" -"dreamhosters.com\0" -"mizuho.tokyo.jp\0os.hordaland.no\0freeddns.org\0" -"k12.wy.us\0" -"jondal.no\0alipay\0" -"ine.kyoto.jp\0" -"hamatama.saga.jp\0" -"kamiamakusa.kumamoto.jp\0rackmaze.com\0" -"gr.com\0" -"tonami.toyama.jp\0kraanghke.no\0" -"laakesvuemie.no\0" -"hokkaido.jp\0" -"le.it\0farm\0lgbt\0vision\0" -"kanazawa.ishikawa.jp\0tr.no\0" -"est-le-patron.com\0for-our.info\0" -"targi.pl\0" -"or.th\0" -"yawata.kyoto.jp\0nagawa.nagano.jp\0" -"wajiki.tokushima.jp\0" -"conference.aero\0" -"fast\0" -"shonai.fukuoka.jp\0theworkpc.com\0" -"or.ug\0" +"info.bo\0law\0applicationcloud.io\0" +"nankoku.kochi.jp\0" "com.ac\0" -"aparecida.br\0" -"or.tz\0" -"com.af\0" +"ebetsu.hokkaido.jp\0*.elb.amazonaws.com.cn\0" +"com.af\0nom.gt\0" "com.ag\0" -"jeonbuk.kr\0" "com.ai\0" -"heguri.nara.jp\0tochigi.tochigi.jp\0imageandsound.museum\0" -"balsan.it\0" -"com.al\0yamagata.jp\0andebu.no\0czeladz.pl\0" -"or.us\0ninja\0" -"com.ba\0nabari.mie.jp\0" -"com.ar\0com.bb\0leirvik.no\0" -"schoenbrunn.museum\0" -"yamazoe.nara.jp\0stranda.no\0" -"com.au\0cc.nh.us\0" -"com.aw\0" +"com.al\0aparecida.br\0" +"ddnslive.com\0" +"chippubetsu.hokkaido.jp\0" +"info.co\0" +"monash\0nom.hn\0" +"com.ba\0" +"com.ar\0com.bb\0art.br\0pesaro-urbino.it\0" +"r\xc3\xa1hkker\xc3\xa1vju.no\0hisamitsu\0" +"pt.it\0" +"com.au\0" +"kashima.saga.jp\0" +"com.aw\0tours\0" "com.bh\0" -"com.bi\0suzuki\0" -"com.az\0minamiashigara.kanagawa.jp\0" -"gx.cn\0" -"kumakogen.ehime.jp\0" -"com.bm\0kochi.jp\0" -"com.bn\0cust.disrec.thingdust.io\0" -"com.bo\0shingo.aomori.jp\0" +"com.bi\0" +"com.az\0" +"s3.dualstack.eu-west-1.amazonaws.com\0" +"fukushima.hokkaido.jp\0tokorozawa.saitama.jp\0" +"com.bm\0oregontrail.museum\0read-books.org\0" +"com.bn\0" +"com.bo\0nom.im\0" +"ogano.saitama.jp\0" "com.br\0" -"com.bs\0bauern.museum\0" +"com.bs\0" "com.bt\0" -"x.bg\0isla.pr\0map.fastly.net\0" +"software.aero\0pubol.museum\0" +"abira.hokkaido.jp\0" "com.by\0com.ci\0" -"com.bz\0" -"gj\xc3\xb8vik.no\0gen.nz\0" -"com.cm\0ee.eu.org\0" -"com.cn\0" -"com.co\0ch.it\0saku.nagano.jp\0s3.dualstack.sa-east-1.amazonaws.com\0" -"association.aero\0" -"philadelphia.museum\0" -"safety\0" -"com.cu\0chigasaki.kanagawa.jp\0com.de\0virtueeldomein.nl\0" -"com.cw\0sakahogi.gifu.jp\0" -"com.cy\0selfip.net\0" -"pu.it\0" -"keymachine.de\0" -"hatogaya.saitama.jp\0jambyl.su\0" -"com.dm\0massa-carrara.it\0" -"agrinet.tn\0" -"com.do\0dovre.no\0" -"isumi.chiba.jp\0lifeinsurance\0" -"lesja.no\0" -"com.ec\0kamishihoro.hokkaido.jp\0" -"com.ee\0hakodate.hokkaido.jp\0" -"nico\0" -"com.eg\0" -"com.dz\0e.se\0dattolocal.com\0" -"hisamitsu\0" -"\xe7\xb5\x84\xe7\xb9\x94.tw\0" -"messina.it\0" -"com.es\0lancome\0" -"com.et\0vestre-toten.no\0" -"yuzawa.niigata.jp\0" -"warszawa.pl\0" -"shimane.jp\0" -"murayama.yamagata.jp\0" -"championship.aero\0" -"meloy.no\0" -"kusatsu.shiga.jp\0" -"hemnes.no\0nord-fron.no\0" -"pvt.k12.ma.us\0isa-geek.org\0" -"botanicgarden.museum\0" +"com.bz\0ad.jp\0flickr\0" +"lds\0" +"com.cm\0plc.co.im\0" +"com.cn\0traniandriabarletta.it\0" +"pueblo.bo\0com.co\0art.do\0" +"\xe5\x85\xac\xe5\x8f\xb8.cn\0" +"tohnosho.chiba.jp\0kawanabe.kagoshima.jp\0nakagawa.nagano.jp\0" +"politica.bo\0" +"sh.cn\0" +"com.cu\0tr\xc3\xb8gstad.no\0com.de\0" +"sanagochi.tokushima.jp\0" +"com.cw\0karasjok.no\0nom.ke\0" +"com.cy\0tolga.no\0store.ro\0" +"art.dz\0lom.it\0mantova.it\0" +"nakadomari.aomori.jp\0" +"com.dm\0\xe5\x85\xac\xe5\x8f\xb8.hk\0" +"com.do\0nom.km\0" +"\xe6\xbb\x8b\xe8\xb3\x80.jp\0weather\0" +"koka.shiga.jp\0" +"com.ec\0bashkiria.ru\0" +"com.ee\0" +"com.eg\0settlement.museum\0herokussl.com\0" +"gets-it.net\0" +"works.aero\0" +"com.dz\0" +"nom.li\0" +"omachi.saga.jp\0" +"bearalvahki.no\0" +"\xe7\xa7\x8b\xe7\x94\xb0.jp\0store.st\0" +"mandal.no\0north-kazakhstan.su\0obninsk.su\0" +"com.es\0bashkiria.su\0" +"com.et\0" +"nom.mg\0mein-iserv.de\0" +"choyo.kumamoto.jp\0" +"music.museum\0nom.mk\0" "com.fr\0" -"com.ge\0" -"com.gh\0kaszuby.pl\0" -"com.gi\0lib.co.us\0" -"sld.do\0com.gl\0" -"com.gn\0naoshima.kagawa.jp\0" -"com.gp\0tsuruga.fukui.jp\0likes-pie.com\0" -"hdfc\0" -"med.br\0com.gr\0furniture.museum\0" -"oyodo.nara.jp\0takaishi.osaka.jp\0woodside\0" -"com.gt\0" -"com.gu\0" -"\xe4\xb8\x96\xe7\x95\x8c\0" -"nakama.fukuoka.jp\0gangwon.kr\0" -"com.gy\0aremark.no\0knightpoint.systems\0" -"com.hk\0" -"kashihara.nara.jp\0" -"rennebu.no\0" -"bc.ca\0com.hn\0hiji.oita.jp\0" -"red\0" -"uppo.gov.pl\0" -"nishi.osaka.jp\0" -"com.hr\0himeji.hyogo.jp\0adult\0" -"gen.tr\0" -"com.ht\0" -"oksnes.no\0" -"kyowa.akita.jp\0" -"wodzislaw.pl\0ren\0" -"nrw.museum\0stuttgart.museum\0" -"ve.it\0fuefuki.yamanashi.jp\0scotland.museum\0" -"com.im\0goto.nagasaki.jp\0" -"qvc\0" -"com.io\0" -"com.iq\0honefoss.no\0" -"med.ec\0com.is\0" -"fnd.br\0med.ee\0arkhangelsk.su\0" -"ass.km\0" -"ardal.no\0vote\0" -"is-a-guru.com\0" -"vaporcloud.io\0" -"lib.tx.us\0" -"movistar\0" -"com.jo\0country\0" -"gives\0" -"kamogawa.chiba.jp\0yokawa.hyogo.jp\0slask.pl\0voto\0" -"tokigawa.saitama.jp\0" -"yatsuka.shimane.jp\0erni\0tuxfamily.org\0" -"sakaki.nagano.jp\0com.kg\0is-a-musician.com\0" -"freeboxos.com\0" +"anjo.aichi.jp\0" +"com.ge\0nom.nc\0" +"palmas.br\0\xd8\xa7\xd8\xb1\xd8\xa7\xd9\x85\xd9\x83\xd9\x88\0" +"com.gh\0" +"economia.bo\0com.gi\0" +"nom.ni\0" +"com.gl\0kawara.fukuoka.jp\0tenri.nara.jp\0" +"barsy.uk\0" +"com.gn\0email\0" +"com.gp\0" +"delta\0" +"com.gr\0nagara.chiba.jp\0florist\0" +"dovre.no\0porsanger.no\0s3-us-gov-west-1.amazonaws.com\0" +"com.gt\0art.ht\0" +"com.gu\0from-de.com\0" +"towada.aomori.jp\0takata.fukuoka.jp\0" +"nom.nu\0" +"chambagri.fr\0" +"com.gy\0ap-northeast-1.elasticbeanstalk.com\0" +"iwanuma.miyagi.jp\0" +"catering.aero\0com.hk\0roros.no\0" +"watch\0" +"vladimir.su\0" +"com.hn\0semboku.akita.jp\0hanamigawa.chiba.jp\0chiyoda.gunma.jp\0kuwana.mie.jp\0" +"cinema.museum\0" +"com.hr\0" +"nom.pa\0lug.org.uk\0" +"com.ht\0higashishirakawa.gifu.jp\0" +"lom.no\0vestvagoy.no\0" +"ce.gov.br\0" +"a.bg\0romskog.no\0nom.pe\0" +"is-into-games.com\0" +"inatsuki.fukuoka.jp\0" +"tra.kp\0" +"com.im\0abudhabi\0" +"kudoyama.wakayama.jp\0nom.pl\0" +"com.io\0aejrie.no\0davvenjarga.no\0" +"nango.fukushima.jp\0band\0forex\0" +"com.iq\0nationalfirearms.museum\0" +"com.is\0bergen.no\0nom.qa\0" +"bank\0" +"kurashiki.okayama.jp\0musashino.tokyo.jp\0hotel.tz\0" +"botany.museum\0newmexico.museum\0nom.pw\0" +"llc\0university\0" +"higashinaruse.akita.jp\0fujimi.saitama.jp\0" +"dclk\0" +"bunkyo.tokyo.jp\0office-on-the.net\0" +"com.jo\0mycd.eu\0" +"kawatana.nagasaki.jp\0satosho.okayama.jp\0kawaguchi.saitama.jp\0" +"honda\0barrel-of-knowledge.info\0" +"ch.it\0kanazawa.ishikawa.jp\0" +"com.kg\0matta-varjjat.no\0nom.re\0mckinsey\0ciscofreak.com\0" +"*.bd\0higashiagatsuma.gunma.jp\0" "com.ki\0" -"sciencehistory.museum\0\xe3\x82\xb3\xe3\x83\xa0\0" -"naamesjevuemie.no\0" -"mitou.yamaguchi.jp\0com.km\0sorreisa.no\0" -"miami\0" -"masaki.ehime.jp\0com.kp\0" -"com.la\0" +"com.km\0schoenbrunn.museum\0vladimir.ru\0ybo.review\0" +"ichinomiya.aichi.jp\0numata.hokkaido.jp\0" +"lans.museum\0" +"mitake.gifu.jp\0com.kp\0" +"com.la\0nom.ro\0" "com.lb\0" -"com.lc\0consulado.st\0" -"seiyo.ehime.jp\0" +"veterinaire.km\0com.lc\0uzhgorod.ua\0is-a-musician.com\0freedesktop.org\0" +"info.ve\0nom.rs\0" +"tanabe.kyoto.jp\0" "com.kw\0" -"com.ky\0ivano-frankivsk.ua\0" +"pgafan.net\0" +"com.ky\0missile.museum\0" "com.kz\0" -"com.lk\0beiarn.no\0" -"nike\0" -"\xe7\x86\x8a\xe6\x9c\xac.jp\0fukui.fukui.jp\0shinjuku.tokyo.jp\0" -"com.lr\0" -"discover\0router.management\0" -"pokrovsk.su\0" -"com.lv\0" -"com.mg\0inderoy.no\0ril\0" -"com.ly\0kv\xc3\xa6""fjord.no\0" -"trader.aero\0kawanabe.kagoshima.jp\0saiki.oita.jp\0rio\0" -"com.mk\0coastaldefence.museum\0rip\0" -"kosaka.akita.jp\0com.ml\0" -"jewishart.museum\0" -"goodhands\0bplaced.de\0" -"com.mo\0" -"gc.ca\0tainai.niigata.jp\0nm.us\0" -"kanonji.kagawa.jp\0com.na\0nore-og-uvdal.no\0est.pr\0" -"ito.shizuoka.jp\0com.ms\0verdal.no\0" -"med.ht\0com.mt\0" -"com.mu\0family.museum\0" -"com.mv\0com.nf\0cyon.link\0" +"com.lk\0nom.si\0" +"pa.it\0info.vn\0arab\0" +"*.ck\0" +"miyako.iwate.jp\0" +"k12.ok.us\0" +"com.lr\0wlocl.pl\0\xe5\xb7\xa5\xe8\xa1\x8c\0" +"\xd9\xbe\xd8\xa7\xda\xa9\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0" +"isa-hockeynut.com\0" +"com.lv\0ostrowiec.pl\0nom.st\0" +"com.mg\0" +"kawasaki.miyagi.jp\0" +"com.ly\0" +"com.mk\0" +"com.ml\0nom.tj\0" +"historyofscience.museum\0midtre-gauldal.no\0bir.ru\0" +"minami.fukuoka.jp\0" +"com.mo\0southwest.museum\0nom.tm\0drud.io\0" +"com.na\0" +"com.ms\0showtime\0" +"com.mt\0lol\0" +"com.mu\0plaza.museum\0" +"com.mv\0com.nf\0" "com.mw\0com.ng\0" "com.mx\0" -"kitakami.iwate.jp\0com.my\0com.ni\0" -"iwate.iwate.jp\0maserati\0" -"is-saved.org\0" -"ogimi.okinawa.jp\0" -"gon.pk\0" -"com.nr\0\xd8\xa7\xd9\x84\xd8\xb9\xd9\x84\xd9\x8a\xd8\xa7\xd9\x86\0" -"karate.museum\0dyndns-remote.com\0" -"c.bg\0iwakuni.yamaguchi.jp\0" -"hamamatsu.shizuoka.jp\0dinosaur.museum\0freedesktop.org\0" +"com.my\0com.ni\0nom.ug\0" +"yonezawa.yamagata.jp\0" +"production.aero\0sciencecenters.museum\0" +"lodi.it\0info.tn\0" +"chiryu.aichi.jp\0" +"blogdns.com\0" +"com.nr\0info.tr\0" +"lib.mt.us\0lib.nd.us\0" +"info.tt\0lpl\0" +"ooguy.com\0nom.vc\0" +"*.er\0" +"sande.m\xc3\xb8re-og-romsdal.no\0" +"veterinaire.fr\0rikuzentakata.iwate.jp\0jeonnam.kr\0" +"nom.vg\0" +"info.tz\0" +"t.se\0nom.uy\0" +"art.pl\0" "com.om\0" -"campidanomedio.it\0tosu.saga.jp\0" -"kashima.ibaraki.jp\0com.pa\0" -"fukaya.saitama.jp\0numazu.shizuoka.jp\0" -"kainan.wakayama.jp\0" -"com.pe\0" -"inami.wakayama.jp\0com.pf\0" -"inagawa.hyogo.jp\0draydns.de\0" -"com.ph\0" -"reggioemilia.it\0yuki.ibaraki.jp\0starostwo.gov.pl\0" -"com.pk\0" -"com.pl\0\xe7\xb5\x84\xe7\xb9\x94.\xe9\xa6\x99\xe6\xb8\xaf\0" -"sakado.saitama.jp\0" -"exeter.museum\0s\xc3\xb8ndre-land.no\0cc.ok.us\0" -"com.qa\0" +"*.fj\0" +"*.fk\0" +"\xe4\xb8\x89\xe9\x87\x8d.jp\0" +"com.pa\0cc.pa.us\0" +"nishinomiya.hyogo.jp\0" +"tsurugashima.saitama.jp\0" +"aukra.no\0com.pe\0" +"hara.nagano.jp\0com.pf\0man\0" +"pharmacy.museum\0" +"piemonte.it\0trentinosudtirol.it\0com.ph\0map\0zapto.xyz\0" +"mba\0" +"izena.okinawa.jp\0" +"museumvereniging.museum\0com.pk\0" +"tomioka.gunma.jp\0com.pl\0" +"takasaki.gunma.jp\0hiraizumi.iwate.jp\0" +"info.ro\0" +"historichouses.museum\0com.qa\0" "com.pr\0" -"culturalcenter.museum\0sandefjord.no\0com.ps\0agency\0" -"halloffame.museum\0com.pt\0" -"leangaviika.no\0" -"x443.pw\0" -"nyuzen.toyama.jp\0com.py\0barsy.menu\0" -"piedmont.it\0" -"decorativearts.museum\0lib.mo.us\0" -"gniezno.pl\0dyndns.info\0" -"sm.ua\0" -"risor.no\0" -"sasayama.hyogo.jp\0" -"saitama.saitama.jp\0" -"com.re\0" -"kanoya.kagoshima.jp\0" -"med.ly\0" -"hitachiota.ibaraki.jp\0atlanta.museum\0" -"sld.pa\0" +"com.ps\0" +"com.pt\0info.sd\0" +"g\xc3\xa1\xc5\x8bgaviika.no\0" +"hida.gifu.jp\0" +"hotel.lk\0com.py\0paris\0" +"\xe5\xb1\xb1\xe5\x8f\xa3.jp\0fujixerox\0" +"yachiyo.chiba.jp\0" +"trentinosued-tirol.it\0\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa7\xb0\xe0\xa6\xa4\0" +"holtalen.no\0" +"\xe7\xb5\x84\xe7\xb9\x94.tw\0" +"soeda.fukuoka.jp\0" +"gorge.museum\0com.re\0au.eu.org\0be.eu.org\0" +"info.pk\0" +"trentinosuedtirol.it\0tokamachi.niigata.jp\0gushikami.okinawa.jp\0info.pl\0ltd\0" +"miyoshi.saitama.jp\0art.sn\0" "com.ro\0" -"yodobashi\0" -"com.sa\0land-4-sale.us\0" -"com.sb\0" -"com.sc\0" -"com.sd\0direct\0" -"com.se\0com.ru\0" -"s3-website-us-west-2.amazonaws.com\0" -"h\xc3\xa1pmir.no\0com.rw\0com.sg\0" +"denmark.museum\0uhren.museum\0com.sa\0servegame.com\0" +"info.pr\0com.sb\0" +"com.sc\0nom.za\0" +"hs.kr\0com.sd\0" +"\xc3\xa5l.no\0com.se\0com.ru\0" +"mashiki.kumamoto.jp\0" +"com.rw\0com.sg\0" "com.sh\0" -"\xe5\x95\x86\xe6\xa0\x87\0" -"com.sl\0" -"nishinomiya.hyogo.jp\0kustanai.ru\0" -"com.sn\0" -"passenger-association.aero\0com.so\0" -"tsushima.nagasaki.jp\0" -"com.st\0uy.com\0" -"x.se\0isa-geek.com\0" -"com.sv\0" -"\xe8\x8c\xa8\xe5\x9f\x8e.jp\0otama.fukushima.jp\0" -"com.sy\0" +"rade.no\0americanfamily\0" +"valledaosta.it\0" +"froya.no\0" +"store.bb\0com.sl\0med\0" +"com.sn\0ericsson\0" +"com.so\0git-repos.de\0" +"ryuoh.shiga.jp\0" +"*.jm\0info.na\0is-a-democrat.com\0" +"britishcolumbia.museum\0" +"motobu.okinawa.jp\0com.st\0" +"myravendb.com\0" +"info.mv\0info.nf\0com.sv\0men\0" +"trainer.aero\0" +"info.ni\0com.sy\0barsy.bg\0" "com.tj\0" -"crimea.ua\0ybo.faith\0" -"jinsekikogen.hiroshima.jp\0nishikawa.yamagata.jp\0sor-aurdal.no\0" -"\xc3\xa5mli.no\0t\xc3\xb8nsberg.no\0med.om\0com.tm\0kustanai.su\0" +"*.kh\0" +"com.tm\0" "com.tn\0" -"hatoyama.saitama.jp\0museumcenter.museum\0com.to\0" -"med.pa\0com.ua\0" -"charter.aero\0pvh.br\0com.tr\0simple-url.com\0" -"salvador.br\0" -"com.tt\0" -"com.tw\0com.ug\0" -"marche.it\0" -"goodyear\0" -"sap\0" -"dyndns-office.com\0hzc.io\0med.pl\0" -"kvitsoy.no\0cn.eu.org\0" -"saobernardo.br\0tp.it\0sas\0" -"carboniaiglesias.it\0" -"rmit\0" -"boavista.br\0kawaba.gunma.jp\0com.vc\0" -"photos\0sbi\0" -"com.ve\0" -"vgs.no\0" -"bialowieza.pl\0" -"hakuba.nagano.jp\0com.uy\0com.vi\0" -"l\xc3\xb8ten.no\0com.uz\0" -"sca\0" -"mod.gi\0scb\0" -"aizuwakamatsu.fukushima.jp\0com.vn\0sbs\0" -"\xe5\x85\xb5\xe5\xba\xab.jp\0" -"tinn.no\0dynamisches-dns.de\0" -"from-vt.com\0" -"from-az.net\0" -"delta\0" -"lucerne.museum\0com.vu\0" -"minamisanriku.miyagi.jp\0" -"oki.fukuoka.jp\0" -"hita.oita.jp\0fyresdal.no\0" -"saito.miyazaki.jp\0" -"ingatlan.hu\0" -"med.sa\0" -"com.ws\0s3.dualstack.eu-west-2.amazonaws.com\0" -"qc.ca\0med.sd\0" -"olbiatempio.it\0" -"\xe6\x9b\xb8\xe7\xb1\x8d\0" -"chirurgiens-dentistes-en-france.fr\0" -"firestone\0*.compute.amazonaws.com.cn\0" -"pilot.aero\0m\xc3\xa5lselv.no\0" -"barrell-of-knowledge.info\0" -"guge\0play\0c.la\0" -"\xe7\xb5\x84\xe7\xb9\x94.hk\0iwaki.fukushima.jp\0law.za\0" -"is-an-entertainer.com\0" -"mamurogawa.yamagata.jp\0" -"run\0" -"se.net\0ru.net\0" -"scienceandhistory.museum\0investments\0ravendb.me\0" -"anthro.museum\0" -"izu.shizuoka.jp\0ses\0" -"sew\0" -"sex\0" -"coloradoplateau.museum\0" -"lc.it\0\xe5\xae\xae\xe5\x9f\x8e.jp\0stokke.no\0" -"kurume.fukuoka.jp\0" -"gratangen.no\0" -"kotohira.kagawa.jp\0ohkura.yamagata.jp\0gateway.museum\0" -"canada.museum\0exnet.su\0" -"shinonsen.hyogo.jp\0" -"sk.ca\0com.zm\0sfr\0" -"kitaura.miyazaki.jp\0githubusercontent.com\0" -"oita.jp\0rwe\0" -"dynu.net\0" -"otake.hiroshima.jp\0" -"kinko.kagoshima.jp\0" -"pippu.hokkaido.jp\0" -"gv.ao\0data\0" -"skydiving.aero\0" -"tsushima.aichi.jp\0date\0cy.eu.org\0servehttp.com\0" -"gv.at\0" -"nakatane.kagoshima.jp\0" -"sakurai.nara.jp\0as.us\0academy\0" -"tadaoka.osaka.jp\0" -"steigen.no\0" -"recreation.aero\0omachi.saga.jp\0aquarium.museum\0" -"gouv.fr\0nanjo.okinawa.jp\0" -"za.net\0" -"etisalat\0dynalias.net\0sp.leg.br\0" -"memorial.museum\0" -"motobu.okinawa.jp\0" -"gs.sf.no\0ro.eu.org\0" -"lincoln\0" -"selfip.info\0" -"mielno.pl\0us-east-1.amazonaws.com\0" -"kazo.saitama.jp\0on-the-web.tv\0" -"sar.it\0" -"omaezaki.shizuoka.jp\0is-into-anime.com\0" -"newjersey.museum\0" -"edunet.tn\0cz.eu.org\0" -"ayase.kanagawa.jp\0" -"kitanakagusuku.okinawa.jp\0rad\xc3\xb8y.no\0maison\0" -"trentinoa-adige.it\0scrysec.com\0" -"kamigori.hyogo.jp\0" -"kashima.saga.jp\0notaires.km\0" -"v.bg\0" -"furukawa.miyagi.jp\0" -"shirahama.wakayama.jp\0" -"gouv.ht\0" -"sodegaura.chiba.jp\0plantation.museum\0" -"taifun-dns.de\0" -"fujinomiya.shizuoka.jp\0luxembourg.museum\0" -"help\0" -"lans.museum\0askvoll.no\0cc.ca.us\0racing\0map.fastlylb.net\0" -"koriyama.fukushima.jp\0communication.museum\0" -"copenhagen.museum\0western.museum\0ski\0" -"konsulat.gov.pl\0" -"comsec\0" -"ravendb.community\0" -"savona.it\0" -"dk.eu.org\0" -"gouv.bj\0" -"aurskog-h\xc3\xb8land.no\0" -"skodje.no\0sky\0" -"koshigaya.saitama.jp\0c.se\0" -"monzaebrianza.it\0" -"inami.toyama.jp\0" -"ptplus.fit\0" -"gouv.ci\0" -"geekgalaxy.com\0" -"pagefrontapp.com\0" -"overhalla.no\0lidl\0si.eu.org\0" -"sugito.saitama.jp\0grajewo.pl\0" -"en.it\0" -"cloudns.club\0" -"crafts.museum\0" -"axis.museum\0" -"nakatombetsu.hokkaido.jp\0" -"kumamoto.jp\0" -"virtuel.museum\0" -"convent.museum\0" -"figueres.museum\0ustka.pl\0" -"vardo.no\0blogdns.org\0" -"life\0" -"eastcoast.museum\0dep.no\0" -"firmdale\0" -"sunndal.no\0servepics.com\0" -"durham.museum\0contact\0" -"settsu.osaka.jp\0" -"bv.nl\0" -"akune.kagoshima.jp\0" -"chiba.jp\0" -"nid.io\0" -"\xc3\xa5lesund.no\0" -"komagane.nagano.jp\0" -"tenri.nara.jp\0" -"kasama.ibaraki.jp\0ullensvang.no\0\xd8\xb9\xd9\x85\xd8\xa7\xd9\x86\0de.eu.org\0" -"tondabayashi.osaka.jp\0" -"aso.kumamoto.jp\0" -"br\xc3\xb8nn\xc3\xb8y.no\0here\0" -"kuromatsunai.hokkaido.jp\0everbank\0soy\0from-nv.com\0" -"drammen.no\0" -"on.ca\0" -"univ.sn\0" -"vc.it\0" -"contemporary.museum\0farsund.no\0wang\0" -, - -"obama.nagasaki.jp\0supplies\0" -"s3-eu-west-1.amazonaws.com\0bci.dnstrace.pro\0" -"tab\0" -"krym.ua\0usr.cloud.muni.cz\0" -"sk.eu.org\0" -"\xe0\xb8\x98\xe0\xb8\xb8\xe0\xb8\xa3\xe0\xb8\x81\xe0\xb8\xb4\xe0\xb8\x88.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0fujitsu\0s3-ap-south-1.amazonaws.com\0cn.com\0" -"ks.ua\0" -"asahi.toyama.jp\0other.nf\0guru\0us-east-2.elasticbeanstalk.com\0" -"nordre-land.no\0rackmaze.net\0" -"kanan.osaka.jp\0" -"autos\0" -"gangaviika.no\0" -"baby\0" -"shell.museum\0" -"melhus.no\0" -"\xc3\xa5mot.no\0" -"tax\0" -"ugim.gov.pl\0ks.us\0" -"hioki.kagoshima.jp\0" -"srl\0from-va.com\0" -"epson\0s3-website.ca-central-1.amazonaws.com\0" -"dsmynas.com\0" -"natal.br\0" -"friulive-giulia.it\0photography\0" -"\xe5\xaf\x8c\xe5\xb1\xb1.jp\0sano.tochigi.jp\0" -"tselinograd.su\0lcube-server.de\0" -"bunkyo.tokyo.jp\0srt\0" -"grainger\0" -"genkai.saga.jp\0meteorapp.com\0" -"certmgr.org\0" -"tci\0" -"cc.wv.us\0" -"mansion.museum\0lib.ia.us\0" -"oppeg\xc3\xa5rd.no\0oster\xc3\xb8y.no\0like\0" -"corporation.museum\0" -"foz.br\0yamato.kumamoto.jp\0" -"naie.hokkaido.jp\0" -"9.bg\0yame.fukuoka.jp\0" -"stc\0" -"matsuda.kanagawa.jp\0" -"gol.no\0" -"\xe9\x80\x9a\xe8\xb2\xa9\0" -"drayddns.com\0" -"us.na\0caseih\0tdk\0" -"narvik.no\0" -"jpmorgan\0" -"selfip.org\0" -"town\0" -"ru.eu.org\0se.eu.org\0" -"langevag.no\0" -"market\0" -"su\xcc\x88""dtirol.it\0" -"cc.ma.us\0" -"tel\0" -"bulsan.it\0" -"masoy.no\0" -"k12.nm.us\0" -"sanofi\0" -"cloudns.info\0" -"lib.ky.us\0" -"obama.fukui.jp\0limo\0" -"a.bg\0r\xc3\xa1isa.no\0" -"cymru.museum\0isa-geek.net\0" -"aq.it\0ba.it\0" -"link\0" -"bozen-suedtirol.it\0minamiminowa.nagano.jp\0cc.al.us\0lima.zone\0" -"toys\0" -"sciencecenters.museum\0" -"guardian\0" -"kongsberg.no\0" -"cc.ny.us\0ca.eu.org\0" -"trentino-alto-adige.it\0kitaaiki.nagano.jp\0lib.al.us\0thd\0" -"halden.no\0" -"fashion\0" -"myftp.biz\0" -"moriyama.shiga.jp\0rsc.cdn77.org\0from-ky.com\0" -"\xe4\xb8\x89\xe9\x87\x8d.jp\0fidelity\0" -"\xe5\xb1\xb1\xe6\xa2\xa8.jp\0" -"somna.no\0" -"productions\0voting\0" -"forde.no\0" -"chikuzen.fukuoka.jp\0plus\0" -"mashike.hokkaido.jp\0" -"leksvik.no\0" -"hagi.yamaguchi.jp\0" -"publ.pt\0" -"1kapp.com\0" -"\xd8\xaa\xd9\x88\xd9\x86\xd8\xb3\0" -"showa.fukushima.jp\0" -"yamatsuri.fukushima.jp\0is-a-designer.com\0" -"cc.ct.us\0" -"takikawa.hokkaido.jp\0*.stolos.io\0" -"cpa.pro\0garden\0" -"wiki.bo\0" -"wiki.br\0" -"itayanagi.aomori.jp\0store.nf\0" -"asahikawa.hokkaido.jp\0fudai.iwate.jp\0" -"dallas.museum\0" -"is-an-anarchist.com\0" -"sakegawa.yamagata.jp\0" -"kanagawa.jp\0yamatotakada.nara.jp\0alabama.museum\0" -"\xd0\xbe\xd0\xbd\xd0\xbb\xd0\xb0\xd0\xb9\xd0\xbd\0" -"tjx\0" -"est-a-la-maison.com\0" -"yn.cn\0" -"funahashi.toyama.jp\0torino.museum\0" -"eiheiji.fukui.jp\0coldwar.museum\0" -"podhale.pl\0airbus\0" -"yamada.iwate.jp\0" -"walmart\0on-web.fr\0" -"friuli-v-giulia.it\0" -"hareid.no\0cc.fl.us\0" -"valled-aosta.it\0" -"shiroishi.saga.jp\0" -"band\0" -"karumai.iwate.jp\0" -"tn.it\0gouv.rw\0" -"spjelkavik.no\0zachpomor.pl\0" -"iwaizumi.iwate.jp\0" -"turek.pl\0\xe5\xb7\xa5\xe8\xa1\x8c\0" -"exhibition.museum\0serveftp.com\0" -"otaki.saitama.jp\0m\xc3\xa1latvuopmi.no\0bank\0" -"lib.fl.us\0social\0" -"bronnoy.no\0hoyanger.no\0gouv.sn\0software\0" -"stalowa-wola.pl\0consulting\0spdns.eu\0" -"kaufen\0" -"tromsa.no\0" -"takatsuki.osaka.jp\0" -"kagamiishi.fukushima.jp\0cd.eu.org\0" -"sondre-land.no\0" -"tennis\0" -"ginoza.okinawa.jp\0" -"s3.eu-central-1.amazonaws.com\0" -"ngo.lk\0" -"beardu.no\0" -"rikuzentakata.iwate.jp\0live\0" -"rotorcraft.aero\0" -"frei.no\0" -"sk\xc3\xa1nit.no\0mazowsze.pl\0cc.id.us\0tunk.org\0" -"laquila.it\0" -"ricoh\0" -"nagi.okayama.jp\0" -"vv.it\0" -"shacknet.nu\0" -"arab\0" -"matsusaka.mie.jp\0cc.wa.us\0" -"daiwa.hiroshima.jp\0dnsking.ch\0" -"sardinia.it\0mihara.kochi.jp\0lanbib.se\0top\0" -"prato.it\0lixil\0" -"nosegawa.nara.jp\0lv.ua\0" -"namegata.ibaraki.jp\0wolomin.pl\0christmas\0" -"sp.gov.br\0" -"dclk\0" -"nesseby.no\0lib.vi.us\0" -"trentinsuedtirol.it\0herokussl.com\0" -"ham-radio-op.net\0" -"shiogama.miyagi.jp\0jobs.tt\0" -"kawara.fukuoka.jp\0" -"nsw.au\0divtasvuodna.no\0" -"res.aero\0" -"kagamino.okayama.jp\0alvdal.no\0" -"enonic.io\0" -"mex.com\0" -"devices.resinstaging.io\0" -"nebraska.museum\0" -"jamison.museum\0" -"esp.br\0" -"muosat.no\0" -"chiyoda.gunma.jp\0" -"monza-e-della-brianza.it\0okutama.tokyo.jp\0sn\xc3\xa5""ase.no\0s\xc3\xb8rreisa.no\0email\0" -"cuiaba.br\0" -"yasugi.shimane.jp\0ngo.ph\0store.ve\0" -"shimabara.nagasaki.jp\0" -"friuli-venezia-giulia.it\0" -"zaporizhzhe.ua\0mortgage\0" -"brunel.museum\0" -"my.id\0kita.kyoto.jp\0kawatana.nagasaki.jp\0mugi.tokushima.jp\0" -"ubs\0kalmykia.su\0cust.dev.thingdust.io\0" -"newholland\0trv\0" -"assn.lk\0spdns.de\0" -"embroidery.museum\0" -"shiriuchi.hokkaido.jp\0" -"utah.museum\0forsand.no\0mycd.eu\0" -"fukuoka.jp\0so.gov.pl\0" -"romsa.no\0" -"odate.akita.jp\0anamizu.ishikawa.jp\0tateyama.toyama.jp\0bodo.no\0holdings\0" -"cc.mt.us\0cc.nd.us\0" -"go.dyndns.org\0" -"\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86.ir\0alta.no\0" -"ukiha.fukuoka.jp\0" -"sites.static.land\0" -"stordal.no\0" -"katsuragi.nara.jp\0" -"katori.chiba.jp\0" -"firm.ht\0sener\0" -"lib.md.us\0from-nj.com\0za.org\0" -"tokyo.jp\0higashiizu.shizuoka.jp\0" -"t.bg\0shimotsuke.tochigi.jp\0gouv.km\0" -"verran.no\0" -"tui\0" -"uri.arpa\0firm.in\0ureshino.mie.jp\0flynnhub.com\0" -"notaires.fr\0*.elb.amazonaws.com\0" -"bt.it\0gjesdal.no\0" -"*.kitakyushu.jp\0shijonawate.osaka.jp\0cloud.goog\0" -"aikawa.kanagawa.jp\0" -"edogawa.tokyo.jp\0\xe5\xa4\xa7\xe4\xbc\x97\xe6\xb1\xbd\xe8\xbd\xa6\0" -"kalmykia.ru\0" -"enna.it\0leitungsen.de\0" -"morotsuka.miyazaki.jp\0nichinan.tottori.jp\0burghof.museum\0\xe3\x83\x95\xe3\x82\xa1\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\0" -"ryuoh.shiga.jp\0" -"fortal.br\0!city.nagoya.jp\0kamoenai.hokkaido.jp\0int.eu.org\0" -"floro.no\0holt\xc3\xa5len.no\0" -"condos\0stream\0" -"supply\0bmoattachments.org\0" -"to.leg.br\0" -"kanzaki.saga.jp\0store.ro\0" -"jl.cn\0taiki.mie.jp\0tvs\0" -"jerusalem.museum\0" -"gouv.ml\0""3utilities.com\0" -"a.se\0pramerica\0" -"money.museum\0" -"firm.co\0" -"ono.fukushima.jp\0nordreisa.no\0" -"room\0" -"paragliding.aero\0pri.ee\0hobby-site.com\0" -"pasadena.museum\0" -"newmexico.museum\0" -"bremanger.no\0ga.us\0" -"ostroleka.pl\0store.st\0s3-website.eu-west-3.amazonaws.com\0" -"firm.dk\0" -"fineart.museum\0" -"osaka.jp\0" -"trentinsu\xcc\x88""dtirol.it\0" -"torahime.shiga.jp\0unusualperson.com\0" -"priv.hu\0tn.us\0alpha-myqnapcloud.com\0" -"si.it\0miyashiro.saitama.jp\0" -"*.awdev.ca\0" -"tsukumi.oita.jp\0" -"cc.sd.us\0" -"md.ci\0kaneyama.fukushima.jp\0" -"kakamigahara.gifu.jp\0lib.dc.us\0" -"vologda.su\0" -"\xd8\xa8\xd8\xa7\xd8\xb1\xd8\xaa\0" -"yotsukaido.chiba.jp\0motorcycle.museum\0" -"bugatti\0" -"ogawa.nagano.jp\0dentist\0" -"chitose.hokkaido.jp\0debian.net\0" -"chicago.museum\0newhampshire.museum\0stavanger.no\0" -"n\xc3\xa1vuotna.no\0" -"can.museum\0oceanographic.museum\0definima.net\0" -"telefonica\0" -"chrome\0" -"cal.it\0" -"living\0cyon.site\0" -"va.it\0" -"trust\0" -"kakogawa.hyogo.jp\0" -"group\0" -"ngo.za\0" -"ong.br\0" -"\xe0\xa8\xad\xe0\xa8\xbe\xe0\xa8\xb0\xe0\xa8\xa4\0" -"morena.br\0" -"s3.cn-north-1.amazonaws.com.cn\0" -"yura.wakayama.jp\0dnsupdater.de\0" -"shirataka.yamagata.jp\0" -"army\0dynalias.org\0" -"fukuroi.shizuoka.jp\0la.us\0" -"priv.at\0" -"kira.aichi.jp\0nagai.yamagata.jp\0kristiansand.no\0" -"sr.gov.pl\0" -"abogado\0" -"asahi.ibaraki.jp\0" -"\xe7\xa7\x8b\xe7\x94\xb0.jp\0yakumo.hokkaido.jp\0higashikagawa.kagawa.jp\0dnepropetrovsk.ua\0" -"askoy.no\0" -"fishing\0" +"depot.museum\0com.to\0" +"com.ua\0safe\0" +"info.nr\0com.tr\0pohl\0" +"tysvar.no\0" +"re.it\0com.tt\0" +"muncie.museum\0com.tw\0cherkassy.ua\0com.ug\0" +"geisei.kochi.jp\0izumi.osaka.jp\0swidnik.pl\0" +"tomobe.ibaraki.jp\0" +"exeter.museum\0" +"monzabrianza.it\0" +"info.la\0bitballoon.com\0" +"\xe0\xb8\x97\xe0\xb8\xab\xe0\xb8\xb2\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0istanbul\0" +"hotel.hu\0com.vc\0barcelona\0" +"com.ve\0realestate\0store.dk\0bg.eu.org\0" +"flog.br\0" +"\xe7\xbb\x84\xe7\xb9\x94.hk\0barsy.de\0" +"com.uy\0com.vi\0ddnsking.com\0" +"com.uz\0" +"com.vn\0" +"bronnoysund.no\0" +"toya.hokkaido.jp\0ebina.kanagawa.jp\0" +"*.mm\0zoological.museum\0lind\xc3\xa5s.no\0" +"re.kr\0" +"info.ls\0no-ip.co.uk\0" +"com.vu\0" +"finearts.museum\0" +"hiratsuka.kanagawa.jp\0" +"media.hu\0iron.museum\0" +"jampa.br\0" +"k12.nj.us\0" "tamano.okayama.jp\0" -"arpa\0*.sensiosite.cloud\0" -"birkenes.no\0sejny.pl\0" -"7.bg\0uno\0" -"hisayama.fukuoka.jp\0delivery\0" -"adm.br\0skanit.no\0" -"praxi\0getmyip.com\0" -"lib.vt.us\0" -"friuliv-giulia.it\0" -"agrar.hu\0" -"williamsburg.museum\0" -"minamioguni.kumamoto.jp\0" -"uol\0" -"beskidy.pl\0df.leg.br\0" -"archi\0" -"2000.hu\0kyoto.jp\0mitoyo.kagawa.jp\0" -"lt.it\0" -"cosenza.it\0va.no\0" -"musica.ar\0cuisinella\0" -"mus.mi.us\0" -"chiryu.aichi.jp\0kyiv.ua\0" -"services.aero\0takahama.fukui.jp\0yanagawa.fukuoka.jp\0kautokeino.no\0" -"fl\xc3\xa5.no\0" -"ups\0" -"tonosho.kagawa.jp\0" -"forum.hu\0is-a-personaltrainer.com\0" -"musica.bo\0otsuchi.iwate.jp\0adygeya.su\0" -"broker.aero\0yonabaru.okinawa.jp\0" -"s3-us-east-2.amazonaws.com\0" -"ao.it\0" -"firm.ve\0*.ex.futurecms.at\0" -"shiiba.miyazaki.jp\0management\0" -"ichinohe.iwate.jp\0lardal.no\0" -"blogdns.net\0" -"lazio.it\0" -"trentinoaadige.it\0asda\0" +"misaki.okayama.jp\0cloudns.club\0" +"heroy.nordland.no\0" +"homeftp.net\0" +"com.ws\0" +"mil\0*.np\0hgtv\0" +"varggat.no\0" +"vlog.br\0oharu.aichi.jp\0" +"barsy.eu\0" +"mit\0" +"pa.us\0" +"friulivegiulia.it\0" +"town.museum\0" +"\xe5\xb1\xb1\xe5\xbd\xa2.jp\0hidaka.saitama.jp\0" +"ab.ca\0info.ke\0forum\0us.com\0" +"chuo.fukuoka.jp\0sklep.pl\0" +"qld.au\0" +"info.ki\0" +"jinsekikogen.hiroshima.jp\0yashio.saitama.jp\0" +"*.pg\0" +"lib.mi.us\0" +"to.leg.br\0" +"comsec\0" +"jan-mayen.no\0" +"loten.no\0drud.us\0" +"a.se\0army\0east-kazakhstan.su\0" +"tomiya.miyagi.jp\0" +"mlb\0" +"s3-website.ap-south-1.amazonaws.com\0kurgan.su\0" +"sld.do\0com.zm\0" +"campidanomedio.it\0" +"luxembourg.museum\0sale\0" +"ouda.nara.jp\0" +"dynamic-dns.info\0" +"griw.gov.pl\0" +"s3-external-1.amazonaws.com\0" +"karikatur.museum\0project.museum\0mma\0" +"kg.kr\0" +"mls\0" +"arpa\0michigan.museum\0" +"nanporo.hokkaido.jp\0uppo.gov.pl\0" +"flesberg.no\0" +"barsy.in\0" +"it.ao\0time.no\0barsy.io\0" +"freemasonry.museum\0africa\0hr.eu.org\0" +"ntdll.top\0" +"r.bg\0skierva.no\0qc.com\0" +"r\xc3\xa1isa.no\0parts\0" +"omiya.saitama.jp\0" +"roma.museum\0" +"res.aero\0party\0" +"rockart.museum\0" +"mj\xc3\xb8ndalen.no\0contractors\0passagens\0" +"hamaroy.no\0" +"go.gov.br\0" +"educational.museum\0" +"amagasaki.hyogo.jp\0frontier\0" +"\xe7\xae\x87\xe4\xba\xba.hk\0ddr.museum\0s3.dualstack.ap-southeast-2.amazonaws.com\0" +"weir\0" +"feira.br\0asakawa.fukushima.jp\0" +"fl\xc3\xa5.no\0k12.sc.us\0moe\0" +"oregon.museum\0" +"vercelli.it\0basketball\0" +"aip.ee\0nedre-eiker.no\0moi\0" +"togakushi.nagano.jp\0final\0barsy.support\0no-ip.biz\0" +"consulting\0mom\0tires\0lcube-server.de\0" +"voting\0" +"is-a-landscaper.com\0" +"conf.au\0suisse.museum\0" +"kamikawa.hyogo.jp\0mov\0" +"frogn.no\0" +"media.pl\0" +"bsb.br\0swiftcover\0" +"koori.fukushima.jp\0porn\0noho.st\0" +"b\xc3\xa5""d\xc3\xa5""ddj\xc3\xa5.no\0" +"honbetsu.hokkaido.jp\0" +"pacific.museum\0" +"fm.br\0makinohara.shizuoka.jp\0" +"nab\0myfritz.net\0" +"co.krd\0" +"asda\0" +"pr.it\0kakamigahara.gifu.jp\0\xd8\xb9\xd9\x85\xd8\xa7\xd9\x86\0deal\0" +"aogashima.tokyo.jp\0" "arte\0" -"bulsan-suedtirol.it\0egyptian.museum\0" -"kerryhotels\0" -"hgtv\0" -"\xe0\xb8\x84\xe0\xb8\xad\xe0\xb8\xa1\0" -"lib.ms.us\0lib.nc.us\0" -"valle-d-aosta.it\0komatsu.ishikawa.jp\0ringebu.no\0" -"sagamihara.kanagawa.jp\0" -"ug.gov.pl\0" -"taranto.it\0" -"ap-southeast-2.elasticbeanstalk.com\0" -"ogi.saga.jp\0mill.museum\0" -"health.nz\0" -"adygeya.ru\0" -"gru.br\0dyn.cosidns.de\0" -"bbva\0tmall\0" -"oshima.yamaguchi.jp\0sumy.ua\0" -"shiga.jp\0sakawa.kochi.jp\0" -"drive\0s3-ca-central-1.amazonaws.com\0" -"mielec.pl\0" -"minamiawaji.hyogo.jp\0okayama.okayama.jp\0baltimore.museum\0" -"paleo.museum\0eidsberg.no\0" -"hotels\0" -"aero.tt\0" -"deal\0" -"drud.io\0" -"alstahaug.no\0uconnect\0" -"ryukyu\0" -"suzuka.mie.jp\0ch.eu.org\0firewall-gateway.net\0" -"naha.okinawa.jp\0" -"entertainment.aero\0store.bb\0t.se\0vet\0" +"reggioemilia.it\0ehime.jp\0teshikaga.hokkaido.jp\0" +"santamaria.br\0" +"cyber.museum\0" +"nakagawa.hokkaido.jp\0yamato.kanagawa.jp\0ogimi.okinawa.jp\0" +"nba\0" +"post\0" +"cahcesuolo.no\0" +"android\0" +"\xd9\x83\xd8\xa7\xd8\xab\xd9\x88\xd9\x84\xd9\x8a\xd9\x83\0" +"s3-eu-central-1.amazonaws.com\0" +"kawai.nara.jp\0\xe8\xb0\xb7\xe6\xad\x8c\0" +"withgoogle.com\0" +"nh-serv.co.uk\0" +"iizuka.fukuoka.jp\0meiwa.mie.jp\0lezajsk.pl\0" +"minamiboso.chiba.jp\0hashima.gifu.jp\0imamat\0" +"manaus.br\0urbino-pesaro.it\0kariya.aichi.jp\0sarl\0" +"vpnplus.to\0" +"msd\0" +"bbva\0" +"meldal.no\0" +"*.triton.zone\0" +"crotone.it\0toho.fukuoka.jp\0" +"portal.museum\0tr\xc3\xa6na.no\0\xd9\x82\xd8\xb7\xd8\xb1\0" +"allfinanz\0" +"heroy.more-og-romsdal.no\0" +"*.ye\0" +"nrw.museum\0" +"does-it.net\0" +"ginoza.okinawa.jp\0" +"yahaba.iwate.jp\0" +"cc.pr.us\0azerbaijan.su\0" +"mtn\0" +"cloudns.info\0" +"abarth\0" +"\xe1\x83\x92\xe1\x83\x94\0mtr\0" +"nec\0" +"yokote.akita.jp\0sodegaura.chiba.jp\0" "l\xc3\xa1hppi.no\0" -"brumunddal.no\0" -"aero.mv\0kwpsp.gov.pl\0" -"firm.ro\0" -"eu-west-1.elasticbeanstalk.com\0" -"keisen.fukuoka.jp\0dynv6.net\0" -"klepp.no\0" -"matsubushi.saitama.jp\0" -"takazaki.miyazaki.jp\0irish\0" -"taishi.hyogo.jp\0luster.no\0" -"ol.no\0" -"vallee-aoste.it\0" -"sannohe.aomori.jp\0kumamoto.kumamoto.jp\0" -"vacations\0" -"va.us\0" +"kitagawa.kochi.jp\0" +"workinggroup.aero\0" +"padova.it\0onga.fukuoka.jp\0" +"stjordal.no\0us-east-1.elasticbeanstalk.com\0s3-sa-east-1.amazonaws.com\0" +"\xe5\xbe\xb3\xe5\xb3\xb6.jp\0komatsu.ishikawa.jp\0" +"gs.fm.no\0" +"saobernardo.br\0" +"globo\0" +"okinawa.okinawa.jp\0net\0" "asia\0" -"hamburg\0" -"agents.aero\0\xd9\x82\xd8\xb7\xd8\xb1\0" -"sula.no\0\xe0\xae\x9a\xe0\xae\xbf\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xae\xaa\xe0\xaf\x8d\xe0\xae\xaa\xe0\xaf\x82\xe0\xae\xb0\xe0\xaf\x8d\0" -"benevento.it\0" -"yonezawa.yamagata.jp\0" -"giessen.museum\0" -"venezia.it\0serveirc.com\0" -"dyr\xc3\xb8y.no\0" -"toba.mie.jp\0" -"higashi.fukushima.jp\0skoczow.pl\0" -"store.dk\0" -"esashi.hokkaido.jp\0lib.sc.us\0" -"komae.tokyo.jp\0sells-it.net\0nalchik.ru\0" -"daigo.ibaraki.jp\0kirkenes.no\0nowtv\0" -"shiroi.chiba.jp\0kakegawa.shizuoka.jp\0mining.museum\0" -"vig\0\xd8\xa8\xd9\x8a\xd8\xaa\xd9\x83\0" -"myddns.rocks\0" -"muos\xc3\xa1t.no\0" -"oygarden.no\0" -"gs.mr.no\0" -"vin\0" -"florence.it\0vip\0nalchik.su\0" -"saitama.jp\0asnes.no\0" -"tateshina.nagano.jp\0kamitsue.oita.jp\0firm.nf\0" -"wy.us\0" -"vt.it\0" -"lerdal.no\0" -"groks-this.info\0" -"fujisawa.iwate.jp\0" -"tas.au\0ibara.okayama.jp\0" -"lt.ua\0" -"health.museum\0" -"pfizer\0" -"toride.ibaraki.jp\0salangen.no\0" -"toyonaka.osaka.jp\0charity\0" -"izena.okinawa.jp\0school.museum\0" -"l-o-g-i-n.de\0" -"health.vn\0dyndns.biz\0" -"friuli-ve-giulia.it\0vegarshei.no\0" -"nahari.kochi.jp\0pohl\0" -"dyndns-blog.com\0" -"suldal.no\0md.us\0" -"nord-aurdal.no\0" -"higashi.fukuoka.jp\0" -"gran.no\0" -"app.os.stg.fedoraproject.org\0" -"katsushika.tokyo.jp\0nanbu.yamanashi.jp\0anquan\0cloudns.eu\0" -"honbetsu.hokkaido.jp\0" -"salzburg.museum\0sorum.no\0" -"asaminami.hiroshima.jp\0" -"is-a-llama.com\0" -"selfip.biz\0" -"malatvuopmi.no\0rivne.ua\0lib.in.us\0" -"\xe5\xb1\xb1\xe5\xbd\xa2.jp\0" -"shikaoi.hokkaido.jp\0buyshouses.net\0" -"lind\xc3\xa5s.no\0tarnobrzeg.pl\0" -"forex\0" -"andriabarlettatrani.it\0" -"\xe0\xb9\x80\xe0\xb8\x99\xe0\xb9\x87\xe0\xb8\x95.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" -"toho.fukuoka.jp\0" -"nationalfirearms.museum\0" -"aioi.hyogo.jp\0at.eu.org\0georgia.su\0" -"toei.aichi.jp\0onagawa.miyagi.jp\0" -"to.gov.br\0\xe5\x80\x8b\xe4\xba\xba.hk\0blogsyte.com\0" -"software.aero\0safe\0" -"is-a-patsfan.org\0" -"worse-than.tv\0" -"gucci\0" -"svizzera.museum\0" -"cust.prod.thingdust.io\0" -"contemporaryart.museum\0" -"\xc3\xb8ksnes.no\0" -"communications.museum\0" -"hb.cn\0" -"noho.st\0" -"k12.oh.us\0today\0" -"hayakawa.yamanashi.jp\0" -"heroy.more-og-romsdal.no\0grondar.za\0" -"vard\xc3\xb8.no\0" -"kvam.no\0" -"r.bg\0tcm.museum\0levanger.no\0cricket\0" -"hashbang.sh\0" -"holiday\0" -"priv.pl\0" -"miyazaki.miyazaki.jp\0cloudns.in\0" -"habikino.osaka.jp\0dell\0" -"weber\0" -"br.it\0cb.it\0" -"creditunion\0" -"shitara.aichi.jp\0" -"matsukawa.nagano.jp\0\xe0\xa4\x95\xe0\xa5\x89\xe0\xa4\xae\0" -"madrid.museum\0redumbrella\0" -"po.it\0ozora.hokkaido.jp\0" -"trentinosud-tirol.it\0" -"chernigov.ua\0k12.ca.us\0\xe4\xb8\xad\xe5\x9b\xbd\0" -"taketomi.okinawa.jp\0mine.nu\0dray-dns.de\0" -"kunitachi.tokyo.jp\0" -"cloudns.cc\0" -"nakamura.kochi.jp\0valer.hedmark.no\0drud.us\0" -"fr\xc3\xb8ya.no\0" -"wsa.gov.pl\0" -"veterinaire.km\0" -"abudhabi\0" -"komono.mie.jp\0*.futurecms.at\0" -"rebun.hokkaido.jp\0\xe4\xb8\xad\xe5\x9c\x8b\0" -"fhsk.se\0" -"priv.no\0" -"mjondalen.no\0in.net\0" -"computer.museum\0" -"iraq.museum\0lund.no\0" -"vercelli.it\0" -"\xe3\x83\x9d\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x88\0mysecuritycamera.com\0" -"monzaedellabrianza.it\0dnsdojo.org\0" -"tarama.okinawa.jp\0" -"toyoake.aichi.jp\0ichikawamisato.yamanashi.jp\0" -"mb.ca\0francaise.museum\0" -"fbx-os.fr\0" -"topology.museum\0" -"miyoshi.aichi.jp\0lib.de.us\0" -"medizinhistorisches.museum\0salon\0" -"sale\0" -"ashibetsu.hokkaido.jp\0\xc3\xa5l.no\0brand.se\0" -"shioya.tochigi.jp\0" -"pilots.museum\0" -"priv.me\0haugesund.no\0" -"time.no\0healthcare\0" -"gallery.museum\0" -"tadotsu.kagawa.jp\0" -"durban\0wed\0" -"antiques.museum\0" -"sandnes.no\0" -"royken.no\0" -"veterinaire.fr\0" -"bnr.la\0" -"am.br\0training\0edu.eu.org\0" -"asuke.aichi.jp\0" -"gr.it\0porn\0" -"prof.pr\0mckinsey\0\xe9\xa6\x99\xe6\xa0\xbc\xe9\x87\x8c\xe6\x8b\x89\0" -"act.edu.au\0atsugi.kanagawa.jp\0ventures\0at-band-camp.net\0" -"kasamatsu.gifu.jp\0" -"basilicata.it\0" -"tatsuno.hyogo.jp\0kunohe.iwate.jp\0vt.us\0ownip.net\0" -"siellak.no\0" -"gr.jp\0" -"trondheim.no\0" -"svalbard.no\0" -"niki.hokkaido.jp\0delaware.museum\0" -"mosj\xc3\xb8""en.no\0" -"yuza.yamagata.jp\0" -"dental\0sharp\0*.magentosite.cloud\0" -"dgca.aero\0" -"df.gov.br\0post\0" -"iz.hr\0" -"abc.br\0desi\0" -"dni.us\0" -"aoki.nagano.jp\0" -"bir.ru\0" -"sakura.tochigi.jp\0" -"gs.ah.no\0" -"college\0" -"her\xc3\xb8y.m\xc3\xb8re-og-romsdal.no\0" -"abira.hokkaido.jp\0" -"karlsoy.no\0" -"dance\0" -"sakuho.nagano.jp\0" -"!city.sendai.jp\0chijiwa.nagasaki.jp\0" -"empresa.bo\0" -"nishigo.fukushima.jp\0anthropology.museum\0" -"git-repos.de\0" -"americanart.museum\0" -"s3.us-east-2.amazonaws.com\0wmflabs.org\0" -"for-better.biz\0" -"final\0" -"test-iserv.de\0" -"colonialwilliamsburg.museum\0" -"5.bg\0" -"stjohn.museum\0win\0" -"r\xc3\xa5holt.no\0insure\0" -"spreadbetting\0" -"yamada.toyama.jp\0on-aptible.com\0" -"cipriani\0" -"srv.br\0from-de.com\0gotdns.com\0" -"selfip.com\0" -"nationwide\0" -"bruxelles.museum\0" -"okuma.fukushima.jp\0silk.museum\0" -"opole.pl\0" -"fm.br\0s3-external-1.amazonaws.com\0" -"tamaki.mie.jp\0sarl\0" -"mb.it\0" -"tarui.gifu.jp\0fujiidera.osaka.jp\0t3l3p0rt.net\0" -"\xd8\xa7\xd8\xb1\xd8\xa7\xd9\x85\xd9\x83\xd9\x88\0" -"karasjohka.no\0" -"shikama.miyagi.jp\0" -"gen.mi.us\0" -"amagasaki.hyogo.jp\0togakushi.nagano.jp\0kirovograd.ua\0" -"sor-fron.no\0" -"k12.ma.us\0" -"\xe7\xbb\x84\xe7\xb9\x94.hk\0wassamu.hokkaido.jp\0arakawa.tokyo.jp\0" -"onojo.fukuoka.jp\0horonobe.hokkaido.jp\0" -"g12.br\0" -"honai.ehime.jp\0bilbao.museum\0" -"tj.cn\0oyer.no\0" -"reggio-emilia.it\0" -"weir\0" -"miasta.pl\0cloudns.us\0" -"rj.leg.br\0" -"zushi.kanagawa.jp\0chiropractic.museum\0forum\0" -"rzgw.gov.pl\0cistron.nl\0" -"wme\0" -"shirako.chiba.jp\0spacekit.io\0" -"\xc3\xa5krehamn.no\0averoy.no\0" -"resistance.museum\0" -"firebaseapp.com\0" -"hanyu.saitama.jp\0sandiego.museum\0" -"workshop.museum\0" -"homesecuritypc.com\0" -"from-or.com\0" -"honeywell\0sells-for-u.com\0" -"\xe0\xb4\xad\xe0\xb4\xbe\xe0\xb4\xb0\xe0\xb4\xa4\xe0\xb4\x82\0" -"hirono.iwate.jp\0" -"chita.aichi.jp\0" +"melhus.no\0new\0" +"vao.it\0" "save\0" -"toyooka.hyogo.jp\0" -"lib.ne.us\0" -"ichikawa.chiba.jp\0" -"imari.saga.jp\0" -"oslo.no\0" -"hinode.tokyo.jp\0" -"deloitte\0\xe6\x89\x8b\xe8\xa1\xa8\0" -"n\xc3\xb8tter\xc3\xb8y.no\0is-into-cartoons.com\0" -"kepno.pl\0" -"rexroth\0" -"cheltenham.museum\0" -"au.eu.org\0be.eu.org\0" -"lel.br\0" -"hitachiomiya.ibaraki.jp\0" -"alessandria.it\0tsu.mie.jp\0wow\0xenapponazure.com\0" -"warabi.saitama.jp\0" -"a.ssl.fastly.net\0" -"nakanojo.gunma.jp\0" -"mitsuke.niigata.jp\0tama.tokyo.jp\0" -"r.se\0saxo\0" -"google\0" -"xz.cn\0" -"civilization.museum\0" -"*.sch.uk\0" -"livorno.it\0medecin.km\0" -"s3.dualstack.ap-southeast-2.amazonaws.com\0" -"fm.it\0owani.aomori.jp\0kasai.hyogo.jp\0" -"midsund.no\0" -"kaga.ishikawa.jp\0" -"eigersund.no\0" -"izumo.shimane.jp\0" -"fr\xc3\xa6na.no\0" -"taishi.osaka.jp\0quebec\0" -"illustration.museum\0" -"takinoue.hokkaido.jp\0" -"vald-aosta.it\0audi\0" -"barlettatraniandria.it\0samsclub\0" -"marshalls\0no-ip.org\0" -"\xe6\x85\x88\xe5\x96\x84\0" -"froya.no\0" -"ube.yamaguchi.jp\0" -"kota.aichi.jp\0hitachi.ibaraki.jp\0wildlife.museum\0s\xc3\xb8mna.no\0" -"bg.eu.org\0" -"wtc\0dagestan.ru\0" -"\xe6\x84\x9b\xe7\x9f\xa5.jp\0" -"clubmed\0wtf\0" -"tagajo.miyagi.jp\0" -"krasnodar.su\0" -"basel.museum\0beer\0" -"niepce.museum\0" -"amber.museum\0england.museum\0" -"rishiri.hokkaido.jp\0" -"vr.it\0dagestan.su\0" -"bod\xc3\xb8.no\0" -"b\xc3\xa1hcavuotna.no\0" -"crotone.it\0" -"viking\0" -"tsuru.yamanashi.jp\0" -"ba.leg.br\0" -"kizu.kyoto.jp\0kvanangen.no\0trysil.no\0\xe5\x80\x8b\xe4\xba\xba.\xe9\xa6\x99\xe6\xb8\xaf\0" -"midori.gunma.jp\0jewish.museum\0" -"\xd0\xbe\xd1\x80\xd0\xb3.\xd1\x81\xd1\x80\xd0\xb1\0" -"k12.wa.us\0bplaced.com\0" -"shimamaki.hokkaido.jp\0" -"barsy.mobi\0" -"liaison\0" +"defense.tn\0" +"lefrak\0" +"kawanishi.yamagata.jp\0nfl\0" +"katsushika.tokyo.jp\0lawyer\0" +"\xe7\xb5\x84\xe7\xb9\x94.hk\0pramerica\0" +"df.leg.br\0" +"airtel\0" +"rakkestad.no\0" +"tsuga.tochigi.jp\0" +"sld.pa\0" +"med.pro\0" +"gs.sf.no\0" +"ecologia.bo\0" +"ngo\0" +"everbank\0" +"fm.it\0nishiazai.shiga.jp\0" +"v\xc3\xa5gan.no\0is-into-cartoons.com\0" +"def.br\0\xd8\xb3\xd9\x88\xd8\xaf\xd8\xa7\xd9\x86\0" +"public.museum\0software\0" +"seaport.museum\0" +"hino.tokyo.jp\0" +"austin.museum\0nhk\0" +"writesthisblog.com\0" +"mlbfan.org\0" +"\xe7\xb6\xb2\xe7\xb5\xa1.cn\0abr.it\0varese.it\0hirokawa.fukuoka.jp\0" +"kvanangen.no\0" +"maceio.br\0" +"saxo\0" +"furniture.museum\0" +"tirol\0" +"saka.hiroshima.jp\0*.magentosite.cloud\0" +"brunel.museum\0tingvoll.no\0eaton.mi.us\0daplie.me\0" +"s\xc3\xbc""dtirol.it\0" +"stadt.museum\0" +"yamada.iwate.jp\0" +"lib.tx.us\0" +"ravenna.it\0cistron.nl\0" +"bestbuy\0" +"kamisato.saitama.jp\0" +"\xc3\xa5seral.no\0drive\0drayddns.com\0" +"corporation.museum\0" +"adv.br\0" +"jorpeland.no\0info.zm\0" +"abeno.osaka.jp\0showa.yamanashi.jp\0" +"k12.ar.us\0" +"idv.hk\0medizinhistorisches.museum\0" +"locker\0" +"sampa.br\0tsumagoi.gunma.jp\0wiw.gov.pl\0" +"allstate\0" +"miyota.nagano.jp\0" +"\xe9\x9d\x99\xe5\xb2\xa1.jp\0" +"mihama.fukui.jp\0nishiokoppe.hokkaido.jp\0" +"tsuiki.fukuoka.jp\0" +"even\xc3\xa1\xc5\xa1\xc5\xa1i.no\0" +"higashisumiyoshi.osaka.jp\0" +"acct.pro\0movie\0" +"nichinan.miyazaki.jp\0dell\0" +"pizza\0" +"trentinsud-tirol.it\0\xe0\xae\x87\xe0\xae\xb2\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xaf\x88\0" +"r\xc3\xb8""d\xc3\xb8y.no\0vikna.no\0s3-website-ap-southeast-1.amazonaws.com\0" +"tone.ibaraki.jp\0cloudaccess.host\0" +"touch.museum\0nesodden.no\0" "fm.no\0" -"hiroo.hokkaido.jp\0" -"motegi.tochigi.jp\0" -"kakuda.miyagi.jp\0\xe6\x89\x8b\xe6\x9c\xba\0" -"ogano.saitama.jp\0" -"fuchu.hiroshima.jp\0" -"amusement.aero\0kaneyama.yamagata.jp\0" -"ownprovider.com\0" -"siljan.no\0" -"mosvik.no\0" -"red.sv\0" -"tananger.no\0" -"yamanouchi.nagano.jp\0" +"\xe3\x82\xb3\xe3\x83\xa0\0" +"khmelnytskyi.ua\0" +"jgora.pl\0" +"is-with-theband.com\0" +"gok.pk\0pr.us\0" +"kotoura.tottori.jp\0" +"minamiashigara.kanagawa.jp\0" +"kyoto.jp\0" +"satx.museum\0brumunddal.no\0" +"curitiba.br\0" +"bc.ca\0\xe7\xb6\xb2\xe7\xb5\xa1.hk\0uscountryestate.museum\0hockey\0" +"kawakami.nara.jp\0" +"ringsaker.no\0" +"suwa.nagano.jp\0" +"t\xc3\xb8nsberg.no\0" +"sf.no\0mk.ua\0" +"komagane.nagano.jp\0murakami.niigata.jp\0" +"fjell.no\0events\0" +"pioneer\0" +"dyndns-mail.com\0" +"hizen.saga.jp\0" +"r.se\0" +"health.museum\0no-ip.info\0" +"elblag.pl\0eurovision\0international\0" +"nl.ca\0user.party.eus\0is-a-bookkeeper.com\0" +"\xe9\xb3\xa5\xe5\x8f\x96.jp\0ogasawara.tokyo.jp\0\xe8\xaf\xba\xe5\x9f\xba\xe4\xba\x9a\0" +"\xd8\xa7\xd8\xa8\xd9\x88\xd8\xb8\xd8\xa8\xd9\x8a\0" +"capebreton.museum\0s\xc3\xb8ndre-land.no\0" +"niigata.jp\0!city.kawasaki.jp\0\xd8\xa7\xd9\x84\xd8\xa7\xd8\xb1\xd8\xaf\xd9\x86\0" +"now\0" +"london\0" +"ishikawa.jp\0samukawa.kanagawa.jp\0" +"kunstsammlung.museum\0" +"yamato.kumamoto.jp\0" +"australia.museum\0" +"rome.it\0tsuru.yamanashi.jp\0" +"wake.okayama.jp\0wloclawek.pl\0" +"chigasaki.kanagawa.jp\0" +"ngrok.io\0noip.us\0" +"etc.br\0seki.gifu.jp\0" +"lincoln.museum\0il.eu.org\0" +"\xe5\xba\x83\xe5\xb3\xb6.jp\0" +"eastcoast.museum\0sor-fron.no\0ipiranga\0" +"nra\0twmail.cc\0" +"\xc3\xa5krehamn.no\0lib.vt.us\0" +"anan.tokushima.jp\0yamanobe.yamagata.jp\0" +"ichiba.tokushima.jp\0" +"f\xc3\xb8rde.no\0" +"obi\0" +"garden\0" +"inami.wakayama.jp\0" +"photos\0" +"crafting.xyz\0" +"parti.se\0" +"svizzera.museum\0firewall-gateway.de\0" +"pharmaciens.km\0chernihiv.ua\0desi\0" +"nrw\0" +"shiki.saitama.jp\0" +"caa.aero\0sor-odal.no\0cc.ia.us\0" +"norddal.no\0hu.eu.org\0ie.eu.org\0" +"sakai.fukui.jp\0" +"balsfjord.no\0bloxcms.com\0" +"\xe7\x8f\xa0\xe5\xae\x9d\0shiftedit.io\0" +"kitanakagusuku.okinawa.jp\0" +"rc.it\0" +"gs.nl.no\0rv.ua\0" +"kanie.aichi.jp\0" +"dnipropetrovsk.ua\0tube\0" +"fuso.aichi.jp\0" +"loppa.no\0tiffany\0" +"reklam.hu\0" +"numata.gunma.jp\0ntt\0" +"sa.edu.au\0" +"verbania.it\0" +"shimabara.nagasaki.jp\0dnsalias.net\0" +"nesseby.no\0plumbing\0" +"servehttp.com\0" +"onjuku.chiba.jp\0adv.mz\0" +"kids.museum\0motorcycle.museum\0" +"kamioka.akita.jp\0ine.kyoto.jp\0" +"nationalheritage.museum\0gratis\0" +"off\0" +"gausdal.no\0condos\0" +"daisen.akita.jp\0" +"openair.museum\0gaular.no\0\xc3\xb8ystre-slidre.no\0" +"lib.or.us\0" +"uw.gov.pl\0" +"ismaili\0" +"furukawa.miyagi.jp\0kitakata.miyazaki.jp\0" +"nagawa.nagano.jp\0" +"s\xc3\xb8mna.no\0lpusercontent.com\0" +"pp.az\0yomitan.okinawa.jp\0" +"idv.tw\0" +"estate\0" +"caravan\0" +"yamagata.ibaraki.jp\0" +"b\xc3\xa5tsfjord.no\0" +"nara.jp\0" +"gliding.aero\0cc.as.us\0" +"yamazoe.nara.jp\0" +"\xe7\x9f\xb3\xe5\xb7\x9d.jp\0democrat\0" +"iwate.jp\0" +"skien.no\0" +"taxi.br\0takagi.nagano.jp\0" +"embetsu.hokkaido.jp\0kuju.oita.jp\0" +"servehumour.com\0" +"dr\xc3\xb8""bak.no\0" +"minamiminowa.nagano.jp\0yamatotakada.nara.jp\0toshima.tokyo.jp\0" +"fineart.museum\0storfjord.no\0nyc\0" +"vall\xc3\xa9""eaoste.it\0" +"statebank\0" +"is-a-nascarfan.com\0""3utilities.com\0" +"nachikatsuura.wakayama.jp\0" +"fin.ec\0" +"dali.museum\0songdalen.no\0" +"obama.fukui.jp\0" +"imabari.ehime.jp\0" +"trysil.no\0s3.dualstack.us-east-1.amazonaws.com\0" +"\xe0\xb2\xad\xe0\xb2\xbe\xe0\xb2\xb0\xe0\xb2\xa4\0" +"ashoro.hokkaido.jp\0" +"hembygdsforbund.museum\0" +"\xe6\x89\x8b\xe8\xa1\xa8\0" +"conf.lv\0" +"nl.no\0feedback\0shouji\0" +"iglesias-carbonia.it\0hashikami.aomori.jp\0" +"sakura.tochigi.jp\0" +"p.bg\0emerck\0" +"sakaiminato.tottori.jp\0" +"cleaning\0" +"shijonawate.osaka.jp\0hino.tottori.jp\0nanyo.yamagata.jp\0" +"\xe6\x95\x99\xe8\x82\xb2.hk\0indiana.museum\0" +"izu.shizuoka.jp\0" +"is-a-techie.com\0" +"adult\0" +"equipment\0" +"discovery.museum\0pharmacy\0" +"ia.us\0" +"nishihara.okinawa.jp\0izumiotsu.osaka.jp\0" +"nasu.tochigi.jp\0" +"lib.vi.us\0servegame.org\0noip.me\0pantheonsite.io\0" +"sakegawa.yamagata.jp\0" +"ass.km\0skaun.no\0" +"armenia.su\0" +"half.host\0" +"tsubata.ishikawa.jp\0" +"servequake.com\0" +"9.bg\0v\xc3\xa6r\xc3\xb8y.no\0gr.eu.org\0" +"yachiyo.ibaraki.jp\0fujisawa.kanagawa.jp\0urawa.saitama.jp\0" +"maryland.museum\0" +"taki.mie.jp\0" "\xe6\x96\xb0\xe9\x97\xbb\0" -"remotewd.com\0" -"flor\xc3\xb8.no\0cloudns.pw\0" -"ditchyourip.com\0" -"hida.gifu.jp\0" -"sogne.no\0" -"hopto.me\0" -"now-dns.top\0" -"vestnes.no\0" -"yoshinogari.saga.jp\0" -"reggio-calabria.it\0cartoonart.museum\0" -"shinto.gunma.jp\0scholarships\0" -"mansions.museum\0readmyblog.org\0" -"media\0" -"yosemite.museum\0no-ip.info\0" -"newport.museum\0" -"kitagata.saga.jp\0" -"american.museum\0" -"xin\0" -"tatebayashi.gunma.jp\0" -"jefferson.museum\0casino\0\xd9\x83\xd9\x88\xd9\x85\0hr.eu.org\0" -"tsumagoi.gunma.jp\0" -"ne.jp\0" -"k12.nv.us\0" -"withyoutube.com\0" -"aguni.okinawa.jp\0ne.ke\0civilwar.museum\0" -"p.bg\0" -"santoandre.br\0yahiko.niigata.jp\0songdalen.no\0" -"fiat\0homes\0" -"schweiz.museum\0de.us\0" -"yasuoka.nagano.jp\0nextdirect\0" -"ne.kr\0" -"shimofusa.chiba.jp\0project.museum\0" -"nobeoka.miyazaki.jp\0" -"\xe7\x8f\xa0\xe5\xae\x9d\0" -"mutsu.aomori.jp\0" -"voyage\0" -"is-a-geek.com\0" -"lillesand.no\0" -"tottori.tottori.jp\0" -"wada.nagano.jp\0rr.leg.br\0" -"mat.br\0" -"chernihiv.ua\0cloudaccess.host\0" -"planetarium.museum\0is-a-cpa.com\0" -"www.ro\0grozny.su\0" -"nikolaev.ua\0" -"am.leg.br\0" -"fido\0softbank\0" -"tjome.no\0" -"kuzumaki.iwate.jp\0appspot.com\0" -"loppa.no\0clinic\0" -"\xe6\x8b\x9b\xe8\x81\x98\0" -"kamaishi.iwate.jp\0" -"\xe3\x82\xaf\xe3\x83\xa9\xe3\x82\xa6\xe3\x83\x89\0" +"ilawa.pl\0" +"fundacio.museum\0one\0travelersinsurance\0" +"wada.nagano.jp\0\xd8\xa7\xd9\x84\xd8\xb9\xd9\x84\xd9\x8a\xd8\xa7\xd9\x86\0" +"ong\0*.elb.amazonaws.com\0from-ks.com\0" +"nord-aurdal.no\0\xd8\xaa\xd9\x88\xd9\x86\xd8\xb3\0" +"ninohe.iwate.jp\0" +"otsuki.yamanashi.jp\0onl\0" +"meguro.tokyo.jp\0" +"trust.museum\0zhytomyr.ua\0" +"tarui.gifu.jp\0" +"ballooning.aero\0" +"miyazaki.jp\0vpndns.net\0" +"railroad.museum\0" +"blog.bo\0capitalone\0" +"aki.kochi.jp\0" +"chintai\0rackmaze.com\0" +"blog.br\0" +"ooo\0" +"bialystok.pl\0" +"manno.kagawa.jp\0shichikashuku.miyagi.jp\0" +"med.br\0scor\0" +"scot\0" +"fvg.it\0toyako.hokkaido.jp\0discover\0" +"miho.ibaraki.jp\0" +"oppegard.no\0" +"as.us\0" +"sd.cn\0malbork.pl\0" +"virginia.museum\0" +"higashitsuno.kochi.jp\0" +"mi.it\0" +"oksnes.no\0shangrila\0" +"gyeongnam.kr\0limited\0rj.leg.br\0" +"k12.ks.us\0" +"brescia.it\0" +"jeju.kr\0management\0podzone.net\0" +"vads\xc3\xb8.no\0audi\0" +"outsystemscloud.com\0" +"funahashi.toyama.jp\0" +"autos\0wellbeingzone.co.uk\0" +"forlicesena.it\0olawa.pl\0ostrowwlkp.pl\0" +"vanylven.no\0from-ms.com\0from-nc.com\0" +"asuke.aichi.jp\0flynnhosting.net\0" "r\xc3\xa6lingen.no\0" -"narashino.chiba.jp\0" -"takayama.gifu.jp\0" -"indianmarket.museum\0" -"rs.leg.br\0sc.leg.br\0" -"tienda\0" -"zagan.pl\0mein-iserv.de\0" -"dnsdojo.net\0" -"texas.museum\0" -"miyagi.jp\0artdeco.museum\0global\0" -"blockbuster\0guitars\0" -"kasuga.hyogo.jp\0tube\0servegame.com\0" -"gemological.museum\0fuossko.no\0" -"taito.tokyo.jp\0" -"kami.kochi.jp\0" -"myfritz.net\0" -"tula.su\0" -"wanouchi.gifu.jp\0" -"ibaraki.ibaraki.jp\0ar.com\0" -"from-ny.net\0neat-url.com\0" -"kayabe.hokkaido.jp\0grozny.ru\0" -"ne.pw\0" -"s\xc3\xa1lat.no\0" -"onyourside\0from-id.com\0" -"anani.br\0" -"cc.tx.us\0" -"k\xc3\xa1r\xc3\xa1\xc5\xa1johka.no\0" -"emilia-romagna.it\0frog.museum\0" -"phoenix.museum\0km.ua\0" -"nx.cn\0tsuwano.shimane.jp\0" -"art.museum\0" -"*.0emm.com\0" -"lexus\0" +"med.ec\0org\0delivery\0n4t.co\0" +"vic.edu.au\0med.ee\0pay\0golffan.us\0" +"kinko.kagoshima.jp\0" +"marche.it\0" +"*.compute-1.amazonaws.com\0" +"porsgrunn.no\0" +"tochio.niigata.jp\0" +"unicom\0" +"konsulat.gov.pl\0" +"lakas.hu\0dyndns-ip.com\0" +"heritage.museum\0starnberg.museum\0dscloud.me\0" +"yamatsuri.fukushima.jp\0beer\0barsy.shop\0" +"\xe5\xb1\xb1\xe6\xa2\xa8.jp\0komaki.aichi.jp\0myoko.niigata.jp\0" +"veneto.it\0tobetsu.hokkaido.jp\0semine.miyagi.jp\0" +"movimiento.bo\0" +"hammerfest.no\0" +"zakopane.pl\0" +"quebec\0fuettertdasnetz.de\0" +"nishiwaki.hyogo.jp\0" +"brandywinevalley.museum\0s3.dualstack.eu-west-2.amazonaws.com\0" +"fiat\0" +"granvin.no\0cc.mi.us\0" +"grp.lk\0pvt.k12.ma.us\0" +"name.hr\0sugito.saitama.jp\0" +"mishima.fukushima.jp\0joetsu.niigata.jp\0" +"suzuka.mie.jp\0" +"\xe6\x85\x88\xe5\x96\x84\0" +"is-an-engineer.com\0" +"minami.tokushima.jp\0ott\0" +"nationwide\0from-sc.com\0" +"potenza.it\0career\0" +"\xe6\x94\xbf\xe5\xba\x9c.hk\0panasonic\0" +"\xd1\x81\xd0\xb0\xd0\xb9\xd1\x82\0" +"goshiki.hyogo.jp\0" +"delmenhorst.museum\0zoology.museum\0lib.gu.us\0" +"name.et\0\xe6\x89\x8b\xe6\x9c\xba\0" +"\xd9\x83\xd9\x88\xd9\x85\0" +"*.platform.sh\0" +"yachts\0" +"svelvik.no\0" +"pet\0" +"naturalsciences.museum\0jolster.no\0" +"massacarrara.it\0" +"med.ht\0ovh\0" +"trentinsuedtirol.it\0wazuka.kyoto.jp\0" +"county.museum\0oxford.museum\0" +"inf.br\0" +"ushiku.ibaraki.jp\0accountant\0" +"fido\0" +"kuroishi.aomori.jp\0" +"metlife\0" +"rsvp\0" +"narvik.no\0mytuleap.com\0freebox-os.com\0" +"barefoot\0" +"bronnoy.no\0smile\0" +"trentino-stirol.it\0" +"inf.cu\0" +"bt.it\0tamaki.mie.jp\0" +"pp.se\0pp.ru\0" +"takarazuka.hyogo.jp\0" +"name.cy\0" +"misasa.tottori.jp\0phd\0" +"correios-e-telecomunica\xc3\xa7\xc3\xb5""es.museum\0" +"kazuno.akita.jp\0" +"pavia.it\0" +"name.eg\0" +"kawaminami.miyazaki.jp\0" +"photography.museum\0" +"pid\0" +"california.museum\0" +"kudamatsu.yamaguchi.jp\0" +"sakurai.nara.jp\0" +"fin.tn\0" +"travel\0" +"k12.mo.us\0pp.ua\0" +"pin\0" +"szczecin.pl\0zagan.pl\0" +"\xe6\x8b\x9b\xe8\x81\x98\0" +"is-lost.org\0" +"name.az\0" +"yazu.tottori.jp\0" +"cc.sd.us\0" +"catania.it\0" +"aknoluokta.no\0" +"med.ly\0fredrikstad.no\0" +"um.gov.pl\0" +"montreal.museum\0" +"sosa.chiba.jp\0matsumoto.nagano.jp\0loan\0instantcloud.cn\0" +"hokuto.hokkaido.jp\0odawara.kanagawa.jp\0" +"is-a-hard-worker.com\0" +"\xe5\xb2\xa1\xe5\xb1\xb1.jp\0" +"chikuhoku.nagano.jp\0mi.th\0" +"cartoonart.museum\0" +"nieruchomosci.pl\0" +"hammarfeasta.no\0" +"seiro.niigata.jp\0" +"ohi.fukui.jp\0" +"lib.nh.us\0" +"expert\0" +"ddnsfree.com\0yombo.me\0" +"trentin-suedtirol.it\0" +"newjersey.museum\0\xe4\xb8\xad\xe5\x9b\xbd\0" +"nerima.tokyo.jp\0" +"p.se\0" +"vda.it\0aoste.it\0ic.gov.pl\0" +"koeln.museum\0r\xc3\xa5""de.no\0" +"muko.kyoto.jp\0govt.nz\0" +"tcm.museum\0austrheim.no\0" +"vaporcloud.io\0" +"toon.ehime.jp\0moriguchi.osaka.jp\0" +"rightathome\0" +"torahime.shiga.jp\0gmail\0ba.leg.br\0" +"med.om\0institute\0systems\0" +"moroyama.saitama.jp\0prod\0" +"mi.us\0\xe4\xb8\xad\xe5\x9c\x8b\0" +"hinode.tokyo.jp\0prof\0" +"med.pa\0" +"yasuda.kochi.jp\0hakuba.nagano.jp\0" +"from-dc.com\0" +"vestre-toten.no\0" +"shinonsen.hyogo.jp\0" +"k12.wa.us\0" +"med.pl\0" +"barsy.net\0" +"usdecorativearts.museum\0osteroy.no\0pnc\0dray-dns.de\0" +"tsushima.aichi.jp\0yukuhashi.fukuoka.jp\0kiso.nagano.jp\0fukaya.saitama.jp\0" +"club.tw\0k12.ga.us\0" +"taranto.it\0" +"calabria.it\0uchinomi.kagawa.jp\0red.sv\0" +"kr\xc3\xa5""anghke.no\0" +"miki.hyogo.jp\0" "oguchi.aichi.jp\0" -"television.museum\0" -"mil.ac\0best\0dyndns-server.com\0" -"naturalsciences.museum\0" -"mil.ae\0" -"obuse.nagano.jp\0" -"mil.al\0heritage.museum\0skj\xc3\xa5k.no\0" -"bytom.pl\0" -"auto\0" -"ama.shimane.jp\0" -"mil.ba\0steiermark.museum\0" -"mil.ar\0ap.leg.br\0" -"eisenbahn.museum\0" -"murakami.niigata.jp\0" -"vestre-slidre.no\0" -"balsan-su\xcc\x88""dtirol.it\0" -"nis.za\0" +"film\0" +"narita.chiba.jp\0us.gov.pl\0" +"wolterskluwer\0" +"mil.ac\0" +"mil.ae\0association.aero\0" +"pruszkow.pl\0" +"\xd0\xb4\xd0\xb5\xd1\x82\xd0\xb8\0" +"\xe7\xb6\xb2\xe8\xb7\xaf.tw\0" +"mil.al\0higashiizumo.shimane.jp\0run.app\0" +"trondheim.no\0" +"scjohnson\0solar\0" +"cam.it\0" +"mil.ba\0kviteseid.no\0" +"mil.ar\0js.cn\0" +"americanart.museum\0" +"med.sa\0" +"loft\0" +"med.sd\0" +"k12.ct.us\0" "mil.az\0" -"rj.gov.br\0" -"fot.br\0landrover\0" -"3.bg\0" -"crew.aero\0mil.bo\0" -"kainan.tokushima.jp\0" -"mil.br\0sauherad.no\0ne.ug\0prudential\0dyndns-mail.com\0" -"medecin.fr\0" -"is-very-evil.org\0" -"ne.tz\0blogspot.com.cy\0rn.leg.br\0" -"sera.hiroshima.jp\0accenture\0" -"fujimi.saitama.jp\0malopolska.pl\0" -"gamvik.no\0" +"sund.no\0" +"emiliaromagna.it\0yashiro.hyogo.jp\0kaizuka.osaka.jp\0skoczow.pl\0" +"alta.no\0" +"\xe5\xa5\x88\xe8\x89\xaf.jp\0" +"mil.bo\0" +"foz.br\0tomi.nagano.jp\0" +"guide\0" +"mil.br\0arezzo.it\0" +"minowa.nagano.jp\0" +"inf.mk\0" +"rr.leg.br\0" +"mosvik.no\0termez.su\0" +"best\0" "mil.by\0" -"kurate.fukuoka.jp\0omi.niigata.jp\0hockey\0" -"mil.cl\0" -"mil.cn\0ne.us\0" -"mil.co\0\xe5\xb2\x90\xe9\x98\x9c.jp\0" -"blogspot.com.ee\0" -"gildeskal.no\0film\0" -"\xd9\x85\xd8\xb5\xd8\xb1\0blogspot.com.eg\0" -"fet.no\0" -"nissan\0wpdevcloud.com\0" -"east-kazakhstan.su\0hopto.org\0" -"blogspot.com.ar\0" -"mil.do\0nakasatsunai.hokkaido.jp\0missile.museum\0" -"blogspot.com.au\0" +"\xd9\x85\xd8\xb5\xd8\xb1\0" +"mil.cl\0\xd0\xbc\xd0\xbe\xd1\x81\xd0\xba\xd0\xb2\xd0\xb0\0" +"collection.museum\0fitjar.no\0" +"mil.cn\0" +"mil.co\0" +"ra.it\0" +"scapp.io\0" +"auto\0lima.zone\0" +"asso.fr\0" +"catering\0" +"mitsue.nara.jp\0kushimoto.wakayama.jp\0" +"seat\0" +"barclays\0" +"aq.it\0ba.it\0" +"egersund.no\0tokke.no\0" +"\xe0\xb9\x80\xe0\xb8\x99\xe0\xb9\x87\xe0\xb8\x95.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" +"k12.ak.us\0" +"mil.do\0pro\0cc.tx.us\0" +"bss.design\0" +"christiansburg.museum\0" +"asso.gp\0" "mil.ec\0" -"ro.leg.br\0" -"sx.cn\0trentino.it\0nissay\0noip.us\0" -"mil.eg\0cesena-forli.it\0" -"inawashiro.fukushima.jp\0" -"auspost\0" -"vevelstad.no\0nyc.mn\0" -"is-a-geek.org\0" -"design\0blogspot.com.br\0" -"sellsyourhome.org\0" -"\xe0\xae\x87\xe0\xae\xa8\xe0\xaf\x8d\xe0\xae\xa4\xe0\xae\xbf\xe0\xae\xaf\xe0\xae\xbe\0" -"collection.museum\0" -"blogspot.com.by\0soundcast.me\0" -"surgery\0" -"shichinohe.aomori.jp\0*.alces.network\0" -"scor\0" -"scot\0s3-website.eu-west-2.amazonaws.com\0blogspot.com.co\0" -"ca-central-1.elasticbeanstalk.com\0" -"gliwice.pl\0gda.pl\0" -"lig.it\0miyoshi.tokushima.jp\0kahoku.yamagata.jp\0" -"mein-vigor.de\0" -"mil.ge\0" -"\xc3\xb8rsta.no\0mragowo.pl\0" -"honda\0" -"mil.gh\0vossevangen.no\0" -"\xe5\x85\xac\xe5\x8f\xb8.cn\0xfinity\0" -"globo\0" -"xxx\0app.os.fedoraproject.org\0" -"yokosuka.kanagawa.jp\0" -"corsica\0" -"s\xc3\xb8r-odal.no\0omega\0" -"mil.gt\0is-a-hunter.com\0" -"\xe5\x85\xac\xe5\x8f\xb8.hk\0honjo.akita.jp\0" -"chimkent.su\0" -"cs.it\0twmail.cc\0" -"academia.bo\0" -"select\0" -"loan\0place\0" -"mil.hn\0tuva.su\0" -"j\xc3\xb8rpeland.no\0xyz\0blogspot.com.es\0" -"oppdal.no\0rzeszow.pl\0" -"sko.gov.pl\0press\0" -"mil.id\0" -"taishin.fukushima.jp\0tokuyama.yamaguchi.jp\0" -"napoli.it\0correios-e-telecomunica\xc3\xa7\xc3\xb5""es.museum\0" +"sd.us\0pru\0s3-ap-south-1.amazonaws.com\0" +"rs.leg.br\0sc.leg.br\0" +"mil.eg\0" +"ena.gifu.jp\0" +"passenger-association.aero\0racing\0" +"shirako.chiba.jp\0" +"miyoshi.tokushima.jp\0" +"dance\0" +"sakyo.kyoto.jp\0nome.pt\0" +"\xd8\xa8\xd8\xa7\xd8\xb1\xd8\xaa\0" "fire\0" +"asso.ht\0yoshida.saitama.jp\0hotmail\0servebbs.net\0" +"wa.gov.au\0" +"nuremberg.museum\0fam.pk\0" +"ingatlan.hu\0" +"aibetsu.hokkaido.jp\0" +"kumano.mie.jp\0am.leg.br\0" +"pub\0" +"cooperativa.bo\0" +"verona.it\0" +"mil.ge\0association.museum\0" +"niikappu.hokkaido.jp\0kawahara.tottori.jp\0" +"bmoattachments.org\0" +"mil.gh\0fish\0" +"s3-eu-west-2.amazonaws.com\0" +"asso.bj\0nagano.jp\0shinyoshitomi.fukuoka.jp\0starhub\0" +"kagoshima.jp\0" +"seek\0" +"mil.gt\0" +"vaapste.no\0" +"yakage.okayama.jp\0name.vn\0" +"eastafrica.museum\0averoy.no\0" +"asso.ci\0kv.ua\0" +"es.gov.br\0mil.hn\0" +"freeboxos.com\0" +"venice.it\0" +"pwc\0" +"mil.id\0" +"uda.nara.jp\0" +"cc.nj.us\0" +"kouzushima.tokyo.jp\0" +"web.bo\0meland.no\0" +"radom.pl\0" +"planetarium.museum\0fed.us\0" "mil.in\0" -"eaton.mi.us\0" +"steigen.no\0" "mil.iq\0" -"badajoz.museum\0p.se\0" -"lawyer\0" -"mibu.tochigi.jp\0\xe8\xb0\xb7\xe6\xad\x8c\0" -"otoineppu.hokkaido.jp\0" -"lacaixa\0" -"fujioka.gunma.jp\0" -"applinzi.com\0" -"fish\0bplaced.net\0" -"mil.jo\0" -"xs4all.space\0" -"onjuku.chiba.jp\0" -"przeworsk.pl\0" -"mo\xc3\xa5reke.no\0pomorskie.pl\0" +"yokaichiba.chiba.jp\0name.tj\0" +"web.co\0yolasite.com\0" +"inf.ua\0" +"asso.dz\0name.tr\0" +"name.tt\0faith\0" +"mil.jo\0nativeamerican.museum\0" +"wroc.pl\0" +"gildeskal.no\0" +"shichinohe.aomori.jp\0kanoya.kagoshima.jp\0privatizehealthinsurance.net\0" +"n.bg\0" +"kanegasaki.iwate.jp\0ogawara.miyagi.jp\0\xe0\xae\x87\xe0\xae\xa8\xe0\xaf\x8d\xe0\xae\xa4\xe0\xae\xbf\xe0\xae\xaf\xe0\xae\xbe\0" +"website\0dedyn.io\0ddnss.de\0" +"ruhr\0rn.leg.br\0" "mil.kg\0" -"ba.gov.br\0jogasz.hu\0nanao.ishikawa.jp\0" -"isesaki.gunma.jp\0" -"mochizuki.nagano.jp\0mil.km\0" -"himi.toyama.jp\0camera\0" -"fuel.aero\0servep2p.com\0" -"mil.kr\0ostrowwlkp.pl\0" -"morimachi.shizuoka.jp\0" -"*.compute.amazonaws.com\0" -"iron.museum\0il.eu.org\0" -"haram.no\0" +"web.do\0hellas.museum\0fr\xc3\xb8ya.no\0" +"nakamichi.yamanashi.jp\0" +"dnsalias.org\0" +"kartuzy.pl\0" +"mil.km\0" +"kmpsp.gov.pl\0" +"pixolino.com\0telebit.io\0" +"barsy.site\0" +"matsuura.nagasaki.jp\0mil.kr\0" +"te.it\0" "mil.kz\0" -"austevoll.no\0" -"eu-central-1.elasticbeanstalk.com\0" -"tonaki.okinawa.jp\0karikatur.museum\0" -"family\0" -"nonoichi.ishikawa.jp\0" -"mil.lv\0" -"mil.mg\0tolga.no\0rsvp\0" -"tamamura.gunma.jp\0osteroy.no\0" -"no-ip.net\0" -"net.ac\0" -"net.ae\0miyakonojo.miyazaki.jp\0loft\0" -"net.af\0belem.br\0" -"net.ag\0" -"guovdageaidnu.no\0workisboring.com\0" -"net.ai\0mil.mv\0" -"mil.ng\0knowsitall.info\0hu.eu.org\0ie.eu.org\0" -"net.al\0mil.my\0mil.ni\0" -"mil.mz\0you\0" -"yusuhara.kochi.jp\0" -"bearalv\xc3\xa1hki.no\0" -"net.ba\0yalta.ua\0" -"net.ar\0net.bb\0mil.no\0" -"bushey.museum\0" -"money\0" -"net.au\0" -"net.bh\0" -"\xd7\xa7\xd7\x95\xd7\x9d\0" -"net.az\0coop.ht\0" -"hs.kr\0" -"nov.ru\0" -"net.bm\0mil.nz\0" -"net.bn\0" -"net.bo\0saves-the-whales.com\0" -"sa.gov.au\0ladbrokes\0" -"net.br\0sanok.pl\0" -"net.bs\0" -"net.bt\0" -"ravendb.run\0" -"yasuda.kochi.jp\0\xe4\xbf\xa1\xe6\x81\xaf\0" -"jaguar\0myasustor.com\0" +"oirm.gov.pl\0" +"deporte.bo\0temasek\0barsy.pro\0" +"target\0wien\0" +"ap.leg.br\0" +"yamagata.yamagata.jp\0" +"moss.no\0" +"ama.shimane.jp\0mil.lv\0ro.leg.br\0" +"7.bg\0mil.mg\0jondal.no\0s3.dualstack.sa-east-1.amazonaws.com\0is-a-patsfan.org\0" +"turin.it\0dazaifu.fukuoka.jp\0miyada.nagano.jp\0" +"ternopil.ua\0" +"miyoshi.hiroshima.jp\0" +"tx.us\0marshalls\0" +"higashikawa.hokkaido.jp\0" +"eisenbahn.museum\0" +"horse\0" +"cloudfront.net\0" +"culturalcenter.museum\0" +"kawachinagano.osaka.jp\0" +"mil.mv\0gda.pl\0" +"mil.ng\0forde.no\0" +"mil.my\0mil.ni\0lillehammer.no\0" +"pn.it\0yamakita.kanagawa.jp\0nozawaonsen.nagano.jp\0mil.mz\0" +"name.qa\0" +"ntr.br\0tomigusuku.okinawa.jp\0name.pr\0" +"web.gu\0mil.no\0" +"barsy.pub\0" +"undersea.museum\0" +"fujisawa.iwate.jp\0" +"\xd0\xb0\xd0\xba.\xd1\x81\xd1\x80\xd0\xb1\0" +"fi.cr\0susono.shizuoka.jp\0" +"murata.miyagi.jp\0cloud.metacentrum.cz\0" +"voyage\0" +"bulsan-s\xc3\xbc""dtirol.it\0mil.nz\0" +"name.na\0nes.buskerud.no\0" +"shinjo.okayama.jp\0" +"whaling.museum\0podzone.org\0fr.eu.org\0" +"web.id\0aichi.jp\0health.nz\0" +"sunndal.no\0lancia\0s3-website-us-west-1.amazonaws.com\0" +"name.mv\0" +"name.ng\0" +"name.my\0vestby.no\0cc.de.us\0" +"azumino.nagano.jp\0nagasaki.nagasaki.jp\0" "mil.pe\0" -"net.ci\0yokote.akita.jp\0" -"net.bz\0" -"\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86.ir\0mil.ph\0prod\0noip.me\0" -"mykolaiv.ua\0nov.su\0" -"net.cm\0prof\0" -"net.cn\0" -"net.co\0mil.pl\0" -"kochi.kochi.jp\0" -"presse.km\0discount\0" -"blogspot.com.mt\0" -"mil.qa\0" -"net.cu\0" -"takahagi.ibaraki.jp\0blogspot.com.ng\0" -"net.cw\0tysfjord.no\0" -"coop.br\0humanities.museum\0\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa6\xb0\xe0\xa6\xa4\0se.leg.br\0" -"net.cy\0geelvinck.museum\0volyn.ua\0" -"sc.cn\0kumiyama.kyoto.jp\0" -"mil.py\0" -"net.dm\0ikeda.nagano.jp\0" -"net.do\0" -"ak.us\0" -"ipifony.net\0" -"net.ec\0" -"h\xc3\xb8ylandet.no\0pulawy.pl\0" -"seto.aichi.jp\0" -"net.eg\0\xc3\xb8vre-eiker.no\0" -"venice.it\0is-a-player.com\0" -"net.dz\0" -"sciencesnaturelles.museum\0sandvik\0" -"oh.us\0" -"kumano.mie.jp\0" -"rr.gov.br\0" -"ms.it\0nieruchomosci.pl\0" -"xerox\0" -"trd.br\0\xe6\x95\x99\xe8\x82\xb2.hk\0presse.ml\0" -"ogori.fukuoka.jp\0hokksund.no\0" -"trentino-aadige.it\0tsurugi.ishikawa.jp\0cc.mn.us\0" -"net.et\0" -"nanae.hokkaido.jp\0caravan\0" -"\xe0\xa4\xb8\xe0\xa4\x82\xe0\xa4\x97\xe0\xa4\xa0\xe0\xa4\xa8\0" -"gjovik.no\0" -"mil.ru\0endoftheinternet.org\0" -"council.aero\0" -"mil.rw\0" -"am.gov.br\0mil.sh\0" -"bolt.hu\0hotel.tz\0" -"tsukiyono.gunma.jp\0bahcavuotna.no\0" -"deatnu.no\0" -"maringa.br\0usui.fukuoka.jp\0bnpparibas\0blogspot.com.tr\0" -"dyndns-pics.com\0" -"nogi.tochigi.jp\0" -"tono.iwate.jp\0" -"n.bg\0net.ge\0" -"yun\0" -"net.gg\0mil.st\0" -"lur\xc3\xb8y.no\0dc.us\0" -"taketa.oita.jp\0" -"net.gl\0mil.sy\0s3-eu-west-3.amazonaws.com\0" -"bn.it\0ms.kr\0malvik.no\0mil.tj\0" -"rs.gov.br\0sc.gov.br\0net.gn\0nakagawa.fukuoka.jp\0" -"net.gp\0oirase.aomori.jp\0oketo.hokkaido.jp\0mil.tm\0ivanovo.su\0" -"eurovision\0" -"net.gr\0mil.to\0" -"rochester.museum\0" -"net.gt\0tec.mi.us\0" -"net.gu\0sardegna.it\0koshu.yamanashi.jp\0yorkshire.museum\0tr\xc3\xa6na.no\0mil.tr\0" -"net.gy\0trentino-altoadige.it\0" +"ostroleka.pl\0" +"*.landing.myjino.ru\0" +"munakata.fukuoka.jp\0mil.ph\0" +"revista.bo\0mining.museum\0" +"mil.pl\0" +"latrobe\0" +"katsuura.chiba.jp\0" +"engerdal.no\0lib.ny.us\0" +"wakayama.wakayama.jp\0" +"sandefjord.no\0mil.qa\0k12.ky.us\0" +"\xe5\x80\x8b\xe4\xba\xba.hk\0from-mn.com\0" +"entertainment.aero\0love\0" +"balsan-s\xc3\xbc""dtirol.it\0ina.ibaraki.jp\0okinoshima.shimane.jp\0" +"westfalen.museum\0stryn.no\0mil.py\0hosting\0" +"shisui.chiba.jp\0sowa.ibaraki.jp\0" +"tanagura.fukushima.jp\0nanbu.tottori.jp\0" +"gov.nc.tr\0" +"stockholm\0" +"kitami.hokkaido.jp\0lubartow.pl\0" +"r\xc3\xb8ros.no\0nj.us\0industries\0hobby-site.org\0" +"ru.com\0" +"ono.fukushima.jp\0" +"wiki\0georgia.su\0" +"bauern.museum\0taipei\0" +"lupin\0" +"gojome.akita.jp\0boehringer\0" +"pointto.us\0" +"\xd8\xa8\xd9\x8a\xd8\xaa\xd9\x83\0" +"web.lk\0name.mk\0mil.ru\0k12.il.us\0spacekit.io\0" +"mil.rw\0dyndns-blog.com\0" +"mil.sh\0" +"nordreisa.no\0" +"hichiso.gifu.jp\0shinjuku.tokyo.jp\0" +"bahn.museum\0ybo.science\0" +"trentinoaltoadige.it\0" +"minamiizu.shizuoka.jp\0" +"properties\0us.eu.org\0" +"mil.st\0" +"elburg.museum\0" +"at-band-camp.net\0" +"name.jo\0mil.sy\0" +"mil.tj\0" +"vi.it\0" +"mil.tm\0" +"on-web.fr\0" +"mil.to\0is-a-nurse.com\0" +"yonaguni.okinawa.jp\0web.nf\0" +"spjelkavik.no\0" +"mil.tr\0" +"web.ni\0" +"mitoyo.kagawa.jp\0yandex\0" +"j\xc3\xb8rpeland.no\0wine\0is-a-painter.com\0" +"fi.it\0" "mil.tw\0" -"net.hk\0" -"mil.tz\0" -"industria.bo\0net.hn\0" -"bozen-su\xcc\x88""dtirol.it\0faith\0" -"urn.arpa\0" -"net.ht\0net.id\0" -"emiliaromagna.it\0moma.museum\0" -"matsudo.chiba.jp\0mil.vc\0" -"nishi.fukuoka.jp\0" +"futaba.fukushima.jp\0mil.tz\0" +"saves-the-whales.com\0" +"yufu.oita.jp\0" +"mil.vc\0" "mil.ve\0" -"kitamoto.saitama.jp\0chizu.tottori.jp\0s\xc3\xb8rum.no\0" -"mizumaki.fukuoka.jp\0bounceme.net\0" -"net.il\0delmenhorst.museum\0ulvik.no\0mil.uy\0" -"net.im\0mihama.mie.jp\0" -"net.in\0odda.no\0s\xc3\xa1l\xc3\xa1t.no\0" -"barclays\0" -"net.iq\0" -"net.ir\0naustdal.no\0" -"net.is\0" -"net.je\0s3-website.ap-northeast-2.amazonaws.com\0" -"kyuragi.saga.jp\0" -"medical.museum\0" -"yoita.niigata.jp\0" -"tachikawa.tokyo.jp\0kvinnherad.no\0is-an-engineer.com\0" -"badaddja.no\0" -"aktyubinsk.su\0" -"net.jo\0" -"quest\0" -"trogstad.no\0" -"hofu.yamaguchi.jp\0tel.tr\0" -"net.kg\0" -"okinawa.jp\0zip\0" -"net.ki\0diet\0" -"manno.kagawa.jp\0omiya.saitama.jp\0vaapste.no\0gr.eu.org\0" -"ln.cn\0" -"saogonca.br\0" -"net.kn\0seat\0" -"uki.kumamoto.jp\0net.la\0" -"sc.ke\0net.lb\0" -"net.lc\0" -"recipes\0" -"harvestcelebration.museum\0chrysler\0" -"santabarbara.museum\0" -"chikusei.ibaraki.jp\0itoman.okinawa.jp\0net.kw\0" -"blogspot.com.uy\0" -"net.ky\0googlecode.com\0" -"net.kz\0selbu.no\0" -"ap.gov.br\0ishikawa.okinawa.jp\0net.lk\0law.pro\0" -"dyndns-at-work.com\0" -"sc.kr\0" -"net.ma\0cupcake.is\0" -"net.lr\0boats\0" -"kamikoani.akita.jp\0" -"mil.za\0oracle\0" -"net.me\0vadso.no\0game-host.org\0" -"not.br\0net.lv\0" -"scrapper-site.net\0" -"capebreton.museum\0" -"ichinoseki.iwate.jp\0net.ly\0online\0" -"santamaria.br\0net.mk\0from-ma.com\0" -"net.ml\0" -"hadano.kanagawa.jp\0k12.gu.us\0" -"rn.gov.br\0" -"of.by\0hotel.lk\0net.mo\0" -"mil.zm\0" -"accident-prevention.aero\0net.ms\0rnrt.tn\0" -"net.mt\0" -"net.mu\0ap.gov.pl\0" -"net.mv\0net.nf\0" -"muika.niigata.jp\0net.mw\0net.ng\0foundation\0feste-ip.net\0" -"net.mx\0k12.ut.us\0" -"net.my\0net.ni\0" -"net.mz\0mil.zw\0" -"avocat.fr\0" -"gyeongnam.kr\0lavangen.no\0" -"net.nr\0tjmaxx\0" -"radio.br\0accesscam.org\0" -"incheon.kr\0seek\0" -"maritimo.museum\0abarth\0kurgan.su\0" -"molise.it\0" -"net.nz\0" -"b\xc3\xb8.telemark.no\0net.om\0" -"ro.gov.br\0valle-daosta.it\0est-mon-blogueur.com\0nh-serv.co.uk\0" -"claims\0\xe5\x98\x89\xe9\x87\x8c\xe5\xa4\xa7\xe9\x85\x92\xe5\xba\x97\0" -"granvin.no\0net.pa\0" -"cq.cn\0" -"nsupdate.info\0" -"daisen.akita.jp\0barum.no\0" -"net.pe\0" -"love\0" -"oe.yamagata.jp\0" -"drangedal.no\0net.ph\0" -"mar.it\0" -"\xd9\x81\xd9\x84\xd8\xb3\xd8\xb7\xd9\x8a\xd9\x86\0" -"shinjo.yamagata.jp\0oppegard.no\0net.pk\0" -"net.pl\0" -"nc.tr\0" -"1.bg\0fvg.it\0net.pn\0" -"ogasawara.tokyo.jp\0" -"net.qa\0" -"ako.hyogo.jp\0net.pr\0from-me.org\0" -"fujishiro.ibaraki.jp\0higashiyamato.tokyo.jp\0net.ps\0" -"kitadaito.okinawa.jp\0fundacio.museum\0net.pt\0\xe3\x82\xb0\xe3\x83\xbc\xe3\x82\xb0\xe3\x83\xab\0" -"assassination.museum\0loans\0" -"qc.com\0" -"kui.hiroshima.jp\0" -"net.py\0ddns.me\0" -"sennan.osaka.jp\0kofu.yamanashi.jp\0" -"juedisches.museum\0" -"andoy.no\0rogers\0" -"ms.us\0nc.us\0" -"akishima.tokyo.jp\0" -"kyotamba.kyoto.jp\0" -"arna.no\0" -"freight.aero\0cc.ky.us\0shell\0" -"hoylandet.no\0" -"hotel.hu\0barclaycard\0" -"b\xc3\xa1jddar.no\0juniper\0" -"n\xc3\xa5\xc3\xa5mesjevuemie.no\0" -"!www.ck\0ruhr\0" -"fi.cr\0panama.museum\0k12.me.us\0" -"net.sa\0\xe5\x85\xac\xe5\x8f\xb8.\xe9\xa6\x99\xe6\xb8\xaf\0" -"hokuto.hokkaido.jp\0net.sb\0" -"\xe5\xb2\xa1\xe5\xb1\xb1.jp\0saltdal.no\0net.sc\0" -"net.sd\0" -"net.ru\0" -"exposed\0resindevice.io\0" -"net.rw\0net.sg\0nohost.me\0" -"net.sh\0app.lmpm.com\0" -"horokanai.hokkaido.jp\0" -"akrehamn.no\0meraker.no\0net.sl\0" -"asaka.saitama.jp\0" -"ishikawa.jp\0net.so\0" -"ws.na\0" -"namdalseid.no\0dscloud.me\0" -"net.st\0" -"szczytno.pl\0" -"sigdal.no\0metlife\0" -"wif.gov.pl\0pixolino.com\0" -"net.th\0" -"tako.chiba.jp\0net.sy\0" -"noto.ishikawa.jp\0net.tj\0immobilien\0" -"isa.kagoshima.jp\0is-a-geek.net\0" -"taira.toyama.jp\0net.tm\0k12.ar.us\0" -"net.tn\0is-a-chef.org\0" -"net.to\0melbourne\0" -"from-ok.com\0" -"net.ua\0mypep.link\0" -"net.tr\0" -"kishiwada.osaka.jp\0bygland.no\0" -"assedic.fr\0omuta.fukuoka.jp\0hyuga.miyazaki.jp\0net.tt\0" -"is-a-rockstar.com\0" -"net.tw\0" -"columbia.museum\0" +"ind.br\0" +"barsyonline.co.uk\0" +"mil.uy\0" +"\xe5\x8d\x83\xe8\x91\x89.jp\0kitahiroshima.hokkaido.jp\0" +"can.museum\0yorkshire.museum\0bjugn.no\0vm.bytemark.co.uk\0" +"sande.more-og-romsdal.no\0" +"akaiwa.okayama.jp\0" +"sejny.pl\0health.vn\0contact\0" +"te.ua\0" +"tv.bb\0red\0" +"web.pk\0\xd7\xa7\xd7\x95\xd7\x9d\0" +"\xe0\xb8\xa8\xe0\xb8\xb6\xe0\xb8\x81\xe0\xb8\xa9\xe0\xb8\xb2.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" +"asso.re\0" +"br.it\0cb.it\0shimoda.shizuoka.jp\0" +"archi\0" +"tanohata.iwate.jp\0" +"kamishihoro.hokkaido.jp\0diet\0ren\0cnpy.gdn\0" +"cc.vi.us\0" +"omotego.fukushima.jp\0" +"tv.bo\0sandcats.io\0" +"blockbuster\0" +"qvc\0from-tn.com\0" +"fnd.br\0tv.br\0rackmaze.net\0" +"mihara.hiroshima.jp\0azurewebsites.net\0" +"stada\0hu.com\0" +"mulhouse.museum\0school.museum\0" +"shimada.shizuoka.jp\0" +"pagespeedmobilizer.com\0" +"bedzin.pl\0" +"de.us\0" +"manx.museum\0" +"lease\0serveirc.com\0" +"se.leg.br\0" +"copenhagen.museum\0lanbib.se\0k12.ne.us\0" +"studio\0" +"friuliveneziagiulia.it\0ikeda.hokkaido.jp\0" +"notaires.km\0leka.no\0" +"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xd8\xa9\0*.advisor.ws\0" +"fukagawa.hokkaido.jp\0" +"hanggliding.aero\0s3.dualstack.ap-south-1.amazonaws.com\0" +"resistance.museum\0mil.za\0" +"yamagata.jp\0kamikawa.saitama.jp\0wielun.pl\0" +"beiarn.no\0is-into-cars.com\0" +"film.hu\0eu.com\0" +"for-the.biz\0" +"mil.zm\0*.vps.myjino.ru\0" +"morimachi.shizuoka.jp\0" +"maserati\0" +"nagareyama.chiba.jp\0web.tj\0" +"asso.nc\0" +"takehara.hiroshima.jp\0yamagata.nagano.jp\0" +"oppdal.no\0\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa7\0mil.zw\0" +"ind.gt\0!city.yokohama.jp\0fujimino.saitama.jp\0" +"lib.nj.us\0\xd8\xb3\xd9\x88\xd8\xb1\xd9\x8a\xd8\xa9\0xs4all.space\0" +"gs.hm.no\0netbank\0wanggou\0de.com\0" +"web.tr\0ril\0" +"leasing.aero\0sexy\0" +"hirono.iwate.jp\0debian.net\0" +"jobs\0rio\0" +"rip\0" +"n.se\0" +"ggf.br\0urayasu.chiba.jp\0" +"barsy.org\0" +"cc.ok.us\0is-leet.com\0dsmynas.org\0" +"ochi.kochi.jp\0satte.saitama.jp\0" +"m\xc3\xa5lselv.no\0is-a-teacher.com\0synology.me\0" +"zarow.pl\0" +"firewall-gateway.com\0" +"okawa.kochi.jp\0" +"web.ve\0latino\0" +"kusatsu.gunma.jp\0saikai.nagasaki.jp\0" +"ind.in\0" +"corsica\0" +"oster\xc3\xb8y.no\0" +"pub.sa\0" +"\xe9\x95\xb7\xe9\x87\x8e.jp\0niigata.niigata.jp\0nago.okinawa.jp\0" +"est-a-la-maison.com\0" +"namdalseid.no\0" +"nishikata.tochigi.jp\0" +"kumamoto.jp\0ustka.pl\0" +"tuva.su\0" +"accident-prevention.aero\0" +"roma.it\0mombetsu.hokkaido.jp\0" +"odda.no\0barsy.co.uk\0" +"\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa5\x8b\xe0\xa4\xa4\0" +"oita.jp\0moonscale.net\0" +"gotdns.org\0" +"higashimurayama.tokyo.jp\0" +"tv.im\0publishproxy.com\0" +"shimogo.fukushima.jp\0sanok.pl\0" +"!www.ck\0sport.hu\0" +"catholic\0" +"tv.it\0" +"eco.br\0" +"ind.kw\0transport.museum\0homesense\0" +"soni.nara.jp\0" +"hinohara.tokyo.jp\0" +"nombre.bo\0versailles.museum\0" +"vi.us\0web.za\0" +"now-dns.net\0" +"is-very-bad.org\0" +"otoineppu.hokkaido.jp\0freesite.host\0" +"asso.km\0gallery.museum\0rahkkeravju.no\0" +"posts-and-telecommunications.museum\0station.museum\0community\0" +"minamiuonuma.niigata.jp\0" +"hirosaki.aomori.jp\0" +"dating\0" +"horten.no\0endoftheinternet.org\0" +"ethnology.museum\0giske.no\0charity\0" +"sb.ua\0k12.pa.us\0" "cyou\0" -"gov.nc.tr\0net.uk\0alfaromeo\0" -"de.com\0" -"emerck\0" -"obninsk.su\0townnews-staging.com\0" -"soundandvision.museum\0grimstad.no\0" -"sakuragawa.ibaraki.jp\0" -"net.vc\0" -"sciences.museum\0sc.ug\0" -"izumi.osaka.jp\0troms\xc3\xb8.no\0net.ve\0" -"sc.tz\0" -"net.uy\0net.vi\0servegame.org\0" -"gs.hl.no\0coop.tt\0net.uz\0" -"yoshida.saitama.jp\0" -"kamisunagawa.hokkaido.jp\0v\xc3\xa5g\xc3\xa5.no\0termez.su\0" -"net.vn\0" -"vapor.cloud\0" -"sc.us\0store\0" -"sakae.nagano.jp\0ibaraki.osaka.jp\0net.vu\0" -"chocolate.museum\0" -"coop.mv\0b.ssl.fastly.net\0" -"coop.mw\0" -"swatch\0" -"works.aero\0minamata.kumamoto.jp\0" -"jobs\0tranoy.no\0" -"webhop.biz\0" -"n.se\0net.ws\0" -"lib.pa.us\0" -"aurland.no\0" -"dyndns-web.com\0" -"kitami.hokkaido.jp\0" -"tottori.jp\0" -"forli\xcc\x80-cesena.it\0youth.museum\0" -"dish\0" -"touch.museum\0\xe4\xbc\x81\xe4\xb8\x9a\0" -"fi.it\0fastlylb.net\0" -"homesense\0" -"of.no\0" -"loten.no\0olayan\0" -"mifune.kumamoto.jp\0" -"sv.it\0joboji.iwate.jp\0" -"wien\0" -"wuoz.gov.pl\0" -"hyogo.jp\0" -"net.za\0" -"swiebodzin.pl\0" -"ogawara.miyagi.jp\0is-a-chef.com\0" -"sveio.no\0" -"vet.br\0schokoladen.museum\0dnsalias.com\0" -"yaotsu.gifu.jp\0" -"def.br\0net.zm\0" -"atsuma.hokkaido.jp\0ohira.tochigi.jp\0coop.py\0" -"shichikashuku.miyagi.jp\0" -"sauda.no\0" -"szczecin.pl\0" -"press.aero\0" -"loabat.no\0mattel\0" -"ota.gunma.jp\0" -"odessa.ua\0netlify.com\0" -"asakuchi.okayama.jp\0" -"se.gov.br\0presse.ci\0" -"saintlouis.museum\0" -"tome.miyagi.jp\0" -"us-gov-west-1.elasticbeanstalk.com\0" -"fuoisku.no\0cc.vi.us\0" -"financial\0" -"vipsinaapp.com\0" -"ltd.co.im\0" -"ed.ao\0myfirewall.org\0" -"raholt.no\0" -"jeonnam.kr\0" -"coop.km\0" -"boston.museum\0clothing\0" -"abeno.osaka.jp\0" -"kudoyama.wakayama.jp\0" -"entomology.museum\0mopar\0" -"ngrok.io\0" -"sa.au\0samegawa.fukushima.jp\0" -"recife.br\0poivron.org\0" -"hizen.saga.jp\0" -"sango.nara.jp\0minato.tokyo.jp\0lugs.org.uk\0" -"sling\0" -"fetsund.no\0" -"ed.ci\0numata.gunma.jp\0seranishi.hiroshima.jp\0vagsoy.no\0" -"s3-us-west-2.amazonaws.com\0" -"zippo\0" -"ogawa.ibaraki.jp\0omi.nagano.jp\0" -"trentin-sued-tirol.it\0tomobe.ibaraki.jp\0setouchi.okayama.jp\0" -"\xe9\xab\x98\xe7\x9f\xa5.jp\0" -"ed.cr\0" -"gob.ar\0shimoichi.nara.jp\0" -"osoyro.no\0" -"aibetsu.hokkaido.jp\0ce.leg.br\0" -"presse.fr\0tsubame.niigata.jp\0michigan.museum\0" -"hoteles\0" -"wiki\0" -"sand\xc3\xb8y.no\0" -"sa.cr\0is-a-bruinsfan.org\0" -"kharkov.ua\0" -"gob.bo\0lib.wy.us\0" -"hasura.app\0" -"utsunomiya.tochigi.jp\0" -"maintenance.aero\0" -"skype\0" -"kaluga.su\0" -"nishitosa.kochi.jp\0obanazawa.yamagata.jp\0nv.us\0" -"manx.museum\0\xe6\x96\xb0\xe5\x8a\xa0\xe5\x9d\xa1\0" -"ome.tokyo.jp\0" -"gob.cl\0na.it\0" -"kiwi.nz\0" -"buzen.fukuoka.jp\0gs.rl.no\0read-books.org\0servehalflife.com\0" -"k12.ak.us\0" -"uklugs.org\0" -"skedsmokorset.no\0" -"kerryproperties\0" -"kinokawa.wakayama.jp\0forsale\0" -"marnardal.no\0psp.gov.pl\0\xd0\xb0\xd0\xba.\xd1\x81\xd1\x80\xd0\xb1\0" -"kppsp.gov.pl\0" -"seoul.kr\0sa.gov.pl\0cieszyn.pl\0" -"kimino.wakayama.jp\0macys\0marketing\0" -"gmail\0" -"\xce\xb5\xce\xbb\0" -"gob.do\0heimatunduhren.museum\0" -"it.ao\0alsace\0" -"research.museum\0" -"l.bg\0" -"gob.ec\0kanra.gunma.jp\0vega.no\0zp.gov.pl\0" -"agr.br\0wine\0" -"\xd0\xba\xd0\xb0\xd1\x82\xd0\xbe\xd0\xbb\xd0\xb8\xd0\xba\0" -"bl.it\0" -"encyclopedic.museum\0boutique\0" +"lubin.pl\0" +"tachiarai.fukuoka.jp\0" +"tj\xc3\xb8me.no\0" +"ao.it\0" +"asso.mc\0ontario.museum\0chernovtsy.ua\0lib.ca.us\0" +"mus.br\0" +"hm.no\0" +"dellogliastra.it\0yoita.niigata.jp\0kainan.tokushima.jp\0" +"myshopblocks.com\0" +"from-in.com\0" +"dscloud.biz\0" +"mo-i-rana.no\0" +"tv.na\0" +"author.aero\0nesoddtangen.no\0" +"showa.fukushima.jp\0" +"folkebibl.no\0athleta\0" +"nagatoro.saitama.jp\0" +"bokn.no\0" +"moka.tochigi.jp\0nogi.tochigi.jp\0" +"mesaverde.museum\0technology.museum\0" +"kamisu.ibaraki.jp\0" +"sap\0" +"k12.md.us\0" +"hikari.yamaguchi.jp\0\xe0\xa4\xb8\xe0\xa4\x82\xe0\xa4\x97\xe0\xa4\xa0\xe0\xa4\xa8\0" +"casadelamoneda.museum\0sas\0shopping\0" +"jus.br\0" +"groundhandling.aero\0" +"wedding\0" +"urbinopesaro.it\0podlasie.pl\0maif\0" +"konyvelo.hu\0sbi\0adygeya.su\0" +"morotsuka.miyazaki.jp\0" +"naha.okinawa.jp\0" +"aver\xc3\xb8y.no\0sca\0" +"rokunohe.aomori.jp\0dish\0scb\0" +"ok.us\0sbs\0" +"\xc3\xa5mot.no\0flora.no\0" +"sondrio.it\0takahata.yamagata.jp\0" +"royken.no\0" +"salangen.no\0" +"oirase.aomori.jp\0" +"pescara.it\0kuchinotsu.nagasaki.jp\0" +"shiraoi.hokkaido.jp\0vision\0" +"tottori.jp\0onojo.fukuoka.jp\0" +"maritimo.museum\0\xc3\xb8ksnes.no\0" +"iida.nagano.jp\0" +"yabuki.fukushima.jp\0" +"gub.uy\0" "res.in\0" -"stjordalshalsen.no\0" -"gob.es\0\xe6\xb2\x96\xe7\xb8\x84.jp\0sexy\0" -"pi.it\0onga.fukuoka.jp\0" -"maif\0" -"barefoot\0" -"alt.za\0" -"pescara.it\0" +"h\xc3\xb8nefoss.no\0" +"cc.nh.us\0" +"susaki.kochi.jp\0" +"haram.no\0" +"\xd8\xa7\xd9\x84\xd8\xb3\xd8\xb9\xd9\x88\xd8\xaf\xdb\x8c\xdb\x83\0" +"adygeya.ru\0" +"bhz.br\0iwanai.hokkaido.jp\0" +"mx.na\0gs.jan-mayen.no\0" +"run\0" +"culture.museum\0" +"ind.tn\0" +"ses\0" +"bandai.fukushima.jp\0etajima.hiroshima.jp\0" +"campinagrande.br\0tv.sd\0" +"lib.id.us\0sew\0" +"sex\0" +"fhsk.se\0" +"tranoy.no\0" +"kakuda.miyagi.jp\0" +"l.bg\0" +"walbrzych.pl\0" +"\xe7\xb6\xb2\xe7\xbb\x9c.hk\0" +"sfr\0" +"rwe\0" +"salzburg.museum\0" +"press.aero\0railway.museum\0net-freaks.com\0" +"yn.cn\0" +"dynns.com\0" +"ss.it\0hachirogata.akita.jp\0" +"tv.tr\0redirectme.net\0" +"shingu.wakayama.jp\0" +"bungoono.oita.jp\0" +"servebbs.org\0" +"cs.it\0mediocampidano.it\0esashi.hokkaido.jp\0cloudapp.net\0" "s3.eu-west-2.amazonaws.com\0" -"yasaka.nagano.jp\0hinohara.tokyo.jp\0" -"motorcycles\0my-wan.de\0" -"dating\0" -"k12.pr.us\0" -"kopervik.no\0" -"abr.it\0" -"tunes\0" -"iida.nagano.jp\0" -"sarufutsu.hokkaido.jp\0parliament.nz\0" -"omaha.museum\0flir\0" -"barueri.br\0" -"daejeon.kr\0" -"desa.id\0" -"s\xc3\xb8gne.no\0pila.pl\0" -"baghdad.museum\0" -"gob.gt\0shizukuishi.iwate.jp\0oy.lc\0" -"health\0" -"\xd8\xa7\xdb\x8c\xd8\xb1\xd8\xa7\xd9\x86\0" -"qld.gov.au\0eidfjord.no\0\xe6\x95\x99\xe8\x82\xb2.\xe9\xa6\x99\xe6\xb8\xaf\0" -"sex.hu\0" -"from-ar.com\0barsyonline.co.uk\0" -"gob.hn\0sa.it\0kotoura.tottori.jp\0" -"ed.jp\0" -"podzone.net\0" -"sytes.net\0" -"bayern\0" -"umig.gov.pl\0" -"radio\0" -"herad.no\0lancia\0" -"shinyoshitomi.fukuoka.jp\0jorpeland.no\0trafficplex.cloud\0" -"salud.bo\0atami.shizuoka.jp\0" -"is-by.us\0" -"mypets.ws\0mypi.co\0" -"dubai\0" -"suzaka.nagano.jp\0" -"vn.ua\0" -"yonaguni.okinawa.jp\0" -"washingtondc.museum\0" -"nt.au\0express\0" -"r\xc3\xa5""de.no\0ia.us\0definima.io\0" +"kahoku.yamagata.jp\0tv.tz\0" +"fhapp.xyz\0" +"kihoku.ehime.jp\0" +"5.bg\0" +"press.cy\0" +"koga.ibaraki.jp\0hakusan.ishikawa.jp\0" +"saskatchewan.museum\0" +"trogstad.no\0" +"hakone.kanagawa.jp\0" +"xenapponazure.com\0" +"bytom.pl\0" +"analytics\0" +"toyama.jp\0" +"\xe4\xbf\xa1\xe6\x81\xaf\0" +"kristiansund.no\0" +"aquarelle\0mango\0is-a-photographer.com\0" +"minamidaito.okinawa.jp\0" +"\xe7\xa5\x9e\xe5\xa5\x88\xe5\xb7\x9d.jp\0chuo.yamanashi.jp\0" +"leikanger.no\0" +"lib.ar.us\0" +"za.net\0" +"ambulance.aero\0ski\0" +"voagat.no\0" +"namegawa.saitama.jp\0" +"cc.dc.us\0" +"*.quipelements.com\0" +"flir\0" +"nagasaki.jp\0" +"wakkanai.hokkaido.jp\0" +"lu.it\0me.it\0*.telebit.xyz\0" +"lib.ok.us\0sky\0" +"v\xc3\xa5ler.\xc3\xb8stfold.no\0" +"himeji.hyogo.jp\0alwaysdata.net\0" +"science.museum\0" +"higashiura.aichi.jp\0" +"hadano.kanagawa.jp\0" +"me.ke\0" +"dyndns.info\0dnsiskinky.com\0" +"gunma.jp\0" +"nh.us\0" +"ikeda.fukui.jp\0" +"googleapis.com\0" +"farsund.no\0" +"okoppe.hokkaido.jp\0publ.pt\0" +"paderborn.museum\0dyndns-server.com\0" +"*.sapporo.jp\0shibata.niigata.jp\0" +"halloffame.museum\0" +"farmers\0" +"eidsberg.no\0doomdns.org\0" +"asahi.mie.jp\0" +"neat-url.com\0" +"oceanographique.museum\0" +"shinkamigoto.nagasaki.jp\0" +"friuliv-giulia.it\0kanra.gunma.jp\0" +"cc.me.us\0""2038.io\0" +"lillesand.no\0es.eu.org\0" +"url.tw\0" +"evenassi.no\0" +"utashinai.hokkaido.jp\0" +"ravendb.me\0" +"tromso.no\0lib.wy.us\0" +"soy\0" +"beauxarts.museum\0bounty-full.com\0" +"uzs.gov.pl\0" +"kvam.no\0giehtavuoatna.no\0" +"fg.it\0familyds.net\0" +"alaska.museum\0lib.hi.us\0s3.us-east-2.amazonaws.com\0" +"tab\0" +"naturhistorisches.museum\0hjartdal.no\0" +"ora.gunma.jp\0" +"oumu.hokkaido.jp\0" +"paragliding.aero\0halden.no\0" +"badajoz.museum\0" +"cc.in.us\0" +"modelling.aero\0mc.eu.org\0" +"ishikawa.okinawa.jp\0" +"www.ro\0" +"niihama.ehime.jp\0" +"kautokeino.no\0" +"tax\0" +"in.na\0" +"shaw\0est-mon-blogueur.com\0from-ky.com\0" +"daiwa.hiroshima.jp\0rzeszow.pl\0srl\0" +"eidsvoll.no\0ryukyu\0" +"taku.saga.jp\0" +"family.museum\0bargains\0" +"hk.cn\0notaires.fr\0bolzano-altoadige.it\0isesaki.gunma.jp\0" +"in.ni\0" +"kurume.fukuoka.jp\0" +"chattanooga.museum\0lodingen.no\0" +"przeworsk.pl\0srt\0" +"ed.ao\0from-mi.com\0" +"greta.fr\0amami.kagoshima.jp\0chuo.tokyo.jp\0yonago.tottori.jp\0" +"rnu.tn\0cdn77-ssl.net\0" +"tci\0" +"kitaaiki.nagano.jp\0" +"app.os.fedoraproject.org\0" +"miyama.mie.jp\0" +"theater.museum\0" +"katashina.gunma.jp\0" +"tsuno.miyazaki.jp\0fujiidera.osaka.jp\0" +"stc\0lt.eu.org\0" +"takasago.hyogo.jp\0" +"ponpes.id\0ham-radio-op.net\0" +"sells-for-u.com\0ownprovider.com\0" +"dc.us\0duckdns.org\0" +"mormon\0" +"nikolaev.ua\0tdk\0" +"usuki.oita.jp\0" +"apartments\0" +"ed.ci\0" +"ce.leg.br\0" +"oystre-slidre.no\0pl.ua\0k12.ms.us\0k12.nc.us\0softbank\0" +"ikeda.gifu.jp\0" +"flight.aero\0k12.ec\0\xc3\xb8rskog.no\0" +"ed.cr\0fujimi.nagano.jp\0" +"nagoya\0" +"kui.hiroshima.jp\0" +"pvt.ge\0" +"g12.br\0tel\0" +"khmelnitskiy.ua\0" +"kamiizumi.saitama.jp\0" +"s3-us-east-2.amazonaws.com\0" +"futbol\0" +"v\xc3\xa5gs\xc3\xb8y.no\0valer.ostfold.no\0" +"osaka.jp\0hidaka.wakayama.jp\0mail.pl\0podhale.pl\0" +"ddns.me\0" +"goto.nagasaki.jp\0" +"cincinnati.museum\0myddns.rocks\0" "minobu.yamanashi.jp\0" -"takanabe.miyazaki.jp\0" -"rehab\0" -"nt.ca\0leikanger.no\0" -"co.ae\0shibukawa.gunma.jp\0" -"aoste.it\0" -"co.ag\0" -"davvesiida.no\0bostik\0" -"airforce\0" -"motoyama.kochi.jp\0potager.org\0" -"fukui.jp\0oregon.museum\0" +"am.br\0" +"amsterdam.museum\0" +"trentino-s-tirol.it\0" +"4u.com\0" +"kr.it\0" +"graz.museum\0" +"yoro.gifu.jp\0" +"cruise\0teaches-yoga.com\0" +"minakami.gunma.jp\0" +"orkdal.no\0" +"imperia.it\0" +"*.awdev.ca\0" +"in.rs\0l.se\0dubai\0" +"aosta.it\0" +"alstom\0is-a-cubicle-slave.com\0" +"me.tz\0" +"me.uk\0" +"cc.ny.us\0" +, + +"ichikawa.hyogo.jp\0" +"\xe3\x83\x95\xe3\x82\xa1\xe3\x83\x83\xe3\x82\xb7\xe3\x83\xa7\xe3\x83\xb3\0" +"thd\0" +"nf.ca\0" +"me.us\0" +"pup.gov.pl\0" +"klepp.no\0bike\0mydatto.com\0" +"trentino-a-adige.it\0" +"sandvik\0" +"from-ri.com\0" +"*.kawasaki.jp\0nakama.fukuoka.jp\0in.th\0" +"i234.me\0" +"toyotsu.fukuoka.jp\0" +"broadcast.museum\0" +"shia\0" +"kouyama.kagoshima.jp\0" +"coldwar.museum\0in.ua\0" +"gov.ac\0v\xc3\xa5g\xc3\xa5.no\0" +"aga.niigata.jp\0" +"gov.ae\0kvinesdal.no\0" +"gov.af\0k12.il\0" +"jprs\0eu-west-3.elasticbeanstalk.com\0" +"sells-it.net\0" +"hitra.no\0s3-website-ap-southeast-2.amazonaws.com\0*.otap.co\0from-wy.com\0net.eu.org\0""4lima.de\0" +"gov.al\0" +"landes.museum\0" +"chijiwa.nagasaki.jp\0" +"gov.ba\0tt.im\0beeldengeluid.museum\0" +"gov.ar\0gov.bb\0edogawa.tokyo.jp\0" +"gov.as\0in.us\0" +"s3.cn-north-1.amazonaws.com.cn\0" +"gov.au\0" +"gov.bf\0" +"gov.bh\0ud.it\0" +"gov.az\0kiyosu.aichi.jp\0" +"gov.bm\0" +"gov.bn\0miyashiro.saitama.jp\0" +"jerusalem.museum\0sydney\0servehalflife.com\0" +"tjx\0yamaxun\0" +"gov.br\0emr.it\0" +"gov.bs\0bing\0" +"gov.bt\0gov.cd\0fukuchiyama.kyoto.jp\0" +"cn.com\0fi.eu.org\0" +"press.se\0house\0" +"gov.by\0cpa.pro\0s3.ca-central-1.amazonaws.com\0from-wi.com\0" +"gov.bz\0florence.it\0""4lima.at\0" +"viking.museum\0" +"gov.cl\0forl\xc3\xac-cesena.it\0kagami.kochi.jp\0" +"gov.cm\0isleofman.museum\0rentals\0" +"gov.cn\0ed.jp\0" +"gov.co\0" +"chtr.k12.ma.us\0" +"\xe6\x96\xb0\xe5\x8a\xa0\xe5\x9d\xa1\0" +"gov.cu\0" +"gov.cx\0perso.ht\0" +"gov.cy\0pilots.museum\0hughes\0" +"dyndns-at-work.com\0" +"gov.dm\0lib.sc.us\0flowers\0" +"bielawa.pl\0""4lima.ch\0" +"gov.do\0" +"gov.ec\0" +"gov.ee\0bern.museum\0sk\xc3\xa1nit.no\0" +"kyonan.chiba.jp\0" +"gov.eg\0" +"h\xc3\xb8yanger.no\0" +"gov.dz\0tamatsukuri.ibaraki.jp\0" +"asnes.no\0molde.no\0" +"dsmynas.net\0" +"phone\0" +"salvadordali.museum\0" +"gov.et\0sakuragawa.ibaraki.jp\0fukudomi.saga.jp\0" +"kr\xc3\xb8""dsherad.no\0" +"pippu.hokkaido.jp\0" +"mima.tokushima.jp\0ube.yamaguchi.jp\0" +"firebaseapp.com\0barsy.menu\0" +"basilicata.it\0" +"government.aero\0" +"gov.ge\0" +"cq.cn\0naples.it\0toyo.kochi.jp\0" +"oz.au\0" +"gov.gh\0top\0" +"express.aero\0gov.gi\0force.museum\0" +"aostavalley.it\0gyeonggi.kr\0" +"shop\0" +"fujitsu\0recipes\0" +"gov.gn\0kashiwazaki.niigata.jp\0" +"buzen.fukuoka.jp\0" +"gov.gr\0" +"fresenius\0show\0" +"gov.gu\0ny.us\0" +"*.statics.cloud\0" +"isteingeek.de\0" +"caxias.br\0suzaka.nagano.jp\0" +"gov.gy\0" +"shirakawa.fukushima.jp\0" +"gov.hk\0habmer.no\0" +"otama.fukushima.jp\0koryo.nara.jp\0kumatori.osaka.jp\0" +"\xe0\xb0\xad\xe0\xb0\xbe\xe0\xb0\xb0\xe0\xb0\xa4\xe0\xb1\x8d\0" +"press.ma\0" +"gov.ie\0lib.la.us\0" +"kr.ua\0k12.ia.us\0" +"eidskog.no\0" +"\xe4\xbc\x81\xe4\xb8\x9a\0" +"mk.eu.org\0" +"gov.il\0kizu.kyoto.jp\0" +"gov.in\0mito.ibaraki.jp\0kita.osaka.jp\0\xe6\x94\xbf\xe5\xba\x9c\0blogsite.xyz\0" +"m\xc3\xa1latvuopmi.no\0beta.bounty-full.com\0" +"kamagaya.chiba.jp\0aso.kumamoto.jp\0" +"gov.iq\0" +"the.br\0gov.ir\0kaneyama.fukushima.jp\0" +"gov.is\0" +"gov.it\0" +"ed.pw\0" +"kasuya.fukuoka.jp\0" +"lugs.org.uk\0now-dns.org\0" +"matsuyama.ehime.jp\0" +"doshi.yamanashi.jp\0" +"tran\xc3\xb8y.no\0ubs\0navoi.su\0" +"trv\0" +"gov.jo\0" +"k12.ut.us\0" +"feste-ip.net\0" +"gov.kg\0" +"vicenza.it\0uconnect\0" +"gov.ki\0" +"from-hi.com\0" +"tas.edu.au\0gov.km\0aquarium.museum\0" +"gov.kn\0" +"j.bg\0" +"hayashima.okayama.jp\0gov.kp\0" +"gov.la\0" +"gov.lb\0" +"gov.lc\0g\xc3\xa1ls\xc3\xa1.no\0" +"cloudns.pro\0" +"gov.kw\0center.museum\0photo\0" +"gov.ky\0stokke.no\0vladikavkaz.ru\0" +"iwade.wakayama.jp\0gov.kz\0" +"gov.lk\0" +"ma.gov.br\0k12.tr\0" +"volyn.ua\0rugby\0" +"schwarz\0" +"gov.ma\0tui\0" +"ta.it\0yamagata.gifu.jp\0gov.lr\0" +"gov.ls\0\xc3\xa5rdal.no\0" +"gov.lt\0" +"gov.me\0palace.museum\0" +"gov.lv\0" +"gov.mg\0orskog.no\0" +"gov.ly\0for-our.info\0vladikavkaz.su\0" +"gov.mk\0lu.eu.org\0me.eu.org\0servemp3.com\0" +"hiranai.aomori.jp\0gov.ml\0" +"plo.ps\0" +"kisofukushima.nagano.jp\0gov.mn\0" +"gov.mo\0us-gov-west-1.elasticbeanstalk.com\0" +"uchihara.ibaraki.jp\0" +"gov.mr\0" +"3.bg\0gov.ms\0lund.no\0k12.vi\0" +"friulivenezia-giulia.it\0" +"gov.mu\0" +"gov.mv\0" +"chiropractic.museum\0gov.mw\0gov.ng\0j\xc3\xb8lster.no\0is-slick.com\0" +"gsm.pl\0" +"midatlantic.museum\0gov.my\0is-a-bulls-fan.com\0" +"gov.mz\0durban\0" +"tvs\0" +"valled-aosta.it\0" +"santabarbara.museum\0naustdal.no\0za.org\0" +"mizuho.tokyo.jp\0" +"nov.ru\0" +"brand.se\0" +"gov.nr\0" +"columbia.museum\0" +"kamoenai.hokkaido.jp\0" +"konskowola.pl\0" +"progressive\0" +"hokksund.no\0lv.eu.org\0" +"nakamura.kochi.jp\0" +"soc.lk\0gov.om\0" +"tondabayashi.osaka.jp\0" +"nov.su\0*.spectrum.myjino.ru\0" +"laz.it\0host\0" +"b\xc3\xa1hccavuotna.no\0helsinki\0homelinux.com\0" +"tmp.br\0siracusa.it\0vibovalentia.it\0" +"skjervoy.no\0" +"togura.nagano.jp\0" +"gov.ph\0go.leg.br\0" +"\xc3\xb8vre-eiker.no\0" +"ullensaker.no\0gov.pk\0" +"otake.hiroshima.jp\0gov.pl\0" +"bolzano.it\0fukuroi.shizuoka.jp\0gov.pn\0" +"exchange\0" +"futtsu.chiba.jp\0" +"gs.oslo.no\0gov.qa\0" +"kimobetsu.hokkaido.jp\0gov.pr\0merckmsd\0" +"gov.ps\0" +"gov.pt\0" +"sauda.no\0cherkasy.ua\0" +"from-la.net\0" +"bruxelles.museum\0gov.py\0" +"mc.it\0iwate.iwate.jp\0ota.tokyo.jp\0" +"og.ao\0bajddar.no\0e12.ve\0leadpages.co\0" +"tagajo.miyagi.jp\0" +"aoki.nagano.jp\0leczna.pl\0" +"webhop.info\0" +"latina.it\0virtueeldomein.nl\0" +"tobishima.aichi.jp\0" +"pasadena.museum\0" +"contagem.br\0chosei.chiba.jp\0" +"homesecuritymac.com\0diskstation.org\0" +"naval.museum\0" +"fujinomiya.shizuoka.jp\0tkmaxx\0" +"holt\xc3\xa5len.no\0gov.sa\0" +"gov.sb\0kicks-ass.net\0" +"paris.museum\0gov.rs\0gov.sc\0" +"trentino-suedtirol.it\0itano.tokushima.jp\0obanazawa.yamagata.jp\0gov.sd\0" +"frankfurt.museum\0gov.ru\0" +"\xd8\xa7\xd9\x84\xd9\x8a\xd9\x85\xd9\x86\0" +"gov.rw\0gov.sg\0health-carereform.com\0" +"gov.sh\0" +"assisi.museum\0cadaques.museum\0herokuapp.com\0" +"kamisunagawa.hokkaido.jp\0" +"kota.aichi.jp\0gov.sl\0" +"supplies\0" +"noboribetsu.hokkaido.jp\0" +"*.uberspace.de\0" +"gov.st\0" +"!city.sapporo.jp\0" +"yalta.ua\0silk\0" +"gov.sx\0" +"gov.sy\0" +"gov.tj\0" +"ltda\0" +"ichinohe.iwate.jp\0gov.tl\0" +"oppeg\xc3\xa5rd.no\0gov.tm\0" +"gov.tn\0" +"gov.to\0" +"kamo.kyoto.jp\0wodzislaw.pl\0" +"volkenkunde.museum\0gov.ua\0" +"honjo.akita.jp\0kamiamakusa.kumamoto.jp\0gov.tr\0" +"gov.tt\0" +"skanit.no\0" +"kisarazu.chiba.jp\0ono.hyogo.jp\0" +"gov.tw\0" +"ve.it\0kosaka.akita.jp\0matsusaka.mie.jp\0pfizer\0" +"swiebodzin.pl\0" +"gov.uk\0" +"art.museum\0vestv\xc3\xa5g\xc3\xb8y.no\0sina\0virtual-user.de\0" +"yoga\0" +"fe.it\0miura.kanagawa.jp\0" +"gov.vc\0" +"yasaka.nagano.jp\0" +"gov.ve\0" +"uonuma.niigata.jp\0" +"florida.museum\0uno\0" +"intel\0" +"market\0" +"gov.vn\0maison\0" +"kristiansand.no\0blogspot.com\0" +"misato.saitama.jp\0" +"cc.il.us\0" +"perso.sn\0" +"uol\0" +"chanel\0cn-north-1.eb.amazonaws.com.cn\0" +"cody.museum\0" +"czeladz.pl\0" +"sakura\0kr.eu.org\0" +"rn.it\0" +"maritime.museum\0vipsinaapp.com\0" +"harima.hyogo.jp\0" +"staples\0" +"boats\0" +"hi.cn\0perso.tn\0" +"gov.ws\0" +"dell-ogliastra.it\0" +"browsersafetymark.io\0" +"bn.it\0dlugoleka.pl\0" +"annefrank.museum\0" +"hagi.yamaguchi.jp\0" +"k12.az.us\0space\0loseyourip.com\0" +"rns.tn\0" +"mill.museum\0ups\0" +"go.dyndns.org\0" +"bozen-sudtirol.it\0" +"dyndns-office.com\0" +"hofu.yamaguchi.jp\0" +"no-ip.ca\0" +"togitsu.nagasaki.jp\0misato.wakayama.jp\0" +"better-than.tv\0" +"emp.br\0kani.gifu.jp\0" +"oslo.no\0" +"foggia.it\0mibu.tochigi.jp\0" +"orsta.no\0is-gone.com\0" +"og.it\0" +"gov.za\0" +"tenkawa.nara.jp\0" +"communications.museum\0" +"builders\0" +"gov.zm\0" +"juegos\0" +"minami.kyoto.jp\0" +"blackbaudcdn.net\0" +"auction\0mypsx.net\0" +"gov.zw\0" +"monzaedellabrianza.it\0" +"q-a.eu.org\0" +"federation.aero\0cloudns.org\0" +"site\0" +"zamami.okinawa.jp\0" +"emergency.aero\0from-md.com\0" +"not.br\0repair\0" +"airtraffic.aero\0" +"satsumasendai.kagoshima.jp\0\xe0\xb4\xad\xe0\xb4\xbe\xe0\xb4\xb0\xe0\xb4\xa4\xe0\xb4\x82\0" +"lajolla.museum\0familyds.org\0" +"trentino-sudtirol.it\0" +"mosj\xc3\xb8""en.no\0" +"takatori.nara.jp\0" +"recht.pro\0" +"inashiki.ibaraki.jp\0" +"durham.museum\0" +"\xe5\xbe\xae\xe5\x8d\x9a\0" +"vet\0" +"co.business\0" +"andria-barletta-trani.it\0suedtirol.it\0" +"konin.pl\0linkyard-cloud.ch\0" +"gs.tr.no\0" +"labor.museum\0" +"ayagawa.kagawa.jp\0" +"zaporizhzhe.ua\0" +"ovre-eiker.no\0" +"yao.osaka.jp\0" +"my-vigor.de\0" +"northwesternmutual\0" +"stalbans.museum\0" +"hokuryu.hokkaido.jp\0football\0" +"*.nagoya.jp\0" +"teo.br\0" +"presidio.museum\0b\xc3\xb8mlo.no\0kharkiv.ua\0from-mt.com\0from-nd.com\0" +"lecco.it\0" +"asahi.yamagata.jp\0" +"salud.bo\0contemporaryart.museum\0aca.pro\0" +"soja.okayama.jp\0tokigawa.saitama.jp\0prochowice.pl\0" +"il.us\0is-a-geek.com\0" +"tr.it\0gokase.miyazaki.jp\0" +"dyn.ddnss.de\0" +"ladbrokes\0" +"uchiko.ehime.jp\0" +"toyosato.shiga.jp\0ens.tn\0" +"berkeley.museum\0s3.ap-south-1.amazonaws.com\0" +"media.aero\0aaa.pro\0vig\0" +"rimini.it\0itako.ibaraki.jp\0" +"cc.wy.us\0" +"gujo.gifu.jp\0" +"fot.br\0vin\0" +"vip\0" +"cc.hi.us\0" +"taishi.hyogo.jp\0" +"neyagawa.osaka.jp\0genkai.saga.jp\0wakasa.tottori.jp\0" +"co.ae\0" +"development.run\0" +"co.ag\0from-sd.com\0" +"neustar\0" +"birthplace.museum\0" +"cesenaforl\xc3\xac.it\0" +"amot.no\0skjerv\xc3\xb8y.no\0" "co.ao\0" -"creation.museum\0" -"co.bb\0" -"chirurgiens-dentistes.fr\0toyoura.hokkaido.jp\0" -"co.at\0""1337.pictures\0" -"noticias.bo\0" -"co.bi\0kagawa.jp\0" -"unnan.shimane.jp\0freebox-os.com\0" -"handa.aichi.jp\0" -"makurazaki.kagoshima.jp\0fuettertdasnetz.de\0" -"co.ca\0" -"lancashire.museum\0" -"kasugai.aichi.jp\0" -"rieti.it\0\xe7\xb6\xb2\xe8\xb7\xaf.tw\0" -"co.bw\0" -"co.ci\0komatsushima.tokushima.jp\0" +"arakawa.saitama.jp\0" +"co.bb\0trani-barletta-andria.it\0" +"co.at\0" +"suifu.ibaraki.jp\0oum.gov.pl\0" +"co.bi\0kvafjord.no\0" +"odate.akita.jp\0" +"embroidery.museum\0" +"takamatsu.kagawa.jp\0" +"nokia\0" +"civilaviation.aero\0co.ca\0" +"sells-for-less.com\0" +"creditcard\0" +"from-ut.com\0" +"rikubetsu.hokkaido.jp\0" +"co.bw\0dr.na\0" +"mt.it\0" +"co.ci\0" +"tr.no\0" "co.cl\0" -"co.cm\0" -"kutchan.hokkaido.jp\0" -"watches\0" -"co.cr\0fukuchi.fukuoka.jp\0" -"bike\0" -"chambagri.fr\0toya.hokkaido.jp\0gob.mx\0allfinanz\0" -"gob.ni\0" -"fr.eu.org\0" -"sanda.hyogo.jp\0co.cz\0" -"matsubara.osaka.jp\0co.dk\0" -"moriguchi.osaka.jp\0lviv.ua\0" -"webhop.me\0" -"algard.no\0" -"demon.nl\0" -"oarai.ibaraki.jp\0" -"ed.pw\0" -"asti.it\0" -"ethnology.museum\0" -"mishima.shizuoka.jp\0" -"carbonia-iglesias.it\0" -"maebashi.gunma.jp\0gob.pa\0golffan.us\0" -"amakusa.kumamoto.jp\0sex.pl\0" -"milan.it\0" -"magazine.aero\0kaminoyama.yamagata.jp\0" -"ntr.br\0\xe9\x95\xb7\xe5\xb4\x8e.jp\0kuwana.mie.jp\0gob.pe\0" -"takasaki.gunma.jp\0" -"adult.ht\0vikna.no\0poznan.pl\0" -"kagoshima.jp\0takehara.hiroshima.jp\0voagat.no\0" -"gob.pk\0" -"auction\0" -"arida.wakayama.jp\0" -"evenassi.no\0writesthisblog.com\0" -"kiyosato.hokkaido.jp\0" +"co.cm\0philadelphiaarea.museum\0" +"bounceme.net\0" +"from-vt.com\0" +"co.cr\0playstation\0" +"hvaler.no\0" +"servebbs.com\0" +"guitars\0" +"storj.farm\0" +"poa.br\0co.cz\0" +"co.dk\0" +"dallas.museum\0" +"leirfjord.no\0cc.ak.us\0" +"localhistory.museum\0" +"\xeb\x8b\xb7\xec\xbb\xb4\0" +"attorney\0" +"awaji.hyogo.jp\0higashiomi.shiga.jp\0" +"homelinux.net\0" +"business\0" +"meet\0" +"lib.ks.us\0" +"krasnik.pl\0" +"isshiki.aichi.jp\0okayama.okayama.jp\0" +"koriyama.fukushima.jp\0" +"horology.museum\0cc.mt.us\0cc.nd.us\0ybo.trade\0" +"valleeaoste.it\0" +"williamsburg.museum\0" +"\xc3\xa5mli.no\0" +"is-a-linux-user.org\0" +"vv.it\0kozagawa.wakayama.jp\0" "co.gg\0" -"holmestrand.no\0bing\0kitchen\0" -"urbinopesaro.it\0misato.saitama.jp\0" -"ag.it\0kalisz.pl\0boston\0" -"vic.gov.au\0co.gl\0" -"utazu.kagawa.jp\0better-than.tv\0" -"foggia.it\0" -"nodum.co\0" -"lierne.no\0joburg\0" -"sado.niigata.jp\0" -"stathelle.no\0" -"co.gy\0" -"monash\0" -"komatsu\0" -"ono.hyogo.jp\0" -"journalism.museum\0" -"sa.com\0" -"hicam.net\0" -"co.id\0\xe9\x95\xb7\xe9\x87\x8e.jp\0dominic.ua\0" -"co.hu\0dontexist.net\0cya.gg\0" -"uchinada.ishikawa.jp\0" -"n\xc3\xa6r\xc3\xb8y.no\0" -"modena.it\0afamilycompany\0" -"is-a-chef.net\0" -"sjc.br\0" -"co.il\0" -"co.im\0seiro.niigata.jp\0ap-southeast-1.elasticbeanstalk.com\0s3-sa-east-1.amazonaws.com\0" -"co.in\0guide\0" -"co.ir\0nodum.io\0" -"trentinoaltoadige.it\0co.it\0yachiyo.chiba.jp\0polkowice.pl\0" -"co.je\0gob.sv\0" -"graz.museum\0" -"wroclaw.pl\0" -"iyo.ehime.jp\0" -"osakasayama.osaka.jp\0" -"campania.it\0" -"co.jp\0diamonds\0" -"stpetersburg.museum\0" -"bronnoysund.no\0lomza.pl\0" -"takko.aomori.jp\0co.ke\0" -"kisarazu.chiba.jp\0" -"ota.tokyo.jp\0rybnik.pl\0" -"sm\xc3\xb8la.no\0vaksdal.no\0" -"*.kawasaki.jp\0us.eu.org\0" -"is-an-actress.com\0" -"l.se\0" -"loab\xc3\xa1t.no\0" -"co.kr\0donostia.museum\0" -"co.lc\0" -"zoology.museum\0gob.ve\0go.leg.br\0" -"s3.dualstack.ap-northeast-2.amazonaws.com\0" -"eu-west-2.elasticbeanstalk.com\0" -"omigawa.chiba.jp\0" -"build\0" -"fg.it\0ruovat.no\0" -"point2this.com\0" -"kunitomi.miyazaki.jp\0co.ma\0nt.no\0ballangen.no\0" -"trani-barletta-andria.it\0" -"bhz.br\0co.ls\0" -"co.me\0" -"co.mg\0" -"hatsukaichi.hiroshima.jp\0" -"kameoka.kyoto.jp\0fredrikstad.no\0" -"isshiki.aichi.jp\0" -"bologna.it\0" -"theater.museum\0" -"ekloges.cy\0" -"padova.it\0" -"gosen.niigata.jp\0co.na\0" -"mo.cn\0" -"is-a-nascarfan.com\0" -"\xe0\xb8\xa8\xe0\xb8\xb6\xe0\xb8\x81\xe0\xb8\xa9\xe0\xb8\xb2.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" -"co.mu\0hitra.no\0" -"gose.nara.jp\0" -"co.mw\0prime\0" -"co.ni\0" -"co.mz\0" -"higashikawa.hokkaido.jp\0co.nl\0" -"co.no\0" -"higashi.okinawa.jp\0" -"seven\0" -"oirm.gov.pl\0\xd9\xbe\xd8\xa7\xd9\x83\xd8\xb3\xd8\xaa\xd8\xa7\xd9\x86\0" -"h\xc3\xa6gebostad.no\0" -"mj\xc3\xb8ndalen.no\0" -"sakai.fukui.jp\0" -"ce.gov.br\0co.nz\0" +"tokoname.aichi.jp\0" +"mg.gov.br\0food\0" +"co.gl\0" +"wassamu.hokkaido.jp\0hakui.ishikawa.jp\0" +"orland.no\0" +"friuli-venezia-giulia.it\0" +"sanfrancisco.museum\0" +"omi.niigata.jp\0" +"h.bg\0infiniti\0" +"kokonoe.oita.jp\0" +"co.gy\0meeres.museum\0merseine.nu\0" +"ebino.miyazaki.jp\0tatar\0" +"wy.us\0" +"trentino-altoadige.it\0" +"malatvuopmi.no\0" +"\xd8\xa7\xd9\x8a\xd8\xb1\xd8\xa7\xd9\x86\0" +"melbourne\0" +"co.id\0valdaosta.it\0" +"co.hu\0hi.us\0is-a-geek.org\0" +"xz.cn\0prudential\0" +"yasugi.shimane.jp\0" +"games.hu\0from-ct.com\0scrapping.cc\0" +"so.it\0iwakura.aichi.jp\0saijo.ehime.jp\0" +"co.il\0friulive-giulia.it\0mielec.pl\0" +"co.im\0ikano\0msk.ru\0" +"co.in\0" +"co.ir\0kurotaki.nara.jp\0" +"co.it\0ogawa.ibaraki.jp\0" +"co.je\0" +"foundation.museum\0clinic\0" +"kamogawa.chiba.jp\0dr.tr\0" +"santacruz.museum\0" +"tsukigata.hokkaido.jp\0ford\0" +"1.bg\0kalmykia.su\0" +"shimofusa.chiba.jp\0" +"bananarepublic\0msk.su\0" +"umig.gov.pl\0" +"co.jp\0warman\0" +"luzern.museum\0s3-ap-northeast-1.amazonaws.com\0" +"cuneo.it\0" +"tananger.no\0" +"vallee-aoste.it\0" +"co.ke\0lindesnes.no\0cloud.goog\0" +"milano.it\0" +"wed\0" +"wa.edu.au\0is-a-caterer.com\0" +"edu.krd\0" +"\xe5\xb2\x90\xe9\x98\x9c.jp\0co.kr\0legal\0rexroth\0" +"co.lc\0*.stolos.io\0" +"selfip.net\0" +"slattum.no\0" +"kawakami.nagano.jp\0computer\0" +"stor-elvdal.no\0from-id.com\0" +"meme\0" +"co.ma\0" +"akita.jp\0" +"co.ls\0" +"sakai.ibaraki.jp\0" +"co.me\0royrvik.no\0rocks\0" +"geek.nz\0" +"co.mg\0school.na\0cc.co.us\0s3.amazonaws.com\0" +"kommune.no\0" +"kalmykia.ru\0" +"ak.us\0" +"aogaki.hyogo.jp\0kashima.ibaraki.jp\0" +"shizuoka.jp\0" +"co.na\0" +"tako.chiba.jp\0kamikawa.hokkaido.jp\0" +"media.museum\0lib.mo.us\0kicks-ass.org\0" +"co.mu\0" +"certification.aero\0co.mw\0" +"nakanojo.gunma.jp\0" +"suli.hu\0co.ni\0" +"sicilia.it\0co.mz\0" +"movistar\0co.nl\0" +"menu\0" +"co.no\0utwente.io\0" +"school.nz\0" +"vologda.su\0" +"nu.ca\0george\0" +"xihuan\0" +"mt.us\0nd.us\0" +"drangedal.no\0" +"\xe5\xaf\x8c\xe5\xb1\xb1.jp\0co.nz\0" +"rauma.no\0" "co.om\0" -"flog.br\0" -"bj.cn\0" -"miasa.nagano.jp\0nishikata.tochigi.jp\0bergbau.museum\0" -"trentinostirol.it\0" -"okazaki.aichi.jp\0" -"nedre-eiker.no\0" -"uryu.hokkaido.jp\0" -"shriram\0" -"brussels\0" +"nakanoto.ishikawa.jp\0" +"poivron.org\0" +"cesenaforli.it\0discount\0" +"loab\xc3\xa1t.no\0" +"nakijin.okinawa.jp\0win\0" +"skin\0" "co.pl\0" -"valle.no\0" +"soundandvision.museum\0" "co.pn\0" -"vanylven.no\0jprs\0\xe6\x94\xbf\xe5\xba\x9c\0" -"hakone.kanagawa.jp\0nt.ro\0" -"portal.museum\0gmina.pl\0" -"schwarz\0" -"wakayama.wakayama.jp\0" -"locus\0" -"caa.aero\0co.pw\0volkswagen\0" -"exchange.aero\0shimamoto.osaka.jp\0" -"coffee\0" -"nes.buskerud.no\0" -"vlog.br\0" -"*.compute.estate\0" -"filatelia.museum\0" -"*.otap.co\0" -"st.no\0" -"aosta-valley.it\0" -"r\xc3\xb8yrvik.no\0" -"alwaysdata.net\0" -"sec.ps\0" -"wroc.pl\0" -"sukumo.kochi.jp\0" -"bielawa.pl\0co.rs\0od.ua\0" -"minamiise.mie.jp\0dst.mi.us\0" -"cancerresearch\0" -"urausu.hokkaido.jp\0co.rw\0" -"tabayama.yamanashi.jp\0" -"kg.kr\0mulhouse.museum\0" -"g\xc3\xa1ivuotna.no\0" -"hiroshima.jp\0" -"lefrak\0" -"co.st\0futurehosting.at\0" -"maritime.museum\0" -"mo.it\0co.th\0" -"koza.wakayama.jp\0" -"co.sz\0co.tj\0club.tw\0" -"co.tm\0" -"broadcast.museum\0latino\0" -"muko.kyoto.jp\0berlevag.no\0shaw\0" -"mutual\0co.ua\0dynvpn.de\0" -"co.tt\0codespot.com\0" -"anpachi.gifu.jp\0florist\0" -"starachowice.pl\0lenug.su\0" -"co.ug\0from-ga.com\0" -"hitachi\0" -"watch-and-clock.museum\0co.tz\0" +"kasukabe.saitama.jp\0" +"vgs.no\0notodden.no\0" +"surgeonshall.museum\0cc.ma.us\0" +"university.museum\0co.pw\0" +"klodzko.pl\0" +"static-access.net\0" +"kddi\0" +"volda.no\0troitsk.su\0" +"kawai.iwate.jp\0" +"coop.ht\0vc.it\0" +"ikata.ehime.jp\0" +"gs.rl.no\0" +"catanzaro.it\0ogliastra.it\0" +"\xc3\xa5s.no\0" +"dreamhosters.com\0" +"fc.it\0sagamihara.kanagawa.jp\0" +"skedsmokorset.no\0" +"lapy.pl\0" +"figueres.museum\0midsund.no\0tuxfamily.org\0" +"kushiro.hokkaido.jp\0" +"x443.pw\0" +"yamamoto.miyagi.jp\0" +"blog\0" +"co.rs\0active\0" +"co.rw\0" +"sorfold.no\0" +"trentino-sued-tirol.it\0" +"wme\0" +"shimonita.gunma.jp\0" +"coop.br\0kadogawa.miyazaki.jp\0" +"shari.hokkaido.jp\0" +"avocat.pro\0" +"massa-carrara.it\0" +"co.st\0" +"shop.ht\0" +"shop.hu\0productions\0" +"yamaguchi.jp\0es.kr\0co.th\0" +"co.sz\0co.tj\0" +"francaise.museum\0co.tm\0ox.rs\0" +"bl.it\0" +"e164.arpa\0fhv.se\0" +"genoa.it\0" +"co.ua\0" +"build\0" +"langev\xc3\xa5g.no\0loabat.no\0" +"co.tt\0" +"skydiving.aero\0is-a-designer.com\0" +"psi.br\0oseto.nagasaki.jp\0" +"co.ug\0" +"uji.kyoto.jp\0" +"co.tz\0" "co.uk\0" -"b\xc3\xb8mlo.no\0" -"tw.cn\0" -"j.bg\0dell-ogliastra.it\0" -"cherkassy.ua\0" -"co.us\0stufftoread.com\0" -"navigation.aero\0" -"co.ve\0" -"nisshin.aichi.jp\0" -"ebino.miyazaki.jp\0co.vi\0" -"toyotsu.fukuoka.jp\0co.uz\0" -"is-a-cubicle-slave.com\0cloud.metacentrum.cz\0" -"shibetsu.hokkaido.jp\0" -"minamiizu.shizuoka.jp\0" -"pg.it\0" -"cooperativa.bo\0" -"gs.tr.no\0" -"vallee-d-aoste.it\0" -"cc.or.us\0" -"eun.eg\0" -"vads\xc3\xb8.no\0travelersinsurance\0dnshome.de\0" -"helsinki.museum\0" -"inagi.tokyo.jp\0sola.no\0" -"dyndns.tv\0" -"imb.br\0" -"weibo\0" -"nombre.bo\0" -"lib.nv.us\0okinawa\0" -"soc.lk\0" -"ninomiya.kanagawa.jp\0ing.pa\0" -"finland.museum\0" -"kariya.aichi.jp\0cbg.ru\0" -"aostavalley.it\0taipei\0" -"trieste.it\0koganei.tokyo.jp\0bloomberg\0" -"circle\0ro.im\0" -"ono.fukui.jp\0" -"kaizuka.osaka.jp\0" -"indianapolis.museum\0" -"ufcfan.org\0" -"finnoy.no\0" -"ro.it\0" -"sa-east-1.elasticbeanstalk.com\0" -"panerai\0from-mo.com\0" -"shirakawa.fukushima.jp\0historyofscience.museum\0kids.museum\0" -"gotemba.shizuoka.jp\0co.za\0" -"agro.bo\0" -"parliament.cy\0" -"dyndns.ws\0" -"marker.no\0" -"moonscale.net\0" -"nakamichi.yamanashi.jp\0" -"nakayama.yamagata.jp\0" +"us.na\0" +"transporte.bo\0" +"co.us\0" +"ito.shizuoka.jp\0" +"osoyro.no\0co.ve\0knightpoint.systems\0" +"pmn.it\0arita.saga.jp\0sosnowiec.pl\0" +"sci.eg\0" +"nu.it\0swinoujscie.pl\0" +"co.vi\0" +"co.uz\0" +"nissedal.no\0" +"grainger\0" +"wow\0" +"associates\0" +"narusawa.yamanashi.jp\0" +"rodeo\0" +"kiyama.saga.jp\0" +"lib.ak.us\0" +"medio-campidano.it\0" +"chikushino.fukuoka.jp\0mazowsze.pl\0" +"ogori.fukuoka.jp\0kitaura.miyazaki.jp\0" +"luxe\0" +"assabu.hokkaido.jp\0" +"geelvinck.museum\0" +"malopolska.pl\0" +"living.museum\0" +"farmers.museum\0coffee\0" +"fukushima.jp\0shingo.aomori.jp\0sasaguri.fukuoka.jp\0toyotomi.hokkaido.jp\0" +"b\xc3\xa1hcavuotna.no\0" +"tempio-olbia.it\0" +"rl.no\0blue\0" +"perugia.it\0" +"commbank\0" +"chichibu.saitama.jp\0" +"hattfjelldal.no\0h.se\0" +"inami.toyama.jp\0" +"ftpaccess.cc\0" +"yurihonjo.akita.jp\0" +"nb.ca\0draydns.de\0" +"mymediapc.net\0" +"ma.us\0co.za\0" +"kitaakita.akita.jp\0kosuge.yamanashi.jp\0" +"docs\0" +"tranibarlettaandria.it\0" +"sydney.museum\0" +"tamamura.gunma.jp\0onion\0" +"taketomi.okinawa.jp\0myeffect.net\0" +"k12.wi.us\0wtc\0" +"noda.iwate.jp\0wtf\0" "co.zm\0" -"shinanomachi.nagano.jp\0xihuan\0" -"rissa.no\0" -"trentino-sud-tirol.it\0funabashi.chiba.jp\0podlasie.pl\0" -"podzone.org\0" -"safety.aero\0" -"neyagawa.osaka.jp\0marylhurst.museum\0co.zw\0" -"haboro.hokkaido.jp\0" -"fukushima.jp\0" -"channel\0shia\0" -"kita.osaka.jp\0v\xc3\xa5ler.hedmark.no\0" -"higashiura.aichi.jp\0chintai\0navoi.su\0" -"\xe5\x8c\x97\xe6\xb5\xb7\xe9\x81\x93.jp\0" -"\xe0\xb0\xad\xe0\xb0\xbe\xe0\xb0\xb0\xe0\xb0\xa4\xe0\xb1\x8d\0" -"chikuhoku.nagano.jp\0toga.toyama.jp\0" -"balsan-sudtirol.it\0" -"ismaili\0\xe5\xbe\xae\xe5\x8d\x9a\0" -"sinaapp.com\0" -"trentin-su\xcc\x88""d-tirol.it\0lecco.it\0" -"itabashi.tokyo.jp\0" -"farmequipment.museum\0dr.na\0" -"host\0gb.com\0" -"\xe4\xba\xac\xe9\x83\xbd.jp\0" -"akita.akita.jp\0shimogo.fukushima.jp\0" -"furubira.hokkaido.jp\0idrett.no\0" -"ginan.gifu.jp\0" -"minato.osaka.jp\0pyatigorsk.ru\0" -"\xe0\xa6\xad\xe0\xa6\xbe\xe0\xa7\xb0\xe0\xa6\xa4\0" -"web.bo\0from-ct.com\0" -"erimo.hokkaido.jp\0" -"test.tj\0" -"games.hu\0kawakami.nagano.jp\0" -"technology.museum\0" -"target\0" -"web.co\0" -"repbody.aero\0" -"\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0" -"sondrio.it\0circus.museum\0" -"plo.ps\0" -"savannahga.museum\0" -"web.do\0" -"ide.kyoto.jp\0civilisation.museum\0" -"caxias.br\0" -"valle-aosta.it\0global.ssl.fastly.net\0" -"geology.museum\0" -"sweden.museum\0" -"yashio.saitama.jp\0mo.us\0vodka\0" -"test.ru\0" -"troitsk.su\0" -"hirara.okinawa.jp\0mymediapc.net\0" -"glug.org.uk\0" -"modum.no\0" -"eti.br\0game.tw\0from-pa.com\0" -"kamakura.kanagawa.jp\0" -"blogdns.com\0" -"foodnetwork\0" -"k12.mi.us\0" -"toyotomi.hokkaido.jp\0" -"r.cdn77.net\0" -"yachimata.chiba.jp\0" -"is-into-cars.com\0" -"trentin-suedtirol.it\0" -"tecnologia.bo\0az.us\0" -"tado.mie.jp\0" -"suedtirol.it\0shop\0" -"from-dc.com\0" -"matsue.shimane.jp\0" -"horse\0" -"web.gu\0" -"show\0" -"kawachinagano.osaka.jp\0reise\0" -"neues.museum\0" -"steam.museum\0" -"cc.nm.us\0" -"genting\0" -"go.gov.br\0" -"higashishirakawa.gifu.jp\0clinton.museum\0" -"web.id\0dr.tr\0" -"genova.it\0" -"dynserv.org\0zapto.org\0" -"lib.nm.us\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\0ath.cx\0" -"bo.telemark.no\0" -"gamagori.aichi.jp\0" -"dyn.ddnss.de\0" -"muroran.hokkaido.jp\0" +"horokanai.hokkaido.jp\0" +"ikeda.nagano.jp\0" +"jor.br\0" +"y.bg\0co.zw\0" +"news.hu\0" "xen.prgmr.com\0" -"svn-repos.de\0" -"\xe7\xa6\x8f\xe5\xb2\xa1.jp\0" -"\xd9\x83\xd8\xa7\xd8\xab\xd9\x88\xd9\x84\xd9\x8a\xd9\x83\0" -"tochigi.jp\0" +"otaki.saitama.jp\0" +"ipifony.net\0" +"minamitane.kagoshima.jp\0olecko.pl\0" +"jpn.com\0workisboring.com\0" +"tjome.no\0" +"forli-cesena.it\0" +"os.hordaland.no\0" +"ako.hyogo.jp\0" +"video.hu\0" +"huissier-justice.fr\0kotohira.kagawa.jp\0" +"tp.it\0ichikai.tochigi.jp\0" +"gdansk.pl\0" +"maizuru.kyoto.jp\0" +"hsbc\0icbc\0lanxess\0singles\0elasticbeanstalk.com\0" +"katowice.pl\0" +"consulting.aero\0" +"detroit.museum\0" +"yaese.okinawa.jp\0" +"office\0" +"umbria.it\0" +"toyota.aichi.jp\0gotemba.shizuoka.jp\0" +"selfip.info\0" +"vadso.no\0" +"mo\xc3\xa5reke.no\0doha\0work\0" +"ohkura.yamagata.jp\0" +"pictures\0myphotos.cc\0" +"eu.int\0shonai.fukuoka.jp\0sennan.osaka.jp\0" +"philately.museum\0" +"gallery\0" +"misato.shimane.jp\0" +"aerobatic.aero\0review\0" +"yatomi.aichi.jp\0" +"tosashimizu.kochi.jp\0" +"gs.mr.no\0" +"gd.cn\0" +"polkowice.pl\0" +"bale.museum\0" +"zara\0" +"mutsu.aomori.jp\0" +"jaworzno.pl\0doctor\0xin\0" +"chimkent.su\0sinaapp.com\0" +"nishiarita.saga.jp\0" +"cloudcontrolled.com\0" +"chrome\0aktyubinsk.su\0" +"muroto.kochi.jp\0" +"tama.tokyo.jp\0" +"hanyu.saitama.jp\0" +"s3-website.us-east-2.amazonaws.com\0" +"\xe8\x87\xba\xe7\x81\xa3\0" +"\xe7\xbd\x91\xe5\x9d\x80\0" +"\xe0\xb8\xad\xe0\xb8\x87\xe0\xb8\x84\xe0\xb9\x8c\xe0\xb8\x81\xe0\xb8\xa3.\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" +"homelinux.org\0" +"noda.chiba.jp\0" +"ama.aichi.jp\0ami.ibaraki.jp\0" +"misato.akita.jp\0" +"cci.fr\0kawanishi.nara.jp\0" +"cechire.com\0" +"\xd8\xa8\xd8\xa7\xd8\xb2\xd8\xa7\xd8\xb1\0" +"newholland\0vistaprint\0" +"lucerne.museum\0" +"vibo-valentia.it\0" +"jp.eu.org\0" +"haebaru.okinawa.jp\0suginami.tokyo.jp\0" +"otofuke.hokkaido.jp\0kasuga.hyogo.jp\0" +"mydatto.net\0" +"marnardal.no\0" +"blogspot.com.cy\0" +"monster\0" +"shimane.jp\0chikugo.fukuoka.jp\0zgora.pl\0" +"komatsu\0" +"trentino.it\0yakumo.shimane.jp\0" +"tatamotors\0" +"morioka.iwate.jp\0" +"\xe9\xa3\x9f\xe5\x93\x81\0blogspot.com.ee\0" +"kherson.ua\0blogspot.com.eg\0nid.io\0" +"rendalen.no\0" +"is-a-financialadvisor.com\0" "kouhoku.saga.jp\0" -"s3.ap-south-1.amazonaws.com\0" -"pz.it\0" -"voss.no\0" -"tochio.niigata.jp\0" -"akashi.hyogo.jp\0" -"yorii.saitama.jp\0" -"palmas.br\0" -"lenvik.no\0sport\0" -"v\xc3\xa5ler.\xc3\xb8stfold.no\0es.eu.org\0" -"molde.no\0strand.no\0k12.ri.us\0homeip.net\0" -"horology.museum\0" -"trento.it\0toyota\0khakassia.su\0" -"travel.pl\0" -"ggf.br\0karmoy.no\0" -"mimata.miyazaki.jp\0fedje.no\0ltda\0cloudns.pro\0" -"costume.museum\0" -"web.lk\0" -"hornindal.no\0" +"myasustor.com\0" +"blogspot.com.ar\0" +"vt.it\0" +"alipay\0blogspot.com.au\0" +"is-a-geek.net\0" +"youth.museum\0" +"kasuga.fukuoka.jp\0arao.kumamoto.jp\0is.gov.pl\0" +"kozow.com\0" +"daegu.kr\0*.kunden.ortsinfo.at\0" +"weber\0" +"game\0" +"umaji.kochi.jp\0" +"mr.no\0service.gov.uk\0" +"hamamatsu.shizuoka.jp\0blogspot.com.br\0" +"russia.museum\0spb.ru\0" +"coop.tt\0" +"f.bg\0is-uberleet.com\0krasnodar.su\0" +"liaison\0" +"karlsoy.no\0blogspot.com.by\0" +"sandiego.museum\0" +"republican\0" +"v\xc3\xa5ler.hedmark.no\0" +"obuse.nagano.jp\0" +"blogspot.com.co\0" +"historicalsociety.museum\0" +"masuda.shimane.jp\0" +"spb.su\0" +"oizumi.gunma.jp\0" +"wallonie.museum\0versicherung\0" +"coop.mv\0" +"coop.mw\0" +"naka.ibaraki.jp\0isahaya.nagasaki.jp\0" +"lierne.no\0utsira.no\0" +"onna.okinawa.jp\0es.leg.br\0" +"bydgoszcz.pl\0\xe0\xa4\xad\xe0\xa4\xbe\xe0\xa4\xb0\xe0\xa4\xa4\0jaguar\0" +"sochi.su\0" +"biei.hokkaido.jp\0konan.shiga.jp\0shop.th\0" +"gliwice.pl\0" +"trentinos-tirol.it\0" +"uozu.toyama.jp\0" +"dp.ua\0" +"cc.vt.us\0" +"bomlo.no\0" +"grondar.za\0dyn.home-webserver.de\0" +"gangaviika.no\0" "okayama.jp\0" -"!city.kobe.jp\0chikuho.fukuoka.jp\0" -"fe.it\0is-very-sweet.org\0" -"air-traffic-control.aero\0" -"sr.it\0konan.aichi.jp\0" -"natori.miyagi.jp\0" -"ginowan.okinawa.jp\0" -"date.hokkaido.jp\0" -"konyvelo.hu\0newyork.museum\0" -"pubol.museum\0" -"web.nf\0" -"cremona.it\0" -"web.ni\0" -"treviso.it\0temp-dns.com\0" -"kumano.hiroshima.jp\0" -"bergen.no\0hermes\0" -"narviika.no\0" -"kuriyama.hokkaido.jp\0" -"kwp.gov.pl\0sucks\0" -"hino.tottori.jp\0firewall-gateway.de\0" -"custom.metacentrum.cz\0" -"photography.museum\0" -"search\0" -"partners\0" -"nakagusuku.okinawa.jp\0" -"koeln.museum\0" -"friulivgiulia.it\0" -"pe.ca\0" -"riik.ee\0nagiso.nagano.jp\0giske.no\0" -"ivgu.no\0" -"works\0" -"world\0" -"matera.it\0" -"cim.br\0web.pk\0is-a-celticsfan.org\0" -"taiji.wakayama.jp\0cruise\0" -"travel.tt\0" -"sokndal.no\0" -"k12.wi.us\0mc.eu.org\0" -"nishiwaki.hyogo.jp\0" -"hob\xc3\xb8l.no\0" -"repair\0" -"miyota.nagano.jp\0mesaverde.museum\0oregontrail.museum\0" -"hitachinaka.ibaraki.jp\0and.museum\0" -"patria.bo\0koka.shiga.jp\0" -"starnberg.museum\0" -"ooguy.com\0" -"udono.mie.jp\0" -"\xe5\xa4\xa9\xe4\xb8\xbb\xe6\x95\x99\0" -"\xe5\xb3\xb6\xe6\xa0\xb9.jp\0" -"is-gone.com\0" -"kadena.okinawa.jp\0" -"trani-andria-barletta.it\0" +"townnews-staging.com\0" +"parma.it\0" +"agents.aero\0doesntexist.com\0blogspot.com.es\0" +"student.aero\0engineering\0" +"college\0cloudns.asia\0" +"tgory.pl\0embaixada.st\0" +"mus.mi.us\0" +"katsuragi.wakayama.jp\0kolobrzeg.pl\0" +"shop.ro\0" +"tas.gov.au\0" +"pharmacien.fr\0sakura.chiba.jp\0" +"coop.py\0zhitomir.ua\0" +"jefferson.museum\0mangyshlak.su\0" +"georgia.museum\0" +"reggiocalabria.it\0muroran.hokkaido.jp\0" +"pomorze.pl\0lancaster\0" +"dinosaur.museum\0fyresdal.no\0" +"kvitsoy.no\0dyndns1.de\0" +"tsukiyono.gunma.jp\0" +"lo.it\0" +"zippo\0" +"shop.pl\0" +"genting\0mitsubishi\0" +"bj.cn\0" +"frei.no\0" +"hurum.no\0y.se\0" +"linkyard.cloud\0" +"antiques.museum\0" +"kimitsu.chiba.jp\0aisho.shiga.jp\0" +"coop.km\0dattorelay.com\0" +"lilly\0" +"wegrow.pl\0" +"ns.ca\0" +"fujieda.shizuoka.jp\0" +"\xe4\xba\xac\xe9\x83\xbd.jp\0" +"dielddanuorri.no\0" +"\xe9\xa6\x99\xe5\xb7\x9d.jp\0" +"kasaoka.okayama.jp\0" +"gs.va.no\0alpha.bounty-full.com\0" +"free\0" +"hyatt\0" +"mansions.museum\0" +"\xe6\xb2\x96\xe7\xb8\x84.jp\0" +"hangout\0" +"larsson.museum\0" +"osakasayama.osaka.jp\0" +"fortworth.museum\0googlecode.com\0securitytactics.com\0" +"kochi.jp\0" +"nuernberg.museum\0br\xc3\xb8nn\xc3\xb8y.no\0" +"elk.pl\0" +"caltanissetta.it\0owani.aomori.jp\0" +"\xe7\xbb\x84\xe7\xbb\x87.hk\0" +"tateyama.toyama.jp\0fbx-os.fr\0" +"hanawa.fukushima.jp\0" +"berlevag.no\0eid.no\0" +"audnedaln.no\0gitlab.io\0" +"kosei.shiga.jp\0" +"namie.fukushima.jp\0" +"firestone\0insure\0" +"stat.no\0" +"va.it\0fudai.iwate.jp\0" +"nishikawa.yamagata.jp\0xxx\0" +"uvic.museum\0" +"dynalias.com\0" +"yokkaichi.mie.jp\0" +"mutsuzawa.chiba.jp\0uwajima.ehime.jp\0" +"kirovograd.ua\0" +"selfip.org\0" +"nittedal.no\0" +"lucania.it\0higashiizu.shizuoka.jp\0" +"asmatart.museum\0exhibition.museum\0" +"vt.us\0" +"riobranco.br\0xyz\0*.ex.ortsinfo.at\0blogspot.com.mt\0" +"aseral.no\0" +"warmia.pl\0" +"blogspot.com.ng\0" +"mizumaki.fukuoka.jp\0" +"sandoy.no\0" +"hatsukaichi.hiroshima.jp\0" +"pokrovsk.su\0" +"laspezia.it\0" +"is-certified.com\0" +"motegi.tochigi.jp\0hayakawa.yamanashi.jp\0" +"sm.ua\0" +"babia-gora.pl\0" +"bo.telemark.no\0narviika.no\0" +"he.cn\0esan.hokkaido.jp\0unzen.nagasaki.jp\0" +"vevelstad.no\0s3-fips-us-gov-west-1.amazonaws.com\0test-iserv.de\0" +"valleaosta.it\0" +"ciencia.bo\0fuossko.no\0s\xc3\xb8rreisa.no\0lib.ct.us\0" +"dyn-ip24.de\0hasura-app.io\0" +"cc.va.us\0" +"k\xc3\xa1r\xc3\xa1\xc5\xa1johka.no\0" +"nagi.okayama.jp\0gbiz\0" +"aid.pl\0" +"hole.no\0" +"nakai.kanagawa.jp\0" +"chieti.it\0" +"flatanger.no\0krodsherad.no\0" +"reggio-emilia.it\0" +"us.org\0" +"blogspot.com.tr\0" +"is-a-llama.com\0" +"enebakk.no\0scrysec.com\0" +"*.sensiosite.cloud\0" +"va.no\0k12.nm.us\0" +"kurogi.fukuoka.jp\0shingu.hyogo.jp\0" +"carrara-massa.it\0tamakawa.fukushima.jp\0" +"s3-us-west-2.amazonaws.com\0" +"kurobe.toyama.jp\0" +"shizuoka.shizuoka.jp\0" +"go-vip.co\0" +"saintlouis.museum\0" +"appspot.com\0" +"cc.az.us\0" +"hisayama.fukuoka.jp\0" +"claims\0" +"cog.mi.us\0" +"sorocaba.br\0siteleaf.net\0" +"historical.museum\0" +"us-east-2.elasticbeanstalk.com\0" +"torino.it\0" +"iveland.no\0" +"tokuyama.yamaguchi.jp\0" +"clinton.museum\0you\0groks-this.info\0" +"kiwa.mie.jp\0" +"f.se\0" +"mishima.shizuoka.jp\0" +"lutsk.ua\0here-for-more.info\0" +"s3.dualstack.ap-northeast-2.amazonaws.com\0barsyonline.com\0" +"kirkenes.no\0" +"mp.br\0" +"mup.gov.pl\0" +"flights\0" +"\xe7\x82\xb9\xe7\x9c\x8b\0" +"kunisaki.oita.jp\0" +"sdn.gov.pl\0" +"siellak.no\0" +"otsu.shiga.jp\0" +"is.eu.org\0" +"netflix\0" +"bahcavuotna.no\0\xe5\x81\xa5\xe5\xba\xb7\0potager.org\0" +"kongsberg.no\0" +"telefonica\0" +"w.bg\0" +"hasami.nagasaki.jp\0" +"homebuilt.aero\0" +"blogspot.com.uy\0" +"school.za\0stage.nodeart.io\0" +"bibai.hokkaido.jp\0" +"city.hu\0lacaixa\0" +"bofa\0" +"izumi.kagoshima.jp\0" +"monticello.museum\0cityeats\0" +"essex.museum\0tjeldsund.no\0" +"kakegawa.shizuoka.jp\0sncf\0" +"gifts\0" +"tn.it\0saitama.saitama.jp\0" +"katagami.akita.jp\0" +"it.eu.org\0" +"monza-brianza.it\0" +"js.org\0" +"yamada.fukuoka.jp\0" +"kagamiishi.fukushima.jp\0" +"bjark\xc3\xb8y.no\0bplaced.com\0" +"trd.br\0" +"aland.fi\0" +"ogi.saga.jp\0chungnam.kr\0" +"deatnu.no\0likes-pie.com\0" +"avellino.it\0" +"va.us\0moscow\0barsy.mobi\0" +"gildesk\xc3\xa5l.no\0mydrobo.com\0" +"akkeshi.hokkaido.jp\0" +"alvdal.no\0cc.gu.us\0" +"is-an-artist.com\0" +"shiroi.chiba.jp\0" +"h\xc3\xa6gebostad.no\0firmdale\0uy.com\0webhosting.be\0" +"americanexpress\0traeumtgerade.de\0" +"nishitosa.kochi.jp\0sakawa.kochi.jp\0yun\0" +"\xec\x82\xbc\xec\x84\xb1\0" +"pisz.pl\0" +"monzaebrianza.it\0yugawara.kanagawa.jp\0" +"gotpantheon.com\0" +"goldpoint\0" +"koga.fukuoka.jp\0" +"likescandy.com\0" +"ag.it\0" +"\xc3\xb8ygarden.no\0" +"ogata.akita.jp\0gangwon.kr\0" +"workshop.museum\0filegear-jp.me\0" +"consulado.st\0" +"l\xc3\xa6rdal.no\0cc.tn.us\0\xe7\xbd\x91\xe7\xab\x99\0" +"\xe7\xb5\x84\xe7\xbb\x87.hk\0marketing\0" +"fujiyoshida.yamanashi.jp\0" +"repbody.aero\0sk.ca\0ralingen.no\0" +"trust\0" +"bulsan-sudtirol.it\0" +"sasayama.hyogo.jp\0" +"lib.ee\0az.us\0" +"ofunato.iwate.jp\0shibata.miyagi.jp\0" +"\xe5\xae\xb6\xe9\x9b\xbb\0in.eu.org\0" +"andria-trani-barletta.it\0katsuragi.nara.jp\0" +"freeddns.org\0" +"belem.br\0" +"lebesby.no\0" +"consultant.aero\0amli.no\0" +"\xe5\x9f\xbc\xe7\x8e\x89.jp\0" +"ivgu.no\0viking\0" +"sebastopol.ua\0" +"author\0ddns.net\0" +"ieee\0" +"mat.br\0\xe5\xae\xae\xe5\x9f\x8e.jp\0" +"services\0" +"\xd0\xb1\xd0\xb5\xd0\xbb\0" +"sayo.hyogo.jp\0shiiba.miyazaki.jp\0zip\0buyshouses.net\0" +"wmflabs.org\0" +"from-or.com\0" +"moma.museum\0homeoffice.gov.uk\0" +"children.museum\0" +"balsan-sudtirol.it\0" +"winners\0" +"is-very-evil.org\0" +"\xe9\xa4\x90\xe5\x8e\x85\0from-pr.com\0" +"gj\xc3\xb8vik.no\0appchizi.com\0" +"miyazaki.miyazaki.jp\0shiroishi.saga.jp\0anquan\0channel\0" +"prd.fr\0koganei.tokyo.jp\0" +"boleslawiec.pl\0exposed\0" +"nishi.osaka.jp\0sagae.yamagata.jp\0bond\0" +"iwama.ibaraki.jp\0" +"surgery\0servep2p.com\0" +"ayase.kanagawa.jp\0" +"maintenance.aero\0" +"yawata.kyoto.jp\0" +"skjak.no\0vuelos\0" +"vr.it\0kunohe.iwate.jp\0" +"brussels.museum\0os.hedmark.no\0sk\xc3\xa5nland.no\0eu.meteorapp.com\0" +"minamiise.mie.jp\0" +"hagebostad.no\0" +"rishiri.hokkaido.jp\0wzmiuw.gov.pl\0" +"floripa.br\0namegata.ibaraki.jp\0xerox\0from-co.net\0" +"fr.it\0higashikagura.hokkaido.jp\0saku.nagano.jp\0" +"lib.il.us\0book\0" +"saigawa.fukuoka.jp\0" +"sirdal.no\0linde\0myjino.ru\0" +"poker\0" +"d.bg\0is-an-entertainer.com\0is-not-certified.com\0" +"serveftp.net\0" +"medecin.km\0" +"yaotsu.gifu.jp\0" +"vagsoy.no\0" +"campidano-medio.it\0kamijima.ehime.jp\0" +"gotsu.shimane.jp\0" +"onthewifi.com\0" +"\xd8\xa8\xda\xbe\xd8\xa7\xd8\xb1\xd8\xaa\0" +"gu.us\0\xd0\xbe\xd0\xbd\xd0\xbb\xd0\xb0\xd0\xb9\xd0\xbd\0" +"trentinosud-tirol.it\0firenze.it\0\xe3\x83\x9d\xe3\x82\xa4\xe3\x83\xb3\xe3\x83\x88\0" +"yamanashi.yamanashi.jp\0realm.cz\0" +"cruises\0" +"dn.ua\0bharti\0" +"tynset.no\0" +"\xd8\xa7\xd9\x84\xd8\xac\xd8\xb2\xd8\xa7\xd8\xa6\xd8\xb1\0" +"tn.us\0" +"prd.km\0r\xc3\xb8yken.no\0" +"t3l3p0rt.net\0" +"plants.museum\0" +"vall\xc3\xa9""e-d-aoste.it\0nagaoka.niigata.jp\0rybnik.pl\0" +"yasu.shiga.jp\0" +"randaberg.no\0" +"\xeb\x8b\xb7\xeb\x84\xb7\0" +"ot.it\0pd.it\0\xe5\x92\x8c\xe6\xad\x8c\xe5\xb1\xb1.jp\0" +"hitachinaka.ibaraki.jp\0" +"b\xc3\xa1id\xc3\xa1r.no\0k12.oh.us\0" +"alstahaug.no\0" +"\xd5\xb0\xd5\xa1\xd5\xb5\0\xd0\xbe\xd1\x80\xd0\xb3.\xd1\x81\xd1\x80\xd0\xb1\0" +"yamatokoriyama.nara.jp\0dentist\0" +"lib.az.us\0" +"taiki.hokkaido.jp\0kitayama.wakayama.jp\0" +"prd.mg\0bahccavuotna.no\0" +"a.ssl.fastly.net\0" +"ushistory.museum\0" +"is-an-actress.com\0" +"fedje.no\0gop.pk\0" +"kikugawa.shizuoka.jp\0" +"kvits\xc3\xb8y.no\0" +"slz.br\0" +"castres.museum\0training\0lebtimnetz.de\0" +"shimonoseki.yamaguchi.jp\0" +"architecture.museum\0" +"lib.ms.us\0lib.nc.us\0" +"dev-myqnapcloud.com\0" +"\xe0\xa8\xad\xe0\xa8\xbe\xe0\xa8\xb0\xe0\xa8\xa4\0" +"w.se\0" +"broker\0" +"database.museum\0" +"soka.saitama.jp\0norton\0" +"kushima.miyazaki.jp\0" +"\xe9\x9b\x86\xe5\x9b\xa2\0" +"sjc.br\0" +"emilia-romagna.it\0" +"spy.museum\0s3-ap-northeast-2.amazonaws.com\0" +"kasamatsu.gifu.jp\0" +"kagoshima.kagoshima.jp\0" +"pa.gov.br\0" +"s3-ap-southeast-2.amazonaws.com\0" +"xbox\0*.futurecms.at\0" +"*.sendai.jp\0" +"abbott\0" +"fjaler.no\0" +"b\xc3\xa6rum.no\0" +"minoh.osaka.jp\0" +"agrar.hu\0" +"markets\0" +"computerhistory.museum\0notteroy.no\0" +"kaita.hiroshima.jp\0" +"indianmarket.museum\0lib.wa.us\0" +"naklo.pl\0" +"taa.it\0" +"luster.no\0" +"pb.gov.br\0" +"ybo.party\0" +"sand\xc3\xb8y.no\0" +"lib.ga.us\0" +"vall\xc3\xa9""edaoste.it\0ichikawa.chiba.jp\0" +"mini\0" +"yusui.kagoshima.jp\0schokokeks.net\0" +"automotive.museum\0" +"kunstunddesign.museum\0barum.no\0" +"nasushiobara.tochigi.jp\0" +"from-ar.com\0" +"amakusa.kumamoto.jp\0kai.yamanashi.jp\0" +"miyake.nara.jp\0mint\0" +"aviation.museum\0fauske.no\0" +"zlg.br\0shiriuchi.hokkaido.jp\0" +"askvoll.no\0" +"tmall\0" +"ngo.lk\0poltava.ua\0" +"s3.ap-northeast-2.amazonaws.com\0" +"tenei.fukushima.jp\0spiegel\0" +"kinokawa.wakayama.jp\0" +"gs.cn\0experts-comptables.fr\0toride.ibaraki.jp\0" +"jewishart.museum\0ivano-frankivsk.ua\0sohu\0" +"wuoz.gov.pl\0" +"palmsprings.museum\0dnepropetrovsk.ua\0" +"koeln\0" +"mallorca.museum\0" +"nirasaki.yamanashi.jp\0bayern\0" +"m\xc3\xa1tta-v\xc3\xa1rjjat.no\0ck.ua\0" +"fetsund.no\0" +"medical.museum\0blogsite.org\0" +"komono.mie.jp\0powiat.pl\0" +"ath.cx\0" +"piw.gov.pl\0" +"\xe5\xb3\xb6\xe6\xa0\xb9.jp\0glogow.pl\0nat.tn\0" +"natural.bo\0mosjoen.no\0" +"akiruno.tokyo.jp\0bplaced.net\0" +"taito.tokyo.jp\0" +"beskidy.pl\0" +"film.museum\0" +"sellsyourhome.org\0" +"foodnetwork\0" +"boavista.br\0saogonca.br\0yabu.hyogo.jp\0" +"aomori.jp\0" +"sakata.yamagata.jp\0" +"\xe0\xae\x9a\xe0\xae\xbf\xe0\xae\x99\xe0\xaf\x8d\xe0\xae\x95\xe0\xae\xaa\xe0\xaf\x8d\xe0\xae\xaa\xe0\xaf\x82\xe0\xae\xb0\xe0\xaf\x8d\0" +"sera.hiroshima.jp\0psse.gov.pl\0" +"safety\0*.platformsh.site\0" +"\xe7\xa6\x8f\xe5\xb2\xa1.jp\0ngo.ph\0travelchannel\0" +"express\0s3.dualstack.ap-southeast-1.amazonaws.com\0" +"kv\xc3\xa6""fjord.no\0" +"slg.br\0" +"ventures\0" +"sakuho.nagano.jp\0utsunomiya.tochigi.jp\0" +"audible\0" +"yanagawa.fukuoka.jp\0" +"kashiwara.osaka.jp\0a.prod.fastly.net\0" +"homedns.org\0" +"lib.md.us\0" +"*.ex.futurecms.at\0" +"gaivuotna.no\0k12.in.us\0" +"protection\0" +"engineer.aero\0lavangen.no\0" +"opencraft.hosting\0" +"olayangroup\0" +"celtic.museum\0d.se\0" +"\xe6\x9c\xba\xe6\x9e\x84\0" +"and.museum\0" +"kanzaki.saga.jp\0" +"principe.st\0" +"politie\0song\0" +"\xd8\xb9\xd8\xb1\xd8\xa7\xd9\x82\0" +"cheltenham.museum\0marker.no\0" +"\xc3\xa5""fjord.no\0" +"daejeon.kr\0" +"mizusawa.iwate.jp\0" +"sony\0" +"gru.br\0tosa.kochi.jp\0" +"barlettatraniandria.it\0" +"if.ua\0" +"u.bg\0" +"shimamaki.hokkaido.jp\0" +"h\xc3\xb8ylandet.no\0" +"bible\0ferrari\0" +"vana\0" +"medecin.fr\0" +"pyatigorsk.ru\0" +"\xe9\xa6\x99\xe6\xb8\xaf\0statefarm\0today\0" +"kutno.pl\0" +"education.museum\0is-a-player.com\0" +"!city.kobe.jp\0bialowieza.pl\0frontdoor\0" +"ap-southeast-2.elasticbeanstalk.com\0" +"firewall-gateway.net\0" +"presse.km\0mozilla-iot.org\0" +"airguard.museum\0hzc.io\0" +"arteducation.museum\0research.museum\0" +"tsushima.nagasaki.jp\0" +"karacol.su\0" +"ishigaki.okinawa.jp\0" +"freight.aero\0\xc3\xb8rland.no\0" +"dnsdojo.com\0" +"selfip.biz\0hasura.app\0" +"tozsde.hu\0vlaanderen.museum\0" +"nakasatsunai.hokkaido.jp\0" +"\xe6\x84\x9b\xe7\x9f\xa5.jp\0mihama.aichi.jp\0matsudo.chiba.jp\0tachikawa.tokyo.jp\0" +"toyonaka.osaka.jp\0" +"ws.na\0" +"tomisato.chiba.jp\0takahashi.okayama.jp\0matsuzaki.shizuoka.jp\0" +"presse.ml\0" +"gouv.fr\0" +"cafe\0" +"ascolipiceno.it\0" +"pu.it\0" +"osaka\0" +"demon.nl\0" +"lotte\0pt.eu.org\0" +"sortland.no\0" +"nord-odal.no\0" +"servebeer.com\0" +"lotto\0" +"kazo.saitama.jp\0" +"nalchik.ru\0" +"pi.gov.br\0vlaanderen\0" +"dsmynas.com\0" +"kepno.pl\0" +"childrens.museum\0" +"gouv.ht\0" +"api.stdlib.com\0" +"\xce\xb5\xce\xbb\0" +"mn.it\0\xe5\x8c\x97\xe6\xb5\xb7\xe9\x81\x93.jp\0" +"pb.ao\0fylkesbibl.no\0" +"fusa.no\0ngo.za\0nalchik.su\0" +"dodge\0" +"or.at\0" +"grue.no\0" +"kazimierz-dolny.pl\0" +"or.bi\0" +"se.net\0ru.net\0" +"scientist.aero\0" +"gouv.bj\0" +"selje.no\0" +"sopot.pl\0" +"spdns.eu\0" +"shimotsuma.ibaraki.jp\0tanabe.wakayama.jp\0intl.tn\0dev.static.land\0" +"taka.hyogo.jp\0shimokitayama.nara.jp\0" +"or.ci\0" +"szex.hu\0chesapeakebay.museum\0" +"gouv.ci\0" +"sener\0" +"kraanghke.no\0" +"or.cr\0nakano.tokyo.jp\0" +"lib.ky.us\0" +"\xd8\xa7\xd8\xaa\xd8\xb5\xd8\xa7\xd9\x84\xd8\xa7\xd8\xaa\0" +"microlight.aero\0ollo\0" +"ota.gunma.jp\0himeshima.oita.jp\0" +"tokashiki.okinawa.jp\0" +"nsw.edu.au\0" +"\xe7\x86\x8a\xe6\x9c\xac.jp\0" +"botanical.museum\0" +"house.museum\0" +"cc.mn.us\0" +"ogaki.gifu.jp\0" +"gran.no\0" +"shinichi.hiroshima.jp\0nadex\0" +"ibigawa.gifu.jp\0" "koto.tokyo.jp\0" -"dontexist.org\0*.triton.zone\0" -"sande.vestfold.no\0" -"lt.eu.org\0" -"cloudeity.net\0" +"steam.museum\0" +"arakawa.tokyo.jp\0" +"medicina.bo\0" +"turek.pl\0call\0" +"apps.fbsbx.com\0" +"*.dapps.earth\0" +"utazu.kagawa.jp\0" +"assassination.museum\0zero\0" +"\xe7\xbd\x91\xe7\xb5\xa1.hk\0" +"himi.toyama.jp\0" +"k12.fl.us\0" +"sar.it\0ichihara.chiba.jp\0unazuki.toyama.jp\0" +"furniture\0" +"id.au\0b.bg\0" +"nissan\0" +"bjarkoy.no\0azurecontainer.io\0" +"camp\0" +"mykolaiv.ua\0" +"online.museum\0is-a-hunter.com\0" +"b.br\0" +"far.br\0" +"nissay\0" +"wpcomstaging.com\0" +"starachowice.pl\0" +"si.it\0" +"erotika.hu\0garden.museum\0" +"nikon\0" +"cultural.museum\0issmarterthanyou.com\0" +"egyptian.museum\0\xe5\x98\x89\xe9\x87\x8c\xe5\xa4\xa7\xe9\x85\x92\xe5\xba\x97\0" +"misato.miyagi.jp\0weatherchannel\0" +"br\xc3\xb8nn\xc3\xb8ysund.no\0" +"ci.it\0karpacz.pl\0" +"dynvpn.de\0" +"togo.aichi.jp\0" +"trader.aero\0k12.as.us\0" +"sannohe.aomori.jp\0mizunami.gifu.jp\0hu.net\0" +"cambridge.museum\0lewismiller.museum\0svn-repos.de\0" +"pe.gov.br\0nosegawa.nara.jp\0cieszyn.pl\0hicam.net\0" +"spdns.de\0" +"or.id\0" +"otsuchi.iwate.jp\0" +"jessheim.no\0" +"chernivtsi.ua\0kyoto\0from-nm.com\0" +"macerata.it\0" +"kr.com\0" +"takanezawa.tochigi.jp\0" +"london.museum\0bod\xc3\xb8.no\0is-a-conservative.com\0" +"or.it\0" +"desa.id\0mar.it\0" +"k12.nv.us\0nis.za\0" +"zappos\0" +"aurskog-holand.no\0skiptvet.no\0my-gateway.de\0" +"or.jp\0shiogama.miyagi.jp\0bungotakada.oita.jp\0" +"clock.museum\0strand.no\0" +"higashiyamato.tokyo.jp\0oguni.yamagata.jp\0" +"andasuolo.no\0" +"musica.ar\0shimamoto.osaka.jp\0" +"or.ke\0" "mikawa.yamagata.jp\0" -"izumiotsu.osaka.jp\0" -"reviews\0" -"adv.br\0vefsn.no\0" -"oyabe.toyama.jp\0roros.no\0" -"nissedal.no\0" -"izumozaki.niigata.jp\0" -"kure.hiroshima.jp\0koge.tottori.jp\0" -"yamamoto.miyagi.jp\0" -"kitakata.fukushima.jp\0press.museum\0" -"noda.iwate.jp\0skierv\xc3\xa1.no\0" -"hm.no\0eid.no\0cloudns.asia\0" -"\xe7\xae\x87\xe4\xba\xba.hk\0r\xc3\xb8yken.no\0from-il.com\0" -"pisz.pl\0" -"nishiizu.shizuoka.jp\0web.tj\0" -"kamitonda.wakayama.jp\0silk\0" -"inatsuki.fukuoka.jp\0futbol\0" -"ebiz.tw\0" -"valdaosta.it\0" -"hashimoto.wakayama.jp\0my-firewall.org\0" -"mizusawa.iwate.jp\0web.tr\0" -"bradesco\0" -"us-west-1.elasticbeanstalk.com\0" -"hobby-site.org\0" -"os.hedmark.no\0" -"agro.pl\0" -"gos.pk\0" -"k12.mn.us\0" -"arts.co\0freemasonry.museum\0troandin.no\0is-an-artist.com\0" -"kasuga.fukuoka.jp\0barsy.co.uk\0" -"minami.kyoto.jp\0" -"sina\0" -"h.bg\0" -"budapest\0schokokeks.net\0" -"tamayu.shimane.jp\0web.ve\0" -"iwafune.tochigi.jp\0" -"chtr.k12.ma.us\0dyn-vpn.de\0" -"yanaizu.fukushima.jp\0barsy.support\0" -"*.cryptonomic.net\0" -"catania.it\0cc.as.us\0" -"kunstunddesign.museum\0tokyo\0" -"cleaning\0" -"elblag.pl\0" -"takahama.aichi.jp\0" -"pe.it\0" -"hanggliding.aero\0" -"limited\0" -"toyo.kochi.jp\0" -"comunica\xc3\xa7\xc3\xb5""es.museum\0is-lost.org\0fi.eu.org\0" -"webredirect.org\0" -"food\0" -"pharmacien.fr\0" -"homedepot\0" -"lib.oh.us\0" -"wakuya.miyagi.jp\0jolster.no\0" -"kunigami.okinawa.jp\0sanfrancisco.museum\0" -"namie.fukushima.jp\0" -"ama.aichi.jp\0ashiya.fukuoka.jp\0" -"takagi.nagano.jp\0webspace.rocks\0" -"suifu.ibaraki.jp\0pe.kr\0" -"andria-barletta-trani.it\0" -"fbxos.fr\0*.in.futurecms.at\0" -"nose.osaka.jp\0grong.no\0malselv.no\0" -"aknoluokta.no\0" -"ac.ae\0" -"rm.it\0" -"ciencia.bo\0ebina.kanagawa.jp\0web.za\0is-found.org\0" -"fla.no\0" -"nakagawa.tokushima.jp\0" -"textile.museum\0linkyard.cloud\0" -"taiki.hokkaido.jp\0" +"sumy.ua\0care\0selfip.com\0" +"gon.pk\0dst.mi.us\0" +"sokndal.no\0s3-website-us-east-1.amazonaws.com\0" +"from-az.net\0" +"ikeda.osaka.jp\0" +"musica.bo\0" +"takaoka.toyama.jp\0or.kr\0fund\0" +"casa\0" +"cars\0" +"nishiaizu.fukushima.jp\0kusu.oita.jp\0minato.osaka.jp\0bieszczady.pl\0spot\0" +"case\0gr.com\0" +"nayoro.hokkaido.jp\0" +"lib.ne.us\0" +"cash\0" +"owariasahi.aichi.jp\0" +"utazas.hu\0" +"decorativearts.museum\0sigdal.no\0" +"mattel\0" +"u.se\0gb.com\0" +"shiraoka.saitama.jp\0gent\0" +"bauhaus\0" +"artcenter.museum\0cc.or.us\0serveftp.org\0shacknet.nu\0" +"jdf.br\0" +"collegefan.org\0" +"isen.kagoshima.jp\0" +"b\xc3\xb8.telemark.no\0" +"tsuruta.aomori.jp\0" +"mn.us\0" +"higashiyoshino.nara.jp\0" +"or.na\0" +"tochigi.jp\0osakikamijima.hiroshima.jp\0kitagata.saga.jp\0" +"or.mu\0" +"enonic.io\0" +"texas.museum\0leclerc\0" +"id.ir\0habikino.osaka.jp\0" +"qa2.com\0" +"pa.gov.pl\0" +"air-surveillance.aero\0axis.museum\0marine.ru\0" +"ricoh\0" +"ballangen.no\0" +"odessa.ua\0careers\0" +"palermo.it\0" +"kitahata.saga.jp\0" +"br.com\0" +"\xe9\x95\xb7\xe5\xb4\x8e.jp\0" +"campania.it\0hirogawa.wakayama.jp\0" +"macapa.br\0yura.wakayama.jp\0" +"my-wan.de\0" +"k\xc3\xa5""fjord.no\0ar.com\0" +"aisai.aichi.jp\0sanda.hyogo.jp\0" +"trentin-s\xc3\xbc""dtirol.it\0" +"estate.museum\0ringerike.no\0" +"dyndns-at-home.com\0is-a-libertarian.com\0" +"jx.cn\0" +"newyork.museum\0" +"yuzawa.niigata.jp\0" +"hitachiomiya.ibaraki.jp\0test.tj\0" +"k12.co.us\0linkitools.space\0" +"or.pw\0" +"fukui.jp\0mitaka.tokyo.jp\0" +"\xe0\xac\xad\xe0\xac\xbe\xe0\xac\xb0\xe0\xac\xa4\0" +"is-a-blogger.com\0" +"kijo.miyazaki.jp\0id.lv\0" +"cc.id.us\0" +"id.ly\0" +"altoadige.it\0" +"hirara.okinawa.jp\0" +"hapmir.no\0" +"obira.hokkaido.jp\0kochi.kochi.jp\0higashiyodogawa.osaka.jp\0" +"damnserver.com\0" +"yame.fukuoka.jp\0ina.saitama.jp\0lowicz.pl\0" +"war.museum\0" +"omigawa.chiba.jp\0datsun\0" +"modalen.no\0k12.pr.us\0tattoo\0karelia.su\0" +"grajewo.pl\0" +"sanofi\0" +"ha.cn\0" +"academy\0filegear-gb.me\0" +"pr.gov.br\0tsukumi.oita.jp\0" +"stjordalshalsen.no\0komforb.se\0" +"av.it\0sunagawa.hokkaido.jp\0iijima.nagano.jp\0" +"ishinomaki.miyagi.jp\0" +"stord.no\0" +"sakai.osaka.jp\0" +"gouv.rw\0" +"psc.br\0" +"test.ru\0" +"kakogawa.hyogo.jp\0" +"budejju.no\0" +"kariwa.niigata.jp\0iide.yamagata.jp\0" +"gouv.sn\0" +"kameoka.kyoto.jp\0" +"uchinada.ishikawa.jp\0or.th\0observer\0" +"tj.cn\0handa.aichi.jp\0kaga.ishikawa.jp\0" +"snillfjord.no\0" +"idf.il\0tuscany.it\0" +"azure\0" +"no.it\0" +"ac.ae\0lib.pa.us\0" +"presse.ci\0k12.ma.us\0\xe0\xa4\xa8\xe0\xa5\x87\xe0\xa4\x9f\0" +"kasama.ibaraki.jp\0" +"tec.mi.us\0" +"karuizawa.nagano.jp\0" +"photography\0" +"reisen\0\xe5\x95\x86\xe5\x9f\x8e\0" +"or.ug\0" +"hamatonbetsu.hokkaido.jp\0tomari.hokkaido.jp\0kita.tokyo.jp\0select\0" +"or.tz\0" +"mayfirst.info\0" "ac.at\0" "ac.be\0" -"minakami.gunma.jp\0" -"torino.it\0ikeda.gifu.jp\0" -"uz.ua\0ford\0" -"kl\xc3\xa6""bu.no\0" -"withgoogle.com\0" -"kitakata.miyazaki.jp\0nikko.tochigi.jp\0bialystok.pl\0" -"veneto.it\0*.kobe.jp\0kawai.nara.jp\0" -"hk.com\0" -"h\xc3\xa5.no\0cloudns.org\0" -"ac.ci\0" -"ltd.cy\0plc.co.im\0hikimi.shimane.jp\0comcast\0" -"site\0" -"ac.cn\0\xe5\xa4\xa7\xe9\x98\xaa.jp\0" -"aosta.it\0" -"ambulance.aero\0!city.sapporo.jp\0" -"ac.cr\0cuneo.it\0" -"bolivia.bo\0meland.no\0us-4.evennode.com\0" -"ac.cy\0tsubetsu.hokkaido.jp\0" -"public.museum\0" -"habmer.no\0" -"sakyo.kyoto.jp\0eastafrica.museum\0square.museum\0" -"shintomi.miyazaki.jp\0russia.museum\0" -"gorlice.pl\0" -"tamba.hyogo.jp\0norton\0" -"tomika.gifu.jp\0" -"blog\0" -"12hp.de\0" -"\xd0\xb1\xd0\xb5\xd0\xbb\0" -"music.museum\0" -"yoga\0" -"nanporo.hokkaido.jp\0meet\0" -"mazury.pl\0" -"inashiki.ibaraki.jp\0" -"ltd.gi\0adv.mz\0hosting-cluster.nl\0" -"tsuga.tochigi.jp\0" -"suita.osaka.jp\0ap-northeast-3.elasticbeanstalk.com\0" -"qh.cn\0kiwa.mie.jp\0" -"nome.pt\0" -"perso.ht\0nexus\0" -"arts.ve\0netbank\0""12hp.at\0" -"sicilia.it\0" -"ac.gn\0quebec.museum\0rovno.ua\0ltd.hk\0" -"anan.tokushima.jp\0" -"nantan.kyoto.jp\0" -"walbrzych.pl\0" -"us-3.evennode.com\0" -"ina.ibaraki.jp\0labor.museum\0skjervoy.no\0wellbeingzone.eu\0" -"rodoy.no\0" -"cc.ks.us\0" -"berg.no\0singles\0mk.eu.org\0" -"akaiwa.okayama.jp\0" +"rovigo.it\0ise.mie.jp\0" +"qc.ca\0" +"or.us\0" +"laquila.it\0gamagori.aichi.jp\0foundation\0" +"taira.toyama.jp\0" +"valle-daosta.it\0" +"barclaycard\0" +"cloudcontrolapp.com\0" +"hasvik.no\0" +"takaharu.miyazaki.jp\0" +"cisco\0" +"hatoyama.saitama.jp\0credit\0" +"ac.ci\0malselv.no\0" +"ullensvang.no\0" +"ac.cn\0gallup\0" +"\xe9\x9d\x92\xe6\xa3\xae.jp\0minami-alps.yamanashi.jp\0" +"g\xc3\xa1ivuotna.no\0b.se\0" +"ac.cr\0" +"baths.museum\0balat.no\0" +"liguria.it\0kanan.osaka.jp\0" +"ac.cy\0forum.hu\0" +"is-a-knight.org\0" +"pol.dz\0kitakata.fukushima.jp\0iizuna.nagano.jp\0" +"presse.fr\0" +"tsugaru.aomori.jp\0" +"talk\0" +"sandnes.no\0" +"graphics\0" +"carraramassa.it\0" +"lipsy\0" +"iiyama.nagano.jp\0nyuzen.toyama.jp\0" +"network\0" +"s.bg\0chocolate.museum\0labour.museum\0marburg.museum\0kongsvinger.no\0" +"bnpparibas\0" +"kashiba.nara.jp\0parliament.nz\0chrysler\0poznan.pl\0" +"kiwi\0" +"gdynia.pl\0" +"barueri.br\0" +"\xd0\xbf\xd1\x80.\xd1\x81\xd1\x80\xd0\xb1\0" +"kamaishi.iwate.jp\0" +"id.us\0lasalle\0" +"warszawa.pl\0" +"sciencecenter.museum\0yodobashi\0myiphost.com\0" +"is-a-republican.com\0" +"chikujo.fukuoka.jp\0usa.oita.jp\0" +"lib.ut.us\0" +"gorizia.it\0ozu.kumamoto.jp\0" +"franziskaner.museum\0mein-vigor.de\0" +"cbre\0" +"ac.gn\0friuli-v-giulia.it\0kuki.saitama.jp\0" +"bentley\0" +"cz.it\0" +"gouv.km\0froland.no\0" +"pol.ht\0worse-than.tv\0" +"s3-website-eu-west-1.amazonaws.com\0" +"salerno.it\0" +"mino.gifu.jp\0\xe8\x81\x94\xe9\x80\x9a\0" +"atami.shizuoka.jp\0" +"building.museum\0flanders.museum\0""12hp.de\0" +"ac.id\0kira.aichi.jp\0flt.cloud.muni.cz\0" +"suldal.no\0" +"british.museum\0reg.dk\0" +"\xe6\x97\xb6\xe5\xb0\x9a\0" +"journal.aero\0" +"ac.il\0poniatowa.pl\0" +"ac.im\0vang.no\0" +"ac.in\0" +"\xd8\xa7\xd9\x84\xd9\x85\xd8\xba\xd8\xb1\xd8\xa8\0" +"ac.ir\0kagawa.jp\0\xe6\x84\x9b\xe5\xaa\x9b.jp\0" +"coal.museum\0davvesiida.no\0knowsitall.info\0" +"\xe7\xbe\xa4\xe9\xa6\xac.jp\0asahi.chiba.jp\0bato.tochigi.jp\0" +"gouv.ml\0" +"ha.no\0" +"av.tr\0" +"n\xc3\xa5\xc3\xa5mesjevuemie.no\0" +"mashike.hokkaido.jp\0" +"fuoisku.no\0" +"ac.jp\0isa.kagoshima.jp\0" +"portland.museum\0doesntexist.org\0" +"12hp.at\0" +"ac.ke\0" +"mol.it\0saroma.hokkaido.jp\0ohda.shimane.jp\0" +"\xe6\xa0\x83\xe6\x9c\xa8.jp\0" +"schweiz.museum\0duck\0" +"leg.br\0kuromatsunai.hokkaido.jp\0" +"ryugasaki.ibaraki.jp\0" +"ainan.ehime.jp\0wakasa.fukui.jp\0" +"sumoto.kumamoto.jp\0" +"murayama.yamagata.jp\0ac.kr\0" +"portlligat.museum\0" "12hp.ch\0" -"analytics\0" -"gwangju.kr\0" -"ac.id\0" -"arakawa.saitama.jp\0us.com\0" -"mail.pl\0" -"tobetsu.hokkaido.jp\0kuju.oita.jp\0" -"furniture\0" -"lug.org.uk\0" -"ac.il\0" -"ac.im\0watarai.mie.jp\0flanders.museum\0" -"ac.in\0africa.com\0" -"logistics.aero\0progressive\0space-to-rent.com\0" -"*.elb.amazonaws.com.cn\0" -"ac.ir\0is-a-landscaper.com\0" -"lukow.pl\0" -"kamisato.saitama.jp\0" -"manchester.museum\0" -"bible\0" -"arts.museum\0author\0" -"ac.jp\0uda.nara.jp\0" -"langev\xc3\xa5g.no\0" -"ichikawa.hyogo.jp\0gyokuto.kumamoto.jp\0chernovtsy.ua\0" -"ac.ke\0blue\0" -"uw.gov.pl\0from-hi.com\0" -"toshima.tokyo.jp\0steinkjer.no\0dp.ua\0" -"hk.cn\0" -"oga.akita.jp\0" -"\xc3\xa1k\xc5\x8boluokta.no\0" -"imperia.it\0ltd.lk\0" +"aircraft.aero\0navigation.aero\0" +"ac.lk\0" +"finance\0" +"usr.cloud.muni.cz\0" +"betainabox.com\0" +"ac.ma\0" +"trentino-alto-adige.it\0nonoichi.ishikawa.jp\0" +"ac.ls\0" +"ac.me\0mywire.org\0" +"yuki.ibaraki.jp\0nantan.kyoto.jp\0" +"stjohn.museum\0bplaced.de\0" +"hanamaki.iwate.jp\0" +"pittsburgh.museum\0" +"educator.aero\0" +"muenster.museum\0taifun-dns.de\0" +"blanco\0" +"ac.mu\0kh.ua\0" +"ac.mw\0" +"ascoli-piceno.it\0" +"uslivinghistory.museum\0ac.ni\0" +"trentin-sud-tirol.it\0ac.mz\0" +"svalbard.no\0" +"giize.com\0customer.speedpartner.de\0dyn-vpn.de\0" +"inuyama.aichi.jp\0po.gov.pl\0" +"mortgage\0toshiba\0" +"cagliari.it\0sharp\0\xe7\xbd\x91\xe7\xbb\x9c\0" +"ggee\0" +"pug.it\0ac.nz\0" +"ac.pa\0" +"shibukawa.gunma.jp\0" +"sorum.no\0" +"fukuchi.fukuoka.jp\0" +"sarpsborg.no\0" +"vestnes.no\0chase\0" +"tarumizu.kagoshima.jp\0shimane.shimane.jp\0" +"farm.museum\0ilovecollege.info\0" +"hitachi\0" +"education\0" +"taxi\0" +"date.fukushima.jp\0ac.pr\0" +"barrell-of-knowledge.info\0" +"dealer\0" +"fishing\0" +"trentin-sued-tirol.it\0nanae.hokkaido.jp\0akashi.hyogo.jp\0sumida.tokyo.jp\0" +"selbu.no\0" +"rost.no\0" +"tomika.gifu.jp\0" +"ookuwa.nagano.jp\0hachijo.tokyo.jp\0" +"silk.museum\0" +"mjondalen.no\0k12.ri.us\0uk.com\0" +"hidaka.hokkaido.jp\0" +"austevoll.no\0" +"iyo.ehime.jp\0" +"plurinacional.bo\0" +"kanagawa.jp\0" +"is-a-cpa.com\0" +"aerodrome.aero\0" +"operaunite.com\0" +"zuerich\0" +"hol.no\0ac.rs\0" +"nord-fron.no\0ac.ru\0ac.se\0lighting\0eu.org\0" +"kujukuri.chiba.jp\0tara.saga.jp\0" +"ac.rw\0" +"yugawa.fukushima.jp\0dyndns.biz\0" +"sauherad.no\0accountants\0" +"eniwa.hokkaido.jp\0" +"gol.no\0bridgestone\0dyndns-pics.com\0point2this.com\0" +"takahama.fukui.jp\0" +"skierv\xc3\xa1.no\0\xd2\x9b\xd0\xb0\xd0\xb7\0" +"iitate.fukushima.jp\0otoyo.kochi.jp\0" +"tatsuno.nagano.jp\0ibaraki.osaka.jp\0" +"clinique\0" +"pol.tr\0kosher\0" +"ac.th\0" +"mazury.pl\0slask.pl\0ac.sz\0ac.tj\0" +"rhcloud.com\0" +"natura\0" +"okaya.nagano.jp\0b.ssl.fastly.net\0" +"lunner.no\0aetna\0s3-website.eu-central-1.amazonaws.com\0" +"fuchu.toyama.jp\0salon\0ma.leg.br\0" +"divttasvuotna.no\0" +"campobasso.it\0inagi.tokyo.jp\0" +"ac.ug\0" +"bristol.museum\0" +"ac.tz\0" +"ac.uk\0" +"matsue.shimane.jp\0" +"abiko.chiba.jp\0qpon\0" +"aarp\0" +"mobile\0" +"oji.nara.jp\0" +"ae.org\0" +"li.it\0" +"glass.museum\0" +"serveminecraft.net\0" +"amber.museum\0" +"hirado.nagasaki.jp\0\xe5\x8f\xb0\xe6\xb9\xbe\0in.net\0" +"ac.vn\0" +"fussa.tokyo.jp\0\xe6\x88\x91\xe7\x88\xb1\xe4\xbd\xa0\0" +"ltd.cy\0money.museum\0s.se\0duns\0" +"minamifurano.hokkaido.jp\0" +"glas.museum\0" +"mihama.mie.jp\0" +"degree\0mobily\0\xe5\x9c\xa8\xe7\xba\xbf\0logoip.de\0" +"e4.cz\0" +"fashion\0" +"realty\0" +"from-nh.com\0" +"recife.br\0nm.cn\0" +"rio.br\0ueno.gunma.jp\0" +"citic\0from-oh.com\0" +"blogspot.vn\0" +"ca-central-1.elasticbeanstalk.com\0" +"viterbo.it\0shingu.fukuoka.jp\0" +"chuo.chiba.jp\0urakawa.hokkaido.jp\0" +"dvag\0" +"fst.br\0tsunan.niigata.jp\0" +"stockholm.museum\0" +"kobayashi.miyazaki.jp\0\xe5\xa8\xb1\xe4\xb9\x90\0" +"cc.ky.us\0" +"bizen.okayama.jp\0" +"koshimizu.hokkaido.jp\0shinjo.nara.jp\0" +"trading\0from-tx.com\0" +"ltd.gi\0ac.za\0al.eu.org\0" +"gamo.shiga.jp\0" +"rovno.ua\0hk.com\0" "yatsushiro.kumamoto.jp\0" -"\xd9\x87\xd9\x85\xd8\xb1\xd8\xa7\xd9\x87\0" -"cnpy.gdn\0" -"ac.kr\0" -"arts.ro\0" -"us-2.evennode.com\0" -"shinkamigoto.nagasaki.jp\0" -"warman\0barsyonline.com\0" +"vn.ua\0richardli\0" +"taishi.osaka.jp\0kaufen\0" +"bearalv\xc3\xa1hki.no\0ac.zm\0" +"chirurgiens-dentistes.fr\0rebun.hokkaido.jp\0" +"state.museum\0" +"equipment.aero\0" +"k12.de.us\0ltd.hk\0" +"setagaya.tokyo.jp\0" +"ac.zw\0" +"pvh.br\0firm.ht\0bbs.tr\0\xe5\x85\xab\xe5\x8d\xa6\0" +"grandrapids.museum\0enterprises\0" +"a\xc3\xa9roport.ci\0\xe4\xb8\xad\xe6\x96\x87\xe7\xbd\x91\0nodum.co\0" +"bolt.hu\0technology\0" +"firm.in\0hiroo.hokkaido.jp\0kadoma.osaka.jp\0" +"isernia.it\0" +"act.au\0" +"agrigento.it\0" +"drammen.no\0troandin.no\0pl.eu.org\0blogspot.re\0" +"shioya.tochigi.jp\0mitou.yamaguchi.jp\0" +"badaddja.no\0" +"nogata.fukuoka.jp\0tonosho.kagawa.jp\0minamioguni.kumamoto.jp\0opoczno.pl\0" +"go.ci\0" +"shitara.aichi.jp\0" +"beats\0meteorapp.com\0" +"kumano.hiroshima.jp\0" +"leksvik.no\0blogspot.ro\0" +"maniwa.okayama.jp\0health\0" +"londrina.br\0go.cr\0at.it\0yoichi.hokkaido.jp\0" +"oygarden.no\0blogspot.rs\0" +"zgorzelec.pl\0" +"airbus\0blogspot.ru\0blogspot.se\0" +"blogspot.sg\0" +"andriabarlettatrani.it\0" +"stj\xc3\xb8rdal.no\0blogspot.si\0" +"blogspot.sk\0" +"alto-adige.it\0" +"filegear-sg.me\0nodum.io\0" +"blogspot.sn\0" +"firm.co\0" +"kerryproperties\0dd-dns.de\0" +"fuchu.hiroshima.jp\0blogspot.td\0" +"temp-dns.com\0" +"sx.cn\0tokai.aichi.jp\0" +"ninja\0" +"marylhurst.museum\0science-fiction.museum\0" +"tozawa.yamagata.jp\0oshino.yamanashi.jp\0" +"casino.hu\0firm.dk\0" +"ac.gov.br\0mw.gov.pl\0" +"ltd.lk\0hyundai\0" +"kosai.shizuoka.jp\0kainan.wakayama.jp\0" +"shintomi.miyazaki.jp\0raid\0" +"lorenskog.no\0able\0cust.dev.thingdust.io\0" +"hanno.saitama.jp\0" +"rennebu.no\0blogspot.tw\0blogspot.ug\0" +"nakayama.yamagata.jp\0" +"nishio.aichi.jp\0" +"origins\0dyn.cosidns.de\0abkhazia.su\0tula.su\0" +"dattolocal.net\0" +"baseball.museum\0vantaa.museum\0os\xc3\xb8yro.no\0" +"\xe3\x82\xb9\xe3\x83\x88\xe3\x82\xa2\0blogspot.mr\0" +"quicksytes.com\0" +"sex.hu\0agriculture.museum\0" +"muni.il\0kikuchi.kumamoto.jp\0\xe5\xa4\xa7\xe4\xbc\x97\xe6\xb1\xbd\xe8\xbd\xa6\0" +"blogspot.mx\0" +"blogspot.my\0" +"bci.dnstrace.pro\0" +"blogspot.nl\0" +"qld.edu.au\0" +"ikusaka.nagano.jp\0" +"blogspot.no\0" +"\xc3\xb8yer.no\0" +"ms.gov.br\0otobe.hokkaido.jp\0" +"sakaki.nagano.jp\0" +"knx-server.net\0" +"cc.nm.us\0" +"moriya.ibaraki.jp\0" +"miyawaka.fukuoka.jp\0" +"sciencehistory.museum\0circle\0" +"go.id\0" +"burghof.museum\0donetsk.ua\0ky.us\0blogspot.pe\0" +"bio.br\0" +"izunokuni.shizuoka.jp\0" +"frogans\0spdns.org\0" +"york.museum\0k12.va.us\0ap-northeast-3.elasticbeanstalk.com\0" +"takanabe.miyazaki.jp\0\xe0\xb9\x84\xe0\xb8\x97\xe0\xb8\xa2\0" +"isehara.kanagawa.jp\0auspost\0" +"blogspot.qa\0" +"scienceandhistory.museum\0" +"trentinsued-tirol.it\0go.it\0blogspot.pt\0" +"parliament.cy\0lib.ia.us\0" +"mt.gov.br\0" +"etne.no\0" +"trentinos\xc3\xbc""d-tirol.it\0trentinsudtirol.it\0olbiatempio.it\0fukumitsu.toyama.jp\0juniper\0" +"q.bg\0naturalhistory.museum\0s3-website-us-west-2.amazonaws.com\0" +"sologne.museum\0" +"santoandre.br\0" +"go.jp\0kawaba.gunma.jp\0" +"flor\xc3\xb8.no\0l-o-g-i-n.de\0" +"ohtawara.tochigi.jp\0" +"weibo\0blogspot.is\0" +"lecce.it\0memorial\0blogspot.it\0" +"go.ke\0" +"tabayama.yamanashi.jp\0" +"accident-investigation.aero\0" +"kadena.okinawa.jp\0" +"frosta.no\0" +"toyokawa.aichi.jp\0banamex\0" +"sibenik.museum\0" +"blogspot.jp\0" +"go.kr\0chirurgiens-dentistes-en-france.fr\0" +"hamar.no\0" +"environment.museum\0" +"higashikagawa.kagawa.jp\0matsukawa.nagano.jp\0\xe5\x85\xac\xe5\x8f\xb8\0" +"gs.aa.no\0" +"honai.ehime.jp\0" +"skole.museum\0utah.museum\0" +"blogspot.kr\0" +"trolley.museum\0bd.se\0from-me.org\0" +"carrier.museum\0salat.no\0brussels\0cipriani\0" +"grimstad.no\0krager\xc3\xb8.no\0" +"lea\xc5\x8bgaviika.no\0blogspot.li\0" +"is-by.us\0" +"shiso.hyogo.jp\0" +"arq.br\0" +"\xed\x95\x9c\xea\xb5\xad\0" +"blogspot.lt\0blogspot.md\0" +"roan.no\0blogspot.lu\0" +"dni.us\0ltd.ua\0" +"championship.aero\0" +"kobierzyce.pl\0" +"schlesisches.museum\0blogspot.mk\0" +"sex.pl\0" +"archaeology.museum\0" +"tonaki.okinawa.jp\0est.pr\0" +"gotdns.com\0" +"ltd.uk\0healthcare\0" +"webhop.biz\0" +"firm.ve\0" +"itayanagi.aomori.jp\0suita.osaka.jp\0" +"blogspot.fi\0" +"narashino.chiba.jp\0" +"\xe7\xbd\x91\xe5\xba\x97\0" +"tsukui.kanagawa.jp\0shimosuwa.nagano.jp\0" +"troms\xc3\xb8.no\0" +"otaki.nagano.jp\0" +"\xe5\xb9\xbf\xe4\xb8\x9c\0" +"jfk.museum\0kl\xc3\xa6""bu.no\0ferrero\0" +"berlin\0blogspot.fr\0" +"oracle\0" +"sukagawa.fukushima.jp\0\xe5\x98\x89\xe9\x87\x8c\0" +"works\0" +"world\0" +"tcp4.me\0" +"kumiyama.kyoto.jp\0open\0" +"is-saved.org\0" +"channelsdvr.net\0" +"friuli-vegiulia.it\0" +"taobao\0co.events\0" +"\xe3\x82\xaf\xe3\x83\xa9\xe3\x82\xa6\xe3\x83\x89\0" +"blogspot.gr\0" +"praxi\0barsy.online\0resindevice.io\0" +"tadaoka.osaka.jp\0" +"go.pw\0is-a-anarchist.com\0" +"trentinostirol.it\0star\0" +"on.ca\0" +"cloudeity.net\0" +"nm.us\0blogspot.hk\0" +"leirvik.no\0" +"ong.br\0blogspot.hr\0" +"lahppi.no\0" +"*.compute.estate\0blogspot.hu\0blogspot.ie\0" +"edu.ac\0\xc3\xa5lesund.no\0blackfriday\0" +"is.it\0zentsuji.kagawa.jp\0" +"paroch.k12.ma.us\0" +"edu.af\0" +"blogspot.in\0" +"rennes\xc3\xb8y.no\0" +"ozora.hokkaido.jp\0busan.kr\0" +"blogspot.ba\0withyoutube.com\0" +"edu.al\0" +"sykkylven.no\0" +"hirakata.osaka.jp\0" +"eng.pro\0blogspot.be\0" +"edu.ba\0aa.no\0blogspot.bg\0" +"edu.ar\0edu.bb\0matera.it\0ibara.okayama.jp\0de.cool\0" +"plc.ly\0" +"blogspot.bj\0" +"edu.au\0godaddy\0is-a-soxfan.org\0" +"keisen.fukuoka.jp\0" +"edu.bh\0moseushi.hokkaido.jp\0" +"edu.bi\0crafts.museum\0" +"edu.az\0kumamoto.kumamoto.jp\0" +"firm.ro\0eu-central-1.elasticbeanstalk.com\0blogspot.ca\0" +"exchange.aero\0edu.bm\0" +"edu.bn\0tsurugi.ishikawa.jp\0" +"edu.bo\0s\xc3\xb8r-odal.no\0" +"blogspot.cf\0" +"aremark.no\0" +"edu.br\0go.th\0blogspot.ch\0" +"edu.bs\0" +"edu.bt\0go.tj\0" +"s\xc3\xb8r-varanger.no\0" +"blogspot.cl\0" +"jogasz.hu\0orkanger.no\0" +"edu.ci\0" +"edu.bz\0" +"gs.bu.no\0jambyl.su\0" +"lublin.pl\0mysecuritycamera.net\0" +"v\xc3\xa1rgg\xc3\xa1t.no\0" +"edu.cn\0" +"edu.co\0contemporary.museum\0blogspot.de\0" +"blogspot.cv\0" +"laakesvuemie.no\0go.ug\0" +"boldlygoingnowhere.org\0" +"go.tz\0blogspot.cz\0" +"edu.cu\0blogspot.dk\0" +"edu.cw\0stranda.no\0" +"hikawa.shimane.jp\0" +"serveftp.com\0" +"shinanomachi.nagano.jp\0" +"edu.dm\0finnoy.no\0" +"yoka.hyogo.jp\0" +"edu.do\0museet.museum\0b\xc3\xa1l\xc3\xa1t.no\0" +"sano.tochigi.jp\0\xd8\xa7\xd9\x85\xd8\xa7\xd8\xb1\xd8\xa7\xd8\xaa\0" +"\xe9\xb9\xbf\xe5\x85\x90\xe5\xb3\xb6.jp\0" +"edu.ec\0" +"edu.ee\0" +"edu.eg\0broadway\0" +"livorno.it\0" +"edu.dz\0carboniaiglesias.it\0" +"lesja.no\0" +"ce.it\0sytes.net\0" +"linz.museum\0virtualuser.de\0" +"seiyo.ehime.jp\0" +"my-firewall.org\0" +"kanmaki.nara.jp\0tendo.yamagata.jp\0wolomin.pl\0" +"sula.no\0" +"firm.nf\0" +"edu.es\0savannahga.museum\0tonsberg.no\0" +"edu.et\0" +"myvnc.com\0" +"engineer\0" +"avoues.fr\0bihoro.hokkaido.jp\0caseih\0" +"juedisches.museum\0" +"al.gov.br\0" +"group.aero\0cc.fl.us\0" +"mg.leg.br\0" +"pulawy.pl\0" +"eng.br\0gift\0" +"columbus.museum\0" +"otari.nagano.jp\0" +"edu.ge\0hermes\0" +"honjo.saitama.jp\0" +"edu.gh\0" +"edu.gi\0coastaldefence.museum\0" +"partners\0" +"edu.gl\0minamiyamashiro.kyoto.jp\0" +"edu.gn\0cloudns.biz\0" +"no.eu.org\0" +"edu.gp\0namikata.ehime.jp\0" +"edu.gr\0" +"cng.br\0edu.gt\0gosen.niigata.jp\0" +"agro.bo\0edu.gu\0phoenix.museum\0lugansk.ua\0" +"digital\0" +"dyn-o-saur.com\0" +"motoyama.kochi.jp\0" +"industria.bo\0edu.gy\0" +"edu.hk\0" +"lombardia.it\0" +"edu.hn\0iwaizumi.iwate.jp\0chino.nagano.jp\0futsu.nagasaki.jp\0" +"fuel.aero\0blogspot.ae\0" +"ishikari.hokkaido.jp\0" +"akrehamn.no\0" +"edu.ht\0" +"toyota\0" +"blogspot.al\0" +"mobi\0tunes\0blogspot.am\0" +"goiania.br\0co.financial\0" +"yokoze.saitama.jp\0" +"naoshima.kagawa.jp\0" +"sola.no\0adac\0\xe6\xb8\xb8\xe6\x88\x8f\0" +"edu.in\0yamanashi.jp\0" +"edu.iq\0" +"edu.is\0" +"edu.it\0" +"plc.uk\0" +"piacenza.it\0terni.it\0lg.jp\0echizen.fukui.jp\0actor\0" +"bu.no\0modum.no\0dy.fi\0" +"takino.hyogo.jp\0" +"\xe5\x8f\xb0\xe7\x81\xa3\0" +"\xe5\x85\xac\xe7\x9b\x8a\0" +"isa.us\0" +"arts.co\0village.museum\0s\xc3\xb8r-fron.no\0vodka\0" +"edu.jo\0moda\0dnshome.de\0" +"tashkent.su\0byen.site\0" +"akune.kagoshima.jp\0canon\0" +"edu.kg\0" +"edu.ki\0countryestate.museum\0" +"green\0" +"edu.km\0" +"sango.nara.jp\0edu.kn\0" +"navuotna.no\0lib.in.us\0" +"yakumo.hokkaido.jp\0edu.kp\0" +"edu.la\0" +"nagahama.shiga.jp\0edu.lb\0" +"edu.lc\0afjord.no\0" +"rotorcraft.aero\0edu.kw\0" +"udono.mie.jp\0global.prod.fastly.net\0" +"edu.ky\0n\xc3\xa1vuotna.no\0" +"\xe7\xbd\x91\xe7\xbb\x9c.cn\0edu.kz\0" +"edu.lk\0" +"pisa.it\0" +"toyota.yamaguchi.jp\0comcast\0" +"lombardy.it\0shikatsu.aichi.jp\0" +"\xc3\xa1lt\xc3\xa1.no\0" +"edu.lr\0" +"edu.ls\0" +"kawaue.gifu.jp\0" +"edu.me\0" +"edu.lv\0" +"edu.mg\0" +"edu.ly\0penza.su\0" +"edu.mk\0" +"edu.ml\0cricket\0telebit.app\0" +"misaki.osaka.jp\0edu.mn\0cern\0" +"edu.mo\0nz.eu.org\0" +"tatebayashi.gunma.jp\0" +"redstone\0nym.by\0" +"nym.bz\0" +"edu.ms\0mordovia.su\0" }; static const quint16 tldChunkCount = 2; -static const quint32 tldChunks[] = {65532, 101260}; +static const quint32 tldChunks[] = {65517, 101828}; QT_END_NAMESPACE diff --git a/src/corelib/io/qwindowspipereader.cpp b/src/corelib/io/qwindowspipereader.cpp index 15c9f52cf3..1f03ac5d5a 100644 --- a/src/corelib/io/qwindowspipereader.cpp +++ b/src/corelib/io/qwindowspipereader.cpp @@ -40,6 +40,7 @@ #include "qwindowspipereader_p.h" #include "qiodevice_p.h" #include <qelapsedtimer.h> +#include <qscopedvaluerollback.h> QT_BEGIN_NAMESPACE @@ -301,9 +302,8 @@ void QWindowsPipeReader::emitPendingReadyRead() { if (readyReadPending) { readyReadPending = false; - inReadyRead = true; + QScopedValueRollback<bool> guard(inReadyRead, true); emit readyRead(); - inReadyRead = false; } } diff --git a/src/corelib/io/qwindowspipereader_p.h b/src/corelib/io/qwindowspipereader_p.h index e52aa4c33d..c757753c9c 100644 --- a/src/corelib/io/qwindowspipereader_p.h +++ b/src/corelib/io/qwindowspipereader_p.h @@ -97,7 +97,7 @@ private: class Overlapped : public OVERLAPPED { - Q_DISABLE_COPY(Overlapped) + Q_DISABLE_COPY_MOVE(Overlapped) public: explicit Overlapped(QWindowsPipeReader *reader); void clear(); diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp index 92e8b6db52..32536f495b 100644 --- a/src/corelib/io/qwindowspipewriter.cpp +++ b/src/corelib/io/qwindowspipewriter.cpp @@ -39,6 +39,7 @@ #include "qwindowspipewriter_p.h" #include "qiodevice_p.h" +#include <qscopedvaluerollback.h> QT_BEGIN_NAMESPACE @@ -111,9 +112,8 @@ void QWindowsPipeWriter::emitPendingBytesWrittenValue() emit canWrite(); if (!inBytesWritten) { - inBytesWritten = true; + QScopedValueRollback<bool> guard(inBytesWritten, true); emit bytesWritten(bytes); - inBytesWritten = false; } } } diff --git a/src/corelib/io/qwindowspipewriter_p.h b/src/corelib/io/qwindowspipewriter_p.h index d6671c3f27..6c269e86b7 100644 --- a/src/corelib/io/qwindowspipewriter_p.h +++ b/src/corelib/io/qwindowspipewriter_p.h @@ -134,7 +134,7 @@ private: class Overlapped : public OVERLAPPED { - Q_DISABLE_COPY(Overlapped) + Q_DISABLE_COPY_MOVE(Overlapped) public: explicit Overlapped(QWindowsPipeWriter *pipeWriter); void clear(); diff --git a/src/corelib/itemmodels/itemmodels.pri b/src/corelib/itemmodels/itemmodels.pri index 068a8c4b3a..ebeac6e211 100644 --- a/src/corelib/itemmodels/itemmodels.pri +++ b/src/corelib/itemmodels/itemmodels.pri @@ -20,6 +20,14 @@ qtConfig(proxymodel) { SOURCES += \ itemmodels/qabstractproxymodel.cpp + qtConfig(concatenatetablesproxymodel) { + HEADERS += \ + itemmodels/qconcatenatetablesproxymodel.h + + SOURCES += \ + itemmodels/qconcatenatetablesproxymodel.cpp + } + qtConfig(identityproxymodel) { HEADERS += \ itemmodels/qidentityproxymodel.h @@ -35,6 +43,15 @@ qtConfig(proxymodel) { SOURCES += \ itemmodels/qsortfilterproxymodel.cpp } + + qtConfig(transposeproxymodel) { + HEADERS += \ + itemmodels/qtransposeproxymodel.h \ + itemmodels/qtransposeproxymodel_p.h + + SOURCES += \ + itemmodels/qtransposeproxymodel.cpp + } } qtConfig(stringlistmodel) { diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index 83dcf68314..3e74e5a0c8 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -45,6 +45,7 @@ #include <qmimedata.h> #include <qdebug.h> #include <qvector.h> +#include <qregexp.h> #include <qstack.h> #include <qbitarray.h> #include <qdatetime.h> @@ -76,8 +77,8 @@ QPersistentModelIndexData *QPersistentModelIndexData::create(const QModelIndex & void QPersistentModelIndexData::destroy(QPersistentModelIndexData *data) { Q_ASSERT(data); - Q_ASSERT(data->ref.load() == 0); - QAbstractItemModel *model = const_cast<QAbstractItemModel *>(data->model); + Q_ASSERT(data->ref.loadRelaxed() == 0); + QAbstractItemModel *model = const_cast<QAbstractItemModel *>(data->index.model()); // a valid persistent model index with a null model pointer can only happen if the model was destroyed if (model) { QAbstractItemModelPrivate *p = model->d_func(); @@ -512,10 +513,8 @@ QAbstractItemModel *QAbstractItemModelPrivate::staticEmptyModel() void QAbstractItemModelPrivate::invalidatePersistentIndexes() { - for (QPersistentModelIndexData *data : qAsConst(persistent.indexes)) { + for (QPersistentModelIndexData *data : qAsConst(persistent.indexes)) data->index = QModelIndex(); - data->model = 0; - } persistent.indexes.clear(); } @@ -530,7 +529,6 @@ void QAbstractItemModelPrivate::invalidatePersistentIndex(const QModelIndex &ind QPersistentModelIndexData *data = *it; persistent.indexes.erase(it); data->index = QModelIndex(); - data->model = 0; } } @@ -863,7 +861,6 @@ void QAbstractItemModelPrivate::rowsRemoved(const QModelIndex &parent, QPersistentModelIndexData *data = *it; persistent.indexes.erase(persistent.indexes.constFind(data->index)); data->index = QModelIndex(); - data->model = 0; } } @@ -958,7 +955,6 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent, QPersistentModelIndexData *data = *it; persistent.indexes.erase(persistent.indexes.constFind(data->index)); data->index = QModelIndex(); - data->model = 0; } } @@ -2334,7 +2330,7 @@ QModelIndex QAbstractItemModel::buddy(const QModelIndex &index) const The way the search is performed is defined by the \a flags given. The list that is returned may be empty. Note also that the order of results in the list may not correspond to the order in the model, if for example a proxy - model is used. The order of the results can not be relied upon. + model is used. The order of the results cannot be relied upon. The search begins from the \a start index, and continues until the number of matching data items equals \a hits, the search reaches the last row, or @@ -2912,7 +2908,7 @@ bool QAbstractItemModelPrivate::allowMove(const QModelIndex &srcParent, int star Note that other rows may be displaced accordingly. Note also that when moving items within the same parent you should not attempt invalid or no-op moves. In - the above example, item 2 is at row 2 before the move, so it can not be moved + the above example, item 2 is at row 2 before the move, so it cannot be moved to row 2 (where it is already) or row 3 (no-op as row 3 means above row 3, where it is already) @@ -3298,8 +3294,6 @@ void QAbstractItemModel::changePersistentIndex(const QModelIndex &from, const QM data->index = to; if (to.isValid()) d->persistent.insertMultiAtEnd(to, data); - else - data->model = 0; } } @@ -3332,8 +3326,6 @@ void QAbstractItemModel::changePersistentIndexList(const QModelIndexList &from, data->index = to.at(i); if (data->index.isValid()) toBeReinserted << data; - else - data->model = 0; } } @@ -3627,7 +3619,7 @@ QModelIndex QAbstractTableModel::sibling(int row, int column, const QModelIndex bool QAbstractTableModel::hasChildren(const QModelIndex &parent) const { - if (parent.model() == this || !parent.isValid()) + if (!parent.isValid()) return rowCount(parent) > 0 && columnCount(parent) > 0; return false; } @@ -3963,7 +3955,7 @@ bool QAbstractListModel::dropMimeData(const QMimeData *data, Qt::DropAction acti /*! \internal - QHash::insertMulti insert the value before the old value. and find() return the new value. + QMultiHash::insert inserts the value before the old value. and find() return the new value. We need insertMultiAtEnd because we don't want to overwrite the old one, which should be removed later There should be only one instance QPersistentModelIndexData per index, but in some intermediate state there may be @@ -3973,9 +3965,9 @@ bool QAbstractListModel::dropMimeData(const QMimeData *data, Qt::DropAction acti */ void QAbstractItemModelPrivate::Persistent::insertMultiAtEnd(const QModelIndex& key, QPersistentModelIndexData *data) { - QHash<QModelIndex,QPersistentModelIndexData *>::iterator newIt = - indexes.insertMulti(key, data); - QHash<QModelIndex,QPersistentModelIndexData *>::iterator it = newIt + 1; + QHash<QModelIndex,QPersistentModelIndexData *>::iterator newIt = indexes.insert(key, data); + QHash<QModelIndex,QPersistentModelIndexData *>::iterator it = newIt; + ++it; while (it != indexes.end() && it.key() == key) { qSwap(*newIt,*it); newIt = it; diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index bec71b0606..43649cf79b 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -57,12 +57,12 @@ class Q_CORE_EXPORT QModelIndex { friend class QAbstractItemModel; public: - Q_DECL_CONSTEXPR inline QModelIndex() Q_DECL_NOTHROW : r(-1), c(-1), i(0), m(nullptr) {} + Q_DECL_CONSTEXPR inline QModelIndex() noexcept : r(-1), c(-1), i(0), m(nullptr) {} // compiler-generated copy/move ctors/assignment operators are fine! - Q_DECL_CONSTEXPR inline int row() const Q_DECL_NOTHROW { return r; } - Q_DECL_CONSTEXPR inline int column() const Q_DECL_NOTHROW { return c; } - Q_DECL_CONSTEXPR inline quintptr internalId() const Q_DECL_NOTHROW { return i; } - inline void *internalPointer() const Q_DECL_NOTHROW { return reinterpret_cast<void*>(i); } + Q_DECL_CONSTEXPR inline int row() const noexcept { return r; } + Q_DECL_CONSTEXPR inline int column() const noexcept { return c; } + Q_DECL_CONSTEXPR inline quintptr internalId() const noexcept { return i; } + inline void *internalPointer() const noexcept { return reinterpret_cast<void*>(i); } inline QModelIndex parent() const; inline QModelIndex sibling(int row, int column) const; inline QModelIndex siblingAtColumn(int column) const; @@ -72,13 +72,13 @@ public: #endif inline QVariant data(int role = Qt::DisplayRole) const; inline Qt::ItemFlags flags() const; - Q_DECL_CONSTEXPR inline const QAbstractItemModel *model() const Q_DECL_NOTHROW { return m; } - Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW { return (r >= 0) && (c >= 0) && (m != nullptr); } - Q_DECL_CONSTEXPR inline bool operator==(const QModelIndex &other) const Q_DECL_NOTHROW + Q_DECL_CONSTEXPR inline const QAbstractItemModel *model() const noexcept { return m; } + Q_DECL_CONSTEXPR inline bool isValid() const noexcept { return (r >= 0) && (c >= 0) && (m != nullptr); } + Q_DECL_CONSTEXPR inline bool operator==(const QModelIndex &other) const noexcept { return (other.r == r) && (other.i == i) && (other.c == c) && (other.m == m); } - Q_DECL_CONSTEXPR inline bool operator!=(const QModelIndex &other) const Q_DECL_NOTHROW + Q_DECL_CONSTEXPR inline bool operator!=(const QModelIndex &other) const noexcept { return !(*this == other); } - Q_DECL_CONSTEXPR inline bool operator<(const QModelIndex &other) const Q_DECL_NOTHROW + Q_DECL_CONSTEXPR inline bool operator<(const QModelIndex &other) const noexcept { return r < other.r || (r == other.r && (c < other.c @@ -86,9 +86,9 @@ public: || (i == other.i && std::less<const QAbstractItemModel *>()(m, other.m)))))); } private: - inline QModelIndex(int arow, int acolumn, void *ptr, const QAbstractItemModel *amodel) Q_DECL_NOTHROW + inline QModelIndex(int arow, int acolumn, void *ptr, const QAbstractItemModel *amodel) noexcept : r(arow), c(acolumn), i(reinterpret_cast<quintptr>(ptr)), m(amodel) {} - Q_DECL_CONSTEXPR inline QModelIndex(int arow, int acolumn, quintptr id, const QAbstractItemModel *amodel) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR inline QModelIndex(int arow, int acolumn, quintptr id, const QAbstractItemModel *amodel) noexcept : r(arow), c(acolumn), i(id), m(amodel) {} int r, c; quintptr i; @@ -103,7 +103,7 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QModelIndex &); class QPersistentModelIndexData; // qHash is a friend, but we can't use default arguments for friends (§8.3.6.4) -uint qHash(const QPersistentModelIndex &index, uint seed = 0) Q_DECL_NOTHROW; +uint qHash(const QPersistentModelIndex &index, uint seed = 0) noexcept; class Q_CORE_EXPORT QPersistentModelIndex { @@ -117,13 +117,11 @@ public: inline bool operator!=(const QPersistentModelIndex &other) const { return !operator==(other); } QPersistentModelIndex &operator=(const QPersistentModelIndex &other); -#ifdef Q_COMPILER_RVALUE_REFS - inline QPersistentModelIndex(QPersistentModelIndex &&other) Q_DECL_NOTHROW + inline QPersistentModelIndex(QPersistentModelIndex &&other) noexcept : d(other.d) { other.d = nullptr; } - inline QPersistentModelIndex &operator=(QPersistentModelIndex &&other) Q_DECL_NOTHROW + inline QPersistentModelIndex &operator=(QPersistentModelIndex &&other) noexcept { qSwap(d, other.d); return *this; } -#endif - inline void swap(QPersistentModelIndex &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + inline void swap(QPersistentModelIndex &other) noexcept { qSwap(d, other.d); } bool operator==(const QModelIndex &other) const; bool operator!=(const QModelIndex &other) const; QPersistentModelIndex &operator=(const QModelIndex &other); @@ -143,14 +141,14 @@ public: bool isValid() const; private: QPersistentModelIndexData *d; - friend uint qHash(const QPersistentModelIndex &, uint seed) Q_DECL_NOTHROW; + friend uint qHash(const QPersistentModelIndex &, uint seed) noexcept; #ifndef QT_NO_DEBUG_STREAM friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QPersistentModelIndex &); #endif }; Q_DECLARE_SHARED(QPersistentModelIndex) -inline uint qHash(const QPersistentModelIndex &index, uint seed) Q_DECL_NOTHROW +inline uint qHash(const QPersistentModelIndex &index, uint seed) noexcept { return qHash(index.d, seed); } @@ -163,6 +161,7 @@ typedef QList<QModelIndex> QModelIndexList; class QMimeData; class QAbstractItemModelPrivate; +class QTransposeProxyModelPrivate; template <class Key, class T> class QMap; @@ -173,6 +172,7 @@ class Q_CORE_EXPORT QAbstractItemModel : public QObject friend class QPersistentModelIndexData; friend class QAbstractItemViewPrivate; friend class QIdentityProxyModel; + friend class QTransposeProxyModelPrivate; public: explicit QAbstractItemModel(QObject *parent = nullptr); @@ -300,7 +300,9 @@ public Q_SLOTS: virtual void revert(); protected Q_SLOTS: - // Qt 6: Make virtual +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + virtual +#endif void resetInternalData(); protected: @@ -460,7 +462,7 @@ inline QVariant QModelIndex::data(int arole) const inline Qt::ItemFlags QModelIndex::flags() const { return m ? m->flags(*this) : Qt::ItemFlags(); } -inline uint qHash(const QModelIndex &index) Q_DECL_NOTHROW +inline uint qHash(const QModelIndex &index) noexcept { return uint((uint(index.row()) << 4) + index.column() + index.internalId()); } QT_END_NAMESPACE diff --git a/src/corelib/itemmodels/qabstractitemmodel_p.h b/src/corelib/itemmodels/qabstractitemmodel_p.h index 12fd93d217..92a440a125 100644 --- a/src/corelib/itemmodels/qabstractitemmodel_p.h +++ b/src/corelib/itemmodels/qabstractitemmodel_p.h @@ -65,11 +65,10 @@ QT_REQUIRE_CONFIG(itemmodel); class QPersistentModelIndexData { public: - QPersistentModelIndexData() : model(0) {} - QPersistentModelIndexData(const QModelIndex &idx) : index(idx), model(idx.model()) {} + QPersistentModelIndexData() {} + QPersistentModelIndexData(const QModelIndex &idx) : index(idx) {} QModelIndex index; QAtomicInt ref; - const QAbstractItemModel *model; static QPersistentModelIndexData *create(const QModelIndex &index); static void destroy(QPersistentModelIndexData *data); }; @@ -99,7 +98,7 @@ public: void itemsMoved(const QModelIndex &srcParent, int srcFirst, int srcLast, const QModelIndex &destinationParent, int destinationChild, Qt::Orientation orientation); bool allowMove(const QModelIndex &srcParent, int srcFirst, int srcLast, const QModelIndex &destinationParent, int destinationChild, Qt::Orientation orientation); - inline QModelIndex createIndex(int row, int column, void *data = 0) const { + inline QModelIndex createIndex(int row, int column, void *data = nullptr) const { return q_func()->createIndex(row, column, data); } @@ -142,7 +141,7 @@ public: struct Persistent { Persistent() {} - QHash<QModelIndex, QPersistentModelIndexData *> indexes; + QMultiHash<QModelIndex, QPersistentModelIndexData *> indexes; QStack<QVector<QPersistentModelIndexData *> > moved; QStack<QVector<QPersistentModelIndexData *> > invalidated; void insertMultiAtEnd(const QModelIndex& key, QPersistentModelIndexData *data); diff --git a/src/corelib/itemmodels/qabstractproxymodel.cpp b/src/corelib/itemmodels/qabstractproxymodel.cpp index 62b3ee85b9..c863406afd 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.cpp +++ b/src/corelib/itemmodels/qabstractproxymodel.cpp @@ -313,6 +313,18 @@ bool QAbstractProxyModel::setHeaderData(int section, Qt::Orientation orientation return d->model->setHeaderData(sourceSection, orientation, value, role); } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +/*! + \reimp + \since 6.0 + */ +bool QAbstractProxyModel::clearItemData(const QModelIndex &index) +{ + Q_D(QAbstractProxyModel); + return d->model->clearItemData(mapToSource(index)); +} +#endif + /*! \reimp */ diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index 08ecf9d15f..c9a73b6a31 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -78,6 +78,9 @@ public: bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; bool setItemData(const QModelIndex& index, const QMap<int, QVariant> &roles) override; bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif QModelIndex buddy(const QModelIndex &index) const override; bool canFetchMore(const QModelIndex &parent) const override; diff --git a/src/corelib/itemmodels/qabstractproxymodel_p.h b/src/corelib/itemmodels/qabstractproxymodel_p.h index f7bd5cc691..a95687c970 100644 --- a/src/corelib/itemmodels/qabstractproxymodel_p.h +++ b/src/corelib/itemmodels/qabstractproxymodel_p.h @@ -62,7 +62,7 @@ class Q_CORE_EXPORT QAbstractProxyModelPrivate : public QAbstractItemModelPrivat { Q_DECLARE_PUBLIC(QAbstractProxyModel) public: - QAbstractProxyModelPrivate() : QAbstractItemModelPrivate(), model(0) {} + QAbstractProxyModelPrivate() : QAbstractItemModelPrivate(), model(nullptr) {} QAbstractItemModel *model; virtual void _q_sourceModelDestroyed(); void mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent, diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp new file mode 100644 index 0000000000..0319d215a1 --- /dev/null +++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.cpp @@ -0,0 +1,750 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qconcatenatetablesproxymodel.h" +#include <private/qabstractitemmodel_p.h> +#include "qsize.h" +#include "qdebug.h" + +QT_BEGIN_NAMESPACE + +class QConcatenateTablesProxyModelPrivate : public QAbstractItemModelPrivate +{ + Q_DECLARE_PUBLIC(QConcatenateTablesProxyModel); + +public: + QConcatenateTablesProxyModelPrivate(); + + int computeRowsPrior(const QAbstractItemModel *sourceModel) const; + + struct SourceModelForRowResult + { + SourceModelForRowResult() : sourceModel(nullptr), sourceRow(-1) {} + QAbstractItemModel *sourceModel; + int sourceRow; + }; + SourceModelForRowResult sourceModelForRow(int row) const; + + void _q_slotRowsAboutToBeInserted(const QModelIndex &, int start, int end); + void _q_slotRowsInserted(const QModelIndex &, int start, int end); + void _q_slotRowsAboutToBeRemoved(const QModelIndex &, int start, int end); + void _q_slotRowsRemoved(const QModelIndex &, int start, int end); + void _q_slotColumnsAboutToBeInserted(const QModelIndex &parent, int start, int end); + void _q_slotColumnsInserted(const QModelIndex &parent, int, int); + void _q_slotColumnsAboutToBeRemoved(const QModelIndex &parent, int start, int end); + void _q_slotColumnsRemoved(const QModelIndex &parent, int, int); + void _q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles); + void _q_slotSourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint); + void _q_slotSourceLayoutChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint); + void _q_slotModelAboutToBeReset(); + void _q_slotModelReset(); + int columnCountAfterChange(const QAbstractItemModel *model, int newCount) const; + int calculatedColumnCount() const; + void updateColumnCount(); + bool mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent, + int *sourceRow, int *sourceColumn, QModelIndex *sourceParent, QAbstractItemModel **sourceModel) const; + + QVector<QAbstractItemModel *> m_models; + int m_rowCount; // have to maintain it here since we can't compute during model destruction + int m_columnCount; + + // for columns{AboutToBe,}{Inserted,Removed} + int m_newColumnCount; + + // for layoutAboutToBeChanged/layoutChanged + QVector<QPersistentModelIndex> layoutChangePersistentIndexes; + QVector<QModelIndex> layoutChangeProxyIndexes; +}; + +QConcatenateTablesProxyModelPrivate::QConcatenateTablesProxyModelPrivate() + : m_rowCount(0), + m_columnCount(0), + m_newColumnCount(0) +{ +} + +/*! + \since 5.13 + \class QConcatenateTablesProxyModel + \inmodule QtCore + \brief The QConcatenateTablesProxyModel class proxies multiple source models, concatenating their rows. + + \ingroup model-view + + QConcatenateTablesProxyModel takes multiple source models and concatenates their rows. + + In other words, the proxy will have all rows of the first source model, + followed by all rows of the second source model, and so on. + + If the source models don't have the same number of columns, the proxy will only + have as many columns as the source model with the smallest number of columns. + Additional columns in other source models will simply be ignored. + + Source models can be added and removed at runtime, and the column count is adjusted accordingly. + + This proxy does not inherit from QAbstractProxyModel because it uses multiple source + models, rather than a single one. + + Only flat models (lists and tables) are supported, tree models are not. + + \sa QAbstractProxyModel, {Model/View Programming}, QIdentityProxyModel, QAbstractItemModel + */ + + +/*! + Constructs a concatenate-rows proxy model with the given \a parent. +*/ +QConcatenateTablesProxyModel::QConcatenateTablesProxyModel(QObject *parent) + : QAbstractItemModel(*new QConcatenateTablesProxyModelPrivate, parent) +{ +} + +/*! + Destroys this proxy model. +*/ +QConcatenateTablesProxyModel::~QConcatenateTablesProxyModel() +{ +} + +/*! + Returns the proxy index for a given \a sourceIndex, which can be from any of the source models. +*/ +QModelIndex QConcatenateTablesProxyModel::mapFromSource(const QModelIndex &sourceIndex) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (!sourceIndex.isValid()) + return QModelIndex(); + const QAbstractItemModel *sourceModel = sourceIndex.model(); + if (!d->m_models.contains(const_cast<QAbstractItemModel *>(sourceModel))) { + qWarning("QConcatenateTablesProxyModel: index from wrong model passed to mapFromSource"); + Q_ASSERT(!"QConcatenateTablesProxyModel: index from wrong model passed to mapFromSource"); + return QModelIndex(); + } + if (sourceIndex.column() >= d->m_columnCount) + return QModelIndex(); + int rowsPrior = d_func()->computeRowsPrior(sourceModel); + return createIndex(rowsPrior + sourceIndex.row(), sourceIndex.column(), sourceIndex.internalPointer()); +} + +/*! + Returns the source index for a given \a proxyIndex. +*/ +QModelIndex QConcatenateTablesProxyModel::mapToSource(const QModelIndex &proxyIndex) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(checkIndex(proxyIndex)); + if (!proxyIndex.isValid()) + return QModelIndex(); + if (proxyIndex.model() != this) { + qWarning("QConcatenateTablesProxyModel: index from wrong model passed to mapToSource"); + Q_ASSERT(!"QConcatenateTablesProxyModel: index from wrong model passed to mapToSource"); + return QModelIndex(); + } + const int row = proxyIndex.row(); + const auto result = d->sourceModelForRow(row); + if (!result.sourceModel) + return QModelIndex(); + return result.sourceModel->index(result.sourceRow, proxyIndex.column()); +} + +/*! + \reimp +*/ +QVariant QConcatenateTablesProxyModel::data(const QModelIndex &index, int role) const +{ + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(checkIndex(index, CheckIndexOption::IndexIsValid)); + if (!sourceIndex.isValid()) + return QVariant(); + return sourceIndex.data(role); +} + +/*! + \reimp +*/ +bool QConcatenateTablesProxyModel::setData(const QModelIndex &index, const QVariant &value, int role) +{ + Q_ASSERT(checkIndex(index, CheckIndexOption::IndexIsValid)); + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.isValid()); + const auto sourceModel = const_cast<QAbstractItemModel *>(sourceIndex.model()); + return sourceModel->setData(sourceIndex, value, role); +} + +/*! + \reimp +*/ +QMap<int, QVariant> QConcatenateTablesProxyModel::itemData(const QModelIndex &proxyIndex) const +{ + Q_ASSERT(checkIndex(proxyIndex)); + const QModelIndex sourceIndex = mapToSource(proxyIndex); + Q_ASSERT(sourceIndex.isValid()); + return sourceIndex.model()->itemData(sourceIndex); +} + +/*! + \reimp +*/ +bool QConcatenateTablesProxyModel::setItemData(const QModelIndex &proxyIndex, const QMap<int, QVariant> &roles) +{ + Q_ASSERT(checkIndex(proxyIndex)); + const QModelIndex sourceIndex = mapToSource(proxyIndex); + Q_ASSERT(sourceIndex.isValid()); + const auto sourceModel = const_cast<QAbstractItemModel *>(sourceIndex.model()); + return sourceModel->setItemData(sourceIndex, roles); +} + +/*! + Returns the flags for the given index. + If the \a index is valid, the flags come from the source model for this \a index. + If the \a index is invalid (as used to determine if dropping onto an empty area + in the view is allowed, for instance), the flags from the first model are returned. +*/ +Qt::ItemFlags QConcatenateTablesProxyModel::flags(const QModelIndex &index) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return Qt::NoItemFlags; + Q_ASSERT(checkIndex(index)); + if (!index.isValid()) + return d->m_models.at(0)->flags(index); + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.isValid()); + return sourceIndex.model()->flags(sourceIndex); +} + +/*! + This method returns the horizontal header data for the first source model, + and the vertical header data for the source model corresponding to each row. + \reimp +*/ +QVariant QConcatenateTablesProxyModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return QVariant(); + switch (orientation) { + case Qt::Horizontal: + return d->m_models.at(0)->headerData(section, orientation, role); + case Qt::Vertical: { + const auto result = d->sourceModelForRow(section); + Q_ASSERT(result.sourceModel); + return result.sourceModel->headerData(result.sourceRow, orientation, role); + } + } + return QVariant(); +} + +/*! + This method returns the column count of the source model with the smallest number of columns. + \reimp +*/ +int QConcatenateTablesProxyModel::columnCount(const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (parent.isValid()) + return 0; // flat model + return d->m_columnCount; +} + +/*! + \reimp +*/ +QModelIndex QConcatenateTablesProxyModel::index(int row, int column, const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(hasIndex(row, column, parent)); + if (!hasIndex(row, column, parent)) + return QModelIndex(); + Q_ASSERT(checkIndex(parent, QAbstractItemModel::CheckIndexOption::ParentIsInvalid)); // flat model + const auto result = d->sourceModelForRow(row); + Q_ASSERT(result.sourceModel); + return mapFromSource(result.sourceModel->index(result.sourceRow, column)); +} + +/*! + \reimp +*/ +QModelIndex QConcatenateTablesProxyModel::parent(const QModelIndex &index) const +{ + Q_UNUSED(index); + return QModelIndex(); // flat model, no hierarchy +} + +/*! + \reimp +*/ +int QConcatenateTablesProxyModel::rowCount(const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(checkIndex(parent, QAbstractItemModel::CheckIndexOption::ParentIsInvalid)); // flat model + Q_UNUSED(parent); + return d->m_rowCount; +} + +/*! + This method returns the mime types for the first source model. + \reimp +*/ +QStringList QConcatenateTablesProxyModel::mimeTypes() const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return QStringList(); + return d->m_models.at(0)->mimeTypes(); +} + +/*! + The call is forwarded to the source model of the first index in the list of \a indexes. + + Important: please note that this proxy only supports dragging a single row. + It will assert if called with indexes from multiple rows, because dragging rows that + might come from different source models cannot be implemented generically by this proxy model. + Each piece of data in the QMimeData needs to be merged, which is data-type-specific. + Reimplement this method in a subclass if you want to support dragging multiple rows. + + \reimp +*/ +QMimeData *QConcatenateTablesProxyModel::mimeData(const QModelIndexList &indexes) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (indexes.isEmpty()) + return nullptr; + const QModelIndex firstIndex = indexes.first(); + Q_ASSERT(checkIndex(firstIndex, CheckIndexOption::IndexIsValid)); + const auto result = d->sourceModelForRow(firstIndex.row()); + QModelIndexList sourceIndexes; + sourceIndexes.reserve(indexes.count()); + for (const QModelIndex &index : indexes) { + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.model() == result.sourceModel); // see documentation above + sourceIndexes.append(sourceIndex); + } + return result.sourceModel->mimeData(sourceIndexes); +} + + +bool QConcatenateTablesProxyModelPrivate::mapDropCoordinatesToSource(int row, int column, const QModelIndex &parent, + int *sourceRow, int *sourceColumn, QModelIndex *sourceParent, QAbstractItemModel **sourceModel) const +{ + Q_Q(const QConcatenateTablesProxyModel); + *sourceColumn = column; + if (!parent.isValid()) { + // Drop after the last item + if (row == -1 || row == m_rowCount) { + *sourceRow = -1; + *sourceModel = m_models.constLast(); + return true; + } + // Drop between toplevel items + const auto result = sourceModelForRow(row); + Q_ASSERT(result.sourceModel); + *sourceRow = result.sourceRow; + *sourceModel = result.sourceModel; + return true; + } else { + if (row > -1) + return false; // flat model, no dropping as new children of items + // Drop onto item + const int targetRow = parent.row(); + const auto result = sourceModelForRow(targetRow); + Q_ASSERT(result.sourceModel); + const QModelIndex sourceIndex = q->mapToSource(parent); + *sourceRow = -1; + *sourceParent = sourceIndex; + *sourceModel = result.sourceModel; + return true; + } +} + +/*! + \reimp +*/ +bool QConcatenateTablesProxyModel::canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return false; + + int sourceRow, sourceColumn; + QModelIndex sourceParent; + QAbstractItemModel *sourceModel; + if (!d->mapDropCoordinatesToSource(row, column, parent, &sourceRow, &sourceColumn, &sourceParent, &sourceModel)) + return false; + return sourceModel->canDropMimeData(data, action, sourceRow, sourceColumn, sourceParent); +} + +/*! + QConcatenateTablesProxyModel handles dropping onto an item, between items, and after the last item. + In all cases the call is forwarded to the underlying source model. + When dropping onto an item, the source model for this item is called. + When dropping between items, the source model immediately below the drop position is called. + When dropping after the last item, the last source model is called. + + \reimp +*/ +bool QConcatenateTablesProxyModel::dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) +{ + Q_D(const QConcatenateTablesProxyModel); + if (d->m_models.isEmpty()) + return false; + int sourceRow, sourceColumn; + QModelIndex sourceParent; + QAbstractItemModel *sourceModel; + if (!d->mapDropCoordinatesToSource(row, column, parent, &sourceRow, &sourceColumn, &sourceParent, &sourceModel)) + return false; + + return sourceModel->dropMimeData(data, action, sourceRow, sourceColumn, sourceParent); +} + +/*! + \reimp +*/ +QSize QConcatenateTablesProxyModel::span(const QModelIndex &index) const +{ + Q_D(const QConcatenateTablesProxyModel); + Q_ASSERT(checkIndex(index)); + if (d->m_models.isEmpty() || !index.isValid()) + return QSize(); + const QModelIndex sourceIndex = mapToSource(index); + Q_ASSERT(sourceIndex.isValid()); + return sourceIndex.model()->span(sourceIndex); +} + +/*! + Adds a source model \a sourceModel, below all previously added source models. + + The ownership of \a sourceModel is not affected by this. + + The same source model cannot be added more than once. + */ +void QConcatenateTablesProxyModel::addSourceModel(QAbstractItemModel *sourceModel) +{ + Q_D(QConcatenateTablesProxyModel); + Q_ASSERT(sourceModel); + Q_ASSERT(!d->m_models.contains(sourceModel)); + connect(sourceModel, SIGNAL(dataChanged(QModelIndex,QModelIndex,QVector<int>)), this, SLOT(_q_slotDataChanged(QModelIndex,QModelIndex,QVector<int>))); + connect(sourceModel, SIGNAL(rowsInserted(QModelIndex,int,int)), this, SLOT(_q_slotRowsInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), this, SLOT(_q_slotRowsRemoved(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(rowsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_slotRowsAboutToBeInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(rowsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(_q_slotRowsAboutToBeRemoved(QModelIndex,int,int))); + + connect(sourceModel, SIGNAL(columnsInserted(QModelIndex,int,int)), this, SLOT(_q_slotColumnsInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(columnsRemoved(QModelIndex,int,int)), this, SLOT(_q_slotColumnsRemoved(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(columnsAboutToBeInserted(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeInserted(QModelIndex,int,int))); + connect(sourceModel, SIGNAL(columnsAboutToBeRemoved(QModelIndex,int,int)), this, SLOT(_q_slotColumnsAboutToBeRemoved(QModelIndex,int,int))); + + connect(sourceModel, SIGNAL(layoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), + this, SLOT(_q_slotSourceLayoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint))); + connect(sourceModel, SIGNAL(layoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)), + this, SLOT(_q_slotSourceLayoutChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint))); + connect(sourceModel, SIGNAL(modelAboutToBeReset()), this, SLOT(_q_slotModelAboutToBeReset())); + connect(sourceModel, SIGNAL(modelReset()), this, SLOT(_q_slotModelReset())); + + const int newRows = sourceModel->rowCount(); + if (newRows > 0) + beginInsertRows(QModelIndex(), d->m_rowCount, d->m_rowCount + newRows - 1); + d->m_rowCount += newRows; + d->m_models.append(sourceModel); + if (newRows > 0) + endInsertRows(); + + d->updateColumnCount(); +} + +/*! + Removes the source model \a sourceModel, which was previously added to this proxy. + + The ownership of \a sourceModel is not affected by this. +*/ +void QConcatenateTablesProxyModel::removeSourceModel(QAbstractItemModel *sourceModel) +{ + Q_D(QConcatenateTablesProxyModel); + Q_ASSERT(d->m_models.contains(sourceModel)); + disconnect(sourceModel, 0, this, 0); + + const int rowsRemoved = sourceModel->rowCount(); + const int rowsPrior = d->computeRowsPrior(sourceModel); // location of removed section + + if (rowsRemoved > 0) + beginRemoveRows(QModelIndex(), rowsPrior, rowsPrior + rowsRemoved - 1); + d->m_models.removeOne(sourceModel); + d->m_rowCount -= rowsRemoved; + if (rowsRemoved > 0) + endRemoveRows(); + + d->updateColumnCount(); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsAboutToBeInserted(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // not supported, the proxy is a flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int rowsPrior = computeRowsPrior(model); + q->beginInsertRows(QModelIndex(), rowsPrior + start, rowsPrior + end); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsInserted(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + m_rowCount += end - start + 1; + q->endInsertRows(); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int rowsPrior = computeRowsPrior(model); + q->beginRemoveRows(QModelIndex(), rowsPrior + start, rowsPrior + end); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotRowsRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + m_rowCount -= end - start + 1; + q->endRemoveRows(); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsAboutToBeInserted(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int oldColCount = model->columnCount(); + const int newColCount = columnCountAfterChange(model, oldColCount + end - start + 1); + Q_ASSERT(newColCount >= oldColCount); + if (newColCount > oldColCount) + // If the underlying models have a different number of columns (example: 2 and 3), inserting 2 columns in + // the first model leads to inserting only one column in the proxy, since qMin(2+2,3) == 3. + q->beginInsertColumns(QModelIndex(), start, qMin(end, start + newColCount - oldColCount - 1)); + m_newColumnCount = newColCount; +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsInserted(const QModelIndex &parent, int start, int end) +{ + Q_UNUSED(start); + Q_UNUSED(end); + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + if (m_newColumnCount != m_columnCount) { + m_columnCount = m_newColumnCount; + q->endInsertColumns(); + } +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsAboutToBeRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + if (parent.isValid()) // flat model + return; + const QAbstractItemModel * const model = static_cast<QAbstractItemModel *>(q->sender()); + const int oldColCount = model->columnCount(); + const int newColCount = columnCountAfterChange(model, oldColCount - (end - start + 1)); + Q_ASSERT(newColCount <= oldColCount); + if (newColCount < oldColCount) + q->beginRemoveColumns(QModelIndex(), start, qMax(end, start + oldColCount - newColCount - 1)); + m_newColumnCount = newColCount; +} + +void QConcatenateTablesProxyModelPrivate::_q_slotColumnsRemoved(const QModelIndex &parent, int start, int end) +{ + Q_Q(QConcatenateTablesProxyModel); + Q_UNUSED(start); + Q_UNUSED(end); + if (parent.isValid()) // flat model + return; + if (m_newColumnCount != m_columnCount) { + m_columnCount = m_newColumnCount; + q->endRemoveColumns(); + } +} + +void QConcatenateTablesProxyModelPrivate::_q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles) +{ + Q_Q(QConcatenateTablesProxyModel); + Q_ASSERT(from.isValid()); + Q_ASSERT(to.isValid()); + const QModelIndex myFrom = q->mapFromSource(from); + Q_ASSERT(q->checkIndex(myFrom, QAbstractItemModel::CheckIndexOption::IndexIsValid)); + const QModelIndex myTo = q->mapFromSource(to); + Q_ASSERT(q->checkIndex(myTo, QAbstractItemModel::CheckIndexOption::IndexIsValid)); + emit q->dataChanged(myFrom, myTo, roles); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotSourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QConcatenateTablesProxyModel); + + if (!sourceParents.isEmpty() && !sourceParents.contains(QModelIndex())) + return; + + emit q->layoutAboutToBeChanged({}, hint); + + const QModelIndexList persistentIndexList = q->persistentIndexList(); + layoutChangePersistentIndexes.reserve(persistentIndexList.size()); + layoutChangeProxyIndexes.reserve(persistentIndexList.size()); + + for (const QPersistentModelIndex &proxyPersistentIndex : persistentIndexList) { + layoutChangeProxyIndexes.append(proxyPersistentIndex); + Q_ASSERT(proxyPersistentIndex.isValid()); + const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex); + Q_ASSERT(srcPersistentIndex.isValid()); + layoutChangePersistentIndexes << srcPersistentIndex; + } +} + +void QConcatenateTablesProxyModelPrivate::_q_slotSourceLayoutChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QConcatenateTablesProxyModel); + if (!sourceParents.isEmpty() && !sourceParents.contains(QModelIndex())) + return; + for (int i = 0; i < layoutChangeProxyIndexes.size(); ++i) { + const QModelIndex proxyIdx = layoutChangeProxyIndexes.at(i); + const QModelIndex newProxyIdx = q->mapFromSource(layoutChangePersistentIndexes.at(i)); + q->changePersistentIndex(proxyIdx, newProxyIdx); + } + + layoutChangePersistentIndexes.clear(); + layoutChangeProxyIndexes.clear(); + + emit q->layoutChanged({}, hint); +} + +void QConcatenateTablesProxyModelPrivate::_q_slotModelAboutToBeReset() +{ + Q_Q(QConcatenateTablesProxyModel); + Q_ASSERT(m_models.contains(const_cast<QAbstractItemModel *>(static_cast<const QAbstractItemModel *>(q->sender())))); + q->beginResetModel(); + // A reset might reduce both rowCount and columnCount, and we can't notify of both at the same time, + // and notifying of one after the other leaves an intermediary invalid situation. + // So the only safe choice is to forward it as a full reset. +} + +void QConcatenateTablesProxyModelPrivate::_q_slotModelReset() +{ + Q_Q(QConcatenateTablesProxyModel); + Q_ASSERT(m_models.contains(const_cast<QAbstractItemModel *>(static_cast<const QAbstractItemModel *>(q->sender())))); + m_columnCount = calculatedColumnCount(); + m_rowCount = computeRowsPrior(nullptr); + q->endResetModel(); +} + +int QConcatenateTablesProxyModelPrivate::calculatedColumnCount() const +{ + if (m_models.isEmpty()) + return 0; + + const auto it = std::min_element(m_models.begin(), m_models.end(), [](const QAbstractItemModel* model1, const QAbstractItemModel* model2) { + return model1->columnCount() < model2->columnCount(); + }); + return (*it)->columnCount(); +} + +void QConcatenateTablesProxyModelPrivate::updateColumnCount() +{ + Q_Q(QConcatenateTablesProxyModel); + const int newColumnCount = calculatedColumnCount(); + const int columnDiff = newColumnCount - m_columnCount; + if (columnDiff > 0) { + q->beginInsertColumns(QModelIndex(), m_columnCount, m_columnCount + columnDiff - 1); + m_columnCount = newColumnCount; + q->endInsertColumns(); + } else if (columnDiff < 0) { + const int lastColumn = m_columnCount - 1; + q->beginRemoveColumns(QModelIndex(), lastColumn + columnDiff + 1, lastColumn); + m_columnCount = newColumnCount; + q->endRemoveColumns(); + } +} + +int QConcatenateTablesProxyModelPrivate::columnCountAfterChange(const QAbstractItemModel *model, int newCount) const +{ + int newColumnCount = 0; + for (int i = 0; i < m_models.count(); ++i) { + const QAbstractItemModel *mod = m_models.at(i); + const int colCount = mod == model ? newCount : mod->columnCount(); + if (i == 0) + newColumnCount = colCount; + else + newColumnCount = qMin(colCount, newColumnCount); + } + return newColumnCount; +} + +int QConcatenateTablesProxyModelPrivate::computeRowsPrior(const QAbstractItemModel *sourceModel) const +{ + int rowsPrior = 0; + for (const QAbstractItemModel *model : m_models) { + if (model == sourceModel) + break; + rowsPrior += model->rowCount(); + } + return rowsPrior; +} + +QConcatenateTablesProxyModelPrivate::SourceModelForRowResult QConcatenateTablesProxyModelPrivate::sourceModelForRow(int row) const +{ + QConcatenateTablesProxyModelPrivate::SourceModelForRowResult result; + int rowCount = 0; + for (QAbstractItemModel *model : m_models) { + const int subRowCount = model->rowCount(); + if (rowCount + subRowCount > row) { + result.sourceModel = model; + break; + } + rowCount += subRowCount; + } + result.sourceRow = row - rowCount; + return result; +} + +QT_END_NAMESPACE + +#include "moc_qconcatenatetablesproxymodel.cpp" diff --git a/src/corelib/itemmodels/qconcatenatetablesproxymodel.h b/src/corelib/itemmodels/qconcatenatetablesproxymodel.h new file mode 100644 index 0000000000..69b3a2ba09 --- /dev/null +++ b/src/corelib/itemmodels/qconcatenatetablesproxymodel.h @@ -0,0 +1,102 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author David Faure <david.faure@kdab.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QCONCATENATEROWSPROXYMODEL_H +#define QCONCATENATEROWSPROXYMODEL_H + +#include <QtCore/qabstractitemmodel.h> + +QT_REQUIRE_CONFIG(concatenatetablesproxymodel); + +QT_BEGIN_NAMESPACE + +class QConcatenateTablesProxyModelPrivate; + +class Q_CORE_EXPORT QConcatenateTablesProxyModel : public QAbstractItemModel +{ + Q_OBJECT + +public: + explicit QConcatenateTablesProxyModel(QObject *parent = nullptr); + ~QConcatenateTablesProxyModel(); + + Q_SCRIPTABLE void addSourceModel(QAbstractItemModel *sourceModel); + Q_SCRIPTABLE void removeSourceModel(QAbstractItemModel *sourceModel); + + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const; + + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + QMap<int, QVariant> itemData(const QModelIndex &proxyIndex) const override; + bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &index) const override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool canDropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) const override; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; + QSize span(const QModelIndex &index) const override; + +private: + Q_DECLARE_PRIVATE(QConcatenateTablesProxyModel) + Q_DISABLE_COPY(QConcatenateTablesProxyModel) + + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsAboutToBeInserted(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsInserted(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsAboutToBeRemoved(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotRowsRemoved(const QModelIndex &, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsAboutToBeInserted(const QModelIndex &parent, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsInserted(const QModelIndex &parent, int, int)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsAboutToBeRemoved(const QModelIndex &parent, int start, int end)) + Q_PRIVATE_SLOT(d_func(), void _q_slotColumnsRemoved(const QModelIndex &parent, int, int)) + Q_PRIVATE_SLOT(d_func(), void _q_slotDataChanged(const QModelIndex &from, const QModelIndex &to, const QVector<int> &roles)) + Q_PRIVATE_SLOT(d_func(), void _q_slotSourceLayoutAboutToBeChanged(QList<QPersistentModelIndex>, QAbstractItemModel::LayoutChangeHint)) + Q_PRIVATE_SLOT(d_func(), void _q_slotSourceLayoutChanged(const QList<QPersistentModelIndex> &, QAbstractItemModel::LayoutChangeHint)) + Q_PRIVATE_SLOT(d_func(), void _q_slotModelAboutToBeReset()) + Q_PRIVATE_SLOT(d_func(), void _q_slotModelReset()) +}; + +QT_END_NAMESPACE + +#endif // QCONCATENATEROWSPROXYMODEL_H diff --git a/src/corelib/itemmodels/qidentityproxymodel.cpp b/src/corelib/itemmodels/qidentityproxymodel.cpp index f869601d3f..39992eccd3 100644 --- a/src/corelib/itemmodels/qidentityproxymodel.cpp +++ b/src/corelib/itemmodels/qidentityproxymodel.cpp @@ -95,7 +95,7 @@ class QIdentityProxyModelPrivate : public QAbstractProxyModelPrivate need to implement all data handling in the same class that creates the structure of the model, and can also be used to create re-usable components. - This also provides a way to change the data in the case where a source model is supplied by a third party which can not be modified. + This also provides a way to change the data in the case where a source model is supplied by a third party which cannot be modified. \snippet code/src_gui_itemviews_qidentityproxymodel.cpp 0 @@ -480,13 +480,13 @@ void QIdentityProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &topLeft Q_ASSERT(topLeft.isValid() ? topLeft.model() == model : true); Q_ASSERT(bottomRight.isValid() ? bottomRight.model() == model : true); Q_Q(QIdentityProxyModel); - q->dataChanged(q->mapFromSource(topLeft), q->mapFromSource(bottomRight), roles); + emit q->dataChanged(q->mapFromSource(topLeft), q->mapFromSource(bottomRight), roles); } void QIdentityProxyModelPrivate::_q_sourceHeaderDataChanged(Qt::Orientation orientation, int first, int last) { Q_Q(QIdentityProxyModel); - q->headerDataChanged(orientation, first, last); + emit q->headerDataChanged(orientation, first, last); } void QIdentityProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &sourceParents, QAbstractItemModel::LayoutChangeHint hint) @@ -505,7 +505,7 @@ void QIdentityProxyModelPrivate::_q_sourceLayoutAboutToBeChanged(const QList<QPe parents << mappedParent; } - q->layoutAboutToBeChanged(parents, hint); + emit q->layoutAboutToBeChanged(parents, hint); const auto proxyPersistentIndexes = q->persistentIndexList(); for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) { @@ -540,7 +540,7 @@ void QIdentityProxyModelPrivate::_q_sourceLayoutChanged(const QList<QPersistentM parents << mappedParent; } - q->layoutChanged(parents, hint); + emit q->layoutChanged(parents, hint); } void QIdentityProxyModelPrivate::_q_sourceModelAboutToBeReset() diff --git a/src/corelib/itemmodels/qitemselectionmodel.cpp b/src/corelib/itemmodels/qitemselectionmodel.cpp index 1bacb63b17..c93a4d15b9 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.cpp +++ b/src/corelib/itemmodels/qitemselectionmodel.cpp @@ -1273,10 +1273,10 @@ struct IsNotValid { typedef bool result_type; struct is_transparent : std::true_type {}; template <typename T> - Q_DECL_CONSTEXPR bool operator()(T &t) const Q_DECL_NOEXCEPT_EXPR(noexcept(t.isValid())) + Q_DECL_CONSTEXPR bool operator()(T &t) const noexcept(noexcept(t.isValid())) { return !t.isValid(); } template <typename T> - Q_DECL_CONSTEXPR bool operator()(T *t) const Q_DECL_NOEXCEPT_EXPR(noexcept(t->isValid())) + Q_DECL_CONSTEXPR bool operator()(T *t) const noexcept(noexcept(t->isValid())) { return !t->isValid(); } }; } diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index 1c924053a5..3c3f9fb1ac 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -60,19 +60,17 @@ public: // ### Qt 6: remove them all, the compiler-generated ones are fine inline QItemSelectionRange(const QItemSelectionRange &other) : tl(other.tl), br(other.br) {} -# ifdef Q_COMPILER_RVALUE_REFS - QItemSelectionRange(QItemSelectionRange &&other) Q_DECL_NOTHROW + QItemSelectionRange(QItemSelectionRange &&other) noexcept : tl(std::move(other.tl)), br(std::move(other.br)) {} - QItemSelectionRange &operator=(QItemSelectionRange &&other) Q_DECL_NOTHROW + QItemSelectionRange &operator=(QItemSelectionRange &&other) noexcept { tl = std::move(other.tl); br = std::move(other.br); return *this; } -# endif QItemSelectionRange &operator=(const QItemSelectionRange &other) { tl = other.tl; br = other.br; return *this; } #endif // Qt < 6 QItemSelectionRange(const QModelIndex &topL, const QModelIndex &bottomR) : tl(topL), br(bottomR) {} explicit QItemSelectionRange(const QModelIndex &index) : tl(index), br(tl) {} - void swap(QItemSelectionRange &other) Q_DECL_NOTHROW + void swap(QItemSelectionRange &other) noexcept { qSwap(tl, other.tl); qSwap(br, other.br); @@ -249,7 +247,7 @@ Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QList<QItemSelectionRange>; class Q_CORE_EXPORT QItemSelection : public QList<QItemSelectionRange> { public: - QItemSelection() Q_DECL_NOTHROW : QList<QItemSelectionRange>() {} + QItemSelection() noexcept : QList<QItemSelectionRange>() {} QItemSelection(const QModelIndex &topLeft, const QModelIndex &bottomRight); // reusing QList::swap() here is OK! diff --git a/src/corelib/itemmodels/qitemselectionmodel_p.h b/src/corelib/itemmodels/qitemselectionmodel_p.h index e12a0c2928..ba85f22be3 100644 --- a/src/corelib/itemmodels/qitemselectionmodel_p.h +++ b/src/corelib/itemmodels/qitemselectionmodel_p.h @@ -62,7 +62,7 @@ class QItemSelectionModelPrivate: public QObjectPrivate Q_DECLARE_PUBLIC(QItemSelectionModel) public: QItemSelectionModelPrivate() - : model(0), + : model(nullptr), currentCommand(QItemSelectionModel::NoUpdate), tableSelected(false), tableColCount(0), tableRowCount(0) {} diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 87960b0863..d13e6199db 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -424,7 +424,7 @@ public: void updateChildrenMapping(const QModelIndex &source_parent, Mapping *parent_mapping, Qt::Orientation orient, int start, int end, int delta_item_count, bool remove); - virtual void _q_sourceModelDestroyed() override; + void _q_sourceModelDestroyed() override; bool needsReorder(const QVector<int> &source_rows, const QModelIndex &source_parent) const; diff --git a/src/corelib/itemmodels/qstringlistmodel.cpp b/src/corelib/itemmodels/qstringlistmodel.cpp index f92a0d6676..a248cdcd38 100644 --- a/src/corelib/itemmodels/qstringlistmodel.cpp +++ b/src/corelib/itemmodels/qstringlistmodel.cpp @@ -136,6 +136,42 @@ QModelIndex QStringListModel::sibling(int row, int column, const QModelIndex &id } /*! + \reimp + \since 5.13 +*/ +QMap<int, QVariant> QStringListModel::itemData(const QModelIndex &index) const +{ + if (!checkIndex(index, CheckIndexOption::IndexIsValid | CheckIndexOption::ParentIsInvalid)) + return QMap<int, QVariant>{}; + const QVariant displayData = lst.at(index.row()); + return QMap<int, QVariant>{{ + std::make_pair<int>(Qt::DisplayRole, displayData), + std::make_pair<int>(Qt::EditRole, displayData) + }}; +} + +/*! + \reimp + \since 5.13 + If \a roles contains both Qt::DisplayRole and Qt::EditRole, the latter will take precedence +*/ +bool QStringListModel::setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) +{ + if (roles.isEmpty()) + return false; + if (std::any_of(roles.keyBegin(), roles.keyEnd(), [](int role) -> bool { + return role != Qt::DisplayRole && role != Qt::EditRole; + })) { + return false; + } + auto roleIter = roles.constFind(Qt::EditRole); + if (roleIter == roles.constEnd()) + roleIter = roles.constFind(Qt::DisplayRole); + Q_ASSERT(roleIter != roles.constEnd()); + return setData(index, roleIter.value(), roleIter.key()); +} + +/*! Returns data for the specified \a role, from the item with the given \a index. @@ -188,18 +224,23 @@ bool QStringListModel::setData(const QModelIndex &index, const QVariant &value, if (lst.at(index.row()) == valueString) return true; lst.replace(index.row(), valueString); - QVector<int> roles; - roles.reserve(2); - roles.append(Qt::DisplayRole); - roles.append(Qt::EditRole); - emit dataChanged(index, index, roles); - // once Q_COMPILER_UNIFORM_INIT can be used, change to: - // emit dataChanged(index, index, {Qt::DisplayRole, Qt::EditRole}); + emit dataChanged(index, index, {Qt::DisplayRole, Qt::EditRole}); return true; } return false; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +/*! + \reimp + \since 6.0 + */ +bool QStringListModel::clearItemData(const QModelIndex &index) +{ + return setData(index, QVariant(), Qt::EditRole); +} +#endif + /*! Inserts \a count rows into the model, beginning at the given \a row. @@ -252,6 +293,38 @@ bool QStringListModel::removeRows(int row, int count, const QModelIndex &parent) return true; } +/*! + \since 5.13 + \reimp +*/ +bool QStringListModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) +{ + if (sourceRow < 0 + || sourceRow + count - 1 >= rowCount(sourceParent) + || destinationChild <= 0 + || destinationChild > rowCount(destinationParent) + || sourceRow == destinationChild - 1 + || count <= 0) { + return false; + } + if (!beginMoveRows(QModelIndex(), sourceRow, sourceRow + count - 1, QModelIndex(), destinationChild)) + return false; + /* + QList::move assumes that the second argument is the index where the item will end up to + i.e. the valid range for that argument is from 0 to QList::size()-1 + QAbstractItemModel::moveRows when source and destinations have the same parent assumes that + the item will end up being in the row BEFORE the one indicated by destinationChild + i.e. the valid range for that argument is from 1 to QList::size() + For this reason we remove 1 from destinationChild when using it inside QList + */ + destinationChild--; + const int fromRow = destinationChild < sourceRow ? (sourceRow + count - 1) : sourceRow; + while (count--) + lst.move(fromRow, destinationChild); + endMoveRows(); + return true; +} + static bool ascendingLessThan(const QPair<QString, int> &s1, const QPair<QString, int> &s2) { return s1.first < s2.first; diff --git a/src/corelib/itemmodels/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h index 53376285c6..86725ea80b 100644 --- a/src/corelib/itemmodels/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -59,11 +59,18 @@ public: QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool clearItemData(const QModelIndex &index) override; +#endif Qt::ItemFlags flags(const QModelIndex &index) const override; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override; + + QMap<int, QVariant> itemData(const QModelIndex &index) const override; + bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; diff --git a/src/corelib/itemmodels/qtransposeproxymodel.cpp b/src/corelib/itemmodels/qtransposeproxymodel.cpp new file mode 100644 index 0000000000..d4f379bc64 --- /dev/null +++ b/src/corelib/itemmodels/qtransposeproxymodel.cpp @@ -0,0 +1,447 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Luca Beldi <v.ronin@yahoo.it> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qtransposeproxymodel.h" +#include <private/qtransposeproxymodel_p.h> +#include <QtCore/qvector.h> +#include <QtCore/qmetaobject.h> +#include <QtCore/qsize.h> + +QT_BEGIN_NAMESPACE + +QModelIndex QTransposeProxyModelPrivate::uncheckedMapToSource(const QModelIndex &proxyIndex) const +{ + if (!model || !proxyIndex.isValid()) + return QModelIndex(); + if (proxyIndex.internalPointer()) + return model->createIndex(proxyIndex.column(), proxyIndex.row(), proxyIndex.internalPointer()); + return model->index(proxyIndex.column(), proxyIndex.row()); +} + +QModelIndex QTransposeProxyModelPrivate::uncheckedMapFromSource(const QModelIndex &sourceIndex) const +{ + if (!model || !sourceIndex.isValid()) + return QModelIndex(); + Q_Q(const QTransposeProxyModel); + return q->createIndex(sourceIndex.column(), sourceIndex.row(), sourceIndex.internalPointer()); +} + +void QTransposeProxyModelPrivate::onLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QTransposeProxyModel); + QModelIndexList toList; + toList.reserve(layoutChangePersistentIndexes.size()); + for (const QPersistentModelIndex &persistIdx : qAsConst(layoutChangePersistentIndexes)) + toList << q->mapFromSource(persistIdx); + q->changePersistentIndexList(layoutChangeProxyIndexes, toList); + layoutChangeProxyIndexes.clear(); + layoutChangePersistentIndexes.clear(); + QList<QPersistentModelIndex> proxyParents; + proxyParents.reserve(parents.size()); + for (const QPersistentModelIndex &srcParent : parents) + proxyParents << q->mapFromSource(srcParent); + QAbstractItemModel::LayoutChangeHint proxyHint = QAbstractItemModel::NoLayoutChangeHint; + if (hint == QAbstractItemModel::VerticalSortHint) + proxyHint = QAbstractItemModel::HorizontalSortHint; + else if (hint == QAbstractItemModel::HorizontalSortHint) + proxyHint = QAbstractItemModel::VerticalSortHint; + emit q->layoutChanged(proxyParents, proxyHint); +} + +void QTransposeProxyModelPrivate::onLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint) +{ + Q_Q(QTransposeProxyModel); + const QModelIndexList proxyPersistentIndexes = q->persistentIndexList(); + layoutChangeProxyIndexes.clear(); + layoutChangePersistentIndexes.clear(); + layoutChangeProxyIndexes.reserve(proxyPersistentIndexes.size()); + layoutChangePersistentIndexes.reserve(proxyPersistentIndexes.size()); + for (const QPersistentModelIndex &proxyPersistentIndex : proxyPersistentIndexes) { + layoutChangeProxyIndexes << proxyPersistentIndex; + Q_ASSERT(proxyPersistentIndex.isValid()); + const QPersistentModelIndex srcPersistentIndex = q->mapToSource(proxyPersistentIndex); + Q_ASSERT(srcPersistentIndex.isValid()); + layoutChangePersistentIndexes << srcPersistentIndex; + } + QList<QPersistentModelIndex> proxyParents; + proxyParents.reserve(parents.size()); + for (auto& srcParent : parents) + proxyParents << q->mapFromSource(srcParent); + QAbstractItemModel::LayoutChangeHint proxyHint = QAbstractItemModel::NoLayoutChangeHint; + if (hint == QAbstractItemModel::VerticalSortHint) + proxyHint = QAbstractItemModel::HorizontalSortHint; + else if (hint == QAbstractItemModel::HorizontalSortHint) + proxyHint = QAbstractItemModel::VerticalSortHint; + emit q->layoutAboutToBeChanged(proxyParents, proxyHint); +} + +void QTransposeProxyModelPrivate::onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles) +{ + Q_Q(QTransposeProxyModel); + emit q->dataChanged(q->mapFromSource(topLeft), q->mapFromSource(bottomRight), roles); +} + +void QTransposeProxyModelPrivate::onHeaderDataChanged(Qt::Orientation orientation, int first, int last) +{ + Q_Q(QTransposeProxyModel); + emit q->headerDataChanged(orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal, first, last); +} + +void QTransposeProxyModelPrivate::onColumnsAboutToBeInserted(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginInsertRows(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onColumnsAboutToBeRemoved(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginRemoveRows(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onColumnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn) +{ + Q_Q(QTransposeProxyModel); + q->beginMoveRows(q->mapFromSource(sourceParent), sourceStart, sourceEnd, q->mapFromSource(destinationParent), destinationColumn); +} + +void QTransposeProxyModelPrivate::onRowsAboutToBeInserted(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginInsertColumns(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last) +{ + Q_Q(QTransposeProxyModel); + q->beginRemoveColumns(q->mapFromSource(parent), first, last); +} + +void QTransposeProxyModelPrivate::onRowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow) +{ + Q_Q(QTransposeProxyModel); + q->beginMoveColumns(q->mapFromSource(sourceParent), sourceStart, sourceEnd, q->mapFromSource(destinationParent), destinationRow); +} + +/*! + \since 5.13 + \class QTransposeProxyModel + \brief This proxy transposes the source model. + + This model will make the rows of the source model become columns of the proxy model and vice-versa. + + If the model is a tree, the parents will be transposed as well. For example, if an index in the source model had parent `index(2,0)`, it will have parent `index(0,2)` in the proxy. +*/ + +/*! + Constructs a new proxy model with the given \a parent. +*/ +QTransposeProxyModel::QTransposeProxyModel(QObject* parent) + : QAbstractProxyModel(*new QTransposeProxyModelPrivate, parent) +{} + +/*! + Destructs the proxy model. +*/ +QTransposeProxyModel::~QTransposeProxyModel() = default; + +/*! + \internal +*/ +QTransposeProxyModel::QTransposeProxyModel(QTransposeProxyModelPrivate &dd, QObject *parent) + : QAbstractProxyModel(dd, parent) +{} + +/*! + \reimp +*/ +void QTransposeProxyModel::setSourceModel(QAbstractItemModel* newSourceModel) +{ + Q_D(QTransposeProxyModel); + if (newSourceModel == d->model) + return; + beginResetModel(); + if (d->model) { + for (const QMetaObject::Connection& discIter : qAsConst(d->sourceConnections)) + disconnect(discIter); + } + d->sourceConnections.clear(); + QAbstractProxyModel::setSourceModel(newSourceModel); + if (d->model) { + using namespace std::placeholders; + d->sourceConnections = QVector<QMetaObject::Connection>{ + connect(d->model, &QAbstractItemModel::modelAboutToBeReset, this, &QTransposeProxyModel::beginResetModel), + connect(d->model, &QAbstractItemModel::modelReset, this, &QTransposeProxyModel::endResetModel), + connect(d->model, &QAbstractItemModel::dataChanged, this, std::bind(&QTransposeProxyModelPrivate::onDataChanged, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::headerDataChanged, this, std::bind(&QTransposeProxyModelPrivate::onHeaderDataChanged, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::columnsAboutToBeInserted, this, std::bind(&QTransposeProxyModelPrivate::onColumnsAboutToBeInserted, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::columnsAboutToBeMoved, this, std::bind(&QTransposeProxyModelPrivate::onColumnsAboutToBeMoved, d, _1, _2, _3, _4, _5)), + connect(d->model, &QAbstractItemModel::columnsAboutToBeRemoved, this, std::bind(&QTransposeProxyModelPrivate::onColumnsAboutToBeRemoved, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::columnsInserted, this, &QTransposeProxyModel::endInsertRows), + connect(d->model, &QAbstractItemModel::columnsRemoved, this, &QTransposeProxyModel::endRemoveRows), + connect(d->model, &QAbstractItemModel::columnsMoved, this, &QTransposeProxyModel::endMoveRows), + connect(d->model, &QAbstractItemModel::rowsAboutToBeInserted, this, std::bind(&QTransposeProxyModelPrivate::onRowsAboutToBeInserted, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::rowsAboutToBeMoved, this, std::bind(&QTransposeProxyModelPrivate::onRowsAboutToBeMoved, d, _1, _2, _3, _4, _5)), + connect(d->model, &QAbstractItemModel::rowsAboutToBeRemoved, this, std::bind(&QTransposeProxyModelPrivate::onRowsAboutToBeRemoved, d, _1, _2, _3)), + connect(d->model, &QAbstractItemModel::rowsInserted, this, &QTransposeProxyModel::endInsertColumns), + connect(d->model, &QAbstractItemModel::rowsRemoved, this, &QTransposeProxyModel::endRemoveColumns), + connect(d->model, &QAbstractItemModel::rowsMoved, this, &QTransposeProxyModel::endMoveColumns), + connect(d->model, &QAbstractItemModel::layoutAboutToBeChanged, this, std::bind(&QTransposeProxyModelPrivate::onLayoutAboutToBeChanged, d, _1, _2)), + connect(d->model, &QAbstractItemModel::layoutChanged, this, std::bind(&QTransposeProxyModelPrivate::onLayoutChanged, d, _1, _2)) + }; + } + endResetModel(); +} + +/*! + \reimp +*/ +int QTransposeProxyModel::rowCount(const QModelIndex &parent) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return 0; + Q_ASSERT(checkIndex(parent)); + return d->model->columnCount(mapToSource(parent)); +} + +/*! + \reimp +*/ +int QTransposeProxyModel::columnCount(const QModelIndex &parent) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return 0; + Q_ASSERT(checkIndex(parent)); + return d->model->rowCount(mapToSource(parent)); +} + +/*! + \reimp +*/ +QVariant QTransposeProxyModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return QVariant(); + return d->model->headerData(section, orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal, role); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role) +{ + Q_D(QTransposeProxyModel); + if (!d->model) + return false; + return d->model->setHeaderData(section, orientation == Qt::Horizontal ? Qt::Vertical : Qt::Horizontal, value, role); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(index)); + if (!d->model || !index.isValid()) + return false; + return d->model->setItemData(mapToSource(index), roles); +} + +/*! + \reimp +*/ +QSize QTransposeProxyModel::span(const QModelIndex &index) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(index)); + if (!d->model || !index.isValid()) + return QSize(); + return d->model->span(mapToSource(index)).transposed(); +} + +/*! + \reimp +*/ +QMap<int, QVariant> QTransposeProxyModel::itemData(const QModelIndex &index) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model) + return QMap<int, QVariant>(); + Q_ASSERT(checkIndex(index)); + return d->model->itemData(mapToSource(index)); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::mapFromSource(const QModelIndex &sourceIndex) const +{ + Q_D(const QTransposeProxyModel); + if (!d->model || !sourceIndex.isValid()) + return QModelIndex(); + Q_ASSERT(d->model->checkIndex(sourceIndex)); + return d->uncheckedMapFromSource(sourceIndex); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::mapToSource(const QModelIndex &proxyIndex) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(proxyIndex)); + if (!d->model || !proxyIndex.isValid()) + return QModelIndex(); + return d->uncheckedMapToSource(proxyIndex); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::parent(const QModelIndex &index) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(index, CheckIndexOption::DoNotUseParent)); + if (!d->model || !index.isValid()) + return QModelIndex(); + return d->uncheckedMapFromSource(d->uncheckedMapToSource(index).parent()); +} + +/*! + \reimp +*/ +QModelIndex QTransposeProxyModel::index(int row, int column, const QModelIndex &parent) const +{ + Q_D(const QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return QModelIndex(); + return mapFromSource(d->model->index(column, row, mapToSource(parent))); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::insertRows(int row, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->insertColumns(row, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::removeRows(int row, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->removeColumns(row, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(sourceParent)); + Q_ASSERT(checkIndex(destinationParent)); + if (!d->model) + return false; + return d->model->moveColumns(mapToSource(sourceParent), sourceRow, count, mapToSource(destinationParent), destinationChild); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::insertColumns(int column, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->insertRows(column, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::removeColumns(int column, int count, const QModelIndex &parent) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(parent)); + if (!d->model) + return false; + return d->model->removeRows(column, count, mapToSource(parent)); +} + +/*! + \reimp +*/ +bool QTransposeProxyModel::moveColumns(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) +{ + Q_D(QTransposeProxyModel); + Q_ASSERT(checkIndex(sourceParent)); + Q_ASSERT(checkIndex(destinationParent)); + if (!d->model) + return false; + return d->model->moveRows(mapToSource(sourceParent), sourceRow, count, mapToSource(destinationParent), destinationChild); +} + +/*! + \reimp + This method will perform no action. Use a QSortFilterProxyModel on top of this one if you require sorting. +*/ +void QTransposeProxyModel::sort(int column, Qt::SortOrder order) +{ + Q_UNUSED(column) + Q_UNUSED(order) + return; +} + +QT_END_NAMESPACE diff --git a/src/corelib/itemmodels/qtransposeproxymodel.h b/src/corelib/itemmodels/qtransposeproxymodel.h new file mode 100644 index 0000000000..854a547fd4 --- /dev/null +++ b/src/corelib/itemmodels/qtransposeproxymodel.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Luca Beldi <v.ronin@yahoo.it> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTRANSPOSEPROXYMODEL_H +#define QTRANSPOSEPROXYMODEL_H + +#include <QtCore/qabstractproxymodel.h> +#include <QtCore/qscopedpointer.h> + +QT_REQUIRE_CONFIG(transposeproxymodel); + +QT_BEGIN_NAMESPACE + +class QTransposeProxyModelPrivate; + +class Q_CORE_EXPORT QTransposeProxyModel : public QAbstractProxyModel +{ + Q_OBJECT + Q_DISABLE_COPY(QTransposeProxyModel) + Q_DECLARE_PRIVATE(QTransposeProxyModel) +public: + explicit QTransposeProxyModel(QObject* parent = nullptr); + ~QTransposeProxyModel(); + void setSourceModel(QAbstractItemModel* newSourceModel) override; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) override; + bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override; + QSize span(const QModelIndex &index) const override; + QMap<int, QVariant> itemData(const QModelIndex &index) const override; + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const override; + QModelIndex parent(const QModelIndex &index) const override; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool moveRows(const QModelIndex &sourceParent, int sourceRow, int count, const QModelIndex &destinationParent, int destinationChild) override; + bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; + bool moveColumns(const QModelIndex &sourceParent, int sourceColumn, int count, const QModelIndex &destinationParent, int destinationChild) override; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; +protected: + QTransposeProxyModel(QTransposeProxyModelPrivate &, QObject *parent); +}; + +QT_END_NAMESPACE + +#endif // QTRANSPOSEPROXYMODEL_H diff --git a/src/corelib/itemmodels/qtransposeproxymodel_p.h b/src/corelib/itemmodels/qtransposeproxymodel_p.h new file mode 100644 index 0000000000..fb5ce5c117 --- /dev/null +++ b/src/corelib/itemmodels/qtransposeproxymodel_p.h @@ -0,0 +1,84 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Luca Beldi <v.ronin@yahoo.it> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QTRANSPOSEPROXYMODEL_P_H +#define QTRANSPOSEPROXYMODEL_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "qtransposeproxymodel.h" +#include <private/qabstractproxymodel_p.h> + +QT_BEGIN_NAMESPACE + +class QTransposeProxyModelPrivate : public QAbstractProxyModelPrivate +{ + Q_DECLARE_PUBLIC(QTransposeProxyModel) + Q_DISABLE_COPY(QTransposeProxyModelPrivate) +private: + QTransposeProxyModelPrivate() = default; + QVector<QMetaObject::Connection> sourceConnections; + QVector<QPersistentModelIndex> layoutChangePersistentIndexes; + QModelIndexList layoutChangeProxyIndexes; + QModelIndex uncheckedMapToSource(const QModelIndex &proxyIndex) const; + QModelIndex uncheckedMapFromSource(const QModelIndex &sourceIndex) const; + void onLayoutChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint); + void onLayoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents, QAbstractItemModel::LayoutChangeHint hint); + void onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight, const QVector<int>& roles); + void onHeaderDataChanged(Qt::Orientation orientation, int first, int last); + void onColumnsAboutToBeInserted(const QModelIndex &parent, int first, int last); + void onColumnsAboutToBeRemoved(const QModelIndex &parent, int first, int last); + void onColumnsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn); + void onRowsAboutToBeInserted(const QModelIndex &parent, int first, int last); + void onRowsAboutToBeRemoved(const QModelIndex &parent, int first, int last); + void onRowsAboutToBeMoved(const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow); +}; + +QT_END_NAMESPACE + +#endif //QTRANSPOSEPROXYMODEL_P_H diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index 3f7bf3cd47..789bcb7927 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -7,7 +7,7 @@ HEADERS += \ kernel/qdeadlinetimer.h \ kernel/qdeadlinetimer_p.h \ kernel/qelapsedtimer.h \ - kernel/qeventloop.h\ + kernel/qeventloop.h \ kernel/qpointer.h \ kernel/qcorecmdlineargs_p.h \ kernel/qcoreapplication.h \ diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index ea08ff571f..7215b3f2bd 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -170,7 +170,7 @@ QAbstractEventDispatcher::~QAbstractEventDispatcher() QAbstractEventDispatcher *QAbstractEventDispatcher::instance(QThread *thread) { QThreadData *data = thread ? QThreadData::get2(thread) : QThreadData::current(); - return data->eventDispatcher.load(); + return data->eventDispatcher.loadRelaxed(); } /*! @@ -470,7 +470,11 @@ void QAbstractEventDispatcher::removeNativeEventFilter(QAbstractNativeEventFilte \sa installNativeEventFilter(), QAbstractNativeEventFilter::nativeEventFilter() \since 5.0 */ +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, void *message, qintptr *result) +#else bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, void *message, long *result) +#endif { Q_D(QAbstractEventDispatcher); if (!d->eventFilters.isEmpty()) { diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index bd8da5c35d..4ef9c068df 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -110,7 +110,11 @@ public: void installNativeEventFilter(QAbstractNativeEventFilter *filterObj); void removeNativeEventFilter(QAbstractNativeEventFilter *filterObj); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + bool filterNativeEvent(const QByteArray &eventType, void *message, qintptr *result); +#else bool filterNativeEvent(const QByteArray &eventType, void *message, long *result); +#endif #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED bool filterEvent(void *message) { return filterNativeEvent("", message, nullptr); } diff --git a/src/corelib/kernel/qabstractnativeeventfilter.cpp b/src/corelib/kernel/qabstractnativeeventfilter.cpp index dcbb92f044..eaadea4c12 100644 --- a/src/corelib/kernel/qabstractnativeeventfilter.cpp +++ b/src/corelib/kernel/qabstractnativeeventfilter.cpp @@ -74,6 +74,7 @@ QAbstractNativeEventFilter::~QAbstractNativeEventFilter() eventDispatcher->removeNativeEventFilter(this); } +// ### fixme Qt 6: result will be qintptr * /*! \fn bool QAbstractNativeEventFilter::nativeEventFilter(const QByteArray &eventType, void *message, long *result) diff --git a/src/corelib/kernel/qabstractnativeeventfilter.h b/src/corelib/kernel/qabstractnativeeventfilter.h index d7baa42513..a468bffd61 100644 --- a/src/corelib/kernel/qabstractnativeeventfilter.h +++ b/src/corelib/kernel/qabstractnativeeventfilter.h @@ -52,7 +52,11 @@ public: QAbstractNativeEventFilter(); virtual ~QAbstractNativeEventFilter(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + virtual bool nativeEventFilter(const QByteArray &eventType, void *message, qintptr *result) = 0; +#else virtual bool nativeEventFilter(const QByteArray &eventType, void *message, long *result) = 0; +#endif private: Q_DISABLE_COPY(QAbstractNativeEventFilter) diff --git a/src/corelib/kernel/qbasictimer.cpp b/src/corelib/kernel/qbasictimer.cpp index 637c98cd40..ea8f8e2c77 100644 --- a/src/corelib/kernel/qbasictimer.cpp +++ b/src/corelib/kernel/qbasictimer.cpp @@ -65,6 +65,10 @@ QT_BEGIN_NAMESPACE has not been stopped. The timer's ID can be retrieved using timerId(). + Objects of this class cannot be copied, but can be moved, so you + can maintain a list of basic timers by holding them in container + that supports move-only types, e.g. std::vector. + The \l{widgets/wiggly}{Wiggly} example uses QBasicTimer to repaint a widget at regular intervals. @@ -79,6 +83,51 @@ QT_BEGIN_NAMESPACE \sa start() */ + +/*! + \fn QBasicTimer::QBasicTimer(QBasicTimer &&other) + \since 5.14 + + Move-constructs a basic timer from \a other, which is left + \l{isActive()}{inactive}. + + \sa isActive(), swap() +*/ + +/*! + \fn QBasicTimer &QBasicTimer::operator=(QBasicTimer &&other) + \since 5.14 + + Move-assigns \a other to this basic timer. The timer + previously represented by this basic timer is stopped. + \a other is left as \l{isActive()}{inactive}. + + \sa stop(), isActive(), swap() +*/ + +#if QT_DEPRECATED_SINCE(5, 14) +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \internal +*/ +QBasicTimer::QBasicTimer(const QBasicTimer &other) + : id{other.id} +{ + qWarning("QBasicTimer can't be copied"); +} + +/*! + \internal +*/ +QBasicTimer &QBasicTimer::operator=(const QBasicTimer &other) +{ + id = other.id; + qWarning("QBasicTimer can't be assigned to"); + return *this; +} +#endif +#endif + /*! \fn QBasicTimer::~QBasicTimer() @@ -95,6 +144,15 @@ QT_BEGIN_NAMESPACE */ /*! + \fn QBasicTimer::swap(QBasicTimer &other) + \fn swap(QBasicTimer &lhs, QBasicTimer &rhs) + \since 5.14 + + Swaps string \a other with this string, or \a lhs with \a rhs. + This operation is very fast and never fails. +*/ + +/*! \fn int QBasicTimer::timerId() const Returns the timer's ID. @@ -115,24 +173,7 @@ QT_BEGIN_NAMESPACE */ void QBasicTimer::start(int msec, QObject *obj) { - QAbstractEventDispatcher *eventDispatcher = QAbstractEventDispatcher::instance(); - if (Q_UNLIKELY(!eventDispatcher)) { - qWarning("QBasicTimer::start: QBasicTimer can only be used with threads started with QThread"); - return; - } - if (Q_UNLIKELY(obj && obj->thread() != eventDispatcher->thread())) { - qWarning("QBasicTimer::start: Timers cannot be started from another thread"); - return; - } - if (id) { - if (Q_LIKELY(eventDispatcher->unregisterTimer(id))) - QAbstractEventDispatcherPrivate::releaseTimerId(id); - else - qWarning("QBasicTimer::start: Stopping previous timer failed. Possibly trying to stop from a different thread"); - } - id = 0; - if (obj) - id = eventDispatcher->registerTimer(msec, Qt::CoarseTimer, obj); + start(msec, Qt::CoarseTimer, obj); } /*! @@ -161,13 +202,7 @@ void QBasicTimer::start(int msec, Qt::TimerType timerType, QObject *obj) qWarning("QBasicTimer::start: Timers cannot be started from another thread"); return; } - if (id) { - if (Q_LIKELY(eventDispatcher->unregisterTimer(id))) - QAbstractEventDispatcherPrivate::releaseTimerId(id); - else - qWarning("QBasicTimer::start: Stopping previous timer failed. Possibly trying to stop from a different thread"); - } - id = 0; + stop(); if (obj) id = eventDispatcher->registerTimer(msec, timerType, obj); } diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h index bfd6ffd125..769898f835 100644 --- a/src/corelib/kernel/qbasictimer.h +++ b/src/corelib/kernel/qbasictimer.h @@ -51,12 +51,35 @@ class QObject; class Q_CORE_EXPORT QBasicTimer { int id; +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + Q_DISABLE_COPY(QBasicTimer) +#elif QT_DEPRECATED_SINCE(5, 14) public: - inline QBasicTimer() : id(0) {} + // Just here to preserve BC, we can't remove them yet + QT_DEPRECATED_X("copy-construction is unsupported; use move-construction instead") + QBasicTimer(const QBasicTimer &); + QT_DEPRECATED_X("copy-assignment is unsupported; use move-assignment instead") + QBasicTimer &operator=(const QBasicTimer &); +#endif + +public: + constexpr QBasicTimer() noexcept : id{0} {} inline ~QBasicTimer() { if (id) stop(); } - inline bool isActive() const { return id != 0; } - inline int timerId() const { return id; } + QBasicTimer(QBasicTimer &&other) noexcept + : id{qExchange(other.id, 0)} + {} + + QBasicTimer& operator=(QBasicTimer &&other) noexcept + { + QBasicTimer{std::move(other)}.swap(*this); + return *this; + } + + void swap(QBasicTimer &other) noexcept { qSwap(id, other.id); } + + bool isActive() const noexcept { return id != 0; } + int timerId() const noexcept { return id; } void start(int msec, QObject *obj); void start(int msec, Qt::TimerType timerType, QObject *obj); @@ -64,6 +87,8 @@ public: }; Q_DECLARE_TYPEINFO(QBasicTimer, Q_MOVABLE_TYPE); +inline void swap(QBasicTimer &lhs, QBasicTimer &rhs) noexcept { lhs.swap(rhs); } + QT_END_NAMESPACE #endif // QBASICTIMER_H diff --git a/src/corelib/kernel/qcore_foundation.mm b/src/corelib/kernel/qcore_foundation.mm index 56eabc4b8c..623d462749 100644 --- a/src/corelib/kernel/qcore_foundation.mm +++ b/src/corelib/kernel/qcore_foundation.mm @@ -501,7 +501,7 @@ NSTimeZone *QTimeZone::toNSTimeZone() const \sa QRectF::fromCGRect() */ -CGRect QRect::toCGRect() const Q_DECL_NOTHROW +CGRect QRect::toCGRect() const noexcept { return CGRectMake(x(), y(), width(), height()); } @@ -513,7 +513,7 @@ CGRect QRect::toCGRect() const Q_DECL_NOTHROW \sa fromCGRect() */ -CGRect QRectF::toCGRect() const Q_DECL_NOTHROW +CGRect QRectF::toCGRect() const noexcept { return CGRectMake(x(), y(), width(), height()); } @@ -525,7 +525,7 @@ CGRect QRectF::toCGRect() const Q_DECL_NOTHROW \sa toCGRect() */ -QRectF QRectF::fromCGRect(CGRect rect) Q_DECL_NOTHROW +QRectF QRectF::fromCGRect(CGRect rect) noexcept { return QRectF(rect.origin.x, rect.origin.y, rect.size.width, rect.size.height); } @@ -539,7 +539,7 @@ QRectF QRectF::fromCGRect(CGRect rect) Q_DECL_NOTHROW \sa QPointF::fromCGPoint() */ -CGPoint QPoint::toCGPoint() const Q_DECL_NOTHROW +CGPoint QPoint::toCGPoint() const noexcept { return CGPointMake(x(), y()); } @@ -551,7 +551,7 @@ CGPoint QPoint::toCGPoint() const Q_DECL_NOTHROW \sa fromCGPoint() */ -CGPoint QPointF::toCGPoint() const Q_DECL_NOTHROW +CGPoint QPointF::toCGPoint() const noexcept { return CGPointMake(x(), y()); } @@ -563,7 +563,7 @@ CGPoint QPointF::toCGPoint() const Q_DECL_NOTHROW \sa toCGPoint() */ -QPointF QPointF::fromCGPoint(CGPoint point) Q_DECL_NOTHROW +QPointF QPointF::fromCGPoint(CGPoint point) noexcept { return QPointF(point.x, point.y); } @@ -577,7 +577,7 @@ QPointF QPointF::fromCGPoint(CGPoint point) Q_DECL_NOTHROW \sa QSizeF::fromCGSize() */ -CGSize QSize::toCGSize() const Q_DECL_NOTHROW +CGSize QSize::toCGSize() const noexcept { return CGSizeMake(width(), height()); } @@ -589,7 +589,7 @@ CGSize QSize::toCGSize() const Q_DECL_NOTHROW \sa fromCGSize() */ -CGSize QSizeF::toCGSize() const Q_DECL_NOTHROW +CGSize QSizeF::toCGSize() const noexcept { return CGSizeMake(width(), height()); } @@ -601,7 +601,7 @@ CGSize QSizeF::toCGSize() const Q_DECL_NOTHROW \sa toCGSize() */ -QSizeF QSizeF::fromCGSize(CGSize size) Q_DECL_NOTHROW +QSizeF QSizeF::fromCGSize(CGSize size) noexcept { return QSizeF(size.width, size.height); } diff --git a/src/corelib/kernel/qcore_mac_objc.mm b/src/corelib/kernel/qcore_mac_objc.mm index 9139b372a8..15b69acbd4 100644 --- a/src/corelib/kernel/qcore_mac_objc.mm +++ b/src/corelib/kernel/qcore_mac_objc.mm @@ -371,7 +371,7 @@ bool operator<(const KeyPair &entry, const Qt::Key &key) struct qtKey2CocoaKeySortLessThan { typedef bool result_type; - Q_DECL_CONSTEXPR result_type operator()(const KeyPair &entry1, const KeyPair &entry2) const Q_DECL_NOTHROW + Q_DECL_CONSTEXPR result_type operator()(const KeyPair &entry1, const KeyPair &entry2) const noexcept { return entry1.qtKey < entry2.qtKey; } @@ -501,7 +501,7 @@ void qt_apple_check_os_version() if (!applicationName) applicationName = NSProcessInfo.processInfo.processName; - fprintf(stderr, "Sorry, \"%s\" can not be run on this version of %s. " + fprintf(stderr, "Sorry, \"%s\" cannot be run on this version of %s. " "Qt requires %s %ld.%ld.%ld or later, you have %s %ld.%ld.%ld.\n", applicationName.UTF8String, os, os, long(required.majorVersion), long(required.minorVersion), long(required.patchVersion), diff --git a/src/corelib/kernel/qcore_mac_p.h b/src/corelib/kernel/qcore_mac_p.h index 8f4c96bbd6..0e1a5fe345 100644 --- a/src/corelib/kernel/qcore_mac_p.h +++ b/src/corelib/kernel/qcore_mac_p.h @@ -91,7 +91,7 @@ public: QAppleRefCounted(const QAppleRefCounted &other) : value(other.value) { if (value) RetainFunction(value); } ~QAppleRefCounted() { if (value) ReleaseFunction(value); } operator T() const { return value; } - void swap(QAppleRefCounted &other) Q_DECL_NOEXCEPT_EXPR(noexcept(qSwap(value, other.value))) + void swap(QAppleRefCounted &other) noexcept(noexcept(qSwap(value, other.value))) { qSwap(value, other.value); } QAppleRefCounted &operator=(const QAppleRefCounted &other) { QAppleRefCounted copy(other); swap(copy); return *this; } diff --git a/src/corelib/kernel/qcore_unix_p.h b/src/corelib/kernel/qcore_unix_p.h index 5a2a29a327..b56c2b9732 100644 --- a/src/corelib/kernel/qcore_unix_p.h +++ b/src/corelib/kernel/qcore_unix_p.h @@ -164,15 +164,15 @@ inline void qt_ignore_sigpipe() { // Set to ignore SIGPIPE once only. static QBasicAtomicInt atom = Q_BASIC_ATOMIC_INITIALIZER(0); - if (!atom.load()) { + if (!atom.loadRelaxed()) { // More than one thread could turn off SIGPIPE at the same time // But that's acceptable because they all would be doing the same // action struct sigaction noaction; memset(&noaction, 0, sizeof(noaction)); noaction.sa_handler = SIG_IGN; - ::sigaction(SIGPIPE, &noaction, 0); - atom.store(1); + ::sigaction(SIGPIPE, &noaction, nullptr); + atom.storeRelaxed(1); } } @@ -347,7 +347,7 @@ static inline pid_t qt_safe_waitpid(pid_t pid, int *status, int options) #endif // in qelapsedtimer_mac.cpp or qtimestamp_unix.cpp -timespec qt_gettime() Q_DECL_NOTHROW; +timespec qt_gettime() noexcept; void qt_nanosleep(timespec amount); QByteArray qt_readlink(const char *path); diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index db6546028a..5d300a0488 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -120,6 +120,7 @@ #ifdef Q_OS_WASM #include <emscripten.h> +#include <emscripten/val.h> #endif #ifdef QT_BOOTSTRAPPED @@ -216,16 +217,23 @@ QString QCoreApplicationPrivate::appVersion() const } #endif -QString *QCoreApplicationPrivate::cachedApplicationFilePath = 0; +QString *QCoreApplicationPrivate::cachedApplicationFilePath = nullptr; bool QCoreApplicationPrivate::checkInstance(const char *function) { - bool b = (QCoreApplication::self != 0); + bool b = (QCoreApplication::self != nullptr); if (!b) qWarning("QApplication::%s: Please instantiate the QApplication object first", function); return b; } +void QCoreApplicationPrivate::addQtOptions(QList<QCommandLineOption> *options) +{ + options->append(QCommandLineOption(QStringLiteral("qmljsdebugger"), + QStringLiteral("Activates the QML/JS debugger with a specified port. The value must be of format port:1234[,block]. \"block\" makes the application wait for a connection."), + QStringLiteral("value"))); +} + void QCoreApplicationPrivate::processCommandLineArguments() { int j = argc ? 1 : 0; @@ -250,22 +258,13 @@ void QCoreApplicationPrivate::processCommandLineArguments() } if (j < argc) { - argv[j] = 0; + argv[j] = nullptr; argc = j; } } // Support for introspection -#ifndef QT_NO_QOBJECT -QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set = { 0, 0, 0, 0 }; - -void qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set) -{ - qt_signal_spy_callback_set = callback_set; -} -#endif - extern "C" void Q_CORE_EXPORT qt_startup_hook() { } @@ -369,17 +368,17 @@ Q_CORE_EXPORT uint qGlobalPostedEventsCount() return currentThreadData->postEventList.size() - currentThreadData->postEventList.startOffset; } -QAbstractEventDispatcher *QCoreApplicationPrivate::eventDispatcher = 0; +QAbstractEventDispatcher *QCoreApplicationPrivate::eventDispatcher = nullptr; #endif // QT_NO_QOBJECT -QCoreApplication *QCoreApplication::self = 0; +QCoreApplication *QCoreApplication::self = nullptr; uint QCoreApplicationPrivate::attribs = (1 << Qt::AA_SynthesizeMouseForUnhandledTouchEvents) | (1 << Qt::AA_SynthesizeMouseForUnhandledTabletEvents); struct QCoreApplicationData { - QCoreApplicationData() Q_DECL_NOTHROW { + QCoreApplicationData() noexcept { applicationNameSet = false; applicationVersionSet = false; } @@ -457,12 +456,12 @@ QCoreApplicationPrivate::QCoreApplicationPrivate(int &aargc, char **aargv, uint , aboutToQuitEmitted(false) , threadData_clean(false) #else - , q_ptr(0) + , q_ptr(nullptr) #endif { app_compile_version = flags & 0xffffff; static const char *const empty = ""; - if (argc == 0 || argv == 0) { + if (argc == 0 || argv == nullptr) { argc = 0; argv = const_cast<char **>(&empty); } @@ -553,8 +552,8 @@ void QCoreApplicationPrivate::eventDispatcherReady() QBasicAtomicPointer<QThread> QCoreApplicationPrivate::theMainThread = Q_BASIC_ATOMIC_INITIALIZER(0); QThread *QCoreApplicationPrivate::mainThread() { - Q_ASSERT(theMainThread.load() != 0); - return theMainThread.load(); + Q_ASSERT(theMainThread.loadRelaxed() != 0); + return theMainThread.loadRelaxed(); } bool QCoreApplicationPrivate::threadRequiresCoreApplication() @@ -700,7 +699,7 @@ void QCoreApplicationPrivate::initLocale() Returns a pointer to the application's QCoreApplication (or QGuiApplication/QApplication) instance. - If no instance has been allocated, \c null is returned. + If no instance has been allocated, \nullptr is returned. */ /*! @@ -801,6 +800,10 @@ void QCoreApplicationPrivate::init() Module.print(err); }); ); + +#if QT_CONFIG(thread) + QThreadPrivate::idealThreadCount = emscripten::val::global("navigator")["hardwareConcurrency"].as<int>(); +#endif #endif // Store app name/version (so they're still available after QCoreApplication is destroyed) @@ -851,7 +854,7 @@ void QCoreApplicationPrivate::init() #ifndef QT_NO_QOBJECT // use the event dispatcher created by the app programmer (if any) Q_ASSERT(!eventDispatcher); - eventDispatcher = threadData->eventDispatcher.load(); + eventDispatcher = threadData->eventDispatcher.loadRelaxed(); // otherwise we create one if (!eventDispatcher) @@ -867,11 +870,6 @@ void QCoreApplicationPrivate::init() eventDispatcherReady(); #endif -#ifdef QT_EVAL - extern void qt_core_eval_init(QCoreApplicationPrivate::Type); - qt_core_eval_init(application_type); -#endif - processCommandLineArguments(); qt_call_pre_routines(); @@ -893,7 +891,7 @@ QCoreApplication::~QCoreApplication() { qt_call_post_routines(); - self = 0; + self = nullptr; #ifndef QT_NO_QOBJECT QCoreApplicationPrivate::is_app_closing = true; QCoreApplicationPrivate::is_app_running = false; @@ -901,7 +899,7 @@ QCoreApplication::~QCoreApplication() #if QT_CONFIG(thread) // Synchronize and stop the global thread pool threads. - QThreadPool *globalThreadPool = 0; + QThreadPool *globalThreadPool = nullptr; QT_TRY { globalThreadPool = QThreadPool::globalInstance(); } QT_CATCH (...) { @@ -912,10 +910,10 @@ QCoreApplication::~QCoreApplication() #endif #ifndef QT_NO_QOBJECT - d_func()->threadData->eventDispatcher = 0; + d_func()->threadData->eventDispatcher = nullptr; if (QCoreApplicationPrivate::eventDispatcher) QCoreApplicationPrivate::eventDispatcher->closingDown(); - QCoreApplicationPrivate::eventDispatcher = 0; + QCoreApplicationPrivate::eventDispatcher = nullptr; #endif #if QT_CONFIG(library) @@ -1043,6 +1041,7 @@ void QCoreApplication::setQuitLockEnabled(bool enabled) quitLockRefEnabled = enabled; } +#if QT_DEPRECATED_SINCE(5, 6) /*! \internal \deprecated @@ -1054,6 +1053,7 @@ bool QCoreApplication::notifyInternal(QObject *receiver, QEvent *event) { return notifyInternal2(receiver, event); } +#endif /*! \internal @@ -1291,7 +1291,11 @@ bool QCoreApplication::closingDown() \l{QCoreApplication::sendPostedEvents()}{sendPostedEvents()} from within that local loop. - Calling this function processes events only for the calling thread. + Calling this function processes events only for the calling thread, + and returns after all available events have been processed. Available + events are events queued before the function call. This means that + events that are posted while the function runs will be queued until + a later round of event processing. \threadsafe @@ -1302,13 +1306,13 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags) QThreadData *data = QThreadData::current(); if (!data->hasEventDispatcher()) return; - data->eventDispatcher.load()->processEvents(flags); + data->eventDispatcher.loadRelaxed()->processEvents(flags); } /*! \overload processEvents() - Processes pending events for the calling thread for \a maxtime + Processes pending events for the calling thread for \a ms milliseconds or until there are no more events to process, whichever is shorter. @@ -1317,11 +1321,14 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags) Calling this function processes events only for the calling thread. + \note Unlike the \l{QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags)}{processEvents()} + overload, this function also processes events that are posted while the function runs. + \threadsafe \sa exec(), QTimer, QEventLoop::processEvents() */ -void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int maxtime) +void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int ms) { // ### Qt 6: consider splitting this method into a public and a private // one, so that a user-invoked processEvents can be detected @@ -1331,8 +1338,8 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int m return; QElapsedTimer start; start.start(); - while (data->eventDispatcher.load()->processEvents(flags & ~QEventLoop::WaitForMoreEvents)) { - if (start.elapsed() > maxtime) + while (data->eventDispatcher.loadRelaxed()->processEvents(flags & ~QEventLoop::WaitForMoreEvents)) { + if (start.elapsed() > ms) break; } } @@ -1655,14 +1662,15 @@ bool QCoreApplication::compressEvent(QEvent *event, QObject *receiver, QPostEven /*! Immediately dispatches all events which have been previously queued - with QCoreApplication::postEvent() and which are for the object \a receiver - and have the event type \a event_type. + with QCoreApplication::postEvent() and which are for the object \a + receiver and have the event type \a event_type. Events from the window system are \e not dispatched by this function, but by processEvents(). - If \a receiver is null, the events of \a event_type are sent for all - objects. If \a event_type is 0, all the events are sent for \a receiver. + If \a receiver is \nullptr, the events of \a event_type are sent for + all objects. If \a event_type is 0, all the events are sent for + \a receiver. \note This method must be called from the thread in which its QObject parameter, \a receiver, lives. @@ -1734,7 +1742,7 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type --data->postEventList.recursion; if (!data->postEventList.recursion && !data->canWait && data->hasEventDispatcher()) - data->eventDispatcher.load()->wakeUp(); + data->eventDispatcher.loadRelaxed()->wakeUp(); // clear the global list, i.e. remove everything that was // delivered. @@ -1843,10 +1851,10 @@ void QCoreApplicationPrivate::sendPostedEvents(QObject *receiver, int event_type call it, be aware that killing events may cause \a receiver to break one or more invariants. - If \a receiver is null, the events of \a eventType are removed for - all objects. If \a eventType is 0, all the events are removed for - \a receiver. You should never call this function with \a eventType - of 0. + If \a receiver is \nullptr, the events of \a eventType are removed + for all objects. If \a eventType is 0, all the events are removed + for \a receiver. You should never call this function with \a + eventType of 0. \threadsafe */ @@ -1985,7 +1993,7 @@ void QCoreApplicationPrivate::deref() void QCoreApplicationPrivate::maybeQuit() { - if (quitLockRef.load() == 0 && in_exec && quitLockRefEnabled && shouldQuit()) + if (quitLockRef.loadRelaxed() == 0 && in_exec && quitLockRefEnabled && shouldQuit()) QCoreApplication::postEvent(QCoreApplication::instance(), new QEvent(QEvent::Quit)); } @@ -2159,7 +2167,7 @@ static void replacePercentN(QString *result, int n) \a disambiguation is an identifying string, for when the same \a sourceText is used in different roles within the same context. By - default, it is null. + default, it is \nullptr. See the \l QTranslator and \l QObject::tr() documentation for more information about contexts, disambiguations and comments. @@ -2954,7 +2962,7 @@ bool QCoreApplication::hasPendingEvents() QAbstractEventDispatcher *QCoreApplication::eventDispatcher() { if (QCoreApplicationPrivate::theMainThread) - return QCoreApplicationPrivate::theMainThread.load()->eventDispatcher(); + return QCoreApplicationPrivate::theMainThread.loadRelaxed()->eventDispatcher(); return 0; } diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 3581970765..b7df004736 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -227,6 +227,7 @@ private: #endif friend Q_CORE_EXPORT QString qAppName(); friend class QClassFactory; + friend class QCommandLineParserPrivate; }; #ifdef QT_NO_DEPRECATED diff --git a/src/corelib/kernel/qcoreapplication_p.h b/src/corelib/kernel/qcoreapplication_p.h index b3479414ab..0b9029b5fe 100644 --- a/src/corelib/kernel/qcoreapplication_p.h +++ b/src/corelib/kernel/qcoreapplication_p.h @@ -52,6 +52,7 @@ // #include "QtCore/qcoreapplication.h" +#include "QtCore/qcommandlineoption.h" #include "QtCore/qtranslator.h" #if QT_CONFIG(settings) #include "QtCore/qsettings.h" @@ -84,6 +85,11 @@ public: }; QCoreApplicationPrivate(int &aargc, char **aargv, uint flags); + + // If not inheriting from QObjectPrivate: force this class to be polymorphic +#ifdef QT_NO_QOBJECT + virtual +#endif ~QCoreApplicationPrivate(); void init(); @@ -99,6 +105,8 @@ public: static bool checkInstance(const char *method); + virtual void addQtOptions(QList<QCommandLineOption> *options); + #ifndef QT_NO_QOBJECT bool sendThroughApplicationEventFilters(QObject *, QEvent *); static bool sendThroughObjectEventFilters(QObject *, QEvent *); @@ -149,7 +157,7 @@ public: QString cachedApplicationDirPath; static QString *cachedApplicationFilePath; static void setApplicationFilePath(const QString &path); - static inline void clearApplicationFilePath() { delete cachedApplicationFilePath; cachedApplicationFilePath = 0; } + static inline void clearApplicationFilePath() { delete cachedApplicationFilePath; cachedApplicationFilePath = nullptr; } #ifndef QT_NO_QOBJECT void execCleanup(); diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 4f4a29b41b..822b68cf62 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -64,8 +64,6 @@ using namespace Microsoft::WRL::Wrappers; QT_BEGIN_NAMESPACE -int appCmdShow = 0; - Q_CORE_EXPORT QString qAppFileName() // get application file name { /* @@ -175,16 +173,12 @@ Q_CORE_EXPORT HINSTANCE qWinAppPrevInst() // get Windows prev app Q_CORE_EXPORT int qWinAppCmdShow() // get main window show command { -#if defined(Q_OS_WINCE) - return appCmdShow; -#else STARTUPINFO startupInfo; GetStartupInfo(&startupInfo); return (startupInfo.dwFlags & STARTF_USESHOWWINDOW) ? startupInfo.wShowWindow : SW_SHOWDEFAULT; -#endif } #endif diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index cacbb1e495..4cfc749386 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -421,10 +421,10 @@ struct QBasicAtomicBitField { QBasicAtomicInteger<uint> next; QBasicAtomicInteger<uint> data[NumInts]; - bool allocateSpecific(int which) Q_DECL_NOTHROW + bool allocateSpecific(int which) noexcept { QBasicAtomicInteger<uint> &entry = data[which / BitsPerInt]; - const uint old = entry.load(); + const uint old = entry.loadRelaxed(); const uint bit = 1U << (which % BitsPerInt); return !(old & bit) // wasn't taken && entry.testAndSetRelaxed(old, old | bit); // still wasn't taken @@ -437,7 +437,7 @@ struct QBasicAtomicBitField { // loop. } - int allocateNext() Q_DECL_NOTHROW + int allocateNext() noexcept { // Unroll loop to iterate over ints, then bits? Would save // potentially a lot of cmpxchgs, because we can scan the @@ -445,10 +445,10 @@ struct QBasicAtomicBitField { // Then again, this should never execute many iterations, so // leave like this for now: - for (uint i = next.load(); i < NumBits; ++i) { + for (uint i = next.loadRelaxed(); i < NumBits; ++i) { if (allocateSpecific(i)) { // remember next (possibly) free id: - const uint oldNext = next.load(); + const uint oldNext = next.loadRelaxed(); next.testAndSetRelaxed(oldNext, qMax(i + 1, oldNext)); return i; } @@ -463,7 +463,7 @@ typedef QBasicAtomicBitField<QEvent::MaxUser - QEvent::User + 1> UserEventTypeRe static UserEventTypeRegistry userEventTypeRegistry; -static inline int registerEventTypeZeroBased(int id) Q_DECL_NOTHROW +static inline int registerEventTypeZeroBased(int id) noexcept { // if the type hint hasn't been registered yet, take it: if (id < UserEventTypeRegistry::NumBits && id >= 0 && userEventTypeRegistry.allocateSpecific(id)) @@ -486,7 +486,7 @@ static inline int registerEventTypeZeroBased(int id) Q_DECL_NOTHROW Returns -1 if all available values are already taken or the program is shutting down. */ -int QEvent::registerEventType(int hint) Q_DECL_NOTHROW +int QEvent::registerEventType(int hint) noexcept { const int result = registerEventTypeZeroBased(QEvent::MaxUser - hint); return result < 0 ? -1 : QEvent::MaxUser - result ; diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index ac974ba411..05af1a6132 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -307,7 +307,7 @@ public: inline void accept() { m_accept = true; } inline void ignore() { m_accept = false; } - static int registerEventType(int hint = -1) Q_DECL_NOTHROW; + static int registerEventType(int hint = -1) noexcept; protected: QEventPrivate *d; diff --git a/src/corelib/kernel/qcoreglobaldata.cpp b/src/corelib/kernel/qcoreglobaldata.cpp index 104be1b87b..7ff222f170 100644 --- a/src/corelib/kernel/qcoreglobaldata.cpp +++ b/src/corelib/kernel/qcoreglobaldata.cpp @@ -48,7 +48,7 @@ Q_GLOBAL_STATIC(QCoreGlobalData, globalInstance) QCoreGlobalData::QCoreGlobalData() #if QT_CONFIG(textcodec) - : codecForLocale(0) + : codecForLocale(nullptr) #endif { } @@ -56,7 +56,7 @@ QCoreGlobalData::QCoreGlobalData() QCoreGlobalData::~QCoreGlobalData() { #if QT_CONFIG(textcodec) - codecForLocale = 0; + codecForLocale = nullptr; QList<QTextCodec *> tmp = allCodecs; allCodecs.clear(); codecCache.clear(); diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp index 49874b94b4..06b56bb09b 100644 --- a/src/corelib/kernel/qdeadlinetimer.cpp +++ b/src/corelib/kernel/qdeadlinetimer.cpp @@ -464,7 +464,7 @@ inline bool TimeReference::toNanoseconds(qint64 *result) const \sa hasExpired(), isForever(), remainingTime(), setRemainingTime() */ -QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW +QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) noexcept : t2(0) { setRemainingTime(msecs, type); @@ -536,7 +536,7 @@ QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW \sa setPreciseRemainingTime(), hasExpired(), isForever(), remainingTime() */ -void QDeadlineTimer::setRemainingTime(qint64 msecs, Qt::TimerType timerType) Q_DECL_NOTHROW +void QDeadlineTimer::setRemainingTime(qint64 msecs, Qt::TimerType timerType) noexcept { if (msecs == -1) { *this = QDeadlineTimer(Forever, timerType); @@ -562,7 +562,7 @@ void QDeadlineTimer::setRemainingTime(qint64 msecs, Qt::TimerType timerType) Q_D \sa setRemainingTime(), hasExpired(), isForever(), remainingTime() */ -void QDeadlineTimer::setPreciseRemainingTime(qint64 secs, qint64 nsecs, Qt::TimerType timerType) Q_DECL_NOTHROW +void QDeadlineTimer::setPreciseRemainingTime(qint64 secs, qint64 nsecs, Qt::TimerType timerType) noexcept { if (secs == -1) { *this = QDeadlineTimer(Forever, timerType); @@ -619,7 +619,7 @@ void QDeadlineTimer::setPreciseRemainingTime(qint64 secs, qint64 nsecs, Qt::Time \sa isForever(), remainingTime() */ -bool QDeadlineTimer::hasExpired() const Q_DECL_NOTHROW +bool QDeadlineTimer::hasExpired() const noexcept { if (isForever()) return false; @@ -666,7 +666,7 @@ void QDeadlineTimer::setTimerType(Qt::TimerType timerType) \sa remainingTimeNSecs(), isForever(), hasExpired() */ -qint64 QDeadlineTimer::remainingTime() const Q_DECL_NOTHROW +qint64 QDeadlineTimer::remainingTime() const noexcept { if (isForever()) return -1; @@ -694,7 +694,7 @@ qint64 QDeadlineTimer::remainingTime() const Q_DECL_NOTHROW \sa remainingTime(), isForever(), hasExpired() */ -qint64 QDeadlineTimer::remainingTimeNSecs() const Q_DECL_NOTHROW +qint64 QDeadlineTimer::remainingTimeNSecs() const noexcept { if (isForever()) return -1; @@ -708,7 +708,7 @@ qint64 QDeadlineTimer::remainingTimeNSecs() const Q_DECL_NOTHROW not deal with Forever. In case of underflow the result is saturated to the minimum possible value, on overflow - the maximum possible value. */ -qint64 QDeadlineTimer::rawRemainingTimeNSecs() const Q_DECL_NOTHROW +qint64 QDeadlineTimer::rawRemainingTimeNSecs() const noexcept { QDeadlineTimer now = current(timerType()); TimeReference ref(t1, t2); @@ -744,7 +744,7 @@ qint64 QDeadlineTimer::rawRemainingTimeNSecs() const Q_DECL_NOTHROW \sa remainingTime(), deadlineNSecs(), setDeadline() */ -qint64 QDeadlineTimer::deadline() const Q_DECL_NOTHROW +qint64 QDeadlineTimer::deadline() const noexcept { if (isForever()) return TimeReference::Max; @@ -777,7 +777,7 @@ qint64 QDeadlineTimer::deadline() const Q_DECL_NOTHROW \sa remainingTime(), deadlineNSecs() */ -qint64 QDeadlineTimer::deadlineNSecs() const Q_DECL_NOTHROW +qint64 QDeadlineTimer::deadlineNSecs() const noexcept { if (isForever()) return TimeReference::Max; @@ -802,7 +802,7 @@ qint64 QDeadlineTimer::deadlineNSecs() const Q_DECL_NOTHROW \sa setPreciseDeadline(), deadline(), deadlineNSecs(), setRemainingTime() */ -void QDeadlineTimer::setDeadline(qint64 msecs, Qt::TimerType timerType) Q_DECL_NOTHROW +void QDeadlineTimer::setDeadline(qint64 msecs, Qt::TimerType timerType) noexcept { if (msecs == TimeReference::Max) { *this = QDeadlineTimer(Forever, timerType); @@ -829,7 +829,7 @@ void QDeadlineTimer::setDeadline(qint64 msecs, Qt::TimerType timerType) Q_DECL_N \sa setDeadline(), deadline(), deadlineNSecs(), setRemainingTime() */ -void QDeadlineTimer::setPreciseDeadline(qint64 secs, qint64 nsecs, Qt::TimerType timerType) Q_DECL_NOTHROW +void QDeadlineTimer::setPreciseDeadline(qint64 secs, qint64 nsecs, Qt::TimerType timerType) noexcept { type = timerType; @@ -849,7 +849,7 @@ void QDeadlineTimer::setPreciseDeadline(qint64 secs, qint64 nsecs, Qt::TimerType \note if \a dt was created as expired, its deadline is indeterminate and adding an amount of time may or may not cause it to become unexpired. */ -QDeadlineTimer QDeadlineTimer::addNSecs(QDeadlineTimer dt, qint64 nsecs) Q_DECL_NOTHROW +QDeadlineTimer QDeadlineTimer::addNSecs(QDeadlineTimer dt, qint64 nsecs) noexcept { if (dt.isForever()) return dt; diff --git a/src/corelib/kernel/qdeadlinetimer.h b/src/corelib/kernel/qdeadlinetimer.h index f9ad4063e5..9dd92481d2 100644 --- a/src/corelib/kernel/qdeadlinetimer.h +++ b/src/corelib/kernel/qdeadlinetimer.h @@ -63,49 +63,49 @@ class Q_CORE_EXPORT QDeadlineTimer public: enum ForeverConstant { Forever }; - Q_DECL_CONSTEXPR QDeadlineTimer(Qt::TimerType type_ = Qt::CoarseTimer) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QDeadlineTimer(Qt::TimerType type_ = Qt::CoarseTimer) noexcept : t1(0), t2(0), type(type_) {} - Q_DECL_CONSTEXPR QDeadlineTimer(ForeverConstant, Qt::TimerType type_ = Qt::CoarseTimer) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QDeadlineTimer(ForeverConstant, Qt::TimerType type_ = Qt::CoarseTimer) noexcept : t1(std::numeric_limits<qint64>::max()), t2(0), type(type_) {} - explicit QDeadlineTimer(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW; + explicit QDeadlineTimer(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) noexcept; - void swap(QDeadlineTimer &other) Q_DECL_NOTHROW + void swap(QDeadlineTimer &other) noexcept { qSwap(t1, other.t1); qSwap(t2, other.t2); qSwap(type, other.type); } - Q_DECL_CONSTEXPR bool isForever() const Q_DECL_NOTHROW + Q_DECL_CONSTEXPR bool isForever() const noexcept { return t1 == (std::numeric_limits<qint64>::max)(); } - bool hasExpired() const Q_DECL_NOTHROW; + bool hasExpired() const noexcept; - Qt::TimerType timerType() const Q_DECL_NOTHROW + Qt::TimerType timerType() const noexcept { return Qt::TimerType(type & 0xff); } void setTimerType(Qt::TimerType type); - qint64 remainingTime() const Q_DECL_NOTHROW; - qint64 remainingTimeNSecs() const Q_DECL_NOTHROW; - void setRemainingTime(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW; + qint64 remainingTime() const noexcept; + qint64 remainingTimeNSecs() const noexcept; + void setRemainingTime(qint64 msecs, Qt::TimerType type = Qt::CoarseTimer) noexcept; void setPreciseRemainingTime(qint64 secs, qint64 nsecs = 0, - Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW; + Qt::TimerType type = Qt::CoarseTimer) noexcept; - qint64 deadline() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; - qint64 deadlineNSecs() const Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; - void setDeadline(qint64 msecs, Qt::TimerType timerType = Qt::CoarseTimer) Q_DECL_NOTHROW; + qint64 deadline() const noexcept Q_DECL_PURE_FUNCTION; + qint64 deadlineNSecs() const noexcept Q_DECL_PURE_FUNCTION; + void setDeadline(qint64 msecs, Qt::TimerType timerType = Qt::CoarseTimer) noexcept; void setPreciseDeadline(qint64 secs, qint64 nsecs = 0, - Qt::TimerType type = Qt::CoarseTimer) Q_DECL_NOTHROW; + Qt::TimerType type = Qt::CoarseTimer) noexcept; - static QDeadlineTimer addNSecs(QDeadlineTimer dt, qint64 nsecs) Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; - static QDeadlineTimer current(Qt::TimerType timerType = Qt::CoarseTimer) Q_DECL_NOTHROW; + static QDeadlineTimer addNSecs(QDeadlineTimer dt, qint64 nsecs) noexcept Q_DECL_PURE_FUNCTION; + static QDeadlineTimer current(Qt::TimerType timerType = Qt::CoarseTimer) noexcept; - friend bool operator==(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW + friend bool operator==(QDeadlineTimer d1, QDeadlineTimer d2) noexcept { return d1.t1 == d2.t1 && d1.t2 == d2.t2; } - friend bool operator!=(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW + friend bool operator!=(QDeadlineTimer d1, QDeadlineTimer d2) noexcept { return !(d1 == d2); } - friend bool operator<(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW + friend bool operator<(QDeadlineTimer d1, QDeadlineTimer d2) noexcept { return d1.t1 < d2.t1 || (d1.t1 == d2.t1 && d1.t2 < d2.t2); } - friend bool operator<=(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW + friend bool operator<=(QDeadlineTimer d1, QDeadlineTimer d2) noexcept { return d1 == d2 || d1 < d2; } - friend bool operator>(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW + friend bool operator>(QDeadlineTimer d1, QDeadlineTimer d2) noexcept { return d2 < d1; } - friend bool operator>=(QDeadlineTimer d1, QDeadlineTimer d2) Q_DECL_NOTHROW + friend bool operator>=(QDeadlineTimer d1, QDeadlineTimer d2) noexcept { return !(d1 < d2); } friend Q_CORE_EXPORT QDeadlineTimer operator+(QDeadlineTimer dt, qint64 msecs); @@ -159,7 +159,7 @@ public: setPreciseRemainingTime(0, std::chrono::nanoseconds(remaining).count(), type_); } - std::chrono::nanoseconds remainingTimeAsDuration() const Q_DECL_NOTHROW + std::chrono::nanoseconds remainingTimeAsDuration() const noexcept { if (isForever()) return std::chrono::nanoseconds::max(); @@ -185,7 +185,7 @@ private: unsigned t2; unsigned type; - qint64 rawRemainingTimeNSecs() const Q_DECL_NOTHROW; + qint64 rawRemainingTimeNSecs() const noexcept; public: // This is not a public function, it's here only for Qt's internal convenience... diff --git a/src/corelib/kernel/qelapsedtimer.cpp b/src/corelib/kernel/qelapsedtimer.cpp index e578b5b8b3..57825583dd 100644 --- a/src/corelib/kernel/qelapsedtimer.cpp +++ b/src/corelib/kernel/qelapsedtimer.cpp @@ -65,7 +65,7 @@ QT_BEGIN_NAMESPACE \snippet qelapsedtimer/main.cpp 0 In this example, the timer is started by a call to start() and the - elapsed timer is calculated by the elapsed() function. + elapsed time is calculated by the elapsed() function. The time elapsed can also be used to recalculate the time available for another operation, after the first one is complete. This is useful when @@ -236,7 +236,7 @@ static const qint64 invalidData = Q_INT64_C(0x8000000000000000); \sa isValid(), start(), restart() */ -void QElapsedTimer::invalidate() Q_DECL_NOTHROW +void QElapsedTimer::invalidate() noexcept { t1 = t2 = invalidData; } @@ -247,7 +247,7 @@ void QElapsedTimer::invalidate() Q_DECL_NOTHROW \sa invalidate(), start(), restart() */ -bool QElapsedTimer::isValid() const Q_DECL_NOTHROW +bool QElapsedTimer::isValid() const noexcept { return t1 != invalidData && t2 != invalidData; } @@ -260,7 +260,7 @@ bool QElapsedTimer::isValid() const Q_DECL_NOTHROW \sa elapsed(), QDeadlineTimer */ -bool QElapsedTimer::hasExpired(qint64 timeout) const Q_DECL_NOTHROW +bool QElapsedTimer::hasExpired(qint64 timeout) const noexcept { // if timeout is -1, quint64(timeout) is LLINT_MAX, so this will be // considered as never expired diff --git a/src/corelib/kernel/qelapsedtimer.h b/src/corelib/kernel/qelapsedtimer.h index 7954b41bf4..873847f6b6 100644 --- a/src/corelib/kernel/qelapsedtimer.h +++ b/src/corelib/kernel/qelapsedtimer.h @@ -62,28 +62,28 @@ public: { } - static ClockType clockType() Q_DECL_NOTHROW; - static bool isMonotonic() Q_DECL_NOTHROW; + static ClockType clockType() noexcept; + static bool isMonotonic() noexcept; - void start() Q_DECL_NOTHROW; - qint64 restart() Q_DECL_NOTHROW; - void invalidate() Q_DECL_NOTHROW; - bool isValid() const Q_DECL_NOTHROW; + void start() noexcept; + qint64 restart() noexcept; + void invalidate() noexcept; + bool isValid() const noexcept; - qint64 nsecsElapsed() const Q_DECL_NOTHROW; - qint64 elapsed() const Q_DECL_NOTHROW; - bool hasExpired(qint64 timeout) const Q_DECL_NOTHROW; + qint64 nsecsElapsed() const noexcept; + qint64 elapsed() const noexcept; + bool hasExpired(qint64 timeout) const noexcept; - qint64 msecsSinceReference() const Q_DECL_NOTHROW; - qint64 msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW; - qint64 secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW; + qint64 msecsSinceReference() const noexcept; + qint64 msecsTo(const QElapsedTimer &other) const noexcept; + qint64 secsTo(const QElapsedTimer &other) const noexcept; - bool operator==(const QElapsedTimer &other) const Q_DECL_NOTHROW + bool operator==(const QElapsedTimer &other) const noexcept { return t1 == other.t1 && t2 == other.t2; } - bool operator!=(const QElapsedTimer &other) const Q_DECL_NOTHROW + bool operator!=(const QElapsedTimer &other) const noexcept { return !(*this == other); } - friend bool Q_CORE_EXPORT operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW; + friend bool Q_CORE_EXPORT operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept; private: qint64 t1; diff --git a/src/corelib/kernel/qelapsedtimer_generic.cpp b/src/corelib/kernel/qelapsedtimer_generic.cpp index fdeb385188..fe959e3c94 100644 --- a/src/corelib/kernel/qelapsedtimer_generic.cpp +++ b/src/corelib/kernel/qelapsedtimer_generic.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \sa isMonotonic() */ -QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW +QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept { return SystemTime; } @@ -60,7 +60,7 @@ QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW \sa clockType(), QElapsedTimer::ClockType */ -bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW +bool QElapsedTimer::isMonotonic() noexcept { return false; } @@ -75,7 +75,7 @@ bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW \sa restart(), invalidate(), elapsed() */ -void QElapsedTimer::start() Q_DECL_NOTHROW +void QElapsedTimer::start() noexcept { restart(); } @@ -97,7 +97,7 @@ void QElapsedTimer::start() Q_DECL_NOTHROW \sa start(), invalidate(), elapsed(), isValid() */ -qint64 QElapsedTimer::restart() Q_DECL_NOTHROW +qint64 QElapsedTimer::restart() noexcept { qint64 old = t1; t1 = QDateTime::currentMSecsSinceEpoch(); @@ -118,7 +118,7 @@ qint64 QElapsedTimer::restart() Q_DECL_NOTHROW \sa start(), restart(), hasExpired(), invalidate() */ -qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::nsecsElapsed() const noexcept { return elapsed() * 1000000; } @@ -132,7 +132,7 @@ qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW \sa start(), restart(), hasExpired(), isValid(), invalidate() */ -qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::elapsed() const noexcept { return QDateTime::currentMSecsSinceEpoch() - t1; } @@ -152,7 +152,7 @@ qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW \sa clockType(), elapsed() */ -qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsSinceReference() const noexcept { return t1; } @@ -167,7 +167,7 @@ qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW \sa secsTo(), elapsed() */ -qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept { qint64 diff = other.t1 - t1; return diff; @@ -183,7 +183,7 @@ qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW \sa msecsTo(), elapsed() */ -qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept { return msecsTo(other) / 1000; } @@ -197,12 +197,12 @@ qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW and the other isn't. However, two invalid timers are equal and thus this function will return false. */ -bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW +bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept { return v1.t1 < v2.t1; } -QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW +QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept { QDeadlineTimer result; result.t1 = QDateTime::currentMSecsSinceEpoch() * 1000 * 1000; diff --git a/src/corelib/kernel/qelapsedtimer_mac.cpp b/src/corelib/kernel/qelapsedtimer_mac.cpp index 7490693991..5370cf7b3d 100644 --- a/src/corelib/kernel/qelapsedtimer_mac.cpp +++ b/src/corelib/kernel/qelapsedtimer_mac.cpp @@ -58,12 +58,12 @@ typedef __int128_t LargeInt; typedef qint64 LargeInt; #endif -QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW +QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept { return MachAbsoluteTime; } -bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW +bool QElapsedTimer::isMonotonic() noexcept { return true; } @@ -87,7 +87,7 @@ static qint64 absoluteToMSecs(qint64 cpuTime) return absoluteToNSecs(cpuTime) / 1000000; } -timespec qt_gettime() Q_DECL_NOTHROW +timespec qt_gettime() noexcept { timespec tv; @@ -107,13 +107,13 @@ void qt_nanosleep(timespec amount) EINTR_LOOP(r, nanosleep(&amount, &amount)); } -void QElapsedTimer::start() Q_DECL_NOTHROW +void QElapsedTimer::start() noexcept { t1 = mach_absolute_time(); t2 = 0; } -qint64 QElapsedTimer::restart() Q_DECL_NOTHROW +qint64 QElapsedTimer::restart() noexcept { qint64 old = t1; t1 = mach_absolute_time(); @@ -122,39 +122,39 @@ qint64 QElapsedTimer::restart() Q_DECL_NOTHROW return absoluteToMSecs(t1 - old); } -qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::nsecsElapsed() const noexcept { uint64_t cpu_time = mach_absolute_time(); return absoluteToNSecs(cpu_time - t1); } -qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::elapsed() const noexcept { uint64_t cpu_time = mach_absolute_time(); return absoluteToMSecs(cpu_time - t1); } -qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsSinceReference() const noexcept { return absoluteToMSecs(t1); } -qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept { return absoluteToMSecs(other.t1 - t1); } -qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept { return msecsTo(other) / 1000; } -bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW +bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept { return v1.t1 < v2.t1; } -QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW +QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept { Q_STATIC_ASSERT(!QDeadlineTimerNanosecondsInT2); QDeadlineTimer result; diff --git a/src/corelib/kernel/qelapsedtimer_unix.cpp b/src/corelib/kernel/qelapsedtimer_unix.cpp index e166d4e3d2..ccc2eeafa3 100644 --- a/src/corelib/kernel/qelapsedtimer_unix.cpp +++ b/src/corelib/kernel/qelapsedtimer_unix.cpp @@ -150,12 +150,12 @@ static int unixCheckClockType() #endif } -bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW +bool QElapsedTimer::isMonotonic() noexcept { return clockType() == MonotonicClock; } -QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW +QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept { return unixCheckClockType() == CLOCK_REALTIME ? SystemTime : MonotonicClock; } @@ -169,7 +169,7 @@ static inline void do_gettime(qint64 *sec, qint64 *frac) } // used in qcore_unix.cpp and qeventdispatcher_unix.cpp -struct timespec qt_gettime() Q_DECL_NOTHROW +struct timespec qt_gettime() noexcept { qint64 sec, frac; do_gettime(&sec, &frac); @@ -204,17 +204,17 @@ static qint64 elapsedAndRestart(qint64 sec, qint64 frac, return (sec * Q_INT64_C(1000000000) + frac) / Q_INT64_C(1000000); } -void QElapsedTimer::start() Q_DECL_NOTHROW +void QElapsedTimer::start() noexcept { do_gettime(&t1, &t2); } -qint64 QElapsedTimer::restart() Q_DECL_NOTHROW +qint64 QElapsedTimer::restart() noexcept { return elapsedAndRestart(t1, t2, &t1, &t2); } -qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::nsecsElapsed() const noexcept { qint64 sec, frac; do_gettime(&sec, &frac); @@ -223,34 +223,34 @@ qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW return sec * Q_INT64_C(1000000000) + frac; } -qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::elapsed() const noexcept { return nsecsElapsed() / Q_INT64_C(1000000); } -qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsSinceReference() const noexcept { return t1 * Q_INT64_C(1000) + t2 / Q_INT64_C(1000000); } -qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept { qint64 secs = other.t1 - t1; qint64 fraction = other.t2 - t2; return (secs * Q_INT64_C(1000000000) + fraction) / Q_INT64_C(1000000); } -qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept { return other.t1 - t1; } -bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW +bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept { return v1.t1 < v2.t1 || (v1.t1 == v2.t1 && v1.t2 < v2.t2); } -QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW +QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept { Q_STATIC_ASSERT(QDeadlineTimerNanosecondsInT2); QDeadlineTimer result; diff --git a/src/corelib/kernel/qelapsedtimer_win.cpp b/src/corelib/kernel/qelapsedtimer_win.cpp index 3beb158b8a..8becb17461 100644 --- a/src/corelib/kernel/qelapsedtimer_win.cpp +++ b/src/corelib/kernel/qelapsedtimer_win.cpp @@ -101,25 +101,25 @@ quint64 qt_msectime() return ticksToNanoseconds(getTickCount()) / 1000000; } -QElapsedTimer::ClockType QElapsedTimer::clockType() Q_DECL_NOTHROW +QElapsedTimer::ClockType QElapsedTimer::clockType() noexcept { resolveCounterFrequency(); return counterFrequency > 0 ? PerformanceCounter : TickCounter; } -bool QElapsedTimer::isMonotonic() Q_DECL_NOTHROW +bool QElapsedTimer::isMonotonic() noexcept { return true; } -void QElapsedTimer::start() Q_DECL_NOTHROW +void QElapsedTimer::start() noexcept { t1 = getTickCount(); t2 = 0; } -qint64 QElapsedTimer::restart() Q_DECL_NOTHROW +qint64 QElapsedTimer::restart() noexcept { qint64 oldt1 = t1; t1 = getTickCount(); @@ -127,40 +127,40 @@ qint64 QElapsedTimer::restart() Q_DECL_NOTHROW return ticksToNanoseconds(t1 - oldt1) / 1000000; } -qint64 QElapsedTimer::nsecsElapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::nsecsElapsed() const noexcept { qint64 elapsed = getTickCount() - t1; return ticksToNanoseconds(elapsed); } -qint64 QElapsedTimer::elapsed() const Q_DECL_NOTHROW +qint64 QElapsedTimer::elapsed() const noexcept { qint64 elapsed = getTickCount() - t1; return ticksToNanoseconds(elapsed) / 1000000; } -qint64 QElapsedTimer::msecsSinceReference() const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsSinceReference() const noexcept { return ticksToNanoseconds(t1) / 1000000; } -qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::msecsTo(const QElapsedTimer &other) const noexcept { qint64 difference = other.t1 - t1; return ticksToNanoseconds(difference) / 1000000; } -qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const Q_DECL_NOTHROW +qint64 QElapsedTimer::secsTo(const QElapsedTimer &other) const noexcept { return msecsTo(other) / 1000; } -bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) Q_DECL_NOTHROW +bool operator<(const QElapsedTimer &v1, const QElapsedTimer &v2) noexcept { return (v1.t1 - v2.t1) < 0; } -QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) Q_DECL_NOTHROW +QDeadlineTimer QDeadlineTimer::current(Qt::TimerType timerType) noexcept { Q_STATIC_ASSERT(!QDeadlineTimerNanosecondsInT2); QDeadlineTimer result; diff --git a/src/corelib/kernel/qeventdispatcher_cf.mm b/src/corelib/kernel/qeventdispatcher_cf.mm index b7b379e2c1..33c231987f 100644 --- a/src/corelib/kernel/qeventdispatcher_cf.mm +++ b/src/corelib/kernel/qeventdispatcher_cf.mm @@ -190,7 +190,7 @@ Q_ENUM_PRINTER(Result); QDebug operator<<(QDebug s, timespec tv) { - s << tv.tv_sec << "." << qSetFieldWidth(9) << qSetPadChar(QChar(48)) << tv.tv_nsec << reset; + s << tv.tv_sec << "." << qSetFieldWidth(9) << qSetPadChar(QChar(48)) << tv.tv_nsec << Qt::reset; return s; } diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 45c6e29e4b..d9746ef6e2 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -86,9 +86,10 @@ static gboolean socketNotifierSourceCheck(GSource *source) p->pollfd.fd, t[int(p->socketNotifier->type())]); // ### note, modifies src->pollfds! p->socketNotifier->setEnabled(false); + i--; + } else { + pending = pending || ((p->pollfd.revents & p->pollfd.events) != 0); } - - pending = ((p->pollfd.revents & p->pollfd.events) != 0); } return pending; @@ -260,7 +261,7 @@ static gboolean postEventSourcePrepare(GSource *s, gint *timeout) *timeout = canWait ? -1 : 0; GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - source->d->wakeUpCalled = source->serialNumber.load() != source->lastSerialNumber; + source->d->wakeUpCalled = source->serialNumber.loadRelaxed() != source->lastSerialNumber; return !canWait || source->d->wakeUpCalled; } @@ -272,7 +273,7 @@ static gboolean postEventSourceCheck(GSource *source) static gboolean postEventSourceDispatch(GSource *s, GSourceFunc, gpointer) { GPostEventSource *source = reinterpret_cast<GPostEventSource *>(s); - source->lastSerialNumber = source->serialNumber.load(); + source->lastSerialNumber = source->serialNumber.loadRelaxed(); QCoreApplication::sendPostedEvents(); source->d->runTimersOnceWithNormalPriority(); return true; // i dunno, george... @@ -319,7 +320,7 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) // setup post event source postEventSource = reinterpret_cast<GPostEventSource *>(g_source_new(&postEventSourceFuncs, sizeof(GPostEventSource))); - postEventSource->serialNumber.store(1); + postEventSource->serialNumber.storeRelaxed(1); postEventSource->d = this; g_source_set_can_recurse(&postEventSource->source, true); g_source_attach(&postEventSource->source, mainContext); diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h index 88ff316ee5..313825d0a7 100644 --- a/src/corelib/kernel/qeventdispatcher_glib_p.h +++ b/src/corelib/kernel/qeventdispatcher_glib_p.h @@ -66,8 +66,8 @@ class Q_CORE_EXPORT QEventDispatcherGlib : public QAbstractEventDispatcher Q_DECLARE_PRIVATE(QEventDispatcherGlib) public: - explicit QEventDispatcherGlib(QObject *parent = 0); - explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0); + explicit QEventDispatcherGlib(QObject *parent = nullptr); + explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = nullptr); ~QEventDispatcherGlib(); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; @@ -102,7 +102,7 @@ class Q_CORE_EXPORT QEventDispatcherGlibPrivate : public QAbstractEventDispatche { public: - QEventDispatcherGlibPrivate(GMainContext *context = 0); + QEventDispatcherGlibPrivate(GMainContext *context = nullptr); GMainContext *mainContext; GPostEventSource *postEventSource; GSocketNotifierSource *socketNotifierSource; diff --git a/src/corelib/kernel/qeventdispatcher_unix.cpp b/src/corelib/kernel/qeventdispatcher_unix.cpp index 535f86fefe..5bc65b7110 100644 --- a/src/corelib/kernel/qeventdispatcher_unix.cpp +++ b/src/corelib/kernel/qeventdispatcher_unix.cpp @@ -225,7 +225,7 @@ int QThreadPipe::check(const pollfd &pfd) QEventDispatcherUNIXPrivate::QEventDispatcherUNIXPrivate() { if (Q_UNLIKELY(threadPipe.init() == false)) - qFatal("QEventDispatcherUNIXPrivate(): Can not continue without a thread pipe"); + qFatal("QEventDispatcherUNIXPrivate(): Cannot continue without a thread pipe"); } QEventDispatcherUNIXPrivate::~QEventDispatcherUNIXPrivate() @@ -459,7 +459,7 @@ void QEventDispatcherUNIX::unregisterSocketNotifier(QSocketNotifier *notifier) bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags) { Q_D(QEventDispatcherUNIX); - d->interrupt.store(0); + d->interrupt.storeRelaxed(0); // we are awake, broadcast it emit awake(); @@ -470,13 +470,13 @@ bool QEventDispatcherUNIX::processEvents(QEventLoop::ProcessEventsFlags flags) const bool wait_for_events = flags & QEventLoop::WaitForMoreEvents; const bool canWait = (d->threadData->canWaitLocked() - && !d->interrupt.load() + && !d->interrupt.loadRelaxed() && wait_for_events); if (canWait) emit aboutToBlock(); - if (d->interrupt.load()) + if (d->interrupt.loadRelaxed()) return false; timespec *tm = nullptr; @@ -545,7 +545,7 @@ void QEventDispatcherUNIX::wakeUp() void QEventDispatcherUNIX::interrupt() { Q_D(QEventDispatcherUNIX); - d->interrupt.store(1); + d->interrupt.storeRelaxed(1); wakeUp(); } diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index 0fd068b074..f37edfc967 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -64,10 +64,10 @@ class QEventDispatcherUNIXPrivate; struct Q_CORE_EXPORT QSocketNotifierSetUNIX final { - inline QSocketNotifierSetUNIX() Q_DECL_NOTHROW; + inline QSocketNotifierSetUNIX() noexcept; - inline bool isEmpty() const Q_DECL_NOTHROW; - inline short events() const Q_DECL_NOTHROW; + inline bool isEmpty() const noexcept; + inline short events() const noexcept; QSocketNotifier *notifiers[3]; }; @@ -102,7 +102,7 @@ class Q_CORE_EXPORT QEventDispatcherUNIX : public QAbstractEventDispatcher Q_DECLARE_PRIVATE(QEventDispatcherUNIX) public: - explicit QEventDispatcherUNIX(QObject *parent = 0); + explicit QEventDispatcherUNIX(QObject *parent = nullptr); ~QEventDispatcherUNIX(); bool processEvents(QEventLoop::ProcessEventsFlags flags) override; @@ -123,7 +123,7 @@ public: void flush() override; protected: - QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = 0); + QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = nullptr); }; class Q_CORE_EXPORT QEventDispatcherUNIXPrivate : public QAbstractEventDispatcherPrivate @@ -150,19 +150,19 @@ public: QAtomicInt interrupt; // bool }; -inline QSocketNotifierSetUNIX::QSocketNotifierSetUNIX() Q_DECL_NOTHROW +inline QSocketNotifierSetUNIX::QSocketNotifierSetUNIX() noexcept { - notifiers[0] = 0; - notifiers[1] = 0; - notifiers[2] = 0; + notifiers[0] = nullptr; + notifiers[1] = nullptr; + notifiers[2] = nullptr; } -inline bool QSocketNotifierSetUNIX::isEmpty() const Q_DECL_NOTHROW +inline bool QSocketNotifierSetUNIX::isEmpty() const noexcept { return !notifiers[0] && !notifiers[1] && !notifiers[2]; } -inline short QSocketNotifierSetUNIX::events() const Q_DECL_NOTHROW +inline short QSocketNotifierSetUNIX::events() const noexcept { short result = 0; diff --git a/src/corelib/kernel/qeventdispatcher_win.cpp b/src/corelib/kernel/qeventdispatcher_win.cpp index b3b6b1be20..c2e57a7924 100644 --- a/src/corelib/kernel/qeventdispatcher_win.cpp +++ b/src/corelib/kernel/qeventdispatcher_win.cpp @@ -82,8 +82,13 @@ extern uint qGlobalPostedEventsCount(); enum { WM_QT_SOCKETNOTIFIER = WM_USER, WM_QT_SENDPOSTEDEVENTS = WM_USER + 1, - WM_QT_ACTIVATENOTIFIERS = WM_USER + 2, - SendPostedEventsWindowsTimerId = ~1u + WM_QT_ACTIVATENOTIFIERS = WM_USER + 2 +}; + +// WM_QT_SENDPOSTEDEVENTS message parameter +enum { + WMWP_QT_TOFOREIGNLOOP = 0, + WMWP_QT_FROMWAKEUP }; class QEventDispatcherWin32Private; @@ -96,8 +101,8 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA QEventDispatcherWin32Private::QEventDispatcherWin32Private() : threadId(GetCurrentThreadId()), interrupt(false), internalHwnd(0), - getMessageHook(0), serialNumber(0), lastSerialNumber(0), sendPostedEventsWindowsTimerId(0), - wakeUps(0), activateNotifiersPosted(false), winEventNotifierActivatedEvent(NULL) + getMessageHook(0), wakeUps(0), activateNotifiersPosted(false), + winEventNotifierActivatedEvent(NULL) { } @@ -136,7 +141,11 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA msg.wParam = wp; msg.lParam = lp; QAbstractEventDispatcher* dispatcher = QAbstractEventDispatcher::instance(); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + qintptr result; +#else long result; +#endif if (!dispatcher) { if (message == WM_TIMER) KillTimer(hwnd, wp); @@ -230,22 +239,20 @@ LRESULT QT_WIN_CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPA return 0; } case WM_TIMER: - if (d->sendPostedEventsWindowsTimerId == 0 - || wp != uint(d->sendPostedEventsWindowsTimerId)) { - Q_ASSERT(d != 0); - d->sendTimerEvent(wp); - return 0; - } - // we also use a Windows timer to send posted events when the message queue is full - Q_FALLTHROUGH(); - case WM_QT_SENDPOSTEDEVENTS: { - const int localSerialNumber = d->serialNumber.load(); - if (localSerialNumber != d->lastSerialNumber) { - d->lastSerialNumber = localSerialNumber; - q->sendPostedEvents(); - } + Q_ASSERT(d != 0); + + d->sendTimerEvent(wp); + return 0; + case WM_QT_SENDPOSTEDEVENTS: + Q_ASSERT(d != 0); + + // Allow posting WM_QT_SENDPOSTEDEVENTS message. + d->wakeUps.storeRelaxed(0); + + // We send posted events manually, if the window procedure was invoked + // by the foreign event loop (e.g. from the native modal dialog). + q->sendPostedEvents(); return 0; - } } // switch (message) return DefWindowProc(hwnd, message, wp, lp); @@ -268,39 +275,6 @@ LRESULT QT_WIN_CALLBACK qt_GetMessageHook(int code, WPARAM wp, LPARAM lp) QEventDispatcherWin32 *q = qobject_cast<QEventDispatcherWin32 *>(QAbstractEventDispatcher::instance()); Q_ASSERT(q != 0); - if (wp == PM_REMOVE) { - if (q) { - MSG *msg = (MSG *) lp; - QEventDispatcherWin32Private *d = q->d_func(); - const int localSerialNumber = d->serialNumber.load(); - static const UINT mask = inputTimerMask(); - if (HIWORD(GetQueueStatus(mask)) == 0) { - // no more input or timer events in the message queue, we can allow posted events to be sent normally now - if (d->sendPostedEventsWindowsTimerId != 0) { - // stop the timer to send posted events, since we now allow the WM_QT_SENDPOSTEDEVENTS message - KillTimer(d->internalHwnd, d->sendPostedEventsWindowsTimerId); - d->sendPostedEventsWindowsTimerId = 0; - } - (void) d->wakeUps.fetchAndStoreRelease(0); - if (localSerialNumber != d->lastSerialNumber - // if this message IS the one that triggers sendPostedEvents(), no need to post it again - && (msg->hwnd != d->internalHwnd - || msg->message != WM_QT_SENDPOSTEDEVENTS)) { - PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0); - } - } else if (d->sendPostedEventsWindowsTimerId == 0 - && localSerialNumber != d->lastSerialNumber) { - // start a special timer to continue delivering posted events while - // there are still input and timer messages in the message queue - d->sendPostedEventsWindowsTimerId = SetTimer(d->internalHwnd, - SendPostedEventsWindowsTimerId, - 0, // we specify zero, but Windows uses USER_TIMER_MINIMUM - NULL); - // we don't check the return value of SetTimer()... if creating the timer failed, there's little - // we can do. we just have to accept that posted events will be starved - } - } - } return q->d_func()->getMessageHook ? CallNextHookEx(0, code, wp, lp) : 0; } @@ -338,7 +312,7 @@ QWindowsMessageWindowClassContext::QWindowsMessageWindowClassContext() wc.lpszClassName = className; atom = RegisterClass(&wc); if (!atom) { - qErrnoWarning("%s RegisterClass() failed", qPrintable(qClassName)); + qErrnoWarning("%ls RegisterClass() failed", qUtf16Printable(qClassName)); delete [] className; className = 0; } @@ -500,8 +474,8 @@ void QEventDispatcherWin32::installMessageHook() d->getMessageHook = SetWindowsHookEx(WH_GETMESSAGE, (HOOKPROC) qt_GetMessageHook, NULL, GetCurrentThreadId()); if (Q_UNLIKELY(!d->getMessageHook)) { int errorCode = GetLastError(); - qFatal("Qt: INTERNAL ERROR: failed to install GetMessage hook: %d, %s", - errorCode, qPrintable(qt_error_string(errorCode))); + qFatal("Qt: INTERNAL ERROR: failed to install GetMessage hook: %d, %ls", + errorCode, qUtf16Printable(qt_error_string(errorCode))); } } @@ -552,12 +526,15 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags) wakeUp(); // trigger a call to sendPostedEvents() } - d->interrupt.store(false); + d->interrupt.storeRelaxed(false); emit awake(); + // To prevent livelocks, send posted events once per iteration. + // QCoreApplication::sendPostedEvents() takes care about recursions. + sendPostedEvents(); + bool canWait; bool retVal = false; - bool seenWM_QT_SENDPOSTEDEVENTS = false; bool needWM_QT_SENDPOSTEDEVENTS = false; do { DWORD waitRet = 0; @@ -568,7 +545,7 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags) pHandles = &d->winEventNotifierActivatedEvent; } QVarLengthArray<MSG> processedTimers; - while (!d->interrupt.load()) { + while (!d->interrupt.loadRelaxed()) { MSG msg; bool haveMessage; @@ -606,19 +583,20 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags) } } if (haveMessage) { - // WinCE doesn't support hooks at all, so we have to call this by hand :( + // The Direct2d integration unsets getMessageHook. See QTBUG-42428 if (!d->getMessageHook) (void) qt_GetMessageHook(0, PM_REMOVE, reinterpret_cast<LPARAM>(&msg)); if (d->internalHwnd == msg.hwnd && msg.message == WM_QT_SENDPOSTEDEVENTS) { - if (seenWM_QT_SENDPOSTEDEVENTS) { - // when calling processEvents() "manually", we only want to send posted - // events once - needWM_QT_SENDPOSTEDEVENTS = true; - continue; + // Set result to 'true', if the message was sent by wakeUp(). + if (msg.wParam == WMWP_QT_FROMWAKEUP) { + d->wakeUps.storeRelaxed(0); + retVal = true; } - seenWM_QT_SENDPOSTEDEVENTS = true; - } else if (msg.message == WM_TIMER) { + needWM_QT_SENDPOSTEDEVENTS = true; + continue; + } + if (msg.message == WM_TIMER) { // avoid live-lock by keeping track of the timers we've already sent bool found = false; for (int i = 0; !found && i < processedTimers.count(); ++i) { @@ -635,10 +613,22 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags) } if (!filterNativeEvent(QByteArrayLiteral("windows_generic_MSG"), &msg, 0)) { + // Post WM_QT_SENDPOSTEDEVENTS before calling external code, + // as it can start a foreign event loop. + if (needWM_QT_SENDPOSTEDEVENTS) { + needWM_QT_SENDPOSTEDEVENTS = false; + PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, + WMWP_QT_TOFOREIGNLOOP, 0); + } TranslateMessage(&msg); DispatchMessage(&msg); } } else if (waitRet - WAIT_OBJECT_0 < nCount) { + if (needWM_QT_SENDPOSTEDEVENTS) { + needWM_QT_SENDPOSTEDEVENTS = false; + PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, + WMWP_QT_TOFOREIGNLOOP, 0); + } activateEventNotifiers(); } else { // nothing todo so break @@ -649,26 +639,27 @@ bool QEventDispatcherWin32::processEvents(QEventLoop::ProcessEventsFlags flags) // still nothing - wait for message or signalled objects canWait = (!retVal - && !d->interrupt.load() + && !d->interrupt.loadRelaxed() && (flags & QEventLoop::WaitForMoreEvents)); if (canWait) { emit aboutToBlock(); waitRet = MsgWaitForMultipleObjectsEx(nCount, pHandles, INFINITE, QS_ALLINPUT, MWMO_ALERTABLE | MWMO_INPUTAVAILABLE); emit awake(); if (waitRet - WAIT_OBJECT_0 < nCount) { + if (needWM_QT_SENDPOSTEDEVENTS) { + needWM_QT_SENDPOSTEDEVENTS = false; + PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, + WMWP_QT_TOFOREIGNLOOP, 0); + } activateEventNotifiers(); retVal = true; } } } while (canWait); - if (!seenWM_QT_SENDPOSTEDEVENTS && (flags & QEventLoop::EventLoopExec) == 0) { - // when called "manually", always send posted events - sendPostedEvents(); - } - if (needWM_QT_SENDPOSTEDEVENTS) - PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0); + PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, + WMWP_QT_TOFOREIGNLOOP, 0); return retVal; } @@ -958,7 +949,7 @@ void QEventDispatcherWin32::activateEventNotifiers() for (int i = 0; i < d->winEventNotifierList.count(); ++i) { QWinEventNotifier *notifier = d->winEventNotifierList.at(i); QWinEventNotifierPrivate *nd = QWinEventNotifierPrivate::get(notifier); - if (nd->signaledCount.load() != 0) { + if (nd->signaledCount.loadRelaxed() != 0) { --nd->signaledCount; nd->unregisterWaitObject(); d->activateEventNotifier(notifier); @@ -992,8 +983,14 @@ int QEventDispatcherWin32::remainingTime(int timerId) quint64 currentTime = qt_msectime(); for (const WinTimerInfo *t : qAsConst(d->timerVec)) { - if (t && t->timerId == timerId) // timer found, return time to wait - return t->timeout > currentTime ? t->timeout - currentTime : 0; + if (t && t->timerId == timerId) { + // timer found, return time to wait + + if (d->internalHwnd) + return t->timeout > currentTime ? t->timeout - currentTime : 0; + else + return t->interval; + } } #ifndef QT_NO_DEBUG @@ -1006,17 +1003,18 @@ int QEventDispatcherWin32::remainingTime(int timerId) void QEventDispatcherWin32::wakeUp() { Q_D(QEventDispatcherWin32); - d->serialNumber.ref(); if (d->internalHwnd && d->wakeUps.testAndSetAcquire(0, 1)) { // post a WM_QT_SENDPOSTEDEVENTS to this thread if there isn't one already pending - PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, 0, 0); + if (!PostMessage(d->internalHwnd, WM_QT_SENDPOSTEDEVENTS, + WMWP_QT_FROMWAKEUP, 0)) + qErrnoWarning("QEventDispatcherWin32::wakeUp: Failed to post a message"); } } void QEventDispatcherWin32::interrupt() { Q_D(QEventDispatcherWin32); - d->interrupt.store(true); + d->interrupt.storeRelaxed(true); wakeUp(); } diff --git a/src/corelib/kernel/qeventdispatcher_win_p.h b/src/corelib/kernel/qeventdispatcher_win_p.h index 3bb618153b..f672530ff8 100644 --- a/src/corelib/kernel/qeventdispatcher_win_p.h +++ b/src/corelib/kernel/qeventdispatcher_win_p.h @@ -80,31 +80,31 @@ public: explicit QEventDispatcherWin32(QObject *parent = 0); ~QEventDispatcherWin32(); - bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags); - bool hasPendingEvents(); + bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) override; + bool hasPendingEvents() override; - void registerSocketNotifier(QSocketNotifier *notifier); - void unregisterSocketNotifier(QSocketNotifier *notifier); + void registerSocketNotifier(QSocketNotifier *notifier) override; + void unregisterSocketNotifier(QSocketNotifier *notifier) override; - void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object); - bool unregisterTimer(int timerId); - bool unregisterTimers(QObject *object); - QList<TimerInfo> registeredTimers(QObject *object) const; + void registerTimer(int timerId, int interval, Qt::TimerType timerType, QObject *object) override; + bool unregisterTimer(int timerId) override; + bool unregisterTimers(QObject *object) override; + QList<TimerInfo> registeredTimers(QObject *object) const override; - bool registerEventNotifier(QWinEventNotifier *notifier); - void unregisterEventNotifier(QWinEventNotifier *notifier); + bool registerEventNotifier(QWinEventNotifier *notifier) override; + void unregisterEventNotifier(QWinEventNotifier *notifier) override; void activateEventNotifiers(); - int remainingTime(int timerId); + int remainingTime(int timerId) override; - void wakeUp(); - void interrupt(); - void flush(); + void wakeUp() override; + void interrupt() override; + void flush() override; - void startingUp(); - void closingDown(); + void startingUp() override; + void closingDown() override; - bool event(QEvent *e); + bool event(QEvent *e) override; HWND internalHwnd(); @@ -172,8 +172,6 @@ public: HHOOK getMessageHook; // for controlling when to send posted events - QAtomicInt serialNumber; - int lastSerialNumber, sendPostedEventsWindowsTimerId; QAtomicInt wakeUps; // timers diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index a6cc51621a..2104b22095 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -135,7 +135,7 @@ bool QEventLoop::processEvents(ProcessEventsFlags flags) Q_D(QEventLoop); if (!d->threadData->hasEventDispatcher()) return false; - return d->threadData->eventDispatcher.load()->processEvents(flags); + return d->threadData->eventDispatcher.loadRelaxed()->processEvents(flags); } /*! @@ -225,7 +225,7 @@ int QEventLoop::exec(ProcessEventsFlags flags) processEvents(flags | WaitForMoreEvents | EventLoopExec); ref.exceptionCaught = false; - return d->returnCode.load(); + return d->returnCode.loadRelaxed(); } /*! @@ -279,9 +279,9 @@ void QEventLoop::exit(int returnCode) if (!d->threadData->hasEventDispatcher()) return; - d->returnCode.store(returnCode); + d->returnCode.storeRelaxed(returnCode); d->exit.storeRelease(true); - d->threadData->eventDispatcher.load()->interrupt(); + d->threadData->eventDispatcher.loadRelaxed()->interrupt(); #ifdef Q_OS_WASM // QEventLoop::exec() never returns in emscripten. We implement approximate behavior here. @@ -318,7 +318,7 @@ void QEventLoop::wakeUp() Q_D(QEventLoop); if (!d->threadData->hasEventDispatcher()) return; - d->threadData->eventDispatcher.load()->wakeUp(); + d->threadData->eventDispatcher.loadRelaxed()->wakeUp(); } diff --git a/src/corelib/kernel/qeventloop_p.h b/src/corelib/kernel/qeventloop_p.h index dcbb5c63c6..4ad6d92007 100644 --- a/src/corelib/kernel/qeventloop_p.h +++ b/src/corelib/kernel/qeventloop_p.h @@ -63,8 +63,8 @@ public: inline QEventLoopPrivate() : inExec(false) { - returnCode.store(-1); - exit.store(true); + returnCode.storeRelaxed(-1); + exit.storeRelaxed(true); } QAtomicInt quitLockRef; diff --git a/src/corelib/kernel/qfunctions_fake_env_p.h b/src/corelib/kernel/qfunctions_fake_env_p.h index 7010d2cf5d..68d17ed4a1 100644 --- a/src/corelib/kernel/qfunctions_fake_env_p.h +++ b/src/corelib/kernel/qfunctions_fake_env_p.h @@ -72,8 +72,8 @@ Q_DECLARE_TYPEINFO(Variable, Q_MOVABLE_TYPE); struct NameEquals { typedef bool result_type; const char *name; - explicit NameEquals(const char *name) Q_DECL_NOTHROW : name(name) {} - result_type operator()(const Variable &other) const Q_DECL_NOTHROW + explicit NameEquals(const char *name) noexcept : name(name) {} + result_type operator()(const Variable &other) const noexcept { return qstrcmp(other.name, name) == 0; } }; diff --git a/src/corelib/kernel/qjni.cpp b/src/corelib/kernel/qjni.cpp index 75a2436d9d..5f652d70e3 100644 --- a/src/corelib/kernel/qjni.cpp +++ b/src/corelib/kernel/qjni.cpp @@ -47,9 +47,9 @@ QT_BEGIN_NAMESPACE -static inline QString keyBase() +static inline QLatin1String keyBase() { - return QStringLiteral("%1%2:%3"); + return QLatin1String("%1%2:%3"); } static QString qt_convertJString(jstring string) @@ -154,7 +154,7 @@ static jmethodID getCachedMethodID(JNIEnv *env, if (className.isEmpty()) return getMethodID(env, clazz, name, sig, isStatic); - const QString key = keyBase().arg(QLatin1String(className)).arg(QLatin1String(name)).arg(QLatin1String(sig)); + const QString key = keyBase().arg(QLatin1String(className), QLatin1String(name), QLatin1String(sig)); QHash<QString, jmethodID>::const_iterator it; { @@ -206,7 +206,7 @@ static jfieldID getCachedFieldID(JNIEnv *env, if (className.isNull()) return getFieldID(env, clazz, name, sig, isStatic); - const QString key = keyBase().arg(QLatin1String(className)).arg(QLatin1String(name)).arg(QLatin1String(sig)); + const QString key = keyBase().arg(QLatin1String(className), QLatin1String(name), QLatin1String(sig)); QHash<QString, jfieldID>::const_iterator it; { diff --git a/src/corelib/kernel/qjni_p.h b/src/corelib/kernel/qjni_p.h index 52abd51dc1..ec8525e6e1 100644 --- a/src/corelib/kernel/qjni_p.h +++ b/src/corelib/kernel/qjni_p.h @@ -76,7 +76,7 @@ public: private: friend class QAndroidJniEnvironment; - Q_DISABLE_COPY(QJNIEnvironmentPrivate) + Q_DISABLE_COPY_MOVE(QJNIEnvironmentPrivate) JNIEnv *jniEnv; }; diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 666bb6eace..56217262f2 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -216,8 +216,8 @@ private: Constructs a new instance of this class. You can pass up to ten arguments (\a val0, \a val1, \a val2, \a val3, \a val4, \a val5, \a val6, \a val7, - \a val8, and \a val9) to the constructor. Returns the new object, or 0 if - no suitable constructor is available. + \a val8, and \a val9) to the constructor. Returns the new object, or + \nullptr if no suitable constructor is available. Note that only constructors that are declared with the Q_INVOKABLE modifier are made available through the meta-object system. @@ -327,8 +327,8 @@ const char *QMetaObject::className() const /*! \fn QMetaObject *QMetaObject::superClass() const - Returns the meta-object of the superclass, or 0 if there is no - such object. + Returns the meta-object of the superclass, or \nullptr if there is + no such object. \sa className() */ @@ -341,7 +341,7 @@ const char *QMetaObject::className() const \since 5.7 */ -bool QMetaObject::inherits(const QMetaObject *metaObject) const Q_DECL_NOEXCEPT +bool QMetaObject::inherits(const QMetaObject *metaObject) const noexcept { const QMetaObject *m = this; do { @@ -2263,9 +2263,9 @@ bool QMetaMethod::invoke(QObject *object, return false; // check connection type - QThread *currentThread = QThread::currentThread(); - QThread *objectThread = object->thread(); if (connectionType == Qt::AutoConnection) { + QThread *currentThread = QThread::currentThread(); + QThread *objectThread = object->thread(); connectionType = currentThread == objectThread ? Qt::DirectConnection : Qt::QueuedConnection; @@ -2348,6 +2348,8 @@ bool QMetaMethod::invoke(QObject *object, 0, -1, nargs, types, args)); } else { // blocking queued connection #if QT_CONFIG(thread) + QThread *currentThread = QThread::currentThread(); + QThread *objectThread = object->thread(); if (currentThread == objectThread) { qWarning("QMetaMethod::invoke: Dead lock detected in " "BlockingQueuedConnection: Receiver is %s(%p)", @@ -2619,7 +2621,7 @@ int QMetaEnum::keyCount() const } /*! - Returns the key with the given \a index, or 0 if no such key exists. + Returns the key with the given \a index, or \nullptr if no such key exists. \sa keyCount(), value(), valueToKey() */ @@ -2741,7 +2743,7 @@ int QMetaEnum::keyToValue(const char *key, bool *ok) const /*! Returns the string that is used as the name of the given - enumeration \a value, or 0 if \a value is not defined. + enumeration \a value, or \nullptr if \a value is not defined. For flag types, use valueToKeys(). @@ -3021,6 +3023,18 @@ int QMetaProperty::propertyIndex() const } /*! + \since 5.14 + + Returns this property's index relative within the enclosing meta object. +*/ +int QMetaProperty::relativePropertyIndex() const +{ + if (!mobj) + return -1; + return idx; +} + +/*! Returns \c true if the property's type is an enumeration value that is used as a flag; otherwise returns \c false. @@ -3526,7 +3540,7 @@ bool QMetaProperty::isStored(const QObject *object) const false. e.g., the \c text property is the \c USER editable property of a QLineEdit. - If \a object is null, the function returns \c false if the \c + If \a object is \nullptr, the function returns \c false if the \c {Q_PROPERTY()}'s \c USER attribute is false. Otherwise it returns true. diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 1efb49017f..fcd92afd89 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -183,7 +183,7 @@ private: // signature() has been renamed to methodSignature() in Qt 5. // Warning, that function returns a QByteArray; check the life time if // you convert to char*. - char *signature(struct renamedInQt5_warning_checkTheLifeTime * = nullptr) Q_DECL_EQ_DELETE; + char *signature(struct renamedInQt5_warning_checkTheLifeTime * = nullptr) = delete; #endif static QMetaMethod fromSignalImpl(const QMetaObject *, void **); @@ -254,6 +254,7 @@ public: QVariant::Type type() const; int userType() const; int propertyIndex() const; + int relativePropertyIndex() const; bool isReadable() const; bool isWritable() const; diff --git a/src/corelib/kernel/qmetaobject_moc_p.h b/src/corelib/kernel/qmetaobject_moc_p.h index ad258acfcd..8c7900767b 100644 --- a/src/corelib/kernel/qmetaobject_moc_p.h +++ b/src/corelib/kernel/qmetaobject_moc_p.h @@ -138,7 +138,7 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc { "struct ", 7 }, { "class ", 6 }, { "enum ", 5 }, - { 0, 0 } + { nullptr, 0 } }; int i = 0; do { @@ -146,7 +146,7 @@ static QByteArray normalizeTypeInternal(const char *t, const char *e, bool fixSc t += optional[i].len; break; } - } while (optional[++i].keyword != 0); + } while (optional[++i].keyword != nullptr); } bool star = false; diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 522bd78e42..0cd9da2eac 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -54,6 +54,7 @@ #include <QtCore/qglobal.h> #include <QtCore/qobjectdefs.h> +#include <QtCore/qmutex.h> #ifndef QT_NO_QOBJECT #include <private/qobject_p.h> // For QObjectPrivate::Connection #endif @@ -168,7 +169,6 @@ Q_DECLARE_TYPEINFO(QArgumentType, Q_MOVABLE_TYPE); typedef QVarLengthArray<QArgumentType, 10> QArgumentTypeArray; class QMetaMethodPrivate; -class QMutex; struct QMetaObjectPrivate { @@ -226,15 +226,15 @@ struct QMetaObjectPrivate static QObjectPrivate::Connection *connect(const QObject *sender, int signal_index, const QMetaObject *smeta, const QObject *receiver, int method_index_relative, - const QMetaObject *rmeta = 0, - int type = 0, int *types = 0); + const QMetaObject *rmeta = nullptr, + int type = 0, int *types = nullptr); static bool disconnect(const QObject *sender, int signal_index, const QMetaObject *smeta, const QObject *receiver, int method_index, void **slot, DisconnectType = DisconnectAll); - static inline bool disconnectHelper(QObjectPrivate::Connection *c, + static inline bool disconnectHelper(QObjectPrivate::ConnectionData *connections, int signalIndex, const QObject *receiver, int method_index, void **slot, - QMutex *senderMutex, DisconnectType = DisconnectAll); + QBasicMutex *senderMutex, DisconnectType = DisconnectAll); #endif }; diff --git a/src/corelib/kernel/qmetaobjectbuilder_p.h b/src/corelib/kernel/qmetaobjectbuilder_p.h index 115ec835aa..6d43be7811 100644 --- a/src/corelib/kernel/qmetaobjectbuilder_p.h +++ b/src/corelib/kernel/qmetaobjectbuilder_p.h @@ -173,7 +173,7 @@ public: void setStaticMetacallFunction(QMetaObjectBuilder::StaticMetacallFunction value); QMetaObject *toMetaObject() const; - QByteArray toRelocatableData(bool * = 0) const; + QByteArray toRelocatableData(bool * = nullptr) const; static void fromRelocatableData(QMetaObject *, const QMetaObject *, const QByteArray &); #ifndef QT_NO_DATASTREAM @@ -184,7 +184,7 @@ public: #endif private: - Q_DISABLE_COPY(QMetaObjectBuilder) + Q_DISABLE_COPY_MOVE(QMetaObjectBuilder) QMetaObjectBuilderPrivate *d; @@ -196,7 +196,7 @@ private: class Q_CORE_EXPORT QMetaMethodBuilder { public: - QMetaMethodBuilder() : _mobj(0), _index(0) {} + QMetaMethodBuilder() : _mobj(nullptr), _index(0) {} int index() const; @@ -238,7 +238,7 @@ private: class Q_CORE_EXPORT QMetaPropertyBuilder { public: - QMetaPropertyBuilder() : _mobj(0), _index(0) {} + QMetaPropertyBuilder() : _mobj(nullptr), _index(0) {} int index() const { return _index; } @@ -294,7 +294,7 @@ private: class Q_CORE_EXPORT QMetaEnumBuilder { public: - QMetaEnumBuilder() : _mobj(0), _index(0) {} + QMetaEnumBuilder() : _mobj(nullptr), _index(0) {} int index() const { return _index; } diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp index 632b86959d..754f5a13e4 100644 --- a/src/corelib/kernel/qmetatype.cpp +++ b/src/corelib/kernel/qmetatype.cpp @@ -51,6 +51,7 @@ #include "quuid.h" #include "qvariant.h" #include "qdatastream.h" +#include "qregexp.h" #include "qmetatypeswitcher_p.h" #if QT_CONFIG(regularexpression) @@ -290,6 +291,10 @@ struct DefinedTypesFilter { \value QJsonObject QJsonObject \value QJsonArray QJsonArray \value QJsonDocument QJsonDocument + \value QCborValue QCborValue + \value QCborArray QCborArray + \value QCborMap QCborMap + \value QCborSimpleType QCborSimpleType \value QModelIndex QModelIndex \value QPersistentModelIndex QPersistentModelIndex (since 5.5) \value QUuid QUuid @@ -373,6 +378,13 @@ struct DefinedTypesFilter { */ /*! + \fn int QMetaType::id() const + \since 5.13 + + Returns id type hold by this QMetatype instance. +*/ + +/*! \fn bool QMetaType::sizeOf() const \since 5.0 @@ -410,8 +422,8 @@ struct DefinedTypesFilter { pointer of this type. (given by QVariant::data for example) If the type is an enumeration, flags() contains QMetaType::IsEnumeration, and this function - returns the QMetaObject of the enclosing object if the enum was registered as a Q_ENUM or 0 - otherwise + returns the QMetaObject of the enclosing object if the enum was registered as a Q_ENUM or + \nullptr otherwise \sa QMetaType::metaObjectForType(), QMetaType::flags() */ @@ -421,7 +433,7 @@ struct DefinedTypesFilter { \since 5.0 Returns a copy of \a copy, assuming it is of the type that this - QMetaType instance was created for. If \a copy is null, creates + QMetaType instance was created for. If \a copy is \nullptr, creates a default constructed instance. \sa QMetaType::destroy() @@ -505,12 +517,12 @@ static const struct { const char * typeName; int typeNameLength; int type; } typ QT_FOR_EACH_STATIC_TYPE(QT_ADD_STATIC_METATYPE) QT_FOR_EACH_STATIC_ALIAS_TYPE(QT_ADD_STATIC_METATYPE_ALIASES_ITER) QT_FOR_EACH_STATIC_HACKS_TYPE(QT_ADD_STATIC_METATYPE_HACKS_ITER) - {0, 0, QMetaType::UnknownType} + {nullptr, 0, QMetaType::UnknownType} }; -Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper = 0; -Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeWidgetsHelper = 0; -Q_CORE_EXPORT const QMetaObject *qMetaObjectWidgetsHelper = 0; +Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeGuiHelper = nullptr; +Q_CORE_EXPORT const QMetaTypeInterface *qMetaTypeWidgetsHelper = nullptr; +Q_CORE_EXPORT const QMetaObject *qMetaObjectWidgetsHelper = nullptr; class QCustomTypeInfo : public QMetaTypeInterface { @@ -545,7 +557,7 @@ public: { const QWriteLocker locker(&lock); const T* &fun = map[k]; - if (fun != 0) + if (fun) return false; fun = f; return true; @@ -554,7 +566,7 @@ public: const T *function(Key k) const { const QReadLocker locker(&lock); - return map.value(k, 0); + return map.value(k, nullptr); } void remove(int from, int to) @@ -575,13 +587,7 @@ QMetaTypeComparatorRegistry; typedef QMetaTypeFunctionRegistry<QtPrivate::AbstractDebugStreamFunction,int> QMetaTypeDebugStreamRegistry; -namespace -{ -union CheckThatItIsPod -{ // This should break if QMetaTypeInterface is not a POD type - QMetaTypeInterface iface; -}; -} +Q_STATIC_ASSERT(std::is_pod<QMetaTypeInterface>::value); Q_DECLARE_TYPEINFO(QCustomTypeInfo, Q_MOVABLE_TYPE); Q_GLOBAL_STATIC(QVector<QCustomTypeInfo>, customTypes) @@ -904,7 +910,7 @@ template <int... TypeIds> struct MetaTypeOffsets<QtPrivate::IndexesList<TypeIds. short offsets[sizeof...(TypeIds)]; constexpr MetaTypeOffsets() : offsets{calculateOffsetForTypeId(TypeIds)...} {} - const char *operator[](int typeId) const Q_DECL_NOTHROW + const char *operator[](int typeId) const noexcept { short o = offsets[typeId]; return o < 0 ? nullptr : metaTypeStrings + o; @@ -961,7 +967,7 @@ static inline int qMetaTypeStaticType(const char *typeName, int length) The extra \a firstInvalidIndex parameter is an easy way to avoid iterating over customTypes() a second time in registerNormalizedType(). */ -static int qMetaTypeCustomType_unlocked(const char *typeName, int length, int *firstInvalidIndex = 0) +static int qMetaTypeCustomType_unlocked(const char *typeName, int length, int *firstInvalidIndex = nullptr) { const QVector<QCustomTypeInfo> * const ct = customTypes(); if (!ct) @@ -994,7 +1000,7 @@ int QMetaType::registerType(const char *typeName, Deleter deleter, { return registerType(typeName, deleter, creator, QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Destruct, - QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct, 0, TypeFlags(), 0); + QtMetaTypePrivate::QMetaTypeFunctionHelper<void>::Construct, 0, TypeFlags(), nullptr); } /*! @@ -1374,236 +1380,197 @@ int QMetaType::type(const QT_PREPEND_NAMESPACE(QByteArray) &typeName) } #ifndef QT_NO_DATASTREAM -/*! - Writes the object pointed to by \a data with the ID \a type to - the given \a stream. Returns \c true if the object is saved - successfully; otherwise returns \c false. - The type must have been registered with qRegisterMetaType() and - qRegisterMetaTypeStreamOperators() beforehand. +namespace +{ - Normally, you should not need to call this function directly. - Instead, use QVariant's \c operator<<(), which relies on save() - to stream custom types. +template<typename T> +class HasStreamOperator +{ + struct Yes { char unused[1]; }; + struct No { char unused[2]; }; + Q_STATIC_ASSERT(sizeof(Yes) != sizeof(No)); + + template<class C> static decltype(std::declval<QDataStream&>().operator>>(std::declval<C&>()), Yes()) load(int); + template<class C> static decltype(operator>>(std::declval<QDataStream&>(), std::declval<C&>()), Yes()) load(int); + template<class C> static No load(...); + template<class C> static decltype(operator<<(std::declval<QDataStream&>(), std::declval<const C&>()), Yes()) saveFunction(int); + template<class C> static decltype(std::declval<QDataStream&>().operator<<(std::declval<const C&>()), Yes()) saveMethod(int); + template<class C> static No saveMethod(...); + template<class C> static No saveFunction(...); + static constexpr bool LoadValue = QtMetaTypePrivate::TypeDefinition<T>::IsAvailable && (sizeof(load<T>(0)) == sizeof(Yes)); + static constexpr bool SaveValue = QtMetaTypePrivate::TypeDefinition<T>::IsAvailable && + ((sizeof(saveMethod<T>(0)) == sizeof(Yes)) || (sizeof(saveFunction<T>(0)) == sizeof(Yes))); +public: + static constexpr bool Value = LoadValue && SaveValue; +}; - \sa load(), qRegisterMetaTypeStreamOperators() -*/ -bool QMetaType::save(QDataStream &stream, int type, const void *data) +// Quick sanity checks +Q_STATIC_ASSERT(HasStreamOperator<NS(QJsonDocument)>::Value); +Q_STATIC_ASSERT(!HasStreamOperator<void*>::Value); +Q_STATIC_ASSERT(HasStreamOperator<qint8>::Value); + +template<typename T, bool IsAcceptedType = DefinedTypesFilter::Acceptor<T>::IsAccepted && HasStreamOperator<T>::Value> +struct FilteredOperatorSwitch +{ + static bool load(QDataStream &stream, T *data, int) + { + stream >> *data; + return true; + } + static bool save(QDataStream &stream, const T *data, int) + { + stream << *data; + return true; + } +}; +template<typename T> +struct FilteredOperatorSwitch<T, /* IsAcceptedType = */ false> { - if (!data || !isRegistered(type)) + static const QMetaTypeInterface* getMetaTypeInterface(int type) + { + if (QModulesPrivate::QTypeModuleInfo<T>::IsGui && qMetaTypeGuiHelper) + return &qMetaTypeGuiHelper[type - QMetaType::FirstGuiType]; + else if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget && qMetaTypeWidgetsHelper) + return &qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType]; + return nullptr; + } + static bool save(QDataStream &stream, const T *data, int type) + { + if (auto interface = getMetaTypeInterface(type)) { + interface->saveOp(stream, data); + return true; + } return false; - - switch(type) { - case QMetaType::UnknownType: - case QMetaType::Void: - case QMetaType::VoidStar: - case QMetaType::QObjectStar: -#if QT_CONFIG(itemmodel) - case QMetaType::QModelIndex: - case QMetaType::QPersistentModelIndex: -#endif - case QMetaType::QJsonValue: - case QMetaType::QJsonObject: - case QMetaType::QJsonArray: - case QMetaType::QJsonDocument: - case QMetaType::QCborValue: - case QMetaType::QCborArray: - case QMetaType::QCborMap: + } + static bool load(QDataStream &stream, T *data, int type) + { + if (auto interface = getMetaTypeInterface(type)) { + interface->loadOp(stream, data); + return true; + } return false; - case QMetaType::Nullptr: - stream << *static_cast<const std::nullptr_t *>(data); - return true; - case QMetaType::Long: - stream << qlonglong(*static_cast<const long *>(data)); - break; - case QMetaType::Int: - stream << *static_cast<const int *>(data); - break; - case QMetaType::Short: - stream << *static_cast<const short *>(data); - break; - case QMetaType::Char: + } +}; + +class SaveOperatorSwitch +{ +public: + QDataStream &stream; + int m_type; + + template<typename T> + bool delegate(const T *data) + { + return FilteredOperatorSwitch<T>::save(stream, data, m_type); + } + bool delegate(const char *data) + { // force a char to be signed - stream << *static_cast<const signed char *>(data); - break; - case QMetaType::ULong: - stream << qulonglong(*static_cast<const ulong *>(data)); - break; - case QMetaType::UInt: - stream << *static_cast<const uint *>(data); - break; - case QMetaType::LongLong: - stream << *static_cast<const qlonglong *>(data); - break; - case QMetaType::ULongLong: - stream << *static_cast<const qulonglong *>(data); - break; - case QMetaType::UShort: - stream << *static_cast<const ushort *>(data); - break; - case QMetaType::SChar: - stream << *static_cast<const signed char *>(data); - break; - case QMetaType::UChar: - stream << *static_cast<const uchar *>(data); - break; - case QMetaType::Bool: - stream << qint8(*static_cast<const bool *>(data)); - break; - case QMetaType::Float: - stream << *static_cast<const float *>(data); - break; - case QMetaType::Double: - stream << *static_cast<const double *>(data); - break; - case QMetaType::QChar: - stream << *static_cast<const NS(QChar) *>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QVariantMap: - stream << *static_cast<const NS(QVariantMap)*>(data); - break; - case QMetaType::QVariantHash: - stream << *static_cast<const NS(QVariantHash)*>(data); - break; - case QMetaType::QVariantList: - stream << *static_cast<const NS(QVariantList)*>(data); - break; - case QMetaType::QVariant: - stream << *static_cast<const NS(QVariant)*>(data); - break; - case QMetaType::QByteArrayList: - stream << *static_cast<const NS(QByteArrayList)*>(data); - break; -#endif - case QMetaType::QByteArray: - stream << *static_cast<const NS(QByteArray)*>(data); - break; - case QMetaType::QString: - stream << *static_cast<const NS(QString)*>(data); - break; - case QMetaType::QStringList: - stream << *static_cast<const NS(QStringList)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QBitArray: - stream << *static_cast<const NS(QBitArray)*>(data); - break; -#endif - case QMetaType::QDate: - stream << *static_cast<const NS(QDate)*>(data); - break; - case QMetaType::QTime: - stream << *static_cast<const NS(QTime)*>(data); - break; - case QMetaType::QDateTime: - stream << *static_cast<const NS(QDateTime)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QUrl: - stream << *static_cast<const NS(QUrl)*>(data); - break; -#endif - case QMetaType::QLocale: - stream << *static_cast<const NS(QLocale)*>(data); - break; -#ifndef QT_NO_GEOM_VARIANT - case QMetaType::QRect: - stream << *static_cast<const NS(QRect)*>(data); - break; - case QMetaType::QRectF: - stream << *static_cast<const NS(QRectF)*>(data); - break; - case QMetaType::QSize: - stream << *static_cast<const NS(QSize)*>(data); - break; - case QMetaType::QSizeF: - stream << *static_cast<const NS(QSizeF)*>(data); - break; - case QMetaType::QLine: - stream << *static_cast<const NS(QLine)*>(data); - break; - case QMetaType::QLineF: - stream << *static_cast<const NS(QLineF)*>(data); - break; - case QMetaType::QPoint: - stream << *static_cast<const NS(QPoint)*>(data); - break; - case QMetaType::QPointF: - stream << *static_cast<const NS(QPointF)*>(data); - break; -#endif -#ifndef QT_NO_REGEXP - case QMetaType::QRegExp: - stream << *static_cast<const NS(QRegExp)*>(data); - break; -#endif -#if QT_CONFIG(regularexpression) - case QMetaType::QRegularExpression: - stream << *static_cast<const NS(QRegularExpression)*>(data); - break; -#endif // QT_CONFIG(regularexpression) -#ifndef QT_BOOTSTRAPPED - case QMetaType::QEasingCurve: - stream << *static_cast<const NS(QEasingCurve)*>(data); - break; - case QMetaType::QCborSimpleType: - stream << *static_cast<const quint8 *>(data); - break; -#endif // QT_BOOTSTRAPPED - case QMetaType::QFont: - case QMetaType::QPixmap: - case QMetaType::QBrush: - case QMetaType::QColor: - case QMetaType::QPalette: - case QMetaType::QImage: - case QMetaType::QPolygon: - case QMetaType::QPolygonF: - case QMetaType::QRegion: - case QMetaType::QBitmap: - case QMetaType::QCursor: - case QMetaType::QKeySequence: - case QMetaType::QPen: - case QMetaType::QTextLength: - case QMetaType::QTextFormat: - case QMetaType::QMatrix: - case QMetaType::QTransform: - case QMetaType::QMatrix4x4: - case QMetaType::QVector2D: - case QMetaType::QVector3D: - case QMetaType::QVector4D: - case QMetaType::QQuaternion: - case QMetaType::QIcon: - if (!qMetaTypeGuiHelper) - return false; - qMetaTypeGuiHelper[type - FirstGuiType].saveOp(stream, data); - break; - case QMetaType::QSizePolicy: - if (!qMetaTypeWidgetsHelper) - return false; - qMetaTypeWidgetsHelper[type - FirstWidgetsType].saveOp(stream, data); - break; - case QMetaType::QUuid: - stream << *static_cast<const NS(QUuid)*>(data); - break; - default: { + stream << qint8(*data); + return true; + } + bool delegate(const long *data) + { + stream << qlonglong(*data); + return true; + } + bool delegate(const unsigned long *data) + { + stream << qulonglong(*data); + return true; + } + bool delegate(const QMetaTypeSwitcher::NotBuiltinType *data) + { const QVector<QCustomTypeInfo> * const ct = customTypes(); if (!ct) return false; - - SaveOperator saveOp = 0; + QMetaType::SaveOperator saveOp = nullptr; { QReadLocker locker(customTypesLock()); - saveOp = ct->at(type - User).saveOp; + saveOp = ct->at(m_type - QMetaType::User).saveOp; } - if (!saveOp) return false; saveOp(stream, data); - break; } + return true; } + bool delegate(const void*) { return false; } + bool delegate(const QMetaTypeSwitcher::UnknownType*) { return false; } +}; +class LoadOperatorSwitch +{ +public: + QDataStream &stream; + int m_type; - return true; + template<typename T> + bool delegate(const T *data) + { + return FilteredOperatorSwitch<T>::load(stream, const_cast<T*>(data), m_type); + } + bool delegate(const char *data) + { + // force a char to be signed + qint8 c; + stream >> c; + *const_cast<char*>(data) = c; + return true; + } + bool delegate(const long *data) + { + qlonglong l; + stream >> l; + *const_cast<long*>(data) = l; + return true; + } + bool delegate(const unsigned long *data) + { + qlonglong l; + stream >> l; + *const_cast<unsigned long*>(data) = l; + return true; + } + bool delegate(const QMetaTypeSwitcher::NotBuiltinType *data) + { + const QVector<QCustomTypeInfo> * const ct = customTypes(); + if (!ct) + return false; + QMetaType::LoadOperator loadOp = nullptr; + { + QReadLocker locker(customTypesLock()); + loadOp = ct->at(m_type - QMetaType::User).loadOp; + } + if (!loadOp) + return false; + loadOp(stream, const_cast<QMetaTypeSwitcher::NotBuiltinType*>(data)); + return true; + } + bool delegate(const void*) { return false; } + bool delegate(const QMetaTypeSwitcher::UnknownType*) { return false; } +}; +} // namespace + +/*! + Writes the object pointed to by \a data with the ID \a type to + the given \a stream. Returns \c true if the object is saved + successfully; otherwise returns \c false. + + The type must have been registered with qRegisterMetaType() and + qRegisterMetaTypeStreamOperators() beforehand. + + Normally, you should not need to call this function directly. + Instead, use QVariant's \c operator<<(), which relies on save() + to stream custom types. + + \sa load(), qRegisterMetaTypeStreamOperators() +*/ +bool QMetaType::save(QDataStream &stream, int type, const void *data) +{ + if (!data) + return false; + SaveOperatorSwitch saveOp{stream, type}; + return QMetaTypeSwitcher::switcher<bool>(saveOp, type, data); } /*! @@ -1622,225 +1589,10 @@ bool QMetaType::save(QDataStream &stream, int type, const void *data) */ bool QMetaType::load(QDataStream &stream, int type, void *data) { - if (!data || !isRegistered(type)) + if (!data) return false; - - switch(type) { - case QMetaType::UnknownType: - case QMetaType::Void: - case QMetaType::VoidStar: - case QMetaType::QObjectStar: -#if QT_CONFIG(itemmodel) - case QMetaType::QModelIndex: - case QMetaType::QPersistentModelIndex: -#endif - case QMetaType::QJsonValue: - case QMetaType::QJsonObject: - case QMetaType::QJsonArray: - case QMetaType::QJsonDocument: - case QMetaType::QCborValue: - case QMetaType::QCborArray: - case QMetaType::QCborMap: - return false; - case QMetaType::Nullptr: - stream >> *static_cast<std::nullptr_t *>(data); - return true; - case QMetaType::Long: { - qlonglong l; - stream >> l; - *static_cast<long *>(data) = long(l); - break; } - case QMetaType::Int: - stream >> *static_cast<int *>(data); - break; - case QMetaType::Short: - stream >> *static_cast<short *>(data); - break; - case QMetaType::Char: - // force a char to be signed - stream >> *static_cast<signed char *>(data); - break; - case QMetaType::ULong: { - qulonglong ul; - stream >> ul; - *static_cast<ulong *>(data) = ulong(ul); - break; } - case QMetaType::UInt: - stream >> *static_cast<uint *>(data); - break; - case QMetaType::LongLong: - stream >> *static_cast<qlonglong *>(data); - break; - case QMetaType::ULongLong: - stream >> *static_cast<qulonglong *>(data); - break; - case QMetaType::UShort: - stream >> *static_cast<ushort *>(data); - break; - case QMetaType::SChar: - stream >> *static_cast<signed char *>(data); - break; - case QMetaType::UChar: - stream >> *static_cast<uchar *>(data); - break; - case QMetaType::Bool: { - qint8 b; - stream >> b; - *static_cast<bool *>(data) = b; - break; } - case QMetaType::Float: - stream >> *static_cast<float *>(data); - break; - case QMetaType::Double: - stream >> *static_cast<double *>(data); - break; - case QMetaType::QChar: - stream >> *static_cast< NS(QChar)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QVariantMap: - stream >> *static_cast< NS(QVariantMap)*>(data); - break; - case QMetaType::QVariantHash: - stream >> *static_cast< NS(QVariantHash)*>(data); - break; - case QMetaType::QVariantList: - stream >> *static_cast< NS(QVariantList)*>(data); - break; - case QMetaType::QVariant: - stream >> *static_cast< NS(QVariant)*>(data); - break; - case QMetaType::QByteArrayList: - stream >> *static_cast< NS(QByteArrayList)*>(data); - break; -#endif - case QMetaType::QByteArray: - stream >> *static_cast< NS(QByteArray)*>(data); - break; - case QMetaType::QString: - stream >> *static_cast< NS(QString)*>(data); - break; - case QMetaType::QStringList: - stream >> *static_cast< NS(QStringList)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QBitArray: - stream >> *static_cast< NS(QBitArray)*>(data); - break; -#endif - case QMetaType::QDate: - stream >> *static_cast< NS(QDate)*>(data); - break; - case QMetaType::QTime: - stream >> *static_cast< NS(QTime)*>(data); - break; - case QMetaType::QDateTime: - stream >> *static_cast< NS(QDateTime)*>(data); - break; -#ifndef QT_BOOTSTRAPPED - case QMetaType::QUrl: - stream >> *static_cast< NS(QUrl)*>(data); - break; -#endif - case QMetaType::QLocale: - stream >> *static_cast< NS(QLocale)*>(data); - break; -#ifndef QT_NO_GEOM_VARIANT - case QMetaType::QRect: - stream >> *static_cast< NS(QRect)*>(data); - break; - case QMetaType::QRectF: - stream >> *static_cast< NS(QRectF)*>(data); - break; - case QMetaType::QSize: - stream >> *static_cast< NS(QSize)*>(data); - break; - case QMetaType::QSizeF: - stream >> *static_cast< NS(QSizeF)*>(data); - break; - case QMetaType::QLine: - stream >> *static_cast< NS(QLine)*>(data); - break; - case QMetaType::QLineF: - stream >> *static_cast< NS(QLineF)*>(data); - break; - case QMetaType::QPoint: - stream >> *static_cast< NS(QPoint)*>(data); - break; - case QMetaType::QPointF: - stream >> *static_cast< NS(QPointF)*>(data); - break; -#endif -#ifndef QT_NO_REGEXP - case QMetaType::QRegExp: - stream >> *static_cast< NS(QRegExp)*>(data); - break; -#endif -#if QT_CONFIG(regularexpression) - case QMetaType::QRegularExpression: - stream >> *static_cast< NS(QRegularExpression)*>(data); - break; -#endif // QT_CONFIG(regularexpression) -#ifndef QT_BOOTSTRAPPED - case QMetaType::QEasingCurve: - stream >> *static_cast< NS(QEasingCurve)*>(data); - break; - case QMetaType::QCborSimpleType: - stream >> *static_cast<quint8 *>(data); - break; -#endif // QT_BOOTSTRAPPED - case QMetaType::QFont: - case QMetaType::QPixmap: - case QMetaType::QBrush: - case QMetaType::QColor: - case QMetaType::QPalette: - case QMetaType::QImage: - case QMetaType::QPolygon: - case QMetaType::QPolygonF: - case QMetaType::QRegion: - case QMetaType::QBitmap: - case QMetaType::QCursor: - case QMetaType::QKeySequence: - case QMetaType::QPen: - case QMetaType::QTextLength: - case QMetaType::QTextFormat: - case QMetaType::QMatrix: - case QMetaType::QTransform: - case QMetaType::QMatrix4x4: - case QMetaType::QVector2D: - case QMetaType::QVector3D: - case QMetaType::QVector4D: - case QMetaType::QQuaternion: - case QMetaType::QIcon: - if (!qMetaTypeGuiHelper) - return false; - qMetaTypeGuiHelper[type - FirstGuiType].loadOp(stream, data); - break; - case QMetaType::QSizePolicy: - if (!qMetaTypeWidgetsHelper) - return false; - qMetaTypeWidgetsHelper[type - FirstWidgetsType].loadOp(stream, data); - break; - case QMetaType::QUuid: - stream >> *static_cast< NS(QUuid)*>(data); - break; - default: { - const QVector<QCustomTypeInfo> * const ct = customTypes(); - if (!ct) - return false; - - LoadOperator loadOp = 0; - { - QReadLocker locker(customTypesLock()); - loadOp = ct->at(type - User).loadOp; - } - - if (!loadOp) - return false; - loadOp(stream, data); - break; } - } - return true; + LoadOperatorSwitch loadOp{stream, type}; + return QMetaTypeSwitcher::switcher<bool>(loadOp, type, data); } #endif // QT_NO_DATASTREAM @@ -1855,7 +1607,7 @@ void *QMetaType::create(int type, const void *copy) QMetaType info(type); if (int size = info.sizeOf()) return info.construct(operator new(size), copy); - return 0; + return nullptr; } /*! @@ -1881,14 +1633,18 @@ class TypeConstructor { static void *Construct(const int type, void *where, const void *copy) { if (QModulesPrivate::QTypeModuleInfo<T>::IsGui) - return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].constructor(where, copy) : 0; + return Q_LIKELY(qMetaTypeGuiHelper) + ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].constructor(where, copy) + : nullptr; if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget) - return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].constructor(where, copy) : 0; + return Q_LIKELY(qMetaTypeWidgetsHelper) + ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].constructor(where, copy) + : nullptr; // This point can be reached only for known types that definition is not available, for example // in bootstrap mode. We have no other choice then ignore it. - return 0; + return nullptr; } }; public: @@ -1912,7 +1668,7 @@ private: { QReadLocker locker(customTypesLock()); if (Q_UNLIKELY(type < QMetaType::User || !ct || ct->count() <= type - QMetaType::User)) - return 0; + return nullptr; const auto &typeInfo = ct->at(type - QMetaType::User); ctor = typeInfo.constructor; tctor = typeInfo.typedConstructor; @@ -1957,7 +1713,7 @@ private: void *QMetaType::construct(int type, void *where, const void *copy) { if (!where) - return 0; + return nullptr; TypeConstructor constructor(type, where); return QMetaTypeSwitcher::switcher<void*>(constructor, type, copy); } @@ -2103,7 +1859,7 @@ private: int QMetaType::sizeOf(int type) { SizeOf sizeOf(type); - return QMetaTypeSwitcher::switcher<int>(sizeOf, type, 0); + return QMetaTypeSwitcher::switcher<int>(sizeOf, type); } namespace { @@ -2167,7 +1923,7 @@ private: QMetaType::TypeFlags QMetaType::typeFlags(int type) { Flags flags(type); - return static_cast<QMetaType::TypeFlags>(QMetaTypeSwitcher::switcher<quint32>(flags, type, 0)); + return static_cast<QMetaType::TypeFlags>(QMetaTypeSwitcher::switcher<quint32>(flags, type)); } #ifndef QT_BOOTSTRAPPED @@ -2190,17 +1946,21 @@ public: { static const QMetaObject *MetaObject(int type) { if (QModulesPrivate::QTypeModuleInfo<T>::IsGui) - return Q_LIKELY(qMetaTypeGuiHelper) ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].metaObject : 0; + return Q_LIKELY(qMetaTypeGuiHelper) + ? qMetaTypeGuiHelper[type - QMetaType::FirstGuiType].metaObject + : nullptr; if (QModulesPrivate::QTypeModuleInfo<T>::IsWidget) - return Q_LIKELY(qMetaTypeWidgetsHelper) ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].metaObject : 0; + return Q_LIKELY(qMetaTypeWidgetsHelper) + ? qMetaTypeWidgetsHelper[type - QMetaType::FirstWidgetsType].metaObject + : nullptr; return 0; } }; template <typename T> const QMetaObject *delegate(const T *) { return MetaObjectImpl<T>::MetaObject(m_type); } - const QMetaObject *delegate(const void*) { return 0; } - const QMetaObject *delegate(const QMetaTypeSwitcher::UnknownType*) { return 0; } + const QMetaObject *delegate(const void*) { return nullptr; } + const QMetaObject *delegate(const QMetaTypeSwitcher::UnknownType*) { return nullptr; } const QMetaObject *delegate(const QMetaTypeSwitcher::NotBuiltinType*) { return customMetaObject(m_type); } private: const int m_type; @@ -2208,10 +1968,10 @@ private: { const QVector<QCustomTypeInfo> * const ct = customTypes(); if (Q_UNLIKELY(!ct || type < QMetaType::User)) - return 0; + return nullptr; QReadLocker locker(customTypesLock()); if (Q_UNLIKELY(ct->count() <= type - QMetaType::User)) - return 0; + return nullptr; return ct->at(type - QMetaType::User).metaObject; } }; @@ -2229,10 +1989,10 @@ const QMetaObject *QMetaType::metaObjectForType(int type) { #ifndef QT_BOOTSTRAPPED MetaObject mo(type); - return QMetaTypeSwitcher::switcher<const QMetaObject*>(mo, type, 0); + return QMetaTypeSwitcher::switcher<const QMetaObject*>(mo, type); #else Q_UNUSED(type); - return 0; + return nullptr; #endif } @@ -2429,7 +2189,7 @@ private: QMetaType QMetaType::typeInfo(const int type) { TypeInfo typeInfo(type); - QMetaTypeSwitcher::switcher<void>(typeInfo, type, 0); + QMetaTypeSwitcher::switcher<void>(typeInfo, type); return (typeInfo.info.constructor || typeInfo.info.typedConstructor) ? QMetaType(static_cast<ExtensionFlag>(QMetaType::CreateEx | QMetaType::DestroyEx | (typeInfo.info.typedConstructor ? QMetaType::ConstructEx | QMetaType::DestructEx : 0)) @@ -2549,7 +2309,7 @@ void QMetaType::dtor() void *QMetaType::createExtended(const void *copy) const { if (m_typeId == QMetaType::UnknownType) - return 0; + return nullptr; if (Q_UNLIKELY(m_typedConstructor && !m_constructor)) return m_typedConstructor(m_typeId, operator new(m_size), copy); return m_constructor(operator new(m_size), copy); @@ -2629,7 +2389,7 @@ uint QMetaType::sizeExtended() const */ QMetaType::TypeFlags QMetaType::flagsExtended() const { - return 0; + return { }; } /*! @@ -2642,7 +2402,7 @@ QMetaType::TypeFlags QMetaType::flagsExtended() const */ const QMetaObject *QMetaType::metaObjectExtended() const { - return 0; + return nullptr; } @@ -2651,7 +2411,7 @@ namespace QtPrivate const QMetaObject *metaObjectForQWidget() { if (!qMetaTypeWidgetsHelper) - return 0; + return nullptr; return qMetaObjectWidgetsHelper; } } diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index ed7feee775..9fe2b9733b 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -570,6 +570,7 @@ public: inline bool isValid() const; inline bool isRegistered() const; + inline int id() const; inline int sizeOf() const; inline TypeFlags flags() const; inline const QMetaObject *metaObject() const; @@ -848,7 +849,7 @@ struct VariantData const uint flags; private: // copy constructor allowed to be implicit to silence level 4 warning from MSVC - VariantData &operator=(const VariantData &) Q_DECL_EQ_DELETE; + VariantData &operator=(const VariantData &) = delete; }; template<typename const_iterator> @@ -1714,12 +1715,17 @@ namespace QtPrivate { } }; + // hack to delay name lookup to instantiation time by making + // EnableInternalData a dependent name: + template <typename T> + struct EnableInternalDataWrap; + template<typename T> struct QSmartPointerConvertFunctor<QWeakPointer<T> > { QObject* operator()(const QWeakPointer<T> &p) const { - return p.data(); + return QtPrivate::EnableInternalDataWrap<T>::internalData(p); } }; } @@ -1976,7 +1982,9 @@ QT_FOR_EACH_STATIC_WIDGETS_CLASS(QT_FORWARD_DECLARE_STATIC_TYPES_ITER) typedef QList<QVariant> QVariantList; typedef QMap<QString, QVariant> QVariantMap; typedef QHash<QString, QVariant> QVariantHash; -#ifndef Q_CLANG_QDOC +#ifdef Q_CLANG_QDOC +class QByteArrayList; +#else typedef QList<QByteArray> QByteArrayList; #endif @@ -1991,7 +1999,7 @@ struct QMetaTypeId< SINGLE_ARG_TEMPLATE<T> > \ static int qt_metatype_id() \ { \ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \ - if (const int id = metatype_id.load()) \ + if (const int id = metatype_id.loadRelaxed()) \ return id; \ const char *tName = QMetaType::typeName(qMetaTypeId<T>()); \ Q_ASSERT(tName); \ @@ -2221,6 +2229,11 @@ inline bool QMetaType::isRegistered() const return isValid(); } +inline int QMetaType::id() const +{ + return m_typeId; +} + inline void *QMetaType::create(const void *copy) const { // ### TODO Qt6 remove the extension diff --git a/src/corelib/kernel/qmetatype_p.h b/src/corelib/kernel/qmetatype_p.h index 94e9228778..97d6001937 100644 --- a/src/corelib/kernel/qmetatype_p.h +++ b/src/corelib/kernel/qmetatype_p.h @@ -87,7 +87,7 @@ template<> \ class QTypeModuleInfo<TYPE > \ { \ public: \ - enum Module { \ + enum Module : bool { \ IsCore = (((MODULE) == (QModulesPrivate::Core))), \ IsWidget = (((MODULE) == (QModulesPrivate::Widgets))), \ IsGui = (((MODULE) == (QModulesPrivate::Gui))), \ @@ -140,12 +140,12 @@ public: /*saveOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Save), \ /*loadOp*/(QtMetaTypePrivate::QMetaTypeFunctionHelper<Type, QtMetaTypePrivate::TypeDefinition<Type>::IsAvailable>::Load), # define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \ - /*saveOp*/ 0, \ - /*loadOp*/ 0, + /*saveOp*/ nullptr, \ + /*loadOp*/ nullptr, #else # define QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) \ - /*saveOp*/ 0, \ - /*loadOp*/ 0, + /*saveOp*/ nullptr, \ + /*loadOp*/ nullptr, # define QT_METATYPE_INTERFACE_INIT_DATASTREAM_IMPL(Type) \ QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(Type) #endif @@ -153,7 +153,7 @@ public: #ifndef QT_BOOTSTRAPPED #define METAOBJECT_DELEGATE(Type) (QtPrivate::MetaObjectForType<Type>::value()) #else -#define METAOBJECT_DELEGATE(Type) 0 +#define METAOBJECT_DELEGATE(Type) nullptr #endif #define QT_METATYPE_INTERFACE_INIT_IMPL(Type, DATASTREAM_DELEGATE) \ @@ -184,11 +184,11 @@ public: #define QT_METATYPE_INTERFACE_INIT_EMPTY() \ { \ QT_METATYPE_INTERFACE_INIT_EMPTY_DATASTREAM_IMPL(void) \ - /*constructor*/ 0, \ - /*destructor*/ 0, \ + /*constructor*/ nullptr, \ + /*destructor*/ nullptr, \ /*size*/ 0, \ /*flags*/ 0, \ - /*metaObject*/ 0 , \ + /*metaObject*/ nullptr , \ /*typedConstructor*/ nullptr, \ /*typedDestructor*/ nullptr \ } diff --git a/src/corelib/kernel/qmetatypeswitcher_p.h b/src/corelib/kernel/qmetatypeswitcher_p.h index 154fb8ab7f..dabc70f4b0 100644 --- a/src/corelib/kernel/qmetatypeswitcher_p.h +++ b/src/corelib/kernel/qmetatypeswitcher_p.h @@ -60,7 +60,7 @@ public: class NotBuiltinType; // type is not a built-in type, but it may be a custom type or an unknown type class UnknownType; // type not known to QMetaType system template<class ReturnType, class DelegateObject> - static ReturnType switcher(DelegateObject &logic, int type, const void *data); + static ReturnType switcher(DelegateObject &logic, int type, const void *data = nullptr); }; diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp index c8ad1bc43f..9a98db21d3 100644 --- a/src/corelib/kernel/qmimedata.cpp +++ b/src/corelib/kernel/qmimedata.cpp @@ -51,6 +51,7 @@ QT_BEGIN_NAMESPACE static inline QString textUriListLiteral() { return QStringLiteral("text/uri-list"); } static inline QString textHtmlLiteral() { return QStringLiteral("text/html"); } static inline QString textPlainLiteral() { return QStringLiteral("text/plain"); } +static inline QString textPlainUtf8Literal() { return QStringLiteral("text/plain;charset=utf-8"); } static inline QString applicationXColorLiteral() { return QStringLiteral("application/x-color"); } static inline QString applicationXQtImageLiteral() { return QStringLiteral("application/x-qt-image"); } @@ -399,6 +400,10 @@ bool QMimeData::hasUrls() const QString QMimeData::text() const { Q_D(const QMimeData); + QVariant utf8Text = d->retrieveTypedData(textPlainUtf8Literal(), QVariant::String); + if (!utf8Text.isNull()) + return utf8Text.toString(); + QVariant data = d->retrieveTypedData(textPlainLiteral(), QVariant::String); return data.toString(); } diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index 68c5460b6a..8f80be30bd 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Copyright (C) 2013 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ @@ -58,6 +58,7 @@ #include <qdebug.h> #include <qpair.h> #include <qvarlengtharray.h> +#include <qscopeguard.h> #include <qset.h> #if QT_CONFIG(thread) #include <qsemaphore.h> @@ -77,6 +78,12 @@ QT_BEGIN_NAMESPACE static int DIRECT_CONNECTION_ONLY = 0; +Q_CORE_EXPORT QBasicAtomicPointer<QSignalSpyCallbackSet> qt_signal_spy_callback_set = Q_BASIC_ATOMIC_INITIALIZER(nullptr); + +void qt_register_signal_spy_callbacks(QSignalSpyCallbackSet *callback_set) +{ + qt_signal_spy_callback_set.storeRelease(callback_set); +} QDynamicMetaObjectData::~QDynamicMetaObjectData() { @@ -146,10 +153,9 @@ static QBasicMutex _q_ObjectMutexPool[131]; * \internal * mutex to be locked when accessing the connectionlists or the senders list */ -static inline QMutex *signalSlotLock(const QObject *o) +static inline QBasicMutex *signalSlotLock(const QObject *o) { - return static_cast<QMutex *>(&_q_ObjectMutexPool[ - uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)]); + return &_q_ObjectMutexPool[uint(quintptr(o)) % sizeof(_q_ObjectMutexPool)/sizeof(QBasicMutex)]; } #if QT_VERSION < 0x60000 @@ -160,39 +166,6 @@ extern "C" Q_CORE_EXPORT void qt_removeObject(QObject *) {} #endif -struct QConnectionSenderSwitcher { - QObject *receiver; - QObjectPrivate::Sender *previousSender; - QObjectPrivate::Sender currentSender; - bool switched; - - inline QConnectionSenderSwitcher() : switched(false) {} - - inline QConnectionSenderSwitcher(QObject *receiver, QObject *sender, int signal_absolute_id) - { - switchSender(receiver, sender, signal_absolute_id); - } - - inline void switchSender(QObject *receiver, QObject *sender, int signal_absolute_id) - { - this->receiver = receiver; - currentSender.sender = sender; - currentSender.signal = signal_absolute_id; - currentSender.ref = 1; - previousSender = QObjectPrivate::setCurrentSender(receiver, ¤tSender); - switched = true; - } - - inline ~QConnectionSenderSwitcher() - { - if (switched) - QObjectPrivate::resetCurrentSender(receiver, ¤tSender, previousSender); - } -private: - Q_DISABLE_COPY(QConnectionSenderSwitcher) -}; - - void (*QAbstractDeclarativeData::destroyed)(QAbstractDeclarativeData *, QObject *) = 0; void (*QAbstractDeclarativeData::destroyed_qml1)(QAbstractDeclarativeData *, QObject *) = 0; void (*QAbstractDeclarativeData::parentChanged)(QAbstractDeclarativeData *, QObject *, QObject *) = 0; @@ -201,6 +174,12 @@ int (*QAbstractDeclarativeData::receivers)(QAbstractDeclarativeData *, const QO bool (*QAbstractDeclarativeData::isSignalConnected)(QAbstractDeclarativeData *, const QObject *, int) = 0; void (*QAbstractDeclarativeData::setWidgetParent)(QObject *, QObject *) = 0; +/*! + \fn QObjectData::QObjectData() + \internal + */ + + QObjectData::~QObjectData() {} QMetaObject *QObjectData::dynamicMetaObject() const @@ -209,7 +188,7 @@ QMetaObject *QObjectData::dynamicMetaObject() const } QObjectPrivate::QObjectPrivate(int version) - : threadData(0), connectionLists(0), senders(0), currentSender(0), currentChildBeingDeleted(0) + : threadData(0), currentChildBeingDeleted(0) { #ifdef QT_BUILD_INTERNAL // Don't check the version parameter in internal builds. @@ -232,7 +211,6 @@ QObjectPrivate::QObjectPrivate(int version) receiveChildEvents = true; postedEvents = 0; extraData = 0; - connectedSignals[0] = connectedSignals[1] = 0; metaObject = 0; isWindow = false; deleteLaterCalled = false; @@ -244,7 +222,7 @@ QObjectPrivate::~QObjectPrivate() if (Q_LIKELY(threadData->thread == QThread::currentThread())) { // unregister pending timers if (threadData->hasEventDispatcher()) - threadData->eventDispatcher.load()->unregisterTimers(q_ptr); + threadData->eventDispatcher.loadRelaxed()->unregisterTimers(q_ptr); // release the timer ids back to the pool for (int i = 0; i < extraData->runningTimers.size(); ++i) @@ -285,59 +263,22 @@ static void computeOffsets(const QMetaObject *metaobject, int *signalOffset, int } } -/* - This vector contains the all connections from an object. - - Each object may have one vector containing the lists of - connections for a given signal. The index in the vector correspond - to the signal index. The signal index is the one returned by - QObjectPrivate::signalIndex (not QMetaObject::indexOfSignal). - Negative index means connections to all signals. - - This vector is protected by the object mutex (signalSlotMutexes()) - - Each Connection is also part of a 'senders' linked list. The mutex - of the receiver must be locked when touching the pointers of this - linked list. -*/ -class QObjectConnectionListVector : public QVector<QObjectPrivate::ConnectionList> -{ -public: - bool orphaned; //the QObject owner of this vector has been destroyed while the vector was inUse - bool dirty; //some Connection have been disconnected (their receiver is 0) but not removed from the list yet - int inUse; //number of functions that are currently accessing this object or its connections - QObjectPrivate::ConnectionList allsignals; - - QObjectConnectionListVector() - : QVector<QObjectPrivate::ConnectionList>(), orphaned(false), dirty(false), inUse(0) - { } - - QObjectPrivate::ConnectionList &operator[](int at) - { - if (at < 0) - return allsignals; - return QVector<QObjectPrivate::ConnectionList>::operator[](at); - } -}; - // Used by QAccessibleWidget bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const { Q_Q(const QObject); int signal_index = signalIndex(signal); - if (signal_index < 0) + ConnectionData *cd = connections.loadRelaxed(); + if (signal_index < 0 || !cd) return false; - QMutexLocker locker(signalSlotLock(q)); - if (connectionLists) { - if (signal_index < connectionLists->count()) { - const QObjectPrivate::Connection *c = - connectionLists->at(signal_index).first; - - while (c) { - if (c->receiver == receiver) - return true; - c = c->nextConnectionList; - } + QBasicMutexLocker locker(signalSlotLock(q)); + if (signal_index < cd->signalVectorCount()) { + const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed(); + + while (c) { + if (c->receiver.loadRelaxed() == receiver) + return true; + c = c->nextConnectionList.loadRelaxed(); } } return false; @@ -346,21 +287,19 @@ bool QObjectPrivate::isSender(const QObject *receiver, const char *signal) const // Used by QAccessibleWidget QObjectList QObjectPrivate::receiverList(const char *signal) const { - Q_Q(const QObject); QObjectList returnValue; int signal_index = signalIndex(signal); - if (signal_index < 0) + ConnectionData *cd = connections.loadRelaxed(); + if (signal_index < 0 || !cd) return returnValue; - QMutexLocker locker(signalSlotLock(q)); - if (connectionLists) { - if (signal_index < connectionLists->count()) { - const QObjectPrivate::Connection *c = connectionLists->at(signal_index).first; - - while (c) { - if (c->receiver) - returnValue << c->receiver; - c = c->nextConnectionList; - } + if (signal_index < cd->signalVectorCount()) { + const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed(); + + while (c) { + QObject *r = c->receiver.loadRelaxed(); + if (r) + returnValue << r; + c = c->nextConnectionList.loadRelaxed(); } } return returnValue; @@ -370,9 +309,12 @@ QObjectList QObjectPrivate::receiverList(const char *signal) const QObjectList QObjectPrivate::senderList() const { QObjectList returnValue; - QMutexLocker locker(signalSlotLock(q_func())); - for (Connection *c = senders; c; c = c->next) - returnValue << c->sender; + ConnectionData *cd = connections.loadRelaxed(); + if (cd) { + QBasicMutexLocker locker(signalSlotLock(q_func())); + for (Connection *c = cd->senders; c; c = c->next) + returnValue << c->sender; + } return returnValue; } @@ -389,89 +331,197 @@ QObjectList QObjectPrivate::senderList() const void QObjectPrivate::addConnection(int signal, Connection *c) { Q_ASSERT(c->sender == q_ptr); - if (!connectionLists) - connectionLists = new QObjectConnectionListVector(); - if (signal >= connectionLists->count()) - connectionLists->resize(signal + 1); - - ConnectionList &connectionList = (*connectionLists)[signal]; - if (connectionList.last) { - connectionList.last->nextConnectionList = c; + ensureConnectionData(); + ConnectionData *cd = connections.loadRelaxed(); + cd->resizeSignalVector(signal + 1); + + ConnectionList &connectionList = cd->connectionsForSignal(signal); + if (connectionList.last.loadRelaxed()) { + Q_ASSERT(connectionList.last.loadRelaxed()->receiver.loadRelaxed()); + connectionList.last.loadRelaxed()->nextConnectionList.storeRelaxed(c); } else { - connectionList.first = c; + connectionList.first.storeRelaxed(c); } - connectionList.last = c; + c->id = ++cd->currentConnectionId; + c->prevConnectionList = connectionList.last.loadRelaxed(); + connectionList.last.storeRelaxed(c); - cleanConnectionLists(); + QObjectPrivate *rd = QObjectPrivate::get(c->receiver.loadRelaxed()); + rd->ensureConnectionData(); - c->prev = &(QObjectPrivate::get(c->receiver)->senders); + c->prev = &(rd->connections.loadRelaxed()->senders); c->next = *c->prev; *c->prev = c; if (c->next) c->next->prev = &c->next; +} + +void QObjectPrivate::ConnectionData::removeConnection(QObjectPrivate::Connection *c) +{ + Q_ASSERT(c->receiver.loadRelaxed()); + ConnectionList &connections = signalVector.loadRelaxed()->at(c->signal_index); + c->receiver.storeRelaxed(nullptr); + QThreadData *td = c->receiverThreadData.loadRelaxed(); + if (td) + td->deref(); + c->receiverThreadData.storeRelaxed(nullptr); - if (signal < 0) { - connectedSignals[0] = connectedSignals[1] = ~0; - } else if (signal < (int)sizeof(connectedSignals) * 8) { - connectedSignals[signal >> 5] |= (1 << (signal & 0x1f)); +#ifndef QT_NO_DEBUG + bool found = false; + for (Connection *cc = connections.first.loadRelaxed(); cc; cc = cc->nextConnectionList.loadRelaxed()) { + if (cc == c) { + found = true; + break; + } } + Q_ASSERT(found); +#endif + + // remove from the senders linked list + *c->prev = c->next; + if (c->next) + c->next->prev = c->prev; + c->prev = nullptr; + + if (connections.first.loadRelaxed() == c) + connections.first.storeRelaxed(c->nextConnectionList.loadRelaxed()); + if (connections.last.loadRelaxed() == c) + connections.last.storeRelaxed(c->prevConnectionList); + Q_ASSERT(signalVector.loadRelaxed()->at(c->signal_index).first.loadRelaxed() != c); + Q_ASSERT(signalVector.loadRelaxed()->at(c->signal_index).last.loadRelaxed() != c); + + // keep c->nextConnectionList intact, as it might still get accessed by activate + Connection *n = c->nextConnectionList.loadRelaxed(); + if (n) + n->prevConnectionList = c->prevConnectionList; + if (c->prevConnectionList) + c->prevConnectionList->nextConnectionList.storeRelaxed(n); + c->prevConnectionList = nullptr; + + Q_ASSERT(c != orphaned.loadRelaxed()); + // add c to orphanedConnections + c->nextInOrphanList = orphaned.loadRelaxed(); + orphaned.storeRelaxed(c); + +#ifndef QT_NO_DEBUG + found = false; + for (Connection *cc = connections.first.loadRelaxed(); cc; cc = cc->nextConnectionList.loadRelaxed()) { + if (cc == c) { + found = true; + break; + } + } + Q_ASSERT(!found); +#endif + } -void QObjectPrivate::cleanConnectionLists() +void QObjectPrivate::ConnectionData::cleanOrphanedConnectionsImpl(QObject *sender) { - if (connectionLists->dirty && !connectionLists->inUse) { - // remove broken connections - bool allConnected = false; - for (int signal = -1; signal < connectionLists->count(); ++signal) { - QObjectPrivate::ConnectionList &connectionList = - (*connectionLists)[signal]; - - // Set to the last entry in the connection list that was *not* - // deleted. This is needed to update the list's last pointer - // at the end of the cleanup. - QObjectPrivate::Connection *last = 0; - - QObjectPrivate::Connection **prev = &connectionList.first; - QObjectPrivate::Connection *c = *prev; - bool connected = false; // whether the signal is still connected somewhere - while (c) { - if (c->receiver) { - last = c; - prev = &c->nextConnectionList; - c = *prev; - connected = true; - } else { - QObjectPrivate::Connection *next = c->nextConnectionList; - *prev = next; - c->deref(); - c = next; - } - } + ConnectionOrSignalVector *c = nullptr; + { + QBasicMutexLocker l(signalSlotLock(sender)); + if (ref > 1) + return; - // Correct the connection list's last pointer. - // As conectionList.last could equal last, this could be a noop - connectionList.last = last; + // Since ref == 1, no activate() is in process since we locked the mutex. That implies, + // that nothing can reference the orphaned connection objects anymore and they can + // be safely deleted + c = orphaned.loadRelaxed(); + orphaned.storeRelaxed(nullptr); + } + deleteOrphaned(c); +} - if (!allConnected && !connected && signal >= 0 - && size_t(signal) < sizeof(connectedSignals) * 8) { - // This signal is no longer connected - connectedSignals[signal >> 5] &= ~(1 << (signal & 0x1f)); - } else if (signal == -1) { - allConnected = connected; - } +void QObjectPrivate::ConnectionData::deleteOrphaned(QObjectPrivate::ConnectionOrSignalVector *o) +{ + while (o) { + QObjectPrivate::ConnectionOrSignalVector *next = nullptr; + if (SignalVector *v = ConnectionOrSignalVector::asSignalVector(o)) { + next = v->nextInOrphanList; + free(v); + } else { + QObjectPrivate::Connection *c = static_cast<Connection *>(o); + next = c->nextInOrphanList; + Q_ASSERT(!c->receiver.loadRelaxed()); + Q_ASSERT(!c->prev); + c->freeSlotObject(); + c->deref(); } - connectionLists->dirty = false; + o = next; } } +/*! \internal + + Returns \c true if the signal with index \a signal_index from object \a sender is connected. + + \a signal_index must be the index returned by QObjectPrivate::signalIndex; +*/ +bool QObjectPrivate::isSignalConnected(uint signalIndex, bool checkDeclarative) const +{ + if (checkDeclarative && isDeclarativeSignalConnected(signalIndex)) + return true; + + ConnectionData *cd = connections.loadRelaxed(); + if (!cd) + return false; + SignalVector *signalVector = cd->signalVector.loadRelaxed(); + if (!signalVector) + return false; + + if (signalVector->at(-1).first.loadRelaxed()) + return true; + + if (signalIndex < uint(cd->signalVectorCount())) { + const QObjectPrivate::Connection *c = signalVector->at(signalIndex).first.loadRelaxed(); + while (c) { + if (c->receiver.loadRelaxed()) + return true; + c = c->nextConnectionList.loadRelaxed(); + } + } + return false; +} + +bool QObjectPrivate::maybeSignalConnected(uint signalIndex) const +{ + ConnectionData *cd = connections.loadRelaxed(); + if (!cd) + return false; + SignalVector *signalVector = cd->signalVector.loadRelaxed(); + if (!signalVector) + return false; + + if (signalVector->at(-1).first) + return true; + + if (signalIndex < uint(cd->signalVectorCount())) { + const QObjectPrivate::Connection *c = signalVector->at(signalIndex).first; + return c != nullptr; + } + return false; +} + +/*! + \internal + */ +QAbstractMetaCallEvent::~QAbstractMetaCallEvent() +{ +#if QT_CONFIG(thread) + if (semaphore_) + semaphore_->release(); +#endif +} + /*! \internal */ QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction, const QObject *sender, int signalId, int nargs, int *types, void **args, QSemaphore *semaphore) - : QEvent(MetaCall), slotObj_(0), sender_(sender), signalId_(signalId), - nargs_(nargs), types_(types), args_(args), semaphore_(semaphore), + : QAbstractMetaCallEvent(sender, signalId, semaphore), + slotObj_(nullptr), nargs_(nargs), types_(types), args_(args), callFunction_(callFunction), method_offset_(method_offset), method_relative_(method_relative) { } @@ -480,9 +530,9 @@ QMetaCallEvent::QMetaCallEvent(ushort method_offset, ushort method_relative, QOb */ QMetaCallEvent::QMetaCallEvent(QtPrivate::QSlotObjectBase *slotO, const QObject *sender, int signalId, int nargs, int *types, void **args, QSemaphore *semaphore) - : QEvent(MetaCall), slotObj_(slotO), sender_(sender), signalId_(signalId), - nargs_(nargs), types_(types), args_(args), semaphore_(semaphore), - callFunction_(0), method_offset_(0), method_relative_(ushort(-1)) + : QAbstractMetaCallEvent(sender, signalId, semaphore), + slotObj_(slotO), nargs_(nargs), types_(types), args_(args), + callFunction_(nullptr), method_offset_(0), method_relative_(ushort(-1)) { if (slotObj_) slotObj_->ref(); @@ -501,10 +551,6 @@ QMetaCallEvent::~QMetaCallEvent() free(types_); free(args_); } -#if QT_CONFIG(thread) - if (semaphore_) - semaphore_->release(); -#endif if (slotObj_) slotObj_->destroyIfLastRef(); } @@ -797,7 +843,7 @@ static bool check_parent_thread(QObject *parent, The destructor of a parent object destroys all child objects. - Setting \a parent to 0 constructs an object with no parent. If the + Setting \a parent to \nullptr constructs an object with no parent. If the object is a widget, it will become a top-level window. \sa parent(), findChild(), findChildren() @@ -806,6 +852,8 @@ static bool check_parent_thread(QObject *parent, QObject::QObject(QObject *parent) : d_ptr(new QObjectPrivate) { + Q_ASSERT_X(this != parent, Q_FUNC_INFO, "Cannot parent a QObject to itself"); + Q_D(QObject); d_ptr->q_ptr = this; d->threadData = (parent && !parent->thread()) ? parent->d_func()->threadData : QThreadData::current(); @@ -834,6 +882,8 @@ QObject::QObject(QObject *parent) QObject::QObject(QObjectPrivate &dd, QObject *parent) : d_ptr(&dd) { + Q_ASSERT_X(this != parent, Q_FUNC_INFO, "Cannot parent a QObject to itself"); + Q_D(QObject); d_ptr->q_ptr = this; d->threadData = (parent && !parent->thread()) ? parent->d_func()->threadData : QThreadData::current(); @@ -894,15 +944,15 @@ QObject::~QObject() d->wasDeleted = true; d->blockSig = 0; // unblock signals so we always emit destroyed() - QtSharedPointer::ExternalRefCountData *sharedRefcount = d->sharedRefcount.load(); + QtSharedPointer::ExternalRefCountData *sharedRefcount = d->sharedRefcount.loadRelaxed(); if (sharedRefcount) { - if (sharedRefcount->strongref.load() > 0) { + if (sharedRefcount->strongref.loadRelaxed() > 0) { qWarning("QObject: shared QObject was deleted directly. The program is malformed and may crash."); // but continue deleting, it's too late to stop anyway } // indicate to all QWeakPointers that this QObject has now been deleted - sharedRefcount->strongref.store(0); + sharedRefcount->strongref.storeRelaxed(0); if (!sharedRefcount->weakref.deref()) delete sharedRefcount; } @@ -921,92 +971,56 @@ QObject::~QObject() } } - // set ref to zero to indicate that this object has been deleted - if (d->currentSender != 0) - d->currentSender->ref = 0; - d->currentSender = 0; + QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed(); + if (cd) { + if (cd->currentSender) { + cd->currentSender->receiverDeleted(); + cd->currentSender = nullptr; + } - if (d->connectionLists || d->senders) { - QMutex *signalSlotMutex = signalSlotLock(this); - QMutexLocker locker(signalSlotMutex); + QBasicMutex *signalSlotMutex = signalSlotLock(this); + QBasicMutexLocker locker(signalSlotMutex); // disconnect all receivers - if (d->connectionLists) { - ++d->connectionLists->inUse; - int connectionListsCount = d->connectionLists->count(); - for (int signal = -1; signal < connectionListsCount; ++signal) { - QObjectPrivate::ConnectionList &connectionList = - (*d->connectionLists)[signal]; - - while (QObjectPrivate::Connection *c = connectionList.first) { - if (!c->receiver) { - connectionList.first = c->nextConnectionList; - c->deref(); - continue; - } + int receiverCount = cd->signalVectorCount(); + for (int signal = -1; signal < receiverCount; ++signal) { + QObjectPrivate::ConnectionList &connectionList = cd->connectionsForSignal(signal); - QMutex *m = signalSlotLock(c->receiver); - bool needToUnlock = QOrderedMutexLocker::relock(signalSlotMutex, m); + while (QObjectPrivate::Connection *c = connectionList.first.loadRelaxed()) { + Q_ASSERT(c->receiver); - if (c->receiver) { - *c->prev = c->next; - if (c->next) c->next->prev = c->prev; - } - c->receiver = 0; - if (needToUnlock) - m->unlock(); - - connectionList.first = c->nextConnectionList; - - // The destroy operation must happen outside the lock - if (c->isSlotObject) { - c->isSlotObject = false; - locker.unlock(); - c->slotObj->destroyIfLastRef(); - locker.relock(); - } - c->deref(); + QBasicMutex *m = signalSlotLock(c->receiver.loadRelaxed()); + bool needToUnlock = QOrderedMutexLocker::relock(signalSlotMutex, m); + if (c->receiver) { + cd->removeConnection(c); + Q_ASSERT(connectionList.first.loadRelaxed() != c); } + if (needToUnlock) + m->unlock(); } - - if (!--d->connectionLists->inUse) { - delete d->connectionLists; - } else { - d->connectionLists->orphaned = true; - } - d->connectionLists = 0; } /* Disconnect all senders: - * This loop basically just does - * for (node = d->senders; node; node = node->next) { ... } - * - * We need to temporarily unlock the receiver mutex to destroy the functors or to lock the - * sender's mutex. And when the mutex is released, node->next might be destroyed by another - * thread. That's why we set node->prev to &node, that way, if node is destroyed, node will - * be updated. */ - QObjectPrivate::Connection *node = d->senders; - while (node) { + while (QObjectPrivate::Connection *node = cd->senders) { + Q_ASSERT(node->receiver); QObject *sender = node->sender; // Send disconnectNotify before removing the connection from sender's connection list. // This ensures any eventual destructor of sender will block on getting receiver's lock // and not finish until we release it. sender->disconnectNotify(QMetaObjectPrivate::signal(sender->metaObject(), node->signal_index)); - QMutex *m = signalSlotLock(sender); - node->prev = &node; + QBasicMutex *m = signalSlotLock(sender); bool needToUnlock = QOrderedMutexLocker::relock(signalSlotMutex, m); //the node has maybe been removed while the mutex was unlocked in relock? - if (!node || node->sender != sender) { + if (node != cd->senders) { // We hold the wrong mutex Q_ASSERT(needToUnlock); m->unlock(); continue; } - node->receiver = 0; - QObjectConnectionListVector *senderLists = sender->d_func()->connectionLists; - if (senderLists) - senderLists->dirty = true; + + QObjectPrivate::ConnectionData *senderData = sender->d_func()->connections.loadRelaxed(); + Q_ASSERT(senderData); QtPrivate::QSlotObjectBase *slotObj = nullptr; if (node->isSlotObject) { @@ -1014,19 +1028,24 @@ QObject::~QObject() node->isSlotObject = false; } - node = node->next; + senderData->removeConnection(node); if (needToUnlock) m->unlock(); if (slotObj) { - if (node) - node->prev = &node; locker.unlock(); slotObj->destroyIfLastRef(); locker.relock(); } } + + // invalidate all connections on the object and make sure + // activate() will skip them + cd->currentConnectionId.storeRelaxed(0); } + if (cd && !cd->ref.deref()) + delete cd; + d->connections.storeRelaxed(nullptr); if (!d->children.isEmpty()) d->deleteChildren(); @@ -1046,7 +1065,7 @@ QObject::~QObject() QObjectPrivate::Connection::~Connection() { if (ownArgumentTypes) { - const int *v = argumentTypes.load(); + const int *v = argumentTypes.loadRelaxed(); if (v != &DIRECT_CONNECTION_ONLY) delete [] v; } @@ -1253,9 +1272,13 @@ bool QObject::event(QEvent *e) case QEvent::MetaCall: { - QMetaCallEvent *mce = static_cast<QMetaCallEvent*>(e); + QAbstractMetaCallEvent *mce = static_cast<QAbstractMetaCallEvent*>(e); - QConnectionSenderSwitcher sw(this, const_cast<QObject*>(mce->sender()), mce->signalId()); + if (!d_func()->connections.loadRelaxed()) { + QBasicMutexLocker locker(signalSlotLock(this)); + d_func()->ensureConnectionData(); + } + QObjectPrivate::Sender sender(this, const_cast<QObject*>(mce->sender()), mce->signalId()); mce->placeMetaCall(this); break; @@ -1264,7 +1287,7 @@ bool QObject::event(QEvent *e) case QEvent::ThreadChange: { Q_D(QObject); QThreadData *threadData = d->threadData; - QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.load(); + QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.loadRelaxed(); if (eventDispatcher) { QList<QAbstractEventDispatcher::TimerInfo> timers = eventDispatcher->registeredTimers(this); if (!timers.isEmpty()) { @@ -1415,7 +1438,7 @@ bool QObject::eventFilter(QObject * /* watched */, QEvent * /* event */) \sa signalsBlocked(), QSignalBlocker */ -bool QObject::blockSignals(bool block) Q_DECL_NOTHROW +bool QObject::blockSignals(bool block) noexcept { Q_D(QObject); bool previous = d->blockSig; @@ -1499,7 +1522,7 @@ void QObject::moveToThread(QThread *targetThread) } else if (d->threadData != currentData) { qWarning("QObject::moveToThread: Current thread (%p) is not the object's thread (%p).\n" "Cannot move to target thread (%p)\n", - currentData->thread.load(), d->threadData->thread.load(), targetData ? targetData->thread.load() : nullptr); + currentData->thread.loadRelaxed(), d->threadData->thread.loadRelaxed(), targetData ? targetData->thread.loadRelaxed() : nullptr); #ifdef Q_OS_MAC qWarning("You might be loading two sets of Qt binaries into the same process. " @@ -1516,6 +1539,9 @@ void QObject::moveToThread(QThread *targetThread) if (!targetData) targetData = new QThreadData(0); + // make sure nobody adds/removes connections to this object while we're moving it + QMutexLocker l(signalSlotLock(this)); + QOrderedMutexLocker locker(¤tData->postEventList.mutex, &targetData->postEventList.mutex); @@ -1561,13 +1587,35 @@ void QObjectPrivate::setThreadData_helper(QThreadData *currentData, QThreadData } if (eventsMoved > 0 && targetData->hasEventDispatcher()) { targetData->canWait = false; - targetData->eventDispatcher.load()->wakeUp(); + targetData->eventDispatcher.loadRelaxed()->wakeUp(); } // the current emitting thread shouldn't restore currentSender after calling moveToThread() - if (currentSender) - currentSender->ref = 0; - currentSender = 0; + ConnectionData *cd = connections.loadRelaxed(); + if (cd) { + if (cd->currentSender) { + cd->currentSender->receiverDeleted(); + cd->currentSender = nullptr; + } + + // adjust the receiverThreadId values in the Connections + if (cd) { + auto *c = cd->senders; + while (c) { + QObject *r = c->receiver.loadRelaxed(); + if (r) { + Q_ASSERT(r == q); + targetData->ref(); + QThreadData *old = c->receiverThreadData.loadRelaxed(); + if (old) + old->deref(); + c->receiverThreadData.storeRelaxed(targetData); + } + c = c->next; + } + } + + } // set new thread data targetData->ref(); @@ -1584,7 +1632,7 @@ void QObjectPrivate::_q_reregisterTimers(void *pointer) { Q_Q(QObject); QList<QAbstractEventDispatcher::TimerInfo> *timerList = reinterpret_cast<QList<QAbstractEventDispatcher::TimerInfo> *>(pointer); - QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.load(); + QAbstractEventDispatcher *eventDispatcher = threadData->eventDispatcher.loadRelaxed(); for (int i = 0; i < timerList->size(); ++i) { const QAbstractEventDispatcher::TimerInfo &ti = timerList->at(i); eventDispatcher->registerTimer(ti.timerId, ti.interval, ti.timerType, q); @@ -1650,7 +1698,7 @@ int QObject::startTimer(int interval, Qt::TimerType timerType) qWarning("QObject::startTimer: Timers cannot be started from another thread"); return 0; } - int timerId = d->threadData->eventDispatcher.load()->registerTimer(interval, timerType, this); + int timerId = d->threadData->eventDispatcher.loadRelaxed()->registerTimer(interval, timerType, this); if (!d->extraData) d->extraData = new QObjectPrivate::ExtraData; d->extraData->runningTimers.append(timerId); @@ -1716,16 +1764,16 @@ void QObject::killTimer(int id) int at = d->extraData ? d->extraData->runningTimers.indexOf(id) : -1; if (at == -1) { // timer isn't owned by this object - qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s, %s), timer has not been killed", + qWarning("QObject::killTimer(): Error: timer id %d is not valid for object %p (%s, %ls), timer has not been killed", id, this, metaObject()->className(), - qPrintable(objectName())); + qUtf16Printable(objectName())); return; } if (d->threadData->hasEventDispatcher()) - d->threadData->eventDispatcher.load()->unregisterTimer(id); + d->threadData->eventDispatcher.loadRelaxed()->unregisterTimer(id); d->extraData->runningTimers.remove(at); QAbstractEventDispatcherPrivate::releaseTimerId(id); @@ -1769,7 +1817,7 @@ void QObject::killTimer(int id) \fn template<typename T> T *QObject::findChild(const QString &name, Qt::FindChildOptions options) const Returns the child of this object that can be cast into type T and - that is called \a name, or 0 if there is no such object. + that is called \a name, or \nullptr if there is no such object. Omitting the \a name argument causes all object names to be matched. The search is performed recursively, unless \a options specifies the option FindDirectChildrenOnly. @@ -1830,12 +1878,15 @@ void QObject::killTimer(int id) /*! \fn template<typename T> QList<T> QObject::findChildren(const QRegExp ®Exp, Qt::FindChildOptions options) const \overload findChildren() + \obsolete Returns the children of this object that can be cast to type T and that have names matching the regular expression \a regExp, or an empty list if there are no such objects. The search is performed recursively, unless \a options specifies the option FindDirectChildrenOnly. + + Use the findChildren overload taking a QRegularExpression instead. */ /*! @@ -2023,8 +2074,25 @@ void QObjectPrivate::deleteChildren() void QObjectPrivate::setParent_helper(QObject *o) { Q_Q(QObject); + Q_ASSERT_X(q != o, Q_FUNC_INFO, "Cannot parent a QObject to itself"); +#ifdef QT_DEBUG + const auto checkForParentChildLoops = qScopeGuard([&](){ + int depth = 0; + auto p = parent; + while (p) { + if (++depth == CheckForParentChildLoopsWarnDepth) { + qWarning("QObject %p (class: '%s', object name: '%s') may have a loop in its parent-child chain; " + "this is undefined behavior", + q, q->metaObject()->className(), qPrintable(q->objectName())); + } + p = p->parent(); + } + }); +#endif + if (o == parent) return; + if (parent) { QObjectPrivate *parentD = parent->d_func(); if (parentD->isDeletingChildren && wasDeleted @@ -2154,7 +2222,8 @@ void QObject::removeEventFilter(QObject *obj) \fn void QObject::destroyed(QObject *obj) This signal is emitted immediately before the object \a obj is - destroyed, and can not be blocked. + destroyed, after any instances of QPointer have been notified, + and cannot be blocked. All the objects's children are destroyed immediately after this signal is emitted. @@ -2372,13 +2441,14 @@ QObject *QObject::sender() const { Q_D(const QObject); - QMutexLocker locker(signalSlotLock(this)); - if (!d->currentSender) - return 0; + QBasicMutexLocker locker(signalSlotLock(this)); + QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed(); + if (!cd || !cd->currentSender) + return nullptr; - for (QObjectPrivate::Connection *c = d->senders; c; c = c->next) { - if (c->sender == d->currentSender->sender) - return d->currentSender->sender; + for (QObjectPrivate::Connection *c = cd->senders; c; c = c->next) { + if (c->sender == cd->currentSender->sender) + return cd->currentSender->sender; } return 0; @@ -2413,14 +2483,15 @@ int QObject::senderSignalIndex() const { Q_D(const QObject); - QMutexLocker locker(signalSlotLock(this)); - if (!d->currentSender) + QBasicMutexLocker locker(signalSlotLock(this)); + QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed(); + if (!cd || !cd->currentSender) return -1; - for (QObjectPrivate::Connection *c = d->senders; c; c = c->next) { - if (c->sender == d->currentSender->sender) { + for (QObjectPrivate::Connection *c = cd->senders; c; c = c->next) { + if (c->sender == cd->currentSender->sender) { // Convert from signal range to method range - return QMetaObjectPrivate::signal(c->sender->metaObject(), d->currentSender->signal).methodIndex(); + return QMetaObjectPrivate::signal(c->sender->metaObject(), cd->currentSender->signal).methodIndex(); } } @@ -2476,15 +2547,13 @@ int QObject::receivers(const char *signal) const signal_index); } - QMutexLocker locker(signalSlotLock(this)); - if (d->connectionLists) { - if (signal_index < d->connectionLists->count()) { - const QObjectPrivate::Connection *c = - d->connectionLists->at(signal_index).first; - while (c) { - receivers += c->receiver ? 1 : 0; - c = c->nextConnectionList; - } + QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed(); + QBasicMutexLocker locker(signalSlotLock(this)); + if (cd && signal_index < cd->signalVectorCount()) { + const QObjectPrivate::Connection *c = cd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed(); + while (c) { + receivers += c->receiver.loadRelaxed() ? 1 : 0; + c = c->nextConnectionList.loadRelaxed(); } } } @@ -2524,22 +2593,8 @@ bool QObject::isSignalConnected(const QMetaMethod &signal) const signalIndex += QMetaObjectPrivate::signalOffset(signal.mobj); - QMutexLocker locker(signalSlotLock(this)); - if (d->connectionLists) { - if (signalIndex < sizeof(d->connectedSignals) * 8 && !d->connectionLists->dirty) - return d->isSignalConnected(signalIndex); - - if (signalIndex < uint(d->connectionLists->count())) { - const QObjectPrivate::Connection *c = - d->connectionLists->at(signalIndex).first; - while (c) { - if (c->receiver) - return true; - c = c->nextConnectionList; - } - } - } - return d->isDeclarativeSignalConnected(signalIndex); + QBasicMutexLocker locker(signalSlotLock(this)); + return d->isSignalConnected(signalIndex, true); } /*! @@ -2936,8 +2991,8 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho 0 may be used as a wildcard, meaning "any signal", "any receiving object", or "any slot in the receiving object", respectively. - The \a sender may never be 0. (You cannot disconnect signals from - more than one object in a single call.) + The \a sender may never be \nullptr. (You cannot disconnect signals + from more than one object in a single call.) If \a signal is 0, it disconnects \a receiver and \a method from any signal. If not, only the specified signal is disconnected. @@ -2948,8 +3003,8 @@ QMetaObject::Connection QObject::connect(const QObject *sender, const QMetaMetho If \a method is 0, it disconnects anything that is connected to \a receiver. If not, only slots named \a method will be disconnected, - and all other slots are left alone. The \a method must be 0 if \a - receiver is left out, so you cannot disconnect a + and all other slots are left alone. The \a method must be \nullptr + if \a receiver is left out, so you cannot disconnect a specifically-named slot on all objects. \sa connect() @@ -3288,7 +3343,7 @@ QMetaObject::Connection QMetaObject::connect(const QObject *sender, int signal_i \internal Same as the QMetaObject::connect, but \a signal_index must be the result of QObjectPrivate::signalIndex - method_index is relative to the rmeta metaobject, if rmeta is null, then it is absolute index + method_index is relative to the rmeta metaobject, if rmeta is \nullptr, then it is absolute index the QObjectPrivate::Connection* has a refcount of 2, so it must be passed to a QMetaObject::Connection */ @@ -3302,24 +3357,22 @@ QObjectPrivate::Connection *QMetaObjectPrivate::connect(const QObject *sender, int method_offset = rmeta ? rmeta->methodOffset() : 0; Q_ASSERT(!rmeta || QMetaObjectPrivate::get(rmeta)->revision >= 6); - QObjectPrivate::StaticMetaCallFunction callFunction = - rmeta ? rmeta->d.static_metacall : 0; + QObjectPrivate::StaticMetaCallFunction callFunction = rmeta ? rmeta->d.static_metacall : nullptr; QOrderedMutexLocker locker(signalSlotLock(sender), signalSlotLock(receiver)); - if (type & Qt::UniqueConnection) { - QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists; - if (connectionLists && connectionLists->count() > signal_index) { - const QObjectPrivate::Connection *c2 = - (*connectionLists)[signal_index].first; + QObjectPrivate::ConnectionData *scd = QObjectPrivate::get(s)->connections.loadRelaxed(); + if (type & Qt::UniqueConnection && scd) { + if (scd->signalVectorCount() > signal_index) { + const QObjectPrivate::Connection *c2 = scd->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed(); int method_index_absolute = method_index + method_offset; while (c2) { - if (!c2->isSlotObject && c2->receiver == receiver && c2->method() == method_index_absolute) - return 0; - c2 = c2->nextConnectionList; + if (!c2->isSlotObject && c2->receiver.loadRelaxed() == receiver && c2->method() == method_index_absolute) + return nullptr; + c2 = c2->nextConnectionList.loadRelaxed(); } } type &= Qt::UniqueConnection - 1; @@ -3328,13 +3381,15 @@ QObjectPrivate::Connection *QMetaObjectPrivate::connect(const QObject *sender, QScopedPointer<QObjectPrivate::Connection> c(new QObjectPrivate::Connection); c->sender = s; c->signal_index = signal_index; - c->receiver = r; + c->receiver.storeRelaxed(r); + QThreadData *td = r->d_func()->threadData; + td->ref(); + c->receiverThreadData.storeRelaxed(td); c->method_relative = method_index; c->method_offset = method_offset; c->connectionType = type; c->isSlotObject = false; - c->argumentTypes.store(types); - c->nextConnectionList = 0; + c->argumentTypes.storeRelaxed(types); c->callFunction = callFunction; QObjectPrivate::get(s)->addConnection(signal_index, c.data()); @@ -3378,49 +3433,40 @@ bool QMetaObject::disconnectOne(const QObject *sender, int signal_index, /*! \internal - Helper function to remove the connection from the senders list and setting the receivers to 0 + Helper function to remove the connection from the senders list and set the receivers to \nullptr */ -bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::Connection *c, +bool QMetaObjectPrivate::disconnectHelper(QObjectPrivate::ConnectionData *connections, int signalIndex, const QObject *receiver, int method_index, void **slot, - QMutex *senderMutex, DisconnectType disconnectType) + QBasicMutex *senderMutex, DisconnectType disconnectType) { bool success = false; + + auto &connectionList = connections->connectionsForSignal(signalIndex); + auto *c = connectionList.first.loadRelaxed(); while (c) { - if (c->receiver - && (receiver == 0 || (c->receiver == receiver + QObject *r = c->receiver.loadRelaxed(); + if (r && (receiver == nullptr || (r == receiver && (method_index < 0 || (!c->isSlotObject && c->method() == method_index)) - && (slot == 0 || (c->isSlotObject && c->slotObj->compare(slot)))))) { + && (slot == nullptr || (c->isSlotObject && c->slotObj->compare(slot)))))) { bool needToUnlock = false; - QMutex *receiverMutex = 0; - if (c->receiver) { - receiverMutex = signalSlotLock(c->receiver); + QBasicMutex *receiverMutex = nullptr; + if (r) { + receiverMutex = signalSlotLock(r); // need to relock this receiver and sender in the correct order needToUnlock = QOrderedMutexLocker::relock(senderMutex, receiverMutex); } - if (c->receiver) { - *c->prev = c->next; - if (c->next) - c->next->prev = c->prev; - } + if (c->receiver.loadRelaxed()) + connections->removeConnection(c); if (needToUnlock) receiverMutex->unlock(); - c->receiver = 0; - - if (c->isSlotObject) { - c->isSlotObject = false; - senderMutex->unlock(); - c->slotObj->destroyIfLastRef(); - senderMutex->lock(); - } - success = true; if (disconnectType == DisconnectOne) return success; } - c = c->nextConnectionList; + c = c->nextConnectionList.loadRelaxed(); } return success; } @@ -3439,43 +3485,34 @@ bool QMetaObjectPrivate::disconnect(const QObject *sender, QObject *s = const_cast<QObject *>(sender); - QMutex *senderMutex = signalSlotLock(sender); - QMutexLocker locker(senderMutex); + QBasicMutex *senderMutex = signalSlotLock(sender); + QBasicMutexLocker locker(senderMutex); - QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists; - if (!connectionLists) + QObjectPrivate::ConnectionData *scd = QObjectPrivate::get(s)->connections.loadRelaxed(); + if (!scd) return false; - // prevent incoming connections changing the connectionLists while unlocked - ++connectionLists->inUse; - bool success = false; - if (signal_index < 0) { - // remove from all connection lists - for (int sig_index = -1; sig_index < connectionLists->count(); ++sig_index) { - QObjectPrivate::Connection *c = - (*connectionLists)[sig_index].first; - if (disconnectHelper(c, receiver, method_index, slot, senderMutex, disconnectType)) { - success = true; - connectionLists->dirty = true; + { + // prevent incoming connections changing the connections->receivers while unlocked + QObjectPrivate::ConnectionDataPointer connections(scd); + + if (signal_index < 0) { + // remove from all connection lists + for (int sig_index = -1; sig_index < scd->signalVectorCount(); ++sig_index) { + if (disconnectHelper(connections.data(), sig_index, receiver, method_index, slot, senderMutex, disconnectType)) + success = true; } - } - } else if (signal_index < connectionLists->count()) { - QObjectPrivate::Connection *c = - (*connectionLists)[signal_index].first; - if (disconnectHelper(c, receiver, method_index, slot, senderMutex, disconnectType)) { - success = true; - connectionLists->dirty = true; + } else if (signal_index < scd->signalVectorCount()) { + if (disconnectHelper(connections.data(), signal_index, receiver, method_index, slot, senderMutex, disconnectType)) + success = true; } } - --connectionLists->inUse; - Q_ASSERT(connectionLists->inUse >= 0); - if (connectionLists->orphaned && !connectionLists->inUse) - delete connectionLists; - locker.unlock(); if (success) { + scd->cleanOrphanedConnections(s); + QMetaMethod smethod = QMetaObjectPrivate::signal(smeta, signal_index); if (smethod.isValid()) s->disconnectNotify(smethod); @@ -3591,10 +3628,9 @@ void QMetaObject::connectSlotsByName(QObject *o) \a signal must be in the signal index range (see QObjectPrivate::signalIndex()). */ -static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv, - QMutexLocker &locker) +static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connection *c, void **argv) { - const int *argumentTypes = c->argumentTypes.load(); + const int *argumentTypes = c->argumentTypes.loadRelaxed(); if (!argumentTypes) { QMetaMethod m = QMetaObjectPrivate::signal(sender->metaObject(), signal); argumentTypes = queuedConnectionTypes(m.parameterTypes()); @@ -3603,7 +3639,7 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect if (!c->argumentTypes.testAndSetOrdered(0, argumentTypes)) { if (argumentTypes != &DIRECT_CONNECTION_ONLY) delete [] argumentTypes; - argumentTypes = c->argumentTypes.load(); + argumentTypes = c->argumentTypes.loadRelaxed(); } } if (argumentTypes == &DIRECT_CONNECTION_ONLY) // cannot activate @@ -3622,129 +3658,109 @@ static void queued_activate(QObject *sender, int signal, QObjectPrivate::Connect for (int n = 1; n < nargs; ++n) types[n] = argumentTypes[n-1]; - locker.unlock(); for (int n = 1; n < nargs; ++n) args[n] = QMetaType::create(types[n], argv[n]); - locker.relock(); - - if (!c->receiver) { - locker.unlock(); - // we have been disconnected while the mutex was unlocked - for (int n = 1; n < nargs; ++n) - QMetaType::destroy(types[n], args[n]); - free(types); - free(args); - locker.relock(); - return; - } + } + + QBasicMutexLocker locker(signalSlotLock(c->receiver.loadRelaxed())); + if (!c->receiver.loadRelaxed()) { + // the connection has been disconnected before we got the lock + locker.unlock(); + for (int n = 1; n < nargs; ++n) + QMetaType::destroy(types[n], args[n]); + free(types); + free(args); + return; } QMetaCallEvent *ev = c->isSlotObject ? new QMetaCallEvent(c->slotObj, sender, signal, nargs, types, args) : new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal, nargs, types, args); - QCoreApplication::postEvent(c->receiver, ev); + QCoreApplication::postEvent(c->receiver.loadRelaxed(), ev); } -/*! - \internal - */ -void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_signal_index, - void **argv) +template <bool callbacks_enabled> +void doActivate(QObject *sender, int signal_index, void **argv) { - activate(sender, QMetaObjectPrivate::signalOffset(m), local_signal_index, argv); -} + QObjectPrivate *sp = QObjectPrivate::get(sender); -/*! - \internal - */ -void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_index, void **argv) -{ - int signal_index = signalOffset + local_signal_index; - - if (sender->d_func()->blockSig) + if (sp->blockSig) return; Q_TRACE_SCOPE(QMetaObject_activate, sender, signal_index); - if (sender->d_func()->isDeclarativeSignalConnected(signal_index) + if (sp->isDeclarativeSignalConnected(signal_index) && QAbstractDeclarativeData::signalEmitted) { Q_TRACE_SCOPE(QMetaObject_activate_declarative_signal, sender, signal_index); - QAbstractDeclarativeData::signalEmitted(sender->d_func()->declarativeData, sender, + QAbstractDeclarativeData::signalEmitted(sp->declarativeData, sender, signal_index, argv); } - if (!sender->d_func()->isSignalConnected(signal_index, /*checkDeclarative =*/ false) - && !qt_signal_spy_callback_set.signal_begin_callback - && !qt_signal_spy_callback_set.signal_end_callback) { - // The possible declarative connection is done, and nothing else is connected, so: + const QSignalSpyCallbackSet *signal_spy_set = callbacks_enabled ? qt_signal_spy_callback_set.loadAcquire() : nullptr; + + void *empty_argv[] = { nullptr }; + if (!argv) + argv = empty_argv; + + if (!sp->maybeSignalConnected(signal_index)) { + // The possible declarative connection is done, and nothing else is connected + if (callbacks_enabled && signal_spy_set->signal_begin_callback != nullptr) + signal_spy_set->signal_begin_callback(sender, signal_index, argv); + if (callbacks_enabled && signal_spy_set->signal_end_callback != nullptr) + signal_spy_set->signal_end_callback(sender, signal_index); return; } - void *empty_argv[] = { 0 }; - if (qt_signal_spy_callback_set.signal_begin_callback != 0) { - qt_signal_spy_callback_set.signal_begin_callback(sender, signal_index, - argv ? argv : empty_argv); - } + if (callbacks_enabled && signal_spy_set->signal_begin_callback != nullptr) + signal_spy_set->signal_begin_callback(sender, signal_index, argv); + bool senderDeleted = false; { - QMutexLocker locker(signalSlotLock(sender)); - struct ConnectionListsRef { - QObjectConnectionListVector *connectionLists; - ConnectionListsRef(QObjectConnectionListVector *connectionLists) : connectionLists(connectionLists) - { - if (connectionLists) - ++connectionLists->inUse; - } - ~ConnectionListsRef() - { - if (!connectionLists) - return; - - --connectionLists->inUse; - Q_ASSERT(connectionLists->inUse >= 0); - if (connectionLists->orphaned) { - if (!connectionLists->inUse) - delete connectionLists; - } - } - - QObjectConnectionListVector *operator->() const { return connectionLists; } - }; - ConnectionListsRef connectionLists = sender->d_func()->connectionLists; - if (!connectionLists.connectionLists) { - locker.unlock(); - if (qt_signal_spy_callback_set.signal_end_callback != 0) - qt_signal_spy_callback_set.signal_end_callback(sender, signal_index); - return; - } + Q_ASSERT(sp->connections); + QObjectPrivate::ConnectionDataPointer connections(sp->connections.loadRelaxed()); + QObjectPrivate::SignalVector *signalVector = connections->signalVector.loadRelaxed(); const QObjectPrivate::ConnectionList *list; - if (signal_index < connectionLists->count()) - list = &connectionLists->at(signal_index); + if (signal_index < signalVector->count()) + list = &signalVector->at(signal_index); else - list = &connectionLists->allsignals; + list = &signalVector->at(-1); Qt::HANDLE currentThreadId = QThread::currentThreadId(); + bool inSenderThread = currentThreadId == QObjectPrivate::get(sender)->threadData->threadId.loadRelaxed(); + // We need to check against the highest connection id to ensure that signals added + // during the signal emission are not emitted in this emission. + uint highestConnectionId = connections->currentConnectionId.loadRelaxed(); do { - QObjectPrivate::Connection *c = list->first; - if (!c) continue; - // We need to check against last here to ensure that signals added - // during the signal emission are not emitted in this emission. - QObjectPrivate::Connection *last = list->last; + QObjectPrivate::Connection *c = list->first.loadRelaxed(); + if (!c) + continue; do { - if (!c->receiver) + QObject * const receiver = c->receiver.loadRelaxed(); + if (!receiver) + continue; + + QThreadData *td = c->receiverThreadData.loadRelaxed(); + if (!td) continue; - QObject * const receiver = c->receiver; - const bool receiverInSameThread = currentThreadId == receiver->d_func()->threadData->threadId.load(); + bool receiverInSameThread; + if (inSenderThread) { + receiverInSameThread = currentThreadId == td->threadId.loadRelaxed(); + } else { + // need to lock before reading the threadId, because moveToThread() could interfere + QMutexLocker lock(signalSlotLock(receiver)); + receiverInSameThread = currentThreadId == td->threadId.loadRelaxed(); + } + // determine if this connection should be sent immediately or // put into the event queue if ((c->connectionType == Qt::AutoConnection && !receiverInSameThread) || (c->connectionType == Qt::QueuedConnection)) { - queued_activate(sender, signal_index, c, argv ? argv : empty_argv, locker); + queued_activate(sender, signal_index, c, argv); continue; #if QT_CONFIG(thread) } else if (c->connectionType == Qt::BlockingQueuedConnection) { @@ -3755,94 +3771,105 @@ void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_i receiver->metaObject()->className(), receiver); } QSemaphore semaphore; - QMetaCallEvent *ev = c->isSlotObject ? - new QMetaCallEvent(c->slotObj, sender, signal_index, 0, 0, argv ? argv : empty_argv, &semaphore) : - new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal_index, 0, 0, argv ? argv : empty_argv, &semaphore); - QCoreApplication::postEvent(receiver, ev); - locker.unlock(); + { + QBasicMutexLocker locker(signalSlotLock(sender)); + if (!c->receiver) + continue; + QMetaCallEvent *ev = c->isSlotObject ? + new QMetaCallEvent(c->slotObj, sender, signal_index, 0, 0, argv, &semaphore) : + new QMetaCallEvent(c->method_offset, c->method_relative, c->callFunction, sender, signal_index, 0, 0, argv, &semaphore); + QCoreApplication::postEvent(receiver, ev); + } semaphore.acquire(); - locker.relock(); continue; #endif } - QConnectionSenderSwitcher sw; + QObjectPrivate::Sender senderData(receiverInSameThread ? receiver : nullptr, sender, signal_index); - if (receiverInSameThread) { - sw.switchSender(receiver, sender, signal_index); - } if (c->isSlotObject) { c->slotObj->ref(); QScopedPointer<QtPrivate::QSlotObjectBase, QSlotObjectBaseDeleter> obj(c->slotObj); - locker.unlock(); { Q_TRACE_SCOPE(QMetaObject_activate_slot_functor, obj.data()); - obj->call(receiver, argv ? argv : empty_argv); + obj->call(receiver, argv); } - - // Make sure the slot object gets destroyed before the mutex is locked again, as the - // destructor of the slot object might also lock a mutex from the signalSlotLock() mutex pool, - // and that would deadlock if the pool happens to return the same mutex. - obj.reset(); - - locker.relock(); } else if (c->callFunction && c->method_offset <= receiver->metaObject()->methodOffset()) { //we compare the vtable to make sure we are not in the destructor of the object. - const int methodIndex = c->method(); const int method_relative = c->method_relative; const auto callFunction = c->callFunction; - locker.unlock(); - if (qt_signal_spy_callback_set.slot_begin_callback != 0) - qt_signal_spy_callback_set.slot_begin_callback(receiver, methodIndex, argv ? argv : empty_argv); + const int methodIndex = (Q_HAS_TRACEPOINTS || callbacks_enabled) ? c->method() : 0; + if (callbacks_enabled && signal_spy_set->slot_begin_callback != nullptr) + signal_spy_set->slot_begin_callback(receiver, methodIndex, argv); { Q_TRACE_SCOPE(QMetaObject_activate_slot, receiver, methodIndex); - callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv ? argv : empty_argv); + callFunction(receiver, QMetaObject::InvokeMetaMethod, method_relative, argv); } - if (qt_signal_spy_callback_set.slot_end_callback != 0) - qt_signal_spy_callback_set.slot_end_callback(receiver, methodIndex); - locker.relock(); + if (callbacks_enabled && signal_spy_set->slot_end_callback != nullptr) + signal_spy_set->slot_end_callback(receiver, methodIndex); } else { const int method = c->method_relative + c->method_offset; - locker.unlock(); - if (qt_signal_spy_callback_set.slot_begin_callback != 0) { - qt_signal_spy_callback_set.slot_begin_callback(receiver, - method, - argv ? argv : empty_argv); + if (callbacks_enabled && signal_spy_set->slot_begin_callback != nullptr) { + signal_spy_set->slot_begin_callback(receiver, method, argv); } { Q_TRACE_SCOPE(QMetaObject_activate_slot, receiver, method); - metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv ? argv : empty_argv); + QMetaObject::metacall(receiver, QMetaObject::InvokeMetaMethod, method, argv); } - if (qt_signal_spy_callback_set.slot_end_callback != 0) - qt_signal_spy_callback_set.slot_end_callback(receiver, method); - - locker.relock(); + if (callbacks_enabled && signal_spy_set->slot_end_callback != nullptr) + signal_spy_set->slot_end_callback(receiver, method); } + } while ((c = c->nextConnectionList.loadRelaxed()) != nullptr && c->id <= highestConnectionId); - if (connectionLists->orphaned) - break; - } while (c != last && (c = c->nextConnectionList) != 0); - - if (connectionLists->orphaned) - break; - } while (list != &connectionLists->allsignals && + } while (list != &signalVector->at(-1) && //start over for all signals; - ((list = &connectionLists->allsignals), true)); + ((list = &signalVector->at(-1)), true)); + if (connections->currentConnectionId.loadRelaxed() == 0) + senderDeleted = true; } + if (!senderDeleted) + sp->connections.loadRelaxed()->cleanOrphanedConnections(sender); + + if (callbacks_enabled && signal_spy_set->signal_end_callback != nullptr) + signal_spy_set->signal_end_callback(sender, signal_index); +} + +/*! + \internal + */ +void QMetaObject::activate(QObject *sender, const QMetaObject *m, int local_signal_index, + void **argv) +{ + int signal_index = local_signal_index + QMetaObjectPrivate::signalOffset(m); - if (qt_signal_spy_callback_set.signal_end_callback != 0) - qt_signal_spy_callback_set.signal_end_callback(sender, signal_index); + if (Q_UNLIKELY(qt_signal_spy_callback_set.loadRelaxed())) + doActivate<true>(sender, signal_index, argv); + else + doActivate<false>(sender, signal_index, argv); } /*! \internal + */ +void QMetaObject::activate(QObject *sender, int signalOffset, int local_signal_index, void **argv) +{ + int signal_index = signalOffset + local_signal_index; + + if (Q_UNLIKELY(qt_signal_spy_callback_set.loadRelaxed())) + doActivate<true>(sender, signal_index, argv); + else + doActivate<false>(sender, signal_index, argv); + } + +/*! + \internal signal_index comes from indexOfMethod() */ void QMetaObject::activate(QObject *sender, int signal_index, void **argv) @@ -3855,12 +3882,12 @@ void QMetaObject::activate(QObject *sender, int signal_index, void **argv) /*! \internal - Returns the signal index used in the internal connectionLists vector. + Returns the signal index used in the internal connections->receivers vector. It is different from QMetaObject::indexOfSignal(): indexOfSignal is the same as indexOfMethod while QObjectPrivate::signalIndex is smaller because it doesn't give index to slots. - If \a meta is not 0, it is set to the meta-object where the signal was found. + If \a meta is not \nullptr, it is set to the meta-object where the signal was found. */ int QObjectPrivate::signalIndex(const char *signalName, const QMetaObject **meta) const @@ -4038,6 +4065,7 @@ static void dumpRecursive(int level, const QObject *object) } } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! \overload \obsolete @@ -4051,6 +4079,7 @@ void QObject::dumpObjectTree() { const_cast<const QObject *>(this)->dumpObjectTree(); } +#endif /*! Dumps a tree of children to the debug output. @@ -4065,6 +4094,7 @@ void QObject::dumpObjectTree() const dumpRecursive(0, this); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! \overload \obsolete @@ -4079,6 +4109,7 @@ void QObject::dumpObjectInfo() { const_cast<const QObject *>(this)->dumpObjectInfo(); } +#endif /*! Dumps information about signal connections, etc. for this object @@ -4095,37 +4126,40 @@ void QObject::dumpObjectInfo() const objectName().isEmpty() ? "unnamed" : objectName().toLocal8Bit().data()); Q_D(const QObject); - QMutexLocker locker(signalSlotLock(this)); + QBasicMutexLocker locker(signalSlotLock(this)); // first, look for connections where this object is the sender qDebug(" SIGNALS OUT"); - if (d->connectionLists) { - for (int signal_index = 0; signal_index < d->connectionLists->count(); ++signal_index) { + QObjectPrivate::ConnectionData *cd = d->connections.loadRelaxed(); + if (cd && cd->signalVectorCount()) { + QObjectPrivate::SignalVector *signalVector = cd->signalVector.loadRelaxed(); + for (int signal_index = 0; signal_index < signalVector->count(); ++signal_index) { + const QObjectPrivate::Connection *c = signalVector->at(signal_index).first.loadRelaxed(); + if (!c) + continue; const QMetaMethod signal = QMetaObjectPrivate::signal(metaObject(), signal_index); qDebug(" signal: %s", signal.methodSignature().constData()); // receivers - const QObjectPrivate::Connection *c = - d->connectionLists->at(signal_index).first; while (c) { - if (!c->receiver) { + if (!c->receiver.loadRelaxed()) { qDebug(" <Disconnected receiver>"); - c = c->nextConnectionList; + c = c->nextConnectionList.loadRelaxed(); continue; } if (c->isSlotObject) { qDebug(" <functor or function pointer>"); - c = c->nextConnectionList; + c = c->nextConnectionList.loadRelaxed(); continue; } - const QMetaObject *receiverMetaObject = c->receiver->metaObject(); + const QMetaObject *receiverMetaObject = c->receiver.loadRelaxed()->metaObject(); const QMetaMethod method = receiverMetaObject->method(c->method()); qDebug(" --> %s::%s %s", receiverMetaObject->className(), - c->receiver->objectName().isEmpty() ? "unnamed" : qPrintable(c->receiver->objectName()), + c->receiver.loadRelaxed()->objectName().isEmpty() ? "unnamed" : qPrintable(c->receiver.loadRelaxed()->objectName()), method.methodSignature().constData()); - c = c->nextConnectionList; + c = c->nextConnectionList.loadRelaxed(); } } } else { @@ -4135,8 +4169,8 @@ void QObject::dumpObjectInfo() const // now look for connections where this object is the receiver qDebug(" SIGNALS IN"); - if (d->senders) { - for (QObjectPrivate::Connection *s = d->senders; s; s = s->next) { + if (cd && cd->senders) { + for (QObjectPrivate::Connection *s = cd->senders; s; s = s->next) { QByteArray slotName = QByteArrayLiteral("<unknown>"); if (!s->isSlotObject) { const QMetaMethod slot = metaObject()->method(s->method()); @@ -4163,6 +4197,11 @@ uint QObject::registerUserData() } /*! + \fn QObjectUserData::QObjectUserData() + \internal + */ + +/*! \internal */ QObjectUserData::~QObjectUserData() @@ -4871,18 +4910,17 @@ QMetaObject::Connection QObjectPrivate::connectImpl(const QObject *sender, int s QOrderedMutexLocker locker(signalSlotLock(sender), signalSlotLock(receiver)); - if (type & Qt::UniqueConnection && slot) { - QObjectConnectionListVector *connectionLists = QObjectPrivate::get(s)->connectionLists; - if (connectionLists && connectionLists->count() > signal_index) { - const QObjectPrivate::Connection *c2 = - (*connectionLists)[signal_index].first; + if (type & Qt::UniqueConnection && slot && QObjectPrivate::get(s)->connections.loadRelaxed()) { + QObjectPrivate::ConnectionData *connections = QObjectPrivate::get(s)->connections.loadRelaxed(); + if (connections->signalVectorCount() > signal_index) { + const QObjectPrivate::Connection *c2 = connections->signalVector.loadRelaxed()->at(signal_index).first.loadRelaxed(); while (c2) { - if (c2->receiver == receiver && c2->isSlotObject && c2->slotObj->compare(slot)) { + if (c2->receiver.loadRelaxed() == receiver && c2->isSlotObject && c2->slotObj->compare(slot)) { slotObj->destroyIfLastRef(); return QMetaObject::Connection(); } - c2 = c2->nextConnectionList; + c2 = c2->nextConnectionList.loadRelaxed(); } } type = static_cast<Qt::ConnectionType>(type ^ Qt::UniqueConnection); @@ -4891,12 +4929,15 @@ QMetaObject::Connection QObjectPrivate::connectImpl(const QObject *sender, int s QScopedPointer<QObjectPrivate::Connection> c(new QObjectPrivate::Connection); c->sender = s; c->signal_index = signal_index; - c->receiver = r; + QThreadData *td = r->d_func()->threadData; + td->ref(); + c->receiverThreadData.storeRelaxed(td); + c->receiver.storeRelaxed(r); c->slotObj = slotObj; c->connectionType = type; c->isSlotObject = true; if (types) { - c->argumentTypes.store(types); + c->argumentTypes.storeRelaxed(types); c->ownArgumentTypes = false; } @@ -4923,35 +4964,35 @@ bool QObject::disconnect(const QMetaObject::Connection &connection) { QObjectPrivate::Connection *c = static_cast<QObjectPrivate::Connection *>(connection.d_ptr); - if (!c || !c->receiver) + if (!c) + return false; + QObject *receiver = c->receiver.loadRelaxed(); + if (!receiver) return false; - QMutex *senderMutex = signalSlotLock(c->sender); - QMutex *receiverMutex = signalSlotLock(c->receiver); + QBasicMutex *senderMutex = signalSlotLock(c->sender); + QBasicMutex *receiverMutex = signalSlotLock(receiver); + QObjectPrivate::ConnectionData *connections; { QOrderedMutexLocker locker(senderMutex, receiverMutex); - QObjectConnectionListVector *connectionLists = QObjectPrivate::get(c->sender)->connectionLists; - Q_ASSERT(connectionLists); - connectionLists->dirty = true; + // load receiver once again and recheck to ensure nobody else has removed the connection in the meantime + receiver = c->receiver.loadRelaxed(); + if (!receiver) + return false; - *c->prev = c->next; - if (c->next) - c->next->prev = c->prev; - c->receiver = 0; + connections = QObjectPrivate::get(c->sender)->connections.loadRelaxed(); + Q_ASSERT(connections); + connections->removeConnection(c); } - // destroy the QSlotObject, if possible - if (c->isSlotObject) { - c->slotObj->destroyIfLastRef(); - c->isSlotObject = false; - } + connections->cleanOrphanedConnections(c->sender); c->sender->disconnectNotify(QMetaObjectPrivate::signal(c->sender->metaObject(), c->signal_index)); - const_cast<QMetaObject::Connection &>(connection).d_ptr = 0; + const_cast<QMetaObject::Connection &>(connection).d_ptr = nullptr; c->deref(); // has been removed from the QMetaObject::Connection object return true; @@ -4993,8 +5034,8 @@ bool QObject::disconnect(const QMetaObject::Connection &connection) 0 may be used as a wildcard, meaning "any signal", "any receiving object", or "any slot in the receiving object", respectively. - The \a sender may never be 0. (You cannot disconnect signals from - more than one object in a single call.) + The \a sender may never be \nullptr. (You cannot disconnect signals + from more than one object in a single call.) If \a signal is 0, it disconnects \a receiver and \a method from any signal. If not, only the specified signal is disconnected. @@ -5005,8 +5046,8 @@ bool QObject::disconnect(const QMetaObject::Connection &connection) If \a method is 0, it disconnects anything that is connected to \a receiver. If not, only slots named \a method will be disconnected, - and all other slots are left alone. The \a method must be 0 if \a - receiver is left out, so you cannot disconnect a + and all other slots are left alone. The \a method must be \nullptr + if \a receiver is left out, so you cannot disconnect a specifically-named slot on all objects. \note It is not possible to use this overload to diconnect signals @@ -5133,7 +5174,7 @@ bool QMetaObject::Connection::isConnected_helper() const Q_ASSERT(d_ptr); // we're only called from operator RestrictedBool() const QObjectPrivate::Connection *c = static_cast<QObjectPrivate::Connection *>(d_ptr); - return c->receiver; + return c->receiver.loadRelaxed(); } diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index aac9bcdee9..7f72b69c1a 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -93,7 +93,9 @@ Q_CORE_EXPORT void qt_qFindChildren_helper(const QObject *parent, const QRegular Q_CORE_EXPORT QObject *qt_qFindChild_helper(const QObject *parent, const QString &name, const QMetaObject &mo, Qt::FindChildOptions options); class Q_CORE_EXPORT QObjectData { + Q_DISABLE_COPY(QObjectData) public: + QObjectData() = default; virtual ~QObjectData() = 0; QObject *q_ptr; QObject *parent; @@ -111,12 +113,17 @@ public: int postedEvents; QDynamicMetaObjectData *metaObject; QMetaObject *dynamicMetaObject() const; + +#ifdef QT_DEBUG + enum { CheckForParentChildLoopsWarnDepth = 4096 }; +#endif }; class Q_CORE_EXPORT QObject { Q_OBJECT + Q_PROPERTY(QString objectName READ objectName WRITE setObjectName NOTIFY objectNameChanged) Q_DECLARE_PRIVATE(QObject) @@ -127,7 +134,7 @@ public: virtual bool event(QEvent *event); virtual bool eventFilter(QObject *watched, QEvent *event); -#if defined(QT_NO_TRANSLATION) +#if defined(QT_NO_TRANSLATION) || defined(Q_CLANG_QDOC) static QString tr(const char *sourceText, const char * = nullptr, int = -1) { return QString::fromUtf8(sourceText); } #if QT_DEPRECATED_SINCE(5, 0) @@ -142,8 +149,8 @@ public: inline bool isWidgetType() const { return d_ptr->isWidget; } inline bool isWindowType() const { return d_ptr->isWindow; } - inline bool signalsBlocked() const Q_DECL_NOTHROW { return d_ptr->blockSig; } - bool blockSignals(bool b) Q_DECL_NOTHROW; + inline bool signalsBlocked() const noexcept { return d_ptr->blockSig; } + bool blockSignals(bool b) noexcept; QThread *thread() const; void moveToThread(QThread *thread); @@ -176,7 +183,9 @@ public: } #ifndef QT_NO_REGEXP +#if QT_DEPRECATED_SINCE(5, 13) template<typename T> + QT_DEPRECATED_X("Use findChildren(const QRegularExpression &, ...) instead.") inline QList<T> findChildren(const QRegExp &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { typedef typename std::remove_cv<typename std::remove_pointer<T>::type>::type ObjType; @@ -186,6 +195,7 @@ public: return list; } #endif +#endif #if QT_CONFIG(regularexpression) template<typename T> @@ -433,7 +443,7 @@ protected: QScopedPointer<QObjectData> d_ptr; static const QMetaObject staticQtMetaObject; - friend inline const QMetaObject *qt_getQtMetaObject() Q_DECL_NOEXCEPT; + friend inline const QMetaObject *qt_getQtMetaObject() noexcept; friend struct QMetaObject; friend struct QMetaObjectPrivate; @@ -464,12 +474,14 @@ inline QMetaObject::Connection QObject::connect(const QObject *asender, const ch const char *amember, Qt::ConnectionType atype) const { return connect(asender, asignal, this, amember, atype); } -inline const QMetaObject *qt_getQtMetaObject() Q_DECL_NOEXCEPT +inline const QMetaObject *qt_getQtMetaObject() noexcept { return &QObject::staticQtMetaObject; } #ifndef QT_NO_USERDATA class Q_CORE_EXPORT QObjectUserData { + Q_DISABLE_COPY(QObjectUserData) public: + QObjectUserData() = default; virtual ~QObjectUserData(); }; #endif @@ -517,7 +529,10 @@ inline T qobject_cast(const QObject *object) template <class T> inline const char * qobject_interface_iid() { return nullptr; } -#if !defined(Q_MOC_RUN) && !defined(Q_CLANG_QDOC) + +#if defined(Q_CLANG_QDOC) +# define Q_DECLARE_INTERFACE(IFace, IId) +#elif !defined(Q_MOC_RUN) # define Q_DECLARE_INTERFACE(IFace, IId) \ template <> inline const char *qobject_interface_iid<IFace *>() \ { return IId; } \ @@ -534,17 +549,15 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QObject *); class QSignalBlocker { public: - inline explicit QSignalBlocker(QObject *o) Q_DECL_NOTHROW; - inline explicit QSignalBlocker(QObject &o) Q_DECL_NOTHROW; + inline explicit QSignalBlocker(QObject *o) noexcept; + inline explicit QSignalBlocker(QObject &o) noexcept; inline ~QSignalBlocker(); -#ifdef Q_COMPILER_RVALUE_REFS - inline QSignalBlocker(QSignalBlocker &&other) Q_DECL_NOTHROW; - inline QSignalBlocker &operator=(QSignalBlocker &&other) Q_DECL_NOTHROW; -#endif + inline QSignalBlocker(QSignalBlocker &&other) noexcept; + inline QSignalBlocker &operator=(QSignalBlocker &&other) noexcept; - inline void reblock() Q_DECL_NOTHROW; - inline void unblock() Q_DECL_NOTHROW; + inline void reblock() noexcept; + inline void unblock() noexcept; private: Q_DISABLE_COPY(QSignalBlocker) QObject * m_o; @@ -552,20 +565,19 @@ private: bool m_inhibited; }; -QSignalBlocker::QSignalBlocker(QObject *o) Q_DECL_NOTHROW +QSignalBlocker::QSignalBlocker(QObject *o) noexcept : m_o(o), m_blocked(o && o->blockSignals(true)), m_inhibited(false) {} -QSignalBlocker::QSignalBlocker(QObject &o) Q_DECL_NOTHROW +QSignalBlocker::QSignalBlocker(QObject &o) noexcept : m_o(&o), m_blocked(o.blockSignals(true)), m_inhibited(false) {} -#ifdef Q_COMPILER_RVALUE_REFS -QSignalBlocker::QSignalBlocker(QSignalBlocker &&other) Q_DECL_NOTHROW +QSignalBlocker::QSignalBlocker(QSignalBlocker &&other) noexcept : m_o(other.m_o), m_blocked(other.m_blocked), m_inhibited(other.m_inhibited) @@ -573,7 +585,7 @@ QSignalBlocker::QSignalBlocker(QSignalBlocker &&other) Q_DECL_NOTHROW other.m_o = nullptr; } -QSignalBlocker &QSignalBlocker::operator=(QSignalBlocker &&other) Q_DECL_NOTHROW +QSignalBlocker &QSignalBlocker::operator=(QSignalBlocker &&other) noexcept { if (this != &other) { // if both *this and other block the same object's signals: @@ -588,7 +600,6 @@ QSignalBlocker &QSignalBlocker::operator=(QSignalBlocker &&other) Q_DECL_NOTHROW } return *this; } -#endif QSignalBlocker::~QSignalBlocker() { @@ -596,13 +607,13 @@ QSignalBlocker::~QSignalBlocker() m_o->blockSignals(m_blocked); } -void QSignalBlocker::reblock() Q_DECL_NOTHROW +void QSignalBlocker::reblock() noexcept { if (m_o) m_o->blockSignals(true); m_inhibited = false; } -void QSignalBlocker::unblock() Q_DECL_NOTHROW +void QSignalBlocker::unblock() noexcept { if (m_o) m_o->blockSignals(m_blocked); m_inhibited = true; diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 5dfef786ec..1953aea21e 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2013 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ ** @@ -79,9 +79,9 @@ struct QSignalSpyCallbackSet EndCallback signal_end_callback, slot_end_callback; }; -void Q_CORE_EXPORT qt_register_signal_spy_callbacks(const QSignalSpyCallbackSet &callback_set); +void Q_CORE_EXPORT qt_register_signal_spy_callbacks(QSignalSpyCallbackSet *callback_set); -extern QSignalSpyCallbackSet Q_CORE_EXPORT qt_signal_spy_callback_set; +extern Q_CORE_EXPORT QBasicAtomicPointer<QSignalSpyCallbackSet> qt_signal_spy_callback_set; enum { QObjectPrivateVersion = QT_VERSION }; @@ -124,54 +124,199 @@ public: }; typedef void (*StaticMetaCallFunction)(QObject *, QMetaObject::Call, int, void **); - struct Connection + struct Connection; + struct SignalVector; + + struct ConnectionOrSignalVector { + union { + // linked list of orphaned connections that need cleaning up + ConnectionOrSignalVector *nextInOrphanList; + // linked list of connections connected to slots in this object + Connection *next; + }; + + static SignalVector *asSignalVector(ConnectionOrSignalVector *c) { + if (reinterpret_cast<quintptr>(c) & 1) + return reinterpret_cast<SignalVector *>(reinterpret_cast<quintptr>(c) & ~quintptr(1u)); + return nullptr; + } + static Connection *fromSignalVector(SignalVector *v) { + return reinterpret_cast<Connection *>(reinterpret_cast<quintptr>(v) | quintptr(1u)); + } + }; + + struct Connection : public ConnectionOrSignalVector { + // linked list of connections connected to slots in this object, next is in base class + Connection **prev; + // linked list of connections connected to signals in this object + QAtomicPointer<Connection> nextConnectionList; + Connection *prevConnectionList; + QObject *sender; - QObject *receiver; + QAtomicPointer<QObject> receiver; + QAtomicPointer<QThreadData> receiverThreadData; union { StaticMetaCallFunction callFunction; QtPrivate::QSlotObjectBase *slotObj; }; - // The next pointer for the singly-linked ConnectionList - Connection *nextConnectionList; - //senders linked list - Connection *next; - Connection **prev; QAtomicPointer<const int> argumentTypes; QAtomicInt ref_; + uint id = 0; ushort method_offset; ushort method_relative; - uint signal_index : 27; // In signal range (see QObjectPrivate::signalIndex()) + int signal_index : 27; // In signal range (see QObjectPrivate::signalIndex()) ushort connectionType : 3; // 0 == auto, 1 == direct, 2 == queued, 4 == blocking ushort isSlotObject : 1; ushort ownArgumentTypes : 1; - Connection() : nextConnectionList(nullptr), ref_(2), ownArgumentTypes(true) { + Connection() : ref_(2), ownArgumentTypes(true) { //ref_ is 2 for the use in the internal lists, and for the use in QMetaObject::Connection } ~Connection(); int method() const { Q_ASSERT(!isSlotObject); return method_offset + method_relative; } void ref() { ref_.ref(); } + void freeSlotObject() + { + if (isSlotObject) { + slotObj->destroyIfLastRef(); + isSlotObject = false; + } + } void deref() { if (!ref_.deref()) { - Q_ASSERT(!receiver); + Q_ASSERT(!receiver.loadRelaxed()); + Q_ASSERT(!isSlotObject); delete this; } } }; // ConnectionList is a singly-linked list struct ConnectionList { - ConnectionList() : first(nullptr), last(nullptr) {} - Connection *first; - Connection *last; + QAtomicPointer<Connection> first; + QAtomicPointer<Connection> last; }; struct Sender { + Sender(QObject *receiver, QObject *sender, int signal) + : receiver(receiver), sender(sender), signal(signal) + { + if (receiver) { + ConnectionData *cd = receiver->d_func()->connections.loadRelaxed(); + previous = cd->currentSender; + cd->currentSender = this; + } + } + ~Sender() + { + if (receiver) + receiver->d_func()->connections.loadRelaxed()->currentSender = previous; + } + void receiverDeleted() + { + Sender *s = this; + while (s) { + s->receiver = nullptr; + s = s->previous; + } + } + Sender *previous; + QObject *receiver; QObject *sender; int signal; - int ref; }; + struct SignalVector : public ConnectionOrSignalVector { + quintptr allocated; + // ConnectionList signals[] + ConnectionList &at(int i) + { + return reinterpret_cast<ConnectionList *>(this + 1)[i + 1]; + } + const ConnectionList &at(int i) const + { + return reinterpret_cast<const ConnectionList *>(this + 1)[i + 1]; + } + int count() const { return static_cast<int>(allocated); } + }; + + + + /* + This contains the all connections from and to an object. + + The signalVector contains the lists of connections for a given signal. The index in the vector correspond + to the signal index. The signal index is the one returned by QObjectPrivate::signalIndex (not + QMetaObject::indexOfSignal). allsignals contains a list of special connections that will get invoked on + any signal emission. This is done by connecting to signal index -1. + + This vector is protected by the object mutex (signalSlotLock()) + + Each Connection is also part of a 'senders' linked list. This one contains all connections connected + to a slot in this object. The mutex of the receiver must be locked when touching the pointers of this + linked list. + */ + struct ConnectionData { + // the id below is used to avoid activating new connections. When the object gets + // deleted it's set to 0, so that signal emission stops + QAtomicInteger<uint> currentConnectionId; + QAtomicInt ref; + QAtomicPointer<SignalVector> signalVector; + Connection *senders = nullptr; + Sender *currentSender = nullptr; // object currently activating the object + QAtomicPointer<Connection> orphaned; + + ~ConnectionData() + { + deleteOrphaned(orphaned.loadRelaxed()); + SignalVector *v = signalVector.loadRelaxed(); + if (v) + free(v); + } + + // must be called on the senders connection data + // assumes the senders and receivers lock are held + void removeConnection(Connection *c); + void cleanOrphanedConnections(QObject *sender) + { + if (orphaned.loadRelaxed() && ref == 1) + cleanOrphanedConnectionsImpl(sender); + } + void cleanOrphanedConnectionsImpl(QObject *sender); + + ConnectionList &connectionsForSignal(int signal) + { + return signalVector.loadRelaxed()->at(signal); + } + + void resizeSignalVector(uint size) { + SignalVector *vector = this->signalVector.loadRelaxed(); + if (vector && vector->allocated > size) + return; + size = (size + 7) & ~7; + SignalVector *newVector = reinterpret_cast<SignalVector *>(malloc(sizeof(SignalVector) + (size + 1) * sizeof(ConnectionList))); + int start = -1; + if (vector) { + memcpy(newVector, vector, sizeof(SignalVector) + (vector->allocated + 1) * sizeof(ConnectionList)); + start = vector->count(); + } + for (int i = start; i < int(size); ++i) + newVector->at(i) = ConnectionList(); + newVector->next = nullptr; + newVector->allocated = size; + + signalVector.storeRelaxed(newVector); + if (vector) { + vector->nextInOrphanList = orphaned.loadRelaxed(); + orphaned.storeRelaxed(ConnectionOrSignalVector::fromSignalVector(vector)); + } + } + int signalVectorCount() const { + return signalVector ? signalVector.loadRelaxed()->count() : -1; + } + + static void deleteOrphaned(ConnectionOrSignalVector *c); + }; QObjectPrivate(int version = QObjectPrivateVersion); virtual ~QObjectPrivate(); @@ -187,13 +332,6 @@ public: QObjectList senderList() const; void addConnection(int signal, Connection *c); - void cleanConnectionLists(); - - static inline Sender *setCurrentSender(QObject *receiver, - Sender *sender); - static inline void resetCurrentSender(QObject *receiver, - Sender *currentSender, - Sender *previousSender); static QObjectPrivate *get(QObject *o) { return o->d_func(); @@ -201,7 +339,8 @@ public: static const QObjectPrivate *get(const QObject *o) { return o->d_func(); } int signalIndex(const char *signalName, const QMetaObject **meta = nullptr) const; - inline bool isSignalConnected(uint signalIdx, bool checkDeclarative = true) const; + bool isSignalConnected(uint signalIdx, bool checkDeclarative = true) const; + bool maybeSignalConnected(uint signalIndex) const; inline bool isDeclarativeSignalConnected(uint signalIdx) const; // To allow abitrary objects to call connectNotify()/disconnectNotify() without making @@ -224,15 +363,21 @@ public: const int *types, const QMetaObject *senderMetaObject); static QMetaObject::Connection connect(const QObject *sender, int signal_index, QtPrivate::QSlotObjectBase *slotObj, Qt::ConnectionType type); static bool disconnect(const QObject *sender, int signal_index, void **slot); + + void ensureConnectionData() + { + if (connections.loadRelaxed()) + return; + ConnectionData *cd = new ConnectionData; + cd->ref.ref(); + connections.storeRelaxed(cd); + } public: ExtraData *extraData; // extra data set by the user QThreadData *threadData; // id of the thread that owns the object - QObjectConnectionListVector *connectionLists; - - Connection *senders; // linked list of connections connected to this object - Sender *currentSender; // object currently activating the object - mutable quint32 connectedSignals[2]; + using ConnectionDataPointer = QExplicitlySharedDataPointer<ConnectionData>; + QAtomicPointer<ConnectionData> connections; union { QObject *currentChildBeingDeleted; // should only be used when QObjectData::isDeletingChildren is set @@ -246,47 +391,12 @@ public: Q_DECLARE_TYPEINFO(QObjectPrivate::ConnectionList, Q_MOVABLE_TYPE); -/*! \internal - - Returns \c true if the signal with index \a signal_index from object \a sender is connected. - Signals with indices above a certain range are always considered connected (see connectedSignals - in QObjectPrivate). - - \a signal_index must be the index returned by QObjectPrivate::signalIndex; -*/ -inline bool QObjectPrivate::isSignalConnected(uint signal_index, bool checkDeclarative) const -{ - return signal_index >= sizeof(connectedSignals) * 8 - || (connectedSignals[signal_index >> 5] & (1 << (signal_index & 0x1f)) - || (checkDeclarative && isDeclarativeSignalConnected(signal_index))); -} - inline bool QObjectPrivate::isDeclarativeSignalConnected(uint signal_index) const { return declarativeData && QAbstractDeclarativeData::isSignalConnected && QAbstractDeclarativeData::isSignalConnected(declarativeData, q_func(), signal_index); } -inline QObjectPrivate::Sender *QObjectPrivate::setCurrentSender(QObject *receiver, - Sender *sender) -{ - Sender *previousSender = receiver->d_func()->currentSender; - receiver->d_func()->currentSender = sender; - return previousSender; -} - -inline void QObjectPrivate::resetCurrentSender(QObject *receiver, - Sender *currentSender, - Sender *previousSender) -{ - // ref is set to zero when this object is deleted during the metacall - if (currentSender->ref == 1) - receiver->d_func()->currentSender = previousSender; - // if we've recursed, we need to tell the caller about the objects deletion - if (previousSender) - previousSender->ref = currentSender->ref; -} - inline void QObjectPrivate::connectNotify(const QMetaMethod &signal) { q_ptr->connectNotify(signal); @@ -372,7 +482,26 @@ Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_MOVABLE_TYPE); Q_DECLARE_TYPEINFO(QObjectPrivate::Sender, Q_MOVABLE_TYPE); class QSemaphore; -class Q_CORE_EXPORT QMetaCallEvent : public QEvent +class Q_CORE_EXPORT QAbstractMetaCallEvent : public QEvent +{ +public: + QAbstractMetaCallEvent(const QObject *sender, int signalId, QSemaphore *semaphore = nullptr) + : QEvent(MetaCall), signalId_(signalId), sender_(sender), semaphore_(semaphore) + {} + ~QAbstractMetaCallEvent(); + + virtual void placeMetaCall(QObject *object) = 0; + + inline const QObject *sender() const { return sender_; } + inline int signalId() const { return signalId_; } + +private: + int signalId_; + const QObject *sender_; + QSemaphore *semaphore_; +}; + +class Q_CORE_EXPORT QMetaCallEvent : public QAbstractMetaCallEvent { public: QMetaCallEvent(ushort method_offset, ushort method_relative, QObjectPrivate::StaticMetaCallFunction callFunction , const QObject *sender, int signalId, @@ -383,23 +512,18 @@ public: QMetaCallEvent(QtPrivate::QSlotObjectBase *slotObj, const QObject *sender, int signalId, int nargs = 0, int *types = nullptr, void **args = nullptr, QSemaphore *semaphore = nullptr); - ~QMetaCallEvent(); + ~QMetaCallEvent() override; inline int id() const { return method_offset_ + method_relative_; } - inline const QObject *sender() const { return sender_; } - inline int signalId() const { return signalId_; } inline void **args() const { return args_; } - virtual void placeMetaCall(QObject *object); + virtual void placeMetaCall(QObject *object) override; private: QtPrivate::QSlotObjectBase *slotObj_; - const QObject *sender_; - int signalId_; int nargs_; int *types_; void **args_; - QSemaphore *semaphore_; QObjectPrivate::StaticMetaCallFunction callFunction_; ushort method_offset_; ushort method_relative_; @@ -407,7 +531,7 @@ private: class QBoolBlocker { - Q_DISABLE_COPY(QBoolBlocker) + Q_DISABLE_COPY_MOVE(QBoolBlocker) public: explicit inline QBoolBlocker(bool &b, bool value=true):block(b), reset(b){block = value;} inline ~QBoolBlocker(){block = reset; } @@ -432,9 +556,9 @@ struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QDynamicMetaObjectData, { ~QAbstractDynamicMetaObject(); - virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override { return this; } + QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override { return this; } virtual int createProperty(const char *, const char *) { return -1; } - virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) override + int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) override { return metaCall(c, _id, a); } virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; } // Compat overload }; diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 059bb44e10..4d5ac4dcb2 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -64,11 +64,7 @@ class QString; // The following macros can be defined by tools that understand Qt // to have the information from the macro. #ifndef QT_ANNOTATE_CLASS -# ifndef Q_COMPILER_VARIADIC_MACROS -# define QT_ANNOTATE_CLASS(type, x) -# else -# define QT_ANNOTATE_CLASS(type, ...) -# endif +# define QT_ANNOTATE_CLASS(type, ...) #endif #ifndef QT_ANNOTATE_CLASS2 # define QT_ANNOTATE_CLASS2(type, a1, a2) @@ -105,11 +101,7 @@ class QString; #endif #define Q_PLUGIN_METADATA(x) QT_ANNOTATE_CLASS(qt_plugin_metadata, x) #define Q_INTERFACES(x) QT_ANNOTATE_CLASS(qt_interfaces, x) -#ifdef Q_COMPILER_VARIADIC_MACROS -# define Q_PROPERTY(...) QT_ANNOTATE_CLASS(qt_property, __VA_ARGS__) -#else -# define Q_PROPERTY(text) QT_ANNOTATE_CLASS(qt_property, text) -#endif +#define Q_PROPERTY(...) QT_ANNOTATE_CLASS(qt_property, __VA_ARGS__) #define Q_PRIVATE_PROPERTY(d, text) QT_ANNOTATE_CLASS2(qt_private_property, d, text) #ifndef Q_REVISION # define Q_REVISION(v) @@ -119,13 +111,13 @@ class QString; #define Q_ENUMS(x) QT_ANNOTATE_CLASS(qt_enums, x) #define Q_FLAGS(x) QT_ANNOTATE_CLASS(qt_enums, x) #define Q_ENUM_IMPL(ENUM) \ - friend Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) Q_DECL_NOEXCEPT { return &staticMetaObject; } \ - friend Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) Q_DECL_NOEXCEPT { return #ENUM; } + friend Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \ + friend Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; } #define Q_ENUM(x) Q_ENUMS(x) Q_ENUM_IMPL(x) #define Q_FLAG(x) Q_FLAGS(x) Q_ENUM_IMPL(x) #define Q_ENUM_NS_IMPL(ENUM) \ - inline Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) Q_DECL_NOEXCEPT { return &staticMetaObject; } \ - inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) Q_DECL_NOEXCEPT { return #ENUM; } + inline Q_DECL_CONSTEXPR const QMetaObject *qt_getEnumMetaObject(ENUM) noexcept { return &staticMetaObject; } \ + inline Q_DECL_CONSTEXPR const char *qt_getEnumName(ENUM) noexcept { return #ENUM; } #define Q_ENUM_NS(x) Q_ENUMS(x) Q_ENUM_NS_IMPL(x) #define Q_FLAG_NS(x) Q_FLAGS(x) Q_ENUM_NS_IMPL(x) #define Q_SCRIPTABLE QT_ANNOTATE_FUNCTION(qt_scriptable) @@ -146,6 +138,10 @@ class QString; # define QT_TR_FUNCTIONS #endif +#ifdef Q_CLANG_QDOC +#define QT_TR_FUNCTIONS +#endif + // ### Qt6: remove #define Q_OBJECT_CHECK /* empty, unused since Qt 5.2 */ @@ -340,7 +336,7 @@ struct Q_CORE_EXPORT QMetaObject const char *className() const; const QMetaObject *superClass() const; - bool inherits(const QMetaObject *metaObject) const Q_DECL_NOEXCEPT; + bool inherits(const QMetaObject *metaObject) const noexcept; QObject *cast(QObject *obj) const; const QObject *cast(const QObject *obj) const; @@ -584,6 +580,7 @@ struct Q_CORE_EXPORT QMetaObject private: static bool invokeMethodImpl(QObject *object, QtPrivate::QSlotObjectBase *slot, Qt::ConnectionType type, void *ret); + friend class QTimer; }; class Q_CORE_EXPORT QMetaObject::Connection { @@ -605,8 +602,8 @@ public: operator RestrictedBool() const { return d_ptr && isConnected_helper() ? &Connection::d_ptr : nullptr; } #endif - Connection(Connection &&o) Q_DECL_NOTHROW : d_ptr(o.d_ptr) { o.d_ptr = nullptr; } - Connection &operator=(Connection &&other) Q_DECL_NOTHROW + Connection(Connection &&o) noexcept : d_ptr(o.d_ptr) { o.d_ptr = nullptr; } + Connection &operator=(Connection &&other) noexcept { qSwap(d_ptr, other.d_ptr); return *this; } }; diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h index 8afff1fb98..31ecc8b20d 100644 --- a/src/corelib/kernel/qobjectdefs_impl.h +++ b/src/corelib/kernel/qobjectdefs_impl.h @@ -386,8 +386,8 @@ namespace QtPrivate { public: explicit QSlotObjectBase(ImplFn fn) : m_ref(1), m_impl(fn) {} - inline int ref() Q_DECL_NOTHROW { return m_ref.ref(); } - inline void destroyIfLastRef() Q_DECL_NOTHROW + inline int ref() noexcept { return m_ref.ref(); } + inline void destroyIfLastRef() noexcept { if (!m_ref.deref()) m_impl(Destroy, this, nullptr, nullptr, nullptr); } inline bool compare(void **a) { bool ret = false; m_impl(Compare, this, nullptr, a, &ret); return ret; } @@ -395,7 +395,7 @@ namespace QtPrivate { protected: ~QSlotObjectBase() {} private: - Q_DISABLE_COPY(QSlotObjectBase) + Q_DISABLE_COPY_MOVE(QSlotObjectBase) }; // implementation of QSlotObjectBase for which the slot is a pointer to member function of a QObject diff --git a/src/corelib/kernel/qpointer.cpp b/src/corelib/kernel/qpointer.cpp index c3dee7989e..068314633b 100644 --- a/src/corelib/kernel/qpointer.cpp +++ b/src/corelib/kernel/qpointer.cpp @@ -45,7 +45,7 @@ \ingroup objectmodel A guarded pointer, QPointer<T>, behaves like a normal C++ - pointer \c{T *}, except that it is automatically set to 0 when the + pointer \c{T *}, except that it is automatically cleared when the referenced object is destroyed (unlike normal C++ pointers, which become "dangling pointers" in such cases). \c T must be a subclass of QObject. @@ -79,7 +79,7 @@ \snippet pointer/pointer.cpp 2 If the QLabel is deleted in the meantime, the \c label variable - will hold 0 instead of an invalid address, and the last line will + will hold \nullptr instead of an invalid address, and the last line will never be executed. The functions and operators available with a QPointer are the @@ -93,7 +93,7 @@ For creating guarded pointers, you can construct or assign to them from a T* or from another guarded pointer of the same type. You can compare them with each other using operator==() and - operator!=(), or test for 0 with isNull(). You can dereference + operator!=(), or test for \nullptr with isNull(). You can dereference them using either the \c *x or the \c x->member notation. A guarded pointer will automatically cast to a \c T *, so you can @@ -113,7 +113,7 @@ /*! \fn template <class T> QPointer<T>::QPointer() - Constructs a 0 guarded pointer. + Constructs a guarded pointer with value \nullptr. \sa isNull() */ diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index b2b3cda4ab..7052bcf0d4 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -77,13 +77,13 @@ public: ~QPointer(); #endif - inline void swap(QPointer &other) { wp.swap(other.wp); } + inline void swap(QPointer &other) noexcept { wp.swap(other.wp); } inline QPointer<T> &operator=(T* p) { wp.assign(static_cast<QObjectType*>(p)); return *this; } inline T* data() const - { return static_cast<T*>( wp.data()); } + { return static_cast<T*>(wp.internalData()); } inline T* operator->() const { return data(); } inline T& operator*() const @@ -143,9 +143,14 @@ template<typename T> QPointer<T> qPointerFromVariant(const QVariant &variant) { - return QPointer<T>(qobject_cast<T*>(QtSharedPointer::weakPointerFromVariant_internal(variant).data())); + const auto wp = QtSharedPointer::weakPointerFromVariant_internal(variant); + return QPointer<T>{qobject_cast<T*>(QtPrivate::EnableInternalData::internalData(wp))}; } +template <class T> +inline void swap(QPointer<T> &p1, QPointer<T> &p2) noexcept +{ p1.swap(p2); } + QT_END_NAMESPACE #endif // QT_NO_QOBJECT diff --git a/src/corelib/kernel/qpoll.cpp b/src/corelib/kernel/qpoll.cpp index 8e93c4d363..8b87bfe79d 100644 --- a/src/corelib/kernel/qpoll.cpp +++ b/src/corelib/kernel/qpoll.cpp @@ -39,6 +39,10 @@ #include "qcore_unix_p.h" +#ifdef Q_OS_RTEMS +#include <rtems/rtems_bsdnet_internal.h> +#endif + QT_BEGIN_NAMESPACE #define QT_POLL_READ_MASK (POLLIN | POLLRDNORM) @@ -135,6 +139,11 @@ static inline int qt_poll_sweep(struct pollfd *fds, nfds_t nfds, static inline bool qt_poll_is_bad_fd(int fd) { +#ifdef Q_OS_RTEMS + if (!rtems_bsdnet_fdToSocket(fd)) + return true; +#endif + int ret; EINTR_LOOP(ret, fcntl(fd, F_GETFD)); return (ret == -1 && errno == EBADF); diff --git a/src/corelib/kernel/qppsattribute.cpp b/src/corelib/kernel/qppsattribute.cpp index 6be462edb5..166d590872 100644 --- a/src/corelib/kernel/qppsattribute.cpp +++ b/src/corelib/kernel/qppsattribute.cpp @@ -145,7 +145,6 @@ QPpsAttribute &QPpsAttribute::operator=(const QPpsAttribute &other) return *this; } -#ifdef Q_COMPILER_RVALUE_REFS QPpsAttribute::QPpsAttribute(QPpsAttribute &&other) : d(other.d) { other.d->type = QPpsAttribute::None; @@ -156,7 +155,6 @@ QPpsAttribute &QPpsAttribute::operator=(QPpsAttribute &&other) qSwap(d, other.d); return *this; } -#endif bool QPpsAttribute::operator==(const QPpsAttribute &other) const { diff --git a/src/corelib/kernel/qppsattribute_p.h b/src/corelib/kernel/qppsattribute_p.h index b59dcd5851..d6611cb675 100644 --- a/src/corelib/kernel/qppsattribute_p.h +++ b/src/corelib/kernel/qppsattribute_p.h @@ -96,10 +96,8 @@ public: bool operator==(const QPpsAttribute &other) const; bool operator!=(const QPpsAttribute &other) const; -#ifdef Q_COMPILER_RVALUE_REFS QPpsAttribute(QPpsAttribute &&other); QPpsAttribute &operator=(QPpsAttribute &&other); -#endif bool isValid() const; Type type() const; diff --git a/src/corelib/kernel/qppsobject_p.h b/src/corelib/kernel/qppsobject_p.h index abcf00fa05..a3bf3a5bc1 100644 --- a/src/corelib/kernel/qppsobject_p.h +++ b/src/corelib/kernel/qppsobject_p.h @@ -119,7 +119,7 @@ Q_SIGNALS: private: Q_DECLARE_PRIVATE(QPpsObject) - Q_DISABLE_COPY(QPpsObject) + Q_DISABLE_COPY_MOVE(QPpsObject) }; QT_END_NAMESPACE diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp index c952655cb8..39f3002394 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp @@ -150,11 +150,18 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, \sa setKey() */ + +#ifndef QT_NO_QOBJECT QSharedMemory::QSharedMemory(QObject *parent) : QObject(*new QSharedMemoryPrivate, parent) { } - +#else +QSharedMemory::QSharedMemory() + : d_ptr(new QSharedMemoryPrivate) +{ +} +#endif /*! Constructs a shared memory object with the given \a parent and with its key set to \a key. Because its key is set, its create() and @@ -162,11 +169,19 @@ QSharedMemory::QSharedMemory(QObject *parent) \sa setKey(), create(), attach() */ +#ifndef QT_NO_QOBJECT QSharedMemory::QSharedMemory(const QString &key, QObject *parent) : QObject(*new QSharedMemoryPrivate, parent) { setKey(key); } +#else +QSharedMemory::QSharedMemory(const QString &key) + : d_ptr(new QSharedMemoryPrivate) +{ + setKey(key); +} +#endif /*! The destructor clears the key, which forces the shared memory object @@ -604,4 +619,6 @@ QString QSharedMemory::errorString() const QT_END_NAMESPACE +#ifndef QT_NO_QOBJECT #include "moc_qsharedmemory.cpp" +#endif diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h index 67cf52ac17..6236c6aa4c 100644 --- a/src/corelib/kernel/qsharedmemory.h +++ b/src/corelib/kernel/qsharedmemory.h @@ -40,8 +40,14 @@ #ifndef QSHAREDMEMORY_H #define QSHAREDMEMORY_H -#include <QtCore/qobject.h> - +#include <QtCore/qglobal.h> +#ifndef QT_NO_QOBJECT +# include <QtCore/qobject.h> +#else +# include <QtCore/qobjectdefs.h> +# include <QtCore/qscopedpointer.h> +# include <QtCore/qstring.h> +#endif QT_BEGIN_NAMESPACE @@ -49,9 +55,14 @@ QT_BEGIN_NAMESPACE class QSharedMemoryPrivate; -class Q_CORE_EXPORT QSharedMemory : public QObject +class Q_CORE_EXPORT QSharedMemory +#ifndef QT_NO_QOBJECT + : public QObject +#endif { +#ifndef QT_NO_QOBJECT Q_OBJECT +#endif Q_DECLARE_PRIVATE(QSharedMemory) public: @@ -74,8 +85,17 @@ public: UnknownError }; +#ifndef QT_NO_QOBJECT QSharedMemory(QObject *parent = nullptr); QSharedMemory(const QString &key, QObject *parent = nullptr); +#else + QSharedMemory(); + QSharedMemory(const QString &key); + static QString tr(const char * str) + { + return QString::fromLatin1(str); + } +#endif ~QSharedMemory(); void setKey(const QString &key); @@ -104,6 +124,9 @@ public: private: Q_DISABLE_COPY(QSharedMemory) +#ifdef QT_NO_QOBJECT + QScopedPointer<QSharedMemoryPrivate> d_ptr; +#endif }; #endif // QT_NO_SHAREDMEMORY diff --git a/src/corelib/kernel/qsharedmemory_p.h b/src/corelib/kernel/qsharedmemory_p.h index 95fe0d1083..e6e989abda 100644 --- a/src/corelib/kernel/qsharedmemory_p.h +++ b/src/corelib/kernel/qsharedmemory_p.h @@ -67,9 +67,12 @@ namespace QSharedMemoryPrivate #else #include "qsystemsemaphore.h" -#include "private/qobject_p.h" -#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) +#ifndef QT_NO_QOBJECT +# include "private/qobject_p.h" +#endif + +#if !defined(Q_OS_WIN) && !defined(Q_OS_ANDROID) && !defined(Q_OS_INTEGRITY) && !defined(Q_OS_RTEMS) # include <sys/sem.h> #endif @@ -98,7 +101,7 @@ public: { if (q_sm && q_sm->lock()) return true; - q_sm = 0; + q_sm = nullptr; return false; } @@ -107,9 +110,14 @@ private: }; #endif // QT_NO_SYSTEMSEMAPHORE -class Q_AUTOTEST_EXPORT QSharedMemoryPrivate : public QObjectPrivate +class Q_AUTOTEST_EXPORT QSharedMemoryPrivate +#ifndef QT_NO_QOBJECT + : public QObjectPrivate +#endif { +#ifndef QT_NO_QOBJECT Q_DECLARE_PUBLIC(QSharedMemory) +#endif public: QSharedMemoryPrivate(); diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index d1d44747e0..f6d7e78441 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -64,8 +64,11 @@ #ifndef QT_NO_SHAREDMEMORY QT_BEGIN_NAMESPACE -QSharedMemoryPrivate::QSharedMemoryPrivate() - : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError), +QSharedMemoryPrivate::QSharedMemoryPrivate() : +#ifndef QT_NO_QOBJECT + QObjectPrivate(), +#endif + memory(0), size(0), error(QSharedMemory::NoError), #ifndef QT_NO_SYSTEMSEMAPHORE systemSemaphore(QString()), lockedByMe(false), #endif diff --git a/src/corelib/kernel/qsharedmemory_win.cpp b/src/corelib/kernel/qsharedmemory_win.cpp index c1dba30e2b..02de2339a5 100644 --- a/src/corelib/kernel/qsharedmemory_win.cpp +++ b/src/corelib/kernel/qsharedmemory_win.cpp @@ -47,7 +47,10 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_SHAREDMEMORY -QSharedMemoryPrivate::QSharedMemoryPrivate() : QObjectPrivate(), +QSharedMemoryPrivate::QSharedMemoryPrivate() : +#ifndef QT_NO_QOBJECT + QObjectPrivate(), +#endif memory(0), size(0), error(QSharedMemory::NoError), systemSemaphore(QString()), lockedByMe(false), hand(0) { diff --git a/src/corelib/kernel/qsignalmapper.cpp b/src/corelib/kernel/qsignalmapper.cpp index 02a1281f92..34fea861cd 100644 --- a/src/corelib/kernel/qsignalmapper.cpp +++ b/src/corelib/kernel/qsignalmapper.cpp @@ -37,6 +37,9 @@ ** ****************************************************************************/ +#include "qglobal.h" +#if QT_DEPRECATED_SINCE(5, 10) + #include "qsignalmapper.h" #include "qhash.h" #include "qobject_p.h" @@ -312,3 +315,4 @@ QT_END_NAMESPACE #include "moc_qsignalmapper.cpp" +#endif diff --git a/src/corelib/kernel/qsocketnotifier.cpp b/src/corelib/kernel/qsocketnotifier.cpp index 6ff8268978..2a246b1204 100644 --- a/src/corelib/kernel/qsocketnotifier.cpp +++ b/src/corelib/kernel/qsocketnotifier.cpp @@ -152,7 +152,7 @@ QSocketNotifier::QSocketNotifier(qintptr socket, Type type, QObject *parent) else if (!d->threadData->hasEventDispatcher()) qWarning("QSocketNotifier: Can only be used with threads started with QThread"); else - d->threadData->eventDispatcher.load()->registerSocketNotifier(this); + d->threadData->eventDispatcher.loadRelaxed()->registerSocketNotifier(this); } /*! @@ -241,9 +241,9 @@ void QSocketNotifier::setEnabled(bool enable) return; } if (d->snenabled) - d->threadData->eventDispatcher.load()->registerSocketNotifier(this); + d->threadData->eventDispatcher.loadRelaxed()->registerSocketNotifier(this); else - d->threadData->eventDispatcher.load()->unregisterSocketNotifier(this); + d->threadData->eventDispatcher.loadRelaxed()->unregisterSocketNotifier(this); } diff --git a/src/corelib/kernel/qsystemerror.cpp b/src/corelib/kernel/qsystemerror.cpp index 53c3136857..a735e12925 100644 --- a/src/corelib/kernel/qsystemerror.cpp +++ b/src/corelib/kernel/qsystemerror.cpp @@ -112,7 +112,7 @@ static QString windowsErrorString(int errorCode) static QString standardLibraryErrorString(int errorCode) { - const char *s = 0; + const char *s = nullptr; QString ret; switch (errorCode) { case 0: @@ -152,10 +152,7 @@ QString QSystemError::string(ErrorScope errorScope, int errorCode) case NativeError: #if defined (Q_OS_WIN) return windowsErrorString(errorCode); -#else - //unix: fall through as native and standard library are the same - Q_FALLTHROUGH(); -#endif +#endif // else unix: native and standard library are the same case StandardLibraryError: return standardLibraryErrorString(errorCode); default: diff --git a/src/corelib/kernel/qsystemsemaphore_systemv.cpp b/src/corelib/kernel/qsystemsemaphore_systemv.cpp index 9e438ae2a6..2c38d74d2d 100644 --- a/src/corelib/kernel/qsystemsemaphore_systemv.cpp +++ b/src/corelib/kernel/qsystemsemaphore_systemv.cpp @@ -76,7 +76,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) #if QT_CONFIG(translation) QCoreApplication::tr("%1: key is empty", "QSystemSemaphore") #else - QString::fromLatin1("%1: key is empty") + QLatin1String("%1: key is empty") #endif .arg(QLatin1String("QSystemSemaphore::handle:")); error = QSystemSemaphore::KeyError; @@ -94,7 +94,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) #if QT_CONFIG(translation) QCoreApplication::tr("%1: unable to make key", "QSystemSemaphore") #else - QString::fromLatin1("%1: unable to make key") + QLatin1String("%1: unable to make key") #endif .arg(QLatin1String("QSystemSemaphore::handle:")); error = QSystemSemaphore::KeyError; @@ -111,7 +111,7 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) #if QT_CONFIG(translation) QCoreApplication::tr("%1: ftok failed", "QSystemSemaphore") #else - QString::fromLatin1("%1: ftok failed") + QLatin1String("%1: ftok failed") #endif .arg(QLatin1String("QSystemSemaphore::handle:")); error = QSystemSemaphore::KeyError; diff --git a/src/corelib/kernel/qtcore_eval.cpp b/src/corelib/kernel/qtcore_eval.cpp deleted file mode 100644 index 5437210699..0000000000 --- a/src/corelib/kernel/qtcore_eval.cpp +++ /dev/null @@ -1,560 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qcoreevent.h> -#include <qdatetime.h> -#include <qlibraryinfo.h> -#include <qobject.h> -#include <qcoreapplication.h> -#include <private/qcoreapplication_p.h> - -#include "stdio.h" -#include "stdlib.h" - -QT_BEGIN_NAMESPACE - -#include "qconfig_eval.cpp" - -static const char boilerplate_supported_but_time_limited[] = - "\nQt %1 Evaluation License\n" - "Copyright (C) 2016 The Qt Company Ltd.\n" - "This trial version may only be used for evaluation purposes\n" - "and will shut down after 120 minutes.\n" - "Registered to:\n" - " Licensee: %2\n\n" - "The evaluation expires in %4 days\n\n" - "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n"; - -static const char boilerplate_supported[] = - "\nQt %1 Evaluation License\n" - "Copyright (C) 2016 The Qt Company Ltd.\n" - "This trial version may only be used for evaluation purposes\n" - "Registered to:\n" - " Licensee: %2\n\n" - "The evaluation expires in %4 days\n\n" - "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n"; - -static const char boilerplate_expired[] = - "This software is using the trial version of the Qt GUI toolkit.\n" - "The trial period has expired. If you need more time to\n" - "evaluate Qt, or if you have any questions about Qt, contact us\n" - "at: http://www.qt.io/contact-us.\n\n"; - -static const char will_shutdown_1min[] = - "\nThe evaluation of Qt will SHUT DOWN in 1 minute.\n" - "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n"; - -static const char will_shutdown_now[] = - "\nThe evaluation of Qt has now reached its automatic\n" - "timeout and will shut down.\n" - "Contact http://www.qt.io/contact-us for pricing and purchasing information.\n"; - -enum EvaluationStatus { - EvaluationNotSupported = 0, - EvaluationSupportedButTimeLimited, - EvaluationSupported -}; - -static EvaluationStatus qt_eval_is_supported() -{ - const volatile char *const license_key = qt_eval_key_data + 12; - - // fast fail - if (!qt_eval_key_data[0] || !*license_key) - return EvaluationNotSupported; - - // is this an unsupported evaluation? - const volatile char *typecode = license_key; - int field = 2; - for ( ; field && *typecode; ++typecode) - if (*typecode == '-') - --field; - - if (!field && typecode[1] == '4' && typecode[2] == 'M') { - if (typecode[0] == 'Q') - return EvaluationSupportedButTimeLimited; - else if (typecode[0] == 'R' || typecode[0] == 'Z') - return EvaluationSupported; - } - return EvaluationNotSupported; -} - -static int qt_eval_days_left() -{ - const volatile char *const expiry_date = qt_eval_expiry_date + 12; - - QDate today = QDate::currentDate(); - QDate lastday = QDate::fromString( - QString::fromLatin1(const_cast<const char*>(expiry_date)), Qt::ISODate); - return today.daysTo(lastday); -} - -static bool qt_eval_is_expired() -{ - return qt_eval_days_left() < 0; -} - -static QString qt_eval_string() -{ - const char *msg; - switch (qt_eval_is_supported()) { - case EvaluationSupportedButTimeLimited: - msg = boilerplate_supported_but_time_limited; - break; - case EvaluationSupported: - msg = boilerplate_supported; - break; - default: - return QString(); - } - - return QString::fromLatin1(msg) - .arg(QLatin1String(QT_VERSION_STR)) - .arg(QLibraryInfo::licensee()) - .arg(qt_eval_days_left()); -} - -#define WARN_TIMEOUT 60 * 1000 * 119 -#define KILL_DELAY 60 * 1000 * 1 - -class QCoreFuriCuri : public QObject -{ -public: - - int warn; - int kill; - - QCoreFuriCuri() : QObject(), warn(-1), kill(-1) - { - if (qt_eval_is_supported() == EvaluationSupportedButTimeLimited) { - warn = startTimer(WARN_TIMEOUT); - kill = 0; - } - } - - void timerEvent(QTimerEvent *e) override { - if (e->timerId() == warn) { - killTimer(warn); - fprintf(stderr, "%s\n", will_shutdown_1min); - kill = startTimer(KILL_DELAY); - } else if (e->timerId() == kill) { - fprintf(stderr, "%s\n", will_shutdown_now); - QCoreApplication::instance()->quit(); - } - } -}; - -#if defined(QT_BUILD_CORE_LIB) || defined (QT_BOOTSTRAPPED) - -void qt_core_eval_init(QCoreApplicationPrivate::Type type) -{ - if (type != QCoreApplicationPrivate::Tty) - return; - - if (!qt_eval_is_supported()) - return; - - if (qt_eval_is_expired()) { - fprintf(stderr, "%s\n", boilerplate_expired); - exit(0); - } else { - fprintf(stderr, "%s\n", qPrintable(qt_eval_string())); - Q_UNUSED(new QCoreFuriCuri()); - } -} -#endif - -#ifdef QT_BUILD_WIDGETS_LIB - -QT_BEGIN_INCLUDE_NAMESPACE -#include <qdialog.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qmessagebox.h> -#if QT_CONFIG(pushbutton) -#include <qpushbutton.h> -#endif -#include <qtimer.h> -#include <qapplication.h> -QT_END_INCLUDE_NAMESPACE - - -static const char * const qtlogo_eval_xpm[] = { -/* columns rows colors chars-per-pixel */ -"46 55 174 2", -" c #002E02", -". c #00370D", -"X c #003A0E", -"o c #003710", -"O c #013C13", -"+ c #043E1A", -"@ c #084F0A", -"# c #0B520C", -"$ c #054413", -"% c #0C4C17", -"& c #07421D", -"* c #09451D", -"= c #0D491E", -"- c #125515", -"; c #13541A", -": c #17591B", -"> c #1B5C1D", -", c #1F611F", -"< c #20621E", -"1 c #337B1E", -"2 c #0B4521", -"3 c #0F4923", -"4 c #114B24", -"5 c #154D2A", -"6 c #175323", -"7 c #1C5924", -"8 c #1C532F", -"9 c #1E5432", -"0 c #245936", -"q c #265938", -"w c #295C3B", -"e c #246324", -"r c #266823", -"t c #2A6C24", -"y c #276628", -"u c #2D7026", -"i c #327427", -"p c #367927", -"a c #37782A", -"s c #397C2A", -"d c #2E613E", -"f c #336C37", -"g c #2F6040", -"h c #356545", -"j c #3C6B4E", -"k c #3F6C51", -"l c #406E4F", -"z c #406D52", -"x c #477457", -"c c #497557", -"v c #4B7857", -"b c #517B5E", -"n c #3C8423", -"m c #3E812C", -"M c #53A61D", -"N c #41862C", -"B c #458A2D", -"V c #498F2D", -"C c #479324", -"Z c #489226", -"A c #4D952C", -"S c #478B30", -"D c #488C30", -"F c #4D9232", -"G c #509632", -"H c #549A33", -"J c #589F35", -"K c #56A526", -"L c #57A821", -"P c #5BAA27", -"I c #57A32A", -"U c #5CA72E", -"Y c #5DAB2A", -"T c #5CA336", -"R c #60AD2E", -"E c #63B12D", -"W c #65AF35", -"Q c #62A53F", -"! c #65AE39", -"~ c #66B036", -"^ c #6AB437", -"/ c #67B138", -"( c #6AB339", -") c #6DB838", -"_ c #70BA3C", -"` c #4D8545", -"' c #4E8942", -"] c #548851", -"[ c #6FAF4A", -"{ c #6DB243", -"} c #71B546", -"| c #70B840", -" . c #73B648", -".. c #79BA4E", -"X. c #7CBB53", -"o. c #598266", -"O. c #62886D", -"+. c #6A8F75", -"@. c #6B9173", -"#. c #70937A", -"$. c #799F79", -"%. c #7BAF66", -"&. c #81BD5B", -"*. c #85BF60", -"=. c #85AC7F", -"-. c #8DBA7B", -";. c #87C061", -":. c #8AC364", -">. c #8DC46A", -",. c #90C56E", -"<. c #93C771", -"1. c #96CA73", -"2. c #9ACB7C", -"3. c #9FD07D", -"4. c #779981", -"5. c #7F9F89", -"6. c #809F88", -"7. c #82A18B", -"8. c #86A192", -"9. c #8DA994", -"0. c #8FA998", -"q. c #94AF9B", -"w. c #97B991", -"e. c #97B19E", -"r. c #9DB6A3", -"t. c #A3BCA7", -"y. c #A6BCAB", -"u. c #A9BEB1", -"i. c #9ECD81", -"p. c #A2CF85", -"a. c #A5D284", -"s. c #A6D189", -"d. c #A9D28E", -"f. c #ABD491", -"g. c #B1D797", -"h. c #B1D699", -"j. c #B5D89E", -"k. c #ADC5AC", -"l. c #B1CAAE", -"z. c #B9DAA3", -"x. c #BDDDA8", -"c. c #ADC1B4", -"v. c #B2C6B6", -"b. c #B5C6BC", -"n. c #B6C9BA", -"m. c #BCD1BA", -"M. c #C6E1B4", -"N. c #CDE5BD", -"B. c #C2D2C6", -"V. c #CADEC2", -"C. c #C6D3CC", -"Z. c #C8D7CB", -"A. c #CEDAD2", -"S. c #D2DDD4", -"D. c #D3E9C6", -"F. c #D7EBC9", -"G. c #D9EBCD", -"H. c #DEEED4", -"J. c #D6E0D9", -"K. c #DAE4DC", -"L. c #E0EFD7", -"P. c #E5F2DD", -"I. c #DFE8E0", -"U. c #E4EBE5", -"Y. c #E9EFEA", -"T. c #EDF4EB", -"R. c #F0FAE6", -"E. c #F1F8EC", -"W. c #EDF0F0", -"Q. c #F4F7F3", -"!. c #F6F9F4", -"~. c #F8FAF7", -"^. c #FEFEFE", -"/. c None", -/* pixels */ -"/././././.c h ' Q / W _ &.p././././././././././././././././././././././././././././././././.", -"/././.4 O % Z ~ ~ W ~ W R U R R ( X.>.p././././././././././././././././././././././././././.", -"/./.. * = J _ ~ ~ ~ ~ ~ / / / / W W U P P U W .;.2././././././././././././././././././././.", -"/.= = & a ) W ~ ~ ~ ~ ~ / W / ~ ~ ~ ^ ( ( ^ ~ R R U P Y ~ .;.2././././././././././././././.", -"O.O = = T ^ W ~ ~ ~ ~ ~ ~ W W / W ~ ~ ~ ~ ~ ~ ~ ( ( ( ( ~ W Y Y Y Y W { &.1././././././././.", -"0 = * 7 ~ ~ ~ ~ ~ ~ ~ ~ ~ / / W ~ ~ ~ ~ ~ ~ ~ ~ W W W ~ ~ ~ ~ ( ( ( W W R U P U W { X.1.f./.", -"= = & e ^ W ~ ~ ~ ~ ~ ~ ~ ~ / / ~ ~ ~ ~ ~ ~ ~ ~ W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ^ ( ( / ~ W R U U Y ", -"= = & e ^ W ~ ~ ~ ~ ~ ~ ~ ~ W W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( W ~ ~ ~ ^ ^ ( ", -"= = * e ^ W ~ ~ ~ ~ ~ ~ / W / W ! ( / ~ W ^ ( ( ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ~ W W ~ ~ ~ ~ ~ ~ ", -"= = & e ^ ! ~ ~ ~ ~ ~ ~ W W ^ _ ~ K Y W W R P Y W ( ~ ~ ~ ~ ~ ~ ~ W / ~ ~ ~ ^ W ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ ~ ~ ~ ~ W ) W 1 ` w.V.L.H.D.z.,.~ Y ^ ~ ~ ~ ~ ~ W ~ ~ ~ ( ~ W W ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ ~ ~ ~ W ) V = 8.~.^.^.^.^.^.^.^.U.<.Y ~ ~ ~ ~ ~ W W ! ~ Y W ^ W ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ ~ ~ W ^ B O u.^.~.^.^.^.^.~.~.^.^.^.h.Y ^ ~ ~ ^ F $ k.R.G.1.Y / ~ ~ ~ ~ ~ ~ ", -"= = & e ^ ~ ~ ~ / W ( J X 7.^.~.^.^.^.^.^.^.^.^.^.^.^.s.Y / W ) a 2 U.^.^.d.U ( ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W / ~ ~ ~ ^ > w ~.^.^.^.^.^.F.%.v c.^.^.^.^.~.X.W ~ ^ > h ^.^.^.d.P ( ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ W ^ H o e.^.^.^.^.^.G.Y E n . y.^.^.^.^.M.Y ( ! $ @.^.~.^.f.U ( / ~ ~ W ~ ~ ", -"= = & e ^ W ~ W ! ) t 4 U.^.^.^.^.^.>.U ( _ , 9 ~.^.^.^.~...^ A y.^.~.^.s.M W Y ~ ~ ~ ~ ~ ", -"= 3 & e ^ W ~ ( ^ ( $ c ^.^.^.^.^.E.) ~ ~ ^ S o n.^.^.^.^.=.- l.v.Y.^.^.^.M.:.:.X.~ ~ ~ ~ ~ ", -"= = & e ^ ! W W ( J X 7.^.^.^.^.^.F.Y ( W ^ T X 6.^.^.~.^.c.. J.^.^.^.^.^.^.^.^.P.~ ~ ~ ~ ~ ", -"= = & r ^ W / W ) B o v.^.~.^.^.^.M.U / ~ ~ ! $ o.^.^.^.^.K.* S.^.^.^.^.^.^.^.^.P.~ ~ ~ ~ ~ ", -"= = & e ^ ! ~ W ) a + S.^.^.^.^.^.z.P ( W ~ ( % z ^.^.^.^.~.f t.U.^.^.^.^.~.^.^.P.~ ~ ~ ~ ~ ", -"* = & e ^ W ~ W ) t 3 Y.^.^.^.^.^.f.P ( ~ ~ ^ ; h ^.^.^.^.^.:.@ j ^.^.^.^.h.{ X.&.~ ~ ~ ~ ~ ", -"3 = & e ^ W ~ ~ ^ e 8 Q.^.^.^.^.^.s.P ~ ~ W ^ > 0 ~.^.^.^.^.1.# z ^.^.^.^.d.L W R ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ ^ > q ~.^.^.^.^.^.p.U ^ ~ W ) e 9 ~.^.^.^.^.3.# k ^.^.^.^.f.Y ( / ~ ~ ~ ~ ~ ", -"= = & e ^ W / W ^ > w ~.^.^.^.^.^.i.Y / ~ W ^ e 8 Q.^.^.^.^.a.# z ^.^.^.^.f.Y / ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W / W ^ > w ^.^.^.^.^.^.2.Y / ~ ~ ) e 8 Q.^.^.^.^.s.# z ^.^.^.^.d.P ( ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W W W ^ > q ^.^.^.^.^.^.p.Y / ~ ~ ^ e 9 Q.^.^.^.^.a.@ z ^.^.^.^.f.U / ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W / W ) 7 9 Q.^.^.^.^.^.a.P / ~ W ) , 9 Q.^.^.^.^.3.# z ^.^.~.^.f.P ^ ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W / W ) r 5 T.^.^.^.^.^.d.Y / ~ W ) > q ~.^.^.^.^.1.# k ^.^.^.^.f.Y ( ~ ~ ~ ~ ~ ~ ", -"= = & e ^ / / W ) i 2 I.^.^.^.^.^.h.P ( ~ W ( > g ^.^.^.^.^.:.# z ^.^.^.^.f.P / ~ ~ ~ ~ ~ ~ ", -"= = & e ( W / W ) m O Z.^.^.^.^.^.x.P / ~ ~ ( ; j ^.^.^.^.~.&.- k ^.^.~.^.f.P / ~ ~ ~ ~ ~ ~ ", -"= = & e ( W / W ) F o y.^.~.^.^.^.N.U ( ~ ~ W $ b ^.^.^.^.R._ - k ^.^.^.^.f.Y ( ~ ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ ^ J X 4.^.^.^.^.^.L.~ ~ W ^ T X #.^.^.^.^.F.~ ; j ^.^.^.^.f.U ( ~ ~ ~ ~ ~ ~ ", -"= = & e ^ ~ ~ ~ / ^ % l ^.^.^.^.^.!. .R ^ ^ G . r.^.~.^.^.j.E : j ^.^.^.^.f.P ) ( ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ W ) u = U.^.^.^.^.^.1.Y ! ) a & K.^.^.^.^.;.~ : j ^.^.~.^.z.M I I / ~ ~ W ~ ", -"= = & e ( W ~ ~ W ( G . q.^.^.^.^.^.D.U ^ ! X o.^.^.^.^.P.~ ^ > g ^.^.^.^.E.-.$.m.X.W ~ ~ ~ ", -"= = & e ^ / ~ ~ ^ ! ( > w ~.^.^.^.^.^.h.T > j T.^.^.~.^.a.Y _ i 3 U.^.^.^.^.^.^.^.X.R ~ ~ ~ ", -"= = & e ^ / ~ ~ W W ^ H . 9.^.~.^.^.^.^.K.C.~.^.^.^.^.H.W W ^ T . q.^.~.^.^.^.^.^.X.R ~ ~ ~ ", -"= = + e ^ W / ~ W W W ) m + B.^.~.^.^.^.^.^.^.^.^.^.E.X.Y ( W ^ B 6 y.^.^.^.E.D.2.( ~ ~ ~ ~ ", -"= = * e ^ ! / ! W ^ W W ) a 4 b.^.^.^.^.^.^.^.^.^.P...Y ( ! W ! ^ W Z [ *.X.{ Y U ~ ~ ~ ~ ~ ", -"= = & e ( W ~ ~ W / W / W ) A < +.A.~.^.^.^.^.!.p.W R ~ ~ ~ ~ ~ W / ) E U W W / ^ ~ ~ ~ ~ ~ ", -"= = & e ^ W ~ ~ / W / / / W ( _ Z X 6.^.^.^.^.E.W ~ ^ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ / ~ ~ ~ ~ ~ ~ ~ ~ ", -"= = & e ^ ~ ~ ~ W W / W ~ ~ ~ ~ ) ; h ^.^.^.^.^.d.M U ~ / ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ", -"= = & e ^ W ~ ~ ^ W W / ~ ~ ~ W ) p + S.^.^.^.^.~.M.f. .W ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ .", -"= = & e ^ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( T O +.^.~.^.^.^.^.^.&.Y ( ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( Y 2.", -"= = & e ( W ~ ~ ~ ~ ~ ~ ~ ~ ~ / W ) N + b.^.^.^.^.^.^.&.R ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W /.", -"= = & e ^ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W ^ N 7 r.W.^.^.^.!.X.W ~ ~ W ~ W ~ ~ ~ ~ ~ ~ / ( ( K p./.", -"= = & e ( W ~ ~ W ~ ~ ~ ~ ~ ~ ~ ~ ~ W ( W C Q &.:.X.| ~ ~ ~ ~ W ~ / ~ ( / ( ~ W E U P 1././.", -"= = + e ^ / / / ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W / ) ^ R Y W W ~ ~ ( / ( / W R Y Y U R ( X.,././././.", -"= = * e ( / ~ / ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ ~ W W W ! ( ( ( W W E U P Y W ( X.,.d./././././././././.", -"= = * e ( W ~ ~ ~ ~ W ! ~ W ~ W ~ ( ( / ^ W W U Y P W ( X.,.d./././././././././././././././.", -"8 $ * e ( W ~ ~ ~ ! ( ( ( / ( W R Y Y Y R ( X.>.d./././././././././././././././././././././.", -"/.d . y ^ / / / ( W Y Y P P W ( X.>.d./././././././././././././././././././././././././././.", -"/./.h : ^ R R R W ( X.<.f./././././././././././././././././././././././././././././././././.", -"/././.] _ *.3./././././././././././././././././././././././././././././././././././././././." -}; - -class EvalMessageBox : public QDialog -{ -public: - EvalMessageBox(bool expired) - { - setWindowTitle(QLatin1String(" ")); - - QString str = expired ? QLatin1String(boilerplate_expired) : qt_eval_string(); - str = str.trimmed(); - - QFrame *border = new QFrame(this); - - QLabel *pixmap_label = new QLabel(border); - pixmap_label->setPixmap(QPixmap(qtlogo_eval_xpm)); - pixmap_label->setAlignment(Qt::AlignTop); - - QLabel *text_label = new QLabel(str, border); - - QHBoxLayout *pm_and_text_layout = new QHBoxLayout(); - pm_and_text_layout->addWidget(pixmap_label); - pm_and_text_layout->addWidget(text_label); - - QVBoxLayout *master_layout = new QVBoxLayout(border); - master_layout->addLayout(pm_and_text_layout); - - QVBoxLayout *border_layout = new QVBoxLayout(this); - border_layout->setMargin(0); - border_layout->addWidget(border); - - if (expired) { - QPushButton *cmd = new QPushButton(QLatin1String("OK"), border); - cmd->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); - cmd->setDefault(true); - - QHBoxLayout *button_layout = new QHBoxLayout(); - master_layout->addLayout(button_layout); - button_layout->addWidget(cmd); - - connect(cmd, SIGNAL(clicked()), this, SLOT(close())); - } else { - border->setFrameShape(QFrame::WinPanel); - border->setFrameShadow(QFrame::Raised); - setParent(parentWidget(), Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint); - QTimer::singleShot(7000, this, SLOT(close())); - setAttribute(Qt::WA_DeleteOnClose); - setAttribute(Qt::WA_QuitOnClose, false); - } - - setFixedSize(sizeHint()); - } -}; - -class QGuiFuriCuri : public QCoreFuriCuri -{ -public: - void timerEvent(QTimerEvent *e) { - if (e->timerId() == warn) { - killTimer(warn); - QMessageBox::information(0, QLatin1String("Automatic Timeout"), QLatin1String(will_shutdown_1min)); - kill = startTimer(KILL_DELAY); - } else if (e->timerId() == kill) { - killTimer(kill); - QMessageBox::information(0, QLatin1String("Automatic Timeout"), QLatin1String(will_shutdown_now)); - qApp->quit(); - } - } -}; - - -void qt_gui_eval_init(QCoreApplicationPrivate::Type type) -{ - Q_UNUSED(type); - - if (!qt_eval_is_supported()) - return; - - if (qt_eval_is_expired()) { - EvalMessageBox box(true); - box.exec(); - ::exit(0); - } else { - Q_UNUSED(new QGuiFuriCuri()); - } -} - -static QString qt_eval_title_prefix() -{ - return QLatin1String("[Qt Evaluation] "); -} - -QString qt_eval_adapt_window_title(const QString &title) -{ - if (!qt_eval_is_supported()) - return title; - return qt_eval_title_prefix() + title; -} - -void qt_eval_init_widget(QWidget *w) -{ - if (!qt_eval_is_supported()) - return; - if (w->isTopLevel() && w->windowTitle().isEmpty() && w->windowType() != Qt::Desktop ) { - w->setWindowTitle(QLatin1String(" ")); - } -} -#endif - -QT_END_NAMESPACE diff --git a/src/corelib/kernel/qtestsupport_core.cpp b/src/corelib/kernel/qtestsupport_core.cpp index c54b933f94..7bd81ed498 100644 --- a/src/corelib/kernel/qtestsupport_core.cpp +++ b/src/corelib/kernel/qtestsupport_core.cpp @@ -102,7 +102,7 @@ Q_CORE_EXPORT void QTest::qWait(int ms) int remaining = ms; do { QCoreApplication::processEvents(QEventLoop::AllEvents, remaining); - QCoreApplication::sendPostedEvents(Q_NULLPTR, QEvent::DeferredDelete); + QCoreApplication::sendPostedEvents(nullptr, QEvent::DeferredDelete); remaining = timer.remainingTime(); if (remaining <= 0) break; diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 13f027074a..178227e914 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -42,6 +42,8 @@ #include "qabstracteventdispatcher.h" #include "qcoreapplication.h" #include "qobject_p.h" +#include "qthread.h" +#include "qcoreapplication_p.h" QT_BEGIN_NAMESPACE @@ -343,6 +345,33 @@ void QTimer::singleShotImpl(int msec, Qt::TimerType timerType, const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj) { + if (msec == 0) { + bool deleteReceiver = false; + // Optimize: set a receiver context when none is given, such that we can use + // QMetaObject::invokeMethod which is more efficient than going through a timer. + // We need a QObject living in the current thread. But the QThread itself lives + // in a different thread - with the exception of the main QThread which lives in + // itself. And QThread::currentThread() is among the few QObjects we know that will + // most certainly be there. Note that one can actually call singleShot before the + // QApplication is created! + if (!receiver && QThread::currentThread() == QCoreApplicationPrivate::mainThread()) { + // reuse main thread as context object + receiver = QThread::currentThread(); + } else if (!receiver) { + // Create a receiver context object on-demand. According to the benchmarks, + // this is still more efficient than going through a timer. + receiver = new QObject; + deleteReceiver = true; + } + + QMetaObject::invokeMethodImpl(const_cast<QObject *>(receiver), slotObj, + Qt::QueuedConnection, nullptr); + + if (deleteReceiver) + const_cast<QObject *>(receiver)->deleteLater(); + return; + } + new QSingleShotTimer(msec, timerType, receiver, slotObj); } @@ -599,7 +628,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv */ /*! - \fn template <typename PointerToMemberFunction> QMetaObject::Connection QTimer::callOnTimeout(const QObject *receiver, PointerToMemberFunction slot, Qt::ConnectionType connectionType = Qt::AutoConnection) + \fn template <typename MemberFunction> QMetaObject::Connection QTimer::callOnTimeout(const QObject *receiver, MemberFunction *slot, Qt::ConnectionType connectionType = Qt::AutoConnection) \since 5.12 \overload callOnTimeout() diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index 66f317c567..eb7185c12d 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -100,8 +100,8 @@ public: QMetaObject::Connection callOnTimeout(Functor slot, Qt::ConnectionType connectionType = Qt::AutoConnection); template <typename Functor> QMetaObject::Connection callOnTimeout(const QObject *context, Functor slot, Qt::ConnectionType connectionType = Qt::AutoConnection); - template <typename PointerToMemberFunction> - QMetaObject::Connection callOnTimeout(const QObject *receiver, PointerToMemberFunction slot, Qt::ConnectionType connectionType = Qt::AutoConnection); + template <typename MemberFunction> + QMetaObject::Connection callOnTimeout(const QObject *receiver, MemberFunction *slot, Qt::ConnectionType connectionType = Qt::AutoConnection); #else // singleShot to a QObject slot template <typename Duration, typename Func1> @@ -218,7 +218,7 @@ private: inline int startTimer(int){ return -1;} inline void killTimer(int){} - static Q_DECL_CONSTEXPR Qt::TimerType defaultTypeFor(int msecs) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR Qt::TimerType defaultTypeFor(int msecs) noexcept { return msecs >= 2000 ? Qt::CoarseTimer : Qt::PreciseTimer; } static void singleShotImpl(int msec, Qt::TimerType timerType, const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj); diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp index c3b8c86063..39010c19cb 100644 --- a/src/corelib/kernel/qtimerinfo_unix.cpp +++ b/src/corelib/kernel/qtimerinfo_unix.cpp @@ -215,7 +215,7 @@ static timespec roundToMillisecond(timespec val) QDebug operator<<(QDebug s, timeval tv) { QDebugStateSaver saver(s); - s.nospace() << tv.tv_sec << "." << qSetFieldWidth(6) << qSetPadChar(QChar(48)) << tv.tv_usec << reset; + s.nospace() << tv.tv_sec << "." << qSetFieldWidth(6) << qSetPadChar(QChar(48)) << tv.tv_usec << Qt::reset; return s; } QDebug operator<<(QDebug s, Qt::TimerType t) @@ -373,7 +373,7 @@ static void calculateNextTimeout(QTimerInfo *t, timespec currentTime) #ifdef QTIMERINFO_DEBUG if (t->timerType != Qt::PreciseTimer) - qDebug() << "timer" << t->timerType << hex << t->id << dec << "interval" << t->interval + qDebug() << "timer" << t->timerType << Qt::hex << t->id << Qt::dec << "interval" << t->interval << "originally expected at" << t->expected << "will fire at" << t->timeout << "or" << (t->timeout - t->expected) << "s late"; #endif @@ -500,7 +500,7 @@ void QTimerInfoList::registerTimer(int timerId, int interval, Qt::TimerType time t->cumulativeError = 0; t->count = 0; if (t->timerType != Qt::PreciseTimer) - qDebug() << "timer" << t->timerType << hex <<t->id << dec << "interval" << t->interval << "expected at" + qDebug() << "timer" << t->timerType << Qt::hex <<t->id << Qt::dec << "interval" << t->interval << "expected at" << t->expected << "will fire first at" << t->timeout; #endif } @@ -620,7 +620,7 @@ int QTimerInfoList::activateTimers() currentTimerInfo->cumulativeError += diff; ++currentTimerInfo->count; if (currentTimerInfo->timerType != Qt::PreciseTimer) - qDebug() << "timer" << currentTimerInfo->timerType << hex << currentTimerInfo->id << dec << "interval" + qDebug() << "timer" << currentTimerInfo->timerType << Qt::hex << currentTimerInfo->id << Qt::dec << "interval" << currentTimerInfo->interval << "firing at" << currentTime << "(orig" << currentTimerInfo->expected << "scheduled at" << currentTimerInfo->timeout << ") off by" << diff << "activation" << currentTimerInfo->count diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp index 63aeed07c3..dc0ab9f08a 100644 --- a/src/corelib/kernel/qtranslator.cpp +++ b/src/corelib/kernel/qtranslator.cpp @@ -61,14 +61,8 @@ #if defined(Q_OS_UNIX) && !defined(Q_OS_INTEGRITY) #define QT_USE_MMAP #include "private/qcore_unix_p.h" -#endif - -// most of the headers below are already included in qplatformdefs.h -// also this lacks Large File support but that's probably irrelevant -#if defined(QT_USE_MMAP) // for mmap #include <sys/mman.h> -#include <errno.h> #endif #include <stdlib.h> @@ -303,7 +297,7 @@ public: bool used_mmap : 1; #endif char *unmapPointer; // used memory (mmap, new or resource file) - quint32 unmapLength; + qsizetype unmapLength; // The resource object in case we loaded the translations from a resource QResource *resource; @@ -323,7 +317,7 @@ public: uint numerusRulesLength; bool do_load(const QString &filename, const QString &directory); - bool do_load(const uchar *data, int len, const QString &directory); + bool do_load(const uchar *data, qsizetype len, const QString &directory); QString do_translate(const char *context, const char *sourceText, const char *comment, int n) const; void clear(); @@ -554,7 +548,7 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo return false; qint64 fileSize = file.size(); - if (fileSize < MagicLength || quint32(-1) <= fileSize) + if (fileSize < MagicLength || fileSize > std::numeric_limits<qsizetype>::max()) return false; { @@ -564,7 +558,7 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo return false; } - d->unmapLength = quint32(fileSize); + d->unmapLength = qsizetype(fileSize); #ifdef QT_USE_MMAP @@ -572,21 +566,20 @@ bool QTranslatorPrivate::do_load(const QString &realname, const QString &directo #define MAP_FILE 0 #endif #ifndef MAP_FAILED -#define MAP_FAILED -1 +#define MAP_FAILED reinterpret_cast<void *>(-1) #endif int fd = file.handle(); if (fd >= 0) { - char *ptr; - ptr = reinterpret_cast<char *>( - mmap(0, d->unmapLength, // any address, whole file - PROT_READ, // read-only memory - MAP_FILE | MAP_PRIVATE, // swap-backed map from file - fd, 0)); // from offset 0 of fd - if (ptr && ptr != reinterpret_cast<char *>(MAP_FAILED)) { + int protection = PROT_READ; // read-only memory + int flags = MAP_FILE | MAP_PRIVATE; // swap-backed map from file + void *ptr = QT_MMAP(nullptr, d->unmapLength,// any address, whole file + protection, flags, + fd, 0); // from offset 0 of fd + if (ptr != MAP_FAILED) { file.close(); d->used_mmap = true; - d->unmapPointer = ptr; + d->unmapPointer = static_cast<char *>(ptr); ok = true; } } @@ -816,7 +809,7 @@ static quint32 read32(const uchar *data) return qFromBigEndian<quint32>(data); } -bool QTranslatorPrivate::do_load(const uchar *data, int len, const QString &directory) +bool QTranslatorPrivate::do_load(const uchar *data, qsizetype len, const QString &directory) { bool ok = true; const uchar *end = data + len; diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index 090436a3c7..511dc3c81c 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2018 Intel Corporation. ** Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com> ** Contact: https://www.qt.io/licensing/ @@ -55,6 +55,7 @@ #include "qstringlist.h" #include "qurl.h" #include "qlocale.h" +#include "qregexp.h" #include "quuid.h" #if QT_CONFIG(itemmodel) #include "qabstractitemmodel.h" @@ -118,19 +119,19 @@ namespace { // annonymous used to hide QVariant handlers static void construct(QVariant::Private *x, const void *copy) { QVariantConstructor<CoreTypesFilter> constructor(x, copy); - QMetaTypeSwitcher::switcher<void>(constructor, x->type, 0); + QMetaTypeSwitcher::switcher<void>(constructor, x->type); } static void clear(QVariant::Private *d) { QVariantDestructor<CoreTypesFilter> cleaner(d); - QMetaTypeSwitcher::switcher<void>(cleaner, d->type, 0); + QMetaTypeSwitcher::switcher<void>(cleaner, d->type); } static bool isNull(const QVariant::Private *d) { QVariantIsNull<CoreTypesFilter> isNull(d); - return QMetaTypeSwitcher::switcher<bool>(isNull, d->type, 0); + return QMetaTypeSwitcher::switcher<bool>(isNull, d->type); } /*! @@ -142,7 +143,7 @@ static bool isNull(const QVariant::Private *d) static bool compare(const QVariant::Private *a, const QVariant::Private *b) { QVariantComparator<CoreTypesFilter> comparator(a, b); - return QMetaTypeSwitcher::switcher<bool>(comparator, a->type, 0); + return QMetaTypeSwitcher::switcher<bool>(comparator, a->type); } /*! @@ -1400,7 +1401,7 @@ static void streamDebug(QDebug dbg, const QVariant &v) { QVariant::Private *d = const_cast<QVariant::Private *>(&v.data_ptr()); QVariantDebugStream<CoreTypesFilter> stream(dbg, d); - QMetaTypeSwitcher::switcher<void>(stream, d->type, 0); + QMetaTypeSwitcher::switcher<void>(stream, d->type); } #endif @@ -1409,16 +1410,16 @@ const QVariant::Handler qt_kernel_variant_handler = { clear, isNull, #ifndef QT_NO_DATASTREAM - 0, - 0, + nullptr, + nullptr, #endif compare, convert, - 0, + nullptr, #if !defined(QT_NO_DEBUG_STREAM) streamDebug #else - 0 + nullptr #endif }; @@ -1435,16 +1436,16 @@ const QVariant::Handler qt_dummy_variant_handler = { dummyClear, dummyIsNull, #ifndef QT_NO_DATASTREAM - 0, - 0, + nullptr, + nullptr, #endif dummyCompare, dummyConvert, - 0, + nullptr, #if !defined(QT_NO_DEBUG_STREAM) dummyStreamDebug #else - 0 + nullptr #endif }; @@ -1462,6 +1463,7 @@ static void customConstruct(QVariant::Private *d, const void *copy) if (size <= sizeof(QVariant::Private::Data) && (type.flags() & (QMetaType::MovableType | QMetaType::IsEnumeration))) { type.construct(&d->data.ptr, copy); + d->is_null = d->data.ptr == nullptr; d->is_shared = false; } else { // Private::Data contains long long, and long double is the biggest standard type. @@ -1472,6 +1474,7 @@ static void customConstruct(QVariant::Private *d, const void *copy) void *data = operator new(offset + size); void *ptr = static_cast<char *>(data) + offset; type.construct(ptr, copy); + d->is_null = ptr == nullptr; d->is_shared = true; d->data.shared = new (data) QVariant::PrivateShared(ptr); } @@ -1552,16 +1555,16 @@ const QVariant::Handler qt_custom_variant_handler = { customClear, customIsNull, #ifndef QT_NO_DATASTREAM - 0, - 0, + nullptr, + nullptr, #endif customCompare, customConvert, - 0, + nullptr, #if !defined(QT_NO_DEBUG_STREAM) customStreamDebug #else - 0 + nullptr #endif }; @@ -1768,7 +1771,7 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names \fn QVariant::QVariant(int typeId, const void *copy) Constructs variant of type \a typeId, and initializes with - \a copy if \a copy is not 0. + \a copy if \a copy is not \nullptr. Note that you have to pass the address of the variable you want stored. @@ -1797,7 +1800,7 @@ Q_CORE_EXPORT void QVariantPrivate::registerHandler(const int /* Modules::Names \internal Constructs a variant private of type \a type, and initializes with \a copy if - \a copy is not 0. + \a copy is not \nullptr. */ void QVariant::create(int type, const void *copy) @@ -2122,7 +2125,7 @@ QVariant::QVariant(const char *val) */ QVariant::QVariant(Type type) -{ create(type, 0); } +{ create(type, nullptr); } QVariant::QVariant(int typeId, const void *copy) { create(typeId, copy); d.is_null = false; } @@ -2363,7 +2366,7 @@ QVariant& QVariant::operator=(const QVariant &variant) void QVariant::detach() { - if (!d.is_shared || d.data.shared->ref.load() == 1) + if (!d.is_shared || d.data.shared->ref.loadRelaxed() == 1) return; Private dd; @@ -2408,7 +2411,7 @@ void QVariant::clear() Converts the int representation of the storage type, \a typeId, to its string representation. - Returns a null pointer if the type is QMetaType::UnknownType or doesn't exist. + Returns \nullptr if the type is QMetaType::UnknownType or doesn't exist. */ const char *QVariant::typeToName(int typeId) { @@ -2664,7 +2667,7 @@ inline T qVariantToHelper(const QVariant::Private &d, const HandlersManager &han return ret; } - handlerManager[d.type]->convert(&d, targetType, &ret, 0); + handlerManager[d.type]->convert(&d, targetType, &ret, nullptr); return ret; } @@ -3214,7 +3217,7 @@ bool QVariant::toBool() const return d.data.b; bool res = false; - handlerManager[d.type]->convert(&d, Bool, &res, 0); + handlerManager[d.type]->convert(&d, Bool, &res, nullptr); return res; } @@ -3732,7 +3735,7 @@ bool QVariant::convert(int targetTypeId) if (!oldValue.canConvert(targetTypeId)) return false; - create(targetTypeId, 0); + create(targetTypeId, nullptr); // Fail if the value is not initialized or was forced null by a previous failed convert. if (oldValue.d.is_null && oldValue.d.type != QMetaType::Nullptr) return false; @@ -3757,7 +3760,7 @@ bool QVariant::convert(int targetTypeId) */ bool QVariant::convert(const int type, void *ptr) const { - return handlerManager[type]->convert(&d, type, ptr, 0); + return handlerManager[type]->convert(&d, type, ptr, nullptr); } @@ -4002,8 +4005,8 @@ static int numericCompare(const QVariant::Private *d1, const QVariant::Private * return 0; // only do fuzzy comparisons for finite, non-zero numbers - int c1 = std::fpclassify(r1); - int c2 = std::fpclassify(r2); + int c1 = qFpClassify(r1); + int c2 = qFpClassify(r2); if ((c1 == FP_NORMAL || c1 == FP_SUBNORMAL) && (c2 == FP_NORMAL || c2 == FP_SUBNORMAL)) { if (qFuzzyCompare(r1, r2)) return 0; @@ -4144,7 +4147,7 @@ void* QVariant::data() /*! Returns \c true if this is a null variant, false otherwise. A variant is considered null if it contains no initialized value, or the contained value - is a null pointer or is an instance of a built-in type that has an isNull + is \nullptr or is an instance of a built-in type that has an isNull method, in which case the result would be the same as calling isNull on the wrapped object. @@ -4224,7 +4227,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) If the QVariant contains a pointer to a type derived from QObject then \c{T} may be any QObject type. If the pointer stored in the QVariant can be - qobject_cast to T, then that result is returned. Otherwise a null pointer is + qobject_cast to T, then that result is returned. Otherwise \nullptr is returned. Note that this only works for QObject subclasses which use the Q_OBJECT macro. @@ -4280,6 +4283,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \sa fromValue() */ +#if QT_DEPRECATED_SINCE(5, 14) /*! \fn template<typename T> QVariant qVariantFromValue(const T &value) \relates QVariant @@ -4317,6 +4321,7 @@ QDebug operator<<(QDebug dbg, const QVariant::Type p) \sa QVariant::setValue() */ +#endif /*! \fn template<typename T> T qvariant_cast(const QVariant &value) diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index ff73c27b6e..c8cb551863 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -55,6 +55,8 @@ #if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L #include <variant> +#elif defined(Q_CLANG_QDOC) +namespace std { template<typename...> struct variant; } #endif QT_BEGIN_NAMESPACE @@ -90,9 +92,6 @@ class QUrl; class QVariant; class QVariantComparisonHelper; -template <typename T> -inline QVariant qVariantFromValue(const T &); - template<typename T> inline T qvariant_cast(const QVariant &); @@ -202,7 +201,7 @@ class Q_CORE_EXPORT QVariant LastType = 0xffffffff // need this so that gcc >= 3.4 allocates 32 bits for Type }; - QVariant() Q_DECL_NOTHROW : d() {} + QVariant() noexcept : d() {} ~QVariant(); QVariant(Type type); QVariant(int typeId, const void *copy); @@ -268,14 +267,12 @@ class Q_CORE_EXPORT QVariant #endif QVariant& operator=(const QVariant &other); -#ifdef Q_COMPILER_RVALUE_REFS - inline QVariant(QVariant &&other) Q_DECL_NOTHROW : d(other.d) + inline QVariant(QVariant &&other) noexcept : d(other.d) { other.d = Private(); } - inline QVariant &operator=(QVariant &&other) Q_DECL_NOTHROW + inline QVariant &operator=(QVariant &&other) noexcept { qSwap(d, other.d); return *this; } -#endif - inline void swap(QVariant &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + inline void swap(QVariant &other) noexcept { qSwap(d, other.d); } Type type() const; int userType() const; @@ -363,9 +360,9 @@ class Q_CORE_EXPORT QVariant template<typename T> static inline QVariant fromValue(const T &value) - { return qVariantFromValue(value); } + { return QVariant(qMetaTypeId<T>(), &value, QTypeInfo<T>::isPointer); } -#if defined(Q_CLANG_QDOC) || (QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L) +#if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L template<typename... Types> static inline QVariant fromStdVariant(const std::variant<Types...> &value) { @@ -388,18 +385,21 @@ class Q_CORE_EXPORT QVariant }; struct Private { - inline Private() Q_DECL_NOTHROW : type(Invalid), is_shared(false), is_null(true) + inline Private() noexcept : type(Invalid), is_shared(false), is_null(true) { data.ptr = nullptr; } // Internal constructor for initialized variants. - explicit inline Private(uint variantType) Q_DECL_NOTHROW + explicit inline Private(uint variantType) noexcept : type(variantType), is_shared(false), is_null(false) {} - inline Private(const Private &other) Q_DECL_NOTHROW +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) + Private(const Private &other) noexcept : data(other.data), type(other.type), is_shared(other.is_shared), is_null(other.is_null) {} + Private &operator=(const Private &other) noexcept = default; +#endif union Data { char c; @@ -486,27 +486,27 @@ public: private: // force compile error, prevent QVariant(bool) to be called - inline QVariant(void *) Q_DECL_EQ_DELETE; + inline QVariant(void *) = delete; // QVariant::Type is marked as \obsolete, but we don't want to // provide a constructor from its intended replacement, // QMetaType::Type, instead, because the idea behind these // constructors is flawed in the first place. But we also don't // want QVariant(QMetaType::String) to compile and falsely be an // int variant, so delete this constructor: - QVariant(QMetaType::Type) Q_DECL_EQ_DELETE; + QVariant(QMetaType::Type) = delete; // These constructors don't create QVariants of the type associcated // 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 // example. - QVariant(Qt::GlobalColor) Q_DECL_EQ_DELETE; - QVariant(Qt::BrushStyle) Q_DECL_EQ_DELETE; - QVariant(Qt::PenStyle) Q_DECL_EQ_DELETE; - QVariant(Qt::CursorShape) Q_DECL_EQ_DELETE; + QVariant(Qt::GlobalColor) = delete; + QVariant(Qt::BrushStyle) = delete; + QVariant(Qt::PenStyle) = delete; + QVariant(Qt::CursorShape) = delete; #ifdef QT_NO_CAST_FROM_ASCII // force compile error when implicit conversion is not wanted - inline QVariant(const char *) Q_DECL_EQ_DELETE; + inline QVariant(const char *) = delete; #endif public: typedef Private DataPtr; @@ -514,50 +514,61 @@ public: inline const DataPtr &data_ptr() const { return d; } }; +#if QT_DEPRECATED_SINCE(5, 14) template <typename T> +QT_DEPRECATED_X("Use QVariant::fromValue() instead.") inline QVariant qVariantFromValue(const T &t) { - return QVariant(qMetaTypeId<T>(), &t, QTypeInfo<T>::isPointer); + return QVariant::fromValue(t); +} + +template <typename T> +QT_DEPRECATED_X("Use QVariant::setValue() instead.") +inline void qVariantSetValue(QVariant &v, const T &t) +{ + v.setValue(t); } +#endif -template <> -inline QVariant qVariantFromValue(const QVariant &t) { return t; } +template<> +inline QVariant QVariant::fromValue(const QVariant &value) +{ + return value; +} #if QT_HAS_INCLUDE(<variant>) && __cplusplus >= 201703L -template <> -inline QVariant qVariantFromValue(const std::monostate &) { return QVariant(); } +template<> +inline QVariant QVariant::fromValue(const std::monostate &) +{ + return QVariant(); +} #endif -template <typename T> -inline void qVariantSetValue(QVariant &v, const T &t) +inline bool QVariant::isValid() const { return d.type != Invalid; } + +template<typename T> +inline void QVariant::setValue(const T &avalue) { - //if possible we reuse the current QVariant private + // If possible we reuse the current QVariant private. const uint type = qMetaTypeId<T>(); - QVariant::Private &d = v.data_ptr(); - if (v.isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) { + if (isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) { d.type = type; d.is_null = false; T *old = reinterpret_cast<T*>(d.is_shared ? d.data.shared->ptr : &d.data.ptr); if (QTypeInfo<T>::isComplex) old->~T(); - new (old) T(t); //call the copy constructor + new (old) T(avalue); // call the copy constructor } else { - v = QVariant(type, &t, QTypeInfo<T>::isPointer); + *this = QVariant(type, &avalue, QTypeInfo<T>::isPointer); } } -template <> -inline void qVariantSetValue<QVariant>(QVariant &v, const QVariant &t) +template<> +inline void QVariant::setValue(const QVariant &avalue) { - v = t; + *this = avalue; } -inline bool QVariant::isValid() const { return d.type != Invalid; } - -template<typename T> -inline void QVariant::setValue(const T &avalue) -{ qVariantSetValue(*this, avalue); } - #ifndef QT_NO_DATASTREAM Q_CORE_EXPORT QDataStream& operator>> (QDataStream& s, QVariant& p); Q_CORE_EXPORT QDataStream& operator<< (QDataStream& s, const QVariant& p); @@ -566,7 +577,7 @@ Q_CORE_EXPORT QDataStream& operator<< (QDataStream& s, const QVariant::Type p); #endif inline bool QVariant::isDetached() const -{ return !d.is_shared || d.data.shared->ref.load() == 1; } +{ return !d.is_shared || d.data.shared->ref.loadRelaxed() == 1; } #ifdef Q_QDOC diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index b22b7c231e..3d87beac83 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -88,7 +88,7 @@ inline T *v_cast(const QVariant::Private *nd, T * = 0) #else // every other compiler in this world template <typename T> -inline const T *v_cast(const QVariant::Private *d, T * = 0) +inline const T *v_cast(const QVariant::Private *d, T * = nullptr) { return !QVariantIntegrator<T>::CanUseInternalSpace ? static_cast<const T *>(d->data.shared->ptr) @@ -96,7 +96,7 @@ inline const T *v_cast(const QVariant::Private *d, T * = 0) } template <typename T> -inline T *v_cast(QVariant::Private *d, T * = 0) +inline T *v_cast(QVariant::Private *d, T * = nullptr) { return !QVariantIntegrator<T>::CanUseInternalSpace ? static_cast<T *>(d->data.shared->ptr) @@ -154,7 +154,7 @@ inline void v_construct(QVariant::Private *x, const T &t) // constructs a new variant if copy is 0, otherwise copy-constructs template <class T> -inline void v_construct(QVariant::Private *x, const void *copy, T * = 0) +inline void v_construct(QVariant::Private *x, const void *copy, T * = nullptr) { if (copy) v_construct<T>(x, *static_cast<const T *>(copy)); @@ -164,7 +164,7 @@ inline void v_construct(QVariant::Private *x, const void *copy, T * = 0) // deletes the internal structures template <class T> -inline void v_clear(QVariant::Private *d, T* = 0) +inline void v_clear(QVariant::Private *d, T* = nullptr) { if (!QVariantIntegrator<T>::CanUseInternalSpace) { @@ -264,7 +264,7 @@ class QVariantIsNull struct No { char unused[2]; }; Q_STATIC_ASSERT(sizeof(Yes) != sizeof(No)); - template<class C> static decltype(static_cast<const C*>(0)->isNull(), Yes()) test(int); + template<class C> static decltype(static_cast<const C*>(nullptr)->isNull(), Yes()) test(int); template<class C> static No test(...); public: static const bool Value = (sizeof(test<T>(0)) == sizeof(Yes)); diff --git a/src/corelib/kernel/qwineventnotifier.cpp b/src/corelib/kernel/qwineventnotifier.cpp index 3c73c0b851..d2ae9668fe 100644 --- a/src/corelib/kernel/qwineventnotifier.cpp +++ b/src/corelib/kernel/qwineventnotifier.cpp @@ -124,7 +124,7 @@ QWinEventNotifier::QWinEventNotifier(HANDLE hEvent, QObject *parent) : QObject(*new QWinEventNotifierPrivate(hEvent, false), parent) { Q_D(QWinEventNotifier); - QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.load(); + QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.loadRelaxed(); if (Q_UNLIKELY(!eventDispatcher)) { qWarning("QWinEventNotifier: Can only be used with threads started with QThread"); return; @@ -197,7 +197,7 @@ void QWinEventNotifier::setEnabled(bool enable) return; d->enabled = enable; - QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.load(); + QAbstractEventDispatcher *eventDispatcher = d->threadData->eventDispatcher.loadRelaxed(); if (!eventDispatcher) { // perhaps application is shutting down if (!enable && d->waitHandle != nullptr) d->unregisterWaitObject(); @@ -256,7 +256,7 @@ void QWinEventNotifierPrivate::unregisterWaitObject() static void CALLBACK wfsoCallback(void *context, BOOLEAN /*ignore*/) { QWinEventNotifierPrivate *nd = reinterpret_cast<QWinEventNotifierPrivate *>(context); - QAbstractEventDispatcher *eventDispatcher = nd->threadData->eventDispatcher.load(); + QAbstractEventDispatcher *eventDispatcher = nd->threadData->eventDispatcher.loadRelaxed(); // Happens when Q(Core)Application is destroyed before QWinEventNotifier. // https://bugreports.qt.io/browse/QTBUG-70214 diff --git a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml index b749fe41ac..d384ffb2d5 100644 --- a/src/corelib/mimetypes/mime/packages/freedesktop.org.xml +++ b/src/corelib/mimetypes/mime/packages/freedesktop.org.xml @@ -64,20 +64,32 @@ <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info"> <mime-type type="application/x-atari-2600-rom"> <comment>Atari 2600</comment> + <comment xml:lang="ast">Atari 2600</comment> <comment xml:lang="ca">Atari 2600</comment> + <comment xml:lang="cs">Atari 2600</comment> <comment xml:lang="da">Atari 2600</comment> <comment xml:lang="de">Atari 2600</comment> + <comment xml:lang="en_GB">Atari 2600</comment> <comment xml:lang="es">Atari 2600</comment> + <comment xml:lang="eu">Atari 2600</comment> <comment xml:lang="fi">Atari 2600</comment> <comment xml:lang="fr">Atari 2600</comment> + <comment xml:lang="ga">Atari 2600</comment> <comment xml:lang="he">אטארי 2600</comment> + <comment xml:lang="hr">Atari 2600</comment> <comment xml:lang="hu">Atari 2600</comment> + <comment xml:lang="id">Atari 2600</comment> + <comment xml:lang="it">Atari 2600</comment> <comment xml:lang="kk">Atari 2600</comment> <comment xml:lang="ko">Atari 2600</comment> + <comment xml:lang="oc">Atari 2600</comment> <comment xml:lang="pl">Atari 2600</comment> <comment xml:lang="pt_BR">Atari 2600</comment> <comment xml:lang="ru">Atari 2600</comment> <comment xml:lang="sk">Atari 2600</comment> + <comment xml:lang="sr">Атари 2600</comment> + <comment xml:lang="sv">Atari 2600</comment> + <comment xml:lang="tr">Atari 2600</comment> <comment xml:lang="uk">Atari 2600</comment> <comment xml:lang="zh_CN">雅达利 2600</comment> <comment xml:lang="zh_TW">Atari 2600</comment> @@ -86,20 +98,32 @@ </mime-type> <mime-type type="application/x-atari-7800-rom"> <comment>Atari 7800</comment> + <comment xml:lang="ast">Atari 7800</comment> <comment xml:lang="ca">Atari 7800</comment> + <comment xml:lang="cs">Atari 7800</comment> <comment xml:lang="da">Atari 7800</comment> <comment xml:lang="de">Atari 7800</comment> + <comment xml:lang="en_GB">Atari 7800</comment> <comment xml:lang="es">Atari 7800</comment> + <comment xml:lang="eu">Atari 7800</comment> <comment xml:lang="fi">Atari 7800</comment> <comment xml:lang="fr">Atari 7800</comment> + <comment xml:lang="ga">Atari 7800</comment> <comment xml:lang="he">אטארי 7800</comment> + <comment xml:lang="hr">Atari 7800</comment> <comment xml:lang="hu">Atari 7800</comment> + <comment xml:lang="id">Atari 7800</comment> + <comment xml:lang="it">Atari 7800</comment> <comment xml:lang="kk">Atari 7800</comment> <comment xml:lang="ko">Atari 7800</comment> + <comment xml:lang="oc">Atari 7800</comment> <comment xml:lang="pl">Atari 7800</comment> <comment xml:lang="pt_BR">Atari 7800</comment> <comment xml:lang="ru">Atari 7800</comment> <comment xml:lang="sk">Atari 7800</comment> + <comment xml:lang="sr">Атари 7800</comment> + <comment xml:lang="sv">Atari 7800</comment> + <comment xml:lang="tr">Atari 7800</comment> <comment xml:lang="uk">Atari 7800</comment> <comment xml:lang="zh_CN">雅达利 7800</comment> <comment xml:lang="zh_TW">Atari 7800</comment> @@ -109,6 +133,35 @@ <match value="ATARI7800" type="string" offset="1"/> </magic> </mime-type> + <mime-type type="application/x-atari-lynx-rom"> + <comment>Atari Lynx</comment> + <comment xml:lang="ast">Atari Lynx</comment> + <comment xml:lang="ca">Atari Lynx</comment> + <comment xml:lang="cs">Atari Lynx</comment> + <comment xml:lang="de">Atari Lynx</comment> + <comment xml:lang="en_GB">Atari Lynx</comment> + <comment xml:lang="es">Atari Lynx</comment> + <comment xml:lang="fi">Atari Lynx</comment> + <comment xml:lang="hr">Atari Lynx</comment> + <comment xml:lang="hu">Atari Lynx</comment> + <comment xml:lang="id">Atari Lynx</comment> + <comment xml:lang="it">Atari Lynx</comment> + <comment xml:lang="kk">Atari Lynx</comment> + <comment xml:lang="ko">Atari Lynx</comment> + <comment xml:lang="pl">Atari Lynx</comment> + <comment xml:lang="pt_BR">Atari Lynx</comment> + <comment xml:lang="ru">Atari Lynx</comment> + <comment xml:lang="sk">Atari Lynx</comment> + <comment xml:lang="sv">Atari Lynx</comment> + <comment xml:lang="uk">Atari Lynx</comment> + <comment xml:lang="zh_CN">雅达利 Lynx</comment> + <comment xml:lang="zh_TW">Atari Lynx</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.lnx"/> + <magic> + <match value="LYNX" type="string" offset="0"/> + </magic> + </mime-type> <mime-type type="application/andrew-inset"> <comment>ATK inset</comment> <comment xml:lang="ar">شكل ATK</comment> @@ -146,7 +199,7 @@ <comment xml:lang="pt">Suplemento ATK</comment> <comment xml:lang="pt_BR">Conjunto de entrada do ATK</comment> <comment xml:lang="ro">Inset ATK</comment> - <comment xml:lang="ru">вкладка ATK</comment> + <comment xml:lang="ru">Вкладка ATK</comment> <comment xml:lang="sk">Vložka ATK</comment> <comment xml:lang="sl">Vložka ATK</comment> <comment xml:lang="sq">Inset ATK</comment> @@ -165,6 +218,7 @@ <mime-type type="application/epub+zip"> <comment>electronic book document</comment> <comment xml:lang="ar">مستند كتاب إلكتروني</comment> + <comment xml:lang="ast">documentu de llibru electrónicu</comment> <comment xml:lang="be@latin">elektronnaja kniha</comment> <comment xml:lang="bg">Документ — електронна книга</comment> <comment xml:lang="ca">document de llibre electrònic</comment> @@ -181,7 +235,7 @@ <comment xml:lang="ga">leabhar leictreonach</comment> <comment xml:lang="gl">documento de libro electrónico</comment> <comment xml:lang="he">מסמך מסוג ספר אלקטרוני</comment> - <comment xml:lang="hr">dokument elektroničke knjige</comment> + <comment xml:lang="hr">Dokument elektroničke knjige</comment> <comment xml:lang="hu">elektronikus könyvdokumentum</comment> <comment xml:lang="ia">Documento de libro electronic</comment> <comment xml:lang="id">dokumen buku elektronik</comment> @@ -198,7 +252,7 @@ <comment xml:lang="pt">documento de livro eletrónico</comment> <comment xml:lang="pt_BR">Documento de livro eletrônico</comment> <comment xml:lang="ro">document carte electronică</comment> - <comment xml:lang="ru">электронная книга</comment> + <comment xml:lang="ru">Электронная книга</comment> <comment xml:lang="sk">Dokument elektronickej knihy</comment> <comment xml:lang="sl">dokument elektronske knjige</comment> <comment xml:lang="sq">Dokument libri elektronik</comment> @@ -224,6 +278,7 @@ <mime-type type="application/illustrator"> <comment>Adobe Illustrator document</comment> <comment xml:lang="ar">مستند أدوبي المصور</comment> + <comment xml:lang="ast">Documentu d'Adobe Illustrator</comment> <comment xml:lang="be@latin">Dakument Adobe Illustrator</comment> <comment xml:lang="bg">Документ — Adobe Illustrator</comment> <comment xml:lang="ca">document d'Adobe Illustrator</comment> @@ -244,7 +299,7 @@ <comment xml:lang="hr">Adobe Illustrator dokument</comment> <comment xml:lang="hu">Adobe Illustrator-dokumentum</comment> <comment xml:lang="ia">Documento Adobe Illustrator</comment> - <comment xml:lang="id">Dokumen Adobe Illustrator</comment> + <comment xml:lang="id">dokumen Adobe Illustrator</comment> <comment xml:lang="it">Documento Adobe Illustrator</comment> <comment xml:lang="ja">Adobe Illustrator ドキュメント</comment> <comment xml:lang="ka">Adobe Illustrator-ის დოკუმენტი</comment> @@ -261,11 +316,11 @@ <comment xml:lang="pt">documento Adobe Illustrator</comment> <comment xml:lang="pt_BR">Documento do Adobe Illustrator</comment> <comment xml:lang="ro">Document Adobe Illustrator</comment> - <comment xml:lang="ru">документ Adobe Illustrator</comment> + <comment xml:lang="ru">Документ Adobe Illustrator</comment> <comment xml:lang="sk">Dokument Adobe Illustrator</comment> <comment xml:lang="sl">Dokument Adobe Illustrator</comment> <comment xml:lang="sq">Dokument Adobe Illustrator</comment> - <comment xml:lang="sr">документ Адобе Илустратора</comment> + <comment xml:lang="sr">документ Адобе илустратора</comment> <comment xml:lang="sv">Adobe Illustrator-dokument</comment> <comment xml:lang="tr">Adobe Illustrator belgesi</comment> <comment xml:lang="uk">документ Adobe Illustrator</comment> @@ -274,10 +329,12 @@ <comment xml:lang="zh_TW">Adobe Illustrator 文件</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.ai"/> + <alias type="application/vnd.adobe.illustrator"/> </mime-type> <mime-type type="application/mac-binhex40"> <comment>Macintosh BinHex-encoded file</comment> <comment xml:lang="ar">ملف Macintosh BinHex مشفر</comment> + <comment xml:lang="ast">Ficheru codificáu en BinHex de Machintosh</comment> <comment xml:lang="az">Macintosh BinHex-kodlanmış fayl</comment> <comment xml:lang="be@latin">Fajł Macintosh, BinHex-zakadavany</comment> <comment xml:lang="bg">Файл — кодиран във формат BinHex за Macintosh</comment> @@ -297,10 +354,10 @@ <comment xml:lang="ga">comhad ionchódaithe le Macintosh BinHex</comment> <comment xml:lang="gl">ficheiro de Macintosh codificado con BinHex</comment> <comment xml:lang="he">קובץ בקידוד Macintosh BinHex</comment> - <comment xml:lang="hr">Macintosh BinHex-kodirana datoteka</comment> + <comment xml:lang="hr">Macintosh BinHex-kôdirana datoteka</comment> <comment xml:lang="hu">Macintosh BinHex kódolású fájl</comment> <comment xml:lang="ia">File codificate in BinHex de Macintosh</comment> - <comment xml:lang="id">Berkas tersandi Macintosh BinHex</comment> + <comment xml:lang="id">berkas tersandi Macintosh BinHex</comment> <comment xml:lang="it">File Macintosh codificato BinHex</comment> <comment xml:lang="ja">Macintosh BinHex エンコードファイル</comment> <comment xml:lang="kk">Macintosh BinHex кодталған файлы</comment> @@ -316,7 +373,7 @@ <comment xml:lang="pt">ficheiro codificado em BinHex de Macintosh</comment> <comment xml:lang="pt_BR">Arquivo do Macintosh codificado com BinHex</comment> <comment xml:lang="ro">Fișier codat Macintosh BinHex</comment> - <comment xml:lang="ru">файл (закодированный Macintosh BinHex)</comment> + <comment xml:lang="ru">Файл (закодированный Macintosh BinHex)</comment> <comment xml:lang="sk">Súbor kódovaný pomocou Macintosh BinHex</comment> <comment xml:lang="sl">Kodirana datoteka Macintosh (BinHex)</comment> <comment xml:lang="sq">File Macintosh i kodifikuar BinHex</comment> @@ -393,6 +450,7 @@ <mime-type type="application/mathml+xml"> <comment>MathML document</comment> <comment xml:lang="ar">مستند MathML</comment> + <comment xml:lang="ast">Documentu MathML</comment> <comment xml:lang="az">MathML sənədi</comment> <comment xml:lang="be@latin">Dakument MathML</comment> <comment xml:lang="bg">Документ — MathML</comment> @@ -415,7 +473,7 @@ <comment xml:lang="hr">MathML dokument</comment> <comment xml:lang="hu">MathML-dokumentum</comment> <comment xml:lang="ia">Documento MathML</comment> - <comment xml:lang="id">Dokumen MathML</comment> + <comment xml:lang="id">dokumen MathML</comment> <comment xml:lang="it">Documento MathML</comment> <comment xml:lang="ja">MathML ドキュメント</comment> <comment xml:lang="ka">MathML-ის დოკუმენტი</comment> @@ -432,7 +490,7 @@ <comment xml:lang="pt">documento MathML</comment> <comment xml:lang="pt_BR">Documento do MathML</comment> <comment xml:lang="ro">Document MathML</comment> - <comment xml:lang="ru">документ MathML</comment> + <comment xml:lang="ru">Документ MathML</comment> <comment xml:lang="sk">Dokument MathML</comment> <comment xml:lang="sl">Dokument MathML</comment> <comment xml:lang="sq">Dokument MathML</comment> @@ -469,7 +527,7 @@ <comment xml:lang="ga">comhad bhosca poist</comment> <comment xml:lang="gl">ficheiro de caixa de correo</comment> <comment xml:lang="he">קובץ תיבת-דואר</comment> - <comment xml:lang="hr">datoteka poštanskog sandučića</comment> + <comment xml:lang="hr">Datoteka poštanskog sandučića</comment> <comment xml:lang="hu">mailbox fájl</comment> <comment xml:lang="ia">File de cassa postal</comment> <comment xml:lang="id">berkas kotak surat</comment> @@ -487,7 +545,7 @@ <comment xml:lang="pt">ficheiro de caixa de correio</comment> <comment xml:lang="pt_BR">Arquivo de caixa de correio</comment> <comment xml:lang="ro">fișier căsuță poștală</comment> - <comment xml:lang="ru">файл почтового ящика</comment> + <comment xml:lang="ru">Файл почтового ящика</comment> <comment xml:lang="sk">Súbor mailbox</comment> <comment xml:lang="sl">datoteka poštnega predala</comment> <comment xml:lang="sq">File mailbox</comment> @@ -496,7 +554,7 @@ <comment xml:lang="tr">posta kutusu dosyası</comment> <comment xml:lang="uk">файл поштової скриньки</comment> <comment xml:lang="vi">tập tin hộp thư</comment> - <comment xml:lang="zh_CN">mailbox 文件</comment> + <comment xml:lang="zh_CN">邮箱文件</comment> <comment xml:lang="zh_TW">郵箱檔</comment> <generic-icon name="text-x-generic"/> <sub-class-of type="text/plain"/> @@ -508,6 +566,7 @@ <mime-type type="application/metalink+xml"> <comment>Metalink file</comment> <comment xml:lang="ar">ملف ميتالنك</comment> + <comment xml:lang="ast">Ficheru d'enllaz meta</comment> <comment xml:lang="bg">Изтегляне — Metalink</comment> <comment xml:lang="ca">fitxer Metalink</comment> <comment xml:lang="cs">soubor metalink</comment> @@ -527,7 +586,7 @@ <comment xml:lang="hr">Datoteka meta poveznice</comment> <comment xml:lang="hu">Metalink fájl</comment> <comment xml:lang="ia">File Metalink</comment> - <comment xml:lang="id">Berkas Metalink</comment> + <comment xml:lang="id">berkas Metalink</comment> <comment xml:lang="it">File Metalink</comment> <comment xml:lang="ja">Metalink ファイル</comment> <comment xml:lang="kk">Metalink файлы</comment> @@ -540,14 +599,14 @@ <comment xml:lang="pt">ficheiro Metalink</comment> <comment xml:lang="pt_BR">Arquivo Metalink</comment> <comment xml:lang="ro">Fișier Metalink</comment> - <comment xml:lang="ru">файл Metalink</comment> + <comment xml:lang="ru">Файл Metalink</comment> <comment xml:lang="sk">Súbor Metalink</comment> <comment xml:lang="sl">Datoteka povezave Metalink</comment> <comment xml:lang="sr">датотека метавезе</comment> <comment xml:lang="sv">Metalink-fil</comment> <comment xml:lang="tr">Metalink dosyası</comment> <comment xml:lang="uk">файл метапосилання</comment> - <comment xml:lang="zh_CN">元链接文件</comment> + <comment xml:lang="zh_CN">Metalink 文件</comment> <comment xml:lang="zh_TW">Metalink 檔案</comment> <sub-class-of type="application/xml"/> <magic priority="50"> @@ -559,6 +618,7 @@ <mime-type type="application/metalink4+xml"> <comment>Metalink file</comment> <comment xml:lang="ar">ملف ميتالنك</comment> + <comment xml:lang="ast">Ficheru d'enllaz meta</comment> <comment xml:lang="bg">Изтегляне — Metalink</comment> <comment xml:lang="ca">fitxer Metalink</comment> <comment xml:lang="cs">soubor metalink</comment> @@ -578,7 +638,7 @@ <comment xml:lang="hr">Datoteka meta poveznice</comment> <comment xml:lang="hu">Metalink fájl</comment> <comment xml:lang="ia">File Metalink</comment> - <comment xml:lang="id">Berkas Metalink</comment> + <comment xml:lang="id">berkas Metalink</comment> <comment xml:lang="it">File Metalink</comment> <comment xml:lang="ja">Metalink ファイル</comment> <comment xml:lang="kk">Metalink файлы</comment> @@ -591,14 +651,14 @@ <comment xml:lang="pt">ficheiro Metalink</comment> <comment xml:lang="pt_BR">Arquivo Metalink</comment> <comment xml:lang="ro">Fișier Metalink</comment> - <comment xml:lang="ru">файл Metalink</comment> + <comment xml:lang="ru">Файл Metalink</comment> <comment xml:lang="sk">Súbor Metalink</comment> <comment xml:lang="sl">Datoteka povezave Metalink</comment> <comment xml:lang="sr">датотека метавезе</comment> <comment xml:lang="sv">Metalink-fil</comment> <comment xml:lang="tr">Metalink dosyası</comment> <comment xml:lang="uk">файл метапосилання</comment> - <comment xml:lang="zh_CN">元链接文件</comment> + <comment xml:lang="zh_CN">Metalink 文件</comment> <comment xml:lang="zh_TW">Metalink 檔案</comment> <sub-class-of type="application/xml"/> <magic priority="50"> @@ -610,12 +670,13 @@ <mime-type type="application/octet-stream"> <comment>unknown</comment> <comment xml:lang="ar">مجهول</comment> + <comment xml:lang="ast">desconozse</comment> <comment xml:lang="be@latin">nieviadomy</comment> <comment xml:lang="bg">Неизвестен тип</comment> <comment xml:lang="ca">desconegut</comment> <comment xml:lang="cs">neznámý</comment> <comment xml:lang="da">ukendt</comment> - <comment xml:lang="de">Unbekannt</comment> + <comment xml:lang="de">unbekannt</comment> <comment xml:lang="el">Άγνωστο</comment> <comment xml:lang="en_GB">unknown</comment> <comment xml:lang="eo">nekonate</comment> @@ -627,7 +688,7 @@ <comment xml:lang="ga">anaithnid</comment> <comment xml:lang="gl">descoñecido</comment> <comment xml:lang="he">לא ידוע</comment> - <comment xml:lang="hr">nepoznato</comment> + <comment xml:lang="hr">Nepoznato</comment> <comment xml:lang="hu">ismeretlen</comment> <comment xml:lang="ia">incognite</comment> <comment xml:lang="id">tak diketahui</comment> @@ -647,7 +708,7 @@ <comment xml:lang="pt">desconhecido</comment> <comment xml:lang="pt_BR">Desconhecido</comment> <comment xml:lang="ro">necunoscut</comment> - <comment xml:lang="ru">неизвестно</comment> + <comment xml:lang="ru">Неизвестно</comment> <comment xml:lang="sk">Neznámy</comment> <comment xml:lang="sl">neznano</comment> <comment xml:lang="sq">Nuk njihet</comment> @@ -658,10 +719,10 @@ <comment xml:lang="vi">không rõ</comment> <comment xml:lang="zh_CN">未知</comment> <comment xml:lang="zh_TW">不明</comment> - <glob pattern="*.bin"/> </mime-type> <mime-type type="application/x-partial-download"> <comment>Partially downloaded file</comment> + <comment xml:lang="ast">Ficheru baxáu parcialmente</comment> <comment xml:lang="ca">fitxer baixat parcialment</comment> <comment xml:lang="cs">částečně stažený soubor</comment> <comment xml:lang="da">Delvist hentet fil</comment> @@ -672,6 +733,7 @@ <comment xml:lang="eu">Partzialki deskargatutako fitxategia</comment> <comment xml:lang="fi">Osittain ladattu tiedosto</comment> <comment xml:lang="fr">fichier partiellement téléchargé</comment> + <comment xml:lang="ga">Comhad leath-íoslódáilte</comment> <comment xml:lang="gl">Ficheiro descargado parcialmente</comment> <comment xml:lang="he">קובץ שהתקבל חלקית</comment> <comment xml:lang="hr">Djelomično preuzeta datoteka</comment> @@ -692,7 +754,7 @@ <comment xml:lang="sv">Delvis hämtad fil</comment> <comment xml:lang="tr">Kısmen indirilmiş dosya</comment> <comment xml:lang="uk">частково отриманий файл</comment> - <comment xml:lang="zh_CN">下载的部分文件</comment> + <comment xml:lang="zh_CN">部分下载的文件</comment> <comment xml:lang="zh_TW">已部份下載的檔案</comment> <generic-icon name="package-x-generic"/> <glob pattern="*.wkdownload"/> @@ -702,6 +764,7 @@ <mime-type type="application/oda"> <comment>ODA document</comment> <comment xml:lang="ar">مستند ODA</comment> + <comment xml:lang="ast">Documentu ODA</comment> <comment xml:lang="az">ODA sənədi</comment> <comment xml:lang="be@latin">Dakument ODA</comment> <comment xml:lang="bg">Документ — ODA</comment> @@ -741,7 +804,7 @@ <comment xml:lang="pt">documento ODA</comment> <comment xml:lang="pt_BR">Documento ODA</comment> <comment xml:lang="ro">Document ODA</comment> - <comment xml:lang="ru">документ ODA</comment> + <comment xml:lang="ru">Документ ODA</comment> <comment xml:lang="sk">Dokument ODA</comment> <comment xml:lang="sl">Dokument ODA</comment> <comment xml:lang="sq">Dokument ODA</comment> @@ -759,6 +822,7 @@ </mime-type> <mime-type type="application/x-wwf"> <comment>WWF document</comment> + <comment xml:lang="ast">Documentu WWF</comment> <comment xml:lang="bg">Документ — WWF</comment> <comment xml:lang="ca">document WWF</comment> <comment xml:lang="cs">dokument WWF</comment> @@ -771,6 +835,7 @@ <comment xml:lang="eu">WWF dokumentua</comment> <comment xml:lang="fi">WWF-asiakirja</comment> <comment xml:lang="fr">document WWF</comment> + <comment xml:lang="ga">cáipéis WWF</comment> <comment xml:lang="gl">documento de WWF</comment> <comment xml:lang="he">מסמך WWF</comment> <comment xml:lang="hr">WWF dokument</comment> @@ -788,7 +853,7 @@ <comment xml:lang="pl">Dokument WWF</comment> <comment xml:lang="pt">documento WWF</comment> <comment xml:lang="pt_BR">Documento WWF</comment> - <comment xml:lang="ru">документ WWF</comment> + <comment xml:lang="ru">Документ WWF</comment> <comment xml:lang="sk">Dokument WWF</comment> <comment xml:lang="sl">Dokument WWF</comment> <comment xml:lang="sr">ВВФ документ</comment> @@ -805,6 +870,7 @@ <mime-type type="application/pdf"> <comment>PDF document</comment> <comment xml:lang="ar">مستند PDF</comment> + <comment xml:lang="ast">Documentu PDF</comment> <comment xml:lang="be@latin">Dakument PDF</comment> <comment xml:lang="bg">Документ — PDF</comment> <comment xml:lang="ca">document PDF</comment> @@ -842,7 +908,7 @@ <comment xml:lang="pt">documento PDF</comment> <comment xml:lang="pt_BR">Documento PDF</comment> <comment xml:lang="ro">Document PDF</comment> - <comment xml:lang="ru">документ PDF</comment> + <comment xml:lang="ru">Документ PDF</comment> <comment xml:lang="sk">Dokument PDF</comment> <comment xml:lang="sl">Dokument PDF</comment> <comment xml:lang="sq">Dokument PDF</comment> @@ -868,6 +934,7 @@ <mime-type type="application/xspf+xml"> <comment>XSPF playlist</comment> <comment xml:lang="ar">قائمة تشغيل XSPF</comment> + <comment xml:lang="ast">Llista de reproducción XSPF</comment> <comment xml:lang="be@latin">Śpis piesień XSPF</comment> <comment xml:lang="bg">Списък за изпълнение — XSPF</comment> <comment xml:lang="ca">llista de reproducció XSPF</comment> @@ -885,7 +952,7 @@ <comment xml:lang="ga">seinmliosta XSPF</comment> <comment xml:lang="gl">lista de reprodución XSPF</comment> <comment xml:lang="he">רשימת נגינה XSPF</comment> - <comment xml:lang="hr">XSPF popis za reprodukciju</comment> + <comment xml:lang="hr">XSPF popis izvođenja</comment> <comment xml:lang="hu">XSPF-lejátszólista</comment> <comment xml:lang="ia">Lista de selection XSPF</comment> <comment xml:lang="id">Senarai pular XSPF</comment> @@ -903,7 +970,7 @@ <comment xml:lang="pt">lista de reprodução XSPF</comment> <comment xml:lang="pt_BR">Lista de reprodução XSPF</comment> <comment xml:lang="ro">Listă XSPF</comment> - <comment xml:lang="ru">список воспроизведения XSPF</comment> + <comment xml:lang="ru">Список воспроизведения XSPF</comment> <comment xml:lang="sk">Zoznam skladieb XSPF</comment> <comment xml:lang="sl">Seznam predvajanja XSPF</comment> <comment xml:lang="sq">Listë titujsh XSPF</comment> @@ -929,11 +996,12 @@ <mime-type type="application/x-windows-themepack"> <comment>Microsoft Windows theme pack</comment> <comment xml:lang="ar">حزمة سمات Microsoft Works</comment> + <comment xml:lang="ast">Paquete de temes de Microsoft Windows</comment> <comment xml:lang="bg">Пакет с тема — Microsoft Windows</comment> <comment xml:lang="ca">paquet de temes de Microsoft Windows</comment> <comment xml:lang="cs">balík motivů Microsoft Windows</comment> <comment xml:lang="da">Microsoft Windows-temapakke</comment> - <comment xml:lang="de">Themenpaket für Microsoft Windows</comment> + <comment xml:lang="de">Microsoft-Windows-Themenpaket</comment> <comment xml:lang="el">Πακέτο θέματος Microsoft Windows</comment> <comment xml:lang="en_GB">Microsoft Windows theme pack</comment> <comment xml:lang="es">paquete de tema para Microsoft Windows</comment> @@ -961,7 +1029,7 @@ <comment xml:lang="pt">pacote de tema Microsoft Windows</comment> <comment xml:lang="pt_BR">Pacote de temas do Microsoft Windows</comment> <comment xml:lang="ro">Pachet de teme Microsoft Windows</comment> - <comment xml:lang="ru">пакет темы Microsoft Windows</comment> + <comment xml:lang="ru">Пакет темы Microsoft Windows</comment> <comment xml:lang="sk">Balík tém Microsoft Windows</comment> <comment xml:lang="sl">Datoteka teme Microsoft Windows</comment> <comment xml:lang="sr">пакет теме Мајкрософт Виндоуза</comment> @@ -976,6 +1044,7 @@ </mime-type> <mime-type type="audio/x-amzxml"> <comment>AmazonMP3 download file</comment> + <comment xml:lang="ast">Ficheru de descarga AmazonMP3</comment> <comment xml:lang="ca">fitxer baixat d'AmazonMP3</comment> <comment xml:lang="cs">soubor stahování AmazonMP3</comment> <comment xml:lang="da">AmazonMP3-downloadfil</comment> @@ -985,6 +1054,7 @@ <comment xml:lang="es">archivo de descarga de AmazonMP3</comment> <comment xml:lang="eu">AmazonMP3 deskarga fitxategia</comment> <comment xml:lang="fr">fichier téléchargé AmazonMP3</comment> + <comment xml:lang="ga">comhad íoslódáilte AmazonMP3</comment> <comment xml:lang="gl">Ficheiro de descarga de AmazonMP3</comment> <comment xml:lang="he">קובץ הורדת AmazonMP3</comment> <comment xml:lang="hr">AmazonMP3 preuzeta datoteka</comment> @@ -1000,7 +1070,7 @@ <comment xml:lang="pl">Pobrany plik AmazonMP3</comment> <comment xml:lang="pt">ficheiro transferido AmazonMP3</comment> <comment xml:lang="pt_BR">Arquivo de download AmazonMP3</comment> - <comment xml:lang="ru">файл загрузки AmazonMP3</comment> + <comment xml:lang="ru">Файл загрузки AmazonMP3</comment> <comment xml:lang="sk">Stiahnutý súbor AmazonMP3 </comment> <comment xml:lang="sl">Datoteka prenosa AmazonMP3</comment> <comment xml:lang="sr">датотека преузимања АмазонаМП3</comment> @@ -1014,6 +1084,7 @@ <mime-type type="audio/x-gsm"> <comment>GSM 06.10 audio</comment> <comment xml:lang="ar">GSM 06.10 سمعي</comment> + <comment xml:lang="ast">Audiu GSM 6.10</comment> <comment xml:lang="bg">Аудио — GSM 06.10</comment> <comment xml:lang="ca">àudio de GSM 06.10</comment> <comment xml:lang="cs">zvuk GSM 06.10</comment> @@ -1029,7 +1100,7 @@ <comment xml:lang="ga">fuaim GSM 06.10</comment> <comment xml:lang="gl">son de GSM 06.10</comment> <comment xml:lang="he">שמע GSM 06.10</comment> - <comment xml:lang="hr">GSM 06.10 audio</comment> + <comment xml:lang="hr">GSM 06.10 zvučni zapis</comment> <comment xml:lang="hu">GSM 06.10 hang</comment> <comment xml:lang="ia">Audio GSM 06.10</comment> <comment xml:lang="id">Audio GSM 06.10</comment> @@ -1046,7 +1117,7 @@ <comment xml:lang="pt">áudio GSM 06.10</comment> <comment xml:lang="pt_BR">Áudio GSM 06.10</comment> <comment xml:lang="ro">GSM 06.10 audio</comment> - <comment xml:lang="ru">аудио GSM 06.10</comment> + <comment xml:lang="ru">Аудио GSM 06.10</comment> <comment xml:lang="sk">Zvuk GSM 06.10</comment> <comment xml:lang="sl">Zvočna datoteka GSM 06.10</comment> <comment xml:lang="sr">ГСМ 06.10 звук</comment> @@ -1063,6 +1134,7 @@ <mime-type type="audio/x-iriver-pla"> <comment>iRiver Playlist</comment> <comment xml:lang="ar">قائمة تشغيل iRiver</comment> + <comment xml:lang="ast">Llista de reproducción iRiver</comment> <comment xml:lang="be@latin">Śpis piesień iRiver</comment> <comment xml:lang="bg">Списък за изпълнение — iRiver</comment> <comment xml:lang="ca">llista de reproducció iRiver</comment> @@ -1080,7 +1152,7 @@ <comment xml:lang="ga">seinmliosta iRiver</comment> <comment xml:lang="gl">lista de reprodución de iRiver</comment> <comment xml:lang="he">רשימת נגינה של iRiver</comment> - <comment xml:lang="hr">iRiver popis za reprodukciju</comment> + <comment xml:lang="hr">iRiver popis izvođenja</comment> <comment xml:lang="hu">iRiver lejátszólista</comment> <comment xml:lang="ia">Lista de selection iRiver</comment> <comment xml:lang="id">iRiver Playlist</comment> @@ -1098,7 +1170,7 @@ <comment xml:lang="pt">lista de reprodução iRiver</comment> <comment xml:lang="pt_BR">Lista de reprodução do iRiver</comment> <comment xml:lang="ro">Listă iRiver</comment> - <comment xml:lang="ru">список воспроизведения iRiver</comment> + <comment xml:lang="ru">Список воспроизведения iRiver</comment> <comment xml:lang="sk">Zoznam skladieb iRiver</comment> <comment xml:lang="sl">Seznam predvajanja iRiver</comment> <comment xml:lang="sq">Listë titujsh iRiver</comment> @@ -1117,6 +1189,7 @@ <mime-type type="application/pgp-encrypted"> <comment>PGP/MIME-encrypted message header</comment> <comment xml:lang="ar">ترويسة رسالة PGP/MIME-مشفرة</comment> + <comment xml:lang="ast">Testera de mensaxe cifrada en PGP/MIME</comment> <comment xml:lang="be@latin">Zahałovak paviedamleńnia, zašyfravany ŭ PGP/MIME</comment> <comment xml:lang="bg">Заглавна част на шифрирано съобщение — PGP/MIME</comment> <comment xml:lang="ca">capçalera de missatge amb xifrat PGP/MIME</comment> @@ -1153,7 +1226,7 @@ <comment xml:lang="pt">cabeçalho de mensagem encriptada com PGP/MIME</comment> <comment xml:lang="pt_BR">Cabeçalho de mensagem criptografada PGP/MIME</comment> <comment xml:lang="ro">Antet de mesaj encriptat PGP/MIME</comment> - <comment xml:lang="ru">заголовок сообщения, зашифрованный PGP/MIME</comment> + <comment xml:lang="ru">Заголовок сообщения, зашифрованный PGP/MIME</comment> <comment xml:lang="sk">Hlavičke správy zašifrovaná pomocou PGP/MIME</comment> <comment xml:lang="sl">Datoteka glave šifriranega sporočila PGP/MIME</comment> <comment xml:lang="sq">Header mesazhi të kriptuar PGP/MIME</comment> @@ -1177,6 +1250,7 @@ <mime-type type="application/pgp-keys"> <comment>PGP keys</comment> <comment xml:lang="ar">مفاتيح PGP</comment> + <comment xml:lang="ast">Claves PGP</comment> <comment xml:lang="az">PGP açarları</comment> <comment xml:lang="be@latin">Klučy PGP</comment> <comment xml:lang="bg">Ключове — PGP</comment> @@ -1215,7 +1289,7 @@ <comment xml:lang="pt">chaves PGP</comment> <comment xml:lang="pt_BR">Chaves PGP</comment> <comment xml:lang="ro">Chei PGP</comment> - <comment xml:lang="ru">ключи PGP</comment> + <comment xml:lang="ru">Ключи PGP</comment> <comment xml:lang="sk">Kľúče PGP</comment> <comment xml:lang="sl">Datoteka ključa PGP</comment> <comment xml:lang="sq">Kyçe PGP</comment> @@ -1252,7 +1326,7 @@ <comment xml:lang="ca">signatura OpenPGP abstreta</comment> <comment xml:lang="cs">oddělený podpis OpenPGP</comment> <comment xml:lang="da">frigjort OpenPGP-signatur</comment> - <comment xml:lang="de">Isolierte OpenPGP-Signatur</comment> + <comment xml:lang="de">isolierte OpenPGP-Signatur</comment> <comment xml:lang="el">Αποκομμένη υπογραφή OpenPGP</comment> <comment xml:lang="en_GB">detached OpenPGP signature</comment> <comment xml:lang="eo">dekroĉa OpenPGP-subskribo</comment> @@ -1264,7 +1338,7 @@ <comment xml:lang="ga">síniú OpenPGP scartha</comment> <comment xml:lang="gl">sinatura de OpenPGP independente</comment> <comment xml:lang="he">חתימת OpenPGP מנותקת</comment> - <comment xml:lang="hr">odvojen OpenPGP potpis</comment> + <comment xml:lang="hr">Odvojen OpenPGP potpis</comment> <comment xml:lang="hu">leválasztott OpenPGP-aláírás</comment> <comment xml:lang="ia">Signatura OpenPGP distachate</comment> <comment xml:lang="id">tanda tangan OpenPGP yang terlepas</comment> @@ -1283,7 +1357,7 @@ <comment xml:lang="pt">assinatura OpenPGP solta</comment> <comment xml:lang="pt_BR">Assinatura OpenPGP destacada</comment> <comment xml:lang="ro">semnătură OpenPGP detașată</comment> - <comment xml:lang="ru">отсоединённая подпись OpenPGP</comment> + <comment xml:lang="ru">Отсоединённая подпись OpenPGP</comment> <comment xml:lang="sk">Oddelený podpis OpenPGP</comment> <comment xml:lang="sl">odpet podpis OpenPGP</comment> <comment xml:lang="sq">Firmë e shkëputur OpenPGP</comment> @@ -1307,6 +1381,7 @@ <mime-type type="application/pkcs7-mime"> <comment>PKCS#7 Message or Certificate</comment> + <comment xml:lang="ast">Mensaxe o certificáu PKCS#7</comment> <comment xml:lang="ca">missatge o certificat PKCS#7</comment> <comment xml:lang="cs">zpráva nebo certifikát PKCS#7</comment> <comment xml:lang="da">PKCS#7-besked eller certifikat</comment> @@ -1317,6 +1392,7 @@ <comment xml:lang="eu">PKCS#7 mezu edo zertifikazioa</comment> <comment xml:lang="fi">PKCS#7-viesti tai -varmenne</comment> <comment xml:lang="fr">Message ou certificat PKCS#7</comment> + <comment xml:lang="ga">Teachtaireacht nó Teastas PKCS#7</comment> <comment xml:lang="gl">Mensaxe ou certificado PKCS#7</comment> <comment xml:lang="he">הודעה או אישור מסוג PKCS#7</comment> <comment xml:lang="hr">PKCS#7 poruka ili vjerodajnica</comment> @@ -1332,7 +1408,7 @@ <comment xml:lang="pl">Wiadomość lub certyfikat PKCS#7</comment> <comment xml:lang="pt">Mensagem ou certificado PKCS#7</comment> <comment xml:lang="pt_BR">Certificado ou Mensagem PKCS#7</comment> - <comment xml:lang="ru">сообщение или сертификат PKCS#7</comment> + <comment xml:lang="ru">Сообщение или сертификат PKCS#7</comment> <comment xml:lang="sk">Správa alebo certifikát PKCS#7</comment> <comment xml:lang="sl">Sporočilo ali dovoljenje PKCS#7</comment> <comment xml:lang="sr">ПКЦС#7 порука или уверење</comment> @@ -1355,7 +1431,7 @@ <comment xml:lang="ca">signatura S/MIME abstreta</comment> <comment xml:lang="cs">oddělený podpis S/MIME</comment> <comment xml:lang="da">frigjort S/MIME-signatur</comment> - <comment xml:lang="de">Isolierte S/MIME-Signatur</comment> + <comment xml:lang="de">isolierte S/MIME-Signatur</comment> <comment xml:lang="el">Αποκομμένη υπογραφή S/MIME</comment> <comment xml:lang="en_GB">detached S/MIME signature</comment> <comment xml:lang="eo">dekroĉa S/MIME-subskribo</comment> @@ -1367,7 +1443,7 @@ <comment xml:lang="ga">síniú S/MIME scartha</comment> <comment xml:lang="gl">sinatura S/MIME independente</comment> <comment xml:lang="he">חתימת S/MIME מנותקת</comment> - <comment xml:lang="hr">odvojen S/MIME potpis</comment> + <comment xml:lang="hr">Odvojen S/MIME potpis</comment> <comment xml:lang="hu">leválasztott S/MIME-aláírás</comment> <comment xml:lang="ia">Signatura S/MIME distachate</comment> <comment xml:lang="id">tanda tangan S/MIME yang terlepas</comment> @@ -1386,7 +1462,7 @@ <comment xml:lang="pt">assinatura S/MIME solta</comment> <comment xml:lang="pt_BR">Assinatura S/MIME destacada</comment> <comment xml:lang="ro">semnătură S/MIME detașată</comment> - <comment xml:lang="ru">отсоединённая подпись S/MIME</comment> + <comment xml:lang="ru">Отсоединённая подпись S/MIME</comment> <comment xml:lang="sk">Oddelený podpis S/MIME</comment> <comment xml:lang="sl">odpet podpis S/MIME</comment> <comment xml:lang="sq">Firmë e shkëputur S/MIME</comment> @@ -1437,7 +1513,7 @@ <comment xml:lang="pt">chave privada PKCS#8</comment> <comment xml:lang="pt_BR">Chave privada PKCS#8</comment> <comment xml:lang="ro">Cheie privată PKCS#8</comment> - <comment xml:lang="ru">личный ключ PKCS#8</comment> + <comment xml:lang="ru">Личный ключ PKCS#8</comment> <comment xml:lang="sk">Súkromný kľúč PKCS#8</comment> <comment xml:lang="sl">Datoteka osebnega ključa PKCS#8</comment> <comment xml:lang="sr">ПКЦС#8 лични кључ</comment> @@ -1450,6 +1526,12 @@ <expanded-acronym>Public-Key Cryptography Standards</expanded-acronym> <glob pattern="*.p8"/> </mime-type> + <mime-type type="application/pkcs8-encrypted"> + <comment>PKCS#8 private key (encrypted)</comment> + <acronym>PKCS</acronym> + <expanded-acronym>Public-Key Cryptography Standards</expanded-acronym> + <glob pattern="*.p8e"/> + </mime-type> <mime-type type="application/pkcs10"> <comment>PKCS#10 certification request</comment> <comment xml:lang="ar">طلب شهادة PKCS#10</comment> @@ -1487,7 +1569,7 @@ <comment xml:lang="pt">pedido de certificação PKCS#10</comment> <comment xml:lang="pt_BR">Pedido de certificação PKCS#12</comment> <comment xml:lang="ro">Cerere de certificat PKCS#10</comment> - <comment xml:lang="ru">запрос сертификации PKCS#10</comment> + <comment xml:lang="ru">Запрос сертификации PKCS#10</comment> <comment xml:lang="sk">Požiadavka na certifikát PKCS#10</comment> <comment xml:lang="sl">Datoteka potrdila PKCS#10</comment> <comment xml:lang="sq">Kërkesë çertifikimi PKCS#10</comment> @@ -1506,6 +1588,7 @@ <mime-type type="application/pkix-cert"> <comment>X.509 certificate</comment> <comment xml:lang="ar">شهادة X.509</comment> + <comment xml:lang="ast">Certificáu X.509</comment> <comment xml:lang="bg">Сертификат — X.509</comment> <comment xml:lang="ca">certificat X.509</comment> <comment xml:lang="cs">certifikát X.509</comment> @@ -1521,7 +1604,7 @@ <comment xml:lang="ga">teastas X.509</comment> <comment xml:lang="gl">Certificado X.509</comment> <comment xml:lang="he">אישור X.509</comment> - <comment xml:lang="hr">X.509 certifikat</comment> + <comment xml:lang="hr">X.509 vjerodajnica</comment> <comment xml:lang="hu">X.509 tanúsítvány</comment> <comment xml:lang="ia">Certificato X.509</comment> <comment xml:lang="id">Sertifikat X.509</comment> @@ -1537,7 +1620,7 @@ <comment xml:lang="pt">certificado X.509</comment> <comment xml:lang="pt_BR">Certificado X.509</comment> <comment xml:lang="ro">Certificat X.509</comment> - <comment xml:lang="ru">сертификат X.509</comment> + <comment xml:lang="ru">Сертификат X.509</comment> <comment xml:lang="sk">Certifikát X.509</comment> <comment xml:lang="sl">Datoteka potrdila X.509</comment> <comment xml:lang="sr">Икс.509 уверење</comment> @@ -1551,6 +1634,7 @@ <mime-type type="application/pkix-crl"> <comment>Certificate revocation list</comment> <comment xml:lang="ar">قائمة إبطال الشهادات</comment> + <comment xml:lang="ast">Llistáu de revocación de certificaos</comment> <comment xml:lang="bg">Списък с отхвърлени сертификати</comment> <comment xml:lang="ca">llista de revocació de certificats</comment> <comment xml:lang="cs">seznam odvolaných certifikátů</comment> @@ -1563,10 +1647,10 @@ <comment xml:lang="fi">Varmenteiden sulkulista</comment> <comment xml:lang="fo">Prógv afturtøkulisti</comment> <comment xml:lang="fr">liste de révocation de certificat</comment> - <comment xml:lang="ga">liosta teastas cúlghairmthe</comment> + <comment xml:lang="ga">Liosta teastas cúlghairmthe</comment> <comment xml:lang="gl">lista de certificados de revogación</comment> <comment xml:lang="he">רשימת אישורים מבוטלים</comment> - <comment xml:lang="hr">popis povučenih certifikata</comment> + <comment xml:lang="hr">Popis opozvanih vjerodajnica</comment> <comment xml:lang="hu">Tanúsítvány-visszavonási lista</comment> <comment xml:lang="ia">Lista de revocation de certificatos</comment> <comment xml:lang="id">Daftar pencabutan sertificat (CRL)</comment> @@ -1596,6 +1680,7 @@ <mime-type type="application/pkix-pkipath"> <comment>PkiPath certification path</comment> <comment xml:lang="ar">مسار شهادة PkiPath</comment> + <comment xml:lang="ast">Camín de certificación PkiPath</comment> <comment xml:lang="bg">Сертификационна верига — PkiPath</comment> <comment xml:lang="ca">camí cap a la certificació PkiPath</comment> <comment xml:lang="cs">cesta k certifikátu PkiPath</comment> @@ -1627,7 +1712,7 @@ <comment xml:lang="pt">caminho de certificação PkiPath</comment> <comment xml:lang="pt_BR">Pedido de certificação PkiPath</comment> <comment xml:lang="ro">Cale certificare PkiPath</comment> - <comment xml:lang="ru">путь сертификации PkiPath</comment> + <comment xml:lang="ru">Путь сертификации PkiPath</comment> <comment xml:lang="sk">Cesta k certifikátu PkiPath</comment> <comment xml:lang="sl">Datoteka poti potrdila PkiPath</comment> <comment xml:lang="sr">путања уверења ПкиПат-а</comment> @@ -1642,6 +1727,7 @@ <mime-type type="application/postscript"> <comment>PS document</comment> <comment xml:lang="ar">مستند PS</comment> + <comment xml:lang="ast">Documentu PS</comment> <comment xml:lang="be@latin">Dakument PS</comment> <comment xml:lang="bg">Документ — PS</comment> <comment xml:lang="ca">document PS</comment> @@ -1677,7 +1763,7 @@ <comment xml:lang="pt">documento PS</comment> <comment xml:lang="pt_BR">Documento PS</comment> <comment xml:lang="ro">Document PS</comment> - <comment xml:lang="ru">документ PS</comment> + <comment xml:lang="ru">Документ PS</comment> <comment xml:lang="sk">Dokument PS</comment> <comment xml:lang="sl">Dokument PS</comment> <comment xml:lang="sq">Dokument PS</comment> @@ -1701,6 +1787,7 @@ <mime-type type="application/prs.plucker"> <comment>Plucker document</comment> <comment xml:lang="ar">مستند Plucker</comment> + <comment xml:lang="ast">Documentu Plucker</comment> <comment xml:lang="be@latin">Dakument Plucker</comment> <comment xml:lang="bg">Документ — Plucker</comment> <comment xml:lang="ca">document Plucker</comment> @@ -1736,7 +1823,7 @@ <comment xml:lang="pt">documento Plucker</comment> <comment xml:lang="pt_BR">Documento do Plucker</comment> <comment xml:lang="ro">Document Plucker</comment> - <comment xml:lang="ru">документ Plucker</comment> + <comment xml:lang="ru">Документ Plucker</comment> <comment xml:lang="sk">Dokument Plucker</comment> <comment xml:lang="sl">Dokument Plucker</comment> <comment xml:lang="sq">Dokument Plucker</comment> @@ -1754,20 +1841,32 @@ </mime-type> <mime-type type="application/raml+yaml"> <comment>RAML document</comment> + <comment xml:lang="ast">Documentu RAML</comment> <comment xml:lang="ca">document RAML</comment> + <comment xml:lang="cs">dokument RAML</comment> <comment xml:lang="da">RAML-dokument</comment> <comment xml:lang="de">RAML-Dokument</comment> + <comment xml:lang="en_GB">RAML document</comment> <comment xml:lang="es">documento RAML</comment> + <comment xml:lang="eu">RAML dokumentua</comment> <comment xml:lang="fi">RAML-asiakirja</comment> <comment xml:lang="fr">document RAML</comment> + <comment xml:lang="ga">cáipéis RAML</comment> <comment xml:lang="he">מסמך RAML</comment> + <comment xml:lang="hr">RAML dokument</comment> <comment xml:lang="hu">RAML dokumentum</comment> + <comment xml:lang="id">dokumen RAML</comment> + <comment xml:lang="it">Documento RAML</comment> <comment xml:lang="kk">RAML құжаты</comment> <comment xml:lang="ko">RAML 문서</comment> + <comment xml:lang="oc">Document RAML</comment> <comment xml:lang="pl">Dokument RAML</comment> <comment xml:lang="pt_BR">Documento RAML</comment> - <comment xml:lang="ru">документ RAML</comment> + <comment xml:lang="ru">Документ RAML</comment> <comment xml:lang="sk">Dokument RAML</comment> + <comment xml:lang="sr">РАМЛ документ</comment> + <comment xml:lang="sv">RAML-dokument</comment> + <comment xml:lang="tr">RAML belgesi</comment> <comment xml:lang="uk">документ RAML</comment> <comment xml:lang="zh_CN">RAML 文档</comment> <comment xml:lang="zh_TW">RAML 文件</comment> @@ -1831,6 +1930,7 @@ <mime-type type="application/rtf"> <comment>RTF document</comment> <comment xml:lang="ar">مستند RTF</comment> + <comment xml:lang="ast">Documentu RTF</comment> <comment xml:lang="be@latin">Dakument RTF</comment> <comment xml:lang="bg">Документ — RTF</comment> <comment xml:lang="ca">document RTF</comment> @@ -1866,7 +1966,7 @@ <comment xml:lang="pt">documento RTF</comment> <comment xml:lang="pt_BR">Documento RTF</comment> <comment xml:lang="ro">Document RTF</comment> - <comment xml:lang="ru">документ RTF</comment> + <comment xml:lang="ru">Документ RTF</comment> <comment xml:lang="sk">Dokument RTF</comment> <comment xml:lang="sl">Dokument RTF</comment> <comment xml:lang="sq">Dokument RTF</comment> @@ -1902,7 +2002,7 @@ <comment xml:lang="eu">Sieve posta-iragazki script-a</comment> <comment xml:lang="fi">Sieve-postinsuodatuskomentotiedosto</comment> <comment xml:lang="fr">script de filtrage de courriel Sieve</comment> - <comment xml:lang="ga">script scagaire phost Sieve</comment> + <comment xml:lang="ga">script scagaire r-phost Sieve</comment> <comment xml:lang="gl">Script de filtro de correo Sieve</comment> <comment xml:lang="he">תסריט סינון דואר של Sieve</comment> <comment xml:lang="hr">Sieve skripta filtriranja pošte</comment> @@ -1923,7 +2023,7 @@ <comment xml:lang="pt">Script de filtragem de correio Sieve</comment> <comment xml:lang="pt_BR">Script de filtro de mensagens do Sieve</comment> <comment xml:lang="ro">Script filtrare email Sieve</comment> - <comment xml:lang="ru">сценарий почтового фильтра Sieve</comment> + <comment xml:lang="ru">Сценарий почтового фильтра Sieve</comment> <comment xml:lang="sk">Skript poštového filtra Sieve</comment> <comment xml:lang="sl">Skriptna datoteka Sieve poštnega filtra</comment> <comment xml:lang="sq">Script filtrim poste Sieve</comment> @@ -1941,6 +2041,7 @@ <mime-type type="application/smil+xml"> <comment>SMIL document</comment> <comment xml:lang="ar">مستند SMIL</comment> + <comment xml:lang="ast">Documentu SMIL</comment> <comment xml:lang="be@latin">Dakument SMIL</comment> <comment xml:lang="bg">Документ — SMIL</comment> <comment xml:lang="ca">document SMIL</comment> @@ -1976,7 +2077,7 @@ <comment xml:lang="pt">documento SMIL</comment> <comment xml:lang="pt_BR">Documento SMIL</comment> <comment xml:lang="ro">Document SMIL</comment> - <comment xml:lang="ru">документ SMIL</comment> + <comment xml:lang="ru">Документ SMIL</comment> <comment xml:lang="sk">Dokument SMIL</comment> <comment xml:lang="sl">Dokument SMIL</comment> <comment xml:lang="sq">Dokument SMIL</comment> @@ -2022,7 +2123,7 @@ <comment xml:lang="ga">seinmliosta WPL</comment> <comment xml:lang="gl">lista de reprodución WPL</comment> <comment xml:lang="he">רשימת נגינה WPL</comment> - <comment xml:lang="hr">WPL popis za reprodukciju</comment> + <comment xml:lang="hr">WPL popis izvođenja</comment> <comment xml:lang="hu">WPL-lejátszólista</comment> <comment xml:lang="ia">Lista de selection WPL</comment> <comment xml:lang="id">Senarai putar WPL</comment> @@ -2038,7 +2139,7 @@ <comment xml:lang="pt">lista de reprodução WPL</comment> <comment xml:lang="pt_BR">Lista de reprodução do WPL</comment> <comment xml:lang="ro">Listă redare WPL</comment> - <comment xml:lang="ru">список воспроизведения WPL</comment> + <comment xml:lang="ru">Список воспроизведения WPL</comment> <comment xml:lang="sk">Zoznam skladieb WPL</comment> <comment xml:lang="sl">Seznam predvajanja WPL</comment> <comment xml:lang="sr">ВПЛ списак нумера</comment> @@ -2094,7 +2195,7 @@ <comment xml:lang="pt">base de dados SQLite2</comment> <comment xml:lang="pt_BR">Banco de dados SQLite2</comment> <comment xml:lang="ro">Bază de date SQLite2</comment> - <comment xml:lang="ru">база данных SQLite2</comment> + <comment xml:lang="ru">База данных SQLite2</comment> <comment xml:lang="sk">Databáza SQLite2</comment> <comment xml:lang="sl">Podatkovna zbirka SQLite2</comment> <comment xml:lang="sq">Bazë me të dhëna SQLite2</comment> @@ -2105,11 +2206,12 @@ <comment xml:lang="vi">Cơ sở dữ liệu SQLite2</comment> <comment xml:lang="zh_CN">SQLite2 数据库</comment> <comment xml:lang="zh_TW">SQLite2 資料庫</comment> + <glob pattern="*.sqlite2"/> <magic> <match value="** This file contains an SQLite" type="string" offset="0"/> </magic> </mime-type> - <mime-type type="application/x-sqlite3"> + <mime-type type="application/vnd.sqlite3"> <comment>SQLite3 database</comment> <comment xml:lang="ar">قاعدة بيانات SQLite3</comment> <comment xml:lang="be@latin">Baza źviestak SQLite3</comment> @@ -2147,7 +2249,7 @@ <comment xml:lang="pt">base de dados SQLite3</comment> <comment xml:lang="pt_BR">Banco de dados SQLite3</comment> <comment xml:lang="ro">Bază de date SQLite3</comment> - <comment xml:lang="ru">база данных SQLite3</comment> + <comment xml:lang="ru">База данных SQLite3</comment> <comment xml:lang="sk">Databáza SQLite3</comment> <comment xml:lang="sl">Podatkovna zbirka SQLite3</comment> <comment xml:lang="sq">Bazë me të dhëna SQLite3</comment> @@ -2158,9 +2260,11 @@ <comment xml:lang="vi">Cơ sở dữ liệu SQLite3</comment> <comment xml:lang="zh_CN">SQLite3 数据库</comment> <comment xml:lang="zh_TW">SQLite3 資料庫</comment> + <glob pattern="*.sqlite3"/> <magic> <match value="SQLite format 3" type="string" offset="0"/> </magic> + <alias type="application/x-sqlite3"/> </mime-type> <mime-type type="application/x-gedcom"> <comment>GEDCOM family history</comment> @@ -2189,7 +2293,7 @@ <comment xml:lang="ja">GEDCOM 家系図データ</comment> <comment xml:lang="ka">GEDCOM ოჯახის ისტორია</comment> <comment xml:lang="kk">GEDCOM отбасы тарихы</comment> - <comment xml:lang="ko">GEDCOM 가족 내력</comment> + <comment xml:lang="ko">GEDCOM 패밀리 기록</comment> <comment xml:lang="lt">GEDCOM šeimos istorija</comment> <comment xml:lang="lv">GEDCOM ģimenes vēsture</comment> <comment xml:lang="nb">GEDCOM-familiehistorikk</comment> @@ -2200,7 +2304,7 @@ <comment xml:lang="pt">história familiar GEDCOM</comment> <comment xml:lang="pt_BR">Histórico familiar do GEDCOM</comment> <comment xml:lang="ro">Tablou genealogic GEDCOM</comment> - <comment xml:lang="ru">история семьи GEDCOM</comment> + <comment xml:lang="ru">История семьи GEDCOM</comment> <comment xml:lang="sk">Rodokmeň GEDCOM</comment> <comment xml:lang="sl">Datoteka družinske zgodovine GEDCOM</comment> <comment xml:lang="sq">Kronollogji familje GEDCOM</comment> @@ -2224,6 +2328,7 @@ <mime-type type="video/x-flv"> <comment>Flash video</comment> <comment xml:lang="ar">Flash مرئي</comment> + <comment xml:lang="ast">Videu en Flash</comment> <comment xml:lang="be@latin">Videa Flash</comment> <comment xml:lang="bg">Видео — Flash</comment> <comment xml:lang="ca">vídeo de Flash</comment> @@ -2241,7 +2346,7 @@ <comment xml:lang="ga">físeán Flash</comment> <comment xml:lang="gl">vídeo Flash</comment> <comment xml:lang="he">וידאו של פלאש</comment> - <comment xml:lang="hr">Flash video</comment> + <comment xml:lang="hr">Flash video snimka</comment> <comment xml:lang="hu">Flash videó</comment> <comment xml:lang="ia">Video Flash</comment> <comment xml:lang="id">Video Flash</comment> @@ -2260,7 +2365,7 @@ <comment xml:lang="pt">vídeo Flash</comment> <comment xml:lang="pt_BR">Vídeo Flash</comment> <comment xml:lang="ro">Video Flash</comment> - <comment xml:lang="ru">видео Flash</comment> + <comment xml:lang="ru">Видео Flash</comment> <comment xml:lang="sk">Video Flash</comment> <comment xml:lang="sl">Video datoteka Flash</comment> <comment xml:lang="sq">Video Flash</comment> @@ -2269,7 +2374,7 @@ <comment xml:lang="tr">Flash video</comment> <comment xml:lang="uk">відеокліп Flash</comment> <comment xml:lang="vi">Ảnh động Flash</comment> - <comment xml:lang="zh_CN">Flash 影片</comment> + <comment xml:lang="zh_CN">Flash 视频</comment> <comment xml:lang="zh_TW">Flash 視訊</comment> <generic-icon name="video-x-generic"/> <magic priority="50"> @@ -2282,6 +2387,7 @@ </mime-type> <mime-type type="video/x-javafx"> <comment>JavaFX video</comment> + <comment xml:lang="ast">Videu en JavaFX</comment> <comment xml:lang="bg">Видео — JavaFX</comment> <comment xml:lang="ca">vídeo de JavaFX</comment> <comment xml:lang="cs">video JavaFX</comment> @@ -2298,7 +2404,7 @@ <comment xml:lang="ga">físeán JavaFX</comment> <comment xml:lang="gl">vídeo JavaFX</comment> <comment xml:lang="he">וידאו JavaFX</comment> - <comment xml:lang="hr">JavaFX video</comment> + <comment xml:lang="hr">JavaFX video snimka</comment> <comment xml:lang="hu">JavaFX videó</comment> <comment xml:lang="ia">Video JavaFX</comment> <comment xml:lang="id">Video JavaFX</comment> @@ -2313,7 +2419,7 @@ <comment xml:lang="pt">vídeo JavaFX</comment> <comment xml:lang="pt_BR">Vídeo JavaFX</comment> <comment xml:lang="ro">Video JavaFX</comment> - <comment xml:lang="ru">видео JavaFX</comment> + <comment xml:lang="ru">Видео JavaFX</comment> <comment xml:lang="sk">Video JavaFX</comment> <comment xml:lang="sl">Video JavaFX</comment> <comment xml:lang="sr">ЈаваФИкс видео</comment> @@ -2367,7 +2473,7 @@ <comment xml:lang="pt">gravação SGF</comment> <comment xml:lang="pt_BR">Gravação SGF</comment> <comment xml:lang="ro">Înregistrare SGF</comment> - <comment xml:lang="ru">запись SGF</comment> + <comment xml:lang="ru">Запись SGF</comment> <comment xml:lang="sk">Záznam SGF</comment> <comment xml:lang="sl">Datoteka shranjene igre SGF</comment> <comment xml:lang="sq">Regjistrim SGF</comment> @@ -2388,9 +2494,10 @@ <match value="(;FF[4]" type="string" offset="0"/> </magic> </mime-type> - <mime-type type="application/x-xliff"> + <mime-type type="application/xliff+xml"> <comment>XLIFF translation file</comment> <comment xml:lang="ar">ملف ترجمة XLIFF</comment> + <comment xml:lang="ast">Ficheru de traducciones XLIFF</comment> <comment xml:lang="be@latin">Fajł pierakładu XLIFF</comment> <comment xml:lang="bg">Превод — XLIFF</comment> <comment xml:lang="ca">fitxer de traducció XLIFF</comment> @@ -2404,7 +2511,7 @@ <comment xml:lang="fi">XLIFF-käännöstiedosto</comment> <comment xml:lang="fo">XLIFF týðingarfíla</comment> <comment xml:lang="fr">fichier de traduction XLIFF</comment> - <comment xml:lang="ga">comhad aistrithe XLIFF</comment> + <comment xml:lang="ga">comhad aistriúcháin XLIFF</comment> <comment xml:lang="gl">ficheiro de tradución XLIFF</comment> <comment xml:lang="he">קובץ תרגום CLIFF</comment> <comment xml:lang="hr">XLIFF datoteka prijevoda</comment> @@ -2425,7 +2532,7 @@ <comment xml:lang="pt">ficheiro de tradução XLIFF</comment> <comment xml:lang="pt_BR">Arquivo de tradução XLIFF</comment> <comment xml:lang="ro">Fișier de traducere XLIFF</comment> - <comment xml:lang="ru">файл перевода XLIFF</comment> + <comment xml:lang="ru">Файл перевода XLIFF</comment> <comment xml:lang="sk">Súbor prekladu XLIFF</comment> <comment xml:lang="sl">Datoteka prevoda XLIFF</comment> <comment xml:lang="sq">File përkthimesh XLIFF</comment> @@ -2434,7 +2541,7 @@ <comment xml:lang="tr">XLIFF çeviri dosyası</comment> <comment xml:lang="uk">файл перекладу XLIFF</comment> <comment xml:lang="vi">Tập tin dịch XLIFF</comment> - <comment xml:lang="zh_CN">XLIFF 消息翻译文件</comment> + <comment xml:lang="zh_CN">XLIFF 翻译文件</comment> <comment xml:lang="zh_TW">XLIFF 翻譯檔</comment> <acronym>XLIFF</acronym> <expanded-acronym>XML Localization Interchange File Format</expanded-acronym> @@ -2446,10 +2553,12 @@ <match value="<xliff" type="string" offset="0:256"/> </magic> <root-XML namespaceURI='urn:oasis:names:tc:xliff:document:1.1' localName='xliff'/> + <alias type="application/x-xliff"/> </mime-type> <mime-type type="application/x-yaml"> <comment>YAML document</comment> <comment xml:lang="ar">مستند YAML</comment> + <comment xml:lang="ast">Documentu YAML</comment> <comment xml:lang="bg">Документ — YAML</comment> <comment xml:lang="ca">document YAML</comment> <comment xml:lang="cs">dokument YAML</comment> @@ -2482,7 +2591,7 @@ <comment xml:lang="pt">documento YAML</comment> <comment xml:lang="pt_BR">Documento YAML</comment> <comment xml:lang="ro">Document YAML</comment> - <comment xml:lang="ru">документ YAML</comment> + <comment xml:lang="ru">Документ YAML</comment> <comment xml:lang="sk">Dokument YAML</comment> <comment xml:lang="sl">Dokument YAML</comment> <comment xml:lang="sr">ЈАМЛ документ</comment> @@ -2506,6 +2615,7 @@ <mime-type type="application/vnd.corel-draw"> <comment>Corel Draw drawing</comment> <comment xml:lang="ar">تصميم Corel Draw</comment> + <comment xml:lang="ast">Dibuxu de Corel Draw</comment> <comment xml:lang="az">Corel Draw çəkimi</comment> <comment xml:lang="be@latin">Rysunak Corel Draw</comment> <comment xml:lang="bg">Чертеж — Corel Draw</comment> @@ -2533,7 +2643,7 @@ <comment xml:lang="ja">Corel Draw ドロー</comment> <comment xml:lang="ka">Corel Draw-ის ნახაზი</comment> <comment xml:lang="kk">Corel Draw суреті</comment> - <comment xml:lang="ko">Corel Draw 드로잉</comment> + <comment xml:lang="ko">코렐 드로우 드로잉</comment> <comment xml:lang="lt">Corel Draw piešinys</comment> <comment xml:lang="lv">Corel Draw zīmējums</comment> <comment xml:lang="ms">Lukisan Corel Draw</comment> @@ -2545,16 +2655,16 @@ <comment xml:lang="pt">desenho Corel Drawdesenho Corel Draw</comment> <comment xml:lang="pt_BR">Desenho do Corel Draw</comment> <comment xml:lang="ro">Desen Corel Draw</comment> - <comment xml:lang="ru">изображение Corel Draw</comment> + <comment xml:lang="ru">Рисунок Corel Draw</comment> <comment xml:lang="sk">Kresba Corel Draw</comment> <comment xml:lang="sl">Datoteka risbe Corel Draw</comment> <comment xml:lang="sq">Vizatim Corel Draw</comment> - <comment xml:lang="sr">Корел Дров цртеж</comment> + <comment xml:lang="sr">Корелов цртеж</comment> <comment xml:lang="sv">Corel Draw-teckning</comment> <comment xml:lang="tr">Corel Draw çizimi</comment> <comment xml:lang="uk">малюнок Corel Draw</comment> <comment xml:lang="vi">Bản vẽ Corel Draw</comment> - <comment xml:lang="zh_CN">Corel Draw 图形</comment> + <comment xml:lang="zh_CN">Corel Draw 绘图</comment> <comment xml:lang="zh_TW">Corel Draw 繪圖</comment> <generic-icon name="image-x-generic"/> <magic priority="80"> @@ -2572,6 +2682,7 @@ <mime-type type="application/vnd.hp-hpgl"> <comment>HPGL file</comment> <comment xml:lang="ar">ملف HPGL</comment> + <comment xml:lang="ast">Ficheru HPGL</comment> <comment xml:lang="be@latin">Fajł HPGL</comment> <comment xml:lang="bg">Файл — HPGL</comment> <comment xml:lang="ca">fitxer HPGL</comment> @@ -2607,7 +2718,7 @@ <comment xml:lang="pt">ficheiro HPGL</comment> <comment xml:lang="pt_BR">Arquivo HPGL</comment> <comment xml:lang="ro">Fișier HPGL</comment> - <comment xml:lang="ru">файл HPGL</comment> + <comment xml:lang="ru">Файл HPGL</comment> <comment xml:lang="sk">Súbor HPGL</comment> <comment xml:lang="sl">Datoteka HPGL</comment> <comment xml:lang="sq">File HPGL</comment> @@ -2626,6 +2737,7 @@ <mime-type type="application/vnd.hp-pcl"> <comment>PCL file</comment> <comment xml:lang="ar">ملف PCL</comment> + <comment xml:lang="ast">FIcheru PCL</comment> <comment xml:lang="be@latin">Fajł PCL</comment> <comment xml:lang="bg">Файл — PCL</comment> <comment xml:lang="ca">fitxer PCL</comment> @@ -2661,7 +2773,7 @@ <comment xml:lang="pt">ficheiro PCL</comment> <comment xml:lang="pt_BR">Arquivo PCL</comment> <comment xml:lang="ro">Fișier PCL</comment> - <comment xml:lang="ru">файл PCL</comment> + <comment xml:lang="ru">Файл PCL</comment> <comment xml:lang="sk">Súbor PCL</comment> <comment xml:lang="sl">Datoteka PCL</comment> <comment xml:lang="sq">File PCL</comment> @@ -2680,6 +2792,7 @@ <mime-type type="application/vnd.lotus-1-2-3"> <comment>Lotus 1-2-3 spreadsheet</comment> <comment xml:lang="ar">جدول Lotus 1-2-3</comment> + <comment xml:lang="ast">Fueya de cálculu de Lotus 1-2-3</comment> <comment xml:lang="az">Lotus 1-2-3 hesab cədvəli</comment> <comment xml:lang="be@latin">Raźlikovy arkuš Lotus 1-2-3</comment> <comment xml:lang="bg">Таблица — Lotus 1-2-3</comment> @@ -2718,7 +2831,7 @@ <comment xml:lang="pt">folha de cálculo Lotus 1-2-3</comment> <comment xml:lang="pt_BR">Planilha do Lotus 1-2-3</comment> <comment xml:lang="ro">Foaie de calcul Lotus 1-2-3</comment> - <comment xml:lang="ru">электронная таблица Lotus 1-2-3</comment> + <comment xml:lang="ru">Электронная таблица Lotus 1-2-3</comment> <comment xml:lang="sk">Zošit Lotus 1-2-3</comment> <comment xml:lang="sl">Preglednica Lotus 1-2-3</comment> <comment xml:lang="sq">Fletë llogaritjesh Lotus 1-2-3</comment> @@ -2727,7 +2840,7 @@ <comment xml:lang="tr">Lotus 1-2-3 hesap tablosu</comment> <comment xml:lang="uk">ел. таблиця Lotus 1-2-3</comment> <comment xml:lang="vi">Bảng tính Lotus 1-2-3</comment> - <comment xml:lang="zh_CN">Lotus 1-2-3 工作簿</comment> + <comment xml:lang="zh_CN">Lotus 1-2-3 电子表格</comment> <comment xml:lang="zh_TW">Lotus 1-2-3 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -2746,6 +2859,7 @@ </mime-type> <mime-type type="application/vnd.lotus-wordpro"> <comment>Lotus Word Pro</comment> + <comment xml:lang="ast">Lotus Word Pro</comment> <comment xml:lang="ca">Lotus Word Pro</comment> <comment xml:lang="cs">Lotus Word Pro</comment> <comment xml:lang="da">Lotus Word Pro</comment> @@ -2756,6 +2870,7 @@ <comment xml:lang="eu">Lotus Word Pro</comment> <comment xml:lang="fi">Lotus Word Pro</comment> <comment xml:lang="fr">Lotus Word Pro</comment> + <comment xml:lang="ga">Lotus Word Pro</comment> <comment xml:lang="gl">Lotus Word Pro</comment> <comment xml:lang="he">Lotus Word Pro</comment> <comment xml:lang="hr">Lotus Word Pro</comment> @@ -2789,6 +2904,7 @@ <mime-type type="application/vnd.ms-access"> <comment>JET database</comment> <comment xml:lang="ar">قاعدة بيانات JET</comment> + <comment xml:lang="ast">Base de datos JETº</comment> <comment xml:lang="be@latin">Baza źviestak JET</comment> <comment xml:lang="bg">База от данни — JET</comment> <comment xml:lang="ca">base de dades JET</comment> @@ -2824,7 +2940,7 @@ <comment xml:lang="pt">base de dados JET</comment> <comment xml:lang="pt_BR">Banco de dados JET</comment> <comment xml:lang="ro">Bază de date JET</comment> - <comment xml:lang="ru">база данных JET</comment> + <comment xml:lang="ru">База данных JET</comment> <comment xml:lang="sk">Databáza JET</comment> <comment xml:lang="sl">Podatkovna zbirka JET</comment> <comment xml:lang="sq">Bazë me të dhëna JET</comment> @@ -2885,7 +3001,7 @@ <comment xml:lang="pt">arquivo Microsoft Cabinet</comment> <comment xml:lang="pt_BR">Pacote Cabinet da Microsoft</comment> <comment xml:lang="ro">Arhivă Microsoft Cabinet</comment> - <comment xml:lang="ru">архив Microsoft Cabinet</comment> + <comment xml:lang="ru">Архив Microsoft Cabinet</comment> <comment xml:lang="sk">Archív Microsoft Cabinet</comment> <comment xml:lang="sl">Datoteka arhiva Microsoft Cabinet</comment> <comment xml:lang="sr">Мајкрософтова кабинет архива</comment> @@ -2893,7 +3009,7 @@ <comment xml:lang="tr">Microsoft Cabinet arşivi</comment> <comment xml:lang="uk">архів Cabinet Microsoft</comment> <comment xml:lang="vi">Kho lưu Cabinet Microsoft</comment> - <comment xml:lang="zh_CN">Microsoft CAB 归档文件</comment> + <comment xml:lang="zh_CN">Microsoft Cabinet 归档文件</comment> <comment xml:lang="zh_TW">微軟 Cabinet 封存檔</comment> <generic-icon name="package-x-generic"/> <magic priority="60"> @@ -2941,7 +3057,7 @@ <comment xml:lang="pt">folha de cálculo Excel</comment> <comment xml:lang="pt_BR">Planilha do Excel</comment> <comment xml:lang="ro">Foaie de calcul Excel</comment> - <comment xml:lang="ru">электронная таблица Excel</comment> + <comment xml:lang="ru">Электронная таблица Excel</comment> <comment xml:lang="sk">Zošit Excel</comment> <comment xml:lang="sl">Razpredelnica Microsoft Excel</comment> <comment xml:lang="sq">Fletë llogaritje Excel</comment> @@ -2950,7 +3066,7 @@ <comment xml:lang="tr">Excel çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Excel</comment> <comment xml:lang="vi">Bảng tính Excel</comment> - <comment xml:lang="zh_CN">Microsoft Excel 工作簿</comment> + <comment xml:lang="zh_CN">Excel 电子表格</comment> <comment xml:lang="zh_TW">Excel 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -2981,9 +3097,10 @@ <comment xml:lang="eu">Excel gehigarria</comment> <comment xml:lang="fi">Excel-lisäosa</comment> <comment xml:lang="fr">complément Excel</comment> + <comment xml:lang="ga">breiseán Excel</comment> <comment xml:lang="gl">complemento de Excel</comment> <comment xml:lang="he">תוסף של Excel</comment> - <comment xml:lang="hr">Excel priključak</comment> + <comment xml:lang="hr">Excel dodatak</comment> <comment xml:lang="hu">Excel bővítmény</comment> <comment xml:lang="ia">Add-in Excel</comment> <comment xml:lang="id">Add-in Excel</comment> @@ -2998,14 +3115,14 @@ <comment xml:lang="pl">Dodatek Excel</comment> <comment xml:lang="pt">Extensão Excel</comment> <comment xml:lang="pt_BR">Suplemento do Excel</comment> - <comment xml:lang="ru">дополнение Excel</comment> + <comment xml:lang="ru">Дополнение Excel</comment> <comment xml:lang="sk">Doplnok aplikácie Excel</comment> <comment xml:lang="sl">Vstavek Excel</comment> <comment xml:lang="sr">Екселов додатак</comment> <comment xml:lang="sv">Excel-tillägg</comment> <comment xml:lang="tr">Excel eklentisi</comment> <comment xml:lang="uk">додаток Excel</comment> - <comment xml:lang="zh_CN">Excel 附加组件</comment> + <comment xml:lang="zh_CN">Excel 外接程序</comment> <comment xml:lang="zh_TW">Excel 增益集</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xlam"/> @@ -3024,6 +3141,7 @@ <comment xml:lang="eu">Excel 2007 kalkulu-orri binarioa</comment> <comment xml:lang="fi">Excel 2007:n binaarinen taulukko</comment> <comment xml:lang="fr">feuille de calcul binaire Excel 2007</comment> + <comment xml:lang="ga">scarbhileog dhénártha Excel 2007</comment> <comment xml:lang="gl">ficheiro binario de folla de cálculo Excel 2007</comment> <comment xml:lang="he">גיליון נתונים בינרי של Excel 2007</comment> <comment xml:lang="hr">Excel 2007 binarna proračunska tablica</comment> @@ -3041,14 +3159,14 @@ <comment xml:lang="pl">Binarny arkusz Excel 2007</comment> <comment xml:lang="pt">folha de cálculo binária Excel 2007</comment> <comment xml:lang="pt_BR">Planilha binária do Excel 2007</comment> - <comment xml:lang="ru">двоичная электронная таблица Excel 2007</comment> + <comment xml:lang="ru">Двоичная электронная таблица Excel 2007</comment> <comment xml:lang="sk">Binárny zošit Excel 2007</comment> <comment xml:lang="sl">Binarna preglednica Excel 2007</comment> <comment xml:lang="sr">Ексел 2007 бинарна табела</comment> <comment xml:lang="sv">Binärt Excel 2007-kalkylblad</comment> <comment xml:lang="tr">Excel 2007 ikilik çalışma sayfası</comment> <comment xml:lang="uk">бінарна електронна таблиця Excel 2007</comment> - <comment xml:lang="zh_CN">Excel 2007 二进制工作表</comment> + <comment xml:lang="zh_CN">Excel 2007 二进制电子表格</comment> <comment xml:lang="zh_TW">Excel 2007 二進位試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xlsb"/> @@ -3093,7 +3211,7 @@ <comment xml:lang="pt">folha de cálculo Excel</comment> <comment xml:lang="pt_BR">Planilha do Excel</comment> <comment xml:lang="ro">Foaie de calcul Excel</comment> - <comment xml:lang="ru">электронная таблица Excel</comment> + <comment xml:lang="ru">Электронная таблица Excel</comment> <comment xml:lang="sk">Zošit Excel</comment> <comment xml:lang="sl">Razpredelnica Microsoft Excel</comment> <comment xml:lang="sq">Fletë llogaritje Excel</comment> @@ -3102,7 +3220,7 @@ <comment xml:lang="tr">Excel çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Excel</comment> <comment xml:lang="vi">Bảng tính Excel</comment> - <comment xml:lang="zh_CN">Microsoft Excel 工作簿</comment> + <comment xml:lang="zh_CN">Excel 电子表格</comment> <comment xml:lang="zh_TW">Excel 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xlsm"/> @@ -3120,6 +3238,7 @@ <comment xml:lang="eu">Excel kalkulu-orri txantiloia</comment> <comment xml:lang="fi">Excel-taulukkomalli</comment> <comment xml:lang="fr">modèle de feuille de calcul Excel</comment> + <comment xml:lang="ga">teimpléad scarbhileoige Excel</comment> <comment xml:lang="he">תבנית גיליון נתונים של Excel</comment> <comment xml:lang="hr">Predložak Excel proračunske tablice</comment> <comment xml:lang="hu">Excel munkafüzetsablon</comment> @@ -3127,18 +3246,18 @@ <comment xml:lang="id">Templat lembar kerja Excel</comment> <comment xml:lang="it">Modello foglio di calcolo Excel</comment> <comment xml:lang="kk">Excel кестесінің үлгісі</comment> - <comment xml:lang="ko">액셀 스프레드시트 양식</comment> + <comment xml:lang="ko">Excel 스프레드시트 서식</comment> <comment xml:lang="oc">Modèl de fuèlh de calcul Excel</comment> <comment xml:lang="pl">Szablon arkusza Excel</comment> <comment xml:lang="pt">modelo de folha de cálculo Excel</comment> <comment xml:lang="pt_BR">Modelo de planilha do Excel</comment> - <comment xml:lang="ru">шаблон таблицы Excel</comment> + <comment xml:lang="ru">Шаблон таблицы Excel</comment> <comment xml:lang="sk">Šablóna tabuľky aplikácie Excel</comment> - <comment xml:lang="sr">Шаблон табеле Ексела</comment> + <comment xml:lang="sr">Екселов шаблон табеле</comment> <comment xml:lang="sv">Excel-kalkylarksmall</comment> <comment xml:lang="tr">Excel hesap tablosu şablonu</comment> <comment xml:lang="uk">шаблон електронної таблиці Excel</comment> - <comment xml:lang="zh_CN">Microsoft Excel 工作簿模板</comment> + <comment xml:lang="zh_CN">Excel 电子表格模板</comment> <comment xml:lang="zh_TW">Excel 試算表範本</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.xltm"/> @@ -3182,16 +3301,16 @@ <comment xml:lang="pt">apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment> <comment xml:lang="ro">Prezentare PowerPoint</comment> - <comment xml:lang="ru">презентация PowerPoint</comment> + <comment xml:lang="ru">Презентация PowerPoint</comment> <comment xml:lang="sk">Prezentácia PowerPoint</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint</comment> <comment xml:lang="sq">Prezantim PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт презентација</comment> + <comment xml:lang="sr">Пауер поинт презентација</comment> <comment xml:lang="sv">PowerPoint-presentation</comment> <comment xml:lang="tr">PowerPoint sunumu</comment> <comment xml:lang="uk">презентація PowerPoint</comment> <comment xml:lang="vi">Trình diễn PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 簡報</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.ppz"/> @@ -3215,9 +3334,10 @@ <comment xml:lang="eu">PowerPoint gehigarria</comment> <comment xml:lang="fi">PowerPoint-lisäosa</comment> <comment xml:lang="fr">complément PowerPoint</comment> + <comment xml:lang="ga">breiseán PowerPoint</comment> <comment xml:lang="gl">complemento de PowerPoint</comment> <comment xml:lang="he">תוסף של PowerPoint</comment> - <comment xml:lang="hr">PowerPoint priključak</comment> + <comment xml:lang="hr">PowerPoint dodatak</comment> <comment xml:lang="hu">PowerPoint bővítmény</comment> <comment xml:lang="ia">Add-in PowerPoint</comment> <comment xml:lang="id">Add-in PowerPoint</comment> @@ -3232,14 +3352,14 @@ <comment xml:lang="pl">Dodatek PowerPoint</comment> <comment xml:lang="pt">extensão PowerPoint</comment> <comment xml:lang="pt_BR">Suplemento do PowerPoint</comment> - <comment xml:lang="ru">дополнение PowerPoint</comment> + <comment xml:lang="ru">Дополнение PowerPoint</comment> <comment xml:lang="sk">Doplnok aplikácie PowerPoint </comment> <comment xml:lang="sl">Vstavek PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт додатак</comment> + <comment xml:lang="sr">Пауер поинт додатак</comment> <comment xml:lang="sv">PowerPoint-tillägg</comment> <comment xml:lang="tr">PowerPoint eklentisi</comment> <comment xml:lang="uk">додаток PowerPoint</comment> - <comment xml:lang="zh_CN">PowerPoint 附加组件</comment> + <comment xml:lang="zh_CN">PowerPoint 外接程序</comment> <comment xml:lang="zh_TW">PowerPoint 增益集</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.ppam"/> @@ -3282,16 +3402,16 @@ <comment xml:lang="pt">apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment> <comment xml:lang="ro">Prezentare PowerPoint</comment> - <comment xml:lang="ru">презентация PowerPoint</comment> + <comment xml:lang="ru">Презентация PowerPoint</comment> <comment xml:lang="sk">Prezentácia PowerPoint</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint</comment> <comment xml:lang="sq">Prezantim PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт презентација</comment> + <comment xml:lang="sr">Пауер поинт презентација</comment> <comment xml:lang="sv">PowerPoint-presentation</comment> <comment xml:lang="tr">PowerPoint sunumu</comment> <comment xml:lang="uk">презентація PowerPoint</comment> <comment xml:lang="vi">Trình diễn PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 簡報</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.pptm"/> @@ -3299,6 +3419,7 @@ </mime-type> <mime-type type="application/vnd.ms-powerpoint.slide.macroEnabled.12"> <comment>PowerPoint slide</comment> + <comment xml:lang="ast">Diapositiva de PowerPoint</comment> <comment xml:lang="ca">dispositiva de PowerPoint</comment> <comment xml:lang="cs">promítání PowerPoint</comment> <comment xml:lang="da">PowerPoint-dias</comment> @@ -3309,6 +3430,7 @@ <comment xml:lang="eu">PowerPoint diapositiba</comment> <comment xml:lang="fi">PowerPoint-dia</comment> <comment xml:lang="fr">diapositive PowerPoint</comment> + <comment xml:lang="ga">sleamhnán PowerPoint</comment> <comment xml:lang="he">שקופית של PowerPoint</comment> <comment xml:lang="hr">PowerPoint prezentacija</comment> <comment xml:lang="hu">PowerPoint dia</comment> @@ -3321,13 +3443,13 @@ <comment xml:lang="pl">Slajd PowerPoint</comment> <comment xml:lang="pt">diapositivo PowerPoint</comment> <comment xml:lang="pt_BR">Slide do PowerPoint</comment> - <comment xml:lang="ru">слайд PowerPoint</comment> + <comment xml:lang="ru">Слайд PowerPoint</comment> <comment xml:lang="sk">Snímka aplikácie PowerPoint</comment> - <comment xml:lang="sr">Слајд Пауер Поинта</comment> + <comment xml:lang="sr">Пауер поинт слајд</comment> <comment xml:lang="sv">PowerPoint-bildspel</comment> <comment xml:lang="tr">PowerPoint sunusu</comment> <comment xml:lang="uk">слайд PowerPoint</comment> - <comment xml:lang="zh_CN">PowerPoint 文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 幻灯片</comment> <comment xml:lang="zh_TW">PowerPoint 投影片</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.sldm"/> @@ -3371,16 +3493,16 @@ <comment xml:lang="pt">apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint</comment> <comment xml:lang="ro">Prezentare PowerPoint</comment> - <comment xml:lang="ru">презентация PowerPoint</comment> + <comment xml:lang="ru">Презентация PowerPoint</comment> <comment xml:lang="sk">Prezentácia PowerPoint</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint</comment> <comment xml:lang="sq">Prezantim PowerPoint</comment> - <comment xml:lang="sr">Пауер Поинт презентација</comment> + <comment xml:lang="sr">Пауер поинт презентација</comment> <comment xml:lang="sv">PowerPoint-presentation</comment> <comment xml:lang="tr">PowerPoint sunumu</comment> <comment xml:lang="uk">презентація PowerPoint</comment> <comment xml:lang="vi">Trình diễn PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 簡報</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.ppsm"/> @@ -3388,6 +3510,7 @@ </mime-type> <mime-type type="application/vnd.ms-powerpoint.template.macroEnabled.12"> <comment>PowerPoint presentation template</comment> + <comment xml:lang="ast">Plantía de presentaciones de PowerPoint</comment> <comment xml:lang="ca">plantilla de presentació de PowerPoint</comment> <comment xml:lang="cs">šablona prezentace PowerPoint</comment> <comment xml:lang="da">PowerPoint-præsentationsskabelon</comment> @@ -3398,6 +3521,7 @@ <comment xml:lang="eu">PowerPoint aurkezpen txantiloia</comment> <comment xml:lang="fi">PowerPoint-esitysmalli</comment> <comment xml:lang="fr">modèle de présentation PowerPoint</comment> + <comment xml:lang="ga">teimpléad láithreoireachta PowerPoint</comment> <comment xml:lang="he">תבנית מצגת PowerPoint</comment> <comment xml:lang="hr">Predložak PowerPoint prezentacije</comment> <comment xml:lang="hu">PowerPoint bemutatósablon</comment> @@ -3405,18 +3529,18 @@ <comment xml:lang="id">Templat presentasi PowerPoint</comment> <comment xml:lang="it">Modello presentazione PowerPoint</comment> <comment xml:lang="kk">PowerPoint презентация үлгісі</comment> - <comment xml:lang="ko">파워포인드 프리젠테이션 양식</comment> + <comment xml:lang="ko">PowerPoint 프리젠테이션 서식</comment> <comment xml:lang="oc">Modèl de presentacion PowerPoint</comment> <comment xml:lang="pl">Szablon prezentacji PowerPoint</comment> <comment xml:lang="pt">modelo de apresentação PowerPoint</comment> <comment xml:lang="pt_BR">Modelo de apresentação do PowerPoint</comment> - <comment xml:lang="ru">шаблон презентации PowerPoint</comment> + <comment xml:lang="ru">Шаблон презентации PowerPoint</comment> <comment xml:lang="sk">Šablóna prezentácie aplikácie PowerPoint</comment> - <comment xml:lang="sr">Шаблон презентације Пауер Поинта</comment> + <comment xml:lang="sr">Шаблон презентације Пауер поинта</comment> <comment xml:lang="sv">PowerPoint-presentationsmall</comment> <comment xml:lang="tr">PowerPoint sunum şablonu</comment> <comment xml:lang="uk">шаблон презентації PowerPoint</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 演示文稿模板</comment> + <comment xml:lang="zh_CN">PowerPoint 演示文稿模板</comment> <comment xml:lang="zh_TW">PowerPoint 簡報範本</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.potm"/> @@ -3434,6 +3558,7 @@ <comment xml:lang="eu">Office Open XML Visio marrazkia</comment> <comment xml:lang="fi">Office Open XML Visio -piirros</comment> <comment xml:lang="fr">dessin Visio Office Open XML</comment> + <comment xml:lang="ga">Líníocht Office Open XML Visio</comment> <comment xml:lang="he">ציור Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio crtež</comment> <comment xml:lang="hu">Office Open XML Visio rajz</comment> @@ -3445,13 +3570,13 @@ <comment xml:lang="pl">Rysunek Office Open XML Visio</comment> <comment xml:lang="pt">desenho Office Open XML Visio</comment> <comment xml:lang="pt_BR">Desenho do Visio em Office Open XML</comment> - <comment xml:lang="ru">схема Visio формата Office Open XML</comment> + <comment xml:lang="ru">Рисунок Visio формата Office Open XML</comment> <comment xml:lang="sk">Kresba aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио цртање</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио цртеж</comment> <comment xml:lang="sv">Office Open XML Visio-teckning</comment> <comment xml:lang="tr">Office Open XML Visio Çizimi</comment> <comment xml:lang="uk">схема VIisio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 绘图</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 绘图</comment> <comment xml:lang="zh_TW">Office Open XML Visio 繪圖</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vsdx"/> @@ -3469,6 +3594,7 @@ <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -malli</comment> <comment xml:lang="fr">modèle Visio Office Open XML</comment> + <comment xml:lang="ga">Teimpléad Office Open XML Visio</comment> <comment xml:lang="he">תבנית Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Predložak Office Open XML Visio</comment> <comment xml:lang="hu">Office Open XML Visio sablon</comment> @@ -3476,17 +3602,17 @@ <comment xml:lang="id">Templat Visio Office Open XML</comment> <comment xml:lang="it">Modello Visio Office Open XML</comment> <comment xml:lang="kk">Office Open XML Visio үлгісі</comment> - <comment xml:lang="ko">오피스 오픈 XML 비지오 양식</comment> + <comment xml:lang="ko">오피스 오픈 XML 비지오 서식</comment> <comment xml:lang="pl">Szablon Office Open XML Visio</comment> <comment xml:lang="pt">modelo Office Open XML Visio</comment> <comment xml:lang="pt_BR">Modelo do Visio em Office Open XML</comment> - <comment xml:lang="ru">шаблон Visio формата Office Open XML</comment> + <comment xml:lang="ru">Шаблон Visio формата Office Open XML</comment> <comment xml:lang="sk">Šablóna aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-mall</comment> <comment xml:lang="tr">Office Open XML Visio Şablonu</comment> <comment xml:lang="uk">шаблон Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模板</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模板</comment> <comment xml:lang="zh_TW">Office Open XML Visio 範本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vstx"/> @@ -3500,8 +3626,10 @@ <comment xml:lang="de">Office-Open-XML-Visio-Schablone</comment> <comment xml:lang="en_GB">Office Open XML Visio Stencil</comment> <comment xml:lang="es">esténcil en OOXML de Visio</comment> + <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -kaavio</comment> <comment xml:lang="fr">stencil Visio Office Open XML</comment> + <comment xml:lang="ga">Stionsal Office Open XML Visio</comment> <comment xml:lang="he">דגם ל־Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio šablona</comment> <comment xml:lang="hu">Office Open XML Visio stencil</comment> @@ -3513,13 +3641,13 @@ <comment xml:lang="pl">Wzór Office Open XML Visio</comment> <comment xml:lang="pt">Stencil Office Open XML Visio</comment> <comment xml:lang="pt_BR">Estêncil do Visio em Office Open XML</comment> - <comment xml:lang="ru">трафарет Visio формата Office Open XML</comment> + <comment xml:lang="ru">Трафарет Visio формата Office Open XML</comment> <comment xml:lang="sk">Objekt aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-stencil</comment> <comment xml:lang="tr">Office Open XML Visio Kalıbı</comment> <comment xml:lang="uk">трафарет Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模具</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模具</comment> <comment xml:lang="zh_TW">Office Open XML Visio 圖形樣本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vssx"/> @@ -3537,6 +3665,7 @@ <comment xml:lang="eu">Office Open XML Visio marrazkia</comment> <comment xml:lang="fi">Office Open XML Visio -piirros</comment> <comment xml:lang="fr">dessin Visio Office Open XML</comment> + <comment xml:lang="ga">Líníocht Office Open XML Visio</comment> <comment xml:lang="he">ציור Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio crtež</comment> <comment xml:lang="hu">Office Open XML Visio rajz</comment> @@ -3548,13 +3677,13 @@ <comment xml:lang="pl">Rysunek Office Open XML Visio</comment> <comment xml:lang="pt">desenho Office Open XML Visio</comment> <comment xml:lang="pt_BR">Desenho do Visio em Office Open XML</comment> - <comment xml:lang="ru">схема Visio формата Office Open XML</comment> + <comment xml:lang="ru">Рисунок Visio формата Office Open XML</comment> <comment xml:lang="sk">Kresba aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио цртање</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио цртеж</comment> <comment xml:lang="sv">Office Open XML Visio-teckning</comment> <comment xml:lang="tr">Office Open XML Visio Çizimi</comment> <comment xml:lang="uk">схема VIisio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 绘图</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 绘图</comment> <comment xml:lang="zh_TW">Office Open XML Visio 繪圖</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vsdm"/> @@ -3572,6 +3701,7 @@ <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -malli</comment> <comment xml:lang="fr">modèle Visio Office Open XML</comment> + <comment xml:lang="ga">Teimpléad Office Open XML Visio</comment> <comment xml:lang="he">תבנית Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Predložak Office Open XML Visio</comment> <comment xml:lang="hu">Office Open XML Visio sablon</comment> @@ -3579,17 +3709,17 @@ <comment xml:lang="id">Templat Visio Office Open XML</comment> <comment xml:lang="it">Modello Visio Office Open XML</comment> <comment xml:lang="kk">Office Open XML Visio үлгісі</comment> - <comment xml:lang="ko">오피스 오픈 XML 비지오 양식</comment> + <comment xml:lang="ko">오피스 오픈 XML 비지오 서식</comment> <comment xml:lang="pl">Szablon Office Open XML Visio</comment> <comment xml:lang="pt">modelo Office Open XML Visio</comment> <comment xml:lang="pt_BR">Modelo do Visio em Office Open XML</comment> - <comment xml:lang="ru">шаблон Visio формата Office Open XML</comment> + <comment xml:lang="ru">Шаблон Visio формата Office Open XML</comment> <comment xml:lang="sk">Šablóna aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-mall</comment> <comment xml:lang="tr">Office Open XML Visio Şablonu</comment> <comment xml:lang="uk">шаблон Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模板</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模板</comment> <comment xml:lang="zh_TW">Office Open XML Visio 範本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vstm"/> @@ -3603,8 +3733,10 @@ <comment xml:lang="de">Office-Open-XML-Visio-Schablone</comment> <comment xml:lang="en_GB">Office Open XML Visio Stencil</comment> <comment xml:lang="es">esténcil en OOXML de Visio</comment> + <comment xml:lang="eu">Office Open XML Visio txantiloia</comment> <comment xml:lang="fi">Office Open XML Visio -kaavio</comment> <comment xml:lang="fr">stencil Visio Office Open XML</comment> + <comment xml:lang="ga">Stionsal Office Open XML Visio</comment> <comment xml:lang="he">דגם ל־Visio ב־Open XML מבית Office</comment> <comment xml:lang="hr">Office Open XML Visio šablona</comment> <comment xml:lang="hu">Office Open XML Visio stencil</comment> @@ -3616,13 +3748,13 @@ <comment xml:lang="pl">Wzór Office Open XML Visio</comment> <comment xml:lang="pt">Stencil Office Open XML Visio</comment> <comment xml:lang="pt_BR">Estêncil do Visio em Office Open XML</comment> - <comment xml:lang="ru">трафарет Visio формата Office Open XML</comment> + <comment xml:lang="ru">Трафарет Visio формата Office Open XML</comment> <comment xml:lang="sk">Objekt aplikácie Visio Office Open XML</comment> - <comment xml:lang="sr">Офис опен ИксМЛ Визио шаблон</comment> + <comment xml:lang="sr">Офисов отворени ИксМЛ Визио шаблон</comment> <comment xml:lang="sv">Office Open XML Visio-stencil</comment> <comment xml:lang="tr">Office Open XML Visio Kalıbı</comment> <comment xml:lang="uk">трафарет Visio у форматі Office Open XML</comment> - <comment xml:lang="zh_CN">OOXML Visio 模具</comment> + <comment xml:lang="zh_CN">Office Open XML Visio 模具</comment> <comment xml:lang="zh_TW">Office Open XML Visio 圖形樣本</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.vssm"/> @@ -3631,6 +3763,7 @@ <mime-type type="application/vnd.ms-word.document.macroEnabled.12"> <comment>Word document</comment> <comment xml:lang="ar">مستند Word</comment> + <comment xml:lang="ast">Documentu de Word</comment> <comment xml:lang="be@latin">Dakument Word</comment> <comment xml:lang="bg">Документ — Word</comment> <comment xml:lang="ca">document Word</comment> @@ -3666,16 +3799,16 @@ <comment xml:lang="pt">documento Word</comment> <comment xml:lang="pt_BR">Documento do Word</comment> <comment xml:lang="ro">Document Word</comment> - <comment xml:lang="ru">документ Word</comment> + <comment xml:lang="ru">Документ Word</comment> <comment xml:lang="sk">Dokument Word</comment> <comment xml:lang="sl">Dokument Word</comment> <comment xml:lang="sq">Dokument Word</comment> - <comment xml:lang="sr">Вордов документ</comment> + <comment xml:lang="sr">Ворд документ</comment> <comment xml:lang="sv">Word-dokument</comment> <comment xml:lang="tr">Word belgesi</comment> <comment xml:lang="uk">документ Word</comment> <comment xml:lang="vi">Tài liệu Word</comment> - <comment xml:lang="zh_CN">Microsoft Word 文档</comment> + <comment xml:lang="zh_CN">Word 文档</comment> <comment xml:lang="zh_TW">Word 文件</comment> <generic-icon name="x-office-document"/> <glob pattern="*.docm"/> @@ -3683,6 +3816,7 @@ </mime-type> <mime-type type="application/vnd.ms-word.template.macroEnabled.12"> <comment>Word document template</comment> + <comment xml:lang="ast">Plantía de documentu de Word</comment> <comment xml:lang="ca">plantilla de document Word</comment> <comment xml:lang="cs">šablona dokumentu Word</comment> <comment xml:lang="da">Word-dokumentskabelon</comment> @@ -3693,6 +3827,7 @@ <comment xml:lang="eu">Word dokumentuaren txantiloia</comment> <comment xml:lang="fi">Word-asiakirjamalli</comment> <comment xml:lang="fr">modèle de document Word</comment> + <comment xml:lang="ga">teimpléad Word</comment> <comment xml:lang="he">תבנית מסמך Word</comment> <comment xml:lang="hr">Predložak Word dokumenta</comment> <comment xml:lang="hu">Word dokumentumsablon</comment> @@ -3700,18 +3835,18 @@ <comment xml:lang="id">Templat dokumen Word</comment> <comment xml:lang="it">Modello documento Word</comment> <comment xml:lang="kk">Word құжатының үлгісі</comment> - <comment xml:lang="ko">워드 문서 양식</comment> + <comment xml:lang="ko">Word 문서 서식</comment> <comment xml:lang="oc">modèl de document Word</comment> <comment xml:lang="pl">Szablon dokumentu Word</comment> <comment xml:lang="pt">modelo de documento Word</comment> <comment xml:lang="pt_BR">Modelo de documento do Word</comment> - <comment xml:lang="ru">шаблон документа Word</comment> + <comment xml:lang="ru">Шаблон документа Word</comment> <comment xml:lang="sk">Šablóna dokumentu aplikácie Word</comment> - <comment xml:lang="sr">Шаблон документа Ворда</comment> + <comment xml:lang="sr">Шаблон Ворд документа</comment> <comment xml:lang="sv">Word-dokumentmall</comment> <comment xml:lang="tr">Word belgesi şablonu</comment> <comment xml:lang="uk">шаблон документа Word</comment> - <comment xml:lang="zh_CN">Microsoft Word 文档模板</comment> + <comment xml:lang="zh_CN">Word 文档模板</comment> <comment xml:lang="zh_TW">Word 文件範本</comment> <generic-icon name="x-office-document"/> <glob pattern="*.dotm"/> @@ -3720,6 +3855,7 @@ <mime-type type="application/oxps"> <comment>XPS document</comment> <comment xml:lang="ar">مستند XPS</comment> + <comment xml:lang="ast">Documentu XPS</comment> <comment xml:lang="be@latin">Dakument XPS</comment> <comment xml:lang="bg">Документ — XPS</comment> <comment xml:lang="ca">document XPS</comment> @@ -3755,7 +3891,7 @@ <comment xml:lang="pt">documento XPS</comment> <comment xml:lang="pt_BR">Documento XPS</comment> <comment xml:lang="ro">Document XPS</comment> - <comment xml:lang="ru">документ XPS</comment> + <comment xml:lang="ru">Документ XPS</comment> <comment xml:lang="sk">Dokument XPS</comment> <comment xml:lang="sl">Dokument XPS</comment> <comment xml:lang="sq">Dokument XPS</comment> @@ -3773,10 +3909,12 @@ <glob pattern="*.oxps"/> <glob pattern="*.xps"/> <alias type="application/vnd.ms-xpsdocument"/> + <alias type="application/xps"/> </mime-type> <mime-type type="application/vnd.ms-works"> <comment>Microsoft Works document</comment> <comment xml:lang="ar">مستند Microsoft Works</comment> + <comment xml:lang="ast">Documentu de Microsoft Works</comment> <comment xml:lang="be@latin">Dakument Microsoft Works</comment> <comment xml:lang="bg">Документ — Microsoft Works</comment> <comment xml:lang="ca">document de Microsoft Works</comment> @@ -3812,11 +3950,11 @@ <comment xml:lang="pt">documento Microsoft Works</comment> <comment xml:lang="pt_BR">Documento do Microsoft Works</comment> <comment xml:lang="ro">Document Microsoft Works</comment> - <comment xml:lang="ru">документ Microsoft Works</comment> + <comment xml:lang="ru">Документ Microsoft Works</comment> <comment xml:lang="sk">Dokument Microsoft Works</comment> <comment xml:lang="sl">Dokument Microsoft Works</comment> <comment xml:lang="sq">Dokument Microsoft Works</comment> - <comment xml:lang="sr">Микрософтов Воркс документ</comment> + <comment xml:lang="sr">документ Мајкрософт Воркса</comment> <comment xml:lang="sv">Microsoft Works-dokument</comment> <comment xml:lang="tr">Microsoft Works belgesi</comment> <comment xml:lang="uk">документ Microsoft Works</comment> @@ -3833,6 +3971,7 @@ </mime-type> <mime-type type="application/vnd.visio"> <comment>Microsoft Visio document</comment> + <comment xml:lang="ast">Documentu de Microsoft Visio</comment> <comment xml:lang="bg">Документ — Microsoft Visio</comment> <comment xml:lang="ca">document de Microsoft Visio</comment> <comment xml:lang="cs">dokument Microsoft Visio</comment> @@ -3844,6 +3983,7 @@ <comment xml:lang="eu">Microsoft Visio dokumentua</comment> <comment xml:lang="fi">Microsoft Visio -asiakirja</comment> <comment xml:lang="fr">document Microsoft Visio</comment> + <comment xml:lang="ga">cáipéis Microsoft Visio</comment> <comment xml:lang="gl">Documento de Microsoft Visio</comment> <comment xml:lang="he">מסמך </comment> <comment xml:lang="hr">Microsoft Visio dokument</comment> @@ -3861,10 +4001,10 @@ <comment xml:lang="pl">Dokument Microsoft Visio</comment> <comment xml:lang="pt">documento Microsoft Visio</comment> <comment xml:lang="pt_BR">Documento do Microsoft Visio</comment> - <comment xml:lang="ru">документ Microsoft Visio</comment> + <comment xml:lang="ru">Документ Microsoft Visio</comment> <comment xml:lang="sk">Dokument Microsoft Visio</comment> <comment xml:lang="sl">Dokument Microsoft Visio</comment> - <comment xml:lang="sr">Микрософтов Визио документ</comment> + <comment xml:lang="sr">документ Мајкрософт Визиа</comment> <comment xml:lang="sv">Microsoft Visio-dokument</comment> <comment xml:lang="tr">Microsoft Visio belgesi</comment> <comment xml:lang="uk">документ Microsoft Visio</comment> @@ -3880,6 +4020,7 @@ <mime-type type="application/msword"> <comment>Word document</comment> <comment xml:lang="ar">مستند Word</comment> + <comment xml:lang="ast">Documentu de Word</comment> <comment xml:lang="be@latin">Dakument Word</comment> <comment xml:lang="bg">Документ — Word</comment> <comment xml:lang="ca">document Word</comment> @@ -3915,16 +4056,16 @@ <comment xml:lang="pt">documento Word</comment> <comment xml:lang="pt_BR">Documento do Word</comment> <comment xml:lang="ro">Document Word</comment> - <comment xml:lang="ru">документ Word</comment> + <comment xml:lang="ru">Документ Word</comment> <comment xml:lang="sk">Dokument Word</comment> <comment xml:lang="sl">Dokument Word</comment> <comment xml:lang="sq">Dokument Word</comment> - <comment xml:lang="sr">Вордов документ</comment> + <comment xml:lang="sr">Ворд документ</comment> <comment xml:lang="sv">Word-dokument</comment> <comment xml:lang="tr">Word belgesi</comment> <comment xml:lang="uk">документ Word</comment> <comment xml:lang="vi">Tài liệu Word</comment> - <comment xml:lang="zh_CN">Microsoft Word 文档</comment> + <comment xml:lang="zh_CN">Word 文档</comment> <comment xml:lang="zh_TW">Word 文件</comment> <sub-class-of type="application/x-ole-storage"/> <generic-icon name="x-office-document"/> @@ -3947,6 +4088,7 @@ <mime-type type="application/msword-template"> <comment>Word template</comment> <comment xml:lang="ar">قالب Word</comment> + <comment xml:lang="ast">Plantía de Word</comment> <comment xml:lang="be@latin">Šablon Word</comment> <comment xml:lang="bg">Шаблон за документи — Word</comment> <comment xml:lang="ca">plantilla de Word</comment> @@ -3982,11 +4124,11 @@ <comment xml:lang="pt">modelo Word</comment> <comment xml:lang="pt_BR">Modelo do Word</comment> <comment xml:lang="ro">Șablon Word</comment> - <comment xml:lang="ru">шаблон Word</comment> + <comment xml:lang="ru">Шаблон Word</comment> <comment xml:lang="sk">Šablóna Word</comment> <comment xml:lang="sl">Predloga dokumenta Microsoft Word</comment> <comment xml:lang="sq">Model Word</comment> - <comment xml:lang="sr">Вордов шаблон</comment> + <comment xml:lang="sr">Ворд шаблон</comment> <comment xml:lang="sv">Word-mall</comment> <comment xml:lang="tr">Word şablonu</comment> <comment xml:lang="uk">шаблон Word</comment> @@ -3999,6 +4141,7 @@ </mime-type> <mime-type type="application/gml+xml"> <comment>GML document</comment> + <comment xml:lang="ast">Documentu GML</comment> <comment xml:lang="ca">document GML</comment> <comment xml:lang="cs">dokument GML</comment> <comment xml:lang="da">GML-dokument</comment> @@ -4009,6 +4152,7 @@ <comment xml:lang="eu">GML dokumentua</comment> <comment xml:lang="fi">GML-asiakirja</comment> <comment xml:lang="fr">document GML</comment> + <comment xml:lang="ga">cáipéis GML</comment> <comment xml:lang="gl">Documento GML</comment> <comment xml:lang="he">מסמך GML</comment> <comment xml:lang="hr">GML dokument</comment> @@ -4024,7 +4168,7 @@ <comment xml:lang="pl">Dokument GML</comment> <comment xml:lang="pt">documento GML</comment> <comment xml:lang="pt_BR">Documento GML</comment> - <comment xml:lang="ru">документ GML</comment> + <comment xml:lang="ru">Документ GML</comment> <comment xml:lang="sk">Dokument GML</comment> <comment xml:lang="sl">Dokument GML</comment> <comment xml:lang="sr">ГМЛ документ</comment> @@ -4077,7 +4221,7 @@ <comment xml:lang="pt">ficheiro de procura GNUnet</comment> <comment xml:lang="pt_BR">Arquivo de pesquisa do GNUnet</comment> <comment xml:lang="ro">Fișier căutare GNUnet</comment> - <comment xml:lang="ru">файл поиска GNUnet</comment> + <comment xml:lang="ru">Файл поиска GNUnet</comment> <comment xml:lang="sk">Vyhľadávací súbor GNUnet</comment> <comment xml:lang="sl">Iskalna datoteka GNUnet</comment> <comment xml:lang="sq">File kërkimi GNUnet</comment> @@ -4096,6 +4240,7 @@ <mime-type type="application/vnd.ms-tnef"> <comment>TNEF message</comment> <comment xml:lang="ar">رسالة TNEF</comment> + <comment xml:lang="ast">Mensaxe TNEF</comment> <comment xml:lang="be@latin">List TNEF</comment> <comment xml:lang="bg">Съобщение — TNEF</comment> <comment xml:lang="ca">missatge TNEF</comment> @@ -4130,7 +4275,7 @@ <comment xml:lang="pt">mensagem TNEF</comment> <comment xml:lang="pt_BR">Mensagem TNEF</comment> <comment xml:lang="ro">Mesaj TNEF</comment> - <comment xml:lang="ru">сообщение TNEF</comment> + <comment xml:lang="ru">Сообщение TNEF</comment> <comment xml:lang="sk">Správa TNEF</comment> <comment xml:lang="sl">Datoteka sporočila TNEF</comment> <comment xml:lang="sq">Mesazh TNEF</comment> @@ -4192,16 +4337,16 @@ <comment xml:lang="pt">folha de cálculo do StarCalc</comment> <comment xml:lang="pt_BR">Planilha do StarCalc</comment> <comment xml:lang="ro">Foaie de calcul StarCalc</comment> - <comment xml:lang="ru">электронная таблица StarCalc</comment> + <comment xml:lang="ru">Электронная таблица StarCalc</comment> <comment xml:lang="sk">Zošit StarCalc</comment> <comment xml:lang="sl">Preglednica StarCalc</comment> <comment xml:lang="sq">Fletë llogaritjesh StarCalc</comment> - <comment xml:lang="sr">Табела Стар Рачуна</comment> + <comment xml:lang="sr">Стар калк табела</comment> <comment xml:lang="sv">StarCalc-kalkylblad</comment> <comment xml:lang="tr">StarCalc çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця StarCalc</comment> <comment xml:lang="vi">Bảng tính StarCalc</comment> - <comment xml:lang="zh_CN">STarCalc 工作簿</comment> + <comment xml:lang="zh_CN">StarCalc 电子表格</comment> <comment xml:lang="zh_TW">StarCalc 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.sdc"/> @@ -4247,7 +4392,7 @@ <comment xml:lang="pt">gráfico do StarChart</comment> <comment xml:lang="pt_BR">Gráfico do StarChart</comment> <comment xml:lang="ro">Diagramă StarChart</comment> - <comment xml:lang="ru">диаграмма StarChart</comment> + <comment xml:lang="ru">Диаграмма StarChart</comment> <comment xml:lang="sk">Graf StarChart</comment> <comment xml:lang="sl">Datoteka grafikona StarChart</comment> <comment xml:lang="sq">Grafik StarChart</comment> @@ -4256,7 +4401,7 @@ <comment xml:lang="tr">StarChart çizgelgesi</comment> <comment xml:lang="uk">діаграма StarChart</comment> <comment xml:lang="vi">Đồ thị StarChart</comment> - <comment xml:lang="zh_CN">STarChart 图表</comment> + <comment xml:lang="zh_CN">StarCalc 图表</comment> <comment xml:lang="zh_TW">StarChart 圖表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.sds"/> @@ -4302,7 +4447,7 @@ <comment xml:lang="pt">desenho do StarDraw</comment> <comment xml:lang="pt_BR">Desenho do StarDraw</comment> <comment xml:lang="ro">Desen StarDraw</comment> - <comment xml:lang="ru">изображение StarDraw</comment> + <comment xml:lang="ru">Рисунок StarDraw</comment> <comment xml:lang="sk">Kresba StarDraw</comment> <comment xml:lang="sl">Datoteka risbe StarDraw</comment> <comment xml:lang="sq">Vizatim StarDraw</comment> @@ -4311,7 +4456,7 @@ <comment xml:lang="tr">StarDraw çizimi</comment> <comment xml:lang="uk">малюнок StarDraw</comment> <comment xml:lang="vi">Bản vẽ StarDraw</comment> - <comment xml:lang="zh_CN">STarDraw 绘图</comment> + <comment xml:lang="zh_CN">StarDraw 绘图</comment> <comment xml:lang="zh_TW">StarDraw 繪圖</comment> <generic-icon name="image-x-generic"/> <glob pattern="*.sda"/> @@ -4357,7 +4502,7 @@ <comment xml:lang="pt">apresentação do StarImpress</comment> <comment xml:lang="pt_BR">Apresentação do StarImpress</comment> <comment xml:lang="ro">Prezentare StarImpress</comment> - <comment xml:lang="ru">презентация StarImpress</comment> + <comment xml:lang="ru">Презентация StarImpress</comment> <comment xml:lang="sk">Prezentácia StarImpress</comment> <comment xml:lang="sl">Predstavitev StarImpress</comment> <comment xml:lang="sq">Prezantim StarImpress</comment> @@ -4366,7 +4511,7 @@ <comment xml:lang="tr">StarImpress sunumu</comment> <comment xml:lang="uk">презентація StarImpress</comment> <comment xml:lang="vi">Trình diễn StarImpress</comment> - <comment xml:lang="zh_CN">STarImpress 演示文稿</comment> + <comment xml:lang="zh_CN">StarImpress 演示文稿</comment> <comment xml:lang="zh_TW">StarImpress 簡報檔</comment> <generic-icon name="x-office-presentation"/> <glob pattern="*.sdd"/> @@ -4411,7 +4556,7 @@ <comment xml:lang="pt">email do StarMail</comment> <comment xml:lang="pt_BR">E-mail do StarMail</comment> <comment xml:lang="ro">Email StarEmail</comment> - <comment xml:lang="ru">электронное письмо StarMail</comment> + <comment xml:lang="ru">Электронное письмо StarMail</comment> <comment xml:lang="sk">E-mail StarMail</comment> <comment xml:lang="sl">Datoteka pošte StarMail</comment> <comment xml:lang="sq">Mesazh StarMail</comment> @@ -4420,7 +4565,7 @@ <comment xml:lang="tr">StarMail epostası</comment> <comment xml:lang="uk">поштове повідомлення StarMail</comment> <comment xml:lang="vi">Thư điện tử StarMail</comment> - <comment xml:lang="zh_CN">STarMail 电子邮件</comment> + <comment xml:lang="zh_CN">StarMail 电子邮件</comment> <comment xml:lang="zh_TW">StarMail 郵件</comment> <glob pattern="*.smd"/> </mime-type> @@ -4463,7 +4608,7 @@ <comment xml:lang="pt">fórmula do StarMath</comment> <comment xml:lang="pt_BR">Fórmula do StarMath</comment> <comment xml:lang="ro">Formulă StarMath</comment> - <comment xml:lang="ru">формула StarMath</comment> + <comment xml:lang="ru">Формула StarMath</comment> <comment xml:lang="sk">Vzorec StarMath</comment> <comment xml:lang="sl">Datoteka formule StarMath</comment> <comment xml:lang="sq">Formulë StarMath</comment> @@ -4472,7 +4617,7 @@ <comment xml:lang="tr">StarMath formülü</comment> <comment xml:lang="uk">формула StarMath</comment> <comment xml:lang="vi">Công thức StarMath</comment> - <comment xml:lang="zh_CN">STarMath 公式</comment> + <comment xml:lang="zh_CN">StarMath 公式</comment> <comment xml:lang="zh_TW">StarMath 公式</comment> <generic-icon name="x-office-document"/> <glob pattern="*.smf"/> @@ -4480,6 +4625,7 @@ <mime-type type="application/vnd.stardivision.writer"> <comment>StarWriter document</comment> <comment xml:lang="ar">مستند StarWriter</comment> + <comment xml:lang="ast">Documentu de StarWriter</comment> <comment xml:lang="az">StarWriter sənədi</comment> <comment xml:lang="be@latin">Dakument StarWriter</comment> <comment xml:lang="bg">Документ — StarWriter</comment> @@ -4518,7 +4664,7 @@ <comment xml:lang="pt">documento do StarWriter</comment> <comment xml:lang="pt_BR">Documento do StarWriter</comment> <comment xml:lang="ro">Document StarWriter</comment> - <comment xml:lang="ru">документ StarWriter</comment> + <comment xml:lang="ru">Документ StarWriter</comment> <comment xml:lang="sk">Dokument StarWriter</comment> <comment xml:lang="sl">Dokument StarWriter</comment> <comment xml:lang="sq">Dokument StarWriter</comment> @@ -4527,7 +4673,7 @@ <comment xml:lang="tr">StarWriter belgesi</comment> <comment xml:lang="uk">документ StarWriter</comment> <comment xml:lang="vi">Tài liệu StarWriter</comment> - <comment xml:lang="zh_CN">STarWriter 文档</comment> + <comment xml:lang="zh_CN">StarWriter 文档</comment> <comment xml:lang="zh_TW">StarWriter 文件</comment> <generic-icon name="x-office-document"/> <glob pattern="*.sdw"/> @@ -4576,7 +4722,7 @@ <comment xml:lang="pt">folha de cálculo OpenOffice Calc</comment> <comment xml:lang="pt_BR">Planilha do OpenOffice Calc</comment> <comment xml:lang="ro">Foaie de calcul OpenOffice Calc</comment> - <comment xml:lang="ru">электронная таблица OpenOffice Calc</comment> + <comment xml:lang="ru">Электронная таблица OpenOffice Calc</comment> <comment xml:lang="sk">Zošit OpenOffice Calc</comment> <comment xml:lang="sl">Razpredelnica OpenOffice.org Calc</comment> <comment xml:lang="sq">Fletë llogaritjesh OpenOffice Calc</comment> @@ -4585,7 +4731,7 @@ <comment xml:lang="tr">OpenOffice Calc çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця OpenOffice Calc</comment> <comment xml:lang="vi">Bảng tính Calc của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Calc 工作簿</comment> + <comment xml:lang="zh_CN">OpenOffice Calc 电子表格</comment> <comment xml:lang="zh_TW">OpenOffice Calc 試算表</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-spreadsheet"/> @@ -4636,7 +4782,7 @@ <comment xml:lang="pt">modelo OpenOffice Calc</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Calc</comment> <comment xml:lang="ro">Șablon OpenOffice Calc</comment> - <comment xml:lang="ru">шаблон OpenOffice Calc</comment> + <comment xml:lang="ru">Шаблон OpenOffice Calc</comment> <comment xml:lang="sk">Šablóna OpenOffice Calc</comment> <comment xml:lang="sl">Predloga OpenOffice.org Calc</comment> <comment xml:lang="sq">Model OpenOffice Calc</comment> @@ -4645,7 +4791,7 @@ <comment xml:lang="tr">OpenOffice Calc şablonu</comment> <comment xml:lang="uk">шаблон ел.таблиці OpenOffice Calc</comment> <comment xml:lang="vi">Mẫu bảng tính Calc của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Calc 工作簿模板</comment> + <comment xml:lang="zh_CN">OpenOffice Calc 模板</comment> <comment xml:lang="zh_TW">OpenOffice Calc 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-spreadsheet"/> @@ -4696,7 +4842,7 @@ <comment xml:lang="pt">desenho OpenOffice Draw</comment> <comment xml:lang="pt_BR">Desenho do OpenOffice Draw</comment> <comment xml:lang="ro">Desen OpenOffice Draw</comment> - <comment xml:lang="ru">изображение OpenOffice Draw</comment> + <comment xml:lang="ru">Рисунок OpenOffice Draw</comment> <comment xml:lang="sk">Kresba OpenOffice Draw</comment> <comment xml:lang="sl">Datoteka risbe OpenOffice.org Draw</comment> <comment xml:lang="sq">Vizatim OpenOffice Draw</comment> @@ -4705,7 +4851,7 @@ <comment xml:lang="tr">OpenOffice Draw çizimi</comment> <comment xml:lang="uk">малюнок OpenOffice Draw</comment> <comment xml:lang="vi">Bản vẽ Draw của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Draw 绘图</comment> + <comment xml:lang="zh_CN">OpenOffice Draw 绘图</comment> <comment xml:lang="zh_TW">OpenOffice Draw 繪圖</comment> <sub-class-of type="application/zip"/> <generic-icon name="image-x-generic"/> @@ -4756,7 +4902,7 @@ <comment xml:lang="pt">modelo OpenOffice Draw</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Draw</comment> <comment xml:lang="ro">Șablon OpenOffice Draw</comment> - <comment xml:lang="ru">шаблон OpenOffice Draw</comment> + <comment xml:lang="ru">Шаблон OpenOffice Draw</comment> <comment xml:lang="sk">Šablóna OpenOffice Draw</comment> <comment xml:lang="sl">Predloga OpenOffice.org Draw</comment> <comment xml:lang="sq">Model OpenOffice Draw</comment> @@ -4765,7 +4911,7 @@ <comment xml:lang="tr">OpenOffice Draw şablonu</comment> <comment xml:lang="uk">шаблон малюнку OpenOffice Draw</comment> <comment xml:lang="vi">Mẫu bản vẽ Draw của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Draw 绘图模板</comment> + <comment xml:lang="zh_CN">OpenOffice Draw 模板</comment> <comment xml:lang="zh_TW">OpenOffice Draw 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="image-x-generic"/> @@ -4818,7 +4964,7 @@ <comment xml:lang="pt">apresentação OpenOffice Impress</comment> <comment xml:lang="pt_BR">Apresentação do OpenOffice Impress</comment> <comment xml:lang="ro">Prezentare OpenOffice Impress</comment> - <comment xml:lang="ru">презентация OpenOffice Impress</comment> + <comment xml:lang="ru">Презентация OpenOffice Impress</comment> <comment xml:lang="sk">Prezentácia OpenOffice Impress</comment> <comment xml:lang="sl">Predstavitev OpenOffice.org Impress</comment> <comment xml:lang="sq">Prezantim OpenOffice Impress</comment> @@ -4827,7 +4973,7 @@ <comment xml:lang="tr">OpenOffice Impress sunumu</comment> <comment xml:lang="uk">презентація OpenOffice Impress</comment> <comment xml:lang="vi">Trình diễn Impress của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Impress 演示文稿</comment> + <comment xml:lang="zh_CN">OpenOffice Impress 演示文稿</comment> <comment xml:lang="zh_TW">OpenOffice Impress 簡報</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-presentation"/> @@ -4878,7 +5024,7 @@ <comment xml:lang="pt">modelo OpenOffice Impress</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Impress</comment> <comment xml:lang="ro">Șablon OpenOffice Impress</comment> - <comment xml:lang="ru">шаблон OpenOffice Impress</comment> + <comment xml:lang="ru">Шаблон OpenOffice Impress</comment> <comment xml:lang="sk">Šablóna OpenOffice Impress</comment> <comment xml:lang="sl">Predloga OpenOffice.org Impress</comment> <comment xml:lang="sq">Model OpenOffice Impress</comment> @@ -4887,7 +5033,7 @@ <comment xml:lang="tr">OpenOffice Impress şablonu</comment> <comment xml:lang="uk">шаблон презентації OpenOffice Impress</comment> <comment xml:lang="vi">Mẫu trình diễn Impress của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Impress 演示文稿模板</comment> + <comment xml:lang="zh_CN">OpenOffice Impress 模板</comment> <comment xml:lang="zh_TW">OpenOffice Impress 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-presentation"/> @@ -4938,7 +5084,7 @@ <comment xml:lang="pt">fórmula OpenOffice Math</comment> <comment xml:lang="pt_BR">Fórmula do OpenOffice Math</comment> <comment xml:lang="ro">Formulă OpenOffice Math</comment> - <comment xml:lang="ru">формула OpenOffice Math</comment> + <comment xml:lang="ru">Формула OpenOffice Math</comment> <comment xml:lang="sk">Vzorec OpenOffice Math</comment> <comment xml:lang="sl">Dokument formule OpenOffice.org Math</comment> <comment xml:lang="sq">Formulë OpenOffice Math</comment> @@ -4947,7 +5093,7 @@ <comment xml:lang="tr">OpenOffice Math formülü</comment> <comment xml:lang="uk">формула OpenOffice Math</comment> <comment xml:lang="vi">Công thức Math của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Math 公式</comment> + <comment xml:lang="zh_CN">OpenOffice Math 公式</comment> <comment xml:lang="zh_TW">OpenOffice Math 公式</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -4963,6 +5109,7 @@ <mime-type type="application/vnd.sun.xml.writer"> <comment>OpenOffice Writer document</comment> <comment xml:lang="ar">مستند Writer المكتب المفتوح</comment> + <comment xml:lang="ast">Documentu d'OpenOffice Writer</comment> <comment xml:lang="az">OpenOffice Writer sənədi</comment> <comment xml:lang="be@latin">Dakument OpenOffice Writer</comment> <comment xml:lang="bg">Документ — OpenOffice Writer</comment> @@ -5000,7 +5147,7 @@ <comment xml:lang="pt">documento OpenOffice Writer</comment> <comment xml:lang="pt_BR">Documento do OpenOffice Writer</comment> <comment xml:lang="ro">Document OpenOffice Writer</comment> - <comment xml:lang="ru">документ OpenOffice Writer</comment> + <comment xml:lang="ru">Документ OpenOffice Writer</comment> <comment xml:lang="sk">Dokument OpenOffice Writer</comment> <comment xml:lang="sl">Dokument OpenOffice.org Writer</comment> <comment xml:lang="sq">Dokument OpenOffice Writer</comment> @@ -5009,7 +5156,7 @@ <comment xml:lang="tr">OpenOffice Writer belgesi</comment> <comment xml:lang="uk">документ OpenOffice Writer</comment> <comment xml:lang="vi">Tài liệu Writer của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Writer 文档</comment> + <comment xml:lang="zh_CN">OpenOffice Writer 文档</comment> <comment xml:lang="zh_TW">OpenOffice Writer 文件</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -5025,6 +5172,7 @@ <mime-type type="application/vnd.sun.xml.writer.global"> <comment>OpenOffice Writer global document</comment> <comment xml:lang="ar">مستند المكتب المفتوح Writer العالمي</comment> + <comment xml:lang="ast">Documentu global d'OpenOffice Writer</comment> <comment xml:lang="az">OpenOffice Writer qlobal sənədi</comment> <comment xml:lang="be@latin">Hlabalny dakument OpenOffice Writer</comment> <comment xml:lang="bg">Документ - глобален — OpenOffice Writer</comment> @@ -5062,7 +5210,7 @@ <comment xml:lang="pt">documento global OpenOffice Writer</comment> <comment xml:lang="pt_BR">Documento global do OpenOffice Writer</comment> <comment xml:lang="ro">Document global OpenOffice Writer</comment> - <comment xml:lang="ru">основной документ OpenOffice Writer</comment> + <comment xml:lang="ru">Основной документ OpenOffice Writer</comment> <comment xml:lang="sk">Globálny dokument OpenOffice Writer</comment> <comment xml:lang="sl">Splošni dokument OpenOffice.org Writer</comment> <comment xml:lang="sq">Dokument i përgjithshëm OpenOffice Writer</comment> @@ -5071,7 +5219,7 @@ <comment xml:lang="tr">OpenOffice Writer global belgesi</comment> <comment xml:lang="uk">загальний документ OpenOffice Writer</comment> <comment xml:lang="vi">Tài liệu toàn cục Writer của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Writer 全局文档</comment> + <comment xml:lang="zh_CN">OpenOffice Writer 全局文档</comment> <comment xml:lang="zh_TW">OpenOffice Writer 主控文件</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -5125,7 +5273,7 @@ <comment xml:lang="pt">modelo OpenOffice Writer</comment> <comment xml:lang="pt_BR">Modelo do OpenOffice Writer</comment> <comment xml:lang="ro">Șablon OpenOffice Writer</comment> - <comment xml:lang="ru">шаблон OpenOffice Writer</comment> + <comment xml:lang="ru">Шаблон OpenOffice Writer</comment> <comment xml:lang="sk">Šablóna OpenOffice Writer</comment> <comment xml:lang="sl">Predloga OpenOffice.org Writer</comment> <comment xml:lang="sq">Model OpenOffice Writer</comment> @@ -5134,7 +5282,7 @@ <comment xml:lang="tr">OpenOffice Writer şablonu</comment> <comment xml:lang="uk">шаблон документа OpenOffice Writer</comment> <comment xml:lang="vi">Mẫu tài liệu Writer của OpenOffice.org</comment> - <comment xml:lang="zh_CN">OpenOffice.org Writer 文档模板</comment> + <comment xml:lang="zh_CN">OpenOffice Writer 模板</comment> <comment xml:lang="zh_TW">OpenOffice Writer 範本</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -5150,6 +5298,7 @@ <mime-type type="application/vnd.oasis.opendocument.text"> <comment>ODT document</comment> <comment xml:lang="ar">مستند ODT</comment> + <comment xml:lang="ast">Documentu ODT</comment> <comment xml:lang="be@latin">Dakument ODT</comment> <comment xml:lang="bg">Документ — ODT</comment> <comment xml:lang="ca">document ODT</comment> @@ -5186,7 +5335,7 @@ <comment xml:lang="pt">documento ODT</comment> <comment xml:lang="pt_BR">Documento ODT</comment> <comment xml:lang="ro">Document ODT</comment> - <comment xml:lang="ru">документ ODT</comment> + <comment xml:lang="ru">Документ ODT</comment> <comment xml:lang="sk">Dokument ODT</comment> <comment xml:lang="sl">Dokument ODT</comment> <comment xml:lang="sq">Dokument ODT</comment> @@ -5213,6 +5362,7 @@ <mime-type type="application/vnd.oasis.opendocument.text-flat-xml"> <comment>ODT document (Flat XML)</comment> <comment xml:lang="ar">مستند ODT (Flat XML)</comment> + <comment xml:lang="ast">Documentu ODT (XML planu)</comment> <comment xml:lang="bg">Документ — ODT (само XML)</comment> <comment xml:lang="ca">document ODT (XML pla)</comment> <comment xml:lang="cs">dokument ODT (Flat XML)</comment> @@ -5245,14 +5395,14 @@ <comment xml:lang="pt">documento ODT (XML plano)</comment> <comment xml:lang="pt_BR">Documento ODT (Flat XML)</comment> <comment xml:lang="ro">Document ODT (XML simplu)</comment> - <comment xml:lang="ru">документ ODT (простой XML)</comment> + <comment xml:lang="ru">Документ ODT (простой XML)</comment> <comment xml:lang="sk">Dokument ODT (čisté XML)</comment> <comment xml:lang="sl">Datoteka dokumenta ODT (nepovezan XML)</comment> <comment xml:lang="sr">ОДТ документ (Обични ИксМЛ)</comment> <comment xml:lang="sv">ODT-dokument (platt XML)</comment> <comment xml:lang="tr">ODT belgesi (Düz XML)</comment> <comment xml:lang="uk">документ ODT (Flat XML)</comment> - <comment xml:lang="zh_CN">ODT 文档(Flat XML)</comment> + <comment xml:lang="zh_CN">ODT 文档（Flat XML）</comment> <comment xml:lang="zh_TW">ODT 文件 (Flat XML)</comment> <acronym>FODT</acronym> <expanded-acronym>OpenDocument Text (Flat XML)</expanded-acronym> @@ -5299,7 +5449,7 @@ <comment xml:lang="pt">modelo ODT</comment> <comment xml:lang="pt_BR">Modelo ODT</comment> <comment xml:lang="ro">Șablon ODT</comment> - <comment xml:lang="ru">шаблон ODT</comment> + <comment xml:lang="ru">Шаблон ODT</comment> <comment xml:lang="sk">Šablóna ODT</comment> <comment xml:lang="sl">Predloga dokumenta ODT</comment> <comment xml:lang="sq">Model ODT</comment> @@ -5362,7 +5512,7 @@ <comment xml:lang="pt">modelo OTH</comment> <comment xml:lang="pt_BR">Modelo OTH</comment> <comment xml:lang="ro">Șablon OTH</comment> - <comment xml:lang="ru">шаблон OTH</comment> + <comment xml:lang="ru">Шаблон OTH</comment> <comment xml:lang="sk">Šablóna OTH</comment> <comment xml:lang="sl">Predloga OTH</comment> <comment xml:lang="sq">Model OTH</comment> @@ -5389,6 +5539,7 @@ <mime-type type="application/vnd.oasis.opendocument.text-master"> <comment>ODM document</comment> <comment xml:lang="ar">مستند ODM</comment> + <comment xml:lang="ast">Documentu ODM</comment> <comment xml:lang="be@latin">Dakument ODM</comment> <comment xml:lang="bg">Документ — ODM</comment> <comment xml:lang="ca">document ODM</comment> @@ -5425,7 +5576,7 @@ <comment xml:lang="pt">documento ODM</comment> <comment xml:lang="pt_BR">Documento ODM</comment> <comment xml:lang="ro">Document ODM</comment> - <comment xml:lang="ru">документ ODM</comment> + <comment xml:lang="ru">Документ ODM</comment> <comment xml:lang="sk">Dokument ODM</comment> <comment xml:lang="sl">Dokument ODM</comment> <comment xml:lang="sq">Dokument ODM</comment> @@ -5488,7 +5639,7 @@ <comment xml:lang="pt">desenho ODG</comment> <comment xml:lang="pt_BR">Desenho ODG</comment> <comment xml:lang="ro">Desen ODG</comment> - <comment xml:lang="ru">изображение ODG</comment> + <comment xml:lang="ru">Рисунок ODG</comment> <comment xml:lang="sk">Kresba ODG</comment> <comment xml:lang="sl">Datoteka risbe ODG</comment> <comment xml:lang="sq">Vizatim ODG</comment> @@ -5547,14 +5698,14 @@ <comment xml:lang="pt">desenho ODG (XML plano)</comment> <comment xml:lang="pt_BR">Desenho ODG (Flat XML)</comment> <comment xml:lang="ro">Desen ODG (XML simplu)</comment> - <comment xml:lang="ru">изображение ODG (простой XML)</comment> + <comment xml:lang="ru">Рисунок ODG (простой XML)</comment> <comment xml:lang="sk">Kresba ODG (čisté XML)</comment> <comment xml:lang="sl">Datoteka risbe ODG (nepovezan XML)</comment> <comment xml:lang="sr">ОДГ цртеж (Обичан ИксМЛ)</comment> <comment xml:lang="sv">ODG-teckning (platt XML)</comment> <comment xml:lang="tr">ODG çizimi (Düz XML)</comment> <comment xml:lang="uk">малюнок ODG (Flat XML)</comment> - <comment xml:lang="zh_CN">ODG 绘图(Flat XML)</comment> + <comment xml:lang="zh_CN">ODG 绘图（Flat XML）</comment> <comment xml:lang="zh_TW">ODG 繪圖 (Flat XML)</comment> <acronym>FODG</acronym> <expanded-acronym>OpenDocument Drawing (Flat XML)</expanded-acronym> @@ -5601,7 +5752,7 @@ <comment xml:lang="pt">modelo ODG</comment> <comment xml:lang="pt_BR">Modelo ODG</comment> <comment xml:lang="ro">Șablon ODG</comment> - <comment xml:lang="ru">шаблон ODG</comment> + <comment xml:lang="ru">Шаблон ODG</comment> <comment xml:lang="sk">Šablóna ODG</comment> <comment xml:lang="sl">Predloga dokumenta ODG</comment> <comment xml:lang="sq">Model ODG</comment> @@ -5664,7 +5815,7 @@ <comment xml:lang="pt">apresentação ODP</comment> <comment xml:lang="pt_BR">Apresentação ODP</comment> <comment xml:lang="ro">Prezentare ODP</comment> - <comment xml:lang="ru">презентация ODP</comment> + <comment xml:lang="ru">Презентация ODP</comment> <comment xml:lang="sk">Prezentácia ODP</comment> <comment xml:lang="sl">Predstavitev ODP</comment> <comment xml:lang="sq">Prezantim ODP</comment> @@ -5723,14 +5874,14 @@ <comment xml:lang="pt">apresentação ODP (XML plano)</comment> <comment xml:lang="pt_BR">Apresentação ODP (Flat XML)</comment> <comment xml:lang="ro">Prezentare ODP (XML simplu)</comment> - <comment xml:lang="ru">презентация ODP (простой XML)</comment> + <comment xml:lang="ru">Презентация ODP (простой XML)</comment> <comment xml:lang="sk">Prezentácia ODP (čisté XML)</comment> <comment xml:lang="sl">Predstavitev ODP (nepovezan XML)</comment> <comment xml:lang="sr">ОДП презентација (Обични ИксМЛ)</comment> <comment xml:lang="sv">ODP-presentation (platt XML)</comment> <comment xml:lang="tr">ODP sunumu (Düz XML)</comment> <comment xml:lang="uk">презентація ODP (Flat XML)</comment> - <comment xml:lang="zh_CN">ODP 演示文稿(Flat XML)</comment> + <comment xml:lang="zh_CN">ODP 演示文稿（Flat XML）</comment> <comment xml:lang="zh_TW">ODP 範本 (Flat XML)</comment> <acronym>FODP</acronym> <expanded-acronym>OpenDocument Presentation (Flat XML)</expanded-acronym> @@ -5777,7 +5928,7 @@ <comment xml:lang="pt">modelo ODP</comment> <comment xml:lang="pt_BR">Modelo ODP</comment> <comment xml:lang="ro">Șablon ODP</comment> - <comment xml:lang="ru">шаблон ODP</comment> + <comment xml:lang="ru">Шаблон ODP</comment> <comment xml:lang="sk">Šablóna ODP</comment> <comment xml:lang="sl">Predloga dokumenta ODP</comment> <comment xml:lang="sq">Model ODP</comment> @@ -5840,16 +5991,16 @@ <comment xml:lang="pt">folha de cálculo ODS</comment> <comment xml:lang="pt_BR">Planilha ODS</comment> <comment xml:lang="ro">Foaie de calcul ODS</comment> - <comment xml:lang="ru">электронная таблица ODS</comment> + <comment xml:lang="ru">Электронная таблица ODS</comment> <comment xml:lang="sk">Zošit ODS</comment> <comment xml:lang="sl">Preglednica ODS</comment> <comment xml:lang="sq">Fletë llogaritjesh ODS</comment> - <comment xml:lang="sr">ОДС spreadsheet</comment> + <comment xml:lang="sr">ОДС табела</comment> <comment xml:lang="sv">ODS-kalkylblad</comment> <comment xml:lang="tr">ODS çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця ODS</comment> <comment xml:lang="vi">Bảng tính ODS</comment> - <comment xml:lang="zh_CN">ODS 工作簿</comment> + <comment xml:lang="zh_CN">ODS 电子表格</comment> <comment xml:lang="zh_TW">ODS 試算表</comment> <acronym>ODS</acronym> <expanded-acronym>OpenDocument Spreadsheet</expanded-acronym> @@ -5899,14 +6050,14 @@ <comment xml:lang="pt">folha de cálculo ODS (XML plano)</comment> <comment xml:lang="pt_BR">Planilha ODS (Flat XML)</comment> <comment xml:lang="ro">Foaie de calcul ODS (XML simplu)</comment> - <comment xml:lang="ru">электронная таблица ODS (простой XML)</comment> + <comment xml:lang="ru">Электронная таблица ODS (простой XML)</comment> <comment xml:lang="sk">Zošit ODS (čisté XML)</comment> <comment xml:lang="sl">Preglednica ODS (nepovezan XML)</comment> - <comment xml:lang="sr">ОДС spreadsheet (Обични ИксМЛ)</comment> + <comment xml:lang="sr">ОДС табела (обични ИксМЛ)</comment> <comment xml:lang="sv">ODS-kalkylblad (platt XML)</comment> <comment xml:lang="tr">ODS sunumu (Düz XML)</comment> <comment xml:lang="uk">ел. таблиця ODS (Flat XML)</comment> - <comment xml:lang="zh_CN">ODS 工作簿(Flat XML)</comment> + <comment xml:lang="zh_CN">ODS 电子表格 (Flat XML)</comment> <comment xml:lang="zh_TW">ODS 試算表 (Flat XML)</comment> <acronym>FODS</acronym> <expanded-acronym>OpenDocument Spreadsheet (Flat XML)</expanded-acronym> @@ -5953,7 +6104,7 @@ <comment xml:lang="pt">modelo ODS</comment> <comment xml:lang="pt_BR">Modelo ODS</comment> <comment xml:lang="ro">Șablon ODS</comment> - <comment xml:lang="ru">шаблон ODS</comment> + <comment xml:lang="ru">Шаблон ODS</comment> <comment xml:lang="sk">Šablóna ODS</comment> <comment xml:lang="sl">Predloga dokumenta ODS</comment> <comment xml:lang="sq">Model ODS</comment> @@ -6015,11 +6166,11 @@ <comment xml:lang="pt">gráfico ODC</comment> <comment xml:lang="pt_BR">Gráfico ODC</comment> <comment xml:lang="ro">Diagramă ODC</comment> - <comment xml:lang="ru">диаграмма ODC</comment> + <comment xml:lang="ru">Диаграмма ODC</comment> <comment xml:lang="sk">Graf ODC</comment> <comment xml:lang="sl">Datoteka grafikona ODC</comment> <comment xml:lang="sq">Grafik ODC</comment> - <comment xml:lang="sr">ОДЦ chart</comment> + <comment xml:lang="sr">ОДЦ график</comment> <comment xml:lang="sv">ODC-diagram</comment> <comment xml:lang="tr">ODC çizelgesi</comment> <comment xml:lang="uk">діаграма ODC</comment> @@ -6075,7 +6226,7 @@ <comment xml:lang="pt">modelo ODC</comment> <comment xml:lang="pt_BR">Modelo ODC</comment> <comment xml:lang="ro">Șablon ODC</comment> - <comment xml:lang="ru">шаблон ODC</comment> + <comment xml:lang="ru">Шаблон ODC</comment> <comment xml:lang="sk">Šablóna ODC</comment> <comment xml:lang="sl">Predloga ODC</comment> <comment xml:lang="sr">ОДЦ шаблон</comment> @@ -6137,11 +6288,11 @@ <comment xml:lang="pt">fórmula ODF</comment> <comment xml:lang="pt_BR">Fórmula ODF</comment> <comment xml:lang="ro">Formulă ODF</comment> - <comment xml:lang="ru">формула ODF</comment> + <comment xml:lang="ru">Формула ODF</comment> <comment xml:lang="sk">Vzorec ODF</comment> <comment xml:lang="sl">Dokument formule ODF</comment> <comment xml:lang="sq">Formulë ODF</comment> - <comment xml:lang="sr">ОДФ formula</comment> + <comment xml:lang="sr">ОДФ формула</comment> <comment xml:lang="sv">ODF-formel</comment> <comment xml:lang="tr">ODF formülü</comment> <comment xml:lang="uk">формула ODF</comment> @@ -6197,7 +6348,7 @@ <comment xml:lang="pt">modelo ODF</comment> <comment xml:lang="pt_BR">Modelo ODF</comment> <comment xml:lang="ro">Șablon ODF</comment> - <comment xml:lang="ru">шаблон ODF</comment> + <comment xml:lang="ru">Шаблон ODF</comment> <comment xml:lang="sk">Šablóna ODF</comment> <comment xml:lang="sl">Predloga dokumenta ODF</comment> <comment xml:lang="sr">ОДФ шаблон</comment> @@ -6259,7 +6410,7 @@ <comment xml:lang="pt">base de dados ODB</comment> <comment xml:lang="pt_BR">Banco de dados ODB</comment> <comment xml:lang="ro">Bază de date ODB</comment> - <comment xml:lang="ru">база данных ODB</comment> + <comment xml:lang="ru">База данных ODB</comment> <comment xml:lang="sk">Databáza ODB</comment> <comment xml:lang="sl">Podatkovna zbirka ODB</comment> <comment xml:lang="sq">Bazë me të dhëna ODB</comment> @@ -6287,6 +6438,7 @@ <mime-type type="application/vnd.oasis.opendocument.image"> <comment>ODI image</comment> <comment xml:lang="ar">صورة ODI</comment> + <comment xml:lang="ast">Imaxe ODI</comment> <comment xml:lang="be@latin">Vyjava ODI</comment> <comment xml:lang="bg">Изображение — ODI</comment> <comment xml:lang="ca">imatge ODI</comment> @@ -6323,7 +6475,7 @@ <comment xml:lang="pt">imagem ODI</comment> <comment xml:lang="pt_BR">Imagem ODI</comment> <comment xml:lang="ro">Imagine ODI</comment> - <comment xml:lang="ru">изображение ODI</comment> + <comment xml:lang="ru">Изображение ODI</comment> <comment xml:lang="sk">Obrázok ODI</comment> <comment xml:lang="sl">Slikovna datoteka ODI</comment> <comment xml:lang="sq">Figurë ODI</comment> @@ -6350,6 +6502,7 @@ <mime-type type="application/vnd.openofficeorg.extension"> <comment>OpenOffice.org extension</comment> <comment xml:lang="ar">امتداد OpenOffice.org</comment> + <comment xml:lang="ast">Estensión d'OpenOffice.org</comment> <comment xml:lang="be@latin">Pašyreńnie OpenOffice.org</comment> <comment xml:lang="bg">Разширение — OpenOffice</comment> <comment xml:lang="ca">extensió d'OpenOffice.org</comment> @@ -6384,7 +6537,7 @@ <comment xml:lang="pt">extensão OpenOffice.org</comment> <comment xml:lang="pt_BR">Extensão do OpenOffice</comment> <comment xml:lang="ro">Extensie OpenOffice.org</comment> - <comment xml:lang="ru">расширение OpenOffice.org</comment> + <comment xml:lang="ru">Расширение OpenOffice.org</comment> <comment xml:lang="sk">Rozšírenie OpenOffice.org</comment> <comment xml:lang="sl">Razširitev OpenOffice.org</comment> <comment xml:lang="sq">Shtojcë për OpenOffice.org</comment> @@ -6401,6 +6554,7 @@ </mime-type> <mime-type type="application/vnd.android.package-archive"> <comment>Android package</comment> + <comment xml:lang="ast">Paquete d'Android</comment> <comment xml:lang="bg">Пакет — Android</comment> <comment xml:lang="ca">paquet d'Android</comment> <comment xml:lang="cs">balíčky systému Android</comment> @@ -6413,6 +6567,7 @@ <comment xml:lang="eu">Android paketea</comment> <comment xml:lang="fi">Android-paketti</comment> <comment xml:lang="fr">paquet Android</comment> + <comment xml:lang="ga">pacáiste Android</comment> <comment xml:lang="gl">paquete de Android</comment> <comment xml:lang="he">חבילת אנדרויד</comment> <comment xml:lang="hr">Android paket</comment> @@ -6430,14 +6585,14 @@ <comment xml:lang="pl">Pakiet Androida</comment> <comment xml:lang="pt">pacote Android</comment> <comment xml:lang="pt_BR">Pacote do Android</comment> - <comment xml:lang="ru">пакет Android</comment> + <comment xml:lang="ru">Пакет Android</comment> <comment xml:lang="sk">Balík Android</comment> <comment xml:lang="sl">Paket Android</comment> <comment xml:lang="sr">Андроидов пакет</comment> <comment xml:lang="sv">Android-paket</comment> <comment xml:lang="tr">Android paketi</comment> <comment xml:lang="uk">пакунок Android</comment> - <comment xml:lang="zh_CN">Android</comment> + <comment xml:lang="zh_CN">Android 应用包</comment> <comment xml:lang="zh_TW">Android 軟體包</comment> <sub-class-of type="application/x-java-archive"/> <glob pattern="*.apk"/> @@ -6445,6 +6600,7 @@ <mime-type type="application/vnd.symbian.install"> <comment>SIS package</comment> <comment xml:lang="ar">حزمة SIS</comment> + <comment xml:lang="ast">Paquete SIS</comment> <comment xml:lang="be@latin">Pakunak SIS</comment> <comment xml:lang="bg">Пакет — SIS</comment> <comment xml:lang="ca">paquet SIS</comment> @@ -6480,7 +6636,7 @@ <comment xml:lang="pt">pacote SIS</comment> <comment xml:lang="pt_BR">Pacote SIS</comment> <comment xml:lang="ro">Pachet SIS</comment> - <comment xml:lang="ru">пакет SIS</comment> + <comment xml:lang="ru">Пакет SIS</comment> <comment xml:lang="sk">Balíček SIS</comment> <comment xml:lang="sl">Datoteka paketa SIS</comment> <comment xml:lang="sq">Paketë SIS</comment> @@ -6502,6 +6658,7 @@ <mime-type type="x-epoc/x-sisx-app"> <comment>SISX package</comment> <comment xml:lang="ar">حزمة SISX</comment> + <comment xml:lang="ast">Paquete SISX</comment> <comment xml:lang="be@latin">Pakunak SISX</comment> <comment xml:lang="bg">Пакет — SISX</comment> <comment xml:lang="ca">paquet SISX</comment> @@ -6537,7 +6694,7 @@ <comment xml:lang="pt">pacote SISX</comment> <comment xml:lang="pt_BR">Pacote SISX</comment> <comment xml:lang="ro">Pachet SISX</comment> - <comment xml:lang="ru">пакет SISX</comment> + <comment xml:lang="ru">Пакет SISX</comment> <comment xml:lang="sk">Balíček SISX</comment> <comment xml:lang="sl">Datoteka paketa SISX</comment> <comment xml:lang="sq">Paketë SISX</comment> @@ -6569,6 +6726,7 @@ <comment xml:lang="eu">Sareko pakete kaptura</comment> <comment xml:lang="fi">Verkkopakettien kaappaus</comment> <comment xml:lang="fr">capture de paquet réseau</comment> + <comment xml:lang="ga">Gabháltas Paicéid Líonra</comment> <comment xml:lang="gl">Captura de Network Packet</comment> <comment xml:lang="he">לכידה של מנות נתונים ברשת</comment> <comment xml:lang="hr">Mrežno hvatanje paketa</comment> @@ -6586,7 +6744,7 @@ <comment xml:lang="pl">Przechwycenie pakietu sieciowego</comment> <comment xml:lang="pt">captura Network Packet</comment> <comment xml:lang="pt_BR">Pacote de captura de rede</comment> - <comment xml:lang="ru">захваченные сетевые пакеты</comment> + <comment xml:lang="ru">Захваченные сетевые пакеты</comment> <comment xml:lang="sk">Zachytené sieťové pakety</comment> <comment xml:lang="sl">Zajem omrežnih paketov</comment> <comment xml:lang="sr">Снимање мрежног пакета</comment> @@ -6608,6 +6766,7 @@ <mime-type type="application/vnd.wordperfect"> <comment>WordPerfect document</comment> <comment xml:lang="ar">مستند WordPerfect</comment> + <comment xml:lang="ast">Documentu de WordPerfect</comment> <comment xml:lang="az">WordPerfect sənədi</comment> <comment xml:lang="be@latin">Dakument WordPerfect</comment> <comment xml:lang="bg">Документ — WordPerfect</comment> @@ -6646,11 +6805,11 @@ <comment xml:lang="pt">documento WordPerfect</comment> <comment xml:lang="pt_BR">Documento do WordPerfect</comment> <comment xml:lang="ro">Document WordPerfect</comment> - <comment xml:lang="ru">документ WordPerfect</comment> + <comment xml:lang="ru">Документ WordPerfect</comment> <comment xml:lang="sk">Dokument WordPerfect</comment> <comment xml:lang="sl">Dokument WordPerfect</comment> <comment xml:lang="sq">Dokument WordPerfect</comment> - <comment xml:lang="sr">документ Ворд Перфекта</comment> + <comment xml:lang="sr">документ Ворд перфекта</comment> <comment xml:lang="sv">WordPerfect-dokument</comment> <comment xml:lang="tr">WordPerfect belgesi</comment> <comment xml:lang="uk">документ WordPerfect</comment> @@ -6671,6 +6830,12 @@ <glob pattern="*.wpd"/> <glob pattern="*.wpp"/> </mime-type> + <mime-type type="application/vnd.youtube.yt"> + <comment>YouTube Media Archive</comment> + <generic-icon name="video-x-generic"/> + <glob pattern="*.yt"/> + <sub-class-of type="application/zip"/> + </mime-type> <mime-type type="application/x-spss-por"> <comment>SPSS Portable Data File</comment> <comment xml:lang="ar">ملف بيانات SPSS متنقلة</comment> @@ -6704,7 +6869,7 @@ <comment xml:lang="pt">ficheiro de dados portátil SPSS</comment> <comment xml:lang="pt_BR">Arquivo de Dados Portáteis SPSS</comment> <comment xml:lang="ro">Fișier portabil de date SPSS</comment> - <comment xml:lang="ru">файл переносимых данных SPSS</comment> + <comment xml:lang="ru">Файл переносимых данных SPSS</comment> <comment xml:lang="sk">Súbor prenosných dát SPSS</comment> <comment xml:lang="sl">Prenosna podatkovna datoteka SPSS</comment> <comment xml:lang="sr">СПСС датотека преносних података</comment> @@ -6730,6 +6895,7 @@ <comment xml:lang="en_GB">SPSS Data File</comment> <comment xml:lang="es">archivo de datos SPSS</comment> <comment xml:lang="eu">SPSS datuen fitxategia</comment> + <comment xml:lang="fi">SPSS-datatiedosto</comment> <comment xml:lang="fo">SPSS dátufíla</comment> <comment xml:lang="fr">fichier de données SPSS</comment> <comment xml:lang="ga">comhad sonraí SPSS</comment> @@ -6751,7 +6917,7 @@ <comment xml:lang="pt">ficheiro de dados SPSS</comment> <comment xml:lang="pt_BR">Arquivo de dados SPSS</comment> <comment xml:lang="ro">Fișier date SPSS</comment> - <comment xml:lang="ru">файл данных SPSS</comment> + <comment xml:lang="ru">Файл данных SPSS</comment> <comment xml:lang="sk">Dátový súbor SPSS</comment> <comment xml:lang="sl">Podatkovna datoteka SPSS</comment> <comment xml:lang="sr">СПСС датотека података</comment> @@ -6788,7 +6954,7 @@ <comment xml:lang="ga">leabharmharcanna XBEL</comment> <comment xml:lang="gl">Marcadores XBEL</comment> <comment xml:lang="he">סימניית XBEL</comment> - <comment xml:lang="hr">XBEL knjižne oznake</comment> + <comment xml:lang="hr">XBEL zabilješka</comment> <comment xml:lang="hu">XBEL-könyvjelzők</comment> <comment xml:lang="ia">Marcapaginas XBEL</comment> <comment xml:lang="id">Bookmark XBEL</comment> @@ -6807,7 +6973,7 @@ <comment xml:lang="pt">marcadores XBEL</comment> <comment xml:lang="pt_BR">Marcadores do XBEL</comment> <comment xml:lang="ro">Semne de carte XBEL</comment> - <comment xml:lang="ru">закладки XBEL</comment> + <comment xml:lang="ru">Закладки XBEL</comment> <comment xml:lang="sk">Záložky XBEL</comment> <comment xml:lang="sl">Datoteka zaznamkov XBEL</comment> <comment xml:lang="sq">Libërshënues XBEL</comment> @@ -6830,6 +6996,7 @@ <mime-type type="application/x-7z-compressed"> <comment>7-zip archive</comment> <comment xml:lang="ar">أرشيف 7-zip</comment> + <comment xml:lang="ast">Archivu 7-zip</comment> <comment xml:lang="be@latin">Archiŭ 7-zip</comment> <comment xml:lang="bg">Архив — 7-zip</comment> <comment xml:lang="ca">arxiu 7-zip</comment> @@ -6866,7 +7033,7 @@ <comment xml:lang="pt">arquivo 7-zip</comment> <comment xml:lang="pt_BR">Pacote 7-Zip</comment> <comment xml:lang="ro">Arhivă 7-zip</comment> - <comment xml:lang="ru">архив 7-zip</comment> + <comment xml:lang="ru">Архив 7-zip</comment> <comment xml:lang="sk">Archív 7-zip</comment> <comment xml:lang="sl">Datoteka arhiva 7-zip</comment> <comment xml:lang="sq">Arkiv 7-zip</comment> @@ -6886,6 +7053,7 @@ <mime-type type="application/x-abiword"> <comment>AbiWord document</comment> <comment xml:lang="ar">مستند آبي وورد</comment> + <comment xml:lang="ast">Documentu d'AbiWord</comment> <comment xml:lang="be@latin">Dakument AbiWord</comment> <comment xml:lang="bg">Документ — AbiWord</comment> <comment xml:lang="ca">document AbiWord</comment> @@ -6923,7 +7091,7 @@ <comment xml:lang="pt">documento AbiWord</comment> <comment xml:lang="pt_BR">Documento do AbiWord</comment> <comment xml:lang="ro">Document AbiWord</comment> - <comment xml:lang="ru">документ AbiWord</comment> + <comment xml:lang="ru">Документ AbiWord</comment> <comment xml:lang="sk">Dokument AbiWord</comment> <comment xml:lang="sl">Dokument AbiWord</comment> <comment xml:lang="sq">Dokument AbiWord</comment> @@ -6961,7 +7129,7 @@ <comment xml:lang="eu">CD irudiaren CUE orria</comment> <comment xml:lang="fi">CD-vedos cuesheet</comment> <comment xml:lang="fr">index de pistes de CD</comment> - <comment xml:lang="ga">bileog chiúáil íomhá CD</comment> + <comment xml:lang="ga">bileog chiúála íomhá CD</comment> <comment xml:lang="gl">cue sheet dunha imaxe de CD</comment> <comment xml:lang="he">גליון נתונים לתמונת דיסק</comment> <comment xml:lang="hr">CD slika s meta podacima</comment> @@ -6982,11 +7150,11 @@ <comment xml:lang="pt">índice de CD de imagem</comment> <comment xml:lang="pt_BR">Índice de Imagem de CD</comment> <comment xml:lang="ro">Imagine CD cuesheet</comment> - <comment xml:lang="ru">таблица содержания образа CD</comment> + <comment xml:lang="ru">Таблица содержания образа CD</comment> <comment xml:lang="sk">Rozvrhnutie stôp obrazu CD</comment> <comment xml:lang="sl">Datoteka razpredelnice odtisa CD cue</comment> <comment xml:lang="sq">Cuesheet imazhi CD</comment> - <comment xml:lang="sr">редослед слика ЦД-а</comment> + <comment xml:lang="sr">Кју лист ЦД одраза</comment> <comment xml:lang="sv">Indexblad för cd-avbild</comment> <comment xml:lang="tr">CD görüntüsü belgesi</comment> <comment xml:lang="uk">таблиця CUE образу CD</comment> @@ -7000,6 +7168,7 @@ <mime-type type="application/x-amipro"> <comment>Lotus AmiPro document</comment> <comment xml:lang="ar">مستند Lotus AmiPro</comment> + <comment xml:lang="ast">Documentu de Lotus AmiPro</comment> <comment xml:lang="az">Lotus AmiPro sənədi</comment> <comment xml:lang="be@latin">Dakument Lotus AmiPro</comment> <comment xml:lang="bg">Документ — Lotus AmiPro</comment> @@ -7038,7 +7207,7 @@ <comment xml:lang="pt">documento Lotus AmiPro</comment> <comment xml:lang="pt_BR">Documento do Lotus AmiPro</comment> <comment xml:lang="ro">Document Lotus AmiPro</comment> - <comment xml:lang="ru">документ Lotus AmiPro</comment> + <comment xml:lang="ru">Документ Lotus AmiPro</comment> <comment xml:lang="sk">Dokument Lotus AmiPro</comment> <comment xml:lang="sl">Dokument Lotus AmiPro</comment> <comment xml:lang="sq">Dokument Lotus AmiPro</comment> @@ -7055,6 +7224,7 @@ <mime-type type="application/x-aportisdoc"> <comment>AportisDoc document</comment> <comment xml:lang="ar">مستند AportisDoc</comment> + <comment xml:lang="ast">Documentu d'AportisDoc</comment> <comment xml:lang="bg">Документ — AportisDoc</comment> <comment xml:lang="ca">document AportisDoc</comment> <comment xml:lang="cs">dokument AportisDoc</comment> @@ -7088,7 +7258,7 @@ <comment xml:lang="pt">documento AportisDoc</comment> <comment xml:lang="pt_BR">Documento do AportisDoc</comment> <comment xml:lang="ro">Document AportisDoc</comment> - <comment xml:lang="ru">документ AportisDoc</comment> + <comment xml:lang="ru">Документ AportisDoc</comment> <comment xml:lang="sk">Dokument AportisDoc</comment> <comment xml:lang="sl">Dokument AportisDoc</comment> <comment xml:lang="sr">Апортис Док документ</comment> @@ -7147,7 +7317,7 @@ <comment xml:lang="pt">folha de cálculo Applix Spreadsheets</comment> <comment xml:lang="pt_BR">Planilha do Applix Spreadsheets</comment> <comment xml:lang="ro">Foaie de calcul Applix</comment> - <comment xml:lang="ru">электронная таблица Applix Spreadsheets</comment> + <comment xml:lang="ru">Электронная таблица Applix Spreadsheets</comment> <comment xml:lang="sk">Zošit Applix Spreadsheets</comment> <comment xml:lang="sl">Razpredelnica Applix Spreadsheets</comment> <comment xml:lang="sq">Fletë llogaritjesh Applix Spreadsheets</comment> @@ -7156,7 +7326,7 @@ <comment xml:lang="tr">Applix Spreadsheets çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Applix Spreadsheets</comment> <comment xml:lang="vi">Bảng tính Applix Spreadsheets</comment> - <comment xml:lang="zh_CN">Applix Spreadsheets 工作簿</comment> + <comment xml:lang="zh_CN">Applix Spreadsheets 电子表格</comment> <comment xml:lang="zh_TW">Applix Spreadsheets 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -7170,6 +7340,7 @@ <mime-type type="application/x-applix-word"> <comment>Applix Words document</comment> <comment xml:lang="ar">مستند كلمات Applix</comment> + <comment xml:lang="ast">Documentu d'Applix Words</comment> <comment xml:lang="az">Applix Words sənədi</comment> <comment xml:lang="be@latin">Dakument Applix Words</comment> <comment xml:lang="bg">Документ — Applix Words</comment> @@ -7209,7 +7380,7 @@ <comment xml:lang="pt">documento Applix Words</comment> <comment xml:lang="pt_BR">Documento do Applix Words</comment> <comment xml:lang="ro">Document Applix Words</comment> - <comment xml:lang="ru">документ Applix Words</comment> + <comment xml:lang="ru">Документ Applix Words</comment> <comment xml:lang="sk">Dokument Applix Words</comment> <comment xml:lang="sl">Dokument Applix Words</comment> <comment xml:lang="sq">Dokument Applix Words</comment> @@ -7267,7 +7438,7 @@ <comment xml:lang="pt">arquivo ARC</comment> <comment xml:lang="pt_BR">Pacote ARC</comment> <comment xml:lang="ro">Arhivă ARC</comment> - <comment xml:lang="ru">архив ARC</comment> + <comment xml:lang="ru">Архив ARC</comment> <comment xml:lang="sk">Archív ARC</comment> <comment xml:lang="sl">Datoteka arhiva ARC</comment> <comment xml:lang="sq">Arkiv ARC</comment> @@ -7328,7 +7499,7 @@ <comment xml:lang="pt">arquivo AR</comment> <comment xml:lang="pt_BR">Pacote AR</comment> <comment xml:lang="ro">Arhivă AR</comment> - <comment xml:lang="ru">архив AR</comment> + <comment xml:lang="ru">Архив AR</comment> <comment xml:lang="sk">Archív AR</comment> <comment xml:lang="sl">Datoteka arhiva AR</comment> <comment xml:lang="sq">Arkiv AR</comment> @@ -7389,7 +7560,7 @@ <comment xml:lang="pt">arquivo ARJ</comment> <comment xml:lang="pt_BR">Pacote ARJ</comment> <comment xml:lang="ro">Arhivă ARJ</comment> - <comment xml:lang="ru">архив ARJ</comment> + <comment xml:lang="ru">Архив ARJ</comment> <comment xml:lang="sk">Archív ARJ</comment> <comment xml:lang="sl">Datoteka arhiva ARJ</comment> <comment xml:lang="sq">Arkiv ARJ</comment> @@ -7411,6 +7582,7 @@ <mime-type type="application/x-asp"> <comment>ASP page</comment> <comment xml:lang="ar">صفحة ASP</comment> + <comment xml:lang="ast">Páxina ASP</comment> <comment xml:lang="be@latin">Staronka ASP</comment> <comment xml:lang="bg">Страница — ASP</comment> <comment xml:lang="ca">pàgina ASP</comment> @@ -7447,7 +7619,7 @@ <comment xml:lang="pt">página ASP</comment> <comment xml:lang="pt_BR">Página ASP</comment> <comment xml:lang="ro">Pagină ASP</comment> - <comment xml:lang="ru">страница ASP</comment> + <comment xml:lang="ru">Страница ASP</comment> <comment xml:lang="sk">Stránka ASP</comment> <comment xml:lang="sl">Datoteka spletne strani ASP</comment> <comment xml:lang="sq">Faqe ASP</comment> @@ -7467,6 +7639,7 @@ <mime-type type="application/x-awk"> <comment>AWK script</comment> <comment xml:lang="ar">سكربت AWK</comment> + <comment xml:lang="ast">Script AWK</comment> <comment xml:lang="az">AWK skripti</comment> <comment xml:lang="be@latin">Skrypt AWK</comment> <comment xml:lang="bg">Скрипт — AWK</comment> @@ -7506,7 +7679,7 @@ <comment xml:lang="pt">script AWK</comment> <comment xml:lang="pt_BR">Script AWK</comment> <comment xml:lang="ro">Script AWK</comment> - <comment xml:lang="ru">сценарий AWK</comment> + <comment xml:lang="ru">Сценарий AWK</comment> <comment xml:lang="sk">Skript AWK</comment> <comment xml:lang="sl">Skriptna datoteka AWK</comment> <comment xml:lang="sq">Script AWK</comment> @@ -7537,6 +7710,7 @@ <mime-type type="application/x-bcpio"> <comment>BCPIO document</comment> <comment xml:lang="ar">مستند BCPIO</comment> + <comment xml:lang="ast">Documentu BCPIO</comment> <comment xml:lang="az">BCPIO sənədi</comment> <comment xml:lang="be@latin">Dakument BCPIO</comment> <comment xml:lang="bg">Документ — BCPIO</comment> @@ -7576,7 +7750,7 @@ <comment xml:lang="pt">documento BCPIO</comment> <comment xml:lang="pt_BR">Documento BCPIO</comment> <comment xml:lang="ro">Document BCPIO</comment> - <comment xml:lang="ru">документ BCPIO</comment> + <comment xml:lang="ru">Документ BCPIO</comment> <comment xml:lang="sk">Dokument BCPIO</comment> <comment xml:lang="sl">Dokument BCPIO</comment> <comment xml:lang="sq">Dokument BCPIO</comment> @@ -7633,7 +7807,7 @@ <comment xml:lang="pt">ficheiro de semente BitTorrent</comment> <comment xml:lang="pt_BR">Arquivo semente BitTorrent</comment> <comment xml:lang="ro">Fișier sursă-completă BitTorrent</comment> - <comment xml:lang="ru">файл источника BitTorrent</comment> + <comment xml:lang="ru">Файл источника BitTorrent</comment> <comment xml:lang="sk">Súbor BitTorrent</comment> <comment xml:lang="sl">Datoteka sejanja BitTorrent</comment> <comment xml:lang="sq">File bazë BitTorrent</comment> @@ -7652,6 +7826,7 @@ <mime-type type="application/x-blender"> <comment>Blender scene</comment> <comment xml:lang="ar">مشهد بلندر</comment> + <comment xml:lang="ast">Escena de Blender</comment> <comment xml:lang="be@latin">Scena Blender</comment> <comment xml:lang="bg">Сцена — Blender</comment> <comment xml:lang="ca">escena de Blender</comment> @@ -7689,7 +7864,7 @@ <comment xml:lang="pt">cenário Blender</comment> <comment xml:lang="pt_BR">Cena do Blender</comment> <comment xml:lang="ro">Scenă Blender</comment> - <comment xml:lang="ru">сцена Blender</comment> + <comment xml:lang="ru">Сцена Blender</comment> <comment xml:lang="sk">Scéna Blender</comment> <comment xml:lang="sl">Datoteka scene Blender</comment> <comment xml:lang="sq">Skenë Blender</comment> @@ -7711,6 +7886,7 @@ <mime-type type="application/x-bzdvi"> <comment>TeX DVI document (bzip-compressed)</comment> <comment xml:lang="ar">مستند TeX DVI (مضغوط-bzip)</comment> + <comment xml:lang="ast">Documentu Tex DVI (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Dakument TeX DVI (bzip-skampresavany)</comment> <comment xml:lang="bg">Документ — TeX DVI, компресиран с bzip</comment> <comment xml:lang="ca">document de TeX DVI (amb compressió bzip)</comment> @@ -7727,7 +7903,7 @@ <comment xml:lang="ga">cáipéis DVI TeX (comhbhrúite le bzip)</comment> <comment xml:lang="gl">documento DVI de TeX (comprimido con bzip)</comment> <comment xml:lang="he">מסמך מסוג TeX DVI (מכווץ ע״י bzip)</comment> - <comment xml:lang="hr">TeX DVI dokument (komprimiran bzip-om)</comment> + <comment xml:lang="hr">TeX DVI dokument (bzip sažeto)</comment> <comment xml:lang="hu">TeX DVI dokumentum (bzip-pel tömörítve)</comment> <comment xml:lang="ia">Documento TeX DVI (comprimite con bzip)</comment> <comment xml:lang="id">Dokumen TeX DVI (terkompresi bzip)</comment> @@ -7745,7 +7921,7 @@ <comment xml:lang="pt">documento TeX DVI (compressão bzip)</comment> <comment xml:lang="pt_BR">Documento DVI TeX (compactado com bzip)</comment> <comment xml:lang="ro">Document TeX DVI (comprimat bzip)</comment> - <comment xml:lang="ru">документ TeX DVI (сжатый bzip)</comment> + <comment xml:lang="ru">Документ TeX DVI (сжатый bzip)</comment> <comment xml:lang="sk">Dokument TeX DVI (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Dokument TeX DVI (stisnjen z bzip)</comment> <comment xml:lang="sq">Dokument Tex DVI (i kompresuar me bzip)</comment> @@ -7754,7 +7930,7 @@ <comment xml:lang="tr">TeX DVI belgesi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ TeX DVI (стиснений bzip)</comment> <comment xml:lang="vi">Tài liệu DVI TeX (đã nén bzip)</comment> - <comment xml:lang="zh_CN">TeX DVI 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">TeX DVI 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">TeX DVI 文件 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <generic-icon name="x-office-document"/> @@ -7763,6 +7939,7 @@ <mime-type type="application/x-bzip"> <comment>Bzip archive</comment> <comment xml:lang="ar">أرشيف Bzip</comment> + <comment xml:lang="ast">Archivu Bzip</comment> <comment xml:lang="be@latin">Archiŭ bzip</comment> <comment xml:lang="bg">Архив — bzip</comment> <comment xml:lang="ca">arxiu bzip</comment> @@ -7799,7 +7976,7 @@ <comment xml:lang="pt">arquivo Bzip</comment> <comment xml:lang="pt_BR">Pacote Bzip</comment> <comment xml:lang="ro">Arhivă Bzip</comment> - <comment xml:lang="ru">архив BZIP</comment> + <comment xml:lang="ru">Архив BZIP</comment> <comment xml:lang="sk">Archív bzip</comment> <comment xml:lang="sl">Datoteka arhiva Bzip</comment> <comment xml:lang="sq">Arkiv bzip</comment> @@ -7808,7 +7985,7 @@ <comment xml:lang="tr">Bzip arşivi</comment> <comment xml:lang="uk">архів bzip</comment> <comment xml:lang="vi">Kho nén bzip</comment> - <comment xml:lang="zh_CN">bzip 归档文件</comment> + <comment xml:lang="zh_CN">Bzip 归档文件</comment> <comment xml:lang="zh_TW">Bzip 封存檔</comment> <generic-icon name="package-x-generic"/> <magic priority="50"> @@ -7821,6 +7998,7 @@ <mime-type type="application/x-bzip-compressed-tar"> <comment>Tar archive (bzip-compressed)</comment> <comment xml:lang="ar">أرشيف Tar (مضغوط-bzip)</comment> + <comment xml:lang="ast">Archivu Tar (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Archiŭ tar (bzip-skampresavany)</comment> <comment xml:lang="bg">Архив — tar, компресиран с bzip</comment> <comment xml:lang="ca">arxiu tar (amb compressió bzip)</comment> @@ -7837,7 +8015,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le bzip)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con bzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י bzip)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana bzip-om)</comment> + <comment xml:lang="hr">Tar arhiva (bzip sažeto)</comment> <comment xml:lang="hu">Tar archívum (bzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con bzip)</comment> <comment xml:lang="id">Arsip Tar (terkompresi bzip)</comment> @@ -7855,7 +8033,7 @@ <comment xml:lang="pt">arquivo Tar (compressão bzip)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com bzip)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată bzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый BZIP)</comment> + <comment xml:lang="ru">Архив TAR (сжатый bzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z bzip)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me bzip)</comment> @@ -7864,7 +8042,7 @@ <comment xml:lang="tr">Tar arşivi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений bzip)</comment> <comment xml:lang="vi">Kho nén tar (đã nén bzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(bzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（bzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (bzip 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-bzip"/> @@ -7877,6 +8055,7 @@ <mime-type type="application/x-bzpdf"> <comment>PDF document (bzip-compressed)</comment> <comment xml:lang="ar">مستند PDF (مضغوط-bzip)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Dakument PDF (bzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PDF, компресиран с bzip</comment> <comment xml:lang="ca">document PDF (amb compressió bzip)</comment> @@ -7911,7 +8090,7 @@ <comment xml:lang="pt">documento PDF (compressão bzip)</comment> <comment xml:lang="pt_BR">Documento PDF (compactado com bzip)</comment> <comment xml:lang="ro">Document PDF (comprimat bzip)</comment> - <comment xml:lang="ru">документ PDF (сжатый bzip)</comment> + <comment xml:lang="ru">Документ PDF (сжатый bzip)</comment> <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Dokument PDF (stisnjen z bzip)</comment> <comment xml:lang="sq">Dokument PDF (i kompresuar me bzip)</comment> @@ -7920,7 +8099,7 @@ <comment xml:lang="tr">PDF belgesi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PDF (стиснений bzip)</comment> <comment xml:lang="vi">Tài liệu PDF (đã nén bzip)</comment> - <comment xml:lang="zh_CN">PDF 文档(bzip 压缩)</comment> + <comment xml:lang="zh_CN">PDF 文档（bzip 压缩）</comment> <comment xml:lang="zh_TW">PDF 文件 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <generic-icon name="x-office-document"/> @@ -7929,6 +8108,7 @@ <mime-type type="application/x-bzpostscript"> <comment>PostScript document (bzip-compressed)</comment> <comment xml:lang="ar">مستند PostScript (مضغوط-bzip)</comment> + <comment xml:lang="ast">Documentu PostScript (comprimíu en bzip)</comment> <comment xml:lang="be@latin">Dakument PostScript (bzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PostScript, компресиран с bzip</comment> <comment xml:lang="ca">document PostScript (amb compressió bzip)</comment> @@ -7963,7 +8143,7 @@ <comment xml:lang="pt">documento PostScript (compressão bzip)</comment> <comment xml:lang="pt_BR">Documento PostScript (compactado com bzip)</comment> <comment xml:lang="ro">Document PostScript (comprimat bzip)</comment> - <comment xml:lang="ru">документ PostScript (сжатый bzip)</comment> + <comment xml:lang="ru">Документ PostScript (сжатый bzip)</comment> <comment xml:lang="sk">Dokument PostScript (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Dokument PostScript (stisnjen z bzip)</comment> <comment xml:lang="sq">Dokument PostScript (i kompresuar me bzip)</comment> @@ -7972,13 +8152,13 @@ <comment xml:lang="tr">PostScript belgesi (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PostScript (стиснене bzip)</comment> <comment xml:lang="vi">Tài liệu PostScript (đã nén bzip)</comment> - <comment xml:lang="zh_CN">PostScript 文档(bzip 压缩)</comment> + <comment xml:lang="zh_CN">PostScript 文档（bzip 压缩）</comment> <comment xml:lang="zh_TW">PostScript 文件 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <generic-icon name="x-office-document"/> <glob pattern="*.ps.bz2"/> </mime-type> - <mime-type type="application/x-cbr"> + <mime-type type="application/vnd.comicbook-rar"> <comment>comic book archive</comment> <comment xml:lang="ar">أرشيف comic book</comment> <comment xml:lang="be@latin">archiŭ komiksaŭ</comment> @@ -8015,7 +8195,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8024,11 +8204,12 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/vnd.rar"/> <generic-icon name="x-office-document"/> <glob pattern="*.cbr"/> + <alias type="application/x-cbr"/> </mime-type> <mime-type type="application/x-cb7"> <comment>comic book archive</comment> @@ -8067,7 +8248,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8076,7 +8257,7 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/x-7z-compressed"/> <generic-icon name="x-office-document"/> @@ -8119,7 +8300,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8128,7 +8309,7 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/x-tar"/> <generic-icon name="x-office-document"/> @@ -8171,7 +8352,7 @@ <comment xml:lang="pt">arquivo de banda desenhada</comment> <comment xml:lang="pt_BR">Pacote de histórias em quadrinhos</comment> <comment xml:lang="ro">arhivă benzi desenate</comment> - <comment xml:lang="ru">архив комиксов</comment> + <comment xml:lang="ru">Архив комиксов</comment> <comment xml:lang="sk">Archív knihy komiksov</comment> <comment xml:lang="sl">Datoteka arhiva stripov</comment> <comment xml:lang="sq">Arkiv comic book</comment> @@ -8180,7 +8361,7 @@ <comment xml:lang="tr">çizgi roman arşivi</comment> <comment xml:lang="uk">архів коміксів</comment> <comment xml:lang="vi">Kho nén sách tranh chuyện vui</comment> - <comment xml:lang="zh_CN">Comic Book 归档文件</comment> + <comment xml:lang="zh_CN">漫画书归档文件</comment> <comment xml:lang="zh_TW">漫畫書封存檔</comment> <sub-class-of type="application/zip"/> <generic-icon name="x-office-document"/> @@ -8222,7 +8403,7 @@ <comment xml:lang="pt">arquivo Lrzip</comment> <comment xml:lang="pt_BR">Pacote Lrzip</comment> <comment xml:lang="ro">Arhivă Lrzip</comment> - <comment xml:lang="ru">архив LRZIP</comment> + <comment xml:lang="ru">Архив LRZIP</comment> <comment xml:lang="sk">Archív Lrzip</comment> <comment xml:lang="sl">Datoteka arhiva Lrzip</comment> <comment xml:lang="sr">Лрзип архива</comment> @@ -8255,7 +8436,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le lrzip)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con lrzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י lrzip)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana lrzip-om)</comment> + <comment xml:lang="hr">Tar arhiva (lrzip sažeta)</comment> <comment xml:lang="hu">Tar archívum (lrzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con lrzip)</comment> <comment xml:lang="id">Arsip Tar (terkompresi lrzip)</comment> @@ -8271,14 +8452,14 @@ <comment xml:lang="pt">arquivo Tar (compressão Lrzip)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com lrzip)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată lrzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый LRZIP)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lrzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou lrzip)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z lrzip)</comment> <comment xml:lang="sr">Тар архива (запакована лрзипом)</comment> <comment xml:lang="sv">Tar-arkiv (lrzip-komprimerat)</comment> <comment xml:lang="tr">Tar arşivi (lrzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений lrzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (lrzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（lrzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (lrzip 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-lrzip"/> @@ -8287,6 +8468,7 @@ </mime-type> <mime-type type="application/x-apple-diskimage"> <comment>Apple disk image</comment> + <comment xml:lang="ast">Imaxe de discu d'Apple</comment> <comment xml:lang="bg">Диск — Apple</comment> <comment xml:lang="ca">imatge de disc d'Apple</comment> <comment xml:lang="cs">obraz disku Apple</comment> @@ -8298,9 +8480,10 @@ <comment xml:lang="eu">Apple disko irudia</comment> <comment xml:lang="fi">Apple-levytiedosto</comment> <comment xml:lang="fr">image disque Apple</comment> + <comment xml:lang="ga">íomhá diosca Apple</comment> <comment xml:lang="gl">imaxe de disco de Appl</comment> <comment xml:lang="he">תמונת כונן Apple</comment> - <comment xml:lang="hr">Apple snimka diska</comment> + <comment xml:lang="hr">Apple slika diska</comment> <comment xml:lang="hu">Apple lemezkép</comment> <comment xml:lang="ia">Imagine de disco Apple</comment> <comment xml:lang="id">Image disk Apple</comment> @@ -8315,95 +8498,107 @@ <comment xml:lang="pl">Obraz dysku Apple</comment> <comment xml:lang="pt">imagem de disco Apple</comment> <comment xml:lang="pt_BR">Imagem de disco Apple</comment> - <comment xml:lang="ru">образ диска Apple Mac OS X</comment> + <comment xml:lang="ru">Образ диска Apple Mac OS X</comment> <comment xml:lang="sk">Obraz disku Apple</comment> <comment xml:lang="sl">Odtis diska Apple</comment> - <comment xml:lang="sr">Еплова слика диска</comment> + <comment xml:lang="sr">Еплов одраз диска</comment> <comment xml:lang="sv">Apple-diskavbild</comment> <comment xml:lang="tr">Apple disk görüntüsü</comment> <comment xml:lang="uk">образ диска Apple</comment> - <comment xml:lang="zh_CN">Apple 磁盘镜像</comment> - <comment xml:lang="zh_TW">Apple 磁碟映像</comment> + <comment xml:lang="zh_CN">Apple 磁盘映像</comment> + <comment xml:lang="zh_TW">Apple 磁碟映像檔</comment> <glob pattern="*.dmg"/> </mime-type> <mime-type type="application/x-raw-disk-image"> - <comment>Raw disk image</comment> - <comment xml:lang="ca">imatge de disc RAW</comment> - <comment xml:lang="cs">surový obraz disku</comment> - <comment xml:lang="da">Rå diskaftryk</comment> - <comment xml:lang="de">Rohes Datenträgerabbild</comment> - <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου</comment> - <comment xml:lang="en_GB">Raw disk image</comment> - <comment xml:lang="es">imagen de disco en bruto</comment> - <comment xml:lang="eu">Disko gordinaren irudia</comment> - <comment xml:lang="fi">Raaka levytiedosto</comment> - <comment xml:lang="fr">image disque Raw</comment> - <comment xml:lang="gl">Imaxe de disco en bruto</comment> - <comment xml:lang="he">דמות גולמית של כונן</comment> - <comment xml:lang="hr">Osnovna slika diska</comment> - <comment xml:lang="hu">Nyers lemezkép</comment> - <comment xml:lang="ia">Imagine de disco crude</comment> - <comment xml:lang="id">Image disk mentah</comment> - <comment xml:lang="it">Immagine disco raw</comment> - <comment xml:lang="kk">Шикі диск бейнесі</comment> - <comment xml:lang="ko">RAW 디스크 이미지</comment> - <comment xml:lang="oc">imatge disc Raw</comment> - <comment xml:lang="pl">Surowy obraz dysku</comment> - <comment xml:lang="pt">imagem de disco Raw</comment> - <comment xml:lang="pt_BR">Imagem bruta de disco</comment> - <comment xml:lang="ru">необработанный образ диска</comment> - <comment xml:lang="sk">Obraz disku</comment> - <comment xml:lang="sl">Surovi odtis diska</comment> - <comment xml:lang="sr">сирова слика диска</comment> - <comment xml:lang="sv">Rå diskavbild</comment> - <comment xml:lang="tr">İşlem görmemiş disk imajı</comment> - <comment xml:lang="uk">простий образ диска</comment> - <comment xml:lang="zh_CN">原始磁盘镜像</comment> - <comment xml:lang="zh_TW">原生磁碟映像</comment> - <glob pattern="*.raw-disk-image"/> - <glob pattern="*.img"/> - </mime-type> - <mime-type type="application/x-raw-disk-image-xz-compressed"> - <comment>Raw disk image (XZ-compressed)</comment> - <comment xml:lang="ca">imatge de disc RAW (amb compressió XZ)</comment> - <comment xml:lang="cs">surový obraz disku (komprimovaný pomocí XZ)</comment> - <comment xml:lang="da">Rå diskaftryk (XZ-komprimeret)</comment> - <comment xml:lang="de">Rohes Datenträgerabbild (XZ-komprimiert)</comment> - <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου (συμπιεσμένη XZ)</comment> - <comment xml:lang="en_GB">Raw disk image (XZ-compressed)</comment> - <comment xml:lang="es">imagen de disco en bruto (comprimida con XZ)</comment> - <comment xml:lang="eu">Disko gordinaren irudia (XZ-rekin konprimitua)</comment> - <comment xml:lang="fi">Raaka levytiedosto (XZ-pakattu)</comment> - <comment xml:lang="fr">image disque Raw (compression XZ)</comment> - <comment xml:lang="gl">Imaxe de disco en bruto (comprimida en XZ)</comment> - <comment xml:lang="he">דמות גולמית של כונן (בדחיסת XZ)</comment> - <comment xml:lang="hr">Osnovna slika diska (XZ sažeta)</comment> - <comment xml:lang="hu">Nyers lemezkép (XZ-vel tömörítve)</comment> - <comment xml:lang="ia">Imagine de disco crude (comprimite con XZ)</comment> - <comment xml:lang="id">Image disk mentah (terkompresi XZ)</comment> - <comment xml:lang="it">Immagine disco raw (compressa XZ)</comment> - <comment xml:lang="kk">Шикі диск бейнесі (XZ-мен сығылған)</comment> - <comment xml:lang="ko">RAW 디스크 이미지(XZ 압축)</comment> - <comment xml:lang="oc">imatge disc Raw (compression XZ)</comment> - <comment xml:lang="pl">Surowy obraz dysku (kompresja XZ)</comment> - <comment xml:lang="pt">imagem de disco Raw (compressão XZ)</comment> - <comment xml:lang="pt_BR">Imagem bruta de disco (compactada com XZ)</comment> - <comment xml:lang="ru">необработанный образ диска (XZ-сжатый)</comment> - <comment xml:lang="sk">Obraz disku (komprimovaný pomocou XZ)</comment> - <comment xml:lang="sl">Surovi odtis diska (stisnjeno z XZ)</comment> - <comment xml:lang="sr">сирова слика диска (запакована ИксЗ-ом)</comment> - <comment xml:lang="sv">Rå diskavbild (XZ-komprimerad)</comment> - <comment xml:lang="tr">İşlem görmemiş disk imajı (XZ ile sıkıştırılmış)</comment> - <comment xml:lang="uk">простий образ диска (стиснений XZ)</comment> - <comment xml:lang="zh_CN">原始磁盘镜像(XZ 压缩)</comment> - <comment xml:lang="zh_TW">原生磁碟映像 (XZ 格式壓縮)</comment> - <sub-class-of type="application/x-xz"/> - <glob pattern="*.raw-disk-image.xz"/> - <glob pattern="*.img.xz"/> - </mime-type> + <comment>Raw disk image</comment> + <comment xml:lang="ast">Imaxe de discu en bruto</comment> + <comment xml:lang="ca">imatge de disc RAW</comment> + <comment xml:lang="cs">surový obraz disku</comment> + <comment xml:lang="da">Rå diskaftryk</comment> + <comment xml:lang="de">Rohes Datenträgerabbild</comment> + <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου</comment> + <comment xml:lang="en_GB">Raw disk image</comment> + <comment xml:lang="es">imagen de disco en bruto</comment> + <comment xml:lang="eu">Disko gordinaren irudia</comment> + <comment xml:lang="fi">Raaka levytiedosto</comment> + <comment xml:lang="fr">image disque Raw</comment> + <comment xml:lang="ga">Amhíomha diosca</comment> + <comment xml:lang="gl">Imaxe de disco en bruto</comment> + <comment xml:lang="he">דמות גולמית של כונן</comment> + <comment xml:lang="hr">Osnovna slika diska</comment> + <comment xml:lang="hu">Nyers lemezkép</comment> + <comment xml:lang="ia">Imagine de disco crude</comment> + <comment xml:lang="id">Image disk mentah</comment> + <comment xml:lang="it">Immagine disco raw</comment> + <comment xml:lang="kk">Шикі диск бейнесі</comment> + <comment xml:lang="ko">RAW 디스크 이미지</comment> + <comment xml:lang="oc">imatge disc Raw</comment> + <comment xml:lang="pl">Surowy obraz dysku</comment> + <comment xml:lang="pt">imagem de disco Raw</comment> + <comment xml:lang="pt_BR">Imagem bruta de disco</comment> + <comment xml:lang="ru">Необработанный образ диска</comment> + <comment xml:lang="sk">Obraz disku</comment> + <comment xml:lang="sl">Surovi odtis diska</comment> + <comment xml:lang="sr">сиров одраз диска</comment> + <comment xml:lang="sv">Rå diskavbild</comment> + <comment xml:lang="tr">İşlem görmemiş disk imajı</comment> + <comment xml:lang="uk">простий образ диска</comment> + <comment xml:lang="zh_CN">原始磁盘映像</comment> + <comment xml:lang="zh_TW">原生磁碟映像檔</comment> + <glob pattern="*.raw-disk-image"/> + <glob pattern="*.img"/> + </mime-type> + <mime-type type="application/x-raw-floppy-disk-image"> + <comment>Floppy disk image</comment> + <sub-class-of type="application/x-raw-disk-image"/> + <alias type="application/x-fd-file"/> + <glob pattern="*.fd"/> + <glob pattern="*.qd"/> + </mime-type> + <mime-type type="application/x-raw-disk-image-xz-compressed"> + <comment>Raw disk image (XZ-compressed)</comment> + <comment xml:lang="ast">Imaxe de discu en bruto (comprimida en XZ)</comment> + <comment xml:lang="ca">imatge de disc RAW (amb compressió XZ)</comment> + <comment xml:lang="cs">surový obraz disku (komprimovaný pomocí XZ)</comment> + <comment xml:lang="da">Rå diskaftryk (XZ-komprimeret)</comment> + <comment xml:lang="de">Rohes Datenträgerabbild (XZ-komprimiert)</comment> + <comment xml:lang="el">Ανεπεξέργαστη εικόνα δίσκου (συμπιεσμένη XZ)</comment> + <comment xml:lang="en_GB">Raw disk image (XZ-compressed)</comment> + <comment xml:lang="es">imagen de disco en bruto (comprimida con XZ)</comment> + <comment xml:lang="eu">Disko gordinaren irudia (XZ-rekin konprimitua)</comment> + <comment xml:lang="fi">Raaka levytiedosto (XZ-pakattu)</comment> + <comment xml:lang="fr">image disque Raw (compression XZ)</comment> + <comment xml:lang="ga">Amhíomhá (comhbhrúite le XZ)</comment> + <comment xml:lang="gl">Imaxe de disco en bruto (comprimida en XZ)</comment> + <comment xml:lang="he">דמות גולמית של כונן (בדחיסת XZ)</comment> + <comment xml:lang="hr">Osnovna slika diska (XZ sažeta)</comment> + <comment xml:lang="hu">Nyers lemezkép (XZ-vel tömörítve)</comment> + <comment xml:lang="ia">Imagine de disco crude (comprimite con XZ)</comment> + <comment xml:lang="id">Image disk mentah (terkompresi XZ)</comment> + <comment xml:lang="it">Immagine disco raw (compressa XZ)</comment> + <comment xml:lang="kk">Шикі диск бейнесі (XZ-мен сығылған)</comment> + <comment xml:lang="ko">RAW 디스크 이미지(XZ 압축)</comment> + <comment xml:lang="oc">imatge disc Raw (compression XZ)</comment> + <comment xml:lang="pl">Surowy obraz dysku (kompresja XZ)</comment> + <comment xml:lang="pt">imagem de disco Raw (compressão XZ)</comment> + <comment xml:lang="pt_BR">Imagem bruta de disco (compactada com XZ)</comment> + <comment xml:lang="ru">Необработанный образ диска (сжатый xz)</comment> + <comment xml:lang="sk">Obraz disku (komprimovaný pomocou XZ)</comment> + <comment xml:lang="sl">Surovi odtis diska (stisnjeno z XZ)</comment> + <comment xml:lang="sr">сиров одраз диска (запакована ИксЗ-ом)</comment> + <comment xml:lang="sv">Rå diskavbild (XZ-komprimerad)</comment> + <comment xml:lang="tr">İşlem görmemiş disk imajı (XZ ile sıkıştırılmış)</comment> + <comment xml:lang="uk">простий образ диска (стиснений XZ)</comment> + <comment xml:lang="zh_CN">原始磁盘映像（XZ 压缩）</comment> + <comment xml:lang="zh_TW">原生磁碟映像 (XZ 格式壓縮)</comment> + <sub-class-of type="application/x-xz"/> + <glob pattern="*.raw-disk-image.xz"/> + <glob pattern="*.img.xz"/> + </mime-type> <mime-type type="application/x-cd-image"> <comment>raw CD image</comment> <comment xml:lang="ar">صورة CD خامة</comment> + <comment xml:lang="ast">imaxe de CD en bruto</comment> <comment xml:lang="be@latin">suvoraja vyjava CD</comment> <comment xml:lang="bg">Изображение — raw CD</comment> <comment xml:lang="ca">imatge de CD en cru</comment> @@ -8440,17 +8635,17 @@ <comment xml:lang="pt">imagem em bruto de CD</comment> <comment xml:lang="pt_BR">Imagem bruta de CD</comment> <comment xml:lang="ro">imagine de CD brută</comment> - <comment xml:lang="ru">необработанный образ компакт-диска</comment> + <comment xml:lang="ru">Необработанный образ компакт-диска</comment> <comment xml:lang="sk">Surový obraz CD</comment> <comment xml:lang="sl">surovi CD odtis</comment> <comment xml:lang="sq">Imazh raw CD</comment> - <comment xml:lang="sr">сирова слика ЦД-а</comment> + <comment xml:lang="sr">сиров одраз ЦД-а</comment> <comment xml:lang="sv">rå cd-avbild</comment> <comment xml:lang="tr">Ham CD görüntüsü</comment> <comment xml:lang="uk">образ raw CD</comment> <comment xml:lang="vi">ảnh đĩa CD thô</comment> <comment xml:lang="zh_CN">原始 CD 映像</comment> - <comment xml:lang="zh_TW">原生 CD 映像</comment> + <comment xml:lang="zh_TW">原生 CD 映像檔</comment> <sub-class-of type="application/x-raw-disk-image"/> <alias type="application/x-iso9660-image"/> @@ -8460,20 +8655,31 @@ <mime-type type="application/x-iso9660-appimage"> <comment>AppImage application bundle</comment> <comment xml:lang="ca">paquet d'aplicació AppImage</comment> + <comment xml:lang="cs">balíček AppImage s aplikací</comment> <comment xml:lang="da">Applmage-programsamling</comment> <comment xml:lang="de">AppImage-Anwendungspaket</comment> + <comment xml:lang="en_GB">AppImage application bundle</comment> <comment xml:lang="es">paquete de aplicación AppImage</comment> + <comment xml:lang="eu">AppImage aplikazio bilduma</comment> + <comment xml:lang="fi">AppImage-sovelluspaketti</comment> <comment xml:lang="fr">lot applicatif AppImage</comment> + <comment xml:lang="ga">burla feidhmchláir AppImage</comment> <comment xml:lang="he">חבילת יישומי AppImage</comment> + <comment xml:lang="hr">AppImage paket aplikacije</comment> <comment xml:lang="hu">AppImage alkalmazáscsomag</comment> + <comment xml:lang="id">bundel aplikasi AppImage</comment> + <comment xml:lang="it">Bundle applicazione AppImage</comment> <comment xml:lang="kk">AppImage қолданбалар дестесі</comment> <comment xml:lang="ko">AppImage 프로그램 번들</comment> <comment xml:lang="pl">Pakiet programu AppImage</comment> <comment xml:lang="pt_BR">Pacote de aplicativo AppImage</comment> - <comment xml:lang="ru">пакет приложений AppImage</comment> + <comment xml:lang="ru">Пакет приложения AppImage</comment> <comment xml:lang="sk">Balík aplikácií AppImage</comment> + <comment xml:lang="sr">скуп програма Ап-слике</comment> + <comment xml:lang="sv">AppImage-programbunt</comment> + <comment xml:lang="tr">AppImage uygulama paketi</comment> <comment xml:lang="uk">пакунок із програмами AppImage</comment> - <comment xml:lang="zh_CN">AppImage 应用包</comment> + <comment xml:lang="zh_CN">AppImage 应用组合包</comment> <comment xml:lang="zh_TW">AppImage 應用程式套組</comment> <sub-class-of type="application/x-executable"/> <sub-class-of type="application/x-iso9660-image"/> @@ -8488,7 +8694,6 @@ </match> </magic> <glob pattern="*.appimage"/> - <glob pattern="*.AppImage"/> </mime-type> <mime-type type="application/x-cdrdao-toc"> <comment>CD Table Of Contents</comment> @@ -8527,7 +8732,7 @@ <comment xml:lang="pt">Tabela de conteúdos de CD</comment> <comment xml:lang="pt_BR">Sumário de CD</comment> <comment xml:lang="ro">Tabel conținut CD</comment> - <comment xml:lang="ru">таблица содержания CD</comment> + <comment xml:lang="ru">Таблица содержания CD</comment> <comment xml:lang="sk">Obsah CD</comment> <comment xml:lang="sl">Kazalo vsebine CD nosilca</comment> <comment xml:lang="sq">Tregues CD</comment> @@ -8588,7 +8793,7 @@ <comment xml:lang="pt">notação de jogo de xadrez PGN</comment> <comment xml:lang="pt_BR">Notação de jogo de xadrez PGN</comment> <comment xml:lang="ro">Notație joc șah PGN</comment> - <comment xml:lang="ru">шахматная партия PGN</comment> + <comment xml:lang="ru">Шахматная партия PGN</comment> <comment xml:lang="sk">Šachová notácia PGN</comment> <comment xml:lang="sl">Datoteka opomb šahovske igre PGN</comment> <comment xml:lang="sq">Njoftim loje shahu PGN</comment> @@ -8612,6 +8817,7 @@ <mime-type type="application/vnd.ms-htmlhelp"> <comment>CHM document</comment> <comment xml:lang="ar">مستند CHM</comment> + <comment xml:lang="ast">Documentu CHM</comment> <comment xml:lang="be@latin">Dakument CHM</comment> <comment xml:lang="bg">Документ — CHM</comment> <comment xml:lang="ca">document CHM</comment> @@ -8648,7 +8854,7 @@ <comment xml:lang="pt">documento CHM</comment> <comment xml:lang="pt_BR">Documento CHM</comment> <comment xml:lang="ro">Document CHM</comment> - <comment xml:lang="ru">документ CHM</comment> + <comment xml:lang="ru">Документ CHM</comment> <comment xml:lang="sk">Dokument CHM</comment> <comment xml:lang="sl">Dokument CHM</comment> <comment xml:lang="sq">Dokument CHM</comment> @@ -8706,7 +8912,7 @@ <comment xml:lang="pt">byte-code Java</comment> <comment xml:lang="pt_BR">Código compilado Java</comment> <comment xml:lang="ro">Bytecode Java</comment> - <comment xml:lang="ru">байт-код Java</comment> + <comment xml:lang="ru">Байт-код Java</comment> <comment xml:lang="sk">Bajtový kód Java</comment> <comment xml:lang="sl">Datoteka bitne kode Java</comment> <comment xml:lang="sq">Byte code Java</comment> @@ -8738,7 +8944,7 @@ <comment xml:lang="ga">comhad UNIX-comhbhrúite</comment> <comment xml:lang="gl">ficheiro comprimido de UNIX</comment> <comment xml:lang="he">קובץ בכיווץ UNIX</comment> - <comment xml:lang="hr">UNIX-komprimirana datoteka</comment> + <comment xml:lang="hr">UNIX sažeta datoteka</comment> <comment xml:lang="hu">Tömörített UNIX-fájl</comment> <comment xml:lang="ia">File comprimite de UNIX</comment> <comment xml:lang="id">Berkas terkompresi UNIX</comment> @@ -8757,7 +8963,7 @@ <comment xml:lang="pt">ficheiro comprimido UNIX</comment> <comment xml:lang="pt_BR">Arquivo compactado do UNIX</comment> <comment xml:lang="ro">Fișier comprimat UNIX</comment> - <comment xml:lang="ru">файл (UNIX-сжатый)</comment> + <comment xml:lang="ru">Файл (UNIX-сжатый)</comment> <comment xml:lang="sk">Súbor komprimovaný v Unixe</comment> <comment xml:lang="sl">Skrčena Unix datoteka</comment> <comment xml:lang="sq">File i kompresuar UNIX</comment> @@ -8793,7 +8999,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le gzip)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con gzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana gzip-om)</comment> + <comment xml:lang="hr">Tar arhiva (gzip sažeta)</comment> <comment xml:lang="hu">Tar archívum (gzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con gzip)</comment> <comment xml:lang="id">Arsip Tar (terkompresi gzip)</comment> @@ -8811,7 +9017,7 @@ <comment xml:lang="pt">arquivo Tar (compressão gzip)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com gzip)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată gzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый GZIP)</comment> + <comment xml:lang="ru">Архив TAR (сжатый gzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z gzip)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me gzip)</comment> @@ -8820,7 +9026,7 @@ <comment xml:lang="tr">Tar arşivi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений gzip)</comment> <comment xml:lang="vi">Kho nén tar (đã nén gzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(gzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（gzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="package-x-generic"/> @@ -8844,7 +9050,7 @@ <comment xml:lang="fi">ohjelman kaatumistiedot</comment> <comment xml:lang="fo">forrits sordáta</comment> <comment xml:lang="fr">données de plantage de programme</comment> - <comment xml:lang="ga">sonraí thuairt ríomhchláir</comment> + <comment xml:lang="ga">sonraí tuairte ríomhchláir</comment> <comment xml:lang="gl">datos de colgue do programa</comment> <comment xml:lang="he">מידע מקריסת תכנית</comment> <comment xml:lang="hr">podaci o rušenju programa</comment> @@ -8866,7 +9072,7 @@ <comment xml:lang="pt">dados de rebentamento de aplicação</comment> <comment xml:lang="pt_BR">Dados de travamento de programa</comment> <comment xml:lang="ro">date eroare program</comment> - <comment xml:lang="ru">данные аварийного завершения</comment> + <comment xml:lang="ru">Данные аварийного завершения программы</comment> <comment xml:lang="sk">Údaje o páde programu</comment> <comment xml:lang="sl">podatki sesutja programa</comment> <comment xml:lang="sq">Të dhëna nga programi i bllokuar</comment> @@ -8897,6 +9103,7 @@ <mime-type type="application/x-cpio"> <comment>CPIO archive</comment> <comment xml:lang="ar">أرشيف CPIO</comment> + <comment xml:lang="ast">Archivu CPIO</comment> <comment xml:lang="az">CPIO arxivi</comment> <comment xml:lang="be@latin">Archiŭ CPIO</comment> <comment xml:lang="bg">Архив — CPIO</comment> @@ -8936,7 +9143,7 @@ <comment xml:lang="pt">arquivo CPIO</comment> <comment xml:lang="pt_BR">Pacote CPIO</comment> <comment xml:lang="ro">Arhivă CPIO</comment> - <comment xml:lang="ru">архив CPIO</comment> + <comment xml:lang="ru">Архив CPIO</comment> <comment xml:lang="sk">Archív CPIO</comment> <comment xml:lang="sl">Datoteka arhiva CPIO</comment> <comment xml:lang="sq">Arkiv CPIO</comment> @@ -8978,7 +9185,7 @@ <comment xml:lang="ga">cartlann CPIO (comhbhrúite le gzip)</comment> <comment xml:lang="gl">arquivo CPIO (comprimido con gzip)</comment> <comment xml:lang="he">ארכיון CPIO (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">CPIO arhiva (komprimirana gzip-om)</comment> + <comment xml:lang="hr">CPIO arhiva (gzip sažeta)</comment> <comment xml:lang="hu">CPIO-archívum (gzip-pel tömörítve)</comment> <comment xml:lang="ia">Archivo CPIO (comprimite con gzip)</comment> <comment xml:lang="id">Arsip CPIO (terkompresi gzip)</comment> @@ -8998,7 +9205,7 @@ <comment xml:lang="pt">arquivo CPIO (compressão gzip)</comment> <comment xml:lang="pt_BR">Pacote CPIO (compactado com gzip)</comment> <comment xml:lang="ro">Arhivă CPIO (compresie gzip)</comment> - <comment xml:lang="ru">архив CPIO (сжатый GZIP)</comment> + <comment xml:lang="ru">Архив CPIO (сжатый gzip)</comment> <comment xml:lang="sk">Archív CPIO (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Datoteka arhiva CPIO (skrčena z gzip)</comment> <comment xml:lang="sq">Arkiv CPIO (kompresuar me gzip)</comment> @@ -9007,7 +9214,7 @@ <comment xml:lang="tr">CPIO arşivi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів CPIO (стиснений gzip)</comment> <comment xml:lang="vi">Kho nén CPIO (đã nén gzip)</comment> - <comment xml:lang="zh_CN">CPIO 归档文件(gzip 压缩)</comment> + <comment xml:lang="zh_CN">CPIO 归档文件（gzip 压缩）</comment> <comment xml:lang="zh_TW">CPIO 封存檔 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="package-x-generic"/> @@ -9019,7 +9226,7 @@ <comment xml:lang="az">C qabıq skripti</comment> <comment xml:lang="be@latin">Skrypt abałonki C</comment> <comment xml:lang="bg">Скрипт — обвивка C</comment> - <comment xml:lang="ca">script de C shell</comment> + <comment xml:lang="ca">script C shell</comment> <comment xml:lang="cs">skript shellu C</comment> <comment xml:lang="cy">Sgript plisgyn C</comment> <comment xml:lang="da">C-skalprogram</comment> @@ -9032,10 +9239,10 @@ <comment xml:lang="fi">Csh-komentotiedosto</comment> <comment xml:lang="fo">C skel boðrøð</comment> <comment xml:lang="fr">script C shell</comment> - <comment xml:lang="ga">script bhlaosc C</comment> + <comment xml:lang="ga">script bhlaoisce C</comment> <comment xml:lang="gl">script de C shell</comment> <comment xml:lang="he">תסריט מעטפת C</comment> - <comment xml:lang="hr">C skripta</comment> + <comment xml:lang="hr">C skripta ljuske</comment> <comment xml:lang="hu">C héj-parancsfájl</comment> <comment xml:lang="ia">Script C-shell</comment> <comment xml:lang="id">Skrip shell C</comment> @@ -9054,11 +9261,11 @@ <comment xml:lang="pt">script de terminal C</comment> <comment xml:lang="pt_BR">Script de shell C</comment> <comment xml:lang="ro">Script C shell</comment> - <comment xml:lang="ru">сценарий C shell</comment> + <comment xml:lang="ru">Сценарий C shell</comment> <comment xml:lang="sk">Skript shellu C</comment> <comment xml:lang="sl">Skriptna datoteka lupine C</comment> <comment xml:lang="sq">Script shell C</comment> - <comment xml:lang="sr">скрипта Ц љуске</comment> + <comment xml:lang="sr">скрипта Ц шкољке</comment> <comment xml:lang="sv">Skalskript (csh)</comment> <comment xml:lang="tr">C kabuk betiği</comment> <comment xml:lang="uk">скрипт оболонки C</comment> @@ -9079,6 +9286,7 @@ <mime-type type="application/x-dbf"> <comment>Xbase document</comment> <comment xml:lang="ar">مستند Xbase</comment> + <comment xml:lang="ast">Documentu Xbase</comment> <comment xml:lang="be@latin">Dakument Xbase</comment> <comment xml:lang="bg">Документ — Xbase</comment> <comment xml:lang="ca">document Xbase</comment> @@ -9114,7 +9322,7 @@ <comment xml:lang="pt">documento Xbase</comment> <comment xml:lang="pt_BR">Documento do Xbase</comment> <comment xml:lang="ro">Document Xbase</comment> - <comment xml:lang="ru">документ Xbase</comment> + <comment xml:lang="ru">Документ Xbase</comment> <comment xml:lang="sk">Dokument Xbase</comment> <comment xml:lang="sl">Dokument Xbase</comment> <comment xml:lang="sq">Dokument Xbase</comment> @@ -9169,7 +9377,7 @@ <comment xml:lang="pt">programa ECMAScript</comment> <comment xml:lang="pt_BR">Programa ECMAScript</comment> <comment xml:lang="ro">Program ECMAScript</comment> - <comment xml:lang="ru">программа ECMAScript</comment> + <comment xml:lang="ru">Программа ECMAScript</comment> <comment xml:lang="sk">Program ECMAScript</comment> <comment xml:lang="sl">Programska datoteka ECMAScript</comment> <comment xml:lang="sq">Program ECMAScript</comment> @@ -9181,6 +9389,7 @@ <comment xml:lang="zh_CN">ECMAScript 程序</comment> <comment xml:lang="zh_TW">ECMAScript 程式</comment> <alias type="text/ecmascript"/> + <sub-class-of type='application/x-executable'/> <sub-class-of type="text/plain"/> <generic-icon name="text-x-script"/> <glob pattern="*.es"/> @@ -9188,22 +9397,33 @@ <mime-type type="application/x-sega-cd-rom"> <comment>Sega CD disc image</comment> + <comment xml:lang="ast">Imaxe de discu de Sega CD</comment> <comment xml:lang="ca">imatge de disc de Sega CD</comment> + <comment xml:lang="cs">obraz disku CD pro Sega</comment> <comment xml:lang="da">Sega CD-diskaftryk</comment> <comment xml:lang="de">Sega-CD-Datenträgerabbild</comment> + <comment xml:lang="en_GB">Sega CD disc image</comment> <comment xml:lang="es">imagen de disco CD de Sega</comment> + <comment xml:lang="eu">Sega CD disko irudia</comment> <comment xml:lang="fi">Sega CD -levykuva</comment> <comment xml:lang="fr">image disque Sega CD</comment> + <comment xml:lang="ga">íomhá dlúthdhiosca Sega</comment> <comment xml:lang="he">דמות כונן Sega CD</comment> + <comment xml:lang="hr">Sega CD slika diska</comment> <comment xml:lang="hu">Sega CD-lemezkép</comment> + <comment xml:lang="id">image cakram CD Sega</comment> + <comment xml:lang="it">Immagine disco Sega Mega CD</comment> <comment xml:lang="kk">Sega CD диск бейнесі</comment> <comment xml:lang="ko">세가 CD 디스크 이미지</comment> <comment xml:lang="pl">Obraz płyty konsoli Mega-CD</comment> <comment xml:lang="pt_BR">Imagem de disco Sega CD</comment> - <comment xml:lang="ru">образ диска CD Sega</comment> + <comment xml:lang="ru">Образ диска CD Sega</comment> <comment xml:lang="sk">Obraz disku CD Sega</comment> + <comment xml:lang="sr">одраз диска Сега ЦД-а</comment> + <comment xml:lang="sv">Mega-CD-skivavbild</comment> + <comment xml:lang="tr">Sega CD disk kalıbı</comment> <comment xml:lang="uk">образ диска Sega CD</comment> - <comment xml:lang="zh_CN">Sega CD 光盘镜像</comment> + <comment xml:lang="zh_CN">Sega CD 光盘映像</comment> <comment xml:lang="zh_TW">Sega CD 光碟映像檔</comment> <generic-icon name="application-x-executable"/> @@ -9221,6 +9441,32 @@ <mime-type type="application/x-sega-pico-rom"> <comment>Sega Pico ROM</comment> + <comment xml:lang="ast">ROM de Sega Pico</comment> + <comment xml:lang="ca">ROM de Sega Pico</comment> + <comment xml:lang="cs">ROM pro Sega Pico</comment> + <comment xml:lang="de">Sega Pico ROM</comment> + <comment xml:lang="en_GB">Sega Pico ROM</comment> + <comment xml:lang="es">ROM de Sega Pico</comment> + <comment xml:lang="eu">Sega Pico ROM</comment> + <comment xml:lang="fi">Sega Pico ROM</comment> + <comment xml:lang="fr">ROM Sega Pico</comment> + <comment xml:lang="ga">ROM Sega Pico</comment> + <comment xml:lang="hr">Sega Pico ROM</comment> + <comment xml:lang="hu">Sega Pico ROM</comment> + <comment xml:lang="id">ROM Sega Pico</comment> + <comment xml:lang="it">ROM Sega Pico</comment> + <comment xml:lang="kk">Sega Pico ROM</comment> + <comment xml:lang="ko">세카 피코 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Sega Pico</comment> + <comment xml:lang="pt_BR">ROM de Sega Pico</comment> + <comment xml:lang="ru">Sega Pico ROM</comment> + <comment xml:lang="sk">ROM pre Sega Pico</comment> + <comment xml:lang="sr">Сега Пико РОМ</comment> + <comment xml:lang="sv">Sega Pico-rom</comment> + <comment xml:lang="tr">Sega Pico ROM</comment> + <comment xml:lang="uk">ППП Sega Pico</comment> + <comment xml:lang="zh_CN">Sega Pico ROM</comment> + <comment xml:lang="zh_TW">Sega Pico ROM</comment> <generic-icon name="application-x-executable"/> <magic priority="50"> <match value="SEGA PICO" type="string" offset="256"/> @@ -9228,6 +9474,7 @@ </mime-type> <mime-type type="application/x-saturn-rom"> <comment>Sega Saturn disc image</comment> + <comment xml:lang="ast">Imaxe de discu de Sega Saturn</comment> <comment xml:lang="ca">imatge de disc de Sega Saturn</comment> <comment xml:lang="cs">obraz disku pro Sega Saturn</comment> <comment xml:lang="da">Sega Saturn-diskaftryk</comment> @@ -9238,6 +9485,7 @@ <comment xml:lang="eu">Sega Saturn disko irudia</comment> <comment xml:lang="fi">Sega Saturn -levykuva</comment> <comment xml:lang="fr">image disque Sega Saturn</comment> + <comment xml:lang="ga">íomhá diosca Sega Saturn</comment> <comment xml:lang="he">דמות כונן Sega Saturn</comment> <comment xml:lang="hr">Sega Saturn slika diska</comment> <comment xml:lang="hu">Sega Saturn lemezkép</comment> @@ -9250,13 +9498,13 @@ <comment xml:lang="pl">Obraz płyty konsoli Sega Saturn</comment> <comment xml:lang="pt">imagem de disco Sega Saturn</comment> <comment xml:lang="pt_BR">Imagem de disco do Sega Saturn</comment> - <comment xml:lang="ru">образ диска Sega Saturn</comment> + <comment xml:lang="ru">Образ диска Sega Saturn</comment> <comment xml:lang="sk">Obraz disku Sega Saturn</comment> - <comment xml:lang="sr">слика диска Сега Сатурна</comment> + <comment xml:lang="sr">одраз диска Сега Сатурна</comment> <comment xml:lang="sv">Sega Saturn-skivavbild</comment> <comment xml:lang="tr">Sega Saturn disk kalıbı</comment> <comment xml:lang="uk">образ диска Sega Saturn</comment> - <comment xml:lang="zh_CN">Sega Saturn 光盘镜像</comment> + <comment xml:lang="zh_CN">Sega Saturn 光盘映像</comment> <comment xml:lang="zh_TW">Sega Saturn 光碟映像檔</comment> <generic-icon name="application-x-executable"/> <magic priority="50"> @@ -9268,6 +9516,7 @@ </mime-type> <mime-type type="application/x-dc-rom"> <comment>Dreamcast GD-ROM</comment> + <comment xml:lang="ast">GD-ROM de Dreamcast</comment> <comment xml:lang="ca">GD-ROM de Dreamcast</comment> <comment xml:lang="cs">GD-ROM pro Dreamcast</comment> <comment xml:lang="da">Dreamcast GD-ROM</comment> @@ -9277,6 +9526,7 @@ <comment xml:lang="es">GD-ROM de Dreamcast</comment> <comment xml:lang="eu">Dreamcast GD-ROM</comment> <comment xml:lang="fr">GD-ROM Dreamcast</comment> + <comment xml:lang="ga">GD-ROM Dreamcast</comment> <comment xml:lang="he">Dreamcast GD-ROM</comment> <comment xml:lang="hr">Dreamcast GD-ROM</comment> <comment xml:lang="hu">Dreamcast GD-ROM</comment> @@ -9288,8 +9538,8 @@ <comment xml:lang="oc">GD-ROM Dreamcast</comment> <comment xml:lang="pl">Plik GD-ROM konsoli Dreamcast</comment> <comment xml:lang="pt">GD-ROM Dreamcast</comment> - <comment xml:lang="pt_BR">GD-ROM do Dreamcast</comment> - <comment xml:lang="ru">GD-ROM Dreamcast</comment> + <comment xml:lang="pt_BR">GD-ROM de Dreamcast</comment> + <comment xml:lang="ru">Dreamcast GD-ROM</comment> <comment xml:lang="sk">Dreamcast GD-ROM</comment> <comment xml:lang="sr">Дримкаст ГД-РОМ</comment> <comment xml:lang="sv">Dreamcast-gd-rom</comment> @@ -9303,6 +9553,7 @@ <mime-type type="application/x-nintendo-ds-rom"> <comment>Nintendo DS ROM</comment> <comment xml:lang="ar">Nintendo DS ROM</comment> + <comment xml:lang="ast">ROM de Nintendo DS</comment> <comment xml:lang="be@latin">Nintendo DS ROM</comment> <comment xml:lang="bg">ROM — Nintendo DS</comment> <comment xml:lang="ca">ROM de Nintendo DS</comment> @@ -9335,7 +9586,7 @@ <comment xml:lang="oc">ROM Nintendo DS</comment> <comment xml:lang="pl">Plik ROM konsoli Nintendo DS</comment> <comment xml:lang="pt">ROM Nintendo DS</comment> - <comment xml:lang="pt_BR">ROM do Nintendo DS</comment> + <comment xml:lang="pt_BR">ROM de Nintendo DS</comment> <comment xml:lang="ro">ROM Nintendo DS</comment> <comment xml:lang="ru">Nintendo DS ROM</comment> <comment xml:lang="sk">ROM pre Nintendo DS</comment> @@ -9346,13 +9597,14 @@ <comment xml:lang="tr">Nintendo DS ROM</comment> <comment xml:lang="uk">ППП Nintendo</comment> <comment xml:lang="vi">ROM DS Nintendo</comment> - <comment xml:lang="zh_CN">Nintendo DS ROM</comment> + <comment xml:lang="zh_CN">任天堂 DS ROM</comment> <comment xml:lang="zh_TW">任天堂 DS ROM</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.nds"/> </mime-type> <mime-type type="application/x-pc-engine-rom"> <comment>PC Engine ROM</comment> + <comment xml:lang="ast">ROM de PC Engine</comment> <comment xml:lang="ca">ROM de PC Engine</comment> <comment xml:lang="cs">ROM pro PC Engine</comment> <comment xml:lang="da">PC Engine ROM</comment> @@ -9363,6 +9615,7 @@ <comment xml:lang="eu">PC Engine ROM</comment> <comment xml:lang="fi">PC Engine ROM</comment> <comment xml:lang="fr">ROM PC Engine</comment> + <comment xml:lang="ga">ROM PC Engine</comment> <comment xml:lang="gl">ROM de máquina de PC</comment> <comment xml:lang="he">ROM של PC Engine</comment> <comment xml:lang="hr">PC Engine ROM</comment> @@ -9390,6 +9643,7 @@ </mime-type> <mime-type type="application/x-wii-rom"> <comment>Wii disc image</comment> + <comment xml:lang="ast">Imaxe de discu de Wii</comment> <comment xml:lang="ca">imatge de disc de Wii</comment> <comment xml:lang="cs">obraz disku pro Wii</comment> <comment xml:lang="da">Wii-diskaftryk</comment> @@ -9400,6 +9654,7 @@ <comment xml:lang="eu">Wii disko irudia</comment> <comment xml:lang="fi">Wii-levykuva</comment> <comment xml:lang="fr">image disque Wii</comment> + <comment xml:lang="ga">íomhá diosca Wii</comment> <comment xml:lang="gl">Imaxe de disco de Wii</comment> <comment xml:lang="he">דמות כונן Wii</comment> <comment xml:lang="hr">Wii slika diska</comment> @@ -9413,14 +9668,14 @@ <comment xml:lang="pl">Obraz płyty konsoli Wii</comment> <comment xml:lang="pt">imagem de disco Wii</comment> <comment xml:lang="pt_BR">Imagem de disco Wii</comment> - <comment xml:lang="ru">образ диска Wii</comment> + <comment xml:lang="ru">Образ диска Wii</comment> <comment xml:lang="sk">Obraz disku Wii</comment> <comment xml:lang="sl">Odtis diska Wii</comment> - <comment xml:lang="sr">слика диска Вии-ја</comment> + <comment xml:lang="sr">одраз диска Вии-ја</comment> <comment xml:lang="sv">Wii-skivavbild</comment> <comment xml:lang="tr">Wii disk görüntüsü</comment> <comment xml:lang="uk">образ диска Wii</comment> - <comment xml:lang="zh_CN">Wii光盘镜像</comment> + <comment xml:lang="zh_CN">Wii 光盘映像</comment> <comment xml:lang="zh_TW">Wii 光碟映像檔</comment> <alias type="application/x-wii-iso-image"/> <alias type="application/x-wbfs"/> @@ -9441,7 +9696,9 @@ <comment xml:lang="de">WiiWare-Paket</comment> <comment xml:lang="en_GB">WiiWare bundle</comment> <comment xml:lang="es">conjunto de WiiWare</comment> + <comment xml:lang="eu">WiiWare bilduma</comment> <comment xml:lang="fr">lot WiiWare</comment> + <comment xml:lang="ga">burla WiiWare</comment> <comment xml:lang="he">מאגד WiiWare</comment> <comment xml:lang="hr">WiiWare paket</comment> <comment xml:lang="hu">WiiWare csomag</comment> @@ -9454,13 +9711,13 @@ <comment xml:lang="pl">Pakiet WiiWare</comment> <comment xml:lang="pt">pacote WiiWare</comment> <comment xml:lang="pt_BR">Pacote WiiWare</comment> - <comment xml:lang="ru">пакет WiiWare</comment> + <comment xml:lang="ru">Пакет WiiWare</comment> <comment xml:lang="sk">Balík WiiWare</comment> <comment xml:lang="sr">ВииВер комплет</comment> <comment xml:lang="sv">WiiWare-paket</comment> <comment xml:lang="tr">WiiWare paketi</comment> <comment xml:lang="uk">пакет WiiWare</comment> - <comment xml:lang="zh_CN">WiiWare bundle</comment> + <comment xml:lang="zh_CN">WiiWare 捆绑包</comment> <comment xml:lang="zh_TW">WiiWare 綁包</comment> <generic-icon name="application-x-executable"/> <magic priority="50"> @@ -9482,6 +9739,7 @@ <comment xml:lang="eu">GameCube disko irudia</comment> <comment xml:lang="fi">GameCube-levykuva</comment> <comment xml:lang="fr">image disque GameCube</comment> + <comment xml:lang="ga">íomhá diosca GameCube</comment> <comment xml:lang="gl">Imae de disco de GameCube</comment> <comment xml:lang="he">דמות כונן GameCube</comment> <comment xml:lang="hr">GameCube slika diska</comment> @@ -9495,14 +9753,14 @@ <comment xml:lang="pl">Obraz płyty konsoli GameCube</comment> <comment xml:lang="pt">imagem de disco GameCube</comment> <comment xml:lang="pt_BR">Imagem de disco GameCube</comment> - <comment xml:lang="ru">образ диска GameCube</comment> + <comment xml:lang="ru">Образ диска GameCube</comment> <comment xml:lang="sk">Obraz disku GameCube</comment> <comment xml:lang="sl">Odtis diska GameCube</comment> - <comment xml:lang="sr">слика диска Гејм Коцке</comment> + <comment xml:lang="sr">одраз диска Гејм Коцке</comment> <comment xml:lang="sv">GameCube-skivavbild</comment> <comment xml:lang="tr">GameCube disk görüntüsü</comment> <comment xml:lang="uk">образ диска GameCube</comment> - <comment xml:lang="zh_CN">GameCube光盘镜像</comment> + <comment xml:lang="zh_CN">GameCube 光盘映像</comment> <comment xml:lang="zh_TW">GameCube 光碟映像檔</comment> <generic-icon name="application-x-executable"/> <alias type="application/x-gamecube-iso-image"/> @@ -9513,16 +9771,85 @@ </mime-type> <mime-type type="application/x-thomson-cartridge-memo7"> <comment>Thomson Mémo7 cartridge</comment> + <comment xml:lang="ca">cartutx Thomson Mémo7</comment> + <comment xml:lang="cs">Kazeta Thomson Mémo7</comment> + <comment xml:lang="de">Thomson-Mémo7-Steckmodul</comment> + <comment xml:lang="en_GB">Thomson Mémo7 cartridge</comment> + <comment xml:lang="es">cartucho Mémo7 de Thomson</comment> + <comment xml:lang="fr">cartouche Thomson Mémo7</comment> + <comment xml:lang="ga">cartús Thomson Mémo7</comment> + <comment xml:lang="hr">Thomson Mémo7 uložak</comment> + <comment xml:lang="hu">Thomson Mémo7 kazetta</comment> + <comment xml:lang="id">cartridge Thomson Mémo7</comment> + <comment xml:lang="it">Cartuccia Thomson Mémo7</comment> + <comment xml:lang="kk">Thomson Mémo7 картриджі</comment> + <comment xml:lang="ko">톰슨 메모7 카트릿지</comment> + <comment xml:lang="pl">Kartridż Thomson Mémo7</comment> + <comment xml:lang="pt_BR">Cartucho Thomson Mémo7</comment> + <comment xml:lang="ru">Картридж Thomson Mémo7</comment> + <comment xml:lang="sk">Kazeta Thomson Mémo7</comment> + <comment xml:lang="sr">Томсон Мемо7 кертриџ</comment> + <comment xml:lang="sv">Thomson Mémo7-spelkassett</comment> + <comment xml:lang="tr">Thomson Mémo7 kartuşu</comment> + <comment xml:lang="uk">картридж Thomson Mémo7</comment> + <comment xml:lang="zh_CN">Thomson Mémo7 卡带</comment> + <comment xml:lang="zh_TW">Thomson Mémo7 卡匣</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.m7"/> </mime-type> <mime-type type="application/x-thomson-cassette"> <comment>Thomson cassette</comment> + <comment xml:lang="ca">cinta de casset Thomson</comment> + <comment xml:lang="cs">Kazeta Thomson</comment> + <comment xml:lang="de">Thomson-Kassette</comment> + <comment xml:lang="en_GB">Thomson cassette</comment> + <comment xml:lang="es">casete de Thomson</comment> + <comment xml:lang="fr">cassette Thomson</comment> + <comment xml:lang="ga">caiséad Thomson</comment> + <comment xml:lang="hr">Thomson kaseta</comment> + <comment xml:lang="hu">Thomson kazetta</comment> + <comment xml:lang="id">kaset Thomson</comment> + <comment xml:lang="it">Cassetta Thomson</comment> + <comment xml:lang="kk">Thomson кассетасы</comment> + <comment xml:lang="ko">톰슨 카셋트</comment> + <comment xml:lang="pl">Kaseta Thomson</comment> + <comment xml:lang="pt_BR">Cassete Thomson</comment> + <comment xml:lang="ru">Кассета Thomson</comment> + <comment xml:lang="sk">Kazeta Thomson</comment> + <comment xml:lang="sr">Томсон касете</comment> + <comment xml:lang="sv">Thomson-kassett</comment> + <comment xml:lang="tr">Thomson kaset</comment> + <comment xml:lang="uk">касета Thomson</comment> + <comment xml:lang="zh_CN">Thomson 磁带</comment> + <comment xml:lang="zh_TW">Thomson 卡匣</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.k7"/> </mime-type> <mime-type type="application/x-hfe-floppy-image"> <comment>HFE floppy disk image</comment> + <comment xml:lang="ca">imatge de disquet HFE</comment> + <comment xml:lang="cs">Obraz diskety HFE</comment> + <comment xml:lang="de">HFE-Diskettenabbild</comment> + <comment xml:lang="en_GB">HFE floppy disk image</comment> + <comment xml:lang="es">imagen de disquete HFE</comment> + <comment xml:lang="fr">image disquette HFE</comment> + <comment xml:lang="ga">íomhá diosca fhlapaigh HFE</comment> + <comment xml:lang="hr">HFE slika diskete</comment> + <comment xml:lang="hu">HFE flopi lemezkép</comment> + <comment xml:lang="id">image disk floppy HFE</comment> + <comment xml:lang="it">Immagine disco floppy HFE</comment> + <comment xml:lang="kk">HFE иілгіш диск бейнесі</comment> + <comment xml:lang="ko">HFE 플로피 디스크 이미지</comment> + <comment xml:lang="pl">Obraz dyskietki HFE</comment> + <comment xml:lang="pt_BR">Imagem de disco flexível HFE</comment> + <comment xml:lang="ru">Образ гибкого диска HFE</comment> + <comment xml:lang="sk">Obraz pružného disku HFE</comment> + <comment xml:lang="sr">ХФЕ слика флопи диска</comment> + <comment xml:lang="sv">HFE-diskavbild</comment> + <comment xml:lang="tr">HFE disket kalıbı</comment> + <comment xml:lang="uk">образ дискети HFE</comment> + <comment xml:lang="zh_CN">HFE 软盘映像</comment> + <comment xml:lang="zh_TW">HFE 軟碟映像檔</comment> <acronym>HFE</acronym> <expanded-acronym>HxC Floppy Emulator</expanded-acronym> <generic-icon name="application-x-executable"/> @@ -9530,9 +9857,33 @@ <magic> <match value="HXCPICFE" type="string" offset="0"/> </magic> + <alias type="application/x-hfe-file"/> </mime-type> <mime-type type="application/x-thomson-sap-image"> <comment>SAP Thomson floppy disk image</comment> + <comment xml:lang="ca">imatge de disquet SAP Thomson</comment> + <comment xml:lang="cs">Obraz diskety SAP Thomson</comment> + <comment xml:lang="de">SAP-Thomson-Diskettenabbild</comment> + <comment xml:lang="en_GB">SAP Thomson floppy disk image</comment> + <comment xml:lang="es">imagen de disquete SAP de Thomson</comment> + <comment xml:lang="fr">image disquette SAP Thomson</comment> + <comment xml:lang="ga">íomhá diosca fhlapaigh SAP Thomson</comment> + <comment xml:lang="hr">SAP Thomson slika diskete</comment> + <comment xml:lang="hu">SAP Thomson flopi lemezkép</comment> + <comment xml:lang="id">image disk floppy SAP Thomson</comment> + <comment xml:lang="it">Immagine disco floppy Thomson SAP</comment> + <comment xml:lang="kk">SAP Thomson иілгіш диск бейнесі</comment> + <comment xml:lang="ko">SAP 톰슨 플로피 디스크 이미지</comment> + <comment xml:lang="pl">Obraz dyskietki SAP Thomson</comment> + <comment xml:lang="pt_BR">Imagem de disco flexível SAP Thomson</comment> + <comment xml:lang="ru">Образ гибкого диска SAP Thomson</comment> + <comment xml:lang="sk">Obraz pružného disku SAP Thomson</comment> + <comment xml:lang="sr">САП Томсон слика флопи диска</comment> + <comment xml:lang="sv">SAP Thomson-diskavbild</comment> + <comment xml:lang="tr">SAP Thomson disket kalıbı</comment> + <comment xml:lang="uk">образ дискети Thomson SAP</comment> + <comment xml:lang="zh_CN">SAP Thomson 软盘映像</comment> + <comment xml:lang="zh_TW">SAP Thomson 軟碟映像檔</comment> <acronym>SAP</acronym> <expanded-acronym>Système d'Archivage Pukall</expanded-acronym> <generic-icon name="application-x-executable"/> @@ -9540,6 +9891,7 @@ <magic> <match value="SYSTEME D'ARCHIVAGE PUKALL S.A.P. (c) Alexandre PUKALL Avril 1998" type="string" offset="1"/> </magic> + <alias type="application/x-sap-file"/> </mime-type> <mime-type type="application/vnd.debian.binary-package"> <comment>Debian package</comment> @@ -9583,7 +9935,7 @@ <comment xml:lang="pt">pacote Debian</comment> <comment xml:lang="pt_BR">Pacote Debian</comment> <comment xml:lang="ro">Pachet Debian</comment> - <comment xml:lang="ru">пакет Debian</comment> + <comment xml:lang="ru">Пакет Debian</comment> <comment xml:lang="sk">Balíček Debianu</comment> <comment xml:lang="sl">Datoteka paketa Debian</comment> <comment xml:lang="sq">Paketë Debian</comment> @@ -9644,11 +9996,11 @@ <comment xml:lang="pt">ficheiro do Qt Designer</comment> <comment xml:lang="pt_BR">Arquivo do Qt Designer</comment> <comment xml:lang="ro">Fișier Qt Designer</comment> - <comment xml:lang="ru">файл Qt Designer</comment> + <comment xml:lang="ru">Файл Qt Designer</comment> <comment xml:lang="sk">Súbor Qt Designer</comment> <comment xml:lang="sl">Datoteka Qt Designer</comment> <comment xml:lang="sq">File Qt Designer</comment> - <comment xml:lang="sr">датотека Кут Дизајнера</comment> + <comment xml:lang="sr">датотека Кут дизајнера</comment> <comment xml:lang="sv">Qt Designer-fil</comment> <comment xml:lang="tr">Qt Tasarımcı dosyası</comment> <comment xml:lang="uk">файл програми Qt-дизайнер</comment> @@ -9676,6 +10028,7 @@ <comment xml:lang="eu">Qt Markup lengoai fitxategia</comment> <comment xml:lang="fi">QML-tiedosto</comment> <comment xml:lang="fr">fichier Qt Markup Language</comment> + <comment xml:lang="ga">comhad teanga mharcála Qt</comment> <comment xml:lang="gl">ficheiro de linguaxe de marcado Qt</comment> <comment xml:lang="he">קובץ שפת סימון של Qt</comment> <comment xml:lang="hr">Qt Markup Language datoteka</comment> @@ -9692,17 +10045,23 @@ <comment xml:lang="pl">Plik języka znaczników Qt</comment> <comment xml:lang="pt">ficheiro de linguagem Qt Markup</comment> <comment xml:lang="pt_BR">Arquivo de Qt Markup Language</comment> - <comment xml:lang="ru">файл Qt Markup Language</comment> + <comment xml:lang="ru">Файл Qt Markup Language</comment> <comment xml:lang="sk">Súbor značkovacieho jazyka Qt</comment> <comment xml:lang="sl">Datoteka označevalnega jezika Qt</comment> - <comment xml:lang="sr">датотека Кутовог језика означавања</comment> + <comment xml:lang="sr">датотека КуТ-овог језика означавања</comment> <comment xml:lang="sv">Qt-märkspråksfil</comment> <comment xml:lang="tr">Qt İşaretleme Dili dosyası</comment> <comment xml:lang="uk">файл мови розмітки Qt</comment> - <comment xml:lang="zh_CN">Qt </comment> + <comment xml:lang="zh_CN">Qt Markup Language 文件</comment> <comment xml:lang="zh_TW">Qt 標記語言檔</comment> <magic priority="80"> - <match value="import Qt " type="string" offset="0:256"/> + <match value="/bin/env qml" type="string" offset="2:16"/> + <match value="import Qt" type="string" offset="0:3000"> + <match value="{" type="string" offset="9:3009"/> + </match> + <match value="import Qml" type="string" offset="0:3000"> + <match value="{" type="string" offset="9:3009"/> + </match> </magic> <glob pattern="*.qml"/> <glob pattern="*.qmltypes"/> @@ -9725,10 +10084,10 @@ <comment xml:lang="fi">työpöydän asetustiedosto</comment> <comment xml:lang="fo">skriviborðssamansetingarfíla</comment> <comment xml:lang="fr">fichier de configuration desktop</comment> - <comment xml:lang="ga">comhad chumraíocht deisce</comment> + <comment xml:lang="ga">comhad cumraíochta deisce</comment> <comment xml:lang="gl">ficheiro de configuración de escritorio</comment> <comment xml:lang="he">קובץ הגדרות שולחן עבודה</comment> - <comment xml:lang="hr">datoteka postavki radne površine</comment> + <comment xml:lang="hr">Datoteka prečaca radne površine</comment> <comment xml:lang="hu">asztalbeállító fájl</comment> <comment xml:lang="ia">File de configuration de scriptorio</comment> <comment xml:lang="id">berkas konfigurasi destop</comment> @@ -9747,7 +10106,7 @@ <comment xml:lang="pt">ficheiro de configuração de área de trabalho</comment> <comment xml:lang="pt_BR">Arquivo de configuração desktop</comment> <comment xml:lang="ro">fișier de configurare al desktopului</comment> - <comment xml:lang="ru">файл настроек рабочего стола</comment> + <comment xml:lang="ru">Файл настроек рабочего стола</comment> <comment xml:lang="sk">Súbor nastavení pracovnej plochy</comment> <comment xml:lang="sl">nastavitvena datoteka namizja</comment> <comment xml:lang="sq">File konfigurimi desktop</comment> @@ -9774,6 +10133,7 @@ <mime-type type="application/x-fictionbook+xml"> <comment>FictionBook document</comment> <comment xml:lang="ar">مستند FictionBook</comment> + <comment xml:lang="ast">Documentu de FictionBook</comment> <comment xml:lang="bg">Документ — FictionBook</comment> <comment xml:lang="ca">document FictionBook</comment> <comment xml:lang="cs">dokument FictionBook</comment> @@ -9807,7 +10167,7 @@ <comment xml:lang="pt">documento FictionBook</comment> <comment xml:lang="pt_BR">Documento FictionBook</comment> <comment xml:lang="ro">Document FictionBook</comment> - <comment xml:lang="ru">документ FictionBook</comment> + <comment xml:lang="ru">Документ FictionBook</comment> <comment xml:lang="sk">Dokument FictionBook</comment> <comment xml:lang="sl">Dokument FictionBook</comment> <comment xml:lang="sr">документ Фикшон Књиге</comment> @@ -9827,6 +10187,7 @@ </mime-type> <mime-type type="application/x-zip-compressed-fb2"> <comment>Compressed FictionBook document</comment> + <comment xml:lang="ast">Documentu comprimíu de FictionBook</comment> <comment xml:lang="ca">document FictionBook amb compressió</comment> <comment xml:lang="cs">komprimovaný dokument FictionBook</comment> <comment xml:lang="da">Komprimeret FictionBook-dokument</comment> @@ -9837,6 +10198,7 @@ <comment xml:lang="eu">Konprimitutako FictionBook dokumentua</comment> <comment xml:lang="fi">Pakattu FictionBook-asiakirja</comment> <comment xml:lang="fr">document FictionBook compressé</comment> + <comment xml:lang="ga">cáipéis chomhbhrúite FictionBook</comment> <comment xml:lang="gl">Documento de FictionBook comprimida</comment> <comment xml:lang="he">מסמך FictionBook מכווץ</comment> <comment xml:lang="hr">Sažet FictionBook dokument</comment> @@ -9858,7 +10220,7 @@ <comment xml:lang="tr">Sıkıştırılmış KurguKitap belgesi</comment> <comment xml:lang="uk">стиснений документ FictionBook</comment> <comment xml:lang="zh_CN">压缩的 FictionBook 文档</comment> - <comment xml:lang="zh_TW">壓縮的 FictionBook 文件</comment> + <comment xml:lang="zh_TW">壓縮版 FictionBook 文件</comment> <sub-class-of type="application/zip"/> <glob pattern="*.fb2.zip"/> <magic priority="70"> @@ -9910,7 +10272,7 @@ <comment xml:lang="pt">diagrama Dia</comment> <comment xml:lang="pt_BR">Diagrama do Dia</comment> <comment xml:lang="ro">Diagramă Dia</comment> - <comment xml:lang="ru">диаграмма Dia</comment> + <comment xml:lang="ru">Диаграмма Dia</comment> <comment xml:lang="sk">Diagram Dia</comment> <comment xml:lang="sl">Datoteka diagrama Dia</comment> <comment xml:lang="sq">Diagramë Dia</comment> @@ -9963,7 +10325,7 @@ <comment xml:lang="pt">forma Dia</comment> <comment xml:lang="pt_BR">Formato Dia</comment> <comment xml:lang="ro">Figură Dia</comment> - <comment xml:lang="ru">фигура Dia</comment> + <comment xml:lang="ru">Фигура Dia</comment> <comment xml:lang="sk">Tvar Dia</comment> <comment xml:lang="sl">Datoteka oblik Dia</comment> <comment xml:lang="sr">облик Дие</comment> @@ -9983,6 +10345,7 @@ <mime-type type="application/x-dvi"> <comment>TeX DVI document</comment> <comment xml:lang="ar">مستند TeX DVI</comment> + <comment xml:lang="ast">Documentu Tex DVI</comment> <comment xml:lang="be@latin">Dakument TeX DVI</comment> <comment xml:lang="bg">Документ — TeX DVI</comment> <comment xml:lang="ca">document DVI de TeX</comment> @@ -10019,7 +10382,7 @@ <comment xml:lang="pt">documento TeX DVI</comment> <comment xml:lang="pt_BR">Documento DVI TeX</comment> <comment xml:lang="ro">Document Tex DVI</comment> - <comment xml:lang="ru">документ TeX DVI</comment> + <comment xml:lang="ru">Документ TeX DVI</comment> <comment xml:lang="sk">Dokument TeX DVI</comment> <comment xml:lang="sl">Dokument TeX DVI</comment> <comment xml:lang="sq">Dokument TeX DVI</comment> @@ -10080,11 +10443,11 @@ <comment xml:lang="pt">tema Enlightenment</comment> <comment xml:lang="pt_BR">Tema do Enlightenment</comment> <comment xml:lang="ro">Temă Enlightenment</comment> - <comment xml:lang="ru">тема Enlightenment</comment> + <comment xml:lang="ru">Тема Enlightenment</comment> <comment xml:lang="sk">Motív Enlightenment</comment> <comment xml:lang="sl">Datoteka teme Enlightenment</comment> <comment xml:lang="sq">Tema Enlightenment</comment> - <comment xml:lang="sr">тема Просвећености</comment> + <comment xml:lang="sr">тема за Енлајтмент</comment> <comment xml:lang="sv">Enlightenment-tema</comment> <comment xml:lang="tr">Enlightenment teması</comment> <comment xml:lang="uk">тема Enlightenment</comment> @@ -10133,7 +10496,7 @@ <comment xml:lang="pt">animação Egon Animator</comment> <comment xml:lang="pt_BR">Animação do Egon Animator</comment> <comment xml:lang="ro">Animație Egon Animator</comment> - <comment xml:lang="ru">анимация Egon Animator</comment> + <comment xml:lang="ru">Анимация Egon Animator</comment> <comment xml:lang="sk">Animácia Egon Animator</comment> <comment xml:lang="sl">Datoteka animacije Egon Animator</comment> <comment xml:lang="sq">Animim Egon Animator</comment> @@ -10167,7 +10530,7 @@ <comment xml:lang="ga">comhad inrite</comment> <comment xml:lang="gl">executábel</comment> <comment xml:lang="he">קובץ הרצה</comment> - <comment xml:lang="hr">izvršna datoteka</comment> + <comment xml:lang="hr">Izvršna datoteka</comment> <comment xml:lang="hu">futtatható</comment> <comment xml:lang="ia">Executabile</comment> <comment xml:lang="id">dapat dieksekusi</comment> @@ -10186,7 +10549,7 @@ <comment xml:lang="pt">executável</comment> <comment xml:lang="pt_BR">Executável</comment> <comment xml:lang="ro">executabil</comment> - <comment xml:lang="ru">исполняемый</comment> + <comment xml:lang="ru">Исполняемый</comment> <comment xml:lang="sk">Spustiteľný súbor</comment> <comment xml:lang="sl">izvedljiva datoteka</comment> <comment xml:lang="sq">I ekzekutueshëm</comment> @@ -10254,7 +10617,7 @@ <comment xml:lang="pt">ficheiro FLTK Fluid</comment> <comment xml:lang="pt_BR">Arquivo Fluid do FLTK</comment> <comment xml:lang="ro">Fișier FLTK Fluid</comment> - <comment xml:lang="ru">файл FLTK Fluid</comment> + <comment xml:lang="ru">Файл FLTK Fluid</comment> <comment xml:lang="sk">Súbor FLTK Fluid</comment> <comment xml:lang="sl">Datoteka FLTK Fluid</comment> <comment xml:lang="sq">File FLTK Fluid</comment> @@ -10274,10 +10637,11 @@ </magic> <glob pattern="*.fl"/> </mime-type> - <mime-type type="application/font-woff"> + <mime-type type="font/woff"> <comment>WOFF font</comment> - <comment xml:lang="ca">tipus de lletra WOFF</comment> - <comment xml:lang="cs">písmo WOFF</comment> + <comment xml:lang="ast">Fonte WOFF</comment> + <comment xml:lang="ca">lletra WOFF</comment> + <comment xml:lang="cs">font WOFF</comment> <comment xml:lang="da">WOFF-skrifttype</comment> <comment xml:lang="de">WOFF-Schrift</comment> <comment xml:lang="el">Γραμματοσειρά WOFF</comment> @@ -10286,13 +10650,14 @@ <comment xml:lang="eu">WOFF letra-tipoa</comment> <comment xml:lang="fi">WOFF-fontti</comment> <comment xml:lang="fr">police WOFF</comment> + <comment xml:lang="ga">cló WOFF</comment> <comment xml:lang="gl">Tipo de letra WOFF</comment> <comment xml:lang="he">גופן WOFF</comment> <comment xml:lang="hr">WOFF slovo</comment> <comment xml:lang="hu">WOFF-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras WOFF</comment> <comment xml:lang="id">Fonta WOFF</comment> - <comment xml:lang="it">Font WOFF</comment> + <comment xml:lang="it">Carattere WOFF</comment> <comment xml:lang="ja">WOFF フォント</comment> <comment xml:lang="kk">WOFF қарібі</comment> <comment xml:lang="ko">WOFF 글꼴</comment> @@ -10301,7 +10666,7 @@ <comment xml:lang="pl">Czcionka WOFF</comment> <comment xml:lang="pt">letra WOFF</comment> <comment xml:lang="pt_BR">Fonte WOFF</comment> - <comment xml:lang="ru">шрифт WOFF</comment> + <comment xml:lang="ru">Шрифт WOFF</comment> <comment xml:lang="sk">Písmo WOFF</comment> <comment xml:lang="sl">Pisava WOFF</comment> <comment xml:lang="sr">ВОФФ слова</comment> @@ -10317,55 +10682,65 @@ <match value="0x774f4646" type="big32" offset="0"/> </magic> <glob pattern="*.woff"/> + <alias type="application/font-woff"/> + </mime-type> + <mime-type type="font/woff"> + <comment>WOFF2 font</comment> + <comment xml:lang="ast">Fonte WOFF2</comment> + <comment xml:lang="ca">lletra WOFF2</comment> + <comment xml:lang="cs">font WOFF2</comment> + <comment xml:lang="de">WOFF2-Schrift</comment> + <comment xml:lang="en_GB">WOFF2 font</comment> + <comment xml:lang="es">tipo de letra WOFF2</comment> + <comment xml:lang="fi">WOFF2-fontti</comment> + <comment xml:lang="hr">WOFF2 slovo</comment> + <comment xml:lang="hu">WOFF2 betűkészlet</comment> + <comment xml:lang="id">Fonta WOFF2</comment> + <comment xml:lang="it">Carattere WOFF2</comment> + <comment xml:lang="kk">WOFF2 қарібі</comment> + <comment xml:lang="ko">WOFF2 글꼴</comment> + <comment xml:lang="pl">Czcionka WOFF2</comment> + <comment xml:lang="pt_BR">Fonte WOFF2</comment> + <comment xml:lang="ru">Шрифт WOFF2</comment> + <comment xml:lang="sk">Písmo WOFF2</comment> + <comment xml:lang="sv">WOFF2-typsnitt</comment> + <comment xml:lang="uk">шрифт WOFF2</comment> + <comment xml:lang="zh_CN">WOFF2 字体</comment> + <comment xml:lang="zh_TW">WOFF2 字型</comment> + <acronym>WOFF2</acronym> + <expanded-acronym>Web Open Font Format 2.0</expanded-acronym> + <generic-icon name="font-x-generic"/> + <magic priority="50"> + <match value="0x774f4632" type="big32" offset="0"/> + </magic> + <glob pattern="*.woff2"/> </mime-type> <mime-type type="application/x-font-type1"> - <comment>Postscript type-1 font</comment> - <comment xml:lang="ar">خط Postscript type-1</comment> - <comment xml:lang="be@latin">Šryft Postscript type-1</comment> - <comment xml:lang="bg">Шрифт — Postscript Type 1</comment> - <comment xml:lang="ca">tipus de lletra Postscript type-1</comment> - <comment xml:lang="cs">písmo Postscript type-1</comment> - <comment xml:lang="da">PostScript type-1-skrifttype</comment> - <comment xml:lang="de">Postscript-Typ-1-Schrift</comment> - <comment xml:lang="el">Γραμματοσειρά Postscript type-1</comment> - <comment xml:lang="en_GB">Postscript type-1 font</comment> + <comment>PostScript type-1 font</comment> + <comment xml:lang="ca">lletra type-1 de PostScript</comment> + <comment xml:lang="cs">font PostScript type-1</comment> + <comment xml:lang="de">PostScript-Typ-1-Schrift</comment> + <comment xml:lang="en_GB">PostScript type-1 font</comment> <comment xml:lang="es">tipo de letra PostScript Type-1</comment> <comment xml:lang="eu">PostScript type-1 letra-tipoa</comment> - <comment xml:lang="fi">PostScript tyyppi-1 -fontti</comment> - <comment xml:lang="fo">Postscript type-1 stavasnið</comment> - <comment xml:lang="fr">police Postscript Type 1</comment> - <comment xml:lang="ga">cló Postscript type-1</comment> - <comment xml:lang="gl">tipo de letra PostScript tipo-1</comment> - <comment xml:lang="he">גופן של Postscript type-1</comment> - <comment xml:lang="hr">Postscript crsta-1 slovo</comment> - <comment xml:lang="hu">Postscript type-1 betűkészlet</comment> - <comment xml:lang="ia">Typo de litteras PostScript typo 1</comment> - <comment xml:lang="id">Fonta tipe-1 Postscript</comment> - <comment xml:lang="it">Carattere Postscript type-1</comment> - <comment xml:lang="ja">PostScript type-1 フォント</comment> - <comment xml:lang="kk">Postscript type-1 қарібі</comment> + <comment xml:lang="fr">police PostScript Type 1</comment> + <comment xml:lang="ga">cló PostScript type-1</comment> + <comment xml:lang="hr">PostScript type-1 slovo</comment> + <comment xml:lang="hu">PostScript type-1 betűkészlet</comment> + <comment xml:lang="id">fonta PostScript type-1</comment> + <comment xml:lang="it">Carattere PostScript type-1</comment> + <comment xml:lang="kk">PostScript type-1 қарібі</comment> <comment xml:lang="ko">PostScript Type-1 글꼴</comment> - <comment xml:lang="lt">Postscript type-1 šriftas</comment> - <comment xml:lang="lv">Postscript 1-tipa fonts</comment> - <comment xml:lang="nb">Postscript type-1 skrift</comment> - <comment xml:lang="nl">PostScript type-1-lettertype</comment> - <comment xml:lang="nn">PostScript type 1-skrifttype</comment> - <comment xml:lang="oc">poliça Postescript Type 1</comment> <comment xml:lang="pl">Czcionka PostScript Type-1</comment> - <comment xml:lang="pt">letra PostScript tipo 1</comment> <comment xml:lang="pt_BR">Fonte PostScript tipo-1</comment> - <comment xml:lang="ro">Font Postscript type-1</comment> - <comment xml:lang="ru">шрифт PostScript Type-1</comment> - <comment xml:lang="sk">Písmo Postscript type-1</comment> - <comment xml:lang="sl">Datoteka pisave Postscript vrste-1</comment> - <comment xml:lang="sq">Lloj gërmash Postscript type-1</comment> + <comment xml:lang="ru">Шрифт PostScript Type-1</comment> + <comment xml:lang="sk">Písmo PostScript typu 1</comment> <comment xml:lang="sr">слова Постскрипта врсте-1</comment> - <comment xml:lang="sv">Postscript type-1-typsnitt</comment> - <comment xml:lang="tr">Postscript type-1 yazı tipi</comment> - <comment xml:lang="uk">шрифт Postscript type-1</comment> - <comment xml:lang="vi">Phông kiểu 1 PostScript</comment> - <comment xml:lang="zh_CN">Postscript type-1 字体</comment> - <comment xml:lang="zh_TW">Postscript type-1 字型</comment> + <comment xml:lang="sv">PostScript type-1-typsnitt</comment> + <comment xml:lang="tr">PostScript tip-1 yazı tipi</comment> + <comment xml:lang="uk">шрифт type-1 PostScript</comment> + <comment xml:lang="zh_CN">PostScript type-1 字体</comment> + <comment xml:lang="zh_TW">PostScript type-1 字型</comment> <sub-class-of type="application/postscript"/> <generic-icon name="font-x-generic"/> <magic priority="60"> @@ -10386,8 +10761,8 @@ <comment xml:lang="az">Adobe yazı növü metrikləri</comment> <comment xml:lang="be@latin">Metryka šryftu Adobe</comment> <comment xml:lang="bg">Шрифтова метрика — Adobe</comment> - <comment xml:lang="ca">mètrica de tipus de lletra Adobe</comment> - <comment xml:lang="cs">metrika písma Adobe</comment> + <comment xml:lang="ca">mètrica de lletra d'Adobe</comment> + <comment xml:lang="cs">metrika fontu Adobe</comment> <comment xml:lang="cy">Metrigau Ffont Adobe</comment> <comment xml:lang="da">Adobe skrifttypefil</comment> <comment xml:lang="de">Adobe-Schriftmetriken</comment> @@ -10401,7 +10776,7 @@ <comment xml:lang="ga">meadarachtaí cló Adobe</comment> <comment xml:lang="gl">métricas de fonte de Adobe</comment> <comment xml:lang="he">מדדי גופן של Adobe</comment> - <comment xml:lang="hr">Adobe mjere fonta</comment> + <comment xml:lang="hr">Adobe mjere slova</comment> <comment xml:lang="hu">Adobe-betűmetrika</comment> <comment xml:lang="ia">Metricas de typo de litteras Adobe</comment> <comment xml:lang="id">Metrik fonta Adobe</comment> @@ -10420,7 +10795,7 @@ <comment xml:lang="pt">métrica de letras Adobe</comment> <comment xml:lang="pt_BR">Métricas de fonte Adobe</comment> <comment xml:lang="ro">Dimensiuni font Adobe</comment> - <comment xml:lang="ru">метрика шрифта Adobe</comment> + <comment xml:lang="ru">Метрика шрифта Adobe</comment> <comment xml:lang="sk">Metrika písma Adobe</comment> <comment xml:lang="sl">Matrika pisave Adobe</comment> <comment xml:lang="sq">Metrik lloj gërmash Adobe</comment> @@ -10429,7 +10804,7 @@ <comment xml:lang="tr">Adobe yazıtipi ölçüleri</comment> <comment xml:lang="uk">метрики шрифту Adobe</comment> <comment xml:lang="vi">Cách đo phông chữ Adobe</comment> - <comment xml:lang="zh_CN">Adobe 字体参数</comment> + <comment xml:lang="zh_CN">Adobe 字体规格</comment> <comment xml:lang="zh_TW">Adobe 字型描述檔</comment> <generic-icon name="font-x-generic"/> <glob pattern="*.afm"/> @@ -10440,8 +10815,8 @@ <comment xml:lang="az">BDF yazı növü</comment> <comment xml:lang="be@latin">Šryft BDF</comment> <comment xml:lang="bg">Шрифт — BDF</comment> - <comment xml:lang="ca">tipus de lletra BDF</comment> - <comment xml:lang="cs">písmo BDF</comment> + <comment xml:lang="ca">lletra BDF</comment> + <comment xml:lang="cs">font BDF</comment> <comment xml:lang="cy">Ffont BDF</comment> <comment xml:lang="da">BDF-skrifttype</comment> <comment xml:lang="de">BDF-Schrift</comment> @@ -10456,7 +10831,7 @@ <comment xml:lang="ga">cló BDF</comment> <comment xml:lang="gl">tipo de fonte BDF</comment> <comment xml:lang="he">גופן BDF</comment> - <comment xml:lang="hr">BDF font</comment> + <comment xml:lang="hr">BDF slovo</comment> <comment xml:lang="hu">BDF-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras BDF</comment> <comment xml:lang="id">Fonta BDF</comment> @@ -10475,7 +10850,7 @@ <comment xml:lang="pt">letra BDF</comment> <comment xml:lang="pt_BR">Fonte BDF</comment> <comment xml:lang="ro">Font BDF</comment> - <comment xml:lang="ru">шрифт BDF</comment> + <comment xml:lang="ru">Шрифт BDF</comment> <comment xml:lang="sk">Písmo BDF</comment> <comment xml:lang="sl">Datoteka pisave BDF</comment> <comment xml:lang="sq">Lloj gërme BDF</comment> @@ -10498,8 +10873,8 @@ <comment xml:lang="az">DOS yazı növü</comment> <comment xml:lang="be@latin">Šryft DOS</comment> <comment xml:lang="bg">Шрифт — DOS</comment> - <comment xml:lang="ca">tipus de lletra DOS</comment> - <comment xml:lang="cs">písmo pro DOS</comment> + <comment xml:lang="ca">lletra DOS</comment> + <comment xml:lang="cs">font pro DOS</comment> <comment xml:lang="cy">Ffont DOS</comment> <comment xml:lang="da">DOS-skrifttype</comment> <comment xml:lang="de">DOS-Schrift</comment> @@ -10514,7 +10889,7 @@ <comment xml:lang="ga">cló DOS</comment> <comment xml:lang="gl">tipo de fonte de DOS</comment> <comment xml:lang="he">גופן DOS</comment> - <comment xml:lang="hr">DOS font</comment> + <comment xml:lang="hr">DOS slovo</comment> <comment xml:lang="hu">DOS-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras DOS</comment> <comment xml:lang="id">Fonta DOS</comment> @@ -10533,7 +10908,7 @@ <comment xml:lang="pt">letra DOS</comment> <comment xml:lang="pt_BR">Fonte do DOS</comment> <comment xml:lang="ro">Font DOS</comment> - <comment xml:lang="ru">шрифт DOS</comment> + <comment xml:lang="ru">Шрифт DOS</comment> <comment xml:lang="sk">Písmo pre DOS</comment> <comment xml:lang="sl">Datoteka pisave DOS</comment> <comment xml:lang="sq">Gërmë DOS</comment> @@ -10557,8 +10932,8 @@ <comment xml:lang="az">Adobe FrameMaker yazı növü</comment> <comment xml:lang="be@latin">Šryft Adobe FrameMaker</comment> <comment xml:lang="bg">Шрифт — Adobe FrameMaker</comment> - <comment xml:lang="ca">tipus de lletra d'Adobe FrameMaker</comment> - <comment xml:lang="cs">písmo Adobe FrameMaker</comment> + <comment xml:lang="ca">lletra d'Adobe FrameMaker</comment> + <comment xml:lang="cs">font Adobe FrameMaker</comment> <comment xml:lang="cy">Ffont Adobe FrameMaker</comment> <comment xml:lang="da">Adobe FrameMaker-skrifttype</comment> <comment xml:lang="de">Adobe-FrameMaker-Schrift</comment> @@ -10573,7 +10948,7 @@ <comment xml:lang="ga">cló Adobe FrameMaker</comment> <comment xml:lang="gl">tipo de fonte de Adobe FrameMaker</comment> <comment xml:lang="he">גופן של Adobe FrameMaker</comment> - <comment xml:lang="hr">Adobe FrameMaker font</comment> + <comment xml:lang="hr">Adobe FrameMaker slovo</comment> <comment xml:lang="hu">Adobe FrameMaker-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras pro Adobe FrameMaker</comment> <comment xml:lang="id">Fonta Adobe FrameMaker</comment> @@ -10592,7 +10967,7 @@ <comment xml:lang="pt">letra Adobe FrameMaker</comment> <comment xml:lang="pt_BR">Fonte do Adobe FrameMaker</comment> <comment xml:lang="ro">Font Adobe FrameMaker</comment> - <comment xml:lang="ru">шрифт Adobe FrameMaker</comment> + <comment xml:lang="ru">Шрифт Adobe FrameMaker</comment> <comment xml:lang="sk">Písmo Adobe FrameMaker</comment> <comment xml:lang="sl">Datoteka pisave Adobe FrameMaker</comment> <comment xml:lang="sq">Gërma Adobe FrameMaker</comment> @@ -10614,8 +10989,8 @@ <comment xml:lang="az">LIBGRX yazı növü</comment> <comment xml:lang="be@latin">Šryft LIBGRX</comment> <comment xml:lang="bg">Шрифт — LIBGRX</comment> - <comment xml:lang="ca">tipus de lletra LIBGRX</comment> - <comment xml:lang="cs">písmo LIBGRX</comment> + <comment xml:lang="ca">lletra LIBGRX</comment> + <comment xml:lang="cs">font LIBGRX</comment> <comment xml:lang="cy">Ffont LIBGRX</comment> <comment xml:lang="da">LIBGRX-skrifttype</comment> <comment xml:lang="de">LIBGRX-Schrift</comment> @@ -10630,7 +11005,7 @@ <comment xml:lang="ga">cló LIBGRX</comment> <comment xml:lang="gl">tipo de fonte en LIBGRX</comment> <comment xml:lang="he">גופן LIBGRX</comment> - <comment xml:lang="hr">LIBGRX font</comment> + <comment xml:lang="hr">LIBGRX slovo</comment> <comment xml:lang="hu">LIBGRX-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras LIBGRX</comment> <comment xml:lang="id">Fonta LIBGRX</comment> @@ -10649,7 +11024,7 @@ <comment xml:lang="pt">letra LIBGRX</comment> <comment xml:lang="pt_BR">Fonte LIBGRX</comment> <comment xml:lang="ro">Font LIBGRX</comment> - <comment xml:lang="ru">шрифт LIBGRX</comment> + <comment xml:lang="ru">Шрифт LIBGRX</comment> <comment xml:lang="sk">Písmo LIBGRX</comment> <comment xml:lang="sl">Datoteka pisave LIBGRX</comment> <comment xml:lang="sq">Lloj gërme LIBGRX</comment> @@ -10671,8 +11046,8 @@ <comment xml:lang="az">Linux PSF konsol yazı növü</comment> <comment xml:lang="be@latin">Kansolny šryft PSF dla Linuksa</comment> <comment xml:lang="bg">Шрифт — PSF, за конзолата на Линукс</comment> - <comment xml:lang="ca">tipus de lletra de consola Linux PSF</comment> - <comment xml:lang="cs">písmo PSF pro konzolu Linuxu</comment> + <comment xml:lang="ca">lletra de consola PSF de Linux</comment> + <comment xml:lang="cs">font PSF pro konzolu Linuxu</comment> <comment xml:lang="cy">Ffont Linux PSF</comment> <comment xml:lang="da">Linux PSF-konsolskrifttype</comment> <comment xml:lang="de">Linux-PSF-Konsolenschrift</comment> @@ -10684,10 +11059,10 @@ <comment xml:lang="fi">Linux PSF -konsolifontti</comment> <comment xml:lang="fo">Linux PSF stýristøðs stavasnið</comment> <comment xml:lang="fr">police console Linux PSF</comment> - <comment xml:lang="ga">cló chonsól Linux PSF</comment> + <comment xml:lang="ga">cló consóil Linux PSF</comment> <comment xml:lang="gl">tipo de fonte de consola Linux PSF</comment> <comment xml:lang="he">גופן לקונסול מסוג Linux PSF</comment> - <comment xml:lang="hr">Linux PSF konzolni font</comment> + <comment xml:lang="hr">Linux PSF konzolno slovo</comment> <comment xml:lang="hu">Linux PSF konzolos betűkészlet</comment> <comment xml:lang="ia">Typo de litteras console Linux PSF</comment> <comment xml:lang="id">Fonta konsol Linux PSF</comment> @@ -10706,7 +11081,7 @@ <comment xml:lang="pt">letra de consola Linux PSF</comment> <comment xml:lang="pt_BR">Fonte de console Linux PSF</comment> <comment xml:lang="ro">Font consolă Linux PSF</comment> - <comment xml:lang="ru">консольный шрифт Linux PSF</comment> + <comment xml:lang="ru">Консольный шрифт Linux PSF</comment> <comment xml:lang="sk">Písmo PSF pre konzolu Linuxu</comment> <comment xml:lang="sl">Datoteka pisave konzole Linux PSF</comment> <comment xml:lang="sq">Lloj gërme për konsolë Linux PSF</comment> @@ -10728,8 +11103,8 @@ <comment xml:lang="ar">خط كونسول PSF لينكس (مضغوط-gzip)</comment> <comment xml:lang="be@latin">Kansolny šryft PSF dla Linuksa (gzip-skampresavany)</comment> <comment xml:lang="bg">Шрифт — Linux PSF, компресиран с gzip</comment> - <comment xml:lang="ca">tipus de lletra de consola Linux PSF (amb compressió gzip)</comment> - <comment xml:lang="cs">písmo PSF pro konzolu Linuxu (komprimované pomocí gzip)</comment> + <comment xml:lang="ca">lletra de consola PSF de Linux (amb compressió gzip)</comment> + <comment xml:lang="cs">font PSF pro konzolu Linuxu (komprimace gzip)</comment> <comment xml:lang="da">Linux PSF-konsolskrifttype (gzip-komprimeret)</comment> <comment xml:lang="de">Linux-PSF-Konsolenschrift (gzip-komprimiert)</comment> <comment xml:lang="el">Γραμματοσειρά κονσόλας PSF Linux (συμπιεσμένη με gzip)</comment> @@ -10739,10 +11114,10 @@ <comment xml:lang="fi">Linux PSF -konsolifontti (gzip-pakattu)</comment> <comment xml:lang="fo">Linux PSF stýristøðs stavasnið (gzip-stappað)</comment> <comment xml:lang="fr">police console Linux PSF (compressée gzip)</comment> - <comment xml:lang="ga">cló chonsól Linux PSF (comhbhrúite le gzip)</comment> + <comment xml:lang="ga">cló consóil Linux PSF (comhbhrúite le gzip)</comment> <comment xml:lang="gl">tipo de fonte de consola Linux PSF (comprimida con gzip)</comment> <comment xml:lang="he">גופן למסוף מסוג Linux PSF (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">Linux PSF konzolni font (komprimiran gzip-om)</comment> + <comment xml:lang="hr">Linux PSF konzolno slovo (gzip sažeto)</comment> <comment xml:lang="hu">Linux PSF konzolos betűkészlet (gzip-tömörítésű)</comment> <comment xml:lang="ia">Typo de litteras console Linux PSF (comprimite con gzip)</comment> <comment xml:lang="id">Fonta konsol Linux PSF (terkompresi gzip)</comment> @@ -10760,7 +11135,7 @@ <comment xml:lang="pt">letra de consola Linux PSF (compressão gzip)</comment> <comment xml:lang="pt_BR">Fonte de console Linux PSF (compactada com gzip)</comment> <comment xml:lang="ro">Font consolă Linux PSF (compresie gzip)</comment> - <comment xml:lang="ru">консольный шрифт Linux PSF (сжатый gzip)</comment> + <comment xml:lang="ru">Консольный шрифт Linux PSF (сжатый gzip)</comment> <comment xml:lang="sk">Písmo PSF pre konzolu Linuxu (komprimované pomocou gzip)</comment> <comment xml:lang="sl">Datoteka pisave konzole Linux PSF (skrčena z gzip)</comment> <comment xml:lang="sq">Lloj gërme për konsolë Linux PSF (komresuar me gzip)</comment> @@ -10769,7 +11144,7 @@ <comment xml:lang="tr">Linux PSF konsol fontu (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">консольний шрифт Linux PSF (стиснений gzip)</comment> <comment xml:lang="vi">Phông chữ bàn giao tiếp PSF Linux (đã nén gzip)</comment> - <comment xml:lang="zh_CN">Linux PSF 控制台字体(gzip 压缩)</comment> + <comment xml:lang="zh_CN">Linux PSF 控制台字体（gzip 压缩）</comment> <comment xml:lang="zh_TW">Linux PSF console 字型 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="font-x-generic"/> @@ -10781,8 +11156,8 @@ <comment xml:lang="az">PCF yazı növü</comment> <comment xml:lang="be@latin">Šryft PCF</comment> <comment xml:lang="bg">Шрифт — PCF</comment> - <comment xml:lang="ca">tipus de lletra PCF</comment> - <comment xml:lang="cs">písmo PCF</comment> + <comment xml:lang="ca">lletra PCF</comment> + <comment xml:lang="cs">font PCF</comment> <comment xml:lang="cy">Ffont PCF</comment> <comment xml:lang="da">PCF-skrifttype</comment> <comment xml:lang="de">PCF-Schrift</comment> @@ -10816,7 +11191,7 @@ <comment xml:lang="pt">letra PCF</comment> <comment xml:lang="pt_BR">Fonte PCF</comment> <comment xml:lang="ro">Font PCF</comment> - <comment xml:lang="ru">шрифт PCF</comment> + <comment xml:lang="ru">Шрифт PCF</comment> <comment xml:lang="sk">Písmo PCF</comment> <comment xml:lang="sl">Datoteka pisave PCF</comment> <comment xml:lang="sq">Gërma PCF</comment> @@ -10835,14 +11210,14 @@ <glob pattern="*.pcf.Z"/> <glob pattern="*.pcf.gz"/> </mime-type> - <mime-type type="application/x-font-otf"> + <mime-type type="font/otf"> <comment>OpenType font</comment> <comment xml:lang="ar">خط OpenType</comment> <comment xml:lang="az">OpenType yazı növü</comment> <comment xml:lang="be@latin">Šryft OpenType</comment> <comment xml:lang="bg">Шрифт — OpenType</comment> - <comment xml:lang="ca">tipus de lletra OpenType</comment> - <comment xml:lang="cs">písmo OpenType</comment> + <comment xml:lang="ca">lletra OpenType</comment> + <comment xml:lang="cs">font OpenType</comment> <comment xml:lang="cy">Ffont OpenType</comment> <comment xml:lang="da">OpenType-skrifttype</comment> <comment xml:lang="de">OpenType-Schrift</comment> @@ -10876,7 +11251,7 @@ <comment xml:lang="pt">letra OpenType</comment> <comment xml:lang="pt_BR">Fonte OpenType</comment> <comment xml:lang="ro">Font OpenType</comment> - <comment xml:lang="ru">шрифт OpenType</comment> + <comment xml:lang="ru">Шрифт OpenType</comment> <comment xml:lang="sk">Písmo OpenType</comment> <comment xml:lang="sl">Datoteka pisave OpenType</comment> <comment xml:lang="sq">Gërma OpenType</comment> @@ -10887,12 +11262,13 @@ <comment xml:lang="vi">Phông chữ OpenType</comment> <comment xml:lang="zh_CN">OpenType 字体</comment> <comment xml:lang="zh_TW">OpenType 字型</comment> - <sub-class-of type="application/x-font-ttf"/> + <sub-class-of type="font/ttf"/> <generic-icon name="font-x-generic"/> <magic priority="50"> <match value="OTTO" type="string" offset="0"/> </magic> <glob pattern="*.otf"/> + <alias type="application/x-font-otf"/> </mime-type> <mime-type type="application/x-font-speedo"> <comment>Speedo font</comment> @@ -10900,8 +11276,8 @@ <comment xml:lang="az">Speedo yazı növü</comment> <comment xml:lang="be@latin">Šryft Speedo</comment> <comment xml:lang="bg">Шрифт — Speedo</comment> - <comment xml:lang="ca">tipus de lletra Speedo</comment> - <comment xml:lang="cs">písmo Speedo</comment> + <comment xml:lang="ca">lletra Speedo</comment> + <comment xml:lang="cs">font Speedo</comment> <comment xml:lang="cy">Ffont Speedo</comment> <comment xml:lang="da">Speedoskrifttype</comment> <comment xml:lang="de">Speedo-Schrift</comment> @@ -10916,7 +11292,7 @@ <comment xml:lang="ga">cló Speedo</comment> <comment xml:lang="gl">tipo de letra Speedo</comment> <comment xml:lang="he">גופן של Speedo</comment> - <comment xml:lang="hr">Speedo font</comment> + <comment xml:lang="hr">Speedo slovo</comment> <comment xml:lang="hu">Speedo-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras Speedo</comment> <comment xml:lang="id">Fonta Speedo</comment> @@ -10935,7 +11311,7 @@ <comment xml:lang="pt">letra Speedo</comment> <comment xml:lang="pt_BR">Fonte Speedo</comment> <comment xml:lang="ro">Font Speedo</comment> - <comment xml:lang="ru">шрифт Speedo</comment> + <comment xml:lang="ru">Шрифт Speedo</comment> <comment xml:lang="sk">Písmo Speedo</comment> <comment xml:lang="sl">Datoteka pisave Speedo</comment> <comment xml:lang="sq">Gërma Speedo</comment> @@ -10958,8 +11334,8 @@ <comment xml:lang="az">SunOS News yazı növü</comment> <comment xml:lang="be@latin">Šryft SunOS News</comment> <comment xml:lang="bg">Шрифт — SunOS News</comment> - <comment xml:lang="ca">tipus de lletra SunOS News</comment> - <comment xml:lang="cs">písmo SunOS News</comment> + <comment xml:lang="ca">lletra News de SunOS</comment> + <comment xml:lang="cs">font SunOS News</comment> <comment xml:lang="cy">Ffont SunOS News</comment> <comment xml:lang="da">SunOS News-skrifttype</comment> <comment xml:lang="de">SunOS-News-Schrift</comment> @@ -10974,7 +11350,7 @@ <comment xml:lang="ga">cló SunOS News</comment> <comment xml:lang="gl">tipo de letra SunOS News</comment> <comment xml:lang="he">גופן של SunOS News</comment> - <comment xml:lang="hr">SunOS News font</comment> + <comment xml:lang="hr">SunOS News slovo</comment> <comment xml:lang="hu">SunOS News-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras SunOS News</comment> <comment xml:lang="id">Fonta SunOS News</comment> @@ -10993,7 +11369,7 @@ <comment xml:lang="pt">letra SunOS News</comment> <comment xml:lang="pt_BR">Fonte SunOS News</comment> <comment xml:lang="ro">Font SunOS News</comment> - <comment xml:lang="ru">шрифт SunOS News</comment> + <comment xml:lang="ru">Шрифт SunOS News</comment> <comment xml:lang="sk">Písmo SunOS News</comment> <comment xml:lang="sl">Datoteka pisave SunOS News</comment> <comment xml:lang="sq">Gërma SunOS News</comment> @@ -11017,8 +11393,8 @@ <comment xml:lang="az">TeX yazı növü</comment> <comment xml:lang="be@latin">Šryft TeX</comment> <comment xml:lang="bg">Шрифт — TeX</comment> - <comment xml:lang="ca">tipus de lletra TeX</comment> - <comment xml:lang="cs">písmo TeX</comment> + <comment xml:lang="ca">lletra TeX</comment> + <comment xml:lang="cs">font TeX</comment> <comment xml:lang="cy">Ffont TeX</comment> <comment xml:lang="da">TeX-skrifttype</comment> <comment xml:lang="de">TeX-Schrift</comment> @@ -11033,7 +11409,7 @@ <comment xml:lang="ga">cló TeX</comment> <comment xml:lang="gl">tipo de letra de TeX</comment> <comment xml:lang="he">גופן TeX</comment> - <comment xml:lang="hr">TeX font</comment> + <comment xml:lang="hr">TeX slovo</comment> <comment xml:lang="hu">TeX-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras TeX</comment> <comment xml:lang="id">Fonta TeX</comment> @@ -11052,7 +11428,7 @@ <comment xml:lang="pt">letra TeX</comment> <comment xml:lang="pt_BR">Fonte TeX</comment> <comment xml:lang="ro">Font TeX</comment> - <comment xml:lang="ru">шрифт TeX</comment> + <comment xml:lang="ru">Шрифт TeX</comment> <comment xml:lang="sk">Písmo TeX</comment> <comment xml:lang="sl">Datoteka pisave TeX</comment> <comment xml:lang="sq">Gërma TeX</comment> @@ -11076,8 +11452,8 @@ <comment xml:lang="az">TeX yazı növü metrikləri</comment> <comment xml:lang="be@latin">Metryka šryftu TeX</comment> <comment xml:lang="bg">Шрифтова метрика — TeX</comment> - <comment xml:lang="ca">mètrica de tipus de lletra TeX</comment> - <comment xml:lang="cs">metrika písma TeX</comment> + <comment xml:lang="ca">mètrica de lletra de TeX</comment> + <comment xml:lang="cs">metrika fontu TeX</comment> <comment xml:lang="cy">Metrigau Ffont TeX</comment> <comment xml:lang="da">TeX-skrifttypeinformation</comment> <comment xml:lang="de">TeX-Schriftmetriken</comment> @@ -11091,7 +11467,7 @@ <comment xml:lang="ga">meadarachtaí cló TeX</comment> <comment xml:lang="gl">Métricas de tipo de letra de TeX</comment> <comment xml:lang="he">ממדי גופן של TeX</comment> - <comment xml:lang="hr">TeX mjere fonta</comment> + <comment xml:lang="hr">TeX mjere slova</comment> <comment xml:lang="hu">TeX-betűmetrika</comment> <comment xml:lang="ia">Metricas de typo de litteras TeX</comment> <comment xml:lang="id">Fonta metrik TeX</comment> @@ -11110,7 +11486,7 @@ <comment xml:lang="pt">métricas de letra TeX</comment> <comment xml:lang="pt_BR">Métrica de fonte TeX</comment> <comment xml:lang="ro">Dimensiuni font TeX</comment> - <comment xml:lang="ru">метрика шрифта TeX</comment> + <comment xml:lang="ru">Метрика шрифта TeX</comment> <comment xml:lang="sk">Metrika písma TeX</comment> <comment xml:lang="sl">Matrika pisave Tex</comment> <comment xml:lang="sq">Gërma TeX metrics</comment> @@ -11119,7 +11495,7 @@ <comment xml:lang="tr">TeX yazı tipi ölçüleri</comment> <comment xml:lang="uk">метрики шрифту TeX</comment> <comment xml:lang="vi">Cách đo phông chữ TeX</comment> - <comment xml:lang="zh_CN">TeX 字体参数</comment> + <comment xml:lang="zh_CN">TeX 字体规格</comment> <comment xml:lang="zh_TW">TeX 字型描述檔</comment> <generic-icon name="font-x-generic"/> <magic priority="50"> @@ -11127,13 +11503,13 @@ <match value="\000\022" type="string" offset="2"/> </magic> </mime-type> - <mime-type type="application/x-font-ttf"> + <mime-type type="font/ttf"> <comment>TrueType font</comment> <comment xml:lang="ar">خط TrueType</comment> <comment xml:lang="be@latin">Šryft TrueType</comment> <comment xml:lang="bg">Шрифт — TrueType</comment> - <comment xml:lang="ca">tipus de lletra TrueType</comment> - <comment xml:lang="cs">písmo TrueType</comment> + <comment xml:lang="ca">lletra TrueType</comment> + <comment xml:lang="cs">font TrueType</comment> <comment xml:lang="da">TrueType-skrifttype</comment> <comment xml:lang="de">TrueType-Schrift</comment> <comment xml:lang="el">Γραμματοσειρά TrueType</comment> @@ -11147,7 +11523,7 @@ <comment xml:lang="ga">cló TrueType</comment> <comment xml:lang="gl">tipo de letra TrueType</comment> <comment xml:lang="he">גופן מסוג TrueType</comment> - <comment xml:lang="hr">TrueType font</comment> + <comment xml:lang="hr">TrueType slovo</comment> <comment xml:lang="hu">TrueType-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras TrueType</comment> <comment xml:lang="id">Fonta TrueType</comment> @@ -11166,7 +11542,7 @@ <comment xml:lang="pt">letra TrueType</comment> <comment xml:lang="pt_BR">Fonte TrueType</comment> <comment xml:lang="ro">Font TrueType</comment> - <comment xml:lang="ru">шрифт TrueType</comment> + <comment xml:lang="ru">Шрифт TrueType</comment> <comment xml:lang="sk">Písmo TrueType</comment> <comment xml:lang="sl">Datoteka pisave TrueType</comment> <comment xml:lang="sq">Lloj gërme TrueType</comment> @@ -11184,6 +11560,31 @@ <match value="\000\001\000\000\000" type="string" offset="0"/> </magic> <glob pattern="*.ttf"/> + <alias type="application/x-font-ttf"/> + </mime-type> + <mime-type type="font/collection"> + <comment>Font collection</comment> + <comment xml:lang="ca">ccol·lecció de lletres</comment> + <comment xml:lang="cs">kolekce fontů</comment> + <comment xml:lang="de">Schriftsammlung</comment> + <comment xml:lang="en_GB">Font collection</comment> + <comment xml:lang="es">colección tipográfica</comment> + <comment xml:lang="fi">Fonttikokoelma</comment> + <comment xml:lang="hr">Kolekcija slova</comment> + <comment xml:lang="hu">Betűkészlet-gyűjtemény</comment> + <comment xml:lang="id">Koleksi fonta</comment> + <comment xml:lang="it">Raccolta di caratteri</comment> + <comment xml:lang="kk">Қаріптер жинағы</comment> + <comment xml:lang="ko">글꼴 모음</comment> + <comment xml:lang="pl">Kolekcja czcionek</comment> + <comment xml:lang="pt_BR">coleção de fontes</comment> + <comment xml:lang="ru">Коллекция шрифтов</comment> + <comment xml:lang="sk">Zbierka písiem</comment> + <comment xml:lang="sv">Typsnittssamling</comment> + <comment xml:lang="uk">збірка шрифтів</comment> + <comment xml:lang="zh_CN">字体集</comment> + <comment xml:lang="zh_TW">字型集</comment> + <generic-icon name="font-x-generic"/> <glob pattern="*.ttc"/> </mime-type> <mime-type type="application/x-font-ttx"> @@ -11191,8 +11592,8 @@ <comment xml:lang="ar">خط TrueType XML</comment> <comment xml:lang="be@latin">Šryft TrueType XML</comment> <comment xml:lang="bg">Шрифт — TrueType XML</comment> - <comment xml:lang="ca">tipus de lletra TrueType XML</comment> - <comment xml:lang="cs">písmo TrueType XML</comment> + <comment xml:lang="ca">lletra XML de TrueType</comment> + <comment xml:lang="cs">font TrueType XML</comment> <comment xml:lang="da">TrueType XML-skrifttype</comment> <comment xml:lang="de">TrueType-XML-Schrift</comment> <comment xml:lang="el">Γραμματοσειρά XML TrueType</comment> @@ -11205,7 +11606,7 @@ <comment xml:lang="ga">cló XML TrueType</comment> <comment xml:lang="gl">tipo de letra TrueType XML</comment> <comment xml:lang="he">גופן XML מסוג TrueType</comment> - <comment xml:lang="hr">TrueType XML font</comment> + <comment xml:lang="hr">TrueType XML slovo</comment> <comment xml:lang="hu">TrueType XML betűkészlet</comment> <comment xml:lang="ia">Typo de litteras TrueType XML</comment> <comment xml:lang="id">Fonta TrueType XML</comment> @@ -11223,7 +11624,7 @@ <comment xml:lang="pt">letra TrueType XML</comment> <comment xml:lang="pt_BR">Fonte TrueType XML</comment> <comment xml:lang="ro">Font XML TrueType</comment> - <comment xml:lang="ru">шрифт TrueType XML</comment> + <comment xml:lang="ru">Шрифт TrueType XML</comment> <comment xml:lang="sk">Písmo TrueType XML</comment> <comment xml:lang="sl">Datoteka pisave TrueType XML</comment> <comment xml:lang="sq">Lloj gërme TrueType XML</comment> @@ -11247,8 +11648,8 @@ <comment xml:lang="az">V yazı növü</comment> <comment xml:lang="be@latin">Šryft V</comment> <comment xml:lang="bg">Шрифт — V</comment> - <comment xml:lang="ca">tipus de lletra V</comment> - <comment xml:lang="cs">písmo V</comment> + <comment xml:lang="ca">lletra V</comment> + <comment xml:lang="cs">font V</comment> <comment xml:lang="cy">Ffont V</comment> <comment xml:lang="da">V-skrifttype</comment> <comment xml:lang="de">V-Schrift</comment> @@ -11263,7 +11664,7 @@ <comment xml:lang="ga">cló V</comment> <comment xml:lang="gl">tipo de letra V</comment> <comment xml:lang="he">גופן של V</comment> - <comment xml:lang="hr">V font</comment> + <comment xml:lang="hr">V slovo</comment> <comment xml:lang="hu">V-betűkészlet</comment> <comment xml:lang="ia">Typo de litteras V</comment> <comment xml:lang="id">Fonta V</comment> @@ -11282,7 +11683,7 @@ <comment xml:lang="pt">letra V</comment> <comment xml:lang="pt_BR">Fonte V</comment> <comment xml:lang="ro">Font V</comment> - <comment xml:lang="ru">шрифт V font</comment> + <comment xml:lang="ru">Шрифт V font</comment> <comment xml:lang="sk">Písmo V</comment> <comment xml:lang="sl">Datoteka pisave V</comment> <comment xml:lang="sq">Gërmë V</comment> @@ -11301,6 +11702,7 @@ <mime-type type="application/vnd.framemaker"> <comment>Adobe FrameMaker document</comment> <comment xml:lang="ar">مستند أدوبي الصانع للإطارات</comment> + <comment xml:lang="ast">Documentu d'Adobe FrameMaker</comment> <comment xml:lang="be@latin">Dakument Adobe FrameMaker</comment> <comment xml:lang="bg">Документ — Adobe FrameMaker</comment> <comment xml:lang="ca">document d'Adobe FrameMaker</comment> @@ -11337,7 +11739,7 @@ <comment xml:lang="pt">documento Adobe FrameMaker</comment> <comment xml:lang="pt_BR">Documento do Adobe FrameMaker</comment> <comment xml:lang="ro">Document Adobe FrameMaker</comment> - <comment xml:lang="ru">документ Adobe FrameMaker</comment> + <comment xml:lang="ru">Документ Adobe FrameMaker</comment> <comment xml:lang="sk">Dokument Adobe FrameMaker</comment> <comment xml:lang="sl">Dokument Adobe FrameMaker</comment> <comment xml:lang="sq">Dokument Adobe FrameMaker</comment> @@ -11399,7 +11801,7 @@ <comment xml:lang="oc">ROM Game Boy</comment> <comment xml:lang="pl">Plik ROM konsoli Game Boy</comment> <comment xml:lang="pt">ROM Game Boy</comment> - <comment xml:lang="pt_BR">ROM do Game Boy</comment> + <comment xml:lang="pt_BR">ROM de Game Boy</comment> <comment xml:lang="ro">ROM Game Boy</comment> <comment xml:lang="ru">Game Boy ROM</comment> <comment xml:lang="sk">ROM pre Game Boy</comment> @@ -11424,18 +11826,29 @@ <mime-type type="application/x-gameboy-color-rom"> <comment>Game Boy Color ROM</comment> <comment xml:lang="ca">ROM de Game Boy Color</comment> + <comment xml:lang="cs">ROM pro Game Boy Color</comment> <comment xml:lang="da">Game Boy Color ROM</comment> <comment xml:lang="de">Game Boy Color ROM</comment> + <comment xml:lang="en_GB">Game Boy Colour ROM</comment> <comment xml:lang="es">ROM de Game Boy Color</comment> + <comment xml:lang="eu">Game Boy Color ROM</comment> <comment xml:lang="fi">Game Boy Color -ROM</comment> <comment xml:lang="fr">ROM Game Boy Color</comment> + <comment xml:lang="ga">ROM Game Boy Color</comment> + <comment xml:lang="he">ROM של Game Boy Color</comment> + <comment xml:lang="hr">Game Boy Color ROM</comment> <comment xml:lang="hu">Game Boy Color ROM</comment> + <comment xml:lang="id">ROM Game Boy Color</comment> + <comment xml:lang="it">ROM Game Boy Color</comment> <comment xml:lang="kk">Game Boy Color ROM</comment> <comment xml:lang="ko">게임보이 컬러 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Game Boy Color</comment> <comment xml:lang="pt_BR">ROM de Game Boy Color</comment> <comment xml:lang="ru">Game Boy Color ROM</comment> <comment xml:lang="sk">ROM pre Game Boy Color</comment> + <comment xml:lang="sr">Гејм Бој РОМ боје</comment> + <comment xml:lang="sv">Game Boy Color-rom</comment> + <comment xml:lang="tr">Game Boy Color ROM</comment> <comment xml:lang="uk">ППП Game Boy Color</comment> <comment xml:lang="zh_CN">Game Boy Color ROM</comment> <comment xml:lang="zh_TW">Game Boy Color ROM</comment> @@ -11484,7 +11897,7 @@ <comment xml:lang="oc">ROM Game Boy Advance</comment> <comment xml:lang="pl">Plik ROM konsoli Game Boy Advance</comment> <comment xml:lang="pt">ROM Game Boy Advance</comment> - <comment xml:lang="pt_BR">ROM do Game Boy Advance</comment> + <comment xml:lang="pt_BR">ROM de Game Boy Advance</comment> <comment xml:lang="ro">ROM Game Boy Advance</comment> <comment xml:lang="ru">Game Boy Advance ROM</comment> <comment xml:lang="sk">ROM pre Game Boy Advance</comment> @@ -11501,6 +11914,30 @@ <glob pattern="*.gba"/> <glob pattern="*.agb"/> </mime-type> + <mime-type type="application/x-virtual-boy-rom"> + <comment>Virtual Boy ROM</comment> + <comment xml:lang="ca">ROM de Virtual Boy</comment> + <comment xml:lang="cs">ROM pro Virtual Boy</comment> + <comment xml:lang="de">Virtual Boy ROM</comment> + <comment xml:lang="en_GB">Virtual Boy ROM</comment> + <comment xml:lang="es">ROM de Virtual Boy</comment> + <comment xml:lang="hr">Virtual Boy ROM</comment> + <comment xml:lang="hu">Virtual Boy ROM</comment> + <comment xml:lang="id">ROM Virtual Boy</comment> + <comment xml:lang="it">ROM Virtual Boy</comment> + <comment xml:lang="kk">Virtual Boy ROM</comment> + <comment xml:lang="ko">버추얼보이 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Virtual Boy</comment> + <comment xml:lang="pt_BR">ROM de Virtual Boy</comment> + <comment xml:lang="ru">Virtual Boy ROM</comment> + <comment xml:lang="sk">ROM pre Virtual Boy</comment> + <comment xml:lang="sv">Virtual Boy-rom</comment> + <comment xml:lang="uk">ROM Virtual Boy</comment> + <comment xml:lang="zh_CN">Virtual Boy ROM</comment> + <comment xml:lang="zh_TW">Virtual Boy ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.vb"/> + </mime-type> <mime-type type="application/x-gdbm"> <comment>GDBM database</comment> <comment xml:lang="ar">قاعدة بيانات GDBM</comment> @@ -11540,7 +11977,7 @@ <comment xml:lang="pt">base de dados GDMB</comment> <comment xml:lang="pt_BR">Banco de dados GDBM</comment> <comment xml:lang="ro">Bază de date GDBM</comment> - <comment xml:lang="ru">база данных GDBM</comment> + <comment xml:lang="ru">База данных GDBM</comment> <comment xml:lang="sk">Databáza GDBM</comment> <comment xml:lang="sl">Podatkovna zbirka GDBM</comment> <comment xml:lang="sq">Bazë me të dhëna GDBM</comment> @@ -11597,7 +12034,7 @@ <comment xml:lang="oc">ROM Mega Drive/Genesis</comment> <comment xml:lang="pl">Plik ROM konsoli Mega Drive</comment> <comment xml:lang="pt">ROM Mega Drive</comment> - <comment xml:lang="pt_BR">ROM do Gênesis (Mega Drive)</comment> + <comment xml:lang="pt_BR">ROM de Genesis (Mega Drive)</comment> <comment xml:lang="ro">ROM Genesis</comment> <comment xml:lang="ru">Genesis ROM</comment> <comment xml:lang="sk">ROM pre Megadrive</comment> @@ -11624,19 +12061,29 @@ <comment>Genesis 32X ROM</comment> <comment xml:lang="ca">ROM de Genesis 32X</comment> + <comment xml:lang="cs">ROM pro Genesis 32X</comment> <comment xml:lang="da">Genesis 32X ROM</comment> <comment xml:lang="de">Genesis 32X ROM</comment> + <comment xml:lang="en_GB">Genesis 32X ROM</comment> <comment xml:lang="es">ROM de Genesis 32X</comment> + <comment xml:lang="eu">Genesis 32X ROM</comment> <comment xml:lang="fi">Genesis 32X -ROM</comment> <comment xml:lang="fr">ROM Genesis 32X</comment> + <comment xml:lang="ga">ROM Genesis 32X</comment> <comment xml:lang="he">ROM מסוג Genesis 32X</comment> + <comment xml:lang="hr">Genesis 32X ROM</comment> <comment xml:lang="hu">Genesis 32X ROM</comment> + <comment xml:lang="id">ROM Genesis 32X</comment> + <comment xml:lang="it">ROM Sega Mega Drive 32X</comment> <comment xml:lang="kk">Genesis 32X ROM</comment> <comment xml:lang="ko">제네시스 32X 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Mega Drive 32X</comment> <comment xml:lang="pt_BR">ROM de Genesis 32X</comment> <comment xml:lang="ru">Genesis 32X ROM</comment> <comment xml:lang="sk">ROM pre Genesis 32X</comment> + <comment xml:lang="sr">Џенезис 32X РОМ</comment> + <comment xml:lang="sv">Mega Drive 32X-rom</comment> + <comment xml:lang="tr">Genesis 32X ROM</comment> <comment xml:lang="uk">ППП Genesis 32X</comment> <comment xml:lang="zh_CN">Genesis 32X ROM</comment> <comment xml:lang="zh_TW">Genesis 32X ROM</comment> @@ -11667,7 +12114,7 @@ <comment xml:lang="ga">teachtaireachtaí aistrithe (inléite ag meaisín)</comment> <comment xml:lang="gl">mensaxes traducidos (lexíbeis por máquinas)</comment> <comment xml:lang="he">הודעות מתורגמות (מובן ע״י מכונה)</comment> - <comment xml:lang="hr">prevedene poruke (strojno čitljive)</comment> + <comment xml:lang="hr">Prevedene poruke (strojno čitljive)</comment> <comment xml:lang="hu">lefordított üzenetek (gépi kód)</comment> <comment xml:lang="ia">messages traducite (legibile pro machinas)</comment> <comment xml:lang="id">pesan diterjemahkan (dapat dibaca mesin)</comment> @@ -11687,7 +12134,7 @@ <comment xml:lang="pt">mensagens traduzidas (leitura pelo computador)</comment> <comment xml:lang="pt_BR">Mensagens traduzidas (legível pelo computador)</comment> <comment xml:lang="ro">mesaje traduse (citite de calculator)</comment> - <comment xml:lang="ru">переводы сообщений (откомпилированые)</comment> + <comment xml:lang="ru">Переводы сообщений (откомпилированые)</comment> <comment xml:lang="sk">Preložené správy (strojovo čitateľné)</comment> <comment xml:lang="sl">prevedena sporočila (strojni zapis)</comment> <comment xml:lang="sq">Mesazhe të përkthyer (të lexueshëm nga makina)</comment> @@ -11696,7 +12143,7 @@ <comment xml:lang="tr">çevrilmiş iletiler (makine tarafından okunabilir)</comment> <comment xml:lang="uk">перекладені повідомлення (у машинній формі)</comment> <comment xml:lang="vi">thông điệp đã dịch (máy đọc được)</comment> - <comment xml:lang="zh_CN">消息翻译(机读)</comment> + <comment xml:lang="zh_CN">已翻译消息（机读）</comment> <comment xml:lang="zh_TW">翻譯訊息 (程式讀取格式)</comment> <magic priority="50"> <match value="\336\22\4\225" type="string" offset="0"/> @@ -11717,6 +12164,7 @@ <comment xml:lang="eu">GTK+ Builder</comment> <comment xml:lang="fi">GTK+ Builder</comment> <comment xml:lang="fr">GTK+ Builder</comment> + <comment xml:lang="ga">Tógálaí GTK+</comment> <comment xml:lang="gl">Construtor de GTK+</comment> <comment xml:lang="he">בנייה של GTK+</comment> <comment xml:lang="hr">GTK+ Builder</comment> @@ -11739,7 +12187,7 @@ <comment xml:lang="sv">GTK+ Builder</comment> <comment xml:lang="tr">GTK+ İnşa Edici</comment> <comment xml:lang="uk">GTK+ Builder</comment> - <comment xml:lang="zh_CN">GTK+ 构建程序</comment> + <comment xml:lang="zh_CN">GTK+ Builder</comment> <comment xml:lang="zh_TW">GTK+ Builder</comment> <sub-class-of type="application/xml"/> <generic-icon name="x-office-document"/> @@ -11789,7 +12237,7 @@ <comment xml:lang="pt">projecto Glade</comment> <comment xml:lang="pt_BR">Projeto do Glade</comment> <comment xml:lang="ro">Proiect Glade</comment> - <comment xml:lang="ru">проект Glade</comment> + <comment xml:lang="ru">Проект Glade</comment> <comment xml:lang="sk">Projekt Glade</comment> <comment xml:lang="sl">Datoteka projekta Glade</comment> <comment xml:lang="sq">Projekt Glade</comment> @@ -11841,7 +12289,7 @@ <comment xml:lang="pt">dados financeiros GnuCash</comment> <comment xml:lang="pt_BR">Dados financeiros do GnuCash</comment> <comment xml:lang="ro">Date financiare GnuCash</comment> - <comment xml:lang="ru">финансовые данные GnuCash</comment> + <comment xml:lang="ru">Финансовые данные GnuCash</comment> <comment xml:lang="sk">Finančné údaje GnuCash</comment> <comment xml:lang="sl">Datoteka finančnih podatkov GnuCash</comment> <comment xml:lang="sr">финансијски подаци Гнуовог новца</comment> @@ -11895,7 +12343,7 @@ <comment xml:lang="pt">folha de cálculo Gnumeric</comment> <comment xml:lang="pt_BR">Planilha do Gnumeric</comment> <comment xml:lang="ro">Foaie de calcul Gnumeric</comment> - <comment xml:lang="ru">электронная таблица Gnumeric</comment> + <comment xml:lang="ru">Электронная таблица Gnumeric</comment> <comment xml:lang="sk">Zošit Gnumeric</comment> <comment xml:lang="sl">Razpredelnica Gnumeric</comment> <comment xml:lang="sq">Fletë llogaritjesh Gnumeric</comment> @@ -11904,7 +12352,7 @@ <comment xml:lang="tr">Gnumeric çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Gnumeric</comment> <comment xml:lang="vi">Bảng tính Gnumeric.</comment> - <comment xml:lang="zh_CN">Gnumeric 工作簿</comment> + <comment xml:lang="zh_CN">Gnumeric 电子表格</comment> <comment xml:lang="zh_TW">Gnumeric 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -11916,6 +12364,7 @@ <mime-type type="application/x-gnuplot"> <comment>Gnuplot document</comment> <comment xml:lang="ar">مستند Gnuplot</comment> + <comment xml:lang="ast">Documentu de Gnuplot</comment> <comment xml:lang="be@latin">Dakument Gnuplot</comment> <comment xml:lang="bg">Документ — Gnuplot</comment> <comment xml:lang="ca">document gnuplot</comment> @@ -11951,7 +12400,7 @@ <comment xml:lang="pt">documento Gnuplot</comment> <comment xml:lang="pt_BR">Documento do Gnuplot</comment> <comment xml:lang="ro">Document Gnuplot</comment> - <comment xml:lang="ru">документ Gnuplot</comment> + <comment xml:lang="ru">Документ Gnuplot</comment> <comment xml:lang="sk">Dokument Gnuplot</comment> <comment xml:lang="sl">Dokument Gnuplot</comment> <comment xml:lang="sq">Dokument Gnuplot</comment> @@ -11985,7 +12434,7 @@ <comment xml:lang="fi">Graphite- tieteellinen graafi</comment> <comment xml:lang="fo">Grapite vísindarlig ritmynd</comment> <comment xml:lang="fr">graphe Graphite scientific</comment> - <comment xml:lang="ga">graf eolaíoch Graphite</comment> + <comment xml:lang="ga">graf eolaíochta Graphite</comment> <comment xml:lang="gl">gráfica científica de Graphite</comment> <comment xml:lang="he">תרשים מדעי של Graphite</comment> <comment xml:lang="hr">Graphite znanstveni grafikon</comment> @@ -12007,7 +12456,7 @@ <comment xml:lang="pt">gráfico científico Graphite</comment> <comment xml:lang="pt_BR">Gráfico científico do Graphite</comment> <comment xml:lang="ro">Grafic științific Graphite</comment> - <comment xml:lang="ru">научная диаграмма Graphite</comment> + <comment xml:lang="ru">Научная диаграмма Graphite</comment> <comment xml:lang="sk">Vedecký graf Graphite</comment> <comment xml:lang="sl">Datoteka znanstvenega grafa Graphite</comment> <comment xml:lang="sq">Grafik shkencor Graphite </comment> @@ -12061,7 +12510,7 @@ <comment xml:lang="pt">catálogo GTKtalog</comment> <comment xml:lang="pt_BR">Catálogo GTKtalog</comment> <comment xml:lang="ro">Catalog GTKalog</comment> - <comment xml:lang="ru">каталог GTKtalog</comment> + <comment xml:lang="ru">Каталог GTKtalog</comment> <comment xml:lang="sk">Katalóg GTKtalog</comment> <comment xml:lang="sl">Datoteka kataloga GTKtalog</comment> <comment xml:lang="sq">Katallog GTKtalog</comment> @@ -12080,6 +12529,7 @@ <mime-type type="application/x-gzdvi"> <comment>TeX DVI document (gzip-compressed)</comment> <comment xml:lang="ar">مستند TeX DVI (مضغوط-gzip)</comment> + <comment xml:lang="ast">Documentu Tex DVI (comprimíu en gzip)</comment> <comment xml:lang="be@latin">Dakument TeX DVI (gzip-skampresavany)</comment> <comment xml:lang="bg">Документ — TeX DVI, компресиран с gzip</comment> <comment xml:lang="ca">document DVI de TeX (amb compressió gzip)</comment> @@ -12096,7 +12546,7 @@ <comment xml:lang="ga">cáipéis DVI TeX (comhbhrúite le gzip)</comment> <comment xml:lang="gl">documento DVI de TeX (comprimido con gzip)</comment> <comment xml:lang="he">מסמך מסוג TeX DVI (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">TeX DVI dokument (komprimiran gzip-om)</comment> + <comment xml:lang="hr">TeX DVI dokument (gzip sažet)</comment> <comment xml:lang="hu">TeX DVI dokumentum (gzip-pel tömörítve)</comment> <comment xml:lang="ia">Documento TeX DVI (comprimite con gzip)</comment> <comment xml:lang="id">Dokumen TeX DVI (terkompresi gzip)</comment> @@ -12114,7 +12564,7 @@ <comment xml:lang="pt">documento TeX DVI (compressão gzip)</comment> <comment xml:lang="pt_BR">Documento DVI TeX (compactado com gzip)</comment> <comment xml:lang="ro">Document TeX DVI (comprimat gzip)</comment> - <comment xml:lang="ru">документ TeX DVI (сжатый gzip)</comment> + <comment xml:lang="ru">Документ TeX DVI (сжатый gzip)</comment> <comment xml:lang="sk">Dokument TeX DVI (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Dokument TeX DVI (stisnjen z gzip)</comment> <comment xml:lang="sq">Dokument TeX DVI (i kompresuar me gzip)</comment> @@ -12123,7 +12573,7 @@ <comment xml:lang="tr">TeX DVI belgesi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ TeX DVI (стиснений gzip)</comment> <comment xml:lang="vi">Tài liệu DVI TeX (đã nén gzip)</comment> - <comment xml:lang="zh_CN">TeX DVI 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">TeX DVI 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">TeX DVI 文件 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="x-office-document"/> @@ -12167,7 +12617,7 @@ <comment xml:lang="pt">arquivo Gzip</comment> <comment xml:lang="pt_BR">Pacote Gzip</comment> <comment xml:lang="ro">Arhivă Gzip</comment> - <comment xml:lang="ru">архив GZIP</comment> + <comment xml:lang="ru">Архив GZIP</comment> <comment xml:lang="sk">Archív gzip</comment> <comment xml:lang="sl">Datoteka arhiva Gzip</comment> <comment xml:lang="sq">Arkiv gzip</comment> @@ -12188,6 +12638,7 @@ <mime-type type="application/x-gzpdf"> <comment>PDF document (gzip-compressed)</comment> <comment xml:lang="ar">مستند PDF (مضغوط-gzip)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en gzip)</comment> <comment xml:lang="be@latin">Dakument PDF (gzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PDF, компресиран с gzip</comment> <comment xml:lang="ca">document PDF (amb compressió gzip)</comment> @@ -12222,7 +12673,7 @@ <comment xml:lang="pt">documento PDF (compressão gzip)</comment> <comment xml:lang="pt_BR">Documento PDF (compactado com gzip)</comment> <comment xml:lang="ro">Document PDF (comprimat gzip)</comment> - <comment xml:lang="ru">документ PDF (сжатый gzip)</comment> + <comment xml:lang="ru">Документ PDF (сжатый gzip)</comment> <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Dokument PDF (stisnjen z gzip)</comment> <comment xml:lang="sq">Dokument PDF (i kompresuar me gzip)</comment> @@ -12231,7 +12682,7 @@ <comment xml:lang="tr">PDF belgesi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PDF (стиснений gzip)</comment> <comment xml:lang="vi">Tài liệu PDF (đã nén gzip)</comment> - <comment xml:lang="zh_CN">PDF 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">PDF 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">PDF 文件 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="x-office-document"/> @@ -12240,6 +12691,7 @@ <mime-type type="application/x-gzpostscript"> <comment>PostScript document (gzip-compressed)</comment> <comment xml:lang="ar">مستند PostScript (مضغوط-gzip)</comment> + <comment xml:lang="ast">Documentu PostScript (comprimíu en gzip)</comment> <comment xml:lang="be@latin">Dakument PostScript (gzip-skampresavany)</comment> <comment xml:lang="bg">Документ — PostScript, компресиран с gzip</comment> <comment xml:lang="ca">document PostScript (amb compressió gzip)</comment> @@ -12276,7 +12728,7 @@ <comment xml:lang="pt">documento PostScript (compressão gzip)</comment> <comment xml:lang="pt_BR">Documento PostScript (compactado com gzip)</comment> <comment xml:lang="ro">Document PostScript (comprimat gzip)</comment> - <comment xml:lang="ru">документ PostScript (сжатый gzip)</comment> + <comment xml:lang="ru">Документ PostScript (сжатый gzip)</comment> <comment xml:lang="sk">Dokument PostScript (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Dokument PostScript (stisnjen z gzip)</comment> <comment xml:lang="sq">Dokument PostScript (i kompresuar me gzip)</comment> @@ -12285,7 +12737,7 @@ <comment xml:lang="tr">PostScript belgesi (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PostScript (стиснене gzip)</comment> <comment xml:lang="vi">Tài liệu PostScript (đã nén gzip)</comment> - <comment xml:lang="zh_CN">PostScript 文档(gzip 压缩)</comment> + <comment xml:lang="zh_CN">PostScript 文档（gzip 压缩）</comment> <comment xml:lang="zh_TW">PostScript 文件 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <generic-icon name="x-office-document"/> @@ -12294,6 +12746,7 @@ <mime-type type="application/x-hdf"> <comment>HDF document</comment> <comment xml:lang="ar">مستند HDF</comment> + <comment xml:lang="ast">Documentu HDF</comment> <comment xml:lang="az">HDF sənədi</comment> <comment xml:lang="be@latin">Dakument HDF</comment> <comment xml:lang="bg">Документ — HDF</comment> @@ -12332,7 +12785,7 @@ <comment xml:lang="pt">documento HDF</comment> <comment xml:lang="pt_BR">Documento HDF</comment> <comment xml:lang="ro">Document HDF</comment> - <comment xml:lang="ru">документ HDF</comment> + <comment xml:lang="ru">Документ HDF</comment> <comment xml:lang="sk">Dokument HDF</comment> <comment xml:lang="sl">Dokument HDF</comment> <comment xml:lang="sq">Dokument HDF</comment> @@ -12368,6 +12821,7 @@ <comment xml:lang="eu">IFF fitxtegia</comment> <comment xml:lang="fi">IFF-tiedosto</comment> <comment xml:lang="fr">fichier IFF</comment> + <comment xml:lang="ga">comhad IFF</comment> <comment xml:lang="gl">Ficheiro IFF</comment> <comment xml:lang="he">קובץ IFF</comment> <comment xml:lang="hr">IFF datoteka</comment> @@ -12383,7 +12837,7 @@ <comment xml:lang="pl">Plik IFF</comment> <comment xml:lang="pt">ficheiro IFF</comment> <comment xml:lang="pt_BR">Arquivo IFF</comment> - <comment xml:lang="ru">файл IFF</comment> + <comment xml:lang="ru">Файл IFF</comment> <comment xml:lang="sk">Súbor IFF</comment> <comment xml:lang="sl">Datoteka IFF</comment> <comment xml:lang="sr">ИФФ датотека</comment> @@ -12437,7 +12891,7 @@ <comment xml:lang="pt">firmware iPod</comment> <comment xml:lang="pt_BR">Firmware do iPod</comment> <comment xml:lang="ro">Firmware iPod</comment> - <comment xml:lang="ru">микропрограмма iPod</comment> + <comment xml:lang="ru">Микропрограмма iPod</comment> <comment xml:lang="sk">Firmware iPod</comment> <comment xml:lang="sl">Programska strojna oprema iPod</comment> <comment xml:lang="sq">Firmware iPod</comment> @@ -12491,7 +12945,7 @@ <comment xml:lang="pt">arquivo Java</comment> <comment xml:lang="pt_BR">Pacote Java</comment> <comment xml:lang="ro">Arhivă Java</comment> - <comment xml:lang="ru">архив Java</comment> + <comment xml:lang="ru">Архив Java</comment> <comment xml:lang="sk">Archív Java</comment> <comment xml:lang="sl">Datoteka arhiva Java</comment> <comment xml:lang="sq">Arkiv Java</comment> @@ -12547,7 +13001,7 @@ <comment xml:lang="pt">classe Java</comment> <comment xml:lang="pt_BR">Classe Java</comment> <comment xml:lang="ro">Clasă Java</comment> - <comment xml:lang="ru">класс Java</comment> + <comment xml:lang="ru">Класс Java</comment> <comment xml:lang="sk">Trieda Java</comment> <comment xml:lang="sl">Datoteka razreda Java</comment> <comment xml:lang="sq">Klasë Java</comment> @@ -12606,7 +13060,7 @@ <comment xml:lang="pt">ficheiro JNLP</comment> <comment xml:lang="pt_BR">Arquivo JNLP</comment> <comment xml:lang="ro">Fișier JNLP</comment> - <comment xml:lang="ru">файл JNLP</comment> + <comment xml:lang="ru">Файл JNLP</comment> <comment xml:lang="sk">Súbor JNLP</comment> <comment xml:lang="sl">Datoteka JNLP</comment> <comment xml:lang="sq">File JNLP</comment> @@ -12660,7 +13114,7 @@ <comment xml:lang="pt">armazém de chaves Java</comment> <comment xml:lang="pt_BR">Keystore de Java</comment> <comment xml:lang="ro">Stocare chei Java</comment> - <comment xml:lang="ru">хранилище ключей Java</comment> + <comment xml:lang="ru">Хранилище ключей Java</comment> <comment xml:lang="sk">Úložisko kľúčov Java</comment> <comment xml:lang="sl">Datoteka tipkovne razporeditve Java</comment> <comment xml:lang="sr">смештај кључа Јаве</comment> @@ -12710,7 +13164,7 @@ <comment xml:lang="pt">armazém de chaves JavaJCE</comment> <comment xml:lang="pt_BR">Keystore JCE do Java</comment> <comment xml:lang="ro">Stocare chei Java JCE</comment> - <comment xml:lang="ru">хранилище ключей Java JCE</comment> + <comment xml:lang="ru">Хранилище ключей Java JCE</comment> <comment xml:lang="sk">Úložisko kľúčov Java JCE</comment> <comment xml:lang="sl">Datoteka tipkovne razporeditve Java JCE</comment> <comment xml:lang="sr">смештај ЈЦЕ кључа Јаве</comment> @@ -12763,7 +13217,7 @@ <comment xml:lang="pt">arquivo Java Pack200</comment> <comment xml:lang="pt_BR">Pacote Java Pack200</comment> <comment xml:lang="ro">Arhivă Java Pack2000</comment> - <comment xml:lang="ru">архив Java Pack200</comment> + <comment xml:lang="ru">Архив Java Pack200</comment> <comment xml:lang="sk">Archív Java Pack200</comment> <comment xml:lang="sl">Datoteka arhiva Pack200 Java</comment> <comment xml:lang="sq">Arkiv Java Pack200</comment> @@ -12819,7 +13273,7 @@ <comment xml:lang="pt">programa JavaScript</comment> <comment xml:lang="pt_BR">Programa JavaScript</comment> <comment xml:lang="ro">Program JavaScript</comment> - <comment xml:lang="ru">сценарий JavaScript</comment> + <comment xml:lang="ru">Программа JavaScript</comment> <comment xml:lang="sk">Program jazyka JavaScript</comment> <comment xml:lang="sl">Programska datoteka JavaScript</comment> <comment xml:lang="sq">Program JavaScript</comment> @@ -12828,17 +13282,31 @@ <comment xml:lang="tr">JavaScript programı</comment> <comment xml:lang="uk">програма мовою JavaScript</comment> <comment xml:lang="vi">Chương trình JavaScript</comment> - <comment xml:lang="zh_CN">Javascript 程序</comment> + <comment xml:lang="zh_CN">JavaScript 程序</comment> <comment xml:lang="zh_TW">JavaScript 程式</comment> <alias type="application/x-javascript"/> <alias type="text/javascript"/> <sub-class-of type="application/ecmascript"/> <generic-icon name="text-x-script"/> + <magic priority="50"> + <match value="#!/bin/gjs" type="string" offset="0"/> + <match value="#! /bin/gjs" type="string" offset="0"/> + <match value='eval \"exec /bin/gjs' type="string" offset="0"/> + <match value="#!/usr/bin/gjs" type="string" offset="0"/> + <match value="#! /usr/bin/gjs" type="string" offset="0"/> + <match value='eval \"exec /usr/bin/gjs' type="string" offset="0"/> + <match value="#!/usr/local/bin/gjs" type="string" offset="0"/> + <match value="#! /usr/local/bin/gjs" type="string" offset="0"/> + <match value='eval \"exec /usr/local/bin/gjs' type="string" offset="0"/> + <match value='/bin/env gjs' type="string" offset="2:16"/> + </magic> <glob pattern="*.js"/> <glob pattern="*.jsm"/> + <glob pattern="*.mjs"/> </mime-type> <mime-type type="application/json"> <comment>JSON document</comment> + <comment xml:lang="ast">Documentu JSON</comment> <comment xml:lang="ca">document JSON</comment> <comment xml:lang="cs">dokument JSON</comment> <comment xml:lang="da">JSON-dokument</comment> @@ -12849,6 +13317,7 @@ <comment xml:lang="eu">JSON dokumentua</comment> <comment xml:lang="fi">JSON-asiakirja</comment> <comment xml:lang="fr">document JSON</comment> + <comment xml:lang="ga">cáipéis JSON</comment> <comment xml:lang="gl">Documento JSON</comment> <comment xml:lang="he">מסמך JSON</comment> <comment xml:lang="hr">JSON dokument</comment> @@ -12879,6 +13348,7 @@ </mime-type> <mime-type type="application/jrd+json"> <comment>JRD document</comment> + <comment xml:lang="ast">Documentu JRD</comment> <comment xml:lang="ca">document JRD</comment> <comment xml:lang="cs">dokument JRD</comment> <comment xml:lang="da">JRD-dokument</comment> @@ -12889,6 +13359,7 @@ <comment xml:lang="eu">JRD dokumentua</comment> <comment xml:lang="fi">JRD-asiakirja</comment> <comment xml:lang="fr">document JRD</comment> + <comment xml:lang="ga">cáipéis JRD</comment> <comment xml:lang="he">מסמך JRD</comment> <comment xml:lang="hr">JRD dokument</comment> <comment xml:lang="hu">JRD dokumentum</comment> @@ -12901,7 +13372,7 @@ <comment xml:lang="pl">Dokument JRD</comment> <comment xml:lang="pt">doxumento JRD</comment> <comment xml:lang="pt_BR">Documento JRD</comment> - <comment xml:lang="ru">документ JRD</comment> + <comment xml:lang="ru">Документ JRD</comment> <comment xml:lang="sk">Dokument JRD</comment> <comment xml:lang="sr">ЈРД документ</comment> <comment xml:lang="sv">JRD-dokument</comment> @@ -12923,7 +13394,9 @@ <comment xml:lang="de">JSON-Patch</comment> <comment xml:lang="en_GB">JSON patch</comment> <comment xml:lang="es">parche en JSON</comment> + <comment xml:lang="eu">JSON adabakia</comment> <comment xml:lang="fr">correctif JSON</comment> + <comment xml:lang="ga">paiste JSON</comment> <comment xml:lang="he">טלאי JSON</comment> <comment xml:lang="hr">JSON zakrpa</comment> <comment xml:lang="hu">JSON javítócsomag</comment> @@ -12936,13 +13409,13 @@ <comment xml:lang="pl">Łata JSON</comment> <comment xml:lang="pt">patch JSON</comment> <comment xml:lang="pt_BR">Patch JSON</comment> - <comment xml:lang="ru">изменение JSON</comment> + <comment xml:lang="ru">Патч JSON</comment> <comment xml:lang="sk">Záplata JSON</comment> <comment xml:lang="sr">ЈСОН закрпа</comment> <comment xml:lang="sv">JSON patch</comment> <comment xml:lang="tr">JSON yaması</comment> <comment xml:lang="uk">латка JSON</comment> - <comment xml:lang="zh_CN">JSON 补丁文件</comment> + <comment xml:lang="zh_CN">JSON 补丁</comment> <comment xml:lang="zh_TW">JSON 修補檔</comment> <acronym>JSON</acronym> <expanded-acronym>JavaScript Object Notation</expanded-acronym> @@ -12952,6 +13425,7 @@ </mime-type> <mime-type type="application/ld+json"> <comment>JSON-LD document</comment> + <comment xml:lang="ast">Documentu JSON-LD</comment> <comment xml:lang="ca">document JSON-LD</comment> <comment xml:lang="cs">dokument JSON-LD</comment> <comment xml:lang="da">JSON-LD-dokument</comment> @@ -12962,6 +13436,7 @@ <comment xml:lang="eu">JSON-LD dokumentua</comment> <comment xml:lang="fi">JSON-LD-asiakirja</comment> <comment xml:lang="fr">document JSON-LD</comment> + <comment xml:lang="ga">cáipéis JSON-LD</comment> <comment xml:lang="he">מסמך JSON-LD</comment> <comment xml:lang="hr">JSON-LD dokument</comment> <comment xml:lang="hu">JSON-LD dokumentum</comment> @@ -12974,7 +13449,7 @@ <comment xml:lang="pl">Dokument JSON-LD</comment> <comment xml:lang="pt">documento JSON-LD</comment> <comment xml:lang="pt_BR">Documento JSON-LD</comment> - <comment xml:lang="ru">документ JSON-LD</comment> + <comment xml:lang="ru">Документ JSON-LD</comment> <comment xml:lang="sk">Dokument JSON-LD</comment> <comment xml:lang="sr">ЈСОН-ЛД документ</comment> <comment xml:lang="sv">JSON-LD-dokument</comment> @@ -12991,18 +13466,28 @@ <mime-type type="application/x-ipynb+json"> <comment>Jupyter Notebook</comment> <comment xml:lang="ca">llibreta de notes de Jupyter</comment> + <comment xml:lang="cs">sešit Jupyter</comment> <comment xml:lang="da">Jupyter Notebook</comment> <comment xml:lang="de">Jupyter-Dokument</comment> + <comment xml:lang="en_GB">Jupyter Notebook</comment> <comment xml:lang="es">libreta de Jupyter</comment> + <comment xml:lang="eu">Jupyter Notebook</comment> <comment xml:lang="fr">carnet de notes Jupyter</comment> + <comment xml:lang="ga">Leabhar nótaí Jupyter</comment> <comment xml:lang="he">מחברת Jupyter</comment> + <comment xml:lang="hr">Jupyter bilježnica</comment> <comment xml:lang="hu">Jupyter notesz</comment> + <comment xml:lang="id">Notebook Jupyter</comment> + <comment xml:lang="it">Notebook Jupyter</comment> <comment xml:lang="kk">Jupyter Notebook</comment> <comment xml:lang="ko">Jupyter 노트북</comment> <comment xml:lang="pl">Notatnik Jupyter</comment> <comment xml:lang="pt_BR">Bloco de Notas Jupyter</comment> <comment xml:lang="ru">Jupyter Notebook</comment> <comment xml:lang="sk">Zošit programu Jupyter</comment> + <comment xml:lang="sr">Џупитер бележница</comment> + <comment xml:lang="sv">Jupyter Notebook-dokument</comment> + <comment xml:lang="tr">Jupyter Notebook</comment> <comment xml:lang="uk">записник Jupyter</comment> <comment xml:lang="zh_CN">Jupyter 笔记本</comment> <comment xml:lang="zh_TW">Jupyter 記事本</comment> @@ -13017,6 +13502,7 @@ </mime-type> <mime-type type="application/vnd.coffeescript"> <comment>CoffeeScript document</comment> + <comment xml:lang="ast">Documentu de CoffeScript</comment> <comment xml:lang="ca">document CoffeeScript</comment> <comment xml:lang="cs">dokument CoffeeScript</comment> <comment xml:lang="da">CoffeeScript-dokument</comment> @@ -13027,6 +13513,7 @@ <comment xml:lang="eu">CoffeeScript dokumentua</comment> <comment xml:lang="fi">CoffeeScript-asiakirja</comment> <comment xml:lang="fr">document CoffeeScript</comment> + <comment xml:lang="ga">cáipéis CoffeeScript</comment> <comment xml:lang="he">מסמך CoffeeScript</comment> <comment xml:lang="hr">CoffeeScript dokument</comment> <comment xml:lang="hu">CoffeeScript dokumentum</comment> @@ -13039,7 +13526,7 @@ <comment xml:lang="pl">Dokument CoffeeScript</comment> <comment xml:lang="pt">documento CoffeeScript</comment> <comment xml:lang="pt_BR">Documento CoffeeScript</comment> - <comment xml:lang="ru">документ CoffeeScript</comment> + <comment xml:lang="ru">Документ CoffeeScript</comment> <comment xml:lang="sk">Dokument CoffeeScript</comment> <comment xml:lang="sr">Кофи скрипт документ</comment> <comment xml:lang="sv">CoffeeScript-dokument</comment> @@ -13090,7 +13577,7 @@ <comment xml:lang="pt">projecto JBuilder</comment> <comment xml:lang="pt_BR">Projeto do JBuilder</comment> <comment xml:lang="ro">Proiect JBuilder</comment> - <comment xml:lang="ru">проект JBuilder</comment> + <comment xml:lang="ru">Проект JBuilder</comment> <comment xml:lang="sk">Projekt JBuilder</comment> <comment xml:lang="sl">Datoteka projekta JBuilder</comment> <comment xml:lang="sq">Projekt JBuilder</comment> @@ -13144,7 +13631,7 @@ <comment xml:lang="pt">desenho Karbon14</comment> <comment xml:lang="pt_BR">Desenho do Karbon14</comment> <comment xml:lang="ro">Desen Karbon14</comment> - <comment xml:lang="ru">изображение Karbon14</comment> + <comment xml:lang="ru">Рисунок Karbon14</comment> <comment xml:lang="sk">Kresba Karbon14</comment> <comment xml:lang="sl">Datoteka risbe Karbon14</comment> <comment xml:lang="sq">Vizatim Karbon14</comment> @@ -13209,7 +13696,7 @@ <comment xml:lang="pt">gráfico KChart</comment> <comment xml:lang="pt_BR">Gráfico do KChart</comment> <comment xml:lang="ro">Diagramă KChart</comment> - <comment xml:lang="ru">диаграмма KChart</comment> + <comment xml:lang="ru">Диаграмма KChart</comment> <comment xml:lang="sk">Graf KChart</comment> <comment xml:lang="sl">Datoteka grafikona KChart</comment> <comment xml:lang="sq">Grafik KChart</comment> @@ -13269,7 +13756,7 @@ <comment xml:lang="pt">definições Kexi para ligação de servidor de base de dados</comment> <comment xml:lang="pt_BR">Configurações do Kexi para conexão a servidor de banco de dados</comment> <comment xml:lang="ro">Configurări Kexi pentru conexiunea la serverul de baze de date</comment> - <comment xml:lang="ru">параметры Kexi для подключения к серверу БД</comment> + <comment xml:lang="ru">Параметры Kexi для подключения к серверу БД</comment> <comment xml:lang="sk">Nastavenia Kexi pre pripojenie k databázovému serveru</comment> <comment xml:lang="sl">Strežniška povezava do nastavitvene datoteke Kexi.</comment> <comment xml:lang="sr">подешавања Кексија за везу са сервером базе података</comment> @@ -13298,7 +13785,7 @@ <comment xml:lang="ga">aicearra go tionscadal Kexi ar fhreastalaí bunachair sonraí</comment> <comment xml:lang="gl">acceso directo a proxecto Kexi no servidor de bases de datos</comment> <comment xml:lang="he">קיצור דרך לפרוירט Kexi בשרת נתונים</comment> - <comment xml:lang="hr">prečac za Kexi projekt na poslužitelju baze podataka</comment> + <comment xml:lang="hr">Prečac do Kexi projekta na poslužitelju baze podataka</comment> <comment xml:lang="hu">indítóikon adatbázis-kiszolgálón lévő Kexi projektre</comment> <comment xml:lang="ia">Ligamine a projecto Kexi in servitor de base de datos</comment> <comment xml:lang="id">pintasan ke projek Kexi pada server basis data</comment> @@ -13314,7 +13801,7 @@ <comment xml:lang="pt">atalho para projeto Kexi em servidor de base de dados</comment> <comment xml:lang="pt_BR">Atalho para projeto Kexi no servidor de banco de dados</comment> <comment xml:lang="ro">scurtătură către un proiect Kexi pe un server de baze de date</comment> - <comment xml:lang="ru">ссылка на проект Kexi на сервере БД</comment> + <comment xml:lang="ru">Ссылка на проект Kexi на сервере БД</comment> <comment xml:lang="sk">Zástupca projektu Kexi na databázovom serveri</comment> <comment xml:lang="sl">bližnjica do Kexi projekta na podatkovnem strežniku</comment> <comment xml:lang="sr">пречица до пројекта Кексија на серверу базе података</comment> @@ -13355,11 +13842,11 @@ <comment xml:lang="lv">Kexi datubāzes datnes balstīts projekts</comment> <comment xml:lang="nl">Kexi database bestandgebaseerd project</comment> <comment xml:lang="oc">projècte de banca de donadas Kexi en mòde fichièr</comment> - <comment xml:lang="pl">Projekt bazy danych Kexi oparty na pliku</comment> + <comment xml:lang="pl">Projekt bazy danych Kexi na podstawie plików</comment> <comment xml:lang="pt">projeto Kexi em base de dados baseada em ficheiros</comment> <comment xml:lang="pt_BR">Projeto de banco de dados baseado em arquivo do Kexi</comment> <comment xml:lang="ro">Proiect bazat pe fișiere al bazei de date Kexi</comment> - <comment xml:lang="ru">файловый проект базы данных Kexi</comment> + <comment xml:lang="ru">Файловый проект базы данных Kexi</comment> <comment xml:lang="sk">Projekt databázy Kexi s úložiskom typu súbor</comment> <comment xml:lang="sl">Datoteka projekta podatkovne zbirke Kexi</comment> <comment xml:lang="sr">пројекат Кексијеве базе података на основу датотеке</comment> @@ -13401,11 +13888,11 @@ <comment xml:lang="lv">Kexi datubāzes datnes balstīts projekts</comment> <comment xml:lang="nl">Kexi database bestandgebaseerd project</comment> <comment xml:lang="oc">projècte de banca de donadas Kexi en mòde fichièr</comment> - <comment xml:lang="pl">Projekt bazy danych Kexi oparty na pliku</comment> + <comment xml:lang="pl">Projekt bazy danych Kexi na podstawie plików</comment> <comment xml:lang="pt">projeto Kexi em base de dados baseada em ficheiros</comment> <comment xml:lang="pt_BR">Projeto de banco de dados baseado em arquivo do Kexi</comment> <comment xml:lang="ro">Proiect bazat pe fișiere al bazei de date Kexi</comment> - <comment xml:lang="ru">файловый проект базы данных Kexi</comment> + <comment xml:lang="ru">Файловый проект базы данных Kexi</comment> <comment xml:lang="sk">Projekt databázy Kexi s úložiskom typu súbor</comment> <comment xml:lang="sl">Datoteka projekta podatkovne zbirke Kexi</comment> <comment xml:lang="sr">пројекат Кексијеве базе података на основу датотеке</comment> @@ -13458,7 +13945,7 @@ <comment xml:lang="pt">fórmula KFormula</comment> <comment xml:lang="pt_BR">Fórmula do KFormula</comment> <comment xml:lang="ro">Formulă KFormula</comment> - <comment xml:lang="ru">формула KFormula</comment> + <comment xml:lang="ru">Формула KFormula</comment> <comment xml:lang="sk">Vzorec KFormula</comment> <comment xml:lang="sl">Datoteka formule KFormula</comment> <comment xml:lang="sq">Formulë KFormula</comment> @@ -13523,7 +14010,7 @@ <comment xml:lang="pt">desenho KIllustrator</comment> <comment xml:lang="pt_BR">Desenho do KIllustrator</comment> <comment xml:lang="ro">Desen KIllustrator</comment> - <comment xml:lang="ru">изображение KIllustrator</comment> + <comment xml:lang="ru">Рисунок KIllustrator</comment> <comment xml:lang="sk">Kresba KIllustrator</comment> <comment xml:lang="sl">Datoteka risbe KIllustrator</comment> <comment xml:lang="sq">Vizatim KIllustrator</comment> @@ -13583,11 +14070,11 @@ <comment xml:lang="pt">gráfico de fluxo Kivio</comment> <comment xml:lang="pt_BR">Fluxograma do Kivio</comment> <comment xml:lang="ro">Diagramă Kivio</comment> - <comment xml:lang="ru">диаграмма Kivio</comment> + <comment xml:lang="ru">Диаграмма Kivio</comment> <comment xml:lang="sk">Vývojový diagram Kivio</comment> <comment xml:lang="sl">Datoteka grafikona Kivio</comment> <comment xml:lang="sq">Diagramë fluksi Kivio</comment> - <comment xml:lang="sr">Кливиов дијаграм протока</comment> + <comment xml:lang="sr">Кивиов дијаграм тока</comment> <comment xml:lang="sv">Kivio-flödesschema</comment> <comment xml:lang="tr">Kivio akış şeması</comment> <comment xml:lang="uk">блок-схема Kivio</comment> @@ -13648,7 +14135,7 @@ <comment xml:lang="pt">desenho Kontour</comment> <comment xml:lang="pt_BR">Desenho do Kontour</comment> <comment xml:lang="ro">Desen Kontour</comment> - <comment xml:lang="ru">изображение Kontour</comment> + <comment xml:lang="ru">Рисунок Kontour</comment> <comment xml:lang="sk">Kresba Kontour</comment> <comment xml:lang="sl">Datoteka risbe Kontour</comment> <comment xml:lang="sq">Vizatim Kontour</comment> @@ -13713,7 +14200,7 @@ <comment xml:lang="pt">cenário KPovModeler</comment> <comment xml:lang="pt_BR">Cena do KPovModeler</comment> <comment xml:lang="ro">Scenă KPovModeler</comment> - <comment xml:lang="ru">сцена KPovModeler</comment> + <comment xml:lang="ru">Сцена KPovModeler</comment> <comment xml:lang="sk">Scéna KPovModeler</comment> <comment xml:lang="sl">Datoteka scene KPovModeler</comment> <comment xml:lang="sq">Skenë KPovModeler</comment> @@ -13766,7 +14253,7 @@ <comment xml:lang="pt">apresentação KPresenter</comment> <comment xml:lang="pt_BR">Apresentação do KPresenter</comment> <comment xml:lang="ro">Prezentare KPresenter</comment> - <comment xml:lang="ru">презентация KPresenter</comment> + <comment xml:lang="ru">Презентация KPresenter</comment> <comment xml:lang="sk">Prezentácia KPresenter</comment> <comment xml:lang="sl">Predstavitev KPresenter</comment> <comment xml:lang="sq">Prezantim i KPresenter</comment> @@ -13796,6 +14283,7 @@ <mime-type type="application/x-krita"> <comment>Krita document</comment> <comment xml:lang="ar">مستند Krita</comment> + <comment xml:lang="ast">Documentu de Krita</comment> <comment xml:lang="be@latin">Dakument Krita</comment> <comment xml:lang="bg">Документ — Krita</comment> <comment xml:lang="ca">document Krita</comment> @@ -13832,7 +14320,7 @@ <comment xml:lang="pt">documento Krita</comment> <comment xml:lang="pt_BR">Documento do Krita</comment> <comment xml:lang="ro">Document Krita</comment> - <comment xml:lang="ru">документ Krita</comment> + <comment xml:lang="ru">Документ Krita</comment> <comment xml:lang="sk">Dokument Krita</comment> <comment xml:lang="sl">Dokument Krita</comment> <comment xml:lang="sq">Dokument Krita</comment> @@ -13897,7 +14385,7 @@ <comment xml:lang="pt">folha de cálculo KSpread</comment> <comment xml:lang="pt_BR">Planilha do KSpread</comment> <comment xml:lang="ro">Foaie de calcul KSpread</comment> - <comment xml:lang="ru">электронная таблица KSpread</comment> + <comment xml:lang="ru">Электронная таблица KSpread</comment> <comment xml:lang="sk">Zošit KSpread</comment> <comment xml:lang="sl">Preglednica KSpread</comment> <comment xml:lang="sq">Fletë llogaritjesh KSpread</comment> @@ -13906,7 +14394,7 @@ <comment xml:lang="tr">KSpread çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця KSpread</comment> <comment xml:lang="vi">Bảng tính KSpread</comment> - <comment xml:lang="zh_CN">KSpread 工作簿</comment> + <comment xml:lang="zh_CN">KSpread 电子表格</comment> <comment xml:lang="zh_TW">KSpread 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="60"> @@ -13962,7 +14450,7 @@ <comment xml:lang="pt">folha de cálculo KSpread (encriptada)</comment> <comment xml:lang="pt_BR">Planilha do KSpread (criptografada)</comment> <comment xml:lang="ro">Foaie de calcul KSpread (criptat)</comment> - <comment xml:lang="ru">электронная таблица KSpread (зашифрованная)</comment> + <comment xml:lang="ru">Электронная таблица KSpread (зашифрованная)</comment> <comment xml:lang="sk">Zošit KSpread (šifrovaný)</comment> <comment xml:lang="sl">Preglednica KSpread (šifrirana)</comment> <comment xml:lang="sq">Fletë llogaritjesh KSpread (e kriptuar)</comment> @@ -13971,7 +14459,7 @@ <comment xml:lang="tr">KSpread çalışma sayfası (şifreli)</comment> <comment xml:lang="uk">ел. таблиця KSpread (зашифрована)</comment> <comment xml:lang="vi">Bảng tính KSpread (đã mật mã)</comment> - <comment xml:lang="zh_CN">KSpread 加密工作簿</comment> + <comment xml:lang="zh_CN">KSpread 电子表格（加密）</comment> <comment xml:lang="zh_TW">KSpread 試算表 (已加密)</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -13994,7 +14482,7 @@ <comment xml:lang="fi">KSysV init -paketti</comment> <comment xml:lang="fo">KSysV init pakki</comment> <comment xml:lang="fr">paquet d'initialisation KSysV</comment> - <comment xml:lang="ga">pacáiste thosú KSysV</comment> + <comment xml:lang="ga">pacáiste túsaithe KSysV</comment> <comment xml:lang="gl">paquete de KsysV init</comment> <comment xml:lang="he">חבילת KSysV init</comment> <comment xml:lang="hr">KSysV init paket</comment> @@ -14015,7 +14503,7 @@ <comment xml:lang="pt">pacote inicial KSysV</comment> <comment xml:lang="pt_BR">Pacote init do KSysV</comment> <comment xml:lang="ro">Pachet KSysV init</comment> - <comment xml:lang="ru">пакет инициализации KSysV</comment> + <comment xml:lang="ru">Пакет инициализации KSysV</comment> <comment xml:lang="sk">Balíček KSysV init</comment> <comment xml:lang="sl">Datoteka paketa KSysV init</comment> <comment xml:lang="sq">Paketë init KSysV</comment> @@ -14036,6 +14524,7 @@ <mime-type type="application/x-kugar"> <comment>Kugar document</comment> <comment xml:lang="ar">مستند Kugar</comment> + <comment xml:lang="ast">Documentu de Kugar</comment> <comment xml:lang="be@latin">Dakument Kugar</comment> <comment xml:lang="bg">Документ — Kugar</comment> <comment xml:lang="ca">document Kugar</comment> @@ -14072,7 +14561,7 @@ <comment xml:lang="pt">documento Kugar</comment> <comment xml:lang="pt_BR">Documento do Kugar</comment> <comment xml:lang="ro">Document Kugar</comment> - <comment xml:lang="ru">документ Kugar</comment> + <comment xml:lang="ru">Документ Kugar</comment> <comment xml:lang="sk">Dokument Kugar</comment> <comment xml:lang="sl">Dokument Kugar</comment> <comment xml:lang="sq">Dokument Kugar</comment> @@ -14089,6 +14578,7 @@ <mime-type type="application/x-kword"> <comment>KWord document</comment> <comment xml:lang="ar">مستند KWord</comment> + <comment xml:lang="ast">Documentu de Kword</comment> <comment xml:lang="be@latin">Dakument KWord</comment> <comment xml:lang="bg">Документ — KWord</comment> <comment xml:lang="ca">document KWord</comment> @@ -14126,7 +14616,7 @@ <comment xml:lang="pt">documento KWord</comment> <comment xml:lang="pt_BR">Documento do KWord</comment> <comment xml:lang="ro">Document KWord</comment> - <comment xml:lang="ru">документ KWord</comment> + <comment xml:lang="ru">Документ KWord</comment> <comment xml:lang="sk">Dokument KWord</comment> <comment xml:lang="sl">Dokument KWord</comment> <comment xml:lang="sq">Dokument KWord</comment> @@ -14156,6 +14646,7 @@ <mime-type type="application/x-kword-crypt"> <comment>KWord document (encrypted)</comment> <comment xml:lang="ar">مستند KWord (مشفر)</comment> + <comment xml:lang="ast">Documentu de Kword (cifráu)</comment> <comment xml:lang="be@latin">Dakument KWord (zašyfravany)</comment> <comment xml:lang="bg">Документ — KWord, шифриран</comment> <comment xml:lang="ca">document KWord (xifrat)</comment> @@ -14192,7 +14683,7 @@ <comment xml:lang="pt">documento KWord (encriptado)</comment> <comment xml:lang="pt_BR">Documento do KWord (criptografado)</comment> <comment xml:lang="ro">Document KWord (criptat)</comment> - <comment xml:lang="ru">документ KWord (зашифрованный)</comment> + <comment xml:lang="ru">Документ KWord (зашифрованный)</comment> <comment xml:lang="sk">Dokument KWord (šifrovaný)</comment> <comment xml:lang="sl">Dokument KWord (šifriran)</comment> <comment xml:lang="sq">Dokument KWord (i kriptuar)</comment> @@ -14201,7 +14692,7 @@ <comment xml:lang="tr">KWord belgesi (şifreli)</comment> <comment xml:lang="uk">документ KWord (зашифрований)</comment> <comment xml:lang="vi">Tài liệu KWord (đã mật mã)</comment> - <comment xml:lang="zh_CN">KWord 加密文档</comment> + <comment xml:lang="zh_CN">KWord 文档（加密）</comment> <comment xml:lang="zh_TW">KWord 文件 (已加密)</comment> <generic-icon name="x-office-document"/> <magic priority="50"> @@ -14249,7 +14740,7 @@ <comment xml:lang="pt">arquivo LHA</comment> <comment xml:lang="pt_BR">Pacote LHA</comment> <comment xml:lang="ro">Arhivă LHA</comment> - <comment xml:lang="ru">архив LHA</comment> + <comment xml:lang="ru">Архив LHA</comment> <comment xml:lang="sk">Archív LHA</comment> <comment xml:lang="sl">Datoteka arhiva LHA</comment> <comment xml:lang="sq">Arkiv LHA</comment> @@ -14318,7 +14809,7 @@ <comment xml:lang="pt">arquivo LHZ</comment> <comment xml:lang="pt_BR">Pacote LHZ</comment> <comment xml:lang="ro">Arhivă LHZ</comment> - <comment xml:lang="ru">архив LHZ</comment> + <comment xml:lang="ru">Архив LHZ</comment> <comment xml:lang="sk">Archív LHZ</comment> <comment xml:lang="sl">Datoteka arhiva LHZ</comment> <comment xml:lang="sq">Arkiv LHZ</comment> @@ -14332,7 +14823,7 @@ <generic-icon name="package-x-generic"/> <glob pattern="*.lhz"/> </mime-type> - <mime-type type="text/vnd.trolltech.linguist"> + <mime-type type="text/vnd.qt.linguist"> <comment>message catalog</comment> <comment xml:lang="ar">كتالوج الرسالة</comment> <comment xml:lang="be@latin">kataloh paviedamleńniaŭ</comment> @@ -14352,7 +14843,7 @@ <comment xml:lang="ga">catalóg theachtaireachtaí</comment> <comment xml:lang="gl">catálogo de mensaxes</comment> <comment xml:lang="he">קטלוג הודעות</comment> - <comment xml:lang="hr">katalog poruka</comment> + <comment xml:lang="hr">Katalog poruka</comment> <comment xml:lang="hu">üzenetkatalógus</comment> <comment xml:lang="ia">Catalogo de messages</comment> <comment xml:lang="id">katalog pesan</comment> @@ -14371,7 +14862,7 @@ <comment xml:lang="pt">catálogo de mensagens</comment> <comment xml:lang="pt_BR">Catálogo de mensagens</comment> <comment xml:lang="ro">catalog de mesaje</comment> - <comment xml:lang="ru">каталог сообщений</comment> + <comment xml:lang="ru">Каталог сообщений</comment> <comment xml:lang="sk">Katalóg správ</comment> <comment xml:lang="sl">katalogov sporočil</comment> <comment xml:lang="sq">Katallog mesazhesh</comment> @@ -14388,10 +14879,12 @@ </magic> <glob pattern="*.ts"/> <alias type="application/x-linguist"/> + <alias type="text/vnd.trolltech.linguist"/> </mime-type> <mime-type type="application/x-lyx"> <comment>LyX document</comment> <comment xml:lang="ar">مستند LyX</comment> + <comment xml:lang="ast">Documentu de Lyx</comment> <comment xml:lang="be@latin">Dakument LyX</comment> <comment xml:lang="bg">Документ — LyX</comment> <comment xml:lang="ca">document LyX</comment> @@ -14428,7 +14921,7 @@ <comment xml:lang="pt">documento LyX</comment> <comment xml:lang="pt_BR">Documento LyX</comment> <comment xml:lang="ro">Document LyX</comment> - <comment xml:lang="ru">документ LyX</comment> + <comment xml:lang="ru">Документ LyX</comment> <comment xml:lang="sk">Dokument LyX</comment> <comment xml:lang="sl">Dokument LyX</comment> <comment xml:lang="sq">Dokument LyX</comment> @@ -14459,6 +14952,7 @@ <comment xml:lang="eu">LZ4 artxiboa</comment> <comment xml:lang="fi">LZ4-arkisto</comment> <comment xml:lang="fr">archive LZ4</comment> + <comment xml:lang="ga">Cartlann LZ4</comment> <comment xml:lang="gl">Arquivo LZ4</comment> <comment xml:lang="he">ארכיון LZ4</comment> <comment xml:lang="hr">LZ4 arhiva</comment> @@ -14472,7 +14966,7 @@ <comment xml:lang="pl">Archiwum LZ4</comment> <comment xml:lang="pt">arquivo LZ4</comment> <comment xml:lang="pt_BR">Pacote LZ4</comment> - <comment xml:lang="ru">архив LZ4</comment> + <comment xml:lang="ru">Архив LZ4</comment> <comment xml:lang="sk">Archív LZ4</comment> <comment xml:lang="sl">Datoteka arhiva LZ4</comment> <comment xml:lang="sr">ЛЗ4 архива</comment> @@ -14491,21 +14985,31 @@ <mime-type type="application/x-lz4-compressed-tar"> <comment>Tar archive (LZ4-compressed)</comment> <comment xml:lang="ca">arxiu tar (amb compressió LZ4)</comment> + <comment xml:lang="cs">archiv Tar (komprimace LZ4)</comment> <comment xml:lang="da">Tar-arkiv (LZ4-komprimeret)</comment> <comment xml:lang="de">Tar-Archiv (LZ4-komprimiert)</comment> + <comment xml:lang="en_GB">Tar archive (LZ4-compressed)</comment> <comment xml:lang="es">archivador Tar (comprimido con LZ4)</comment> + <comment xml:lang="eu">Tar artxiboa (LZ4-rekin konprimatua)</comment> <comment xml:lang="fi">Tar-arkisto (LZ4-pakattu)</comment> <comment xml:lang="fr">archive tar (compression LZ4)</comment> + <comment xml:lang="ga">cartlann Tar (comhbhrúite le LZ4)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZ4)</comment> + <comment xml:lang="hr">Tar arhiva (LZ4 sažeto)</comment> <comment xml:lang="hu">Tar archívum (LZ4-el tömörítve)</comment> + <comment xml:lang="id">arsip tar (terkompresi LZ4)</comment> + <comment xml:lang="it">Archivio tar (compresso con LZ4)</comment> <comment xml:lang="kk">Tar архиві (LZ4-пен сығылған)</comment> <comment xml:lang="ko">Tar 묶음 파일(LZ4 압축)</comment> <comment xml:lang="pl">Archiwum tar (kompresja LZ4)</comment> <comment xml:lang="pt_BR">Arquvio Tar (compactado com LZ4)</comment> - <comment xml:lang="ru">архив TAR (сжатый LZ4)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lz4)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZ4)</comment> + <comment xml:lang="sr">Тар архива (запакована ЛЗ4-ом)</comment> + <comment xml:lang="sv">Tar-arkiv (LZ4-komprimerat)</comment> + <comment xml:lang="tr">Tar arşivi (LZ4 ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений LZ4)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (LZ4 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（LZ4 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (LZ4 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-lz4"/> @@ -14546,7 +15050,7 @@ <comment xml:lang="pt">arquivo LZip</comment> <comment xml:lang="pt_BR">Pacote Lzip</comment> <comment xml:lang="ro">Arhivă Lzip</comment> - <comment xml:lang="ru">архив LZIP</comment> + <comment xml:lang="ru">Архив LZIP</comment> <comment xml:lang="sk">Archív Lzip</comment> <comment xml:lang="sl">Datoteka arhiva Lzip</comment> <comment xml:lang="sr">Лзип архива</comment> @@ -14564,21 +15068,31 @@ <mime-type type="application/x-lzip-compressed-tar"> <comment>Tar archive (lzip-compressed)</comment> <comment xml:lang="ca">arxiu tar (amb compressió lzip)</comment> + <comment xml:lang="cs">archiv Tar (komprimace lzip)</comment> <comment xml:lang="da">Tar-arkiv (lzip-komprimeret)</comment> <comment xml:lang="de">Tar-Archiv (lzip-komprimiert)</comment> + <comment xml:lang="en_GB">Tar archive (lzip-compressed)</comment> <comment xml:lang="es">archivador Tar (comprimido con lzip)</comment> + <comment xml:lang="eu">Tar artxiboa (lzip-rekin konprimatua)</comment> <comment xml:lang="fi">Tar-arkisto (lzip-pakattu)</comment> <comment xml:lang="fr">archive tar (compressée lzip)</comment> + <comment xml:lang="ga">cartlann Tar (comhbhrúite le lzip)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י lzip)</comment> + <comment xml:lang="hr">Tar arhiva (lzip sažeto)</comment> <comment xml:lang="hu">Tar archívum (lzippel tömörítve)</comment> + <comment xml:lang="id">arsip tar (terkompresi lzip)</comment> + <comment xml:lang="it">Archivio tar (compresso con lzip)</comment> <comment xml:lang="kk">Tar архиві (lzip-пен сығылған)</comment> <comment xml:lang="ko">TAR 묶음 파일(LZIP 압축)</comment> <comment xml:lang="pl">Archiwum tar (kompresja lzip)</comment> <comment xml:lang="pt_BR">Arquivo Tar (compactado com lzip)</comment> - <comment xml:lang="ru">архив TAR (сжатый lzip)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lzip)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou lzip)</comment> + <comment xml:lang="sr">Тар архива (запакована лзипом)</comment> + <comment xml:lang="sv">Tar-arkiv (lzip-komprimerat)</comment> + <comment xml:lang="tr">Tar arşivi (lzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений lzip)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (lzip 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（lzip 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (lzip 格式壓縮)</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="application/x-lzip"/> @@ -14586,6 +15100,32 @@ </mime-type> <mime-type type="application/x-lzpdf"> <comment>PDF document (lzip-compressed)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en lzip)</comment> + <comment xml:lang="ca">document PDF (amb compressió lzip)</comment> + <comment xml:lang="cs">dokument PDF (komprimace lzip)</comment> + <comment xml:lang="de">PDF-Dokument (lzip-komprimiert)</comment> + <comment xml:lang="en_GB">PDF document (lzip-compressed)</comment> + <comment xml:lang="es">documento PDF (comprimido con lzip)</comment> + <comment xml:lang="eu">PDF dokumentua (lzip-rekin konprimitua)</comment> + <comment xml:lang="fi">PDF-asiakirja (lzip-pakattu)</comment> + <comment xml:lang="fr">document PDF (compressé lzip)</comment> + <comment xml:lang="ga">cáipéis PDF (comhbhrúite le lzip)</comment> + <comment xml:lang="hr">PDF dokument (lzip sažeto)</comment> + <comment xml:lang="hu">PDF dokumentum (lzip-tömörítésű)</comment> + <comment xml:lang="id">dokumen PDF (termkompresi lzip)</comment> + <comment xml:lang="it">Documento PDF (compresso con lzip)</comment> + <comment xml:lang="kk">PDF құжаты (lzip-пен сығылған)</comment> + <comment xml:lang="ko">PDF 문서(LZIP 압축)</comment> + <comment xml:lang="pl">Dokument PDF (kompresja lzip)</comment> + <comment xml:lang="pt_BR">Documento PDF (compactado com lzip)</comment> + <comment xml:lang="ru">Документ PDF (сжатый lzip)</comment> + <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou lzip)</comment> + <comment xml:lang="sr">ПДФ документ (запакован лзип-ом)</comment> + <comment xml:lang="sv">PDF-dokument (lzip-komprimerat)</comment> + <comment xml:lang="tr">PDF belgesi (lzip ile sıkıştırılmış)</comment> + <comment xml:lang="uk">документ PDF (стиснений lzip)</comment> + <comment xml:lang="zh_CN">PDF 文档（lzip 压缩）</comment> + <comment xml:lang="zh_TW">PDF 文件 (lzip 格式壓縮)</comment> <sub-class-of type="application/x-lzip"/> <generic-icon name="x-office-document"/> <glob pattern="*.pdf.lz"/> @@ -14628,7 +15168,7 @@ <comment xml:lang="pt">arquivo LZMA</comment> <comment xml:lang="pt_BR">Pacote LZMA</comment> <comment xml:lang="ro">Arhivă LZMA</comment> - <comment xml:lang="ru">архив LZMA</comment> + <comment xml:lang="ru">Архив LZMA</comment> <comment xml:lang="sk">Archív LZMA</comment> <comment xml:lang="sl">Datoteka arhiva LZMA</comment> <comment xml:lang="sq">Arkiv LZMA</comment> @@ -14650,7 +15190,7 @@ <comment xml:lang="be@latin">Archiŭ tar (LZMA-skampresavany)</comment> <comment xml:lang="bg">Архив — tar, компресиран с LZMA</comment> <comment xml:lang="ca">arxiu tar (amb compressió LZMA)</comment> - <comment xml:lang="cs">archiv tar (komprimovaný pomocí LZMA)</comment> + <comment xml:lang="cs">archiv Tar (komprimace LZMA)</comment> <comment xml:lang="da">Tar-arkiv (LZMA-komprimeret)</comment> <comment xml:lang="de">Tar-Archiv (LZMA-komprimiert)</comment> <comment xml:lang="el">Αρχείο Tar (συμπιεσμένο με LZMA)</comment> @@ -14663,7 +15203,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le LZMA)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con LZMA)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZMA)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana LZMA-om)</comment> + <comment xml:lang="hr">Tar arhiva (LZMA sažeta)</comment> <comment xml:lang="hu">Tar archívum (LZMA-val tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con LZMA)</comment> <comment xml:lang="id">Arsip Tar (terkompresi LZMA)</comment> @@ -14681,7 +15221,7 @@ <comment xml:lang="pt">arquivo Tar (compressão LZMA)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com LZMA)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată LZMA)</comment> - <comment xml:lang="ru">архив TAR (сжатый LZMA)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lzma)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZMA)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z LZMA)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me LZMA)</comment> @@ -14690,7 +15230,7 @@ <comment xml:lang="tr">Tar arşivi (LZMA ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений LZMA)</comment> <comment xml:lang="vi">Kho nén tar (đã nén LZMA)</comment> - <comment xml:lang="zh_CN">Tar 归档文件 (LZMA 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（LZMA 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (LZMA 格式壓縮)</comment> <sub-class-of type="application/x-lzma"/> <generic-icon name="package-x-generic"/> @@ -14736,7 +15276,7 @@ <comment xml:lang="pt">arquivo LZO</comment> <comment xml:lang="pt_BR">Pacote LZO</comment> <comment xml:lang="ro">Arhivă LZO</comment> - <comment xml:lang="ru">архив LZO</comment> + <comment xml:lang="ru">Архив LZO</comment> <comment xml:lang="sk">Archív LZO</comment> <comment xml:lang="sl">Datoteka arhiva LZO</comment> <comment xml:lang="sq">Arkiv LZO</comment> @@ -14764,9 +15304,9 @@ <comment xml:lang="el">Συμπιεσμένο αρχείο Qpress</comment> <comment xml:lang="en_GB">Qpress archive</comment> <comment xml:lang="es">archivador de Qpress</comment> - <comment xml:lang="eu">Qpress artxiboa</comment> <comment xml:lang="fi">Qpress-arkisto</comment> <comment xml:lang="fr">Archive Qpress</comment> + <comment xml:lang="ga">cartlann Qpress</comment> <comment xml:lang="gl">Arquivo Qpress</comment> <comment xml:lang="he">ארכיון Qpress</comment> <comment xml:lang="hr">Qpress arhiva</comment> @@ -14780,7 +15320,7 @@ <comment xml:lang="pl">Archiwum Qpress</comment> <comment xml:lang="pt">arquivo Qpress</comment> <comment xml:lang="pt_BR">Pacote Qpress</comment> - <comment xml:lang="ru">архив Qpress</comment> + <comment xml:lang="ru">Архив Qpress</comment> <comment xml:lang="sk">Archív Qpress</comment> <comment xml:lang="sl">Datoteka arhiva Qpress</comment> <comment xml:lang="sr">Купрес архива</comment> @@ -14806,6 +15346,7 @@ <comment xml:lang="eu">XAR artxiboa</comment> <comment xml:lang="fi">XAR-arkisto</comment> <comment xml:lang="fr">archive XAR</comment> + <comment xml:lang="ga">cartlann XAR</comment> <comment xml:lang="he">ארכיון XAR</comment> <comment xml:lang="hr">XAR arhiva</comment> <comment xml:lang="hu">XAR archívum</comment> @@ -14816,7 +15357,7 @@ <comment xml:lang="oc">Archiu XAR</comment> <comment xml:lang="pl">Archiwum XAR</comment> <comment xml:lang="pt_BR">Arquivo XAR</comment> - <comment xml:lang="ru">архив XAR</comment> + <comment xml:lang="ru">Архив XAR</comment> <comment xml:lang="sk">Archív XAR</comment> <comment xml:lang="sr">ИксАР архива</comment> <comment xml:lang="sv">XAR-arkiv</comment> @@ -14843,9 +15384,9 @@ <comment xml:lang="el">Συμπιεσμένο αρχείο Zlib</comment> <comment xml:lang="en_GB">Zlib archive</comment> <comment xml:lang="es">archivador Zlib</comment> - <comment xml:lang="eu">Zlib artxiboa</comment> <comment xml:lang="fi">Zlib-arkisto</comment> <comment xml:lang="fr">Archive Zlib</comment> + <comment xml:lang="ga">cartlann Zlib</comment> <comment xml:lang="gl">Arquivo Zlib</comment> <comment xml:lang="he">ארכיון Zlib</comment> <comment xml:lang="hr">Zlib arhiva</comment> @@ -14859,7 +15400,7 @@ <comment xml:lang="pl">Archiwum Zlib</comment> <comment xml:lang="pt">arquivo Zlib</comment> <comment xml:lang="pt_BR">Pacote Zlib</comment> - <comment xml:lang="ru">архив Zlib</comment> + <comment xml:lang="ru">Архив Zlib</comment> <comment xml:lang="sk">Archív Zlib</comment> <comment xml:lang="sl">Datoteka arhiva Zlib</comment> <comment xml:lang="sr">Злиб архива</comment> @@ -14912,7 +15453,7 @@ <comment xml:lang="pt">apresentação MagicPoint</comment> <comment xml:lang="pt_BR">Apresentação do MagicPoint</comment> <comment xml:lang="ro">Prezentare MagicPoint</comment> - <comment xml:lang="ru">презентация MagicPoint</comment> + <comment xml:lang="ru">Презентация MagicPoint</comment> <comment xml:lang="sk">Prezentácia MagicPoint</comment> <comment xml:lang="sl">Predstavitev MagicPoint</comment> <comment xml:lang="sq">Prezantim MagicPoint</comment> @@ -14966,7 +15507,7 @@ <comment xml:lang="pt">ficheiro MacBinary de Macintosh</comment> <comment xml:lang="pt_BR">Arquivo do Macintosh MacBinary</comment> <comment xml:lang="ro">Fișier Macintosh MacBinary</comment> - <comment xml:lang="ru">файл Macintosh MacBinary</comment> + <comment xml:lang="ru">Файл Macintosh MacBinary</comment> <comment xml:lang="sk">Súbor pre Macintosh MacBinary</comment> <comment xml:lang="sl">Izvedljiva dvojiška datoteka Macintosh MacBinary</comment> <comment xml:lang="sq">File MacBinary Macintosh</comment> @@ -15019,7 +15560,7 @@ <comment xml:lang="pt">fluxo Matroska</comment> <comment xml:lang="pt_BR">Transmissão do Matroska</comment> <comment xml:lang="ro">Flux Matroska</comment> - <comment xml:lang="ru">поток Matroska</comment> + <comment xml:lang="ru">Поток Matroska</comment> <comment xml:lang="sk">Stream Matroska</comment> <comment xml:lang="sl">Pretočni vir Matroska</comment> <comment xml:lang="sq">Stream Matroska</comment> @@ -15045,6 +15586,7 @@ <mime-type type="video/x-matroska"> <comment>Matroska video</comment> <comment xml:lang="ar">Matroska مرئي</comment> + <comment xml:lang="ast">Videu en Matroska</comment> <comment xml:lang="be@latin">Videa Matroska</comment> <comment xml:lang="bg">Видео — Matroska</comment> <comment xml:lang="ca">vídeo Matroska</comment> @@ -15062,7 +15604,7 @@ <comment xml:lang="ga">físeán Matroska</comment> <comment xml:lang="gl">vídeo de Matroska</comment> <comment xml:lang="he">וידאו Matroska</comment> - <comment xml:lang="hr">Matroska video</comment> + <comment xml:lang="hr">Matroška video snimka</comment> <comment xml:lang="hu">Matroska-videó</comment> <comment xml:lang="ia">Video Matroska</comment> <comment xml:lang="id">Video Matroska</comment> @@ -15082,7 +15624,7 @@ <comment xml:lang="pt">vídeo Matroska</comment> <comment xml:lang="pt_BR">Vídeo Matroska</comment> <comment xml:lang="ro">Video Matroska</comment> - <comment xml:lang="ru">видео Matroska</comment> + <comment xml:lang="ru">Видео Matroska</comment> <comment xml:lang="sk">Video Matroska</comment> <comment xml:lang="sl">Video datoteka Matroska</comment> <comment xml:lang="sq">Video Matroska</comment> @@ -15098,6 +15640,7 @@ </mime-type> <mime-type type="video/x-matroska-3d"> <comment>Matroska 3D video</comment> + <comment xml:lang="ast">Videu en Matroska 3D</comment> <comment xml:lang="ca">vídeo Matroska 3D</comment> <comment xml:lang="cs">3D video Matroska</comment> <comment xml:lang="da">Matroska 3D-video</comment> @@ -15108,6 +15651,7 @@ <comment xml:lang="eu">Matroska 3D bideoa</comment> <comment xml:lang="fi">Matroska 3D-video</comment> <comment xml:lang="fr">vidéo Matroska 3D</comment> + <comment xml:lang="ga">físeán Matroska 3D</comment> <comment xml:lang="gl">Video Matroska 3D</comment> <comment xml:lang="he">סרטון תלת ממדי מסוג Matroska</comment> <comment xml:lang="hr">Matroška 3D video snimka</comment> @@ -15153,7 +15697,7 @@ <comment xml:lang="ga">fuaim Matroska</comment> <comment xml:lang="gl">son de Matroska</comment> <comment xml:lang="he">שמע Matroska</comment> - <comment xml:lang="hr">Matroska audio</comment> + <comment xml:lang="hr">Matroška zvučni zapis</comment> <comment xml:lang="hu">Matroska hang</comment> <comment xml:lang="ia">Audio Matroska</comment> <comment xml:lang="id">Audio Matroska</comment> @@ -15172,7 +15716,7 @@ <comment xml:lang="pt">áudio Matroska</comment> <comment xml:lang="pt_BR">Áudio Matroska</comment> <comment xml:lang="ro">Audio Matroska</comment> - <comment xml:lang="ru">аудио Matroska</comment> + <comment xml:lang="ru">Аудио Matroska</comment> <comment xml:lang="sk">Zvuk Matroska</comment> <comment xml:lang="sl">Zvočna datoteka Matroska</comment> <comment xml:lang="sq">Audio Matroska</comment> @@ -15189,6 +15733,7 @@ <mime-type type="video/webm"> <comment>WebM video</comment> <comment xml:lang="ar">WebM مرئي</comment> + <comment xml:lang="ast">Videu en WebM</comment> <comment xml:lang="bg">Видео — WebM</comment> <comment xml:lang="ca">vídeo WebM</comment> <comment xml:lang="cs">video WebM</comment> @@ -15205,7 +15750,7 @@ <comment xml:lang="ga">físeán WebM</comment> <comment xml:lang="gl">vídeo WebM</comment> <comment xml:lang="he">וידאו WebM</comment> - <comment xml:lang="hr">WebM video</comment> + <comment xml:lang="hr">WebM video snimka</comment> <comment xml:lang="hu">WebM videó</comment> <comment xml:lang="ia">Video WebM</comment> <comment xml:lang="id">Video WebM</comment> @@ -15221,7 +15766,7 @@ <comment xml:lang="pt">vídeo WebM</comment> <comment xml:lang="pt_BR">Vídeo WebM</comment> <comment xml:lang="ro">Video WebM</comment> - <comment xml:lang="ru">видео WebM</comment> + <comment xml:lang="ru">Видео WebM</comment> <comment xml:lang="sk">Video WebM</comment> <comment xml:lang="sl">Video datoteka WebM</comment> <comment xml:lang="sr">ВебМ видео</comment> @@ -15261,7 +15806,7 @@ <comment xml:lang="ga">fuaim WebM</comment> <comment xml:lang="gl">son WebM</comment> <comment xml:lang="he">שמע WebM</comment> - <comment xml:lang="hr">WebM audio</comment> + <comment xml:lang="hr">WebM zvučni zapis</comment> <comment xml:lang="hu">WebM hang</comment> <comment xml:lang="ia">Audio WebM</comment> <comment xml:lang="id">Audio WebM</comment> @@ -15277,7 +15822,7 @@ <comment xml:lang="pt">áudio WebM</comment> <comment xml:lang="pt_BR">Áudio WebM</comment> <comment xml:lang="ro">Audio WebM</comment> - <comment xml:lang="ru">аудио WebM</comment> + <comment xml:lang="ru">Аудио WebM</comment> <comment xml:lang="sk">Zvuk WebM</comment> <comment xml:lang="sl">Zvočna datoteka WebM</comment> <comment xml:lang="sr">ВебМ звук</comment> @@ -15300,6 +15845,7 @@ <comment xml:lang="eu">MHTML web artxiboa</comment> <comment xml:lang="fi">MHTML-kooste</comment> <comment xml:lang="fr">archive web MHTML</comment> + <comment xml:lang="ga">cartlann ghréasáin MHTML</comment> <comment xml:lang="gl">Arquivo web MHTML</comment> <comment xml:lang="he">ארכיון רשת MHTML</comment> <comment xml:lang="hr">MHTML web arhiva</comment> @@ -15315,7 +15861,7 @@ <comment xml:lang="pl">Archiwum witryny MHTML</comment> <comment xml:lang="pt">arquivo web MHTML</comment> <comment xml:lang="pt_BR">Pacote web MHTML</comment> - <comment xml:lang="ru">веб-архив MHTML</comment> + <comment xml:lang="ru">Веб-архив MHTML</comment> <comment xml:lang="sk">Webový archív MHTML</comment> <comment xml:lang="sl">Spletni arhiv MHTML</comment> <comment xml:lang="sr">МХТМЛ веб архива</comment> @@ -15333,6 +15879,7 @@ <mime-type type="application/mxf"> <comment>MXF video</comment> <comment xml:lang="ar">MXF مرئي</comment> + <comment xml:lang="ast">Videu en MXF</comment> <comment xml:lang="bg">Видео — MXF</comment> <comment xml:lang="ca">vídeo MXF</comment> <comment xml:lang="cs">video MXF</comment> @@ -15349,7 +15896,7 @@ <comment xml:lang="ga">físeán MXF</comment> <comment xml:lang="gl">vídeo MXF</comment> <comment xml:lang="he">וידאו MXF</comment> - <comment xml:lang="hr">MXF video</comment> + <comment xml:lang="hr">MXF video snimka</comment> <comment xml:lang="hu">MXF videó</comment> <comment xml:lang="ia">Video MXF</comment> <comment xml:lang="id">Video MXF</comment> @@ -15366,7 +15913,7 @@ <comment xml:lang="pt">vídeo MXF</comment> <comment xml:lang="pt_BR">Vídeo MXF</comment> <comment xml:lang="ro">Video MXF</comment> - <comment xml:lang="ru">видео MXF</comment> + <comment xml:lang="ru">Видео MXF</comment> <comment xml:lang="sk">Video MXF</comment> <comment xml:lang="sl">Video datoteka MXF</comment> <comment xml:lang="sr">МИксФ видео</comment> @@ -15421,7 +15968,7 @@ <comment xml:lang="pt">ficheiro OCL</comment> <comment xml:lang="pt_BR">Arquivo OCL</comment> <comment xml:lang="ro">Fișier OCL</comment> - <comment xml:lang="ru">файл OCL</comment> + <comment xml:lang="ru">Файл OCL</comment> <comment xml:lang="sk">Súbor OCL</comment> <comment xml:lang="sl">Datoteka OCL</comment> <comment xml:lang="sq">File OCL</comment> @@ -15451,6 +15998,7 @@ <comment xml:lang="eu">COBOL iturburu-kodea</comment> <comment xml:lang="fi">COBOL-lähdekoodi</comment> <comment xml:lang="fr">fichier source COBOL</comment> + <comment xml:lang="ga">cód foinseach COBOL</comment> <comment xml:lang="gl">ficheiro fonte de COBOL</comment> <comment xml:lang="he">קובץ מקור של COBOL</comment> <comment xml:lang="hr">COBOL izvorna datoteka</comment> @@ -15468,14 +16016,14 @@ <comment xml:lang="pl">Plik źródłowy COBOL</comment> <comment xml:lang="pt">ficheiro origem COBOL</comment> <comment xml:lang="pt_BR">Arquivo de código-fonte em COBOL</comment> - <comment xml:lang="ru">файл исходного кода на COBOL</comment> + <comment xml:lang="ru">Файл исходного кода на COBOL</comment> <comment xml:lang="sk">Zdrojový súbor COBOLu</comment> <comment xml:lang="sl">Izvorna koda COBOL</comment> <comment xml:lang="sr">изворна датотека КОБОЛ-а</comment> <comment xml:lang="sv">COBOL-källkodsfil</comment> <comment xml:lang="tr">COBOL kaynak dosyası</comment> <comment xml:lang="uk">вихідний код мовою COBOL</comment> - <comment xml:lang="zh_CN">COBOL 源</comment> + <comment xml:lang="zh_CN">COBOL 源文件</comment> <comment xml:lang="zh_TW">COBOL 源檔</comment> <acronym>COBOL</acronym> <expanded-acronym>COmmon Business Oriented Language</expanded-acronym> @@ -15496,6 +16044,7 @@ <comment xml:lang="eu">Mobipocket liburua</comment> <comment xml:lang="fi">Mobipocket e-kirja</comment> <comment xml:lang="fr">livre numérique Mobipocket</comment> + <comment xml:lang="ga">r-leabhar Mobipocket</comment> <comment xml:lang="gl">E-book Mobipocket</comment> <comment xml:lang="he">ספר אלקטרוני של Mobipocket</comment> <comment xml:lang="hr">Mobipocket e-knjiga</comment> @@ -15513,7 +16062,7 @@ <comment xml:lang="pl">E-book Mobipocket</comment> <comment xml:lang="pt">ebook Mobipocket</comment> <comment xml:lang="pt_BR">E-book Mobipocket</comment> - <comment xml:lang="ru">электронная книга Mobipocket</comment> + <comment xml:lang="ru">Электронная книга Mobipocket</comment> <comment xml:lang="sk">E-kniha Mobipocket</comment> <comment xml:lang="sl">e-knjiga Mobipocket</comment> <comment xml:lang="sr">Мобипокет ел. књига</comment> @@ -15537,6 +16086,7 @@ <mime-type type="application/x-mif"> <comment>Adobe FrameMaker MIF document</comment> <comment xml:lang="ar">مستند أدوبي الصانع للإطارات MIF</comment> + <comment xml:lang="ast">Documentu MIF d'Adobe FrameMaker</comment> <comment xml:lang="be@latin">Dakument Adobe FrameMaker MIF</comment> <comment xml:lang="bg">Документ — Adobe FrameMaker MIF</comment> <comment xml:lang="ca">document MIF d'Adobe FrameMaker</comment> @@ -15573,7 +16123,7 @@ <comment xml:lang="pt">documento Adobe FrameMaker MIF</comment> <comment xml:lang="pt_BR">Documento MIF do Adobe FrameMaker</comment> <comment xml:lang="ro">Document Adobe FrameMaker MIF</comment> - <comment xml:lang="ru">документ Adobe FrameMaker MIF</comment> + <comment xml:lang="ru">Документ Adobe FrameMaker MIF</comment> <comment xml:lang="sk">Dokument Adobe FrameMaker MIF</comment> <comment xml:lang="sl">Dokument Adobe FrameMaker MIF</comment> <comment xml:lang="sq">Dokument MIF Adobe FrameMaker</comment> @@ -15606,7 +16156,7 @@ <comment xml:lang="ga">leabharmharcanna Mozilla</comment> <comment xml:lang="gl">Marcadores de Mozilla</comment> <comment xml:lang="he">סימניה של Mozilla</comment> - <comment xml:lang="hr">Mozilla knjižne oznake</comment> + <comment xml:lang="hr">Mozilla zabilješke</comment> <comment xml:lang="hu">Mozilla-könyvjelzők</comment> <comment xml:lang="ia">Marcapaginas Mozilla</comment> <comment xml:lang="id">Bookmark Mozilla</comment> @@ -15625,7 +16175,7 @@ <comment xml:lang="pt">marcadores do Mozilla</comment> <comment xml:lang="pt_BR">Favoritos do Mozilla</comment> <comment xml:lang="ro">Semne de carte Mozilla</comment> - <comment xml:lang="ru">закладки Mozilla</comment> + <comment xml:lang="ru">Закладки Mozilla</comment> <comment xml:lang="sk">Záložky Mozilla</comment> <comment xml:lang="sl">Datoteka zaznamkov Mozilla</comment> <comment xml:lang="sq">Libërshënues Mozilla</comment> @@ -15683,7 +16233,7 @@ <comment xml:lang="pt">executável DOS/Windows</comment> <comment xml:lang="pt_BR">Executável do DOS/Windows</comment> <comment xml:lang="ro">Executabil DOS/Windows</comment> - <comment xml:lang="ru">исполняемый файл DOS/Windows</comment> + <comment xml:lang="ru">Исполняемый файл DOS/Windows</comment> <comment xml:lang="sk">Spustiteľný súbor pre DOS/Windows</comment> <comment xml:lang="sl">Izvedljiva datoteka DOS/Windows</comment> <comment xml:lang="sq">I ekzekutueshëm DOS/Windows</comment> @@ -15741,7 +16291,7 @@ <comment xml:lang="sk">Internetový odkaz</comment> <comment xml:lang="sl">Internetna bližnjica</comment> <comment xml:lang="sq">Shkurtim internet</comment> - <comment xml:lang="sr">Интернет пречица</comment> + <comment xml:lang="sr">интернет пречица</comment> <comment xml:lang="sv">Internetgenväg</comment> <comment xml:lang="tr">İnternet kısayolu</comment> <comment xml:lang="uk">інтернет-посилання</comment> @@ -15759,6 +16309,7 @@ <mime-type type="application/x-mswrite"> <comment>WRI document</comment> <comment xml:lang="ar">مستند WRI</comment> + <comment xml:lang="ast">Documentu WRI</comment> <comment xml:lang="be@latin">Dakument WRI</comment> <comment xml:lang="bg">Документ — WRI</comment> <comment xml:lang="ca">document WRI</comment> @@ -15794,7 +16345,7 @@ <comment xml:lang="pt">documento WRI</comment> <comment xml:lang="pt_BR">Documento WRI</comment> <comment xml:lang="ro">Document WRI</comment> - <comment xml:lang="ru">документ WRI</comment> + <comment xml:lang="ru">Документ WRI</comment> <comment xml:lang="sk">Dokument WRI</comment> <comment xml:lang="sl">Dokument WRI</comment> <comment xml:lang="sq">Dokument WRI</comment> @@ -15847,7 +16398,7 @@ <comment xml:lang="oc">ROM MSX</comment> <comment xml:lang="pl">Plik ROM konsoli MSX</comment> <comment xml:lang="pt">ROM MSX</comment> - <comment xml:lang="pt_BR">ROM do MSX</comment> + <comment xml:lang="pt_BR">ROM de MSX</comment> <comment xml:lang="ro">ROM MSX</comment> <comment xml:lang="ru">MSX ROM</comment> <comment xml:lang="sk">ROM pre MSX</comment> @@ -15900,7 +16451,7 @@ <comment xml:lang="pt">macro M4</comment> <comment xml:lang="pt_BR">Macro M4</comment> <comment xml:lang="ro">Macro M4</comment> - <comment xml:lang="ru">макрос M4</comment> + <comment xml:lang="ru">Макрос M4</comment> <comment xml:lang="sk">Makro M4</comment> <comment xml:lang="sl">Makro datoteka M4</comment> <comment xml:lang="sq">Macro M4</comment> @@ -15952,7 +16503,7 @@ <comment xml:lang="oc">ROM Nintendo64</comment> <comment xml:lang="pl">Plik ROM konsoli Nintendo64</comment> <comment xml:lang="pt">ROM Nintendo64</comment> - <comment xml:lang="pt_BR">ROM do Nintendo64</comment> + <comment xml:lang="pt_BR">ROM de Nintendo64</comment> <comment xml:lang="ro">ROM Nintendo64</comment> <comment xml:lang="ru">Nintendo64 ROM</comment> <comment xml:lang="sk">ROM pre Nintendo64</comment> @@ -15963,7 +16514,7 @@ <comment xml:lang="tr">Nintendo64 ROM</comment> <comment xml:lang="uk">ППП Nintendo64</comment> <comment xml:lang="vi">ROM Nintendo64</comment> - <comment xml:lang="zh_CN">Nintendo64 ROM</comment> + <comment xml:lang="zh_CN">任天堂 64 ROM</comment> <comment xml:lang="zh_TW">Nintendo64 ROM</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.n64"/> @@ -16000,7 +16551,7 @@ <comment xml:lang="ga">nasc Nautilus</comment> <comment xml:lang="gl">ligazón de nautilus</comment> <comment xml:lang="he">קישור של Nautilus</comment> - <comment xml:lang="hr">Nautilus veza</comment> + <comment xml:lang="hr">Nautilusova poveznica</comment> <comment xml:lang="hu">Nautilus-link</comment> <comment xml:lang="ia">Ligamine Nautilus</comment> <comment xml:lang="id">Taut Nautilus</comment> @@ -16019,7 +16570,7 @@ <comment xml:lang="pt">atalho Nautilus</comment> <comment xml:lang="pt_BR">Link do Nautilus</comment> <comment xml:lang="ro">Legătură Nautilus</comment> - <comment xml:lang="ru">ссылка Nautilus</comment> + <comment xml:lang="ru">Ссылка Nautilus</comment> <comment xml:lang="sk">Odkaz Nautilus</comment> <comment xml:lang="sl">Datoteka povezave Nautilus</comment> <comment xml:lang="sq">Lidhje Nautilus</comment> @@ -16039,25 +16590,49 @@ <mime-type type="application/x-neo-geo-pocket-rom"> <comment>Neo-Geo Pocket ROM</comment> <comment xml:lang="ca">ROM de Neo-Geo Pocket</comment> + <comment xml:lang="cs">ROM pro Neo-Geo Pocket</comment> <comment xml:lang="da">Neo-Geo Pocket ROM</comment> <comment xml:lang="de">Neo-Geo Pocket ROM</comment> + <comment xml:lang="en_GB">Neo-Geo Pocket ROM</comment> <comment xml:lang="es">ROM de Neo-Geo Pocket</comment> + <comment xml:lang="eu">Neo-Geo Pocket ROM</comment> <comment xml:lang="fi">Neo-Geo Pocket -ROM</comment> <comment xml:lang="fr">ROM Neo-Geo Pocket</comment> + <comment xml:lang="ga">ROM Neo-Geo Pocket</comment> + <comment xml:lang="hr">Neo-Geo Pocket ROM</comment> <comment xml:lang="hu">Neo-Geo Pocket ROM</comment> + <comment xml:lang="id">ROM Neo-Geo Pocket</comment> + <comment xml:lang="it">ROM Neo-Geo Pocket</comment> <comment xml:lang="kk">Neo-Geo Pocket ROM</comment> <comment xml:lang="ko">네오지오 포켓 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Neo-Geo Pocket</comment> <comment xml:lang="pt_BR">ROM de Neo-Geo Pocket</comment> <comment xml:lang="ru">Neo-Geo Pocket ROM</comment> <comment xml:lang="sk">ROM pre Neo-Geo Pocket</comment> + <comment xml:lang="sr">Нео-Гео Покет РОМ</comment> + <comment xml:lang="sv">Neo-Geo Pocket-rom</comment> + <comment xml:lang="tr">Neo-Geo Pocket ROM</comment> <comment xml:lang="uk">ППП Neo-Geo Pocket</comment> <comment xml:lang="zh_CN">Neo-Geo Pocket ROM</comment> <comment xml:lang="zh_TW">Neo-Geo Pocket ROM</comment> <generic-icon name="application-x-executable"/> <glob pattern="*.ngp"/> <magic> - <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/> + <match value="0x0" type="byte" offset="35"> + <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/> + <match value=" LICENSED BY SNK CORPORATION" type="string" offset="0"/> + </match> + </magic> + </mime-type> + <mime-type type="application/x-neo-geo-pocket-color-rom"> + <comment>Neo-Geo Pocket Color ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.ngc"/> + <magic> + <match value="0x10" type="byte" offset="35"> + <match value="COPYRIGHT BY SNK CORPORATION" type="string" offset="0"/> + <match value=" LICENSED BY SNK CORPORATION" type="string" offset="0"/> + </match> </magic> </mime-type> <mime-type type="application/x-nes-rom"> @@ -16099,7 +16674,7 @@ <comment xml:lang="oc">ROM NES</comment> <comment xml:lang="pl">Plik ROM konsoli NES</comment> <comment xml:lang="pt">ROM NES</comment> - <comment xml:lang="pt_BR">ROM do NES</comment> + <comment xml:lang="pt_BR">ROM de NES</comment> <comment xml:lang="ro">ROM NES</comment> <comment xml:lang="ru">NES ROM</comment> <comment xml:lang="sk">ROM pre NES</comment> @@ -16121,6 +16696,7 @@ <mime-type type="application/x-netcdf"> <comment>Unidata NetCDF document</comment> <comment xml:lang="ar">مستند Unidata NetCDF</comment> + <comment xml:lang="ast">Documentu NetCDF d'Unidata</comment> <comment xml:lang="be@latin">Dakument Unidata NetCDF</comment> <comment xml:lang="bg">Документ — Unidata NetCDF</comment> <comment xml:lang="ca">document d'Unidata NetCDF</comment> @@ -16157,7 +16733,7 @@ <comment xml:lang="pt">documento Unidata NetCDF</comment> <comment xml:lang="pt_BR">Documento do Unidata NetCDF</comment> <comment xml:lang="ro">Document Unidata NetCDF</comment> - <comment xml:lang="ru">документ Unidata NetCDF</comment> + <comment xml:lang="ru">Документ Unidata NetCDF</comment> <comment xml:lang="sk">Dokument Unidata NetCDF</comment> <comment xml:lang="sl">Dokument Unidata NetCDF</comment> <comment xml:lang="sq">Dokument Unidata NetCDF</comment> @@ -16186,6 +16762,7 @@ <comment xml:lang="es">índice NewzBin de usenet</comment> <comment xml:lang="eu">NewzBin usenet indizea</comment> <comment xml:lang="fr">index usenet </comment> + <comment xml:lang="ga">innéacs usenet NewzBin</comment> <comment xml:lang="gl">Índice de usenet NEwzBin</comment> <comment xml:lang="he">אינדקס שרתי חדשות NewzBin</comment> <comment xml:lang="hr">NewzBin usenet indeks</comment> @@ -16202,14 +16779,14 @@ <comment xml:lang="pl">Indeks grup dyskusyjnych NewzBin</comment> <comment xml:lang="pt">índice usenet NewzBin</comment> <comment xml:lang="pt_BR">Índice de usenet NewzBin</comment> - <comment xml:lang="ru">индекс usenet NewzBin</comment> + <comment xml:lang="ru">Индекс usenet NewzBin</comment> <comment xml:lang="sk">Index Usenetu NewzBin</comment> <comment xml:lang="sl">Kazalo usenet NewzBin</comment> <comment xml:lang="sr">Њузбин попис јузнета</comment> <comment xml:lang="sv">NewzBin-usenetindex</comment> <comment xml:lang="tr">NewzBin usenet dizini</comment> <comment xml:lang="uk">покажчик usenet NewzBin</comment> - <comment xml:lang="zh_CN">NewzBin usenet 索引</comment> + <comment xml:lang="zh_CN">NewzBin Usenet 索引</comment> <comment xml:lang="zh_TW">NewzBin usenet 索引</comment> <sub-class-of type="application/xml"/> <magic priority="80"> @@ -16236,10 +16813,10 @@ <comment xml:lang="ga">cód réada</comment> <comment xml:lang="gl">código obxecto</comment> <comment xml:lang="he">קוד אובייקט</comment> - <comment xml:lang="hr">kod objekta</comment> + <comment xml:lang="hr">Object kôd</comment> <comment xml:lang="hu">tárgykód</comment> <comment xml:lang="ia">Codice objecto</comment> - <comment xml:lang="id">kode object</comment> + <comment xml:lang="id">kode objek</comment> <comment xml:lang="it">Codice oggetto</comment> <comment xml:lang="ja">オブジェクトコード</comment> <comment xml:lang="kk">объектті коды</comment> @@ -16255,7 +16832,7 @@ <comment xml:lang="pt">código de objeto</comment> <comment xml:lang="pt_BR">Código-objeto</comment> <comment xml:lang="ro">cod sursă obiect</comment> - <comment xml:lang="ru">объектный код</comment> + <comment xml:lang="ru">Объектный код</comment> <comment xml:lang="sk">Objektový kód</comment> <comment xml:lang="sl">predmetna koda</comment> <comment xml:lang="sq">Kod objekti</comment> @@ -16299,7 +16876,7 @@ <comment xml:lang="ga">formáid mhalairte Annodex</comment> <comment xml:lang="gl">formato intercambiábel de Annodex</comment> <comment xml:lang="he">תבנית החלפת Annodex</comment> - <comment xml:lang="hr">Annodex oblik za razmjenu</comment> + <comment xml:lang="hr">Annodex format razmjene</comment> <comment xml:lang="hu">Annodex csereformátum</comment> <comment xml:lang="ia">Formato de excambio Annodex</comment> <comment xml:lang="id">Format pertukaran Annodex</comment> @@ -16316,7 +16893,7 @@ <comment xml:lang="pt">formato de troca Annodex</comment> <comment xml:lang="pt_BR">Formato de troca Annodex</comment> <comment xml:lang="ro">Format schimb Annodex</comment> - <comment xml:lang="ru">формат обмена Annodex</comment> + <comment xml:lang="ru">Формат обмена Annodex</comment> <comment xml:lang="sk">Formát pre výmenu Annodex</comment> <comment xml:lang="sl">Izmenjalna datoteka Annodex</comment> <comment xml:lang="sr">Анодексов запис размене</comment> @@ -16340,6 +16917,7 @@ <mime-type type="video/annodex"> <comment>Annodex Video</comment> <comment xml:lang="ar">Annodex مرئي</comment> + <comment xml:lang="ast">Videu n'Annodex</comment> <comment xml:lang="bg">Видео — Annodex</comment> <comment xml:lang="ca">Annodex Video</comment> <comment xml:lang="cs">video Annodex</comment> @@ -16353,10 +16931,10 @@ <comment xml:lang="fi">Annodex-video</comment> <comment xml:lang="fo">Annodex video</comment> <comment xml:lang="fr">vidéo Annodex</comment> - <comment xml:lang="ga">físeán Annodex</comment> + <comment xml:lang="ga">Físeán Annodex</comment> <comment xml:lang="gl">vídeo de Annodex</comment> <comment xml:lang="he">וידאו Annodex</comment> - <comment xml:lang="hr">Annodex Video</comment> + <comment xml:lang="hr">Annodex video snimka</comment> <comment xml:lang="hu">Annodex videó</comment> <comment xml:lang="ia">Video Annodex</comment> <comment xml:lang="id">Video Annodex</comment> @@ -16373,7 +16951,7 @@ <comment xml:lang="pt">vídeo Annodex</comment> <comment xml:lang="pt_BR">Vídeo Annodex</comment> <comment xml:lang="ro">Video Annodex</comment> - <comment xml:lang="ru">видео Annodex</comment> + <comment xml:lang="ru">Видео Annodex</comment> <comment xml:lang="sk">Video Annodex</comment> <comment xml:lang="sl">Video datoteka Annodex</comment> <comment xml:lang="sr">Анодекс видео</comment> @@ -16410,10 +16988,10 @@ <comment xml:lang="fi">Annodex-ääni</comment> <comment xml:lang="fo">Annodex ljóður</comment> <comment xml:lang="fr">audio Annodex</comment> - <comment xml:lang="ga">fuaim Annodex</comment> + <comment xml:lang="ga">Fuaim Annodex</comment> <comment xml:lang="gl">son de Annodex</comment> <comment xml:lang="he">שמע Annodex</comment> - <comment xml:lang="hr">Annodex Audio</comment> + <comment xml:lang="hr">Annodex zvučni zapis</comment> <comment xml:lang="hu">Annodex hang</comment> <comment xml:lang="ia">Audio Annodex</comment> <comment xml:lang="id">Audio Annodex</comment> @@ -16430,7 +17008,7 @@ <comment xml:lang="pt">áudio Annodex</comment> <comment xml:lang="pt_BR">Áudio Annodex</comment> <comment xml:lang="ro">Audio Annodex</comment> - <comment xml:lang="ru">аудио Annodex</comment> + <comment xml:lang="ru">Аудио Annodex</comment> <comment xml:lang="sk">Zvuk Annodex</comment> <comment xml:lang="sl">Zvočna datoteka Annodex</comment> <comment xml:lang="sr">Анодекс аудио</comment> @@ -16489,7 +17067,7 @@ <comment xml:lang="pt">ficheiro multimédia Ogg</comment> <comment xml:lang="pt_BR">Arquivo multimídia Ogg</comment> <comment xml:lang="ro">Fișier multimedia Ogg</comment> - <comment xml:lang="ru">мультимедийный файл Ogg</comment> + <comment xml:lang="ru">Мультимедийный файл Ogg</comment> <comment xml:lang="sk">Súbor multimédií Ogg</comment> <comment xml:lang="sl">Večpredstavnostna datoteka Ogg</comment> <comment xml:lang="sq">File multimedial Ogg</comment> @@ -16523,7 +17101,7 @@ <comment xml:lang="fi">Ogg-ääni</comment> <comment xml:lang="fo">Ogg ljóður</comment> <comment xml:lang="fr">audio Ogg</comment> - <comment xml:lang="ga">fuaim Ogg</comment> + <comment xml:lang="ga">Fuaim Ogg</comment> <comment xml:lang="gl">son Ogg</comment> <comment xml:lang="he">שמע Ogg</comment> <comment xml:lang="hr">Ogg zvučni zapis</comment> @@ -16545,7 +17123,7 @@ <comment xml:lang="pt">áudio Ogg</comment> <comment xml:lang="pt_BR">Áudio Ogg</comment> <comment xml:lang="ro">Audio Ogg</comment> - <comment xml:lang="ru">аудио Ogg</comment> + <comment xml:lang="ru">Аудио Ogg</comment> <comment xml:lang="sk">Zvuk Ogg</comment> <comment xml:lang="sl">Zvočna datoteka Ogg</comment> <comment xml:lang="sq">Audio Ogg</comment> @@ -16568,6 +17146,7 @@ <mime-type type="video/ogg"> <comment>Ogg Video</comment> <comment xml:lang="ar">Ogg مرئي</comment> + <comment xml:lang="ast">Videu n'Ogg</comment> <comment xml:lang="be@latin">Videa Ogg</comment> <comment xml:lang="bg">Видео — Ogg</comment> <comment xml:lang="ca">vídeo Ogg</comment> @@ -16581,7 +17160,7 @@ <comment xml:lang="fi">Ogg-video</comment> <comment xml:lang="fo">Ogg Video</comment> <comment xml:lang="fr">vidéo Ogg</comment> - <comment xml:lang="ga">físeán Ogg</comment> + <comment xml:lang="ga">Físeán Ogg</comment> <comment xml:lang="gl">vídeo Ogg</comment> <comment xml:lang="he">וידאו Ogg</comment> <comment xml:lang="hr">Ogg video snimka</comment> @@ -16603,7 +17182,7 @@ <comment xml:lang="pt">vídeo Ogg</comment> <comment xml:lang="pt_BR">Vídeo Ogg</comment> <comment xml:lang="ro">Video Ogg</comment> - <comment xml:lang="ru">видео Ogg</comment> + <comment xml:lang="ru">Видео Ogg</comment> <comment xml:lang="sk">Video Ogg</comment> <comment xml:lang="sl">Video datoteka Ogg</comment> <comment xml:lang="sq">Video Ogg</comment> @@ -16664,7 +17243,7 @@ <comment xml:lang="pt">áudio Ogg Vorbis</comment> <comment xml:lang="pt_BR">Áudio Ogg Vorbis</comment> <comment xml:lang="ro">Audio Ogg Vorbis</comment> - <comment xml:lang="ru">аудио Ogg Vorbis</comment> + <comment xml:lang="ru">Аудио Ogg Vorbis</comment> <comment xml:lang="sk">Zvuk Ogg Vorbis</comment> <comment xml:lang="sl">Zvočna datoteka Ogg Vorbis</comment> <comment xml:lang="sq">Audio Ogg Vorbis</comment> @@ -16724,7 +17303,7 @@ <comment xml:lang="pt">áudio Ogg FLAC</comment> <comment xml:lang="pt_BR">Áudio Ogg FLAC</comment> <comment xml:lang="ro">Audio Ogg FLAC</comment> - <comment xml:lang="ru">аудио Ogg FLAC</comment> + <comment xml:lang="ru">Аудио Ogg FLAC</comment> <comment xml:lang="sk">Zvuk Ogg FLAC</comment> <comment xml:lang="sl">Zvočna datoteka Ogg FLAC</comment> <comment xml:lang="sq">Audio Ogg FLAC</comment> @@ -16760,6 +17339,7 @@ <comment xml:lang="eu">Opus audioa</comment> <comment xml:lang="fi">Opus-ääni</comment> <comment xml:lang="fr">audio Opus</comment> + <comment xml:lang="ga">fuaim Opus</comment> <comment xml:lang="gl">Son Opus</comment> <comment xml:lang="he">שמע Opus</comment> <comment xml:lang="hr">Opus zvučni zapis</comment> @@ -16828,7 +17408,7 @@ <comment xml:lang="pt">áudio Ogg Speex</comment> <comment xml:lang="pt_BR">Áudio Ogg Speex</comment> <comment xml:lang="ro">Audio Ogg Speex</comment> - <comment xml:lang="ru">аудио Ogg Speex</comment> + <comment xml:lang="ru">Аудио Ogg Speex</comment> <comment xml:lang="sk">Zvuk Ogg Speex</comment> <comment xml:lang="sl">Zvočna datoteka Ogg Speex</comment> <comment xml:lang="sq">Audio Ogg Speex</comment> @@ -16867,7 +17447,7 @@ <comment xml:lang="ga">fuaim Speex</comment> <comment xml:lang="gl">son Speex</comment> <comment xml:lang="he">שמע של Speex</comment> - <comment xml:lang="hr">Speex audio</comment> + <comment xml:lang="hr">Speex zvučni zapis</comment> <comment xml:lang="hu">Speex hang</comment> <comment xml:lang="ia">Audio Speex</comment> <comment xml:lang="id">Audio Speex</comment> @@ -16885,7 +17465,7 @@ <comment xml:lang="pt">áudio Speex</comment> <comment xml:lang="pt_BR">Áudio Speex</comment> <comment xml:lang="ro">Audio Speex</comment> - <comment xml:lang="ru">аудио Speex</comment> + <comment xml:lang="ru">Аудио Speex</comment> <comment xml:lang="sk">Zvuk Speex</comment> <comment xml:lang="sl">Zvočna datoteka Speex</comment> <comment xml:lang="sq">Audio Speex</comment> @@ -16904,6 +17484,7 @@ <mime-type type="video/x-theora+ogg"> <comment>Ogg Theora video</comment> <comment xml:lang="ar">Ogg Theora مرئي</comment> + <comment xml:lang="ast">Videu n'Ogg Theora</comment> <comment xml:lang="be@latin">Videa Ogg Theora</comment> <comment xml:lang="bg">Видео — Ogg Theora</comment> <comment xml:lang="ca">vídeo Ogg Theora</comment> @@ -16939,7 +17520,7 @@ <comment xml:lang="pt">vídeo Ogg Theora</comment> <comment xml:lang="pt_BR">Vídeo Ogg Theora</comment> <comment xml:lang="ro">Video Ogg Theora</comment> - <comment xml:lang="ru">видео Ogg Theora</comment> + <comment xml:lang="ru">Видео Ogg Theora</comment> <comment xml:lang="sk">Video Ogg Theora</comment> <comment xml:lang="sl">Video datoteka Ogg Theora</comment> <comment xml:lang="sq">Video Ogg Theora</comment> @@ -16962,6 +17543,7 @@ <mime-type type="video/x-ogm+ogg"> <comment>OGM video</comment> <comment xml:lang="ar">OGM مرئي</comment> + <comment xml:lang="ast">Videu n'OGM</comment> <comment xml:lang="be@latin">Videa OGM</comment> <comment xml:lang="bg">Видео — OGM</comment> <comment xml:lang="ca">vídeo OGM</comment> @@ -16979,7 +17561,7 @@ <comment xml:lang="ga">físeán OGM</comment> <comment xml:lang="gl">vídeo OGM</comment> <comment xml:lang="he">וידאו OGM</comment> - <comment xml:lang="hr">OGM video</comment> + <comment xml:lang="hr">OGM video snimka</comment> <comment xml:lang="hu">OGM-videó</comment> <comment xml:lang="ia">Video OGM</comment> <comment xml:lang="id">Video OGM</comment> @@ -16998,7 +17580,7 @@ <comment xml:lang="pt">vídeo OGM</comment> <comment xml:lang="pt_BR">Vídeo OGM</comment> <comment xml:lang="ro">Video OGM</comment> - <comment xml:lang="ru">видео OGM</comment> + <comment xml:lang="ru">Видео OGM</comment> <comment xml:lang="sk">Video OGM</comment> <comment xml:lang="sl">Video datoteka OGM</comment> <comment xml:lang="sq">Video OGM</comment> @@ -17022,6 +17604,7 @@ <mime-type type="application/x-ole-storage"> <comment>OLE2 compound document storage</comment> <comment xml:lang="ar">تخزين مجمع مستند OLE2</comment> + <comment xml:lang="ast">Almacenamientu de documentos compuestu por OLE2</comment> <comment xml:lang="be@latin">Schovišča dla kampanentaŭ dakumentu OLE2</comment> <comment xml:lang="bg">Съставен документ-хранилище — OLE2</comment> <comment xml:lang="ca">emmagatzematge de documents compostos OLE2</comment> @@ -17036,7 +17619,7 @@ <comment xml:lang="fi">OLE2-yhdisteasiakirjatallenne</comment> <comment xml:lang="fo">OLE2 samansett skjalagoymsla</comment> <comment xml:lang="fr">document de stockage composé OLE2</comment> - <comment xml:lang="ga">stóras cháipéisí comhshuite OLE2</comment> + <comment xml:lang="ga">stóras cáipéisí comhshuite OLE2</comment> <comment xml:lang="gl">almacenamento de documento composto OLE2</comment> <comment xml:lang="he">אחסון מסמך משותף OLE2</comment> <comment xml:lang="hr">OLE2 pohrana složenog dokumenta</comment> @@ -17058,7 +17641,7 @@ <comment xml:lang="pt">armazenamento de documento composto OLE2</comment> <comment xml:lang="pt_BR">Armazenamento de documento composto OLE2</comment> <comment xml:lang="ro">Document de stocare compus OLE2</comment> - <comment xml:lang="ru">хранилище составных документов OLE2</comment> + <comment xml:lang="ru">Хранилище составных документов OLE2</comment> <comment xml:lang="sk">Úložisko zloženého dokumentu OLE2</comment> <comment xml:lang="sl">Združeni dokument OLE2</comment> <comment xml:lang="sq">Arkiv dokumenti i përbërë OLE2</comment> @@ -17077,6 +17660,7 @@ </mime-type> <mime-type type="application/vnd.ms-publisher"> <comment>Microsoft Publisher document</comment> + <comment xml:lang="ast">Documentu de Microsoft Publisher</comment> <comment xml:lang="ca">document de Microsoft Publisher</comment> <comment xml:lang="cs">dokument Microsoft Publisher</comment> <comment xml:lang="da">Microsoft Publisher-dokument</comment> @@ -17087,6 +17671,7 @@ <comment xml:lang="eu">Microsoft Publisher dokumentua</comment> <comment xml:lang="fi">Microsoft Publisher -asiakirja</comment> <comment xml:lang="fr">document Microsoft Publisher</comment> + <comment xml:lang="ga">cáipéis Microsoft Publisher</comment> <comment xml:lang="gl">Documento de Microsoft Publisher</comment> <comment xml:lang="he">מסמך Microsoft Publisher</comment> <comment xml:lang="hr">Microsoft Publisher dokument</comment> @@ -17131,7 +17716,7 @@ <comment xml:lang="ga">pacáiste Windows Installer</comment> <comment xml:lang="gl">paquete de instalación de Windows</comment> <comment xml:lang="he">חבילה של Windows Installer</comment> - <comment xml:lang="hr">Windows Installer paket</comment> + <comment xml:lang="hr">Windows Instalacijski paket</comment> <comment xml:lang="hu">Windows Installer csomag</comment> <comment xml:lang="ia">Pacchetto Windows Installer</comment> <comment xml:lang="id">Paket Windows Installer</comment> @@ -17148,7 +17733,7 @@ <comment xml:lang="pt">pacote de instalação Windows</comment> <comment xml:lang="pt_BR">Pacote do Windows Installer</comment> <comment xml:lang="ro">Pachet instalator Windows</comment> - <comment xml:lang="ru">пакет Windows Installer</comment> + <comment xml:lang="ru">Пакет Windows Installer</comment> <comment xml:lang="sk">Balík Windows Installer</comment> <comment xml:lang="sl">Datoteka paketa Windows namestilnika</comment> <comment xml:lang="sq">Paketë Windows Installer</comment> @@ -17202,7 +17787,7 @@ <comment xml:lang="pt">folha de cálculo GNU Oleo</comment> <comment xml:lang="pt_BR">Planilha do GNU Oleo</comment> <comment xml:lang="ro">Foaie de calcul GNU Oleo</comment> - <comment xml:lang="ru">электронная таблица GNU Oleo</comment> + <comment xml:lang="ru">Электронная таблица GNU Oleo</comment> <comment xml:lang="sk">Zošit GNU Oleo</comment> <comment xml:lang="sl">Preglednica GNU Oleo</comment> <comment xml:lang="sq">Fletë llogaritje GNU Oleo</comment> @@ -17211,7 +17796,7 @@ <comment xml:lang="tr">GNU Oleo çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця GNU Oleo</comment> <comment xml:lang="vi">Bảng tính Oleo của GNU</comment> - <comment xml:lang="zh_CN">GNU Oleo 工作簿</comment> + <comment xml:lang="zh_CN">GNU Oleo 电子表格</comment> <comment xml:lang="zh_TW">GNU Oleo 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -17258,7 +17843,7 @@ <comment xml:lang="pt">arquivo PAK</comment> <comment xml:lang="pt_BR">Pacote PAK</comment> <comment xml:lang="ro">Arhivă PAK</comment> - <comment xml:lang="ru">архив PAK</comment> + <comment xml:lang="ru">Архив PAK</comment> <comment xml:lang="sk">Archív PAK</comment> <comment xml:lang="sl">Datoteka arhiva PAK</comment> <comment xml:lang="sq">Arkiv PAK</comment> @@ -17267,7 +17852,7 @@ <comment xml:lang="tr">PAK arşivi</comment> <comment xml:lang="uk">архів PAK</comment> <comment xml:lang="vi">Kho nén PAK</comment> - <comment xml:lang="zh_CN">AR 归档文件</comment> + <comment xml:lang="zh_CN">PAK 归档文件</comment> <comment xml:lang="zh_TW">PAK 封存檔</comment> <generic-icon name="package-x-generic"/> <magic priority="80"> @@ -17316,7 +17901,7 @@ <comment xml:lang="pt">base de dados Palm OS</comment> <comment xml:lang="pt_BR">Banco de dados do Palm OS</comment> <comment xml:lang="ro">Bază de date Palm OS</comment> - <comment xml:lang="ru">база данных Palm OS</comment> + <comment xml:lang="ru">База данных Palm OS</comment> <comment xml:lang="sk">Databáza Palm OS</comment> <comment xml:lang="sl">Podatkovna zbirka Palm OS</comment> <comment xml:lang="sq">Bankë me të dhëna Palm OS</comment> @@ -17370,7 +17955,7 @@ <comment xml:lang="pt">arquivo Parchive</comment> <comment xml:lang="pt_BR">Pacote Parchive</comment> <comment xml:lang="ro">Arhivă Parchive</comment> - <comment xml:lang="ru">архив Parchive</comment> + <comment xml:lang="ru">Архив Parchive</comment> <comment xml:lang="sk">Archív Parchive</comment> <comment xml:lang="sl">Datoteka arhiva Parchive</comment> <comment xml:lang="sq">Arkiv Parchive</comment> @@ -17429,7 +18014,7 @@ <comment xml:lang="pt">executável PEF</comment> <comment xml:lang="pt_BR">Executável PEF</comment> <comment xml:lang="ro">Executabil PEF</comment> - <comment xml:lang="ru">исполняемый файл PEF</comment> + <comment xml:lang="ru">Исполняемый файл PEF</comment> <comment xml:lang="sk">Spustiteľný súbor PEF</comment> <comment xml:lang="sl">Izvedljiva datoteka PEF</comment> <comment xml:lang="sq">E ekzekutueshme PEF</comment> @@ -17485,7 +18070,7 @@ <comment xml:lang="pt">script Perl</comment> <comment xml:lang="pt_BR">Script Perl</comment> <comment xml:lang="ro">Script Perl</comment> - <comment xml:lang="ru">сценарий Perl</comment> + <comment xml:lang="ru">Сценарий Perl</comment> <comment xml:lang="sk">Skript jazyka Perl</comment> <comment xml:lang="sl">Skriptna datoteka Perl</comment> <comment xml:lang="sq">Script Perl</comment> @@ -17499,6 +18084,7 @@ <sub-class-of type="application/x-executable"/> <sub-class-of type="text/plain"/> <generic-icon name="text-x-script"/> + <alias type="text/x-perl"/> <magic priority="50"> <match value='eval \"exec /usr/local/bin/perl' type="string" offset="0"/> <match value="/bin/perl" type="string" offset="2:16"/> @@ -17563,7 +18149,7 @@ <comment xml:lang="pt">script PHP</comment> <comment xml:lang="pt_BR">Script PHP</comment> <comment xml:lang="ro">Script PHP</comment> - <comment xml:lang="ru">сценарий PHP</comment> + <comment xml:lang="ru">Сценарий PHP</comment> <comment xml:lang="sk">Skript PHP</comment> <comment xml:lang="sl">Skriptna datoteka PHP</comment> <comment xml:lang="sq">Script PHP</comment> @@ -17600,7 +18186,7 @@ <comment xml:lang="fi">PKCS#7-varmennenippu</comment> <comment xml:lang="fo">PKCS#7 váttanar bundi</comment> <comment xml:lang="fr">lot de certificats PKCS#7</comment> - <comment xml:lang="ga">cuach theastas PKCS#7</comment> + <comment xml:lang="ga">burla teastas PKCS#7</comment> <comment xml:lang="gl">paquete de certificado PKCS#7</comment> <comment xml:lang="he">בקשה מוסמכת PKCS#7</comment> <comment xml:lang="hr">PKCS#7 paket vjerodajnica</comment> @@ -17619,7 +18205,7 @@ <comment xml:lang="pt">pacote de certificação PKCS#7</comment> <comment xml:lang="pt_BR">Pacote de certificados PKCS#7</comment> <comment xml:lang="ro">Pachet certificat PKCS#7</comment> - <comment xml:lang="ru">пакет сертификатов PKCS#7</comment> + <comment xml:lang="ru">Пакет сертификата PKCS#7</comment> <comment xml:lang="sk">Zväzok certifikátov PKCS#7</comment> <comment xml:lang="sl">Datoteka potrdila PKCS#7</comment> <comment xml:lang="sr">ПКЦС#7 пакет уверења</comment> @@ -17651,7 +18237,7 @@ <comment xml:lang="fi">PKCS#12-varmennenippu</comment> <comment xml:lang="fo">PKCS#12 váttanar bundi</comment> <comment xml:lang="fr">lot de certificats PKCS#12</comment> - <comment xml:lang="ga">cuach theastas PKCS#12</comment> + <comment xml:lang="ga">burla teastas PKCS#12</comment> <comment xml:lang="gl">paquete de certificado PKCS#12</comment> <comment xml:lang="he">בקשה מוסמכת PKCS#12</comment> <comment xml:lang="hr">PKCS#12 paket vjerodajnica</comment> @@ -17673,7 +18259,7 @@ <comment xml:lang="pt">pacote de certificação PKCS#12</comment> <comment xml:lang="pt_BR">Pacote de certificados PKCS#12</comment> <comment xml:lang="ro">Certificat împachetat PKCS#12</comment> - <comment xml:lang="ru">пакет сертификатов PKCS#12</comment> + <comment xml:lang="ru">Пакет сертификата PKCS#12</comment> <comment xml:lang="sk">Zväzok certifikátov PKCS#12</comment> <comment xml:lang="sl">Datoteka potrdila PKCS#12</comment> <comment xml:lang="sq">Bundle çertifikate PKCS#12</comment> @@ -17727,7 +18313,7 @@ <comment xml:lang="pt">folha de cálculo PlanPerfect</comment> <comment xml:lang="pt_BR">Planilha do PlanPerfect</comment> <comment xml:lang="ro">Foaie de calcul PlanPerfect</comment> - <comment xml:lang="ru">электронная таблица PlanPerfect</comment> + <comment xml:lang="ru">Электронная таблица PlanPerfect</comment> <comment xml:lang="sk">Zošit PlanPerfect</comment> <comment xml:lang="sl">Preglednica PlanPerfect</comment> <comment xml:lang="sq">Fletë llogaritjesh PlanPerfect</comment> @@ -17736,7 +18322,7 @@ <comment xml:lang="tr">PlanPerfect çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця PlanPerfect</comment> <comment xml:lang="vi">Bảng tính PlanPerfect</comment> - <comment xml:lang="zh_CN">PlanPerfect 工作簿</comment> + <comment xml:lang="zh_CN">PlanPerfect 电子表格</comment> <comment xml:lang="zh_TW">PlanPerfect 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.pln"/> @@ -17744,6 +18330,7 @@ <mime-type type="application/x-pocket-word"> <comment>Pocket Word document</comment> <comment xml:lang="ar">مستند Pocket Word</comment> + <comment xml:lang="ast">Documentu de PocketWord</comment> <comment xml:lang="bg">Документ — Pocket Word</comment> <comment xml:lang="ca">document de Pocket Word</comment> <comment xml:lang="cs">dokument Pocket Word</comment> @@ -17775,7 +18362,7 @@ <comment xml:lang="pt">documento Pocket Word</comment> <comment xml:lang="pt_BR">Documento do Pocket Word</comment> <comment xml:lang="ro">Document Pocket Word</comment> - <comment xml:lang="ru">документ Pocket Word</comment> + <comment xml:lang="ru">Документ Pocket Word</comment> <comment xml:lang="sk">Dokument Pocket Word</comment> <comment xml:lang="sl">Dokument Pocket Word</comment> <comment xml:lang="sr">документ Покет Ворда</comment> @@ -17831,7 +18418,7 @@ <comment xml:lang="pt">resultados de análise de perfil</comment> <comment xml:lang="pt_BR">Resultados do profiler</comment> <comment xml:lang="ro">rezultate profiler</comment> - <comment xml:lang="ru">результаты профилирования</comment> + <comment xml:lang="ru">Результаты профилирования</comment> <comment xml:lang="sk">Výsledky profilera</comment> <comment xml:lang="sl">rezultati profilirnika</comment> <comment xml:lang="sq">Rezultate të profiluesit</comment> @@ -17840,7 +18427,7 @@ <comment xml:lang="tr">profil sonuçları</comment> <comment xml:lang="uk">результати профілювання</comment> <comment xml:lang="vi">kết quả nét hiện trạng</comment> - <comment xml:lang="zh_CN">profiler 结果</comment> + <comment xml:lang="zh_CN">探查器结果</comment> <comment xml:lang="zh_TW">硬體資訊產生器成果</comment> <sub-class-of type="text/plain"/> <generic-icon name="text-x-generic"/> @@ -17849,6 +18436,7 @@ <mime-type type="application/x-pw"> <comment>Pathetic Writer document</comment> <comment xml:lang="ar">مستند Pathetic Writer</comment> + <comment xml:lang="ast">Documentu de Pathetic Writer</comment> <comment xml:lang="be@latin">Dakument Pathetic Writer</comment> <comment xml:lang="bg">Документ — Pathetic Writer</comment> <comment xml:lang="ca">document de Pathetic Writer</comment> @@ -17885,7 +18473,7 @@ <comment xml:lang="pt">documento do Pathetic Writer</comment> <comment xml:lang="pt_BR">Documento do Pathetic Writer</comment> <comment xml:lang="ro">Document Pathetic Writer</comment> - <comment xml:lang="ru">документ Pathetic Writer</comment> + <comment xml:lang="ru">Документ Pathetic Writer</comment> <comment xml:lang="sk">Dokument Pathetic Writer</comment> <comment xml:lang="sl">Dokument Pathetic Writer</comment> <comment xml:lang="sq">Dokument Pathetic Writer</comment> @@ -17940,7 +18528,7 @@ <comment xml:lang="pt">código binário Python</comment> <comment xml:lang="pt_BR">Código compilado Python</comment> <comment xml:lang="ro">Bytecode Python</comment> - <comment xml:lang="ru">байт-код Python</comment> + <comment xml:lang="ru">Байт-код Python</comment> <comment xml:lang="sk">Bajtový kód Python</comment> <comment xml:lang="sl">Datoteka bitne kode Python</comment> <comment xml:lang="sq">Bytecode Python</comment> @@ -17959,6 +18547,7 @@ </mime-type> <mime-type type="application/x-qtiplot"> <comment>QtiPlot document</comment> + <comment xml:lang="ast">Documentu de QtiPlot</comment> <comment xml:lang="ca">document QtiPlot</comment> <comment xml:lang="cs">dokument GtiPlot</comment> <comment xml:lang="da">QtiPlot-dokument</comment> @@ -17969,6 +18558,7 @@ <comment xml:lang="eu">QtiPlot dokumentua</comment> <comment xml:lang="fi">QtiPlot-asiakirja</comment> <comment xml:lang="fr">document QtiPlot</comment> + <comment xml:lang="ga">cáipéis QtiPlot</comment> <comment xml:lang="gl">Documento de QtiPilot</comment> <comment xml:lang="he">מסמך QtiPlot</comment> <comment xml:lang="hr">QtiPlot dokument</comment> @@ -17984,7 +18574,7 @@ <comment xml:lang="pl">Dokument QtiPlot</comment> <comment xml:lang="pt">documento QtiPlot</comment> <comment xml:lang="pt_BR">Documento do QtiPlot</comment> - <comment xml:lang="ru">документ QtiPlot</comment> + <comment xml:lang="ru">Документ QtiPlot</comment> <comment xml:lang="sk">Dokument QtiPlot</comment> <comment xml:lang="sl">Dokument QtiPlot</comment> <comment xml:lang="sr">КутиПлот документ</comment> @@ -18040,7 +18630,7 @@ <comment xml:lang="pt">folha de cálculo Quattro Pro</comment> <comment xml:lang="pt_BR">Planilha do Quattro Pro</comment> <comment xml:lang="ro">Foaie de calcul Quattro Pro</comment> - <comment xml:lang="ru">электронная таблица Quattro Pro</comment> + <comment xml:lang="ru">Электронная таблица Quattro Pro</comment> <comment xml:lang="sk">Zošit Quattro Pro</comment> <comment xml:lang="sl">Preglednica Quattro Pro</comment> <comment xml:lang="sq">Fletë llogaritjesh Quattro Pro</comment> @@ -18049,7 +18639,7 @@ <comment xml:lang="tr">Quattro Pro çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Quattro Pro</comment> <comment xml:lang="vi">Bảng tính Quattro Pro</comment> - <comment xml:lang="zh_CN">Quattro Pro 工作簿</comment> + <comment xml:lang="zh_CN">Quattro Pro 电子表格</comment> <comment xml:lang="zh_TW">Quattro Pro 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.wb1"/> @@ -18093,7 +18683,7 @@ <comment xml:lang="pt">lista de reprodução QuickTime metalink</comment> <comment xml:lang="pt_BR">Lista de reprodução metalink do QuickTime</comment> <comment xml:lang="ro">Listă cu metalegături QuickTime</comment> - <comment xml:lang="ru">список воспроизведения мета-ссылок QuickTime</comment> + <comment xml:lang="ru">Список воспроизведения мета-ссылок QuickTime</comment> <comment xml:lang="sk">Zoznam skladieb metalink QuickTime</comment> <comment xml:lang="sl">Seznam predvajanja QuickTime</comment> <comment xml:lang="sq">Listë titujsh metalink QuickTime</comment> @@ -18102,7 +18692,7 @@ <comment xml:lang="tr">QuickTime metalink çalma listesi</comment> <comment xml:lang="uk">список відтворення QuickTime metalink</comment> <comment xml:lang="vi">Danh mục nhạc siêu liên kết Quicktime</comment> - <comment xml:lang="zh_CN">QuickTime 元链接播放列表</comment> + <comment xml:lang="zh_CN">QuickTime Metalink 播放列表</comment> <comment xml:lang="zh_TW">QuickTime metalink 播放清單</comment> <generic-icon name="video-x-generic"/> <sub-class-of type="video/quicktime"/> @@ -18120,6 +18710,7 @@ <mime-type type="application/x-qw"> <comment>Quicken document</comment> <comment xml:lang="ar">مستند Quicken</comment> + <comment xml:lang="ast">Documentu de Quicken</comment> <comment xml:lang="az">Quicken sənədi</comment> <comment xml:lang="be@latin">Dakument Quicken</comment> <comment xml:lang="bg">Документ — Quicken</comment> @@ -18158,7 +18749,7 @@ <comment xml:lang="pt">documento Quicken</comment> <comment xml:lang="pt_BR">Documento do Quicken</comment> <comment xml:lang="ro">Document Quicken</comment> - <comment xml:lang="ru">документ Quicken</comment> + <comment xml:lang="ru">Документ Quicken</comment> <comment xml:lang="sk">Dokument Quicken</comment> <comment xml:lang="sl">Dokument Quicken</comment> <comment xml:lang="sq">Dokument Quicken</comment> @@ -18212,7 +18803,7 @@ <comment xml:lang="pt">arquivo RAR</comment> <comment xml:lang="pt_BR">Pacote RAR</comment> <comment xml:lang="ro">Arhivă RAR</comment> - <comment xml:lang="ru">архив RAR</comment> + <comment xml:lang="ru">Архив RAR</comment> <comment xml:lang="sk">Archív RAR</comment> <comment xml:lang="sl">Datoteka arhiva RAR</comment> <comment xml:lang="sq">Arkiv RAR</comment> @@ -18272,7 +18863,7 @@ <comment xml:lang="pt">arquivo DAR</comment> <comment xml:lang="pt_BR">Pacote DAR</comment> <comment xml:lang="ro">Arhivă DAR</comment> - <comment xml:lang="ru">архив DAR</comment> + <comment xml:lang="ru">Архив DAR</comment> <comment xml:lang="sk">Archív DAR</comment> <comment xml:lang="sl">Datoteka arhiva DAR</comment> <comment xml:lang="sq">Arkiv DAR</comment> @@ -18328,7 +18919,7 @@ <comment xml:lang="pt">arquivo Alzip</comment> <comment xml:lang="pt_BR">Pacote Alzip</comment> <comment xml:lang="ro">Arhivă Alzip</comment> - <comment xml:lang="ru">архив ALZIP</comment> + <comment xml:lang="ru">Архив ALZIP</comment> <comment xml:lang="sk">Archív Alzip</comment> <comment xml:lang="sl">Datoteka arhiva Alzip</comment> <comment xml:lang="sq">Arkiv Alzip</comment> @@ -18358,14 +18949,14 @@ <comment xml:lang="en_GB">rejected patch</comment> <comment xml:lang="eo">reĵeta flikaĵo</comment> <comment xml:lang="es">parche rechazado</comment> - <comment xml:lang="eu">baztertutako bide-izena</comment> + <comment xml:lang="eu">baztertutako adabakia</comment> <comment xml:lang="fi">hylättyjen muutosten tiedosto</comment> <comment xml:lang="fo">vrakað rætting</comment> <comment xml:lang="fr">correctif rejeté</comment> <comment xml:lang="ga">paiste diúltaithe</comment> <comment xml:lang="gl">parche rexeitado</comment> <comment xml:lang="he">טלאי שנדחה</comment> - <comment xml:lang="hr">odbijena zakrpa</comment> + <comment xml:lang="hr">Odbijena zakrpa</comment> <comment xml:lang="hu">visszautasított folt</comment> <comment xml:lang="ia">Patch rejectate</comment> <comment xml:lang="id">patch ditolak</comment> @@ -18384,7 +18975,7 @@ <comment xml:lang="pt">patch rejeitado</comment> <comment xml:lang="pt_BR">Arquivo de patch rejeitado</comment> <comment xml:lang="ro">petec respsins</comment> - <comment xml:lang="ru">отвергнутый патч</comment> + <comment xml:lang="ru">Отклонённый патч</comment> <comment xml:lang="sk">Odmietnutá záplata</comment> <comment xml:lang="sl">zavrnjen popravek</comment> <comment xml:lang="sq">Patch i kthyer mbrapsht</comment> @@ -18439,7 +19030,7 @@ <comment xml:lang="pt">pacote RPM</comment> <comment xml:lang="pt_BR">Pacote RPM</comment> <comment xml:lang="ro">Pachet RPM</comment> - <comment xml:lang="ru">пакет RPM</comment> + <comment xml:lang="ru">Пакет RPM</comment> <comment xml:lang="sk">Balík RPM</comment> <comment xml:lang="sl">Datoteka paketa RPM</comment> <comment xml:lang="sq">Paketë RPM</comment> @@ -18469,6 +19060,7 @@ <comment xml:lang="eu">Iturburu RPM paketea</comment> <comment xml:lang="fi">RPM-lähdepaketti</comment> <comment xml:lang="fr">paquet source RPM</comment> + <comment xml:lang="ga">pacáiste foinse RPM</comment> <comment xml:lang="gl">Paquete RPM de fontes</comment> <comment xml:lang="he">חבילת מקור RPM</comment> <comment xml:lang="hr">RPM paket izvora</comment> @@ -18484,7 +19076,7 @@ <comment xml:lang="pl">Źródłowy pakiet RPM</comment> <comment xml:lang="pt">pacote origem RPM</comment> <comment xml:lang="pt_BR">Pacote fonte RPM</comment> - <comment xml:lang="ru">пакет RPM с исходным кодом</comment> + <comment xml:lang="ru">Пакет RPM с исходным кодом</comment> <comment xml:lang="sk">Zdrojový balík RPM</comment> <comment xml:lang="sl">Paket izvorne kode RPM</comment> <comment xml:lang="sr">изворни РПМ пакет</comment> @@ -18537,7 +19129,7 @@ <comment xml:lang="pt">script Ruby</comment> <comment xml:lang="pt_BR">Script Ruby</comment> <comment xml:lang="ro">Script Ruby</comment> - <comment xml:lang="ru">сценарий Ruby</comment> + <comment xml:lang="ru">Сценарий Ruby</comment> <comment xml:lang="sk">Skript Ruby</comment> <comment xml:lang="sl">Skriptna datoteka Ruby</comment> <comment xml:lang="sq">Script Ruby</comment> @@ -18596,7 +19188,7 @@ <comment xml:lang="pt">script Markaby</comment> <comment xml:lang="pt_BR">Script Markaby</comment> <comment xml:lang="ro">Script Markaby</comment> - <comment xml:lang="ru">сценарий Markaby</comment> + <comment xml:lang="ru">Сценарий Markaby</comment> <comment xml:lang="sk">Skript Markaby</comment> <comment xml:lang="sl">Skriptna datoteka Markaby</comment> <comment xml:lang="sq">Script Markaby</comment> @@ -18623,6 +19215,7 @@ <comment xml:lang="eu">Rust iturburu-kodea</comment> <comment xml:lang="fi">Rust-lähdekoodi</comment> <comment xml:lang="fr">code source Rust</comment> + <comment xml:lang="ga">cód foinseach Rust</comment> <comment xml:lang="he">קוד מקור של Rust</comment> <comment xml:lang="hr">Rust izvorni kôd</comment> <comment xml:lang="hu">Rust forrásfájl</comment> @@ -18635,7 +19228,7 @@ <comment xml:lang="pl">Kod źródłowy Rust</comment> <comment xml:lang="pt">código origem Rust</comment> <comment xml:lang="pt_BR">Código-fonte Rust</comment> - <comment xml:lang="ru">исходный код Rust</comment> + <comment xml:lang="ru">Исходный код Rust</comment> <comment xml:lang="sk">Zdrojový kód Rust</comment> <comment xml:lang="sr">Раст изворни ко̂д</comment> <comment xml:lang="sv">Rust-källkod</comment> @@ -18684,7 +19277,7 @@ <comment xml:lang="pt">folha de cálculo SC/Xspread</comment> <comment xml:lang="pt_BR">Planilha do SC/Xspread</comment> <comment xml:lang="ro">Foaie de calcul SC/Xspread</comment> - <comment xml:lang="ru">электронная таблица SC/Xspread</comment> + <comment xml:lang="ru">Электронная таблица SC/Xspread</comment> <comment xml:lang="sk">Zošit SC/Xspread</comment> <comment xml:lang="sl">Preglednica SC/Xspread</comment> <comment xml:lang="sq">Fletë llogaritjesh SC/Xspread</comment> @@ -18693,7 +19286,7 @@ <comment xml:lang="tr">SC/Xspread çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця SC/Xspread</comment> <comment xml:lang="vi">Bảng tính SC/Xspread</comment> - <comment xml:lang="zh_CN">SC/Xspread 工作簿</comment> + <comment xml:lang="zh_CN">SC/Xspread 电子表格</comment> <comment xml:lang="zh_TW">SC/Xspread 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <magic priority="50"> @@ -18722,7 +19315,7 @@ <comment xml:lang="ga">cartlann bhlaoisce</comment> <comment xml:lang="gl">ficheiro shell</comment> <comment xml:lang="he">ארכיון מעטפת</comment> - <comment xml:lang="hr">arhiva ljuske</comment> + <comment xml:lang="hr">Arhiva ljuske</comment> <comment xml:lang="hu">héjarchívum</comment> <comment xml:lang="ia">Archivo de shell</comment> <comment xml:lang="id">arsip shell</comment> @@ -18741,7 +19334,7 @@ <comment xml:lang="pt">arquivo de terminal</comment> <comment xml:lang="pt_BR">Pacote shell</comment> <comment xml:lang="ro">arhivă shell</comment> - <comment xml:lang="ru">архив оболочки UNIX</comment> + <comment xml:lang="ru">Архив shell</comment> <comment xml:lang="sk">Archív shellu</comment> <comment xml:lang="sl">lupinski arhiv</comment> <comment xml:lang="sq">Arkiv shell</comment> @@ -18792,7 +19385,7 @@ <comment xml:lang="pt">biblioteca partilhada libtool</comment> <comment xml:lang="pt_BR">Biblioteca compartilhada libtool</comment> <comment xml:lang="ro">bibliotecă partajată libtool</comment> - <comment xml:lang="ru">разделяемая библиотека libtool</comment> + <comment xml:lang="ru">Разделяемая библиотека libtool</comment> <comment xml:lang="sk">Zdieľaná knižnica libtool</comment> <comment xml:lang="sl">Souporabna knjižnica libtool</comment> <comment xml:lang="sq">Librari e përbashkët libtool</comment> @@ -18848,7 +19441,7 @@ <comment xml:lang="pt">biblioteca partilhada</comment> <comment xml:lang="pt_BR">Biblioteca compartilhada</comment> <comment xml:lang="ro">bibliotecă partajată</comment> - <comment xml:lang="ru">разделяемая библиотека</comment> + <comment xml:lang="ru">Разделяемая библиотека</comment> <comment xml:lang="sk">Zdieľaná knižnica</comment> <comment xml:lang="sl">souporabljena knjižnica</comment> <comment xml:lang="sq">Librari e përbashkët</comment> @@ -18883,7 +19476,7 @@ <comment xml:lang="az">qabıq skripti</comment> <comment xml:lang="be@latin">skrypt abałonki</comment> <comment xml:lang="bg">Скрипт на обвивката</comment> - <comment xml:lang="ca">script de shell</comment> + <comment xml:lang="ca">script shell</comment> <comment xml:lang="cs">skript shellu</comment> <comment xml:lang="cy">sgript plisgyn</comment> <comment xml:lang="da">skalprogram</comment> @@ -18899,7 +19492,7 @@ <comment xml:lang="ga">script bhlaoisce</comment> <comment xml:lang="gl">script de shell</comment> <comment xml:lang="he">תסריט מעטפת</comment> - <comment xml:lang="hr">skripta ljuske</comment> + <comment xml:lang="hr">Skripta ljuske</comment> <comment xml:lang="hu">héj-parancsfájl</comment> <comment xml:lang="ia">Script de shell</comment> <comment xml:lang="id">skrip shell</comment> @@ -18918,7 +19511,7 @@ <comment xml:lang="pt">script de terminal</comment> <comment xml:lang="pt_BR">Script shell</comment> <comment xml:lang="ro">script shell</comment> - <comment xml:lang="ru">сценарий оболочки UNIX</comment> + <comment xml:lang="ru">Сценарий shell</comment> <comment xml:lang="sk">Skript shellu</comment> <comment xml:lang="sl">lupinski skript</comment> <comment xml:lang="sq">Script shell</comment> @@ -18987,7 +19580,7 @@ <comment xml:lang="pt">ficheiro Shockwave Flash</comment> <comment xml:lang="pt_BR">Arquivo Shockwave Flash</comment> <comment xml:lang="ro">Fișier Shockwave Flash</comment> - <comment xml:lang="ru">файл Shockwave Flash</comment> + <comment xml:lang="ru">Файл Shockwave Flash</comment> <comment xml:lang="sk">Súbor Shockwave Flash</comment> <comment xml:lang="sl">Datoteka Shockwave Flash</comment> <comment xml:lang="sq">File Flash Shockwave</comment> @@ -19029,7 +19622,7 @@ <comment xml:lang="ga">fuaim Shorten</comment> <comment xml:lang="gl">son Shorten</comment> <comment xml:lang="he">שמע של Shorten</comment> - <comment xml:lang="hr">Shorten audio</comment> + <comment xml:lang="hr">Shorten zvučni zapis</comment> <comment xml:lang="hu">Shorten hang</comment> <comment xml:lang="ia">Audio Shorten</comment> <comment xml:lang="id">Audio Shorten</comment> @@ -19047,7 +19640,7 @@ <comment xml:lang="pt">áudio Shorten</comment> <comment xml:lang="pt_BR">Áudio Shorten</comment> <comment xml:lang="ro">Audio Shorten</comment> - <comment xml:lang="ru">аудио Shorten</comment> + <comment xml:lang="ru">Аудио Shorten</comment> <comment xml:lang="sk">Zvuk Shorten</comment> <comment xml:lang="sl">Zvočna datoteka Shorten</comment> <comment xml:lang="sq">Audio Shorten</comment> @@ -19104,7 +19697,7 @@ <comment xml:lang="pt">folha de cálculo Siag</comment> <comment xml:lang="pt_BR">Planilha do Siag</comment> <comment xml:lang="ro">Foaie de calcul Siag</comment> - <comment xml:lang="ru">электронная таблица Siag</comment> + <comment xml:lang="ru">Электронная таблица Siag</comment> <comment xml:lang="sk">Zošit Siag</comment> <comment xml:lang="sl">Preglednica Siag</comment> <comment xml:lang="sq">Fletë llogaritjesh Siag</comment> @@ -19113,7 +19706,7 @@ <comment xml:lang="tr">Siag çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Siag</comment> <comment xml:lang="vi">Bảng tính Slag</comment> - <comment xml:lang="zh_CN">Siag 工作簿</comment> + <comment xml:lang="zh_CN">Siag 电子表格</comment> <comment xml:lang="zh_TW">Siag 試算表</comment> <generic-icon name="x-office-spreadsheet"/> <glob pattern="*.siag"/> @@ -19121,6 +19714,7 @@ <mime-type type="image/x-skencil"> <comment>Skencil document</comment> <comment xml:lang="ar">مستند Skencil</comment> + <comment xml:lang="ast">Documentu de Skencil</comment> <comment xml:lang="be@latin">Dakument Skencil</comment> <comment xml:lang="bg">Документ — Skencil</comment> <comment xml:lang="ca">document Skencil</comment> @@ -19155,7 +19749,7 @@ <comment xml:lang="pt">documento Skencil</comment> <comment xml:lang="pt_BR">Documento do Skencil</comment> <comment xml:lang="ro">Document Skencil</comment> - <comment xml:lang="ru">документ Skencil</comment> + <comment xml:lang="ru">Документ Skencil</comment> <comment xml:lang="sk">Dokument Skencil</comment> <comment xml:lang="sl">Dokument Skencil</comment> <comment xml:lang="sq">Dokument Skencil</comment> @@ -19213,7 +19807,7 @@ <comment xml:lang="pt">pacote Stampede</comment> <comment xml:lang="pt_BR">Pacote Stampede</comment> <comment xml:lang="ro">Pachet Stampede</comment> - <comment xml:lang="ru">пакет Stampede</comment> + <comment xml:lang="ru">Пакет Stampede</comment> <comment xml:lang="sk">Balíček Stampede</comment> <comment xml:lang="sl">Datoteka paketa Stampede</comment> <comment xml:lang="sq">Paketë Stampede</comment> @@ -19229,18 +19823,28 @@ <mime-type type="application/x-sg1000-rom"> <comment>SG-1000 ROM</comment> <comment xml:lang="ca">ROM de SG-1000</comment> + <comment xml:lang="cs">ROM pro SG-1000</comment> <comment xml:lang="da">SG-1000 ROM</comment> <comment xml:lang="de">SG-1000 ROM</comment> + <comment xml:lang="en_GB">SG-1000 ROM</comment> <comment xml:lang="es">ROM de SG-1000</comment> + <comment xml:lang="eu">SG-1000 ROM</comment> <comment xml:lang="fi">SG-1000 -ROM</comment> <comment xml:lang="fr">ROM SG-1000</comment> + <comment xml:lang="ga">ROM SG-1000</comment> + <comment xml:lang="hr">SG-1000 ROM</comment> <comment xml:lang="hu">SG-1000 ROM</comment> + <comment xml:lang="id">ROM SG-1000</comment> + <comment xml:lang="it">ROM SG-1000</comment> <comment xml:lang="kk">SG-1000 ROM</comment> <comment xml:lang="ko">SG-1000 롬</comment> <comment xml:lang="pl">Plik ROM konsoli SG-1000</comment> <comment xml:lang="pt_BR">ROM de SG-1000</comment> <comment xml:lang="ru">SG-1000 ROM</comment> <comment xml:lang="sk">ROM pre SG-1000</comment> + <comment xml:lang="sr">СГ-1000 РОМ</comment> + <comment xml:lang="sv">SG-1000-rom</comment> + <comment xml:lang="tr">SG-1000 ROM</comment> <comment xml:lang="uk">ППП SG-1000</comment> <comment xml:lang="zh_CN">SG-1000 ROM</comment> <comment xml:lang="zh_TW">SG-1000 ROM</comment> @@ -19251,18 +19855,28 @@ <comment>Master System ROM</comment> <comment xml:lang="ca">ROM de Master System</comment> + <comment xml:lang="cs">ROM pro Master System</comment> <comment xml:lang="da">Master System ROM</comment> <comment xml:lang="de">Master System ROM</comment> + <comment xml:lang="en_GB">Master System ROM</comment> <comment xml:lang="es">ROM de Master System</comment> + <comment xml:lang="eu">Master System ROM</comment> <comment xml:lang="fi">Master System -ROM</comment> <comment xml:lang="fr">ROM Master System</comment> + <comment xml:lang="ga">ROM Master System</comment> + <comment xml:lang="hr">Master System ROM</comment> <comment xml:lang="hu">Master System ROM</comment> + <comment xml:lang="id">ROM Master System</comment> + <comment xml:lang="it">ROM Master System</comment> <comment xml:lang="kk">Master System ROM</comment> <comment xml:lang="ko">마스터 시스템 롬</comment> <comment xml:lang="pl">Plik ROM konsoli SMS</comment> <comment xml:lang="pt_BR">ROM de Master System</comment> <comment xml:lang="ru">Master System ROM</comment> <comment xml:lang="sk">ROM pre Master System</comment> + <comment xml:lang="sr">Мастер Систем РОМ</comment> + <comment xml:lang="sv">Master System-rom</comment> + <comment xml:lang="tr">Master System ROM</comment> <comment xml:lang="uk">ППП Master System</comment> <comment xml:lang="zh_CN">Master System ROM</comment> <comment xml:lang="zh_TW">Master System ROM</comment> @@ -19273,18 +19887,28 @@ <mime-type type="application/x-gamegear-rom"> <comment>Game Gear ROM</comment> <comment xml:lang="ca">ROM de Game Gear</comment> + <comment xml:lang="cs">ROM pro Game Gear</comment> <comment xml:lang="da">Game Gear ROM</comment> <comment xml:lang="de">Game Gear ROM</comment> + <comment xml:lang="en_GB">Game Gear ROM</comment> <comment xml:lang="es">ROM de Game Gear</comment> + <comment xml:lang="eu">Game Gear ROM</comment> <comment xml:lang="fi">Game Gear -ROM</comment> <comment xml:lang="fr">ROM Game Gear</comment> + <comment xml:lang="ga">ROM Game Gear</comment> + <comment xml:lang="hr">Game Gear ROM</comment> <comment xml:lang="hu">Game Gear ROM</comment> + <comment xml:lang="id">ROM Game Gear</comment> + <comment xml:lang="it">ROM Game Gear</comment> <comment xml:lang="kk">Game Gear ROM</comment> <comment xml:lang="ko">게임 기어 롬</comment> <comment xml:lang="pl">Plik ROM konsoli Game Gear</comment> <comment xml:lang="pt_BR">ROM de Game Gear</comment> <comment xml:lang="ru">Game Gear ROM</comment> <comment xml:lang="sk">ROM pre Game Gear</comment> + <comment xml:lang="sr">Гејм Гир РОМ</comment> + <comment xml:lang="sv">Game Gear-rom</comment> + <comment xml:lang="tr">Game Gear ROM</comment> <comment xml:lang="uk">ППП Game Gear</comment> <comment xml:lang="zh_CN">Game Gear ROM</comment> <comment xml:lang="zh_TW">Game Gear ROM</comment> @@ -19328,7 +19952,7 @@ <comment xml:lang="oc">ROM Super Nintendo</comment> <comment xml:lang="pl">Plik ROM konsoli SNES</comment> <comment xml:lang="pt">ROM Super Nintendo</comment> - <comment xml:lang="pt_BR">ROM do Super Nintendo</comment> + <comment xml:lang="pt_BR">ROM de Super Nintendo</comment> <comment xml:lang="ro">ROM Super Nintendo</comment> <comment xml:lang="ru">Super NES ROM</comment> <comment xml:lang="sk">ROM pre Super Nintendo</comment> @@ -19384,7 +20008,7 @@ <comment xml:lang="pt">arquivo StuffIt</comment> <comment xml:lang="pt_BR">Pacote StuffIt</comment> <comment xml:lang="ro">Arhivă StuffIt</comment> - <comment xml:lang="ru">архив StuffIt</comment> + <comment xml:lang="ru">Архив StuffIt</comment> <comment xml:lang="sk">Archív StuffIt</comment> <comment xml:lang="sl">Datoteka arhiva StuffIt</comment> <comment xml:lang="sq">Arkiv StuffIt</comment> @@ -19424,7 +20048,7 @@ <comment xml:lang="ga">fotheidil SubRip</comment> <comment xml:lang="gl">subtítulos SubRip</comment> <comment xml:lang="he">כתוביות של SubRip</comment> - <comment xml:lang="hr">SubRip titlovi</comment> + <comment xml:lang="hr">SubRip podnaslovi</comment> <comment xml:lang="hu">SubRip feliratok</comment> <comment xml:lang="ia">Subtitulos SubRip</comment> <comment xml:lang="id">Subjudul SubRip</comment> @@ -19442,7 +20066,7 @@ <comment xml:lang="pt">legendas SubRip</comment> <comment xml:lang="pt_BR">Legendas SubRip</comment> <comment xml:lang="ro">Subtitrare SubRip</comment> - <comment xml:lang="ru">субтитры SubRip</comment> + <comment xml:lang="ru">Субтитры SubRip</comment> <comment xml:lang="sk">Titulky SubRip</comment> <comment xml:lang="sl">Datoteka podnapisov SubRip</comment> <comment xml:lang="sq">Nëntituj SubRip</comment> @@ -19476,12 +20100,13 @@ <comment xml:lang="eu">WebVTT azpitituluak</comment> <comment xml:lang="fi">WebVTT-tekstitykset</comment> <comment xml:lang="fr">sous-titres WebVTT</comment> + <comment xml:lang="ga">fotheidil WebVTT</comment> <comment xml:lang="gl">subtítulos WebVTT</comment> <comment xml:lang="he">כתוביות WebVTT</comment> - <comment xml:lang="hr">WebVTT titlovi</comment> + <comment xml:lang="hr">WebVTT podnaslovi</comment> <comment xml:lang="hu">WebVTT feliratok</comment> <comment xml:lang="ia">Subtitulos WebVTT</comment> - <comment xml:lang="id">Subtitel WebVTT</comment> + <comment xml:lang="id">Subjudul WebVTT</comment> <comment xml:lang="it">Sottotitoli WebVTT</comment> <comment xml:lang="ja">WebVTT サブタイトル</comment> <comment xml:lang="ka">WebVTT ქვეტიტრები</comment> @@ -19493,7 +20118,7 @@ <comment xml:lang="pl">Napisy WebVTT</comment> <comment xml:lang="pt">legendas WebVTT</comment> <comment xml:lang="pt_BR">Legendas WebVTT</comment> - <comment xml:lang="ru">субтитры WebVTT</comment> + <comment xml:lang="ru">Субтитры WebVTT</comment> <comment xml:lang="sk">Titulky WebVTT</comment> <comment xml:lang="sl">Podnapisi WebVTT</comment> <comment xml:lang="sr">Веб ВТТ преводи</comment> @@ -19531,7 +20156,7 @@ <comment xml:lang="ga">fotheidil SAMI</comment> <comment xml:lang="gl">subtítulos SAMI</comment> <comment xml:lang="he">כתוביות SAMI</comment> - <comment xml:lang="hr">SAMI titlovi</comment> + <comment xml:lang="hr">SAMI podnaslovi</comment> <comment xml:lang="hu">SAMI feliratok</comment> <comment xml:lang="ia">Subtitulos SAMI</comment> <comment xml:lang="id">Subjudul SAMI</comment> @@ -19549,7 +20174,7 @@ <comment xml:lang="pt">legendas SAMI</comment> <comment xml:lang="pt_BR">Legendas SAMI</comment> <comment xml:lang="ro">Subtitrări SAMI</comment> - <comment xml:lang="ru">субтитры SAMI</comment> + <comment xml:lang="ru">Субтитры SAMI</comment> <comment xml:lang="sk">Titulky SAMI</comment> <comment xml:lang="sl">Datoteka podnapisov SAMI</comment> <comment xml:lang="sq">Nëntituj SAMI</comment> @@ -19590,7 +20215,7 @@ <comment xml:lang="ga">fotheidil MicroDVD</comment> <comment xml:lang="gl">subtítulos de MicroDVD</comment> <comment xml:lang="he">כתוביות של MicroDVD</comment> - <comment xml:lang="hr">MicroDVD titlovi</comment> + <comment xml:lang="hr">MicroDVD podnaslovi</comment> <comment xml:lang="hu">MicroDVD feliratok</comment> <comment xml:lang="ia">Subtitulos MicroDVD</comment> <comment xml:lang="id">Subjudul MicroDVD</comment> @@ -19609,7 +20234,7 @@ <comment xml:lang="pt">legendas MicroDVD</comment> <comment xml:lang="pt_BR">Legendas MicroDVD</comment> <comment xml:lang="ro">Subtitrări MicroDVD</comment> - <comment xml:lang="ru">субтитры MicroDVD</comment> + <comment xml:lang="ru">Субтитры MicroDVD</comment> <comment xml:lang="sk">Titulky MicroDVD</comment> <comment xml:lang="sl">Datoteka podnapisov MicroDVD</comment> <comment xml:lang="sq">Nëntituj MicroDVD</comment> @@ -19648,7 +20273,7 @@ <comment xml:lang="ga">fotheidil MPSub</comment> <comment xml:lang="gl">subtítulos MPSub</comment> <comment xml:lang="he">כתוביות MPSub</comment> - <comment xml:lang="hr">MPSub titlovi</comment> + <comment xml:lang="hr">MPSub podnaslovi</comment> <comment xml:lang="hu">MPSub feliratok</comment> <comment xml:lang="ia">Subtitulos MPSub</comment> <comment xml:lang="id">Subjudul MPSub</comment> @@ -19667,7 +20292,7 @@ <comment xml:lang="pt">legendas MPSub</comment> <comment xml:lang="pt_BR">Legendas MPSub</comment> <comment xml:lang="ro">Subtitrări MPSub</comment> - <comment xml:lang="ru">субтитры MPSub</comment> + <comment xml:lang="ru">Субтитры MPSub</comment> <comment xml:lang="sk">Titulky MPSub</comment> <comment xml:lang="sl">Datoteka podnapisov MPSub</comment> <comment xml:lang="sq">Nëntituj MPSub</comment> @@ -19706,7 +20331,7 @@ <comment xml:lang="ga">fotheidil SSA</comment> <comment xml:lang="gl">Subtitulos SSA</comment> <comment xml:lang="he">כתובית SSA</comment> - <comment xml:lang="hr">SSA titlovi</comment> + <comment xml:lang="hr">SSA podnaslovi</comment> <comment xml:lang="hu">SSA feliratok</comment> <comment xml:lang="ia">Subtitulos SSA</comment> <comment xml:lang="id">Subjudul SSA</comment> @@ -19724,7 +20349,7 @@ <comment xml:lang="pt">legendas SSA</comment> <comment xml:lang="pt_BR">Legendas SSA</comment> <comment xml:lang="ro">Subtitrări SSA</comment> - <comment xml:lang="ru">субтитры SSA</comment> + <comment xml:lang="ru">Субтитры SSA</comment> <comment xml:lang="sk">Titulky SSA</comment> <comment xml:lang="sl">Datoteka podnapisov SSA</comment> <comment xml:lang="sq">Nëntituj SSA</comment> @@ -19765,7 +20390,7 @@ <comment xml:lang="ga">fotheidil SubViewer</comment> <comment xml:lang="gl">subtítulos SubViewer</comment> <comment xml:lang="he">כתוביות של SubViewer</comment> - <comment xml:lang="hr">SubViewer titlovi</comment> + <comment xml:lang="hr">SubViewer podnaslovi</comment> <comment xml:lang="hu">SubViewer feliratok</comment> <comment xml:lang="ia">Subtitulos SubViewer</comment> <comment xml:lang="id">Subjudul SubViewer</comment> @@ -19783,7 +20408,7 @@ <comment xml:lang="pt">legendas SubViewer</comment> <comment xml:lang="pt_BR">Legendas SubViewer</comment> <comment xml:lang="ro">Subtitrare SubViewer</comment> - <comment xml:lang="ru">субтитры SubViewer</comment> + <comment xml:lang="ru">Субтитры SubViewer</comment> <comment xml:lang="sk">Titulky SubViewer</comment> <comment xml:lang="sl">Datoteka podnapisov SubViewer</comment> <comment xml:lang="sq">Nëntituj SubViewer</comment> @@ -19819,7 +20444,7 @@ <comment xml:lang="ga">ton buailte iMelody</comment> <comment xml:lang="gl">Melodía de iMelody</comment> <comment xml:lang="he">צלצול של iMelody</comment> - <comment xml:lang="hr">iMelody ton zvonjenja</comment> + <comment xml:lang="hr">iMelody melodija zvona</comment> <comment xml:lang="hu">iMelody csengőhang</comment> <comment xml:lang="ia">Tono de appello iMelody</comment> <comment xml:lang="id">nada dering iMelody</comment> @@ -19837,7 +20462,7 @@ <comment xml:lang="pt">toque iMelody</comment> <comment xml:lang="pt_BR">Toque de celular do iMelody</comment> <comment xml:lang="ro">Sonerie iMelody</comment> - <comment xml:lang="ru">мелодия iMelody</comment> + <comment xml:lang="ru">Мелодия iMelody</comment> <comment xml:lang="sk">Vyzváňacie melódie iMelody</comment> <comment xml:lang="sl">Zvonjenje iMelody</comment> <comment xml:lang="sq">Zile iMelody</comment> @@ -19876,7 +20501,7 @@ <comment xml:lang="ga">fuaim SMAF</comment> <comment xml:lang="gl">son SMAF</comment> <comment xml:lang="he">שמע SMAF</comment> - <comment xml:lang="hr">SMAF audio</comment> + <comment xml:lang="hr">SMAF zvučni zapis</comment> <comment xml:lang="hu">SMAF hang</comment> <comment xml:lang="ia">Audio SMAF</comment> <comment xml:lang="id">Audio SMAF</comment> @@ -19894,7 +20519,7 @@ <comment xml:lang="pt">áudio SMAF</comment> <comment xml:lang="pt_BR">Áudio SMAF</comment> <comment xml:lang="ro">Audio SMAF</comment> - <comment xml:lang="ru">аудио SMAF</comment> + <comment xml:lang="ru">Аудио SMAF</comment> <comment xml:lang="sk">Zvuk SMAF</comment> <comment xml:lang="sl">Zvočna datoteka SMAF</comment> <comment xml:lang="sq">Audio SMAF</comment> @@ -19935,7 +20560,7 @@ <comment xml:lang="ga">seinmliosta MRML</comment> <comment xml:lang="gl">lista de reprodución MRML</comment> <comment xml:lang="he">רשימת השמעה MRML</comment> - <comment xml:lang="hr">MRML popis za reprodukciju</comment> + <comment xml:lang="hr">MRML popis izvođenja</comment> <comment xml:lang="hu">MRML-lejátszólista</comment> <comment xml:lang="ia">Lista de selection MRML</comment> <comment xml:lang="id">Senarai putar MRML</comment> @@ -19954,7 +20579,7 @@ <comment xml:lang="pt">lista de reprodução MRML</comment> <comment xml:lang="pt_BR">Lista de reprodução do MRML</comment> <comment xml:lang="ro">Listă redare MRML</comment> - <comment xml:lang="ru">список воспроизведения MRML</comment> + <comment xml:lang="ru">Список воспроизведения MRML</comment> <comment xml:lang="sk">Zoznam skladieb MRML</comment> <comment xml:lang="sl">Seznam predvajanja MRML</comment> <comment xml:lang="sq">Listë titujsh MRML</comment> @@ -19993,7 +20618,7 @@ <comment xml:lang="ga">fuaim XMF</comment> <comment xml:lang="gl">son XMF</comment> <comment xml:lang="he">שמע XMF</comment> - <comment xml:lang="hr">XMF audio</comment> + <comment xml:lang="hr">XMF zvučni zapis</comment> <comment xml:lang="hu">XMF hang</comment> <comment xml:lang="ia">Audio XMF</comment> <comment xml:lang="id">Audio XMF</comment> @@ -20011,7 +20636,7 @@ <comment xml:lang="pt">aúdio XMF</comment> <comment xml:lang="pt_BR">Áudio XMF</comment> <comment xml:lang="ro">Audio XMF</comment> - <comment xml:lang="ru">аудио XMF</comment> + <comment xml:lang="ru">Аудио XMF</comment> <comment xml:lang="sk">Zvuk XMF</comment> <comment xml:lang="sl">Zvočna datoteka XMF</comment> <comment xml:lang="sq">Audio XMF</comment> @@ -20073,7 +20698,7 @@ <comment xml:lang="pt">arquivo SV4 CPIO</comment> <comment xml:lang="pt_BR">Pacote SV4 CPIO</comment> <comment xml:lang="ro">Arhivă SV4 CPIO</comment> - <comment xml:lang="ru">архив SV4 CPIO</comment> + <comment xml:lang="ru">Архив SV4 CPIO</comment> <comment xml:lang="sk">Archív SV4 CPIO</comment> <comment xml:lang="sl">Datoteka arhiva SV4 CPIO</comment> <comment xml:lang="sq">Arkiv SV4 CPIO</comment> @@ -20126,7 +20751,7 @@ <comment xml:lang="pt">arquivo SV4 CPIO (com CRC)</comment> <comment xml:lang="pt_BR">Pacote SV4 CPIO (com CRC)</comment> <comment xml:lang="ro">Arhivă SV4 CPIO (cu CRC)</comment> - <comment xml:lang="ru">архив SV4 CPIP (с CRC)</comment> + <comment xml:lang="ru">Архив SV4 CPIO (с CRC)</comment> <comment xml:lang="sk">Archív SV4 CPIO (s CRC)</comment> <comment xml:lang="sl">Datoteka arhiva SV4 CPIO (z razpršilom CRC)</comment> <comment xml:lang="sq">Arkiv SV4 CPIO (me CRC)</comment> @@ -20135,7 +20760,7 @@ <comment xml:lang="tr">SV4 CPIO arşivi (CRC ile)</comment> <comment xml:lang="uk">архів SV4 CPIO (з CRC)</comment> <comment xml:lang="vi">Kho nén CPIO SV4 (với CRC)</comment> - <comment xml:lang="zh_CN">SV4 CPIP 归档文件(带有 CRC)</comment> + <comment xml:lang="zh_CN">SV4 CPIP 归档文件（带 CRC）</comment> <comment xml:lang="zh_TW">SV4 CPIO 封存檔 (具有 CRC)</comment> <generic-icon name="package-x-generic"/> <glob pattern="*.sv4crc"/> @@ -20180,7 +20805,7 @@ <comment xml:lang="pt">arquivo Tar</comment> <comment xml:lang="pt_BR">Pacote Tar</comment> <comment xml:lang="ro">Arhivă Tar</comment> - <comment xml:lang="ru">архив TAR</comment> + <comment xml:lang="ru">Архив TAR</comment> <comment xml:lang="sk">Archív tar</comment> <comment xml:lang="sl">Datoteka arhiva Tar</comment> <comment xml:lang="sq">Arkiv tar</comment> @@ -20220,7 +20845,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite)</comment> <comment xml:lang="gl">arquivo Tar (comprimido)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana)</comment> + <comment xml:lang="hr">Tar arhiva (sažeta)</comment> <comment xml:lang="hu">Tar archívum (tömörített)</comment> <comment xml:lang="ia">Archivo Tar (comprimite)</comment> <comment xml:lang="id">Arsip Tar (terkompresi)</comment> @@ -20238,7 +20863,7 @@ <comment xml:lang="pt">arquivo Tar (comprimido)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată)</comment> - <comment xml:lang="ru">архив TAR (сжатый)</comment> + <comment xml:lang="ru">Архив TAR (сжатый)</comment> <comment xml:lang="sk">Archív tar (komprimovaný)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar)</comment> @@ -20247,7 +20872,7 @@ <comment xml:lang="tr">Tar arşivi (sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений)</comment> <comment xml:lang="vi">Kho nén tar (đã nén)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (UNIX 格式壓縮)</comment> <sub-class-of type="application/x-compress"/> <generic-icon name="package-x-generic"/> @@ -20259,8 +20884,8 @@ <comment xml:lang="ar">ملف الخط العام</comment> <comment xml:lang="be@latin">zvyčajny fajł šryftu</comment> <comment xml:lang="bg">Шрифт</comment> - <comment xml:lang="ca">fitxer genèric de tipus de lletra</comment> - <comment xml:lang="cs">obecný soubor písma</comment> + <comment xml:lang="ca">fitxer de lletra genèrica</comment> + <comment xml:lang="cs">obecný soubor s fontem</comment> <comment xml:lang="da">general skrifttypefil</comment> <comment xml:lang="de">Allgemeine Schriftdatei</comment> <comment xml:lang="el">Γενικό αρχείο γραμματοσειράς</comment> @@ -20274,7 +20899,7 @@ <comment xml:lang="ga">comhad cló ginearálta</comment> <comment xml:lang="gl">ficheiro de tipo de fonte xenérica</comment> <comment xml:lang="he">קובץ גופן גנרי</comment> - <comment xml:lang="hr">općenita datoteka fonta</comment> + <comment xml:lang="hr">Izvorna datoteka slova</comment> <comment xml:lang="hu">általános betűkészletfájl</comment> <comment xml:lang="ia">File de typo de litteras generic</comment> <comment xml:lang="id">berkas fonta generik</comment> @@ -20293,7 +20918,7 @@ <comment xml:lang="pt">ficheiro genérico de letra</comment> <comment xml:lang="pt_BR">Arquivo de fonte genérico</comment> <comment xml:lang="ro">fișier de font generic</comment> - <comment xml:lang="ru">обычный файл шрифта</comment> + <comment xml:lang="ru">Обычный файл шрифта</comment> <comment xml:lang="sk">Obyčajný súbor písma</comment> <comment xml:lang="sl">izvorna datoteka pisave</comment> <comment xml:lang="sq">File lloj gërme i përgjithshëm</comment> @@ -20312,8 +20937,8 @@ <comment xml:lang="ar">ملف الخط المرزم</comment> <comment xml:lang="be@latin">zapakavany fajł šryftu</comment> <comment xml:lang="bg">Шрифт — компресиран</comment> - <comment xml:lang="ca">fitxer empaquetat de tipus de lletra</comment> - <comment xml:lang="cs">komprimovaný soubor písma</comment> + <comment xml:lang="ca">fitxer de lletra empaquetada</comment> + <comment xml:lang="cs">komprimovaný soubor s fontem</comment> <comment xml:lang="da">pakket skrifttypefil</comment> <comment xml:lang="de">Gepackte Schriftdatei</comment> <comment xml:lang="el">Αρχείο συμπιεσμένης γραμματοσειράς</comment> @@ -20327,7 +20952,7 @@ <comment xml:lang="ga">comhad cló pacáilte</comment> <comment xml:lang="gl">ficheiro de fonte empaquetada</comment> <comment xml:lang="he">קובץ גופן ארוז</comment> - <comment xml:lang="hr">pakirana datoteka fonta</comment> + <comment xml:lang="hr">Zapakirana datoteka slova</comment> <comment xml:lang="hu">packed font-fájl</comment> <comment xml:lang="ia">File de typos de litteras impacchettate</comment> <comment xml:lang="id">berkas fonta terkemas</comment> @@ -20346,7 +20971,7 @@ <comment xml:lang="pt">ficheiro de letras empacotadas</comment> <comment xml:lang="pt_BR">Arquivo de fonte empacotado</comment> <comment xml:lang="ro">fișier font împachetat</comment> - <comment xml:lang="ru">сжатый файл шрифта</comment> + <comment xml:lang="ru">Сжатый файл шрифта</comment> <comment xml:lang="sk">Komprimovaný súbor písma</comment> <comment xml:lang="sl">pakirana datoteka pisave</comment> <comment xml:lang="sq">File lloj gërmash i kondensuar</comment> @@ -20363,6 +20988,7 @@ <mime-type type="application/x-tgif"> <comment>TGIF document</comment> <comment xml:lang="ar">مستند TGIF</comment> + <comment xml:lang="ast">Documentu de TGIF</comment> <comment xml:lang="be@latin">Dakument TGIF</comment> <comment xml:lang="bg">Документ — TGIF</comment> <comment xml:lang="ca">document TGIF</comment> @@ -20399,7 +21025,7 @@ <comment xml:lang="pt">documento TGIF</comment> <comment xml:lang="pt_BR">Documento TGIF</comment> <comment xml:lang="ro">Document TGIF</comment> - <comment xml:lang="ru">документ TGIF</comment> + <comment xml:lang="ru">Документ TGIF</comment> <comment xml:lang="sk">Dokument TGIF</comment> <comment xml:lang="sl">Dokument TGIF</comment> <comment xml:lang="sq">Dokument TGIF</comment> @@ -20438,7 +21064,7 @@ <comment xml:lang="ga">téama</comment> <comment xml:lang="gl">tema</comment> <comment xml:lang="he">ערכת נושא</comment> - <comment xml:lang="hr">tema</comment> + <comment xml:lang="hr">Tema</comment> <comment xml:lang="hu">téma</comment> <comment xml:lang="ia">Thema</comment> <comment xml:lang="id">tema</comment> @@ -20458,7 +21084,7 @@ <comment xml:lang="pt">tema</comment> <comment xml:lang="pt_BR">Tema</comment> <comment xml:lang="ro">temă</comment> - <comment xml:lang="ru">тема</comment> + <comment xml:lang="ru">Тема</comment> <comment xml:lang="sk">Motív</comment> <comment xml:lang="sl">tema</comment> <comment xml:lang="sq">Temë</comment> @@ -20476,6 +21102,7 @@ <mime-type type="application/x-toutdoux"> <comment>ToutDoux document</comment> <comment xml:lang="ar">مستند ToutDoux</comment> + <comment xml:lang="ast">Documentu de ToutDoux</comment> <comment xml:lang="az">ToutDoux sənədi</comment> <comment xml:lang="be@latin">Dakument ToutDoux</comment> <comment xml:lang="bg">Документ — ToutDoux</comment> @@ -20514,7 +21141,7 @@ <comment xml:lang="pt">documento ToutDoux</comment> <comment xml:lang="pt_BR">Documento do ToutDoux</comment> <comment xml:lang="ro">Document ToutDoux</comment> - <comment xml:lang="ru">документ ToutDoux</comment> + <comment xml:lang="ru">Документ ToutDoux</comment> <comment xml:lang="sk">Dokument ToutDoux</comment> <comment xml:lang="sl">Dokument ToutDoux</comment> <comment xml:lang="sq">Dokument ToutDoux</comment> @@ -20566,7 +21193,7 @@ <comment xml:lang="pt">cópia de segurança</comment> <comment xml:lang="pt_BR">Arquivo de backup</comment> <comment xml:lang="ro">fișier de backup</comment> - <comment xml:lang="ru">резервная копия</comment> + <comment xml:lang="ru">Резервная копия</comment> <comment xml:lang="sk">Záložný súbor</comment> <comment xml:lang="sl">varnostna kopija datoteke</comment> <comment xml:lang="sq">File backup</comment> @@ -20586,6 +21213,7 @@ <mime-type type="text/troff"> <comment>Troff document</comment> <comment xml:lang="ar">مستند Troff</comment> + <comment xml:lang="ast">Documentu de Troff</comment> <comment xml:lang="az">Troff sənədi</comment> <comment xml:lang="be@latin">Dakument Troff</comment> <comment xml:lang="bg">Документ — Troff</comment> @@ -20624,7 +21252,7 @@ <comment xml:lang="pt">documento Troff</comment> <comment xml:lang="pt_BR">Documento Troff</comment> <comment xml:lang="ro">Document Troff</comment> - <comment xml:lang="ru">документ Troff</comment> + <comment xml:lang="ru">Документ Troff</comment> <comment xml:lang="sk">Dokument troff</comment> <comment xml:lang="sl">Dokument Troff</comment> <comment xml:lang="sq">Dokument Troff</comment> @@ -20657,7 +21285,9 @@ <comment xml:lang="el">Έγγραφο βοήθειας manpage</comment> <comment xml:lang="en_GB">Manpage manual document</comment> <comment xml:lang="es">documento de manual de Manpage</comment> + <comment xml:lang="eu">Manpage eskuliburu dokumentua</comment> <comment xml:lang="fr">document manuel Manpage</comment> + <comment xml:lang="ga">cáipéis lámhleabhair Man</comment> <comment xml:lang="he">מסמך תיעוד man</comment> <comment xml:lang="hr">Manpage dokument priručnika</comment> <comment xml:lang="hu">Manpage kézikönyv-dokumentum</comment> @@ -20670,7 +21300,7 @@ <comment xml:lang="pl">Dokument podręcznika stron pomocy</comment> <comment xml:lang="pt">documento de ajuda Manpage</comment> <comment xml:lang="pt_BR">Documento Manpage</comment> - <comment xml:lang="ru">документ справочной системы Manpage</comment> + <comment xml:lang="ru">Документ справочной системы Manpage</comment> <comment xml:lang="sk">Dokument manuálu Manpage</comment> <comment xml:lang="sr">документ упутства странице упутства</comment> <comment xml:lang="sv">Manpage-manualdokument</comment> @@ -20704,7 +21334,7 @@ <comment xml:lang="ga">leathanach lámhleabhair (comhbhrúite)</comment> <comment xml:lang="gl">páxina de manual (comprimida)</comment> <comment xml:lang="he">דף עזר (מכווץ)</comment> - <comment xml:lang="hr">stranica priručnika (komprimirana)</comment> + <comment xml:lang="hr">Stranica priručnika (sažeta)</comment> <comment xml:lang="hu">kézikönyvoldal (tömörített)</comment> <comment xml:lang="ia">Pagina de manual (comprimite)</comment> <comment xml:lang="id">halaman manual (terkompresi)</comment> @@ -20723,7 +21353,7 @@ <comment xml:lang="pt">página de manual (comprimida)</comment> <comment xml:lang="pt_BR">Página de manual (compactada)</comment> <comment xml:lang="ro">pagină de manual (comprimată)</comment> - <comment xml:lang="ru">страница руководства (сжатая)</comment> + <comment xml:lang="ru">Страница руководства (сжатая)</comment> <comment xml:lang="sk">Manuálová stránka (komprimovaná)</comment> <comment xml:lang="sl">stran priročnika (stisnjena)</comment> <comment xml:lang="sq">Faqe manuali (e kompresuar)</comment> @@ -20732,7 +21362,7 @@ <comment xml:lang="tr">kılavuz dosyası (sıkıştırılmış)</comment> <comment xml:lang="uk">сторінка посібника (стиснена)</comment> <comment xml:lang="vi">trang hướng dẫn (đã nén)</comment> - <comment xml:lang="zh_CN">手册页 (压缩)</comment> + <comment xml:lang="zh_CN">手册页（压缩）</comment> <comment xml:lang="zh_TW">手冊頁面 (壓縮版)</comment> <generic-icon name="text-x-generic"/> </mime-type> @@ -20755,7 +21385,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le LZO)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con LZO)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י LZO)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana LZO-om)</comment> + <comment xml:lang="hr">Tar arhiva (LZO sažeta)</comment> <comment xml:lang="hu">Tar archívum (LZO-val tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con LZO)</comment> <comment xml:lang="id">Arsip Tar (terkompresi LZO)</comment> @@ -20773,7 +21403,7 @@ <comment xml:lang="pt">arquivo Tar (compressão LZO)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com LZO)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată LZO)</comment> - <comment xml:lang="ru">архив TAR (сжатый LZO)</comment> + <comment xml:lang="ru">Архив TAR (сжатый lzo)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou LZO)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z LZO)</comment> <comment xml:lang="sq">Arkiv tar (i kompresuar me LZO)</comment> @@ -20782,7 +21412,7 @@ <comment xml:lang="tr">Tar arşivi (LZO ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений LZO)</comment> <comment xml:lang="vi">Kho nén tar (đã nén LZO)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(LZO 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（LZO 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (LZO 格式壓縮)</comment> <sub-class-of type="application/x-lzop"/> <generic-icon name="package-x-generic"/> @@ -20824,7 +21454,7 @@ <comment xml:lang="pt">arquivo XZ</comment> <comment xml:lang="pt_BR">Pacote XZ</comment> <comment xml:lang="ro">Arhivă XZ</comment> - <comment xml:lang="ru">архив XZ</comment> + <comment xml:lang="ru">Архив XZ</comment> <comment xml:lang="sk">Archív XZ</comment> <comment xml:lang="sl">Datoteka arhiva XZ</comment> <comment xml:lang="sr">ИксЗ архива</comment> @@ -20857,7 +21487,7 @@ <comment xml:lang="ga">cartlann Tar (comhbhrúite le XZ)</comment> <comment xml:lang="gl">arquivo Tar (comprimido con XZ)</comment> <comment xml:lang="he">ארכיון Tar (מכווץ ע״י XZ)</comment> - <comment xml:lang="hr">Tar arhiva (komprimirana XZ-om)</comment> + <comment xml:lang="hr">Tar arhiva ( XZ sažeta)</comment> <comment xml:lang="hu">Tar archívum (XZ-vel tömörítve)</comment> <comment xml:lang="ia">Archivo Tar (comprimite con XZ)</comment> <comment xml:lang="id">Arsip Tar (terkompresi XZ)</comment> @@ -20873,14 +21503,14 @@ <comment xml:lang="pt">arquivo Tar (compressão XZ)</comment> <comment xml:lang="pt_BR">Pacote Tar (compactado com XZ)</comment> <comment xml:lang="ro">Arhivă Tar (comprimată XZ)</comment> - <comment xml:lang="ru">архив TAR (сжатый XZ)</comment> + <comment xml:lang="ru">Архив TAR (сжатый xz)</comment> <comment xml:lang="sk">Archív tar (komprimovaný pomocou XZ)</comment> <comment xml:lang="sl">Datoteka arhiva Tar (stisnjen z XZ)</comment> <comment xml:lang="sr">Тар архива (запакована ИксЗ-ом)</comment> <comment xml:lang="sv">Tar-arkiv (XZ-komprimerat)</comment> <comment xml:lang="tr">Tar arşivi (XZ ile sıkıştırılmış)</comment> <comment xml:lang="uk">архів tar (стиснений XZ)</comment> - <comment xml:lang="zh_CN">Tar 归档文件(XZ 压缩)</comment> + <comment xml:lang="zh_CN">Tar 归档文件（XZ 压缩）</comment> <comment xml:lang="zh_TW">Tar 封存檔 (XZ 格式壓縮)</comment> <sub-class-of type="application/x-xz"/> <generic-icon name="package-x-generic"/> @@ -20889,6 +21519,7 @@ </mime-type> <mime-type type="application/x-xzpdf"> <comment>PDF document (XZ-compressed)</comment> + <comment xml:lang="ast">Documentu PDF (comprimíu en XZ)</comment> <comment xml:lang="bg">Документ — PDF, компресиран с XZ</comment> <comment xml:lang="ca">document PDF (amb compressió XZ)</comment> <comment xml:lang="cs">dokument PDF (komprimovaný pomocí XZ)</comment> @@ -20900,9 +21531,10 @@ <comment xml:lang="eu">PDF dokumentua (XZ-rekin konprimitua)</comment> <comment xml:lang="fi">PDF-asiakirja (XZ-pakattu)</comment> <comment xml:lang="fr">document PDF (compressé XZ)</comment> + <comment xml:lang="ga">cáipéis PDF (comhbhrúite le XZ)</comment> <comment xml:lang="gl">documento PDF (comprimido en XZ)</comment> <comment xml:lang="he">מסמך PDF (מכווץ ע״י XZ)</comment> - <comment xml:lang="hr">PDF dokument (komprimiran XZ-om)</comment> + <comment xml:lang="hr">PDF dokument ( XZ sažet)</comment> <comment xml:lang="hu">PDF dokumentum (XZ-vel tömörített)</comment> <comment xml:lang="ia">Documento PDF (comprimite con XZ)</comment> <comment xml:lang="id">Dokumen PDF (terkompresi XZ)</comment> @@ -20917,14 +21549,14 @@ <comment xml:lang="pl">Dokument PDF (kompresja XZ)</comment> <comment xml:lang="pt">documento PDF (compressão XZ)</comment> <comment xml:lang="pt_BR">Documento PDF (compactado com XZ)</comment> - <comment xml:lang="ru">документ PDF (сжатый XZ)</comment> + <comment xml:lang="ru">Документ PDF (сжатый xz)</comment> <comment xml:lang="sk">Dokument PDF (komprimovaný pomocou XZ)</comment> <comment xml:lang="sl">Dokument PDF (XZ-stisnjen)</comment> <comment xml:lang="sr">ПДФ документ (запакован ИксЗ-ом)</comment> <comment xml:lang="sv">PDF-dokument (XZ-komprimerat)</comment> <comment xml:lang="tr">PDF belgesi (XZ ile sıkıştırılmış)</comment> <comment xml:lang="uk">документ PDF (стиснений xz)</comment> - <comment xml:lang="zh_CN">PDF 文档(XZ)</comment> + <comment xml:lang="zh_CN">PDF 文档（XZ）</comment> <comment xml:lang="zh_TW">PDF 文件 (XZ 格式壓縮)</comment> <sub-class-of type="application/x-xz"/> <generic-icon name="x-office-document"/> @@ -20968,7 +21600,7 @@ <comment xml:lang="pt">arquivo Ustar</comment> <comment xml:lang="pt_BR">Pacote Ustar</comment> <comment xml:lang="ro">Arhivă Ustar</comment> - <comment xml:lang="ru">архив Ustar</comment> + <comment xml:lang="ru">Архив Ustar</comment> <comment xml:lang="sk">Archív ustar</comment> <comment xml:lang="sl">Datoteka arhiva Ustar</comment> <comment xml:lang="sq">Arkiv Ustar</comment> @@ -21004,7 +21636,7 @@ <comment xml:lang="ga">cód foinseach WAIS</comment> <comment xml:lang="gl">código fonte WAIS</comment> <comment xml:lang="he">קוד מקור של WAIS</comment> - <comment xml:lang="hr">WAIS izvorni kod</comment> + <comment xml:lang="hr">WAIS izvorni kôd</comment> <comment xml:lang="hu">WAIS-forráskód</comment> <comment xml:lang="ia">Codice-fonte WAIS</comment> <comment xml:lang="id">Kode program WAIS</comment> @@ -21023,7 +21655,7 @@ <comment xml:lang="pt">código origem WAIS</comment> <comment xml:lang="pt_BR">Código-fonte WAIS</comment> <comment xml:lang="ro">Cod sursă WAIS</comment> - <comment xml:lang="ru">исходный код WAIS</comment> + <comment xml:lang="ru">Исходный код WAIS</comment> <comment xml:lang="sk">Zdrojový kód WAIS</comment> <comment xml:lang="sl">Datoteka izvorne kode WAIS</comment> <comment xml:lang="sq">Kod burues WAIS</comment> @@ -21077,7 +21709,7 @@ <comment xml:lang="pt">imagem do WordPerfect/Drawperfect</comment> <comment xml:lang="pt_BR">Imagem do WordPerfect/Drawperfect</comment> <comment xml:lang="ro">Imagine WordPerfect/Drawperfect</comment> - <comment xml:lang="ru">изображение WordPerfect/Drawperfect</comment> + <comment xml:lang="ru">Изображение WordPerfect/Drawperfect</comment> <comment xml:lang="sk">Obrázok WordPerfect/Drawperfect</comment> <comment xml:lang="sl">Slikovna datoteka Drawperfect</comment> <comment xml:lang="sq">Figurë WordPerfect/Drawperfect</comment> @@ -21091,6 +21723,54 @@ <generic-icon name="image-x-generic"/> <glob pattern="*.wpg"/> </mime-type> + <mime-type type="application/x-wonderswan-rom"> + <comment>Bandai WonderSwan ROM</comment> + <comment xml:lang="ca">ROM de Bandai WonderSwan</comment> + <comment xml:lang="cs">ROM pro Bandai WonderSwan</comment> + <comment xml:lang="de">Bandai WonderSwan ROM</comment> + <comment xml:lang="en_GB">Bandai WonderSwan ROM</comment> + <comment xml:lang="es">ROM de Bandai WonderSwan</comment> + <comment xml:lang="hr">Bandai WonderSwan ROM</comment> + <comment xml:lang="hu">Bandai WonderSwan ROM</comment> + <comment xml:lang="id">ROM Bandai WonderSwan</comment> + <comment xml:lang="it">ROM Bandai WonderSwan</comment> + <comment xml:lang="kk">Bandai WonderSwan ROM</comment> + <comment xml:lang="ko">반다이 원더스완 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Bandai WonderSwan</comment> + <comment xml:lang="pt_BR">ROM de WonderSwan da Bandai</comment> + <comment xml:lang="ru">Bandai WonderSwan ROM</comment> + <comment xml:lang="sk">ROM pre Bandai WonderSwan</comment> + <comment xml:lang="sv">Bandai WonderSwan-rom</comment> + <comment xml:lang="uk">ROM Bandai WonderSwan</comment> + <comment xml:lang="zh_CN">万代 WonderSwan ROM</comment> + <comment xml:lang="zh_TW">Bandai WonderSwan ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.ws"/> + </mime-type> + <mime-type type="application/x-wonderswan-color-rom"> + <comment>Bandai WonderSwan Color ROM</comment> + <comment xml:lang="ca">ROM de Bandai WonderSwan Color</comment> + <comment xml:lang="cs">ROM pro Bandai WonderSwan Color</comment> + <comment xml:lang="de">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="en_GB">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="es">ROM de Bandai WonderSwan Color</comment> + <comment xml:lang="hr">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="hu">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="id">ROM Bandai WonderSwan Color</comment> + <comment xml:lang="it">ROM Bandai WonderSwan Color</comment> + <comment xml:lang="kk">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="ko">반다이 원더스완 컬러 롬</comment> + <comment xml:lang="pl">Plik ROM konsoli Bandai WonderSwan Color</comment> + <comment xml:lang="pt_BR">ROM de WonderSwan Color da Bandai</comment> + <comment xml:lang="ru">Bandai WonderSwan Color ROM</comment> + <comment xml:lang="sk">ROM pre Bandai WonderSwan Color</comment> + <comment xml:lang="sv">Bandai WonderSwan Color-rom</comment> + <comment xml:lang="uk">ROM Bandai WonderSwan Color</comment> + <comment xml:lang="zh_CN">万代 WonderSwan Color ROM</comment> + <comment xml:lang="zh_TW">Bandai WonderSwan Color ROM</comment> + <generic-icon name="application-x-executable"/> + <glob pattern="*.wsc"/> + </mime-type> <mime-type type="application/x-x509-ca-cert"> <comment>DER/PEM/Netscape-encoded X.509 certificate</comment> <comment xml:lang="ar">شهادة DER/PEM/Netscape-encoded X.509</comment> @@ -21111,7 +21791,7 @@ <comment xml:lang="ga">teastas X.509 ionchódaithe le DER/PEM/Netscape</comment> <comment xml:lang="gl">certificado X.509 codificado con DER/PEM/Netscape</comment> <comment xml:lang="he">אישור מסוג X.509 של DER/PEM/Netscape-encoded</comment> - <comment xml:lang="hr">DER/PEM/Netscape-kodiran X.509 certifikat</comment> + <comment xml:lang="hr">DER/PEM/Netscape-kodiran X.509 vjerodajnica</comment> <comment xml:lang="hu">DER/PEM/Netscape formátumú X.509-tanúsítvány</comment> <comment xml:lang="ia">Certificato X.509 codificate in DER/PEM/Netscape</comment> <comment xml:lang="id">Sertifikat DER/PEM/Netscape-tersandi X.509</comment> @@ -21131,7 +21811,7 @@ <comment xml:lang="pt">certificado X.509 codificado com DER/PEM/Netscape</comment> <comment xml:lang="pt_BR">Certificado X.509 codificado com DER/PEM/Netscape</comment> <comment xml:lang="ro">Certificat DER/PEM/Netscape-codat X.509</comment> - <comment xml:lang="ru">сертификат X.509 (DER/PEM/Netscape-закодированный)</comment> + <comment xml:lang="ru">Сертификат X.509 (DER/PEM/Netscape-закодированный)</comment> <comment xml:lang="sk">Certifikát X.509 kódovaný ako DER/PEM/Netscape</comment> <comment xml:lang="sl">Datoteka potrdila DER/PEM/Netscape X.509</comment> <comment xml:lang="sq">Çertifikatë DER/PEM/Netscape-encoded X.509</comment> @@ -21151,6 +21831,7 @@ <mime-type type="application/x-zerosize"> <comment>empty document</comment> <comment xml:lang="ar">مستند فارغ</comment> + <comment xml:lang="ast">documentu baleru</comment> <comment xml:lang="be@latin">pusty dakument</comment> <comment xml:lang="bg">Празен документ</comment> <comment xml:lang="ca">document buit</comment> @@ -21168,7 +21849,7 @@ <comment xml:lang="ga">cáipéis fholamh</comment> <comment xml:lang="gl">documeto baleiro</comment> <comment xml:lang="he">מסמך ריק</comment> - <comment xml:lang="hr">prazan dokument</comment> + <comment xml:lang="hr">Prazan dokument</comment> <comment xml:lang="hu">üres dokumentum</comment> <comment xml:lang="ia">Documento vacue</comment> <comment xml:lang="id">dokumen kosong</comment> @@ -21187,7 +21868,7 @@ <comment xml:lang="pt">documento vazio</comment> <comment xml:lang="pt_BR">Documento vazio</comment> <comment xml:lang="ro">document gol</comment> - <comment xml:lang="ru">пустой документ</comment> + <comment xml:lang="ru">Пустой документ</comment> <comment xml:lang="sk">Prázdny dokument</comment> <comment xml:lang="sl">prazen dokument</comment> <comment xml:lang="sq">Dokument bosh</comment> @@ -21239,7 +21920,7 @@ <comment xml:lang="pt">arquivo Zoo</comment> <comment xml:lang="pt_BR">Pacote Zoo</comment> <comment xml:lang="ro">Arhivă Zoo</comment> - <comment xml:lang="ru">архив ZOO</comment> + <comment xml:lang="ru">Архив ZOO</comment> <comment xml:lang="sk">Archív zoo</comment> <comment xml:lang="sl">Datoteka arhiva ZOO</comment> <comment xml:lang="sq">Arkiv zoo</comment> @@ -21295,7 +21976,7 @@ <comment xml:lang="pt">página XHTML</comment> <comment xml:lang="pt_BR">Página XHTML</comment> <comment xml:lang="ro">Pagină XHTML</comment> - <comment xml:lang="ru">страница XHTML</comment> + <comment xml:lang="ru">Страница XHTML</comment> <comment xml:lang="sk">Stránka XHTML</comment> <comment xml:lang="sl">Datoteka spletne strani XHTML</comment> <comment xml:lang="sq">Faqe XHTML</comment> @@ -21360,7 +22041,7 @@ <comment xml:lang="pt">arquivo Zip</comment> <comment xml:lang="pt_BR">Pacote Zip</comment> <comment xml:lang="ro">Arhivă zip</comment> - <comment xml:lang="ru">архив ZIP</comment> + <comment xml:lang="ru">Архив ZIP</comment> <comment xml:lang="sk">Archív ZIP</comment> <comment xml:lang="sl">Datoteka arhiva ZIP</comment> <comment xml:lang="sq">Arkiv zip</comment> @@ -21391,6 +22072,7 @@ <comment xml:lang="eu">WIM disko irudia</comment> <comment xml:lang="fi">WIM-levytiedosto</comment> <comment xml:lang="fr">image disque WIM</comment> + <comment xml:lang="ga">íomhá diosca WIM</comment> <comment xml:lang="he">דמות דיסק WIM</comment> <comment xml:lang="hr">WIM slika diska</comment> <comment xml:lang="hu">WIM lemezkép</comment> @@ -21403,13 +22085,13 @@ <comment xml:lang="pl">Obraz dysku WIM</comment> <comment xml:lang="pt">imagem de disco WIM</comment> <comment xml:lang="pt_BR">Imagem de disco WIM</comment> - <comment xml:lang="ru">образ диска WIM</comment> + <comment xml:lang="ru">Образ диска WIM</comment> <comment xml:lang="sk">Obraz disku WIM</comment> <comment xml:lang="sr">слика диска ВИМ-а</comment> <comment xml:lang="sv">WIM-diskavbild</comment> <comment xml:lang="tr">WIM disk kalıbı</comment> <comment xml:lang="uk">образ диска WIM</comment> - <comment xml:lang="zh_CN">WIM 磁盘镜像</comment> + <comment xml:lang="zh_CN">WIM 磁盘映像</comment> <comment xml:lang="zh_TW">WIM 磁碟映像檔</comment> <acronym>WIM</acronym> <expanded-acronym>Windows Imaging Format</expanded-acronym> @@ -21441,7 +22123,7 @@ <comment xml:lang="ga">fuaim Dolby Digital</comment> <comment xml:lang="gl">son Dolby Digital</comment> <comment xml:lang="he">שמע Dolby Digital</comment> - <comment xml:lang="hr">Dolby Digital audio</comment> + <comment xml:lang="hr">Dolby Digital zvučni zapis</comment> <comment xml:lang="hu">Dolby Digital hang</comment> <comment xml:lang="ia">Audio Dolby Digital</comment> <comment xml:lang="id">Audio Dolby Digital</comment> @@ -21461,7 +22143,7 @@ <comment xml:lang="pt">áudio Dolby Digital</comment> <comment xml:lang="pt_BR">Áudio Dolby Digital</comment> <comment xml:lang="ro">Audio Dolby Digital</comment> - <comment xml:lang="ru">аудио Dolby Digital</comment> + <comment xml:lang="ru">Аудио Dolby Digital</comment> <comment xml:lang="sk">Zvuk Dolby Digital</comment> <comment xml:lang="sl">Zvočna datoteka Dolby Digital</comment> <comment xml:lang="sq">Audio Dolby Digital</comment> @@ -21489,6 +22171,7 @@ <comment xml:lang="eu">DTS audioa</comment> <comment xml:lang="fi">DTS-ääni</comment> <comment xml:lang="fr">audio DTS</comment> + <comment xml:lang="ga">fuaim DTS</comment> <comment xml:lang="gl">Son DTS</comment> <comment xml:lang="he">שמע DTS</comment> <comment xml:lang="hr">DTS zvučni zapis</comment> @@ -21501,10 +22184,10 @@ <comment xml:lang="ko">DTS 오디오</comment> <comment xml:lang="lv">DTS audio</comment> <comment xml:lang="oc">àudio DTS</comment> - <comment xml:lang="pl">Dźwięk DTS</comment> + <comment xml:lang="pl">Plik dźwiękowy DTS</comment> <comment xml:lang="pt">aúdio DTS</comment> <comment xml:lang="pt_BR">Áudio DTS</comment> - <comment xml:lang="ru">аудио DTS</comment> + <comment xml:lang="ru">Аудио DTS</comment> <comment xml:lang="sk">Zvuk DTS</comment> <comment xml:lang="sl">Zvok DTS</comment> <comment xml:lang="sr">ДТС звук</comment> @@ -21534,6 +22217,7 @@ <comment xml:lang="eu">DTSHD audioa</comment> <comment xml:lang="fi">DTS-HD-ääni</comment> <comment xml:lang="fr">audio DTSHD</comment> + <comment xml:lang="ga">fuaim DTSHD</comment> <comment xml:lang="gl">Son DTSHD</comment> <comment xml:lang="he">שמע DTSHD</comment> <comment xml:lang="hr">DTSHD zvučni zapis</comment> @@ -21546,10 +22230,10 @@ <comment xml:lang="ko">DTSHD 오디오</comment> <comment xml:lang="lv">DTSHD audio</comment> <comment xml:lang="oc">àudio DTSHD</comment> - <comment xml:lang="pl">Dźwięk DTSHD</comment> + <comment xml:lang="pl">Plik dźwiękowy DTSHD</comment> <comment xml:lang="pt">áudio DTSHD</comment> <comment xml:lang="pt_BR">Áudio DTSHD</comment> - <comment xml:lang="ru">аудио DTSHD</comment> + <comment xml:lang="ru">Аудио DTSHD</comment> <comment xml:lang="sk">Zvuk DTSHD</comment> <comment xml:lang="sl">Zvok DTSHD</comment> <comment xml:lang="sr">ДТСХД звук</comment> @@ -21585,7 +22269,7 @@ <comment xml:lang="ga">fuaim AMR</comment> <comment xml:lang="gl">son AMR</comment> <comment xml:lang="he">שמע AMR</comment> - <comment xml:lang="hr">AMR audio</comment> + <comment xml:lang="hr">AMR zvučni zapis</comment> <comment xml:lang="hu">AMR hang</comment> <comment xml:lang="ia">Audio AMR</comment> <comment xml:lang="id">Audio AMR</comment> @@ -21604,7 +22288,7 @@ <comment xml:lang="pt">áudio AMR</comment> <comment xml:lang="pt_BR">Áudio AMR</comment> <comment xml:lang="ro">Audio AMR</comment> - <comment xml:lang="ru">аудио AMR</comment> + <comment xml:lang="ru">Аудио AMR</comment> <comment xml:lang="sk">Zvuk AMR</comment> <comment xml:lang="sl">Zvočna datoteka AMR</comment> <comment xml:lang="sq">Audio AMR</comment> @@ -21644,7 +22328,7 @@ <comment xml:lang="ga">fuaim AMR-WB</comment> <comment xml:lang="gl">son AMR-WB</comment> <comment xml:lang="he">שמע AMR-WN</comment> - <comment xml:lang="hr">AMR-WB audio</comment> + <comment xml:lang="hr">AMR-WB zvučni zapis</comment> <comment xml:lang="hu">AMR-WB hang</comment> <comment xml:lang="ia">Audio AMR-WB</comment> <comment xml:lang="id">Audio AMR-WB</comment> @@ -21663,7 +22347,7 @@ <comment xml:lang="pt">áudio AMR-WB</comment> <comment xml:lang="pt_BR">Áudio AMR-WB</comment> <comment xml:lang="ro">Audio AMR-WB</comment> - <comment xml:lang="ru">аудио AMR-WB</comment> + <comment xml:lang="ru">Аудио AMR-WB</comment> <comment xml:lang="sk">Zvuk AMR-WB</comment> <comment xml:lang="sl">Zvočna datoteka AMR-WB</comment> <comment xml:lang="sq">Audio AMR-WB</comment> @@ -21724,7 +22408,7 @@ <comment xml:lang="pt">áudio ULAW (Sun)</comment> <comment xml:lang="pt_BR">Áudio ULAW (Sun)</comment> <comment xml:lang="ro">Fișier audio ULAW (Sun)</comment> - <comment xml:lang="ru">аудио ULAW (Sun)</comment> + <comment xml:lang="ru">Аудио ULAW (Sun)</comment> <comment xml:lang="sk">Zvuk ULAW (Sun)</comment> <comment xml:lang="sl">Zvočna datoteka ULAW (Sun)</comment> <comment xml:lang="sq">Audio ULAW (Sun)</comment> @@ -21761,7 +22445,7 @@ <comment xml:lang="ga">fuaim Commodore 64</comment> <comment xml:lang="gl">son de Commodore 64</comment> <comment xml:lang="he">שמע של Commodore 64</comment> - <comment xml:lang="hr">Commodore 64 audio</comment> + <comment xml:lang="hr">Commodore 64 zvučni zapis</comment> <comment xml:lang="hu">Commodore 64 hang</comment> <comment xml:lang="ia">Audio Commodore 64</comment> <comment xml:lang="id">Audio Commodore 64</comment> @@ -21781,7 +22465,7 @@ <comment xml:lang="pt">áudio Commodore 64</comment> <comment xml:lang="pt_BR">Áudio Commodore 64</comment> <comment xml:lang="ro">Audio Commodore 64</comment> - <comment xml:lang="ru">аудио Commodore 64</comment> + <comment xml:lang="ru">Аудио Commodore 64</comment> <comment xml:lang="sk">Zvuk Commodore 64</comment> <comment xml:lang="sl">Zvočna datoteka Commodore 64</comment> <comment xml:lang="sq">Audio Commodore 64</comment> @@ -21839,7 +22523,7 @@ <comment xml:lang="pt">áudio PCM</comment> <comment xml:lang="pt_BR">Áudio PCM</comment> <comment xml:lang="ro">Audio PCM</comment> - <comment xml:lang="ru">аудио PCM</comment> + <comment xml:lang="ru">Аудио PCM</comment> <comment xml:lang="sk">Zvuk PCM</comment> <comment xml:lang="sl">Zvočna datoteka PCM</comment> <comment xml:lang="sq">Audio PCM</comment> @@ -21888,7 +22572,7 @@ <comment xml:lang="ga">fuaim AIFC</comment> <comment xml:lang="gl">son AIFC</comment> <comment xml:lang="he">שמע AIFC</comment> - <comment xml:lang="hr">AIFC audio</comment> + <comment xml:lang="hr">AIFC zvučni zapis</comment> <comment xml:lang="hu">AIFC hang</comment> <comment xml:lang="ia">Audio AIFC</comment> <comment xml:lang="id">Audio AIFC</comment> @@ -21908,7 +22592,7 @@ <comment xml:lang="pt">áudio AIFC</comment> <comment xml:lang="pt_BR">Áudio AIFC</comment> <comment xml:lang="ro">Fișier audio AIFC</comment> - <comment xml:lang="ru">аудио AIFC</comment> + <comment xml:lang="ru">Аудио AIFC</comment> <comment xml:lang="sk">Zvuk AIFC</comment> <comment xml:lang="sl">Zvočna datoteka AIFC</comment> <comment xml:lang="sq">Audio AIFC</comment> @@ -21951,7 +22635,7 @@ <comment xml:lang="ga">fuaim AIFF/Amiga/Mac</comment> <comment xml:lang="gl">son AIFF/Amiga/Mac</comment> <comment xml:lang="he">שמע AIFF/Amiga/Mac</comment> - <comment xml:lang="hr">AIFF/Amiga/Mac audio</comment> + <comment xml:lang="hr">AIFF/Amiga/Mac zvučni zapis</comment> <comment xml:lang="hu">AIFF/Amiga/Mac hang</comment> <comment xml:lang="ia">Audio AIFF/Amiga/Mac</comment> <comment xml:lang="id">Audio AIFF/Amiga/Mac</comment> @@ -21971,7 +22655,7 @@ <comment xml:lang="pt">áudio AIFF/Amiga/Mac</comment> <comment xml:lang="pt_BR">Áudio AIFF/Amiga/Mac</comment> <comment xml:lang="ro">Audio AIFF/Amiga/Mac</comment> - <comment xml:lang="ru">аудио AIFF/Amiga/Mac</comment> + <comment xml:lang="ru">Аудио AIFF/Amiga/Mac</comment> <comment xml:lang="sk">Zvuk AIFF/Amiga/Mac</comment> <comment xml:lang="sl">Zvočna datoteka AIFF/Amiga/Mac</comment> <comment xml:lang="sq">Audio AIFF/Amiga/Mac</comment> @@ -22029,7 +22713,7 @@ <comment xml:lang="pt">áudio Monkey</comment> <comment xml:lang="pt_BR">Áudio Monkey's</comment> <comment xml:lang="ro">Audio Monkey's</comment> - <comment xml:lang="ru">аудио Monkey's</comment> + <comment xml:lang="ru">Аудио Monkey's</comment> <comment xml:lang="sk">Zvuk Monkey's</comment> <comment xml:lang="sl">Zvočna datoteka Monkey</comment> <comment xml:lang="sq">Audio Monkey's</comment> @@ -22038,13 +22722,44 @@ <comment xml:lang="tr">Monkey's sesi</comment> <comment xml:lang="uk">звук Monkey's</comment> <comment xml:lang="vi">Âm thanh cua Monkey</comment> - <comment xml:lang="zh_CN">Monkey's audio 音频</comment> + <comment xml:lang="zh_CN">Monkey's Audio 音频</comment> <comment xml:lang="zh_TW">Monkey's 音訊</comment> <magic priority="50"> <match value="MAC " type="string" offset="0"/> </magic> <glob pattern="*.ape"/> </mime-type> + <mime-type type="audio/x-pn-audibleaudio"> + <comment>Audible.Com audio</comment> + <comment xml:lang="ca">àudio Audible.Com</comment> + <comment xml:lang="cs">zvuk Audible.Com</comment> + <comment xml:lang="de">Audible.Com-Audio</comment> + <comment xml:lang="en_GB">Audible.Com audio</comment> + <comment xml:lang="es">sonido de Audible.com</comment> + <comment xml:lang="hr">Audible.Com zvučni zapis</comment> + <comment xml:lang="hu">Audible.Com hang</comment> + <comment xml:lang="id">Audio Audible.Com</comment> + <comment xml:lang="it">Audio Audible.Com</comment> + <comment xml:lang="kk">Audible.Com аудиосы</comment> + <comment xml:lang="ko">Audible.Com 오디오</comment> + <comment xml:lang="pl">Plik dźwiękowy Audible.com</comment> + <comment xml:lang="pt_BR">Áudio de audible.com</comment> + <comment xml:lang="ru">Аудио Audible.Com</comment> + <comment xml:lang="sk">Audio Audible.Com</comment> + <comment xml:lang="sv">Audible.Com-ljud</comment> + <comment xml:lang="uk">звук Audible.Com</comment> + <comment xml:lang="zh_CN">Audible.Com 音频</comment> + <comment xml:lang="zh_TW">Audible.Com 音訊</comment> + <magic priority="50"> + + <match value="1469084982" type="big32" offset="4"/> + <match value="aax " type="string" offset="8"/> + </magic> + <glob pattern="*.aa"/> + <glob pattern="*.aax"/> + <alias type="audio/vnd.audible"/> + <alias type="audio/vnd.audible.aax"/> + </mime-type> <mime-type type="audio/x-it"> <comment>Impulse Tracker audio</comment> <comment xml:lang="ar">Impulse Tracker سمعي</comment> @@ -22067,7 +22782,7 @@ <comment xml:lang="ga">fuaim Impulse Tracker</comment> <comment xml:lang="gl">son de Impulse Tracker</comment> <comment xml:lang="he">שמע של Impulse Tracker</comment> - <comment xml:lang="hr">Impulse Tracker audio</comment> + <comment xml:lang="hr">Impulse Tracker zvučni zapis</comment> <comment xml:lang="hu">Impulse Tracker hang</comment> <comment xml:lang="ia">Audio Impulse Tracker</comment> <comment xml:lang="id">Audio Impulse Tracker</comment> @@ -22086,7 +22801,7 @@ <comment xml:lang="pt">áudio Impulse Tracker</comment> <comment xml:lang="pt_BR">Áudio Impulse Tracker</comment> <comment xml:lang="ro">Audio Impulse Tracker</comment> - <comment xml:lang="ru">аудио Impulse Tracker</comment> + <comment xml:lang="ru">Аудио Impulse Tracker</comment> <comment xml:lang="sk">Zvuk Impulse Tracker</comment> <comment xml:lang="sl">Zvočna datoteka Impulse Tracker</comment> <comment xml:lang="sq">Audio Impulse Tracker</comment> @@ -22122,7 +22837,7 @@ <comment xml:lang="ga">fuaim FLAC</comment> <comment xml:lang="gl">son FLAC</comment> <comment xml:lang="he">קובץ שמע מסוג FLAC</comment> - <comment xml:lang="hr">FLAC audio</comment> + <comment xml:lang="hr">FLAC zvučni zapis</comment> <comment xml:lang="hu">FLAC hang</comment> <comment xml:lang="ia">Audio FLAC</comment> <comment xml:lang="id">Audio FLAC</comment> @@ -22142,7 +22857,7 @@ <comment xml:lang="pt">áudio FLAC</comment> <comment xml:lang="pt_BR">Áudio FLAC</comment> <comment xml:lang="ro">Audio FLAC</comment> - <comment xml:lang="ru">аудио FLAC</comment> + <comment xml:lang="ru">Аудио FLAC</comment> <comment xml:lang="sk">Zvuk FLAC</comment> <comment xml:lang="sl">Zvočna datoteka Flac</comment> <comment xml:lang="sq">Audio FLAC</comment> @@ -22179,7 +22894,7 @@ <comment xml:lang="ga">fuaim WavPack</comment> <comment xml:lang="gl">son WavPack</comment> <comment xml:lang="he">שמע WavPack</comment> - <comment xml:lang="hr">WavPack audio</comment> + <comment xml:lang="hr">WavPack zvučni zapis</comment> <comment xml:lang="hu">WavPack hang</comment> <comment xml:lang="ia">Audio WavPack</comment> <comment xml:lang="id">Audio WavPack</comment> @@ -22197,7 +22912,7 @@ <comment xml:lang="pt">áudio WavPack</comment> <comment xml:lang="pt_BR">Áudio WavPack</comment> <comment xml:lang="ro">Audio WavPack</comment> - <comment xml:lang="ru">аудио WavPack</comment> + <comment xml:lang="ru">Аудио WavPack</comment> <comment xml:lang="sk">Zvuk WavPack</comment> <comment xml:lang="sl">Zvočna datoteka WavPack</comment> <comment xml:lang="sq">Audio WavPack</comment> @@ -22230,7 +22945,7 @@ <comment xml:lang="fi">WavPack-äänikorjaustiedosto</comment> <comment xml:lang="fo">WavPack ljóðrættingarfíla</comment> <comment xml:lang="fr">fichier de correction audio WavPack</comment> - <comment xml:lang="ga">comhad cheartú fhuaim WavPack</comment> + <comment xml:lang="ga">comhad ceartúchán fuaime WavPack</comment> <comment xml:lang="gl">ficheiro de corrección de son WavPack</comment> <comment xml:lang="he">קובץ תיקון שמע של WavPack</comment> <comment xml:lang="hr">WavPack datoteka ispravke zvuka</comment> @@ -22251,7 +22966,7 @@ <comment xml:lang="pt">ficheiro de correção áudio WavPack</comment> <comment xml:lang="pt_BR">Arquivo de correção de áudio WavPack</comment> <comment xml:lang="ro">Fișier audio de corecție WavPack</comment> - <comment xml:lang="ru">файл коррекции аудио WavPack</comment> + <comment xml:lang="ru">Файл коррекции аудио WavPack</comment> <comment xml:lang="sk">Opravný zvukový súbor WavPack</comment> <comment xml:lang="sl">popravljalna zvočna datoteka WavPack</comment> <comment xml:lang="sq">File korrigjgimi audio WavPack</comment> @@ -22260,7 +22975,7 @@ <comment xml:lang="tr">WavPack ses düzeltme dosyası</comment> <comment xml:lang="uk">файл корекції звуку WavPack</comment> <comment xml:lang="vi">Tập tin sửa chữa âm thanh WavPack</comment> - <comment xml:lang="zh_CN">WavPack 音频校正文档</comment> + <comment xml:lang="zh_CN">WavPack 音频校正文件</comment> <comment xml:lang="zh_TW">WavPack 音訊校正檔</comment> <magic priority="50"> <match value="wvpk" type="string" offset="0"/> @@ -22289,7 +23004,7 @@ <comment xml:lang="ga">fuaim MIDI</comment> <comment xml:lang="gl">son MIDI</comment> <comment xml:lang="he">שמע MIDI</comment> - <comment xml:lang="hr">MIDI audio</comment> + <comment xml:lang="hr">MIDI zvučni zapis</comment> <comment xml:lang="hu">MIDI hang</comment> <comment xml:lang="ia">Audio MIDI</comment> <comment xml:lang="id">Audio MIDI</comment> @@ -22308,7 +23023,7 @@ <comment xml:lang="pt">áudio MIDI</comment> <comment xml:lang="pt_BR">Áudio MIDI</comment> <comment xml:lang="ro">Audio MIDI</comment> - <comment xml:lang="ru">аудио MIDI</comment> + <comment xml:lang="ru">Аудио MIDI</comment> <comment xml:lang="sk">Zvuk MIDI</comment> <comment xml:lang="sl">Zvočna datoteka MIDI</comment> <comment xml:lang="sq">Audio MIDI</comment> @@ -22346,7 +23061,7 @@ <comment xml:lang="ga">fuaim chomhbhrúite Tracker</comment> <comment xml:lang="gl">son comprimido de Tracker</comment> <comment xml:lang="he">שמע גשש מכווץ</comment> - <comment xml:lang="hr">komprimirani Tracker audio</comment> + <comment xml:lang="hr">Sažeti Tracker zvučni zapis</comment> <comment xml:lang="hu">tömörített Tracker hang</comment> <comment xml:lang="ia">Audio Tracker comprimite</comment> <comment xml:lang="id">audio Tracker terkompresi</comment> @@ -22363,7 +23078,7 @@ <comment xml:lang="pt">áudio comprimido Tracker</comment> <comment xml:lang="pt_BR">Áudio Tracker compactado</comment> <comment xml:lang="ro">Tracker audio comprimat</comment> - <comment xml:lang="ru">аудио Tracker (сжатое)</comment> + <comment xml:lang="ru">Сжатое аудио Tracker</comment> <comment xml:lang="sk">Komprimovaný zvuk Tracker</comment> <comment xml:lang="sl">Skrčena zvočna datoteka Tracker</comment> <comment xml:lang="sq">Audio Tracker e kompresuar</comment> @@ -22391,6 +23106,7 @@ <comment xml:lang="eu">AAC audioa</comment> <comment xml:lang="fi">AAC-ääni</comment> <comment xml:lang="fr">audio AAC</comment> + <comment xml:lang="ga">fuaim AAC</comment> <comment xml:lang="gl">Son AAC</comment> <comment xml:lang="he">שמע AAC</comment> <comment xml:lang="hr">AAC zvučni zapis</comment> @@ -22403,10 +23119,10 @@ <comment xml:lang="ko">AAC 오디오</comment> <comment xml:lang="lv">AAC audio</comment> <comment xml:lang="oc">àudio AAC</comment> - <comment xml:lang="pl">Dźwięk AAC</comment> + <comment xml:lang="pl">Plik dźwiękowy AAC</comment> <comment xml:lang="pt">áudio AAC</comment> <comment xml:lang="pt_BR">Áudio AAC</comment> - <comment xml:lang="ru">аудио AAC</comment> + <comment xml:lang="ru">Аудио AAC</comment> <comment xml:lang="sk">Zvuk AAC</comment> <comment xml:lang="sl">Zvok AAC</comment> <comment xml:lang="sr">ААЦ звук</comment> @@ -22422,8 +23138,17 @@ <match value="0xFFF0" type="big16" offset="0" mask="0xFFF6"/> </magic> <glob pattern="*.aac"/> + <glob pattern="*.adts"/> + <glob weight="10" pattern="*.ass"/> <alias type="audio/x-aac"/> </mime-type> + <mime-type type="audio/usac"> + <comment>USAC audio</comment> + <acronym>USAC</acronym> + <expanded-acronym>Unified Speech and Audio Coding</expanded-acronym> + <glob pattern="*.loas"/> + <glob pattern="*.xhe"/> + </mime-type> <mime-type type="audio/mp4"> <comment>MPEG-4 audio</comment> <comment xml:lang="ar">MPEG-4 سمعي</comment> @@ -22444,7 +23169,7 @@ <comment xml:lang="ga">fuaim MPEG-4</comment> <comment xml:lang="gl">son MPEG-4</comment> <comment xml:lang="he">שמע MPEG-4</comment> - <comment xml:lang="hr">MPEG-4 audio</comment> + <comment xml:lang="hr">MPEG-4 zvučni zapis</comment> <comment xml:lang="hu">MPEG-4 hang</comment> <comment xml:lang="ia">Audio MPEG-4</comment> <comment xml:lang="id">Audio MPEG-4</comment> @@ -22463,7 +23188,7 @@ <comment xml:lang="pt">áudio MPEG-4</comment> <comment xml:lang="pt_BR">Áudio MPEG-4</comment> <comment xml:lang="ro">Audio MPEG-4</comment> - <comment xml:lang="ru">аудио MPEG-4</comment> + <comment xml:lang="ru">Аудио MPEG-4</comment> <comment xml:lang="sk">Zvuk MPEG-4</comment> <comment xml:lang="sl">Zvočna datoteka MPEG-4</comment> <comment xml:lang="sq">Audio MPEG-4</comment> @@ -22482,9 +23207,15 @@ <glob pattern="*.m4a"/> <glob pattern="*.f4a"/> </mime-type> + <mime-type type="audio/x-m4r"> + <comment>MPEG-4 Ringtone</comment> + <glob pattern="*.m4r"/> + <sub-class-of type="video/mp4"/> + </mime-type> <mime-type type="video/mp4"> <comment>MPEG-4 video</comment> <comment xml:lang="ar">MPEG-4 مرئي</comment> + <comment xml:lang="ast">Videu en MPEG-4</comment> <comment xml:lang="be@latin">Videa MPEG-4</comment> <comment xml:lang="bg">Видео — MPEG-4</comment> <comment xml:lang="ca">vídeo MPEG-4</comment> @@ -22502,7 +23233,7 @@ <comment xml:lang="ga">físeán MPEG-4</comment> <comment xml:lang="gl">vídeo MPEG-4</comment> <comment xml:lang="he">וידאו MPEG-4</comment> - <comment xml:lang="hr">MPEG-4 video</comment> + <comment xml:lang="hr">MPEG-4 video snimka</comment> <comment xml:lang="hu">MPEG-4 videó</comment> <comment xml:lang="ia">Video MPEG-4</comment> <comment xml:lang="id">Video MPEG-4</comment> @@ -22521,7 +23252,7 @@ <comment xml:lang="pt">vídeo MPEG-4</comment> <comment xml:lang="pt_BR">Vídeo MPEG-4</comment> <comment xml:lang="ro">Video MPEG-4</comment> - <comment xml:lang="ru">видео MPEG-4</comment> + <comment xml:lang="ru">Видео MPEG-4</comment> <comment xml:lang="sk">Video MPEG-4</comment> <comment xml:lang="sl">Video datoteka MPEG-4</comment> <comment xml:lang="sq">Video MPEG-4</comment> @@ -22563,10 +23294,10 @@ <comment xml:lang="fi">MPEG-4-äänikirja</comment> <comment xml:lang="fo">MPEG-4 ljóðbók</comment> <comment xml:lang="fr">livre audio MPEG-4</comment> - <comment xml:lang="ga">leabhar fhuaim MPEG-4</comment> + <comment xml:lang="ga">closleabhar MPEG-4</comment> <comment xml:lang="gl">sonlibro de MPEG-4</comment> <comment xml:lang="he">ספר דיגיטלי MPEG-4</comment> - <comment xml:lang="hr">MPEG-4 audio knjiga</comment> + <comment xml:lang="hr">MPEG-4 zvučna knjiga</comment> <comment xml:lang="hu">MPEG-4 hangoskönyv</comment> <comment xml:lang="ia">Libro audio MPEG-4</comment> <comment xml:lang="id">Buku audio MPEG-4</comment> @@ -22585,7 +23316,7 @@ <comment xml:lang="pt">livro áudio MPEG-4</comment> <comment xml:lang="pt_BR">Áudio livro MPEG-4</comment> <comment xml:lang="ro">Carte audio MPEG-4</comment> - <comment xml:lang="ru">аудиокнига MPEG-4</comment> + <comment xml:lang="ru">Аудиокнига MPEG-4</comment> <comment xml:lang="sk">Zvuková kniha MPEG-4</comment> <comment xml:lang="sl">Zvočna knjiga MPEG-4</comment> <comment xml:lang="sq">Audiolibër MPEG-4</comment> @@ -22641,7 +23372,7 @@ <comment xml:lang="pt">ficheiro multimédia 3GPP</comment> <comment xml:lang="pt_BR">Arquivo multimídia 3GPP</comment> <comment xml:lang="ro">Fișier multimedia 3GPP</comment> - <comment xml:lang="ru">мультимедийный файл 3GPP</comment> + <comment xml:lang="ru">Мультимедийный файл 3GPP</comment> <comment xml:lang="sk">Súbor multimédií 3GPP</comment> <comment xml:lang="sl">Večpredstavnostna datoteka 3GPP</comment> <comment xml:lang="sq">File multimedial 3GPP</comment> @@ -22707,7 +23438,7 @@ <comment xml:lang="pt">ficheiro multimédia 3GPP2</comment> <comment xml:lang="pt_BR">Arquivo multimídia 3GPP2</comment> <comment xml:lang="ro">Fișier multimedia 3GPP2</comment> - <comment xml:lang="ru">мультимедийный файл 3GPP2</comment> + <comment xml:lang="ru">Мультимедийный файл 3GPP2</comment> <comment xml:lang="sk">Súbor multimédií 3GPP2</comment> <comment xml:lang="sl">Večpredstavnostna datoteka 3GPP2</comment> <comment xml:lang="sr">3ГПП2 мултимедијална датотека</comment> @@ -22747,7 +23478,7 @@ <comment xml:lang="ga">fuaim Amiga SoundTracker</comment> <comment xml:lang="gl">son de Amiga SoundTracker</comment> <comment xml:lang="he">קובץ שמע של Amiga SoundTracker</comment> - <comment xml:lang="hr">Amiga SoundTracker audio</comment> + <comment xml:lang="hr">Amiga SoundTracker zvučni zapis</comment> <comment xml:lang="hu">Amiga SoundTracker hang</comment> <comment xml:lang="ia">Audio Amiga SoundTracker</comment> <comment xml:lang="id">Audio Amida SoundTracker</comment> @@ -22767,7 +23498,7 @@ <comment xml:lang="pt">áudio SoundTracker do Amiga</comment> <comment xml:lang="pt_BR">Áudio Amiga SoundTracker</comment> <comment xml:lang="ro">Audio Amiga SoundTracker</comment> - <comment xml:lang="ru">аудио Amiga SoundTracker</comment> + <comment xml:lang="ru">Аудио Amiga SoundTracker</comment> <comment xml:lang="sk">Zvuk Amiga SoundTracker</comment> <comment xml:lang="sl">Zvočna datoteka Amiga SoundTracker</comment> <comment xml:lang="sq">Audio Amiga SoundTracker</comment> @@ -22840,7 +23571,7 @@ <comment xml:lang="ga">fuaim MP2</comment> <comment xml:lang="gl">son MP2</comment> <comment xml:lang="he">שמע MP2</comment> - <comment xml:lang="hr">MP2 audio</comment> + <comment xml:lang="hr">MP2 zvučni zapis</comment> <comment xml:lang="hu">MP2 hang</comment> <comment xml:lang="ia">Audio MP2</comment> <comment xml:lang="id">Audio MP2</comment> @@ -22858,7 +23589,7 @@ <comment xml:lang="pt">áudio MP2</comment> <comment xml:lang="pt_BR">Áudio MP2</comment> <comment xml:lang="ro">Audio MP2</comment> - <comment xml:lang="ru">аудио MP2</comment> + <comment xml:lang="ru">Аудио MP2</comment> <comment xml:lang="sk">Zvuk MP2</comment> <comment xml:lang="sl">Zvočna datoteka MP2</comment> <comment xml:lang="sq">Audio MP2</comment> @@ -22894,7 +23625,7 @@ <comment xml:lang="ga">fuaim MP3</comment> <comment xml:lang="gl">son MP3</comment> <comment xml:lang="he">שמע MP3</comment> - <comment xml:lang="hr">MP3 audio</comment> + <comment xml:lang="hr">MP3 zvučni zapis</comment> <comment xml:lang="hu">MP3 hang</comment> <comment xml:lang="ia">Audio MP3</comment> <comment xml:lang="id">Audio MP3</comment> @@ -22914,7 +23645,7 @@ <comment xml:lang="pt">áudio MP3</comment> <comment xml:lang="pt_BR">Áudio MP3</comment> <comment xml:lang="ro">Audio MP3</comment> - <comment xml:lang="ru">аудио MP3</comment> + <comment xml:lang="ru">Аудио MP3</comment> <comment xml:lang="sk">Zvuk MP3</comment> <comment xml:lang="sl">Zvočna datoteka MP3</comment> <comment xml:lang="sq">Audio MP3</comment> @@ -22972,11 +23703,11 @@ <comment xml:lang="nl">MP3-audio (gestreamd)</comment> <comment xml:lang="nn">Strauma MP3-lyd</comment> <comment xml:lang="oc">àudio MP3 (flux)</comment> - <comment xml:lang="pl">Dźwięk MP3 (strumień)</comment> + <comment xml:lang="pl">Plik dźwiękowy MP3 (strumień)</comment> <comment xml:lang="pt">áudio MP3 (em fluxo)</comment> <comment xml:lang="pt_BR">Áudio MP3 (em fluxo)</comment> <comment xml:lang="ro">Audio MP3 (flux)</comment> - <comment xml:lang="ru">аудио MP3 (потоковое)</comment> + <comment xml:lang="ru">Аудио MP3 (потоковое)</comment> <comment xml:lang="sk">Zvuk MP3 (streamovaný)</comment> <comment xml:lang="sl">Zvočna datoteka MP3 (pretočna)</comment> <comment xml:lang="sq">Audio MP3 (streamed)</comment> @@ -22985,7 +23716,7 @@ <comment xml:lang="tr">MP3 sesi (akış)</comment> <comment xml:lang="uk">звук MP3 (потоковий)</comment> <comment xml:lang="vi">Âm thanh MP3 (chạy luồng)</comment> - <comment xml:lang="zh_CN">MP3 流音频</comment> + <comment xml:lang="zh_CN">MP3 音频流媒体</comment> <comment xml:lang="zh_TW">MP3 音訊 (串流)</comment> <sub-class-of type="text/plain"/> <alias type="audio/mpegurl"/> @@ -23033,14 +23764,14 @@ <comment xml:lang="pt">lista de reprodução HTTP Live Streaming</comment> <comment xml:lang="pt_BR">Lista de Reprodução Streaming ao Vivo de HTTP</comment> <comment xml:lang="ro">Listă de redare difuzată ca flux HTTP</comment> - <comment xml:lang="ru">список воспроизведения HTTP-потока</comment> + <comment xml:lang="ru">Список воспроизведения HTTP-потока</comment> <comment xml:lang="sk">Zoznam stôp HTTP Live Streaming</comment> <comment xml:lang="sl">Seznam predvajanja živega pretoka HTTP</comment> <comment xml:lang="sr">ХТТП списак нумера Живог Протока</comment> <comment xml:lang="sv">HTTP Live Streaming-spellista</comment> <comment xml:lang="tr">HTTP Canlı Akış çalma listesi</comment> <comment xml:lang="uk">список відтворення HTTP Live Streaming</comment> - <comment xml:lang="zh_CN">HTTP 直播流播放列表</comment> + <comment xml:lang="zh_CN">HTTP 实时流播放列表</comment> <comment xml:lang="zh_TW">HTTP 即時串流播放清單</comment> <sub-class-of type="text/plain"/> <glob pattern="*.m3u"/> @@ -23071,7 +23802,7 @@ <comment xml:lang="ga">seinmliosta Microsoft ASX</comment> <comment xml:lang="gl">lista de reprodución Microsoft ASX</comment> <comment xml:lang="he">רשימת השמעה ASX (מיקרוסופט)</comment> - <comment xml:lang="hr">Microsoft ASX popis za reprodukciju</comment> + <comment xml:lang="hr">Microsoft ASX popis izvođenja</comment> <comment xml:lang="hu">Microsoft ASX lejátszólista</comment> <comment xml:lang="ia">Lista de selection Microsoft ASX</comment> <comment xml:lang="id">Senarai putar Microsoft ASX</comment> @@ -23090,7 +23821,7 @@ <comment xml:lang="pt">lista de reprodução Microsoft ASX</comment> <comment xml:lang="pt_BR">Lista de reprodução do Microsoft ASX</comment> <comment xml:lang="ro">Listă redare Microsoft ASX</comment> - <comment xml:lang="ru">список воспроизведения Microsoft ASX</comment> + <comment xml:lang="ru">Список воспроизведения Microsoft ASX</comment> <comment xml:lang="sk">Zoznam skladieb Microsoft ASX</comment> <comment xml:lang="sl">Seznam predvajanja Microsoft ASX</comment> <comment xml:lang="sq">Listë titujsh Microsoft ASF</comment> @@ -23154,7 +23885,7 @@ <comment xml:lang="pt">áudio PSF</comment> <comment xml:lang="pt_BR">Áudio PSF</comment> <comment xml:lang="ro">Audio PSF</comment> - <comment xml:lang="ru">аудио PSF</comment> + <comment xml:lang="ru">Аудио PSF</comment> <comment xml:lang="sk">Zvuk PSF</comment> <comment xml:lang="sl">Zvočna datoteka PSF</comment> <comment xml:lang="sq">Audio PSF</comment> @@ -23192,7 +23923,7 @@ <comment xml:lang="ga">fuaim MiniPSF</comment> <comment xml:lang="gl">son MiniPSF</comment> <comment xml:lang="he">שמע של MiniPSP</comment> - <comment xml:lang="hr">MiniPSF audio</comment> + <comment xml:lang="hr">MiniPSF zvučni zapis</comment> <comment xml:lang="hu">MiniPSF hang</comment> <comment xml:lang="ia">Audio MiniPSF</comment> <comment xml:lang="id">Audio MiniPSF</comment> @@ -23211,7 +23942,7 @@ <comment xml:lang="pt">áudio MiniPSF</comment> <comment xml:lang="pt_BR">Áudio MiniPSF</comment> <comment xml:lang="ro">Audio MiniPSF</comment> - <comment xml:lang="ru">аудио MiniPSF</comment> + <comment xml:lang="ru">Аудио MiniPSF</comment> <comment xml:lang="sk">Zvuk MiniPSF</comment> <comment xml:lang="sl">Zvočna datoteka MiniPSF</comment> <comment xml:lang="sq">Audio MiniPSF</comment> @@ -23243,7 +23974,7 @@ <comment xml:lang="fi">PSFlib-äänikirjasto</comment> <comment xml:lang="fo">PSFlib ljóðsavn</comment> <comment xml:lang="fr">bibliothèque audio PSFlib</comment> - <comment xml:lang="ga">leabharlann fhuaim PSFlib</comment> + <comment xml:lang="ga">leabharlann fhuaime PSFlib</comment> <comment xml:lang="gl">Biblioteca de son PSFlib</comment> <comment xml:lang="he">ספריית שמע PSFlib</comment> <comment xml:lang="hr">PSFlib zvučna biblioteka</comment> @@ -23264,7 +23995,7 @@ <comment xml:lang="pt">biblioteca áudio PSFlib</comment> <comment xml:lang="pt_BR">Biblioteca de áudio PSFlib</comment> <comment xml:lang="ro">Bibliotecă audio PSFlib</comment> - <comment xml:lang="ru">фонотека PSFlib</comment> + <comment xml:lang="ru">Фонотека PSFlib</comment> <comment xml:lang="sk">Zvuková knižnica PSFlib</comment> <comment xml:lang="sl">Zvočna knjižnica PSFlib</comment> <comment xml:lang="sq">Librari audio PSFlib</comment> @@ -23273,7 +24004,7 @@ <comment xml:lang="tr">PSFlib ses kitaplığı</comment> <comment xml:lang="uk">аудіобібліотека PSFlib</comment> <comment xml:lang="vi">Thư viện âm thanh PSFlib</comment> - <comment xml:lang="zh_CN">PSFlib 音频库文件</comment> + <comment xml:lang="zh_CN">PSFlib 音频库</comment> <comment xml:lang="zh_TW">PSFlib 音訊庫</comment> <acronym>PSFlib</acronym> <expanded-acronym>Portable Sound Format Library</expanded-acronym> @@ -23299,7 +24030,7 @@ <comment xml:lang="ga">fuaim Windows Media</comment> <comment xml:lang="gl">son de Windows Media</comment> <comment xml:lang="he">שמע של Windows Media</comment> - <comment xml:lang="hr">Windows Media audio</comment> + <comment xml:lang="hr">Windows Media zvučni zapis</comment> <comment xml:lang="hu">Windows Media hang</comment> <comment xml:lang="ia">Audio Windows Media</comment> <comment xml:lang="id">Audio Windows Media</comment> @@ -23317,7 +24048,7 @@ <comment xml:lang="pt">áudio Windows Media</comment> <comment xml:lang="pt_BR">Áudio do Windows Media</comment> <comment xml:lang="ro">Audio Windows Media</comment> - <comment xml:lang="ru">аудио Windows Media</comment> + <comment xml:lang="ru">Аудио Windows Media</comment> <comment xml:lang="sk">Zvuk Windows Media</comment> <comment xml:lang="sl">Zvočna datoteka Windows Media</comment> <comment xml:lang="sq">Audio Windows Media</comment> @@ -23351,7 +24082,7 @@ <comment xml:lang="ga">fuaim Musepack</comment> <comment xml:lang="gl">son de Musepack</comment> <comment xml:lang="he">שמע של Musepack</comment> - <comment xml:lang="hr">Musepack audio</comment> + <comment xml:lang="hr">Musepack zvučni zapis</comment> <comment xml:lang="hu">Musepack hang</comment> <comment xml:lang="ia">Audio Musepack</comment> <comment xml:lang="id">Audio Musepack</comment> @@ -23369,7 +24100,7 @@ <comment xml:lang="pt">áudio Musepack</comment> <comment xml:lang="pt_BR">Áudio Musepack</comment> <comment xml:lang="ro">Audio Musepack</comment> - <comment xml:lang="ru">аудио Musepack</comment> + <comment xml:lang="ru">Аудио Musepack</comment> <comment xml:lang="sk">Zvuk Musepack</comment> <comment xml:lang="sl">Zvočna datoteka Musepack</comment> <comment xml:lang="sq">Audio Musepack</comment> @@ -23390,6 +24121,7 @@ <mime-type type="audio/vnd.rn-realaudio"> <comment>RealAudio document</comment> <comment xml:lang="ar">مستند RealAudio</comment> + <comment xml:lang="ast">Documentu RealAudio</comment> <comment xml:lang="be@latin">Dakument RealAudio</comment> <comment xml:lang="bg">Документ — RealAudio</comment> <comment xml:lang="ca">document RealAudio</comment> @@ -23425,7 +24157,7 @@ <comment xml:lang="pt">documento RealAudio</comment> <comment xml:lang="pt_BR">Documento RealAudio</comment> <comment xml:lang="ro">Document RealAudio</comment> - <comment xml:lang="ru">документ RealAudio</comment> + <comment xml:lang="ru">Документ RealAudio</comment> <comment xml:lang="sk">Dokument RealAudio</comment> <comment xml:lang="sl">Dokument RealAudio</comment> <comment xml:lang="sq">Dokument RealAudio</comment> @@ -23457,7 +24189,7 @@ <comment xml:lang="fi">RealMedia-metatiedosto</comment> <comment xml:lang="fo">RealMedia metafíla</comment> <comment xml:lang="fr">métafichier RealMedia</comment> - <comment xml:lang="ga">meiteachomhad RealMedia</comment> + <comment xml:lang="ga">Meiteachomhad RealMedia</comment> <comment xml:lang="gl">Metaficheiro RealMedia</comment> <comment xml:lang="he">קובץ מטא של RealMedia</comment> <comment xml:lang="hr">RealMedia meta datoteka</comment> @@ -23478,7 +24210,7 @@ <comment xml:lang="pt">metaficheiro RealMedia</comment> <comment xml:lang="pt_BR">Meta arquivo do RealMedia</comment> <comment xml:lang="ro">Metafișier RealMedia</comment> - <comment xml:lang="ru">мета-файл RealMedia</comment> + <comment xml:lang="ru">Мета-файл RealMedia</comment> <comment xml:lang="sk">RealMedia Metafile</comment> <comment xml:lang="sl">Metadatoteka RealMedia</comment> <comment xml:lang="sq">Metafile RealMedia</comment> @@ -23494,6 +24226,7 @@ <mime-type type="video/vnd.rn-realvideo"> <comment>RealVideo document</comment> <comment xml:lang="ar">مستند RealVideo</comment> + <comment xml:lang="ast">Documentu RealVideo</comment> <comment xml:lang="be@latin">Dakument RealVideo</comment> <comment xml:lang="bg">Документ — RealVideo</comment> <comment xml:lang="ca">document RealVideo</comment> @@ -23529,7 +24262,7 @@ <comment xml:lang="pt">documento RealVideo</comment> <comment xml:lang="pt_BR">Documento RealVideo</comment> <comment xml:lang="ro">Document RealVideo</comment> - <comment xml:lang="ru">документ RealVideo</comment> + <comment xml:lang="ru">Документ RealVideo</comment> <comment xml:lang="sk">Dokument RealVideo</comment> <comment xml:lang="sl">Video datoteka RealVideo</comment> <comment xml:lang="sq">Dokument RealVideo</comment> @@ -23547,6 +24280,7 @@ <mime-type type="application/vnd.rn-realmedia"> <comment>RealMedia document</comment> <comment xml:lang="ar">مستند RealMedia</comment> + <comment xml:lang="ast">Documentu RealMedia</comment> <comment xml:lang="be@latin">Dakument RealMedia</comment> <comment xml:lang="bg">Документ — RealMedia</comment> <comment xml:lang="ca">document RealMedia</comment> @@ -23582,7 +24316,7 @@ <comment xml:lang="pt">documento RealMedia</comment> <comment xml:lang="pt_BR">Documento RealMedia</comment> <comment xml:lang="ro">Document RealMedia</comment> - <comment xml:lang="ru">документ RealMedia</comment> + <comment xml:lang="ru">Документ RealMedia</comment> <comment xml:lang="sk">Dokument RealMedia</comment> <comment xml:lang="sl">Dokument RealMedia</comment> <comment xml:lang="sq">Dokument RealMedia</comment> @@ -23608,6 +24342,7 @@ <mime-type type="image/vnd.rn-realpix"> <comment>RealPix document</comment> <comment xml:lang="ar">مستند RealPix</comment> + <comment xml:lang="ast">Documentu RealPix</comment> <comment xml:lang="be@latin">Dakument RealPix</comment> <comment xml:lang="bg">Документ — RealPix</comment> <comment xml:lang="ca">document RealPix</comment> @@ -23643,7 +24378,7 @@ <comment xml:lang="pt">documento RealPix</comment> <comment xml:lang="pt_BR">Documento RealPix</comment> <comment xml:lang="ro">Document RealPix</comment> - <comment xml:lang="ru">документ RealPix</comment> + <comment xml:lang="ru">Документ RealPix</comment> <comment xml:lang="sk">Dokument RealPix</comment> <comment xml:lang="sl">Dokument RealPix</comment> <comment xml:lang="sq">Dokument RealPix</comment> @@ -23659,6 +24394,7 @@ <mime-type type="text/vnd.rn-realtext"> <comment>RealText document</comment> <comment xml:lang="ar">مستند RealText</comment> + <comment xml:lang="ast">Documentu RealText</comment> <comment xml:lang="be@latin">Dakument RealText</comment> <comment xml:lang="bg">Документ — RealText</comment> <comment xml:lang="ca">document RealText</comment> @@ -23694,7 +24430,7 @@ <comment xml:lang="pt">documento RealText</comment> <comment xml:lang="pt_BR">Documento RealText</comment> <comment xml:lang="ro">Document RealText</comment> - <comment xml:lang="ru">документ RealText</comment> + <comment xml:lang="ru">Документ RealText</comment> <comment xml:lang="sk">Dokument RealText</comment> <comment xml:lang="sl">Dokument RealText</comment> <comment xml:lang="sq">Dokument RealText</comment> @@ -23729,7 +24465,7 @@ <comment xml:lang="ga">fuaim RIFF</comment> <comment xml:lang="gl">son RIFF</comment> <comment xml:lang="he">שמע RIFF</comment> - <comment xml:lang="hr">RIFF audio</comment> + <comment xml:lang="hr">RIFF zvučni zapis</comment> <comment xml:lang="hu">RIFF-kép</comment> <comment xml:lang="ia">Audio RIFF</comment> <comment xml:lang="id">Audio RIFF</comment> @@ -23748,7 +24484,7 @@ <comment xml:lang="pt">áudio RIFF</comment> <comment xml:lang="pt_BR">Áudio RIFF</comment> <comment xml:lang="ro">Audio RIFF</comment> - <comment xml:lang="ru">аудио RIFF</comment> + <comment xml:lang="ru">Аудио RIFF</comment> <comment xml:lang="sk">Zvuk RIFF</comment> <comment xml:lang="sl">Zvočna datoteka RIFF</comment> <comment xml:lang="sq">Audio RIFF</comment> @@ -23771,6 +24507,7 @@ <comment xml:lang="es">contenedor RIFF</comment> <comment xml:lang="eu">RIFF edukitzailea</comment> <comment xml:lang="fr">conteneur RIFF</comment> + <comment xml:lang="ga">coimeádán RIFF</comment> <comment xml:lang="gl">Contenedor RIFF</comment> <comment xml:lang="he">מכולת RIFF</comment> <comment xml:lang="hr">RIFF spremnik</comment> @@ -23820,7 +24557,7 @@ <comment xml:lang="ga">fuaim Scream Tracker 3</comment> <comment xml:lang="gl">son Scream Tracker 3</comment> <comment xml:lang="he">שמע של Scream Tracker 3</comment> - <comment xml:lang="hr">Scream Tracker 3 audio</comment> + <comment xml:lang="hr">Scream Tracker 3 zvučni zapis</comment> <comment xml:lang="hu">Scream Tracker 3 hang</comment> <comment xml:lang="ia">Audio Scream Tracker 3</comment> <comment xml:lang="id">Audio Scream Tracker 3</comment> @@ -23839,7 +24576,7 @@ <comment xml:lang="pt">áudio Scream Tracker 3</comment> <comment xml:lang="pt_BR">Áudio Scream Tracker 3</comment> <comment xml:lang="ro">Audio Scream Tracker 3</comment> - <comment xml:lang="ru">аудио Scream Tracker 3</comment> + <comment xml:lang="ru">Аудио Scream Tracker 3</comment> <comment xml:lang="sk">Skladba Scream Tracker 3</comment> <comment xml:lang="sl">Zvočna datoteka Scream Tracker 3</comment> <comment xml:lang="sq">Audio Scream Tracker 3</comment> @@ -23875,7 +24612,7 @@ <comment xml:lang="ga">seinmliosta MP3 ShoutCast</comment> <comment xml:lang="gl">lista de reprodución MP3 de ShoutCast</comment> <comment xml:lang="he">רשימת השמעה MP3 של ShoutCast</comment> - <comment xml:lang="hr">MP3 ShoutCast popis za reprodukciju</comment> + <comment xml:lang="hr">MP3 ShoutCast popis izvođenja</comment> <comment xml:lang="hu">MP3 ShoutCast-lejátszólista</comment> <comment xml:lang="ia">Lista de selection MP3 ShoutCast</comment> <comment xml:lang="id">Senarai putar MP3 ShoutCast</comment> @@ -23894,7 +24631,7 @@ <comment xml:lang="pt">lista de reprodução MP3 ShoutCast</comment> <comment xml:lang="pt_BR">Lista de reprodução MP3 ShoutCast</comment> <comment xml:lang="ro">Listă MP3 ShoutCast</comment> - <comment xml:lang="ru">список воспроизведения MP3 ShoutCast</comment> + <comment xml:lang="ru">Список воспроизведения MP3 ShoutCast</comment> <comment xml:lang="sk">Zoznam skladieb MP3 ShoutCast</comment> <comment xml:lang="sl">Seznam predvajanja MP3 ShoutCast</comment> <comment xml:lang="sq">Listë titujsh MP3 ShoutCast</comment> @@ -23936,7 +24673,7 @@ <comment xml:lang="ga">fuaim Scream Tracker</comment> <comment xml:lang="gl">son Scream Tracker</comment> <comment xml:lang="he">שמע של Scream Tracker</comment> - <comment xml:lang="hr">Scream Tracker audio</comment> + <comment xml:lang="hr">Scream Tracker zvučni zapis</comment> <comment xml:lang="hu">Scream Tracker hang</comment> <comment xml:lang="ia">Audio Scream Tracker</comment> <comment xml:lang="id">Audio Scream Tracker</comment> @@ -23955,7 +24692,7 @@ <comment xml:lang="pt">áudio Scream Tracker</comment> <comment xml:lang="pt_BR">Áudio Scream Tracker</comment> <comment xml:lang="ro">Audio Scream Tracker</comment> - <comment xml:lang="ru">аудио Scream Tracker</comment> + <comment xml:lang="ru">Аудио Scream Tracker</comment> <comment xml:lang="sk">Skladba Scream Tracker</comment> <comment xml:lang="sl">Zvočna datoteka Scream Tracker</comment> <comment xml:lang="sq">Audio Scream Tracker</comment> @@ -23995,7 +24732,7 @@ <comment xml:lang="ga">fuaim VOC</comment> <comment xml:lang="gl">son VOC</comment> <comment xml:lang="he">שמע VOC</comment> - <comment xml:lang="hr">VOC audio</comment> + <comment xml:lang="hr">VOC zvučni zapis</comment> <comment xml:lang="hu">VOC hang</comment> <comment xml:lang="ia">Audio VOC</comment> <comment xml:lang="id">Audio VOC</comment> @@ -24014,7 +24751,7 @@ <comment xml:lang="pt">áudio VOC</comment> <comment xml:lang="pt_BR">Áudio VOC</comment> <comment xml:lang="ro">Audio VOC</comment> - <comment xml:lang="ru">аудио VOC</comment> + <comment xml:lang="ru">Аудио VOC</comment> <comment xml:lang="sk">Zvuk VOC</comment> <comment xml:lang="sl">Zvočna datoteka VOC</comment> <comment xml:lang="sq">Audio VOC</comment> @@ -24049,7 +24786,7 @@ <comment xml:lang="ga">fuaim WAV</comment> <comment xml:lang="gl">son WAV</comment> <comment xml:lang="he">שמע WAV</comment> - <comment xml:lang="hr">WAV audio</comment> + <comment xml:lang="hr">WAV zvučni zapis</comment> <comment xml:lang="hu">WAV hang</comment> <comment xml:lang="ia">Audio WAV</comment> <comment xml:lang="id">Audio WAV</comment> @@ -24068,7 +24805,7 @@ <comment xml:lang="pt">áudio WAV</comment> <comment xml:lang="pt_BR">Áudio WAV</comment> <comment xml:lang="ro">Audio WAV</comment> - <comment xml:lang="ru">аудио WAV</comment> + <comment xml:lang="ru">Аудио WAV</comment> <comment xml:lang="sk">Zvuk WAV</comment> <comment xml:lang="sl">Zvočna datoteka WAV</comment> <comment xml:lang="sq">Audio WAV</comment> @@ -24128,7 +24865,7 @@ <comment xml:lang="pt">instrumento Scream Tracker</comment> <comment xml:lang="pt_BR">Instrumento Scream Tracker</comment> <comment xml:lang="ro">Instrument Scream Tracker</comment> - <comment xml:lang="ru">инструмент Scream Tracker</comment> + <comment xml:lang="ru">Инструмент Scream Tracker</comment> <comment xml:lang="sk">Nástroj pre Scream Tracker</comment> <comment xml:lang="sl">Datoteka zvoka glasbila Scream Tracker</comment> <comment xml:lang="sq">Instrument Scream Tracker</comment> @@ -24166,7 +24903,7 @@ <comment xml:lang="ga">fuaim FastTracker II</comment> <comment xml:lang="gl">son de FastTracker II</comment> <comment xml:lang="he">שמע FastTracker II</comment> - <comment xml:lang="hr">FastTracker II audio</comment> + <comment xml:lang="hr">FastTracker II zvučni zapis</comment> <comment xml:lang="hu">FastTracker II hang</comment> <comment xml:lang="ia">Audio FastTracker II</comment> <comment xml:lang="id">Audio FastTracker II</comment> @@ -24186,7 +24923,7 @@ <comment xml:lang="pt">áudio FastTracker II</comment> <comment xml:lang="pt_BR">Áudio FastTracker II</comment> <comment xml:lang="ro">Audio FastTracker II</comment> - <comment xml:lang="ru">аудио FastTracker II</comment> + <comment xml:lang="ru">Аудио FastTracker II</comment> <comment xml:lang="sk">Zvuk FastTracker II</comment> <comment xml:lang="sl">Zvočna datoteka FastTracker II</comment> <comment xml:lang="sq">Audio FastTracker II</comment> @@ -24222,7 +24959,7 @@ <comment xml:lang="ga">fuaim TrueAudio</comment> <comment xml:lang="gl">son Trueson</comment> <comment xml:lang="he">שמע TrueAudio</comment> - <comment xml:lang="hr">TrueAudio audio</comment> + <comment xml:lang="hr">TrueAudio zvučni zapis</comment> <comment xml:lang="hu">TrueAudio hang</comment> <comment xml:lang="ia">Audio TrueAudio</comment> <comment xml:lang="id">Audio TrueAudio</comment> @@ -24240,7 +24977,7 @@ <comment xml:lang="pt">áudio TrueAudio</comment> <comment xml:lang="pt_BR">Áudio TrueAudio</comment> <comment xml:lang="ro">Audio TrueAudio</comment> - <comment xml:lang="ru">аудио TrueAudio</comment> + <comment xml:lang="ru">Аудио TrueAudio</comment> <comment xml:lang="sk">Zvuk TrueAudio</comment> <comment xml:lang="sl">Zvočna datoteka TrueAudio</comment> <comment xml:lang="sq">Audio TrueAudio</comment> @@ -24298,7 +25035,7 @@ <comment xml:lang="pt">imagem BMP Windows</comment> <comment xml:lang="pt_BR">Imagem BMP do Windows</comment> <comment xml:lang="ro">Imagine Windows BMP</comment> - <comment xml:lang="ru">изображение Windows BMP</comment> + <comment xml:lang="ru">Изображение Windows BMP</comment> <comment xml:lang="sk">Obrázok Windows BMP</comment> <comment xml:lang="sl">Slikovna datoteka Windows BMP</comment> <comment xml:lang="sq">Figurë Windows BMP</comment> @@ -24360,7 +25097,7 @@ <comment xml:lang="pt">imagem WBMP</comment> <comment xml:lang="pt_BR">Imagem WBMP</comment> <comment xml:lang="ro">Imagine WBMP</comment> - <comment xml:lang="ru">изображение WBMP</comment> + <comment xml:lang="ru">Изображение WBMP</comment> <comment xml:lang="sk">Obrázok WBMP</comment> <comment xml:lang="sl">Slikovna datoteka WBMP</comment> <comment xml:lang="sq">Figurë WBMP</comment> @@ -24393,7 +25130,7 @@ <comment xml:lang="fi">Computer Graphics -metatiedosto</comment> <comment xml:lang="fo">Teldugrafikk metafíla</comment> <comment xml:lang="fr">métafichier Computer Graphics</comment> - <comment xml:lang="ga">meiteachomhad Grafaicí Ríomhaire</comment> + <comment xml:lang="ga">Meiteachomhad Grafaicí Ríomhaire</comment> <comment xml:lang="gl">metaficheiro de Computer Graphics</comment> <comment xml:lang="he">קובץ-מטה מסוג Computer Graphics</comment> <comment xml:lang="hr">Computer Graphics meta datoteka</comment> @@ -24415,7 +25152,7 @@ <comment xml:lang="pt">metaficheiro Computer Graphics</comment> <comment xml:lang="pt_BR">Meta-arquivo do Computer Graphics</comment> <comment xml:lang="ro">Metafișier Computer Graphics</comment> - <comment xml:lang="ru">метафайл компьютерной графики</comment> + <comment xml:lang="ru">Метафайл компьютерной графики</comment> <comment xml:lang="sk">Computer Graphics Metafile</comment> <comment xml:lang="sl">Metadatoteka računalniške grafike (CGM)</comment> <comment xml:lang="sq">Metafile Computer Graphics</comment> @@ -24424,7 +25161,7 @@ <comment xml:lang="tr">Computer Graphics Meta dosyası</comment> <comment xml:lang="uk">метафайл комп'ютерної графіки</comment> <comment xml:lang="vi">Siêu tập tin đồ họa máy tính (CMF)</comment> - <comment xml:lang="zh_CN">CGM 计算机图像元文件</comment> + <comment xml:lang="zh_CN">计算机图形图元文件 (CGM)</comment> <comment xml:lang="zh_TW">CGM 影像</comment> <glob pattern="*.cgm"/> </mime-type> @@ -24468,7 +25205,7 @@ <comment xml:lang="pt">fax CCITT G3</comment> <comment xml:lang="pt_BR">Fax do CCITT G3</comment> <comment xml:lang="ro">Fax CCITT G3</comment> - <comment xml:lang="ru">факс CCITT G3</comment> + <comment xml:lang="ru">Факс CCITT G3</comment> <comment xml:lang="sk">Fax CCITT G3</comment> <comment xml:lang="sl">Datoteka faksimila CCITT G3</comment> <comment xml:lang="sq">Fax CCITT G3</comment> @@ -24523,7 +25260,7 @@ <comment xml:lang="pt">imagem de fax G3</comment> <comment xml:lang="pt_BR">Imagem de fax G3</comment> <comment xml:lang="ro">Imagine fax G3</comment> - <comment xml:lang="ru">факсовое изображение G3</comment> + <comment xml:lang="ru">Факсовое изображение G3</comment> <comment xml:lang="sk">Obrázok fax G3</comment> <comment xml:lang="sl">Slikovna datoteka G3 fax</comment> <comment xml:lang="sq">Figurë Fax G3</comment> @@ -24532,7 +25269,7 @@ <comment xml:lang="tr">G3 fax görüntüsü</comment> <comment xml:lang="uk">факс G3</comment> <comment xml:lang="vi">Ảnh điện thư G3</comment> - <comment xml:lang="zh_CN">G3 传真文档</comment> + <comment xml:lang="zh_CN">G3 传真图像</comment> <comment xml:lang="zh_TW">G3 傳真圖</comment> </mime-type> <mime-type type="image/gif"> @@ -24577,7 +25314,7 @@ <comment xml:lang="pt">imagem GIF</comment> <comment xml:lang="pt_BR">Imagem GIF</comment> <comment xml:lang="ro">Imagine GIF</comment> - <comment xml:lang="ru">изображение GIF</comment> + <comment xml:lang="ru">Изображение GIF</comment> <comment xml:lang="sk">Obrázok GIF</comment> <comment xml:lang="sl">Slikovna datoteka GIF</comment> <comment xml:lang="sq">Figurë GIF</comment> @@ -24593,6 +25330,16 @@ </magic> <glob pattern="*.gif"/> </mime-type> + <mime-type type="image/heif"> + <comment>HEIF image</comment> + <acronym>HEIF</acronym> + <expanded-acronym>High Efficiency Image File</expanded-acronym> + <glob pattern="*.heic"/> + <glob pattern="*.heif"/> + <alias type="image/heic"/> + <alias type="image/heic-sequence"/> + <alias type="image/heif-sequence"/> + </mime-type> <mime-type type="image/ief"> <comment>IEF image</comment> <comment xml:lang="ar">صورة IEF</comment> @@ -24634,7 +25381,7 @@ <comment xml:lang="pt">imagem IEF</comment> <comment xml:lang="pt_BR">Imagem IEF</comment> <comment xml:lang="ro">Imagine IEF</comment> - <comment xml:lang="ru">изображение IEF</comment> + <comment xml:lang="ru">Изображение IEF</comment> <comment xml:lang="sk">Obrázok IEF</comment> <comment xml:lang="sl">Slikovna datoteka IEF</comment> <comment xml:lang="sq">Figurë IEF</comment> @@ -24688,7 +25435,7 @@ <comment xml:lang="pt">imagem JPEG</comment> <comment xml:lang="pt_BR">Imagem JPEG</comment> <comment xml:lang="ro">Imagine JPEG</comment> - <comment xml:lang="ru">изображение JPEG</comment> + <comment xml:lang="ru">Изображение JPEG</comment> <comment xml:lang="sk">Obrázok JPEG</comment> <comment xml:lang="sl">Slikovna datoteka JPEG</comment> <comment xml:lang="sq">Figurë JPEG</comment> @@ -24708,69 +25455,164 @@ <glob pattern="*.jpe"/> <alias type="image/pjpeg"/> </mime-type> - <mime-type type="image/jp2"> - <comment>JPEG-2000 image</comment> - <comment xml:lang="ar">صورة JPEG-2000</comment> - <comment xml:lang="be@latin">Vyjava JPEG-2000</comment> - <comment xml:lang="bg">Изображение — JPEG-2000</comment> - <comment xml:lang="ca">imatge JPEG-2000</comment> - <comment xml:lang="cs">obrázek JPEG-2000</comment> - <comment xml:lang="da">JPEG2000-billede</comment> - <comment xml:lang="de">JPEG-2000-Bild</comment> - <comment xml:lang="el">Εικόνα JPEG-2000</comment> - <comment xml:lang="en_GB">JPEG-2000 image</comment> - <comment xml:lang="eo">JPEG-2000-bildo</comment> - <comment xml:lang="es">imagen JPEG-2000</comment> - <comment xml:lang="eu">JPEG-2000 irudia</comment> - <comment xml:lang="fi">JPEG-2000-kuva</comment> - <comment xml:lang="fo">JPEG-2000 mynd</comment> - <comment xml:lang="fr">image JPEG-2000</comment> - <comment xml:lang="ga">íomhá JPEG-2000</comment> - <comment xml:lang="gl">imaxe JPEG-2000</comment> - <comment xml:lang="he">תמונת JPEG-2000</comment> - <comment xml:lang="hr">JPEG-2000 slika</comment> - <comment xml:lang="hu">JPEG-2000 kép</comment> - <comment xml:lang="ia">Imagine JPEG-2000</comment> - <comment xml:lang="id">Citra JPEG-2000</comment> - <comment xml:lang="it">Immagine JPEG-2000</comment> - <comment xml:lang="ja">JPEG-2000 画像</comment> - <comment xml:lang="kk">JPEG-2000 суреті</comment> - <comment xml:lang="ko">JPEG-2000 그림</comment> - <comment xml:lang="lt">JPEG-2000 paveikslėlis</comment> - <comment xml:lang="lv">JPEG-2000 attēls</comment> - <comment xml:lang="ms">Imej JPEG-2000</comment> - <comment xml:lang="nb">JPEG-2000-bilde</comment> - <comment xml:lang="nl">JPEG-2000-afbeelding</comment> - <comment xml:lang="nn">JPEG-2000-bilete</comment> - <comment xml:lang="oc">imatge JPEG-2000</comment> - <comment xml:lang="pl">Obraz JPEG-2000</comment> - <comment xml:lang="pt">imagem JPEG-2000</comment> + <mime-type type="video/x-mjpeg"> + <comment>MJPEG video stream</comment> + <acronym>MJPEG</acronym> + <expanded-acronym>Motion JPEG</expanded-acronym> + <sub-class-of type="image/jpeg"/> + <glob pattern="*.mjpeg"/> + <glob pattern="*.mjpg"/> + </mime-type> + <mime-type type="image/x-jp2-codestream"> + <comment>JPEG-2000 codestream</comment> + <comment xml:lang="ca">flux de codis JPEG-2000</comment> + <comment xml:lang="cs">datový tok JPEG-2000</comment> + <comment xml:lang="de">JPEG-2000 Codestream</comment> + <comment xml:lang="en_GB">JPEG-2000 codestream</comment> + <comment xml:lang="es">secuencia de código JPEG-2000</comment> + <comment xml:lang="hr">JPEG-2000 kôd strujanja</comment> + <comment xml:lang="hu">JPEG-2000 kódfolyam</comment> + <comment xml:lang="id">codestream JPEG-2000</comment> + <comment xml:lang="it">Codestream JPEG-2000</comment> + <comment xml:lang="kk">JPEG-2000 код ағыны</comment> + <comment xml:lang="ko">JPEG-2000 코드스트림</comment> + <comment xml:lang="pl">Strumień kodu JPEG-2000</comment> <comment xml:lang="pt_BR">Imagem JPEG-2000</comment> - <comment xml:lang="ro">Imagine JPEG-2000</comment> - <comment xml:lang="ru">изображение JPEG-2000</comment> - <comment xml:lang="sk">Obrázok JPEG-2000</comment> - <comment xml:lang="sl">Slikovna datoteka JPEG-2000</comment> - <comment xml:lang="sq">Figurë JPEG-2000</comment> - <comment xml:lang="sr">ЈПЕГ-2000 слика</comment> - <comment xml:lang="sv">JPEG-2000-bild</comment> - <comment xml:lang="tr">JPEG-2000 görüntüsü</comment> - <comment xml:lang="uk">зображення JPEG-2000</comment> - <comment xml:lang="vi">Ảnh JPEG-2000</comment> - <comment xml:lang="zh_CN">JPEG-2000 图像</comment> - <comment xml:lang="zh_TW">JPEG-2000 影像</comment> + <comment xml:lang="ru">Кодовый поток JPEG-2000</comment> + <comment xml:lang="sk">JPEG-2000 codestream</comment> + <comment xml:lang="sv">JPEG-2000-kodström</comment> + <comment xml:lang="uk">потік коду JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 码流</comment> + <comment xml:lang="zh_TW">JPEG-2000 代碼串流</comment> + <magic priority="50"> + <match value="0xff4fff51" type="big32" offset="0"/> + </magic> + <glob pattern="*.j2c"/> + <glob pattern="*.j2k"/> + <glob pattern="*.jpc"/> + </mime-type> + <mime-type type="image/jp2"> + <comment>JPEG-2000 JP2 image</comment> + <comment xml:lang="ca">imatge JPEG-2000 JP2</comment> + <comment xml:lang="cs">obrázek JPEG-2000 JP2</comment> + <comment xml:lang="de">JPEG-2000 JP2-Bild</comment> + <comment xml:lang="en_GB">JPEG-2000 JP2 image</comment> + <comment xml:lang="es">imagen JPEG-2000 JP2</comment> + <comment xml:lang="fi">JPEG-2000 JP2 -kuva</comment> + <comment xml:lang="hr">JPEG-2000 JP2 slika</comment> + <comment xml:lang="hu">JPEG-2000 JP2 kép</comment> + <comment xml:lang="id">Citra JPEG-2000 JP2</comment> + <comment xml:lang="it">Immagine JPEG-2000 JP2</comment> + <comment xml:lang="kk">JPEG-2000 JP2 суреті</comment> + <comment xml:lang="ko">JPEG-2000 JP2 그림</comment> + <comment xml:lang="pl">Obraz JP2 JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem JP2 de JPEG-2000</comment> + <comment xml:lang="ru">Изоражение JPEG-2000 JP2</comment> + <comment xml:lang="sk">Obrázok JPEG-2000 JP2</comment> + <comment xml:lang="sv">JPEG-2000 JP2-bild</comment> + <comment xml:lang="uk">зображення JP2 JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 JP2 图像</comment> + <comment xml:lang="zh_TW">JPEG-2000 JP2 影像</comment> + <acronym>JP2</acronym> + <expanded-acronym>JPEG-2000</expanded-acronym> <alias type="image/jpeg2000"/> - <alias type="image/jpx"/> <alias type="image/jpeg2000-image"/> <alias type="image/x-jpeg2000-image"/> <magic priority="50"> - <match value="\xFF\x4F\xFF\x51\x00" type="string" offset="0"/> - <match value="0x0c6a5020" type="big32" offset="3"/> - <match value="jp2" type="string" offset="20"/> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jp2\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> </magic> <glob pattern="*.jp2"/> - <glob pattern="*.jpx"/> + <glob pattern="*.jpg2"/> + </mime-type> + <mime-type type="image/jpx"> + <comment>JPEG-2000 JPX image</comment> + <comment xml:lang="ca">imatge JPEG-2000 JPX</comment> + <comment xml:lang="cs">obrázek JPEG-2000 JPX</comment> + <comment xml:lang="de">JPEG-2000 JPX-Bild</comment> + <comment xml:lang="en_GB">JPEG-2000 JPX image</comment> + <comment xml:lang="es">imagen JPEG-2000 JPX</comment> + <comment xml:lang="fi">JPEG-2000 JPX -kuva</comment> + <comment xml:lang="hr">JPEG-2000 JPX slika</comment> + <comment xml:lang="hu">JPEG-2000 JPX kép</comment> + <comment xml:lang="id">Citra JPEG-2000 JPX</comment> + <comment xml:lang="it">Immagine JPEG-2000 JPX</comment> + <comment xml:lang="kk">JPEG-2000 JPX суреті</comment> + <comment xml:lang="ko">JPEG-2000 JPX 그림</comment> + <comment xml:lang="pl">Obraz JPX JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem JPX de JPEG-2000</comment> + <comment xml:lang="ru">Изображение JPEG-2000 JPX</comment> + <comment xml:lang="sk">Obrázok JPEG-2000 JPX</comment> + <comment xml:lang="sv">JPEG-2000 JPX-bild</comment> + <comment xml:lang="uk">зображення JPX JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 JPX 图像</comment> + <comment xml:lang="zh_TW">JPEG-2000 JPX 影像</comment> + <acronym>JPX</acronym> + <expanded-acronym>JPEG-2000 eXtended</expanded-acronym> + <magic priority="50"> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpx\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> + </magic> <glob pattern="*.jpf"/> - + <glob pattern="*.jpx"/> + </mime-type> + <mime-type type="image/jpm"> + <comment>JPEG-2000 JPM image</comment> + <comment xml:lang="ca">imatge JPEG-2000 JPM</comment> + <comment xml:lang="cs">obrázek JPEG-2000 JPM</comment> + <comment xml:lang="de">JPEG-2000 JPM-Bild</comment> + <comment xml:lang="en_GB">JPEG-2000 JPM image</comment> + <comment xml:lang="es">imagen JPEG-2000 JPM</comment> + <comment xml:lang="fi">JPEG-2000 JPM -kuva</comment> + <comment xml:lang="hr">JPEG-2000 JPM slika</comment> + <comment xml:lang="hu">JPEG-2000 JPM kép</comment> + <comment xml:lang="id">Citra JPEG-2000 JPM</comment> + <comment xml:lang="it">Immagine JPEG-2000 JPM</comment> + <comment xml:lang="kk">JPEG-2000 JPM суреті</comment> + <comment xml:lang="ko">JPEG-2000 JPM 그림</comment> + <comment xml:lang="pl">Obraz JPM JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem JPM de JPEG-2000</comment> + <comment xml:lang="ru">Изображение JPEG-2000 JPM</comment> + <comment xml:lang="sk">Obrázok JPEG-2000 JPM</comment> + <comment xml:lang="sv">JPEG-2000 JPM-bild</comment> + <comment xml:lang="uk">зображення JPM JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 JPM 图像</comment> + <comment xml:lang="zh_TW">JPEG-2000 JPM 影像</comment> + <acronym>JPM</acronym> + <expanded-acronym>JPEG-2000 Mixed</expanded-acronym> + <magic priority="50"> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a jpm\x20" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> + </magic> + <glob pattern="*.jpm"/> + <glob pattern="*.jpgm"/> + </mime-type> + <mime-type type="video/mj2"> + <comment>JPEG-2000 MJ2 video</comment> + <comment xml:lang="ca">vídeo JPEG-2000 MJ2</comment> + <comment xml:lang="cs">video JPEG-2000 MJ2</comment> + <comment xml:lang="de">JPEG-2000 MJ2-Video</comment> + <comment xml:lang="en_GB">JPEG-2000 MJ2 video</comment> + <comment xml:lang="es">vídeo JPEG-2000 MJ2</comment> + <comment xml:lang="fi">JPEG-2000 MJ2 -video</comment> + <comment xml:lang="hr">JPEG-2000 MJ2 video snimka</comment> + <comment xml:lang="hu">JPEG-2000 MJ2 videó</comment> + <comment xml:lang="id">Video JPEG-2000 MJ2</comment> + <comment xml:lang="it">Video JPEG-2000 MJ2</comment> + <comment xml:lang="kk">JPEG-2000 MJ2 видеосы</comment> + <comment xml:lang="ko">JPEG-2000 MJ2 동영상</comment> + <comment xml:lang="pl">Plik wideo MJ2 JPEG-2000</comment> + <comment xml:lang="pt_BR">Imagem MJ2 de JPEG-2000</comment> + <comment xml:lang="ru">Видео JPEG-2000 MJ2</comment> + <comment xml:lang="sk">Video JPEG-2000 MJ2</comment> + <comment xml:lang="sv">JPEG-2000 MJ2-bild</comment> + <comment xml:lang="uk">зображення MJ2 JPEG-2000</comment> + <comment xml:lang="zh_CN">JPEG-2000 MJ2 视频</comment> + <comment xml:lang="zh_TW">JPEG-2000 MJ2 視訊</comment> + <acronym>MJ2</acronym> + <expanded-acronym>Motion JPEG-2000</expanded-acronym> + <magic priority="50"> + <match value="\x00\x00\x00\x0c\x6a\x50\x20\x20\x0d\x0a\x87\x0a mjp2" type="string" offset="0" mask="0xffffffffffffffffffffffff0000000000000000ffffffff"/> + </magic> + <glob pattern="*.mj2"/> + <glob pattern="*.mjp2"/> </mime-type> <mime-type type="image/openraster"> <comment>OpenRaster archiving image</comment> @@ -24807,14 +25649,14 @@ <comment xml:lang="pt">imagem arquivo OpenRaster</comment> <comment xml:lang="pt_BR">Imagem de arquivamento OpenRaster</comment> <comment xml:lang="ro">Arhivă imagine OpenRaster</comment> - <comment xml:lang="ru">архивное изображение OpenRaster</comment> + <comment xml:lang="ru">Архивное изображение OpenRaster</comment> <comment xml:lang="sk">Archivačný obrázok OpenRaster</comment> <comment xml:lang="sl">Odtis arhiva OpenRaster</comment> <comment xml:lang="sr">слика Опен Растер архивирања</comment> <comment xml:lang="sv">OpenRaster-arkivbild</comment> <comment xml:lang="tr">OpenRaster arşivleme görüntüsü</comment> <comment xml:lang="uk">архівоване зображення OpenRaster</comment> - <comment xml:lang="zh_CN">OpenRaster 归档映像</comment> + <comment xml:lang="zh_CN">OpenRaster 归档图像</comment> <comment xml:lang="zh_TW">OpenRaster 封存影像</comment> <sub-class-of type="application/zip"/> <magic priority="70"> @@ -24864,7 +25706,7 @@ <comment xml:lang="pt">superfície DirectDraw</comment> <comment xml:lang="pt_BR">Superfície do DirectDraw</comment> <comment xml:lang="ro">Suprafață DirectDraw</comment> - <comment xml:lang="ru">плоскость DirectDraw</comment> + <comment xml:lang="ru">Плоскость DirectDraw</comment> <comment xml:lang="sk">Plocha DirectDraw</comment> <comment xml:lang="sl">Datoteka predmeta DirectDraw</comment> <comment xml:lang="sq">Superfaqe DirectDraw</comment> @@ -24899,7 +25741,7 @@ <comment xml:lang="ga">cúrsóir X11</comment> <comment xml:lang="gl">Cursor X11</comment> <comment xml:lang="he">סמן של X11</comment> - <comment xml:lang="hr">X11 kursor</comment> + <comment xml:lang="hr">X11 pokazivač</comment> <comment xml:lang="hu">X11 kurzor</comment> <comment xml:lang="ia">Cursor X11</comment> <comment xml:lang="id">Kursor X11</comment> @@ -24917,7 +25759,7 @@ <comment xml:lang="pt">cursor X11</comment> <comment xml:lang="pt_BR">Cursor do X11</comment> <comment xml:lang="ro">Cursor X11</comment> - <comment xml:lang="ru">курсор X11</comment> + <comment xml:lang="ru">Курсор X11</comment> <comment xml:lang="sk">Kurzor X11</comment> <comment xml:lang="sl">Datoteka kazalke X11</comment> <comment xml:lang="sq">Kursor X11</comment> @@ -24971,7 +25813,7 @@ <comment xml:lang="pt">imagem EXR</comment> <comment xml:lang="pt_BR">Imagem EXR</comment> <comment xml:lang="ro">Imagine EXR</comment> - <comment xml:lang="ru">изображение EXR</comment> + <comment xml:lang="ru">Изображение EXR</comment> <comment xml:lang="sk">Obrázok EXR</comment> <comment xml:lang="sl">Slikovna datoteka EXR</comment> <comment xml:lang="sq">Figurë EXR</comment> @@ -25026,7 +25868,7 @@ <comment xml:lang="pt">desenho Quickdraw/PICT de Macintosh</comment> <comment xml:lang="pt_BR">Desenho do Macintosh Quickdraw/PICT</comment> <comment xml:lang="ro">Desen Macintosh Quickdraw/PICT</comment> - <comment xml:lang="ru">рисунок Macintosh Quickdraw/PICT</comment> + <comment xml:lang="ru">Рисунок Macintosh Quickdraw/PICT</comment> <comment xml:lang="sk">Kresba Macintosh QuickDraw/PICT</comment> <comment xml:lang="sl">Datoteka risbe Macintosh Quickdraw/PICT</comment> <comment xml:lang="sq">Vizatim Macintosh Quickdraw/PICT</comment> @@ -25097,7 +25939,7 @@ <comment xml:lang="pt">imagem UFRaw ID</comment> <comment xml:lang="pt_BR">Imagem ID do UFRaw</comment> <comment xml:lang="ro">ID imagine UFRaw</comment> - <comment xml:lang="ru">изображение UFRaw ID</comment> + <comment xml:lang="ru">Изображение UFRaw ID</comment> <comment xml:lang="sk">Obrázok ID UFRaw</comment> <comment xml:lang="sl">Slikovna datoteka UFRaw ID</comment> <comment xml:lang="sq">Figurë UFRaw ID</comment> @@ -25130,7 +25972,7 @@ <comment xml:lang="fi">digitaalinen raakakuva</comment> <comment xml:lang="fo">talgild rámynd</comment> <comment xml:lang="fr">image brute numérique</comment> - <comment xml:lang="ga">amhíomhá digiteach</comment> + <comment xml:lang="ga">amhíomhá dhigiteach</comment> <comment xml:lang="gl">imaxe en bruto dixital</comment> <comment xml:lang="he">תמונה דיגטלית גולמית</comment> <comment xml:lang="hr">Digitalna osnovna slika</comment> @@ -25151,7 +25993,7 @@ <comment xml:lang="pt">imagem digital em bruto</comment> <comment xml:lang="pt_BR">Imagem digital bruta</comment> <comment xml:lang="ro">imagine digitală brută</comment> - <comment xml:lang="ru">необработанные цифровые изображения</comment> + <comment xml:lang="ru">Необработанное цифровое изображение</comment> <comment xml:lang="sk">Digitálny surový obrázok</comment> <comment xml:lang="sl">surova digitalna slika</comment> <comment xml:lang="sq">Figurë raw dixhitale</comment> @@ -25201,7 +26043,7 @@ <comment xml:lang="pt">negativo Adobe DNG</comment> <comment xml:lang="pt_BR">Negativo DNG da Adobe</comment> <comment xml:lang="ro">Negativ Adobe DNG</comment> - <comment xml:lang="ru">негатив Adobe DNG</comment> + <comment xml:lang="ru">Негатив Adobe DNG</comment> <comment xml:lang="sk">Adobe Digital Negative (DNG)</comment> <comment xml:lang="sl">Datoteka negativa Adobe DNG</comment> <comment xml:lang="sq">Negativ Adobe DNG</comment> @@ -25258,7 +26100,7 @@ <comment xml:lang="pt">imagem em bruto Canon CRW</comment> <comment xml:lang="pt_BR">Imagem bruta CRW da Canon</comment> <comment xml:lang="ro">Imagine brută Canon CRW</comment> - <comment xml:lang="ru">необработанное изображение Canon CRW</comment> + <comment xml:lang="ru">Необработанное изображение Canon CRW</comment> <comment xml:lang="sk">Surový obrázok Canon CRW</comment> <comment xml:lang="sl">Surova slikovna datoteka Canon CRW</comment> <comment xml:lang="sq">Figurë raw Canon CRW</comment> @@ -25267,7 +26109,7 @@ <comment xml:lang="tr">Canon CRW ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив CRW Canon</comment> <comment xml:lang="vi">Ảnh thô Canon CRW</comment> - <comment xml:lang="zh_CN">Canon CRW 原始图像</comment> + <comment xml:lang="zh_CN">佳能 CRW 原始图像</comment> <comment xml:lang="zh_TW">Canon CRW 原生影像</comment> <acronym>CRW</acronym> <expanded-acronym>Canon RaW</expanded-acronym> @@ -25316,7 +26158,7 @@ <comment xml:lang="pt">imagem em bruto Canon CR2</comment> <comment xml:lang="pt_BR">Imagem bruta CR2 da Canon</comment> <comment xml:lang="ro">Imagine brută Canon CR2</comment> - <comment xml:lang="ru">необработанное изображение Canon CR2</comment> + <comment xml:lang="ru">Необработанное изображение Canon CR2</comment> <comment xml:lang="sk">Surový obrázok Canon CR2</comment> <comment xml:lang="sl">Surova slikovna datoteka Canon CR2</comment> <comment xml:lang="sq">Figurë raw Canon CR2</comment> @@ -25325,7 +26167,7 @@ <comment xml:lang="tr">Canon CR2 ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив CR2 Canon</comment> <comment xml:lang="vi">Ảnh thô Canon CR2</comment> - <comment xml:lang="zh_CN">Canon CR2 原始图像</comment> + <comment xml:lang="zh_CN">佳能 CR2 原始图像</comment> <comment xml:lang="zh_TW">Canon CR2 原生影像</comment> <acronym>CR2</acronym> <expanded-acronym>Canon Raw 2</expanded-acronym> @@ -25371,7 +26213,7 @@ <comment xml:lang="pt">imagem em bruto Fuji RAF</comment> <comment xml:lang="pt_BR">Imagem bruta RAF da Fuji</comment> <comment xml:lang="ro">Imagine brută Fuji RAF</comment> - <comment xml:lang="ru">необработанное изображение Fuji RAF</comment> + <comment xml:lang="ru">Необработанное изображение Fuji RAF</comment> <comment xml:lang="sk">Surový obrázok Fuji RAF</comment> <comment xml:lang="sl">Surova slikovna datoteka Fuji RAF</comment> <comment xml:lang="sq">Figurë raw Fuji RAF</comment> @@ -25380,7 +26222,7 @@ <comment xml:lang="tr">Fuji RAF ham görüntüsü</comment> <comment xml:lang="uk">Цифровий негатив RAF Fuji</comment> <comment xml:lang="vi">Ảnh thô Fuji RAF</comment> - <comment xml:lang="zh_CN">富士RAF 原始图像</comment> + <comment xml:lang="zh_CN">富士 RAF 原始图像</comment> <comment xml:lang="zh_TW">Fuji RAF 原生影像</comment> <acronym>RAF</acronym> <expanded-acronym>RAw Format</expanded-acronym> @@ -25427,7 +26269,7 @@ <comment xml:lang="pt">imagem em bruto Kodak DCR</comment> <comment xml:lang="pt_BR">Imagem bruta DCR da Kodak</comment> <comment xml:lang="ro">Imagine brută Kodak DCR</comment> - <comment xml:lang="ru">необработанное изображение Kodak DCR</comment> + <comment xml:lang="ru">Необработанное изображение Kodak DCR</comment> <comment xml:lang="sk">Surový obrázok Kodak DCR</comment> <comment xml:lang="sl">Surova slikovna datoteka Kodak DCR</comment> <comment xml:lang="sq">Figurë raw Kodak DCR</comment> @@ -25436,7 +26278,7 @@ <comment xml:lang="tr">Kodak DCR ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив DCR Kodak</comment> <comment xml:lang="vi">Ảnh thô Kodak DCR</comment> - <comment xml:lang="zh_CN">Kodak DCR 原始图像</comment> + <comment xml:lang="zh_CN">柯达 DCR 原始图像</comment> <comment xml:lang="zh_TW">Kodak DCR 原生影像</comment> <acronym>DCR</acronym> <expanded-acronym>Digital Camera Raw</expanded-acronym> @@ -25481,7 +26323,7 @@ <comment xml:lang="pt">imagem em bruto Kodak K25</comment> <comment xml:lang="pt_BR">Imagem bruta K25 da Kodak</comment> <comment xml:lang="ro">Imagine brută Kodak K25</comment> - <comment xml:lang="ru">необработанное изображение Kodak K25</comment> + <comment xml:lang="ru">Необработанное изображение Kodak K25</comment> <comment xml:lang="sk">Surový obrázok Kodak K25</comment> <comment xml:lang="sl">Surova slikovna datoteka Kodak K25</comment> <comment xml:lang="sq">Figurë raw Kodak K25</comment> @@ -25490,7 +26332,7 @@ <comment xml:lang="tr">Kodak K25 ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив K25 Kodak</comment> <comment xml:lang="vi">Ảnh thô Kodak K25</comment> - <comment xml:lang="zh_CN">Kodak K25 原始图像</comment> + <comment xml:lang="zh_CN">柯达 K25 原始图像</comment> <comment xml:lang="zh_TW">Kodak K25 原生影像</comment> <acronym>K25</acronym> <expanded-acronym>Kodak DC25</expanded-acronym> @@ -25535,7 +26377,7 @@ <comment xml:lang="pt">imagem em bruto Kodak KDC</comment> <comment xml:lang="pt_BR">Imagem bruta KDC da Kodak</comment> <comment xml:lang="ro">Imagine brută Kodak KDC</comment> - <comment xml:lang="ru">необработанное изображение Kodak KDC</comment> + <comment xml:lang="ru">Необработанное изображение Kodak KDC</comment> <comment xml:lang="sk">Surový obrázok Kodak KDC</comment> <comment xml:lang="sl">Surova slikovna datoteka Kodak KDC</comment> <comment xml:lang="sq">Figurë raw Kodak KDC</comment> @@ -25544,7 +26386,7 @@ <comment xml:lang="tr">Kodak KDC ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив KDC Kodak</comment> <comment xml:lang="vi">Ảnh thô Kodak KDC</comment> - <comment xml:lang="zh_CN">Kodak KDC 原始图像</comment> + <comment xml:lang="zh_CN">柯达 KDC 原始图像</comment> <comment xml:lang="zh_TW">Kodak KDC 原生影像</comment> <acronym>KDC</acronym> <expanded-acronym>Kodak Digital Camera</expanded-acronym> @@ -25592,7 +26434,7 @@ <comment xml:lang="pt">imagem em bruto Minolta MRW</comment> <comment xml:lang="pt_BR">Imagem bruta MRW do Minolta</comment> <comment xml:lang="ro">Imagine brută Minolta MRW</comment> - <comment xml:lang="ru">необработанное изображение Minolta MRW</comment> + <comment xml:lang="ru">Необработанное изображение Minolta MRW</comment> <comment xml:lang="sk">Surový obrázok Minolta MRW</comment> <comment xml:lang="sl">Surova slikovna datoteka Minolta MRW</comment> <comment xml:lang="sq">Figurë raw Minolta MRW</comment> @@ -25601,7 +26443,7 @@ <comment xml:lang="tr">Minolta MRW ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив MRW Minolta</comment> <comment xml:lang="vi">Ảnh thô Minolta MRW</comment> - <comment xml:lang="zh_CN">Minolta MRW 原始图像</comment> + <comment xml:lang="zh_CN">美能达 MRW 原始图像</comment> <comment xml:lang="zh_TW">Minolta MRW 原生影像</comment> <acronym>MRW</acronym> <expanded-acronym>Minolta RaW</expanded-acronym> @@ -25648,7 +26490,7 @@ <comment xml:lang="pt">imagem em bruto Nikon NEF</comment> <comment xml:lang="pt_BR">Imagem bruta NEF da Nikon</comment> <comment xml:lang="ro">Imagine brută Nikon NEF</comment> - <comment xml:lang="ru">необработанное изображение Nikon NEF</comment> + <comment xml:lang="ru">Необработанное изображение Nikon NEF</comment> <comment xml:lang="sk">Surový obrázok Nikon NEF</comment> <comment xml:lang="sl">Surova slikovna datoteka Nikon NEF</comment> <comment xml:lang="sq">Figurë raw Nikon NEF</comment> @@ -25657,7 +26499,7 @@ <comment xml:lang="tr">Nikon NEF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив NEF Nikon</comment> <comment xml:lang="vi">Ảnh thô Nikon NEF</comment> - <comment xml:lang="zh_CN">Nikon NEF 原始图像</comment> + <comment xml:lang="zh_CN">尼康 NEF 原始图像</comment> <comment xml:lang="zh_TW">Nikon NEF 原生影像</comment> <acronym>NEF</acronym> <expanded-acronym>Nikon Electronic Format</expanded-acronym> @@ -25703,7 +26545,7 @@ <comment xml:lang="pt">imagem em bruto Olympus ORF</comment> <comment xml:lang="pt_BR">Imagem bruta ORF da Olympus</comment> <comment xml:lang="ro">Imagine brută Olympus ORF</comment> - <comment xml:lang="ru">необработанное изображение Olympus ORF</comment> + <comment xml:lang="ru">Необработанное изображение Olympus ORF</comment> <comment xml:lang="sk">Surový obrázok Olympus ORF</comment> <comment xml:lang="sl">Surova slikovna datoteka Olympus ORF</comment> <comment xml:lang="sq">Figurë raw Olympus ORF</comment> @@ -25712,7 +26554,7 @@ <comment xml:lang="tr">Olympus ORF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив ORF Olympus</comment> <comment xml:lang="vi">Ảnh thô Olympus ORF</comment> - <comment xml:lang="zh_CN">Olympus ORF 原始图像</comment> + <comment xml:lang="zh_CN">奥林巴斯 ORF 原始图像</comment> <comment xml:lang="zh_TW">Olympus ORF 原生影像</comment> <acronym>ORF</acronym> <expanded-acronym>Olympus Raw Format</expanded-acronym> @@ -25727,7 +26569,7 @@ </magic> <glob pattern="*.orf"/> </mime-type> - <mime-type type="image/x-panasonic-raw"> + <mime-type type="image/x-panasonic-rw"> <comment>Panasonic raw image</comment> <comment xml:lang="ar">صورة Panasonic خامة</comment> <comment xml:lang="be@latin">Suvoraja vyjava Panasonic</comment> @@ -25764,7 +26606,7 @@ <comment xml:lang="pt">imagem em bruto Panasonic</comment> <comment xml:lang="pt_BR">Imagem bruta da Panasonic</comment> <comment xml:lang="ro">Imagine brută Panasonic</comment> - <comment xml:lang="ru">необработанное изображение Panasonic</comment> + <comment xml:lang="ru">Необработанное изображение Panasonic</comment> <comment xml:lang="sk">Surový obrázok Panasonic</comment> <comment xml:lang="sl">Surova slikovna datoteka Panasonic</comment> <comment xml:lang="sq">Figurë raw Panasonic</comment> @@ -25773,7 +26615,7 @@ <comment xml:lang="tr">Panasonic ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив Panasonic</comment> <comment xml:lang="vi">Ảnh thô Panasonic</comment> - <comment xml:lang="zh_CN">Panasonic 原始图像</comment> + <comment xml:lang="zh_CN">松下原始图像</comment> <comment xml:lang="zh_TW">Panasonic 原生影像</comment> <sub-class-of type="image/x-dcraw"/> <magic priority="50"> @@ -25781,8 +26623,9 @@ <match value="IIU\x00\x08\x00\x00\x00" type="string" offset="0"/> </magic> <glob pattern="*.raw"/> + <alias type="image/x-panasonic-raw"/> </mime-type> - <mime-type type="image/x-panasonic-raw2"> + <mime-type type="image/x-panasonic-rw2"> <comment>Panasonic raw2 image</comment> <comment xml:lang="bg">Изображение — Panasonic raw2</comment> <comment xml:lang="ca">imatge «RAW2» de Panasonic</comment> @@ -25795,6 +26638,7 @@ <comment xml:lang="eu">Panasonic raw2 irudia</comment> <comment xml:lang="fi">Panasonic raw2 -kuva</comment> <comment xml:lang="fr">image raw2 Panasonic</comment> + <comment xml:lang="ga">íomhá raw2 Panasonic</comment> <comment xml:lang="gl">imaxe en bruto raw2 de Panasonic</comment> <comment xml:lang="he">תמונת raw2 של Panasonic</comment> <comment xml:lang="hr">Panasonic raw2 image</comment> @@ -25811,14 +26655,14 @@ <comment xml:lang="pl">Obraz raw2 Panasonic</comment> <comment xml:lang="pt">imagem em bruto Panasonic</comment> <comment xml:lang="pt_BR">Imagem raw2 da Panasonic</comment> - <comment xml:lang="ru">необработанное изображение Panasonic RAW 2</comment> + <comment xml:lang="ru">Необработанное изображение Panasonic raw2</comment> <comment xml:lang="sk">Surový obrázok Panasonic raw2</comment> <comment xml:lang="sl">Slikovna datoteka Panasonic raw2</comment> <comment xml:lang="sr">Панасоник сирова2 слика</comment> <comment xml:lang="sv">Panasonic raw2-bild</comment> <comment xml:lang="tr">Panasonic raw2 görüntüsü</comment> <comment xml:lang="uk">зображення формату raw2 Panasonic</comment> - <comment xml:lang="zh_CN">Panasonic raw2 图像</comment> + <comment xml:lang="zh_CN">松下 raw2 图像</comment> <comment xml:lang="zh_TW">Panasonic raw2 影像</comment> <sub-class-of type="image/x-dcraw"/> <magic priority="50"> @@ -25826,6 +26670,7 @@ <match value="IIU\x00\x18\x00\x00\x00" type="string" offset="0"/> </magic> <glob pattern="*.rw2"/> + <alias type="image/x-panasonic-raw2"/> </mime-type> <mime-type type="image/x-pentax-pef"> <comment>Pentax PEF raw image</comment> @@ -25864,7 +26709,7 @@ <comment xml:lang="pt">imagem em bruto Pentax PEF</comment> <comment xml:lang="pt_BR">Imagem bruta PEF da Pentax</comment> <comment xml:lang="ro">Imagine brută Pentax PEF</comment> - <comment xml:lang="ru">необработанное изображение Pentax PEF</comment> + <comment xml:lang="ru">Необработанное изображение Pentax PEF</comment> <comment xml:lang="sk">Surový obrázok Pentax PEF</comment> <comment xml:lang="sl">Surova slikovna datoteka Pentax PEF</comment> <comment xml:lang="sq">Figurë raw Pentax PEF</comment> @@ -25873,7 +26718,7 @@ <comment xml:lang="tr">Pentax PEF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив PEF Pentax</comment> <comment xml:lang="vi">Ảnh thô Pentax PEF</comment> - <comment xml:lang="zh_CN">Pentax PEF 原始图像</comment> + <comment xml:lang="zh_CN">宾得 PEF 原始图像</comment> <comment xml:lang="zh_TW">Pentax PEF 原生影像</comment> <acronym>PEF</acronym> <expanded-acronym>Pentax Electronic Format</expanded-acronym> @@ -25918,7 +26763,7 @@ <comment xml:lang="pt">imagem em bruto Sigma X3F</comment> <comment xml:lang="pt_BR">Imagem bruta X3F da Sigma</comment> <comment xml:lang="ro">Imagine brută Sigma X3F</comment> - <comment xml:lang="ru">необработанное изображение Sigma X3F</comment> + <comment xml:lang="ru">Необработанное изображение Sigma X3F</comment> <comment xml:lang="sk">Surový obrázok Sigma X3F</comment> <comment xml:lang="sl">Surova slikovna datoteka Sigma X3F</comment> <comment xml:lang="sq">Fifurë raw Sigma X3F</comment> @@ -25927,7 +26772,7 @@ <comment xml:lang="tr">Sigma X3F ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив X3F Sigma</comment> <comment xml:lang="vi">Ảnh thô Sigma X3F</comment> - <comment xml:lang="zh_CN">Sigma X3F 原始图像</comment> + <comment xml:lang="zh_CN">适马 X3F 原始图像</comment> <comment xml:lang="zh_TW">Sigma X3F 原生影像</comment> <acronym>X3F</acronym> <expanded-acronym>X3 Foveon</expanded-acronym> @@ -25978,7 +26823,7 @@ <comment xml:lang="pt">imagem em bruto Sony SRF</comment> <comment xml:lang="pt_BR">Imagem bruta SRF da Sony</comment> <comment xml:lang="ro">Imagine brută Sony SRF</comment> - <comment xml:lang="ru">необработанное изображение Sony SRF</comment> + <comment xml:lang="ru">Необработанное изображение Sony SRF</comment> <comment xml:lang="sk">Surový obrázok Sony SRF</comment> <comment xml:lang="sl">Surova slikovna datoteka Sony SRF</comment> <comment xml:lang="sq">Figurë raw Sony SRF</comment> @@ -25987,7 +26832,7 @@ <comment xml:lang="tr">Sony SRF ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив SRF Sony</comment> <comment xml:lang="vi">Ảnh thô Sony SRF</comment> - <comment xml:lang="zh_CN">Sony SRF 原始映像</comment> + <comment xml:lang="zh_CN">索尼 SRF 原始映像</comment> <comment xml:lang="zh_TW">Sony SRF 原生影像</comment> <acronym>SRF</acronym> <expanded-acronym>Sony Raw Format</expanded-acronym> @@ -26032,7 +26877,7 @@ <comment xml:lang="pt">imagem em bruto Sony SR2</comment> <comment xml:lang="pt_BR">Imagem bruta SR2 da Sony</comment> <comment xml:lang="ro">Imagine brută Sony SR2</comment> - <comment xml:lang="ru">необработанное изображение Sony SR2</comment> + <comment xml:lang="ru">Необработанное изображение Sony SR2</comment> <comment xml:lang="sk">Surový obrázok Sony SR2</comment> <comment xml:lang="sl">Surova slikovna datoteka Sony SR2</comment> <comment xml:lang="sq">Figurë raw Sony SR2</comment> @@ -26041,7 +26886,7 @@ <comment xml:lang="tr">Sony SR2 ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив SR2 Sony</comment> <comment xml:lang="vi">Ảnh thô Sony SR2</comment> - <comment xml:lang="zh_CN">Sony SR2 原始映像</comment> + <comment xml:lang="zh_CN">索尼 SR2 原始映像</comment> <comment xml:lang="zh_TW">Sony SR2 原生影像</comment> <acronym>SR2</acronym> <expanded-acronym>Sony Raw format 2</expanded-acronym> @@ -26086,7 +26931,7 @@ <comment xml:lang="pt">imagem em bruto Sony ARW</comment> <comment xml:lang="pt_BR">Imagem bruta ARW da Sony</comment> <comment xml:lang="ro">Imagine brută Sony ARW</comment> - <comment xml:lang="ru">необработанное изображение Sony ARW</comment> + <comment xml:lang="ru">Необработанное изображение Sony ARW</comment> <comment xml:lang="sk">Surový obrázok Sony ARW</comment> <comment xml:lang="sl">Surova slikovna datoteka Sony ARW</comment> <comment xml:lang="sq">Figurë raw Sony ARW</comment> @@ -26095,7 +26940,7 @@ <comment xml:lang="tr">Sony ARW ham görüntüsü</comment> <comment xml:lang="uk">цифровий негатив ARW Sony</comment> <comment xml:lang="vi">Ảnh thô Sony ARW</comment> - <comment xml:lang="zh_CN">Sony ARW 原始映像</comment> + <comment xml:lang="zh_CN">索尼 ARW 原始映像</comment> <comment xml:lang="zh_TW">Sony ARW 原生影像</comment> <acronym>ARW</acronym> <expanded-acronym>Alpha Raw format</expanded-acronym> @@ -26144,7 +26989,7 @@ <comment xml:lang="pt">imagem PNG</comment> <comment xml:lang="pt_BR">Imagem PNG</comment> <comment xml:lang="ro">Imagine PNG</comment> - <comment xml:lang="ru">изображение PNG</comment> + <comment xml:lang="ru">Изображение PNG</comment> <comment xml:lang="sk">Obrázok PNG</comment> <comment xml:lang="sl">Slikovna datoteka PNG</comment> <comment xml:lang="sq">Figurë PNG</comment> @@ -26175,7 +27020,7 @@ <comment xml:lang="eu">'Run Lenght Encoded' bitmap irudia</comment> <comment xml:lang="fi">RLE-koodattu bittikartta</comment> <comment xml:lang="fr">image matricielle Run Length Encoded</comment> - <comment xml:lang="ga">íomhá mhapa giotáin Run Length Encoded</comment> + <comment xml:lang="ga">íomhá ghiotánmhapach ionchódaithe fad reatha</comment> <comment xml:lang="gl">mapa de bits con codificación do tamaño durante a execución</comment> <comment xml:lang="he">מקודד מפת סיביות של Run Length</comment> <comment xml:lang="hr">Run Length Encoded bitmap slika</comment> @@ -26196,7 +27041,7 @@ <comment xml:lang="pt">mapa de bitas Run Length Encoded</comment> <comment xml:lang="pt_BR">Classe de comprimento imagem bitmap codificada</comment> <comment xml:lang="ro">Imagine bitmap codată RLE</comment> - <comment xml:lang="ru">растровое изображение (сжатое RLE)</comment> + <comment xml:lang="ru">Растровое изображение, сжатое RLE</comment> <comment xml:lang="sk">Bitmapový obrázok Run Length Encoded</comment> <comment xml:lang="sl">Zaporedno kodirana bitna slika (RLE)</comment> <comment xml:lang="sq">Figurë bitmap RLE (Run Length Encoded)</comment> @@ -26247,7 +27092,7 @@ <comment xml:lang="pt">imagem SVG</comment> <comment xml:lang="pt_BR">Imagem SVG</comment> <comment xml:lang="ro">Imagine SVG</comment> - <comment xml:lang="ru">изображение SVG</comment> + <comment xml:lang="ru">Изображение SVG</comment> <comment xml:lang="sk">Obrázok SVG</comment> <comment xml:lang="sl">Slikovna vektorska datoteka SVG</comment> <comment xml:lang="sq">Figurë SVG</comment> @@ -26287,7 +27132,7 @@ <comment xml:lang="ga">íomhá SVG comhbhrúite</comment> <comment xml:lang="gl">imaxe SVG comprimida</comment> <comment xml:lang="he">תמונת SVG מכווצת</comment> - <comment xml:lang="hr">komprimirana SVG slika</comment> + <comment xml:lang="hr">Sažeta SVG slika</comment> <comment xml:lang="hu">tömörített SVG kép</comment> <comment xml:lang="ia">Imagine SVG comprimite</comment> <comment xml:lang="id">Citra SVG terkompresi</comment> @@ -26305,7 +27150,7 @@ <comment xml:lang="pt">imagem SVG comprimida</comment> <comment xml:lang="pt_BR">Imagem SVG compactada</comment> <comment xml:lang="ro">imagine comprimată SVG</comment> - <comment xml:lang="ru">сжатое изображение SVG</comment> + <comment xml:lang="ru">Сжатое изображение SVG</comment> <comment xml:lang="sk">Komprimovaný obrázok SVG</comment> <comment xml:lang="sl">Slikovna datoteka SVG (stisnjena)</comment> <comment xml:lang="sq">Figurë SVG e kompresuar</comment> @@ -26360,7 +27205,7 @@ <comment xml:lang="pt">imagem TIFF</comment> <comment xml:lang="pt_BR">Imagem TIFF</comment> <comment xml:lang="ro">Imagine TIFF</comment> - <comment xml:lang="ru">изображение TIFF</comment> + <comment xml:lang="ru">Изображение TIFF</comment> <comment xml:lang="sk">Obrázok TIFF</comment> <comment xml:lang="sl">Slikovna datoteka TIFF</comment> <comment xml:lang="sq">Figurë TIFF</comment> @@ -26389,9 +27234,9 @@ <comment xml:lang="el">Πολυσέλιδη εικόνα TIFF</comment> <comment xml:lang="en_GB">Multi-page TIFF image</comment> <comment xml:lang="es">imagen TIFF de varias páginas</comment> - <comment xml:lang="eu">Orri anitzeko TIFF irudia</comment> <comment xml:lang="fi">Monisivuinen TIFF-kuva</comment> <comment xml:lang="fr">Image TIFF multi-page</comment> + <comment xml:lang="ga">íomhá il-leathanach TIFF</comment> <comment xml:lang="gl">Imaxe TIFF multipáxina</comment> <comment xml:lang="he">תמונת TIFF עם ריבוי עמודים</comment> <comment xml:lang="hr">Višestrana TIFF slika</comment> @@ -26425,7 +27270,7 @@ <comment xml:lang="be@latin">Vyjava AutoCAD</comment> <comment xml:lang="bg">Изображение — AutoCAD</comment> <comment xml:lang="ca">imatge d'AutoCAD</comment> - <comment xml:lang="cs">obrázek AutoCAD</comment> + <comment xml:lang="cs">výkres AutoCAD</comment> <comment xml:lang="cy">Delwedd AutoCAD</comment> <comment xml:lang="da">AutoCAD-billede</comment> <comment xml:lang="de">AutoCAD-Bild</comment> @@ -26460,7 +27305,7 @@ <comment xml:lang="pt">imagem AutoCAD</comment> <comment xml:lang="pt_BR">Imagem do AutoCAD</comment> <comment xml:lang="ro">Imagine AutoCAD</comment> - <comment xml:lang="ru">изображение AutoCAD</comment> + <comment xml:lang="ru">Изображение AutoCAD</comment> <comment xml:lang="sk">Obrázok AutoCAD</comment> <comment xml:lang="sl">Slikovna datoteka AutoCAD</comment> <comment xml:lang="sq">Figurë AutoCAD</comment> @@ -26490,7 +27335,7 @@ <comment xml:lang="fi">DXF-vektorikuva</comment> <comment xml:lang="fo">DXF vektormynd</comment> <comment xml:lang="fr">image vectorielle DXF</comment> - <comment xml:lang="ga">íomhá veicteoir DXF</comment> + <comment xml:lang="ga">íomhá veicteoireach DXF</comment> <comment xml:lang="gl">imaxe de vector DXF</comment> <comment xml:lang="he">תמונת DXF וקטורית</comment> <comment xml:lang="hr">DXF vektorska slika</comment> @@ -26513,7 +27358,7 @@ <comment xml:lang="pt">imagem de vectores DXF</comment> <comment xml:lang="pt_BR">Imagem vetorial DXF</comment> <comment xml:lang="ro">Imagine vectorială DXF</comment> - <comment xml:lang="ru">векторное изображение DXF</comment> + <comment xml:lang="ru">Векторное изображение DXF</comment> <comment xml:lang="sk">Vektorový obrázok DXF</comment> <comment xml:lang="sl">Slikovna vektorska datoteka DXF</comment> <comment xml:lang="sq">Figurë vektoriale DFX</comment> @@ -26533,6 +27378,7 @@ <mime-type type="image/vnd.ms-modi"> <comment>Microsoft Document Imaging format</comment> <comment xml:lang="ar">صيغة مستند تصوير مايكروسوفت</comment> + <comment xml:lang="ast">Formatu d'imáxenes de Microsoft Document</comment> <comment xml:lang="bg">Изображение — Microsoft Document Imaging</comment> <comment xml:lang="ca">format Microsoft Document Imaging</comment> <comment xml:lang="cs">formát Microsoft Document Imaging</comment> @@ -26564,7 +27410,7 @@ <comment xml:lang="pt">formato Microsoft Document Imaging</comment> <comment xml:lang="pt_BR">Formato do Microsoft Document Imaging</comment> <comment xml:lang="ro">Format Microsoft Document Imaging</comment> - <comment xml:lang="ru">формат Microsoft Document Imaging</comment> + <comment xml:lang="ru">Формат Microsoft Document Imaging</comment> <comment xml:lang="sk">Formát Microsoft Document Imaging</comment> <comment xml:lang="sl">Zapis Microsoft Document Imaging</comment> <comment xml:lang="sr">запис слика Мајкрософтовог документа</comment> @@ -26572,7 +27418,7 @@ <comment xml:lang="tr">Microsoft Belge Görüntüleme biçimi</comment> <comment xml:lang="uk">формат Microsoft Document Imaging</comment> <comment xml:lang="vi">Định dạng tạo ảnh tài liệu Microsoft</comment> - <comment xml:lang="zh_CN">Microsoft Document Imaging 扫描图像</comment> + <comment xml:lang="zh_CN">Microsoft Document Imaging 格式</comment> <comment xml:lang="zh_TW">微軟文件影像格式</comment> <acronym>MDI</acronym> <expanded-acronym>Microsoft Document Imaging</expanded-acronym> @@ -26593,6 +27439,7 @@ <comment xml:lang="eu">WebP irudia</comment> <comment xml:lang="fi">WebP-kuva</comment> <comment xml:lang="fr">image WebP</comment> + <comment xml:lang="ga">íomhá WebP</comment> <comment xml:lang="gl">Imaxe WebP</comment> <comment xml:lang="he">תמונת WebP</comment> <comment xml:lang="hr">WebP slika</comment> @@ -26664,7 +27511,7 @@ <comment xml:lang="pt">imagem 3D Studio</comment> <comment xml:lang="pt_BR">Imagem do 3D Studio</comment> <comment xml:lang="ro">Imagine 3D Studio</comment> - <comment xml:lang="ru">сцена 3D Studio</comment> + <comment xml:lang="ru">Сцена 3D Studio</comment> <comment xml:lang="sk">Obrázok 3D Studio</comment> <comment xml:lang="sl">Slikovna datoteka 3D Studio</comment> <comment xml:lang="sq">Figurë 3D Studio</comment> @@ -26717,7 +27564,7 @@ <comment xml:lang="pt">imagem Applix Graphics</comment> <comment xml:lang="pt_BR">Imagem do Applix Graphics</comment> <comment xml:lang="ro">Imagine Applix Graphics</comment> - <comment xml:lang="ru">изображение Applix Graphics</comment> + <comment xml:lang="ru">Изображение Applix Graphics</comment> <comment xml:lang="sk">Obrázok Applix Graphics</comment> <comment xml:lang="sl">Slikovna datoteka Applix Graphics</comment> <comment xml:lang="sq">Figurë Applix Graphics</comment> @@ -26754,7 +27601,7 @@ <comment xml:lang="ga">íomhá EPS (comhbhrúite le bzip)</comment> <comment xml:lang="gl">imaxe EPS (comprimida con bzip)</comment> <comment xml:lang="he">תמונת EPS (מכווץ בbzip)</comment> - <comment xml:lang="hr">EPS slika (komprimirana bzip-om)</comment> + <comment xml:lang="hr">EPS slika (bzip sažeta)</comment> <comment xml:lang="hu">EPS kép (bzip-tömörítésű)</comment> <comment xml:lang="ia">Imagine EPS (comprimite con bzip)</comment> <comment xml:lang="id">Citra EPS (terkompresi bzip)</comment> @@ -26773,7 +27620,7 @@ <comment xml:lang="pt">imagem EPS (compressão bzip)</comment> <comment xml:lang="pt_BR">Imagem EPS (compactada com bzip)</comment> <comment xml:lang="ro">Imagine EPS (compresie bzip)</comment> - <comment xml:lang="ru">изображение EPS (сжатое bzip)</comment> + <comment xml:lang="ru">Изображение EPS (сжатое bzip)</comment> <comment xml:lang="sk">Obrázok EPS (komprimovaný pomocou bzip)</comment> <comment xml:lang="sl">Slikovna datoteka EPS (stisnjena z bzip)</comment> <comment xml:lang="sq">Figurë EPS (e kompresuar me bzip)</comment> @@ -26782,7 +27629,7 @@ <comment xml:lang="tr">EPS görüntüsü (bzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">зображення EPS (стиснене bzip)</comment> <comment xml:lang="vi">Ảnh EPS (đã nén bzip)</comment> - <comment xml:lang="zh_CN">EPS 图像(bzip 压缩)</comment> + <comment xml:lang="zh_CN">EPS 图像（bzip 压缩）</comment> <comment xml:lang="zh_TW">EPS 影像 (bzip 格式壓縮)</comment> <sub-class-of type="application/x-bzip"/> <glob pattern="*.eps.bz2"/> @@ -26831,7 +27678,7 @@ <comment xml:lang="pt">imagem raster CMU</comment> <comment xml:lang="pt_BR">Imagem raster CMU</comment> <comment xml:lang="ro">Imagine raster CMU</comment> - <comment xml:lang="ru">растровое изображение CMU</comment> + <comment xml:lang="ru">Растровое изображение CMU</comment> <comment xml:lang="sk">Rastrový obrázok CMU</comment> <comment xml:lang="sl">Slikovna rastrska datoteka CMU</comment> <comment xml:lang="sq">Figurë raster CMU</comment> @@ -26840,7 +27687,7 @@ <comment xml:lang="tr">CMU tarama görüntüsü</comment> <comment xml:lang="uk">растрове зображення CMU</comment> <comment xml:lang="vi">Ảnh mành CMU</comment> - <comment xml:lang="zh_CN">CMU 矢量图像</comment> + <comment xml:lang="zh_CN">CMU 光栅图像</comment> <comment xml:lang="zh_TW">CMU raster 影像</comment> <glob pattern="*.ras"/> </mime-type> @@ -26881,7 +27728,7 @@ <comment xml:lang="pt">imagem GIMP comprimida</comment> <comment xml:lang="pt_BR">Imagem do GIMP compactada</comment> <comment xml:lang="ro">imagine comprimată GIMP</comment> - <comment xml:lang="ru">сжатое изображение GIMP</comment> + <comment xml:lang="ru">Сжатое изображение GIMP</comment> <comment xml:lang="sk">Komprimovaný obrázok GIMP</comment> <comment xml:lang="sl">Slikovna datoteka GIMP (stisnjena)</comment> <comment xml:lang="sq">Figurë GIMP e kompresuar</comment> @@ -26934,7 +27781,7 @@ <comment xml:lang="pt">imagem DICOM</comment> <comment xml:lang="pt_BR">Imagem DICOM</comment> <comment xml:lang="ro">Imagine DICOM</comment> - <comment xml:lang="ru">изображение DICOM</comment> + <comment xml:lang="ru">Изображение DICOM</comment> <comment xml:lang="sk">Obrázok DICOM</comment> <comment xml:lang="sl">Slikovna datoteka DICOM</comment> <comment xml:lang="sq">Figurë DICOM</comment> @@ -26957,6 +27804,7 @@ <mime-type type="application/x-docbook+xml"> <comment>DocBook document</comment> <comment xml:lang="ar">مستند DocBook</comment> + <comment xml:lang="ast">Documentu DocBook</comment> <comment xml:lang="be@latin">Dakument DocBook</comment> <comment xml:lang="bg">Документ — DocBook</comment> <comment xml:lang="ca">document DocBook</comment> @@ -26993,7 +27841,7 @@ <comment xml:lang="pt">documento DocBook</comment> <comment xml:lang="pt_BR">Documento DocBook</comment> <comment xml:lang="ro">Document DocBook</comment> - <comment xml:lang="ru">документ DocBook</comment> + <comment xml:lang="ru">Документ DocBook</comment> <comment xml:lang="sk">Dokument DocBook</comment> <comment xml:lang="sl">Dokument DocBook</comment> <comment xml:lang="sq">Dokument DocBook</comment> @@ -27056,7 +27904,7 @@ <comment xml:lang="pt">imagem DIB</comment> <comment xml:lang="pt_BR">Imagem DIB</comment> <comment xml:lang="ro">Imagine DIB</comment> - <comment xml:lang="ru">изображение DIB</comment> + <comment xml:lang="ru">Изображение DIB</comment> <comment xml:lang="sk">Obrázok DIB</comment> <comment xml:lang="sl">Slikovna datoteka DIB</comment> <comment xml:lang="sq">Figurë DIB</comment> @@ -27113,7 +27961,7 @@ <comment xml:lang="pt">imagem DjVu</comment> <comment xml:lang="pt_BR">Imagem DjVu</comment> <comment xml:lang="ro">Imagine DjVu</comment> - <comment xml:lang="ru">изображение DjVu</comment> + <comment xml:lang="ru">Изображение DjVu</comment> <comment xml:lang="sk">Obrázok DjVu</comment> <comment xml:lang="sl">Slikovna datoteka DjVu</comment> <comment xml:lang="sq">Figurë DjVu</comment> @@ -27126,7 +27974,7 @@ <comment xml:lang="zh_TW">DjVu 影像</comment> <alias type="image/x-djvu"/> <alias type="image/x.djvu"/> - <magic priority="50"> + <magic priority="80"> <match value="AT&TFORM" type="string" offset="0"> <match value="DJVU" type="string" offset="12"/> </match> @@ -27139,6 +27987,7 @@ </mime-type> <mime-type type="image/vnd.djvu+multipage"> <comment>DjVu document</comment> + <comment xml:lang="ast">Documentu DjVu</comment> <comment xml:lang="ca">document DjVu</comment> <comment xml:lang="cs">dokument DjVu</comment> <comment xml:lang="da">DjVu-dokument</comment> @@ -27149,6 +27998,7 @@ <comment xml:lang="eu">DjVu dokumentua</comment> <comment xml:lang="fi">DjVu-asiakirja</comment> <comment xml:lang="fr">document DjVu</comment> + <comment xml:lang="ga">cáipéis DjVu</comment> <comment xml:lang="he">מסמך DjVu</comment> <comment xml:lang="hr">DjVu dokument</comment> <comment xml:lang="hu">DjVu dokumentum</comment> @@ -27161,7 +28011,7 @@ <comment xml:lang="pl">Dokument DjVu</comment> <comment xml:lang="pt">documento DjVu</comment> <comment xml:lang="pt_BR">Documento DjVu</comment> - <comment xml:lang="ru">документ DjVu</comment> + <comment xml:lang="ru">Документ DjVu</comment> <comment xml:lang="sk">Dokument DjVu</comment> <comment xml:lang="sr">ДјВу документ</comment> <comment xml:lang="sv">DjVu-dokument</comment> @@ -27170,7 +28020,7 @@ <comment xml:lang="zh_CN">DjVu 文档</comment> <comment xml:lang="zh_TW">DjVu 文件</comment> <generic-icon name="x-office-document"/> - <magic priority="50"> + <magic priority="80"> <match value="AT&TFORM" type="string" offset="0"> <match value="DJVM" type="string" offset="12"/> </match> @@ -27221,7 +28071,7 @@ <comment xml:lang="pt">imagem DPX</comment> <comment xml:lang="pt_BR">Imagem DPX</comment> <comment xml:lang="ro">Imagine DPX</comment> - <comment xml:lang="ru">изображение DPX</comment> + <comment xml:lang="ru">Изображение DPX</comment> <comment xml:lang="sk">Obrázok DPX</comment> <comment xml:lang="sl">Slikovna datoteka DPX</comment> <comment xml:lang="sq">Figurë DPX</comment> @@ -27277,7 +28127,7 @@ <comment xml:lang="pt">imagem EPS</comment> <comment xml:lang="pt_BR">Imagem EPS</comment> <comment xml:lang="ro">Imagine EPS</comment> - <comment xml:lang="ru">изображение EPS</comment> + <comment xml:lang="ru">Изображение EPS</comment> <comment xml:lang="sk">Obrázok EPS</comment> <comment xml:lang="sl">Slikovna datoteka EPS</comment> <comment xml:lang="sq">Figurë EPS</comment> @@ -27307,6 +28157,7 @@ <mime-type type="image/fits"> <comment>FITS document</comment> <comment xml:lang="ar">مستند FITS</comment> + <comment xml:lang="ast">Documentu FITS</comment> <comment xml:lang="be@latin">Dakument FITS</comment> <comment xml:lang="bg">Документ — FITS</comment> <comment xml:lang="ca">document FITS</comment> @@ -27343,7 +28194,7 @@ <comment xml:lang="pt">documento FITS</comment> <comment xml:lang="pt_BR">Documento FITS</comment> <comment xml:lang="ro">Document FITS</comment> - <comment xml:lang="ru">документ FITS</comment> + <comment xml:lang="ru">Документ FITS</comment> <comment xml:lang="sk">Dokument FITS</comment> <comment xml:lang="sl">Dokument FITS</comment> <comment xml:lang="sq">Dokument FITS</comment> @@ -27401,7 +28252,7 @@ <comment xml:lang="pt">imagem FPX</comment> <comment xml:lang="pt_BR">Imagem FPX</comment> <comment xml:lang="ro">Imagine FPX</comment> - <comment xml:lang="ru">изображение FPX</comment> + <comment xml:lang="ru">Изображение FPX</comment> <comment xml:lang="sk">Obrázok FPX</comment> <comment xml:lang="sl">Slikovna datoteka FPX</comment> <comment xml:lang="sq">Figurë FPX</comment> @@ -27437,7 +28288,7 @@ <comment xml:lang="ga">íomhá EPS (comhbhrúite le gzip)</comment> <comment xml:lang="gl">imaxe EPS (comprimida con gzip)</comment> <comment xml:lang="he">תמונת EPS (מכווץ ע״י gzip)</comment> - <comment xml:lang="hr">EPS slika (komprimirana gzip-om)</comment> + <comment xml:lang="hr">EPS slika (gzip sažeta)</comment> <comment xml:lang="hu">EPS kép (gzip-tömörítésű)</comment> <comment xml:lang="ia">Imagine EPS (comprimite con gzip)</comment> <comment xml:lang="id">Citra EPS (terkompresi gzip)</comment> @@ -27456,7 +28307,7 @@ <comment xml:lang="pt">imagem EPS (compressão gzip)</comment> <comment xml:lang="pt_BR">Imagem EPS (compactada com gzip)</comment> <comment xml:lang="ro">Imagine EPS (compresie gzip)</comment> - <comment xml:lang="ru">изображение EPS (сжатое gzip)</comment> + <comment xml:lang="ru">Изображение EPS (сжатое gzip)</comment> <comment xml:lang="sk">Obrázok EPS (komprimovaný pomocou gzip)</comment> <comment xml:lang="sl">Slikovna datoteka EPS (stisnjena z gzip)</comment> <comment xml:lang="sq">Figurë EPS (e kompresuar me gzip)</comment> @@ -27465,7 +28316,7 @@ <comment xml:lang="tr">EPS görüntüsü (gzip ile sıkıştırılmış)</comment> <comment xml:lang="uk">зображення EPS (стиснене gzip)</comment> <comment xml:lang="vi">Ảnh EPS (đã nén gzip)</comment> - <comment xml:lang="zh_CN">EPS 图像(gzip 压缩)</comment> + <comment xml:lang="zh_CN">EPS 图像（gzip 压缩）</comment> <comment xml:lang="zh_TW">EPS 影像 (gzip 格式壓縮)</comment> <sub-class-of type="application/gzip"/> <glob pattern="*.eps.gz"/> @@ -27484,6 +28335,7 @@ <comment xml:lang="eu">Windows ikonoa</comment> <comment xml:lang="fi">Windows-kuvake</comment> <comment xml:lang="fr">icône Windows</comment> + <comment xml:lang="ga">deilbhín Windows</comment> <comment xml:lang="he">סמל של Windows</comment> <comment xml:lang="hr">Windows ikona</comment> <comment xml:lang="hu">Windows ikon</comment> @@ -27496,7 +28348,7 @@ <comment xml:lang="pl">Ikona Windows</comment> <comment xml:lang="pt">ícone Windows</comment> <comment xml:lang="pt_BR">Ícone do Windows</comment> - <comment xml:lang="ru">значок Windows</comment> + <comment xml:lang="ru">Значок Windows</comment> <comment xml:lang="sk">Ikona Windows</comment> <comment xml:lang="sl">Ikona Windows</comment> <comment xml:lang="sr">Иконица Виндоуза</comment> @@ -27557,7 +28409,7 @@ <comment xml:lang="pt">ćone MacOS X</comment> <comment xml:lang="pt_BR">Ícone do MacOS X</comment> <comment xml:lang="ro">Iconiță MacOS X</comment> - <comment xml:lang="ru">значок MacOS X</comment> + <comment xml:lang="ru">Значок MacOS X</comment> <comment xml:lang="sk">Ikona MacOS X</comment> <comment xml:lang="sl">Datoteka ikone MacOS X</comment> <comment xml:lang="sq">Ikonë MacOS X</comment> @@ -27614,7 +28466,7 @@ <comment xml:lang="pt">imagem ILBM</comment> <comment xml:lang="pt_BR">Imagem ILBM</comment> <comment xml:lang="ro">Imagine ILBM</comment> - <comment xml:lang="ru">изображение ILBM</comment> + <comment xml:lang="ru">Изображение ILBM</comment> <comment xml:lang="sk">Obrázok ILMB</comment> <comment xml:lang="sl">Slikovna datoteka ILBM</comment> <comment xml:lang="sq">Figurë ILBM</comment> @@ -27678,7 +28530,7 @@ <comment xml:lang="pt">imagem JNG</comment> <comment xml:lang="pt_BR">Imagem JNG</comment> <comment xml:lang="ro">Imagine JNG</comment> - <comment xml:lang="ru">изображение JNG</comment> + <comment xml:lang="ru">Изображение JNG</comment> <comment xml:lang="sk">Obrázok JNG</comment> <comment xml:lang="sl">Slikovna datoteka JNG</comment> <comment xml:lang="sq">Figurë JNG</comment> @@ -27734,7 +28586,7 @@ <comment xml:lang="pt">Objecto LightWave</comment> <comment xml:lang="pt_BR">Objeto LightWave</comment> <comment xml:lang="ro">Obiect LightWave</comment> - <comment xml:lang="ru">объект LightWave</comment> + <comment xml:lang="ru">Объект LightWave</comment> <comment xml:lang="sk">Objekt LightWave</comment> <comment xml:lang="sl">Datoteka predmeta LightWave</comment> <comment xml:lang="sq">Objekt LightWave</comment> @@ -27789,7 +28641,7 @@ <comment xml:lang="pt">cenário LightWave</comment> <comment xml:lang="pt_BR">Cena LightWave</comment> <comment xml:lang="ro">Scenă LightWave</comment> - <comment xml:lang="ru">сцена LightWave</comment> + <comment xml:lang="ru">Сцена LightWave</comment> <comment xml:lang="sk">Scéna LightWave</comment> <comment xml:lang="sl">Datoteka scene LightWave</comment> <comment xml:lang="sq">Skenë LightWave</comment> @@ -27818,7 +28670,7 @@ <comment xml:lang="fi">MacPaint-bittikartta</comment> <comment xml:lang="fo">MacPaint Bitmap mynd</comment> <comment xml:lang="fr">image matricielle MacPaint</comment> - <comment xml:lang="ga">íomhá MacPaint Bitmap</comment> + <comment xml:lang="ga">íomhá ghiotánmhapach MacPaint</comment> <comment xml:lang="gl">imaxe de mapa de bits MacPaint</comment> <comment xml:lang="he">תמונת מפת-סיביות של MacPaint</comment> <comment xml:lang="hr">MacPaint Bitmap slika</comment> @@ -27839,7 +28691,7 @@ <comment xml:lang="pt">imagem MacPaint Bitmap</comment> <comment xml:lang="pt_BR">Imagem de bitmap do MacPaint</comment> <comment xml:lang="ro">Imagine MacPaint Bitmap</comment> - <comment xml:lang="ru">растровое изображение MacPaint</comment> + <comment xml:lang="ru">Растровое изображение MacPaint</comment> <comment xml:lang="sk">Obrázok MacPaint Bitmap</comment> <comment xml:lang="sl">Slikovna bitna datoteka MacPaint</comment> <comment xml:lang="sq">Figurë BitMap MacPaint</comment> @@ -27889,7 +28741,7 @@ <comment xml:lang="pt">desenho Office</comment> <comment xml:lang="pt_BR">Desenho do Office</comment> <comment xml:lang="ro">Desen Office</comment> - <comment xml:lang="ru">изображение Office</comment> + <comment xml:lang="ru">Рисунок Office</comment> <comment xml:lang="sk">Kresba Office</comment> <comment xml:lang="sl">Datoteka risbe Office</comment> <comment xml:lang="sq">Vizatim Office</comment> @@ -27898,7 +28750,7 @@ <comment xml:lang="tr">Ofis çizimi</comment> <comment xml:lang="uk">малюнок Office</comment> <comment xml:lang="vi">Bản vẽ Office</comment> - <comment xml:lang="zh_CN">Microsoft Office 绘图</comment> + <comment xml:lang="zh_CN">Office 绘图</comment> <comment xml:lang="zh_TW">Office 繪圖</comment> <glob pattern="*.msod"/> </mime-type> @@ -27940,7 +28792,7 @@ <comment xml:lang="pt">imagem NIFF</comment> <comment xml:lang="pt_BR">Imagem NIFF</comment> <comment xml:lang="ro">Imagine NIF</comment> - <comment xml:lang="ru">изображение NIFF</comment> + <comment xml:lang="ru">Изображение NIFF</comment> <comment xml:lang="sk">Obrázok NIFF</comment> <comment xml:lang="sl">Slikovna datoteka NIFF</comment> <comment xml:lang="sq">Figurë NIFF</comment> @@ -27993,7 +28845,7 @@ <comment xml:lang="pt">imagem PCX</comment> <comment xml:lang="pt_BR">Imagem PCX</comment> <comment xml:lang="ro">Imagine PCX</comment> - <comment xml:lang="ru">изображение PCX</comment> + <comment xml:lang="ru">Изображение PCX</comment> <comment xml:lang="sk">Obrázok PCX</comment> <comment xml:lang="sl">Slikovna datoteka PCX</comment> <comment xml:lang="sq">Figurë PCX</comment> @@ -28056,7 +28908,7 @@ <comment xml:lang="pt">imagem PCD</comment> <comment xml:lang="pt_BR">Imagem PCD</comment> <comment xml:lang="ro">Imagine PCD</comment> - <comment xml:lang="ru">изображение PCD</comment> + <comment xml:lang="ru">Изображение PCD</comment> <comment xml:lang="sk">Obrázok PCD</comment> <comment xml:lang="sl">Slikovna datoteka PCD</comment> <comment xml:lang="sq">Figurë PCD</comment> @@ -28112,7 +28964,7 @@ <comment xml:lang="pt">imagem PNM</comment> <comment xml:lang="pt_BR">Imagem PNM</comment> <comment xml:lang="ro">Imagine PNM</comment> - <comment xml:lang="ru">изображение PNM</comment> + <comment xml:lang="ru">Изображение PNM</comment> <comment xml:lang="sk">Obrázok PNM</comment> <comment xml:lang="sl">Slikovna datoteka PNM</comment> <comment xml:lang="sq">Figurë PNM</comment> @@ -28165,7 +29017,7 @@ <comment xml:lang="pt">imagem PBM</comment> <comment xml:lang="pt_BR">Imagem PBM</comment> <comment xml:lang="ro">Imagine PBM</comment> - <comment xml:lang="ru">изображение PBM</comment> + <comment xml:lang="ru">Изображение PBM</comment> <comment xml:lang="sk">Obrázok PBM</comment> <comment xml:lang="sl">Slikovna datoteka PBM</comment> <comment xml:lang="sq">Figurë PBM</comment> @@ -28234,7 +29086,7 @@ <comment xml:lang="pt">imagem PGM</comment> <comment xml:lang="pt_BR">Imagem PGM</comment> <comment xml:lang="ro">Imagine PGM</comment> - <comment xml:lang="ru">изображение PGM</comment> + <comment xml:lang="ru">Изображение PGM</comment> <comment xml:lang="sk">Obrázok PGM</comment> <comment xml:lang="sl">Slikovna datoteka PGM</comment> <comment xml:lang="sq">Figurë PGM</comment> @@ -28303,7 +29155,7 @@ <comment xml:lang="pt">imagem PPM</comment> <comment xml:lang="pt_BR">Imagem PPM</comment> <comment xml:lang="ro">Imagine PPM</comment> - <comment xml:lang="ru">изображение PPM</comment> + <comment xml:lang="ru">Изображение PPM</comment> <comment xml:lang="sk">Obrázok PPM</comment> <comment xml:lang="sl">Slikovna datoteka PPM</comment> <comment xml:lang="sq">Figurë PPM</comment> @@ -28369,7 +29221,7 @@ <comment xml:lang="pt">imagem Photoshop</comment> <comment xml:lang="pt_BR">Imagem do Photoshop</comment> <comment xml:lang="ro">Imagine Photoshop</comment> - <comment xml:lang="ru">изображение Photoshop</comment> + <comment xml:lang="ru">Изображение Photoshop</comment> <comment xml:lang="sk">Obrázok Photoshop</comment> <comment xml:lang="sl">Slikovna datoteka Photoshop</comment> <comment xml:lang="sr">Фотошоп слика</comment> @@ -28431,7 +29283,7 @@ <comment xml:lang="pt">imagem RGB</comment> <comment xml:lang="pt_BR">Imagem RGB</comment> <comment xml:lang="ro">Imagine RGB</comment> - <comment xml:lang="ru">изображение RGB</comment> + <comment xml:lang="ru">Изображение RGB</comment> <comment xml:lang="sk">Obrázok RGB</comment> <comment xml:lang="sl">Slikovna datoteka RGB</comment> <comment xml:lang="sq">Figurë RGB</comment> @@ -28482,7 +29334,7 @@ <comment xml:lang="pt">imagem SGI</comment> <comment xml:lang="pt_BR">Imagem SGI</comment> <comment xml:lang="ro">Imagine SGI</comment> - <comment xml:lang="ru">изображение SGI</comment> + <comment xml:lang="ru">Изображение SGI</comment> <comment xml:lang="sk">Obrázok SGI</comment> <comment xml:lang="sl">Slikovna datoteka SGI</comment> <comment xml:lang="sq">Figurë SGI</comment> @@ -28532,7 +29384,7 @@ <comment xml:lang="pt">imagem raster Sun</comment> <comment xml:lang="pt_BR">Imagem raster da Sun</comment> <comment xml:lang="ro">Imagine rasterizată Sun</comment> - <comment xml:lang="ru">растровое изображение Sun</comment> + <comment xml:lang="ru">Растровое изображение Sun</comment> <comment xml:lang="sk">Rastrový obrázok Sun</comment> <comment xml:lang="sl">Slikovna rastrska datoteka Sun</comment> <comment xml:lang="sq">Figurë raster Sun</comment> @@ -28586,7 +29438,7 @@ <comment xml:lang="pt">imagem TGA</comment> <comment xml:lang="pt_BR">Imagem TGA</comment> <comment xml:lang="ro">Imagine TGA</comment> - <comment xml:lang="ru">изображение TGA</comment> + <comment xml:lang="ru">Изображение TGA</comment> <comment xml:lang="sk">Obrázok TGA</comment> <comment xml:lang="sl">Slikovna datoteka TGA</comment> <comment xml:lang="sq">Figurë TGA</comment> @@ -28614,8 +29466,8 @@ <match value="0x20" type="byte" offset="16"/> </match> </magic> - <glob pattern="*.icb"/> <glob pattern="*.tga"/> + <glob pattern="*.icb"/> <glob pattern="*.tpic"/> <glob pattern="*.vda"/> <glob pattern="*.vst"/> @@ -28641,7 +29493,7 @@ <comment xml:lang="ga">cúrsóir Windows</comment> <comment xml:lang="gl">Cursor de Windows</comment> <comment xml:lang="he">סמן של Windows</comment> - <comment xml:lang="hr">Windows kursor</comment> + <comment xml:lang="hr">Windows pokazivač</comment> <comment xml:lang="hu">Windows-kurzor</comment> <comment xml:lang="ia">Cursor pro Windows</comment> <comment xml:lang="id">Kursor Windows</comment> @@ -28660,7 +29512,7 @@ <comment xml:lang="pt">cursor Windows</comment> <comment xml:lang="pt_BR">Cursor do Windows</comment> <comment xml:lang="ro">Cursor Windows</comment> - <comment xml:lang="ru">курсор Windows</comment> + <comment xml:lang="ru">Курсор Windows</comment> <comment xml:lang="sk">Kurzor Windows</comment> <comment xml:lang="sl">Datoteka kazalke Windows</comment> <comment xml:lang="sq">Kursor Windows</comment> @@ -28694,10 +29546,10 @@ <comment xml:lang="fi">animoitu Windows-osoitin</comment> <comment xml:lang="fo">Windows livindaigjørdur vísi</comment> <comment xml:lang="fr">curseur animé Windows</comment> - <comment xml:lang="ga">cúrsóir beo Windows</comment> + <comment xml:lang="ga">cúrsóir beoite Windows</comment> <comment xml:lang="gl">Cursor animado de Windows</comment> <comment xml:lang="he">סמן מונפש של Windows</comment> - <comment xml:lang="hr">Windows animirani kursor</comment> + <comment xml:lang="hr">Windows animirani pokazivač</comment> <comment xml:lang="hu">Windows animált kurzor</comment> <comment xml:lang="ia">Cursor animate pro Windows</comment> <comment xml:lang="id">Kursor animasi Windows</comment> @@ -28714,7 +29566,7 @@ <comment xml:lang="pt">cursor animado Windows</comment> <comment xml:lang="pt_BR">Cursor animado do Windows</comment> <comment xml:lang="ro">Cursor animat Windows</comment> - <comment xml:lang="ru">анимированный курсор Windows</comment> + <comment xml:lang="ru">Анимированный курсор Windows</comment> <comment xml:lang="sk">Animovaný kurzor Windows</comment> <comment xml:lang="sl">Datoteka animirane kazalke Windows</comment> <comment xml:lang="sq">Kursor i animuar Windows</comment> @@ -28723,7 +29575,7 @@ <comment xml:lang="tr">Windows canlandırmalı imleci</comment> <comment xml:lang="uk">анімований курсор Windows</comment> <comment xml:lang="vi">Con chạy hoạt họa Windows</comment> - <comment xml:lang="zh_CN">Windows 动画光标</comment> + <comment xml:lang="zh_CN">Windows 动态光标</comment> <comment xml:lang="zh_TW">Windows 滑鼠動畫游標</comment> <magic priority="50"> <match value="RIFF" type="string" offset="0"> @@ -28771,7 +29623,7 @@ <comment xml:lang="pt">imagem EMF</comment> <comment xml:lang="pt_BR">Imagem EMF</comment> <comment xml:lang="ro">Imagine EMF</comment> - <comment xml:lang="ru">изображение EMF</comment> + <comment xml:lang="ru">Изображение EMF</comment> <comment xml:lang="sk">Obrázok EMF</comment> <comment xml:lang="sl">Slikovna datoteka EMF</comment> <comment xml:lang="sq">Figurë EMF</comment> @@ -28836,7 +29688,7 @@ <comment xml:lang="pt">imagem WMF</comment> <comment xml:lang="pt_BR">Imagem WMF</comment> <comment xml:lang="ro">Imagine WMF</comment> - <comment xml:lang="ru">изображение WMF</comment> + <comment xml:lang="ru">Изображение WMF</comment> <comment xml:lang="sk">Obrázok WMF</comment> <comment xml:lang="sl">Slikovna datoteka WMF</comment> <comment xml:lang="sq">Figurë WMF</comment> @@ -28907,7 +29759,7 @@ <comment xml:lang="pt">imagem XBM</comment> <comment xml:lang="pt_BR">Imagem XBM</comment> <comment xml:lang="ro">Imagine XBM</comment> - <comment xml:lang="ru">изображение XBM</comment> + <comment xml:lang="ru">Изображение XBM</comment> <comment xml:lang="sk">Obrázok XBM</comment> <comment xml:lang="sl">Slikovna datoteka XBM</comment> <comment xml:lang="sq">Figurë XBM</comment> @@ -28962,7 +29814,7 @@ <comment xml:lang="pt">imagem GIMP</comment> <comment xml:lang="pt_BR">Imagem do GIMP</comment> <comment xml:lang="ro">Imagine GIMP</comment> - <comment xml:lang="ru">изображение GIMP</comment> + <comment xml:lang="ru">Изображение GIMP</comment> <comment xml:lang="sk">Obrázok GIMP</comment> <comment xml:lang="sl">Slikovna datoteka GIMP</comment> <comment xml:lang="sq">Figurë GIMP</comment> @@ -28979,6 +29831,80 @@ <match value="gimp xcf v" type="string" offset="0"/> </magic> </mime-type> + <mime-type type="image/x-gimp-gbr"> + <comment>GIMP brush</comment> + <comment xml:lang="ca">pinzell de GIMP</comment> + <comment xml:lang="cs">štětec GIMP</comment> + <comment xml:lang="de">GIMP-Pinsel</comment> + <comment xml:lang="en_GB">GIMP brush</comment> + <comment xml:lang="es">pincel del GIMP</comment> + <comment xml:lang="hr">GIMP kist</comment> + <comment xml:lang="hu">GIMP ecset</comment> + <comment xml:lang="id">Kuas GIMP</comment> + <comment xml:lang="it">Pennello GIMP</comment> + <comment xml:lang="kk">GIMP бояу жаққышы</comment> + <comment xml:lang="ko">GIMP 붓</comment> + <comment xml:lang="pl">Pędzel programu GIMP</comment> + <comment xml:lang="pt_BR">Pincel do GIMP</comment> + <comment xml:lang="ru">Кисть GIMP</comment> + <comment xml:lang="sk">Štetec aplikácie GIMP</comment> + <comment xml:lang="sv">GIMP-pensel</comment> + <comment xml:lang="uk">пензель GIMP</comment> + <comment xml:lang="zh_CN">GIMP 笔刷</comment> + <comment xml:lang="zh_TW">GIMP 筆刷</comment> + <glob pattern="*.gbr"/> + <magic priority="50"> + <match value="GIMP" type="string" offset="20"/> + </magic> + </mime-type> + <mime-type type="image/x-gimp-gih"> + <comment>GIMP brush pipe</comment> + <comment xml:lang="ca">conducte del pinzell de GIMP</comment> + <comment xml:lang="cs">zřetězení štětců GIMP</comment> + <comment xml:lang="de">GIMP-Pinselanimation</comment> + <comment xml:lang="en_GB">GIMP brush pipe</comment> + <comment xml:lang="es">pincel animado del GIMP</comment> + <comment xml:lang="hr">GIMP valjkasti kist</comment> + <comment xml:lang="hu">GIMP ecsetcsatorna</comment> + <comment xml:lang="id">Pipa kuas GIMP</comment> + <comment xml:lang="it">Pipe pennello GIMP</comment> + <comment xml:lang="kk">GIMP бояу жаққыш түтігі</comment> + <comment xml:lang="ko">GIMP 붓 파이프</comment> + <comment xml:lang="pl">Potok pędzla programu GIMP</comment> + <comment xml:lang="pt_BR">Tubo de pincel do GIMP</comment> + <comment xml:lang="ru">Анимированная кисть GIMP</comment> + <comment xml:lang="sv">GIMP-penselrör</comment> + <comment xml:lang="uk">канал пензлів GIMP</comment> + <comment xml:lang="zh_CN">GIMP 管刷</comment> + <comment xml:lang="zh_TW">GIMP 筆刷導管</comment> + <glob pattern="*.gih"/> + </mime-type> + <mime-type type="image/x-gimp-pat"> + <comment>GIMP pattern</comment> + <comment xml:lang="ca">patró de GIMP</comment> + <comment xml:lang="cs">vzorek GIMP</comment> + <comment xml:lang="de">GIMP-Muster</comment> + <comment xml:lang="en_GB">GIMP pattern</comment> + <comment xml:lang="es">patrón del GIMP</comment> + <comment xml:lang="hr">GIMP uzorak</comment> + <comment xml:lang="hu">GIMP minta</comment> + <comment xml:lang="id">Pola GIMP</comment> + <comment xml:lang="it">Motivo GIMP</comment> + <comment xml:lang="kk">GIMP оюы</comment> + <comment xml:lang="ko">GIMP 패턴</comment> + <comment xml:lang="pl">Deseń programu GIMP</comment> + <comment xml:lang="pt_BR">Textura do GIMP</comment> + <comment xml:lang="ru">Шаблон GIMP</comment> + <comment xml:lang="sk">Vzor aplikácie GIMP</comment> + <comment xml:lang="sv">GIMP-mönster</comment> + <comment xml:lang="uk">візерунок GIMP</comment> + <comment xml:lang="zh_CN">GIMP 图案</comment> + <comment xml:lang="zh_TW">GIMP 樣式</comment> + <glob pattern="*.pat"/> + <magic priority="50"> + <match value="GPAT" type="string" offset="20"/> + </magic> + </mime-type> <mime-type type="image/x-xfig"> <comment>XFig image</comment> <comment xml:lang="ar">صورة XFig</comment> @@ -29018,7 +29944,7 @@ <comment xml:lang="pt">imagem XFig</comment> <comment xml:lang="pt_BR">Imagem do XFig</comment> <comment xml:lang="ro">Imagine XFig</comment> - <comment xml:lang="ru">изображение XFig</comment> + <comment xml:lang="ru">Изображение XFig</comment> <comment xml:lang="sk">Obrázok XFig</comment> <comment xml:lang="sl">Slikovna datoteka XFig</comment> <comment xml:lang="sq">Figurë XFig</comment> @@ -29073,7 +29999,7 @@ <comment xml:lang="pt">imagem XPM</comment> <comment xml:lang="pt_BR">Imagem XPM</comment> <comment xml:lang="ro">Imagine XPM</comment> - <comment xml:lang="ru">изображение XPM</comment> + <comment xml:lang="ru">Изображение XPM</comment> <comment xml:lang="sk">Obrázok XPM</comment> <comment xml:lang="sl">Slikovna datoteka XPM</comment> <comment xml:lang="sq">Figurë XPM</comment> @@ -29111,7 +30037,7 @@ <comment xml:lang="fi">X-ikkunakuva</comment> <comment xml:lang="fo">X vindeyga mynd</comment> <comment xml:lang="fr">image X window</comment> - <comment xml:lang="ga">íomhá fhuinneog X</comment> + <comment xml:lang="ga">íomhá X-windows</comment> <comment xml:lang="gl">imaxe de X Window</comment> <comment xml:lang="he">תמונת חלון של X</comment> <comment xml:lang="hr">X window slika</comment> @@ -29133,7 +30059,7 @@ <comment xml:lang="pt">imagem de janela X</comment> <comment xml:lang="pt_BR">Imagem de janela do X</comment> <comment xml:lang="ro">Imagine X window</comment> - <comment xml:lang="ru">изображение X window</comment> + <comment xml:lang="ru">Изображение X window</comment> <comment xml:lang="sk">Obrázok X window</comment> <comment xml:lang="sl">slika X oken</comment> <comment xml:lang="sq">Figurë X window</comment> @@ -29142,13 +30068,14 @@ <comment xml:lang="tr">X pencere görüntüsü</comment> <comment xml:lang="uk">зображення X window</comment> <comment xml:lang="vi">Ảnh cửa sổ X</comment> - <comment xml:lang="zh_CN">X window 图像</comment> + <comment xml:lang="zh_CN">X Window 图像</comment> <comment xml:lang="zh_TW">X window 影像</comment> <glob pattern="*.xwd"/> </mime-type> <mime-type type="inode/blockdevice"> <comment>block device</comment> <comment xml:lang="ar">جهاز كتلي</comment> + <comment xml:lang="ast">preséu de bloques</comment> <comment xml:lang="be@latin">blokavaja pryłada</comment> <comment xml:lang="bg">Блоково устройство</comment> <comment xml:lang="ca">dispositiu de blocs</comment> @@ -29169,7 +30096,7 @@ <comment xml:lang="hr">Blokovski uređaj</comment> <comment xml:lang="hu">blokkos eszköz</comment> <comment xml:lang="ia">Dispositivo de blocos</comment> - <comment xml:lang="id">blok divais</comment> + <comment xml:lang="id">peranti blok</comment> <comment xml:lang="it">Device a blocchi</comment> <comment xml:lang="ja">ブロックデバイス</comment> <comment xml:lang="kk">блоктық құрылғысы</comment> @@ -29185,7 +30112,7 @@ <comment xml:lang="pt">dispositivo de bloco</comment> <comment xml:lang="pt_BR">Dispositivo de bloco</comment> <comment xml:lang="ro">dispozitiv bloc</comment> - <comment xml:lang="ru">блочное устройство</comment> + <comment xml:lang="ru">Блочное устройство</comment> <comment xml:lang="sk">Blokové zariadenie</comment> <comment xml:lang="sl">bločna naprava</comment> <comment xml:lang="sq">device me blloqe</comment> @@ -29200,6 +30127,7 @@ <mime-type type="inode/chardevice"> <comment>character device</comment> <comment xml:lang="ar">جهاز حرفي</comment> + <comment xml:lang="ast">preséu de caráuteres</comment> <comment xml:lang="be@latin">znakavaja pryłada</comment> <comment xml:lang="bg">Символно устройство</comment> <comment xml:lang="ca">dispositiu de caràcters</comment> @@ -29220,7 +30148,7 @@ <comment xml:lang="hr">Znakovni uređaj</comment> <comment xml:lang="hu">karakteres eszköz</comment> <comment xml:lang="ia">Dispositivo de characteres</comment> - <comment xml:lang="id">karakter divais</comment> + <comment xml:lang="id">peranti karakter</comment> <comment xml:lang="it">Device a caratteri</comment> <comment xml:lang="ja">キャラクタデバイス</comment> <comment xml:lang="kk">символдық құрылғысы</comment> @@ -29236,7 +30164,7 @@ <comment xml:lang="pt">dispositivo de caracteres</comment> <comment xml:lang="pt_BR">Dispositivo de caractere</comment> <comment xml:lang="ro">dispozitiv caracter</comment> - <comment xml:lang="ru">символьное устройство</comment> + <comment xml:lang="ru">Символьное устройство</comment> <comment xml:lang="sk">Znakové zariadenie</comment> <comment xml:lang="sl">znakovna naprava</comment> <comment xml:lang="sq">device me karaktere</comment> @@ -29251,6 +30179,7 @@ <mime-type type="inode/directory"> <comment>folder</comment> <comment xml:lang="ar">مجلّد</comment> + <comment xml:lang="ast">carpeta</comment> <comment xml:lang="be@latin">kataloh</comment> <comment xml:lang="bg">Папка</comment> <comment xml:lang="ca">carpeta</comment> @@ -29268,7 +30197,7 @@ <comment xml:lang="ga">fillteán</comment> <comment xml:lang="gl">cartafol</comment> <comment xml:lang="he">תיקייה</comment> - <comment xml:lang="hr">direktorij</comment> + <comment xml:lang="hr">Mapa</comment> <comment xml:lang="hu">mappa</comment> <comment xml:lang="ia">Dossier</comment> <comment xml:lang="id">folder</comment> @@ -29287,7 +30216,7 @@ <comment xml:lang="pt">pasta</comment> <comment xml:lang="pt_BR">Pasta</comment> <comment xml:lang="ro">dosar</comment> - <comment xml:lang="ru">папка</comment> + <comment xml:lang="ru">Папка</comment> <comment xml:lang="sk">Priečinok</comment> <comment xml:lang="sl">mapa</comment> <comment xml:lang="sq">Kartelë</comment> @@ -29340,7 +30269,7 @@ <comment xml:lang="pt">canal</comment> <comment xml:lang="pt_BR">Pipe</comment> <comment xml:lang="ro">canal pipe</comment> - <comment xml:lang="ru">канал</comment> + <comment xml:lang="ru">Канал</comment> <comment xml:lang="sk">Rúra</comment> <comment xml:lang="sl">cev</comment> <comment xml:lang="sq">Pipe</comment> @@ -29355,6 +30284,7 @@ <mime-type type="inode/mount-point"> <comment>mount point</comment> <comment xml:lang="ar">نقطة الوصْل</comment> + <comment xml:lang="ast">puntu de montaxe</comment> <comment xml:lang="be@latin">punkt mantavańnia</comment> <comment xml:lang="bg">Точка на монтиране</comment> <comment xml:lang="ca">punt de muntatge</comment> @@ -29372,7 +30302,7 @@ <comment xml:lang="ga">pointe feistithe</comment> <comment xml:lang="gl">punto de montaxe</comment> <comment xml:lang="he">נקודת עיגון</comment> - <comment xml:lang="hr">točka montiranja</comment> + <comment xml:lang="hr">Točka montiranja</comment> <comment xml:lang="hu">csatolási pont</comment> <comment xml:lang="ia">Puncto de montage</comment> <comment xml:lang="id">titik mount</comment> @@ -29391,7 +30321,7 @@ <comment xml:lang="pt">ponto de montagem</comment> <comment xml:lang="pt_BR">Ponto de montagem</comment> <comment xml:lang="ro">loc montare</comment> - <comment xml:lang="ru">точка монтирования</comment> + <comment xml:lang="ru">Точка монтирования</comment> <comment xml:lang="sk">Miesto pripojenia</comment> <comment xml:lang="sl">priklopna točka</comment> <comment xml:lang="sq">Pikë montimi</comment> @@ -29424,7 +30354,7 @@ <comment xml:lang="ga">soicéad</comment> <comment xml:lang="gl">socket</comment> <comment xml:lang="he">נקודת חיבור</comment> - <comment xml:lang="hr">utičnica</comment> + <comment xml:lang="hr">Priključnica</comment> <comment xml:lang="hu">illesztőpont</comment> <comment xml:lang="ia">Socket</comment> <comment xml:lang="id">soket</comment> @@ -29443,7 +30373,7 @@ <comment xml:lang="pt">tomada</comment> <comment xml:lang="pt_BR">Socket</comment> <comment xml:lang="ro">socket</comment> - <comment xml:lang="ru">сокет</comment> + <comment xml:lang="ru">Сокет</comment> <comment xml:lang="sk">Soket</comment> <comment xml:lang="sl">vtič</comment> <comment xml:lang="sq">Socket</comment> @@ -29458,6 +30388,7 @@ <mime-type type="inode/symlink"> <comment>symbolic link</comment> <comment xml:lang="ar">وصلة رمزية</comment> + <comment xml:lang="ast">enllaz simbólicu</comment> <comment xml:lang="az">simvolik körpü</comment> <comment xml:lang="be@latin">symbalnaja spasyłka</comment> <comment xml:lang="bg">Символна връзка</comment> @@ -29477,7 +30408,7 @@ <comment xml:lang="ga">nasc siombalach</comment> <comment xml:lang="gl">ligazón simbólica</comment> <comment xml:lang="he">קישור סימבולי</comment> - <comment xml:lang="hr">simbolička veza</comment> + <comment xml:lang="hr">Simbolička poveznica</comment> <comment xml:lang="hu">szimbolikus link</comment> <comment xml:lang="ia">Ligamine symbolic</comment> <comment xml:lang="id">taut simbolik</comment> @@ -29497,7 +30428,7 @@ <comment xml:lang="pt">ligação simbólica</comment> <comment xml:lang="pt_BR">Ligação simbólica</comment> <comment xml:lang="ro">legătură simbolică</comment> - <comment xml:lang="ru">символьная ссылка</comment> + <comment xml:lang="ru">Символьная ссылка</comment> <comment xml:lang="sk">Symbolický odkaz</comment> <comment xml:lang="sl">simbolna povezava</comment> <comment xml:lang="sq">Lidhje simbolike</comment> @@ -29528,10 +30459,10 @@ <comment xml:lang="fi">viestin jakeluilmoitus</comment> <comment xml:lang="fo">post útberingarfrásøgn</comment> <comment xml:lang="fr">rapport de livraison de courriels</comment> - <comment xml:lang="ga">tuairisc sheachadadh poist</comment> + <comment xml:lang="ga">tuairisc sheachadta r-phoist</comment> <comment xml:lang="gl">informe de entrega de correo</comment> <comment xml:lang="he">דוח העברת דואר</comment> - <comment xml:lang="hr">izvještaj dostave pošte</comment> + <comment xml:lang="hr">Izvještaj dostave pošte</comment> <comment xml:lang="hu">jelentés levélkézbesítésről</comment> <comment xml:lang="ia">Reporto de livration de e-mail</comment> <comment xml:lang="id">laporan pengantaran surat</comment> @@ -29550,7 +30481,7 @@ <comment xml:lang="pt">relatório de entrega de email</comment> <comment xml:lang="pt_BR">Relatório de entrega de correspondência</comment> <comment xml:lang="ro">raport de trimitere email</comment> - <comment xml:lang="ru">отчёт о доставке сообщения</comment> + <comment xml:lang="ru">Отчёт о доставке сообщения</comment> <comment xml:lang="sk">Správa o doručení pošty</comment> <comment xml:lang="sl">poročilo dostave pošte</comment> <comment xml:lang="sq">Raport mbi dorëzimin e mesazhit</comment> @@ -29583,7 +30514,7 @@ <comment xml:lang="fi">viestin kuittausilmoitus</comment> <comment xml:lang="fo">post avhendingarfrásøgn</comment> <comment xml:lang="fr">rapport de disposition de courriels</comment> - <comment xml:lang="ga">tuairisc chóiriú poist</comment> + <comment xml:lang="ga">tuairisc chóirithe r-phoist</comment> <comment xml:lang="gl">informe de disposición de correo</comment> <comment xml:lang="he">דוח אספקת דואר</comment> <comment xml:lang="hr">Izvještaj smještaja e-pošte</comment> @@ -29605,7 +30536,7 @@ <comment xml:lang="pt">relatório de disposição de email</comment> <comment xml:lang="pt_BR">Relatório de disposição de correspondência</comment> <comment xml:lang="ro">confirmare primire email</comment> - <comment xml:lang="ru">отчёт о перемещении почты</comment> + <comment xml:lang="ru">Отчёт о перемещении почты</comment> <comment xml:lang="sk">Správa o odovzdaní pošty</comment> <comment xml:lang="sl">poročilo razporeditve pošte</comment> <comment xml:lang="sq">Raport mbi njoftimin e mesazhit</comment> @@ -29641,7 +30572,7 @@ <comment xml:lang="ga">tagairt do chomhad cianda</comment> <comment xml:lang="gl">referencia a un ficheiro remoto</comment> <comment xml:lang="he">התיחסות לקובץ מרוחק</comment> - <comment xml:lang="hr">referenca na udaljenu datoteku</comment> + <comment xml:lang="hr">Preporuka na udaljenu datoteku</comment> <comment xml:lang="hu">hivatkozás távoli fájlra</comment> <comment xml:lang="ia">Referentia a un file remote</comment> <comment xml:lang="id">referensi ke berkas jarak jauh</comment> @@ -29660,7 +30591,7 @@ <comment xml:lang="pt">referência a um ficheiro remoto</comment> <comment xml:lang="pt_BR">Referência para arquivo remoto</comment> <comment xml:lang="ro">referință fișier la distanță</comment> - <comment xml:lang="ru">ссылка на удалённый файл</comment> + <comment xml:lang="ru">Ссылка на удалённый файл</comment> <comment xml:lang="sk">Odkaz na vzdialený súbor</comment> <comment xml:lang="sl">sklic do oddaljene datoteke</comment> <comment xml:lang="sq">Referim për tek file në distancë</comment> @@ -29692,7 +30623,7 @@ <comment xml:lang="fi">nyyssiviesti</comment> <comment xml:lang="fo">Usenet news boð</comment> <comment xml:lang="fr">message de groupe d'échange Usenet</comment> - <comment xml:lang="ga">teachtaireacht nuacht Usenet</comment> + <comment xml:lang="ga">teachtaireacht nuachta Usenet</comment> <comment xml:lang="gl">mensaxes de noticias de Usenet</comment> <comment xml:lang="he">הודעת חדשות של Usenet</comment> <comment xml:lang="hr">Usenet poruka novosti</comment> @@ -29714,7 +30645,7 @@ <comment xml:lang="pt">mensagem de notícias Usenet</comment> <comment xml:lang="pt_BR">Mensagem de notícias da Usenet</comment> <comment xml:lang="ro">Mesaj Usenet de știri </comment> - <comment xml:lang="ru">новостное сообщение Usenet</comment> + <comment xml:lang="ru">Новостное сообщение Usenet</comment> <comment xml:lang="sk">Príspevok do diskusných skupín Usenet</comment> <comment xml:lang="sl">novičarsko sporočilo Usenet</comment> <comment xml:lang="sq">Mesazh lajmesh Usenet</comment> @@ -29754,14 +30685,14 @@ <comment xml:lang="ga">teachtaireacht ríomhphoist neamhiomlán</comment> <comment xml:lang="gl">mensaxe de correo electrónico parcial</comment> <comment xml:lang="he">מסר דוא״ל חלקי</comment> - <comment xml:lang="hr">djelomična poruka e-pošte</comment> + <comment xml:lang="hr">Nepotpuna poruka e-pošte</comment> <comment xml:lang="hu">részleges elektronikus levél</comment> <comment xml:lang="ia">Message de e-mail partial</comment> <comment xml:lang="id">pesan email sebagian</comment> <comment xml:lang="it">Messaggio email parziale</comment> <comment xml:lang="ja">部分メールメッセージ</comment> <comment xml:lang="kk">электронды поштаның үзінді мәлімдемесі</comment> - <comment xml:lang="ko">부분적 전자 우편 메시지</comment> + <comment xml:lang="ko">전자 우편 메시지 일부</comment> <comment xml:lang="lt">nepilnas el. laiškas</comment> <comment xml:lang="lv">daļēja e-pasta vēstule</comment> <comment xml:lang="ms">Bahagian mesej emel</comment> @@ -29773,7 +30704,7 @@ <comment xml:lang="pt">mensagem parcial de email</comment> <comment xml:lang="pt_BR">Mensagem de e-mail parcial</comment> <comment xml:lang="ro">mesaj de email parțial</comment> - <comment xml:lang="ru">фрагмент сообщения электронной почты</comment> + <comment xml:lang="ru">Фрагмент сообщения электронной почты</comment> <comment xml:lang="sk">Čiastočná e-mailová správa</comment> <comment xml:lang="sl">delno elektronsko sporočilo</comment> <comment xml:lang="sq">Mesazh poste i pjesëshëm</comment> @@ -29807,7 +30738,7 @@ <comment xml:lang="ga">teachtaireacht ríomhphoist</comment> <comment xml:lang="gl">mensaxe de correo electrónico</comment> <comment xml:lang="he">הודעת דואר אלקטרוני</comment> - <comment xml:lang="hr">poruka e-pošte</comment> + <comment xml:lang="hr">Poruka e-pošte</comment> <comment xml:lang="hu">elektronikus levél</comment> <comment xml:lang="ia">Message de e-mail</comment> <comment xml:lang="id">pesan email</comment> @@ -29826,7 +30757,7 @@ <comment xml:lang="pt">mensagem de email</comment> <comment xml:lang="pt_BR">Mensagem de e-mail</comment> <comment xml:lang="ro">mesaj email</comment> - <comment xml:lang="ru">почтовое сообщение</comment> + <comment xml:lang="ru">Почтовое сообщение</comment> <comment xml:lang="sk">E-mailová správa</comment> <comment xml:lang="sl">sporočilo elektronske pošte</comment> <comment xml:lang="sq">Mesazh poste</comment> @@ -29872,7 +30803,7 @@ <comment xml:lang="fi">GNU-postiviesti</comment> <comment xml:lang="fo">GNU mail boð</comment> <comment xml:lang="fr">message de courriel GNU</comment> - <comment xml:lang="ga">teachtaireacht phost GNU</comment> + <comment xml:lang="ga">teachtaireacht r-phoist GNU</comment> <comment xml:lang="gl">mensaxe de correo electrónico de GNU</comment> <comment xml:lang="he">הודעת דואר של GNU</comment> <comment xml:lang="hr">GNU poruka pošte</comment> @@ -29895,7 +30826,7 @@ <comment xml:lang="pt">mensagem de email GNU</comment> <comment xml:lang="pt_BR">Mensagem de e-mail GNU</comment> <comment xml:lang="ro">Mesaj GNU mail</comment> - <comment xml:lang="ru">почтовое сообщение GNU</comment> + <comment xml:lang="ru">Почтовое сообщение GNU</comment> <comment xml:lang="sk">Správa GNU mail</comment> <comment xml:lang="sl">Sporočilo pošte GNU</comment> <comment xml:lang="sq">Mesazh GNU mail</comment> @@ -29911,20 +30842,31 @@ </mime-type> <mime-type type="model/iges"> <comment>IGES document</comment> + <comment xml:lang="ast">Documentu IGES</comment> <comment xml:lang="ca">document IGES</comment> + <comment xml:lang="cs">dokument IGES</comment> <comment xml:lang="da">IGES-dokument</comment> <comment xml:lang="de">IGES-Dokument</comment> + <comment xml:lang="en_GB">IGES document</comment> <comment xml:lang="es">documento IGES</comment> + <comment xml:lang="eu">IGES dokumentua</comment> <comment xml:lang="fi">IGES-asiakirja</comment> <comment xml:lang="fr">document IGES</comment> + <comment xml:lang="ga">cáipéis IGES</comment> <comment xml:lang="he">מסמך IGES</comment> + <comment xml:lang="hr">IGES dokument</comment> <comment xml:lang="hu">IGES dokumentum</comment> + <comment xml:lang="id">dokumen IGES</comment> + <comment xml:lang="it">Documento IGES</comment> <comment xml:lang="kk">IGES құжаты</comment> <comment xml:lang="ko">IGES 문서</comment> <comment xml:lang="pl">Dokument IGES</comment> <comment xml:lang="pt_BR">Documento IGES</comment> - <comment xml:lang="ru">документ IGES</comment> + <comment xml:lang="ru">Документ IGES</comment> <comment xml:lang="sk">Dokument IGES</comment> + <comment xml:lang="sr">ИГЕС документ</comment> + <comment xml:lang="sv">IGES-dokument</comment> + <comment xml:lang="tr">IGES belgesi</comment> <comment xml:lang="uk">документ IGES</comment> <comment xml:lang="zh_CN">IGES 文档</comment> <comment xml:lang="zh_TW">IGES 文件</comment> @@ -29942,6 +30884,7 @@ <mime-type type="model/vrml"> <comment>VRML document</comment> <comment xml:lang="ar">مستند VRML</comment> + <comment xml:lang="ast">Documentu VRML</comment> <comment xml:lang="az">VRML sənədi</comment> <comment xml:lang="be@latin">Dakument VRML</comment> <comment xml:lang="bg">Документ — VRML</comment> @@ -29980,7 +30923,7 @@ <comment xml:lang="pt">documento VRML</comment> <comment xml:lang="pt_BR">Documento VRML</comment> <comment xml:lang="ro">Document VRML</comment> - <comment xml:lang="ru">документ VRML</comment> + <comment xml:lang="ru">Документ VRML</comment> <comment xml:lang="sk">Dokument VRML</comment> <comment xml:lang="sl">Dokument VRML</comment> <comment xml:lang="sq">Dokument VRML</comment> @@ -30021,10 +30964,10 @@ <comment xml:lang="fi">viesti useissa muodoissa</comment> <comment xml:lang="fo">boð í fleiri sniðum</comment> <comment xml:lang="fr">message en formats divers</comment> - <comment xml:lang="ga">teachtaireacht i roinnt fhormáidí</comment> + <comment xml:lang="ga">teachtaireacht i bhformáidí éagsúla</comment> <comment xml:lang="gl">mensaxe en varios formatos</comment> <comment xml:lang="he">הודעה במספר תבניות</comment> - <comment xml:lang="hr">poruka u nekoliko oblika</comment> + <comment xml:lang="hr">Poruka u nekoliko oblika</comment> <comment xml:lang="hu">többféle formátumú üzenet</comment> <comment xml:lang="ia">Message in plure formatos</comment> <comment xml:lang="id">pesan dalam beberapa format</comment> @@ -30043,7 +30986,7 @@ <comment xml:lang="pt">mensagem em vários formatos</comment> <comment xml:lang="pt_BR">Mensagem em vários formatos</comment> <comment xml:lang="ro">mesaj în diferite formate</comment> - <comment xml:lang="ru">сообщение в нескольких форматах</comment> + <comment xml:lang="ru">Сообщение в нескольких форматах</comment> <comment xml:lang="sk">Správa v niekoľkých formátoch</comment> <comment xml:lang="sl">sporočilo v več zapisih</comment> <comment xml:lang="sq">Mesazh në formate të ndryshëm</comment> @@ -30052,7 +30995,7 @@ <comment xml:lang="tr">farklı biçimlerde ileti</comment> <comment xml:lang="uk">повідомлення у кількох форматах</comment> <comment xml:lang="vi">thông điệp có vài định dạng</comment> - <comment xml:lang="zh_CN">各种格式的消息</comment> + <comment xml:lang="zh_CN">各种格式的信件</comment> <comment xml:lang="zh_TW">多種格式的訊息</comment> </mime-type> <mime-type type="multipart/appledouble"> @@ -30096,7 +31039,7 @@ <comment xml:lang="pt">ficheiro codificado em AppleDouble de Macintosh</comment> <comment xml:lang="pt_BR">Arquivo do Macintosh codificado com AppleDouble</comment> <comment xml:lang="ro">Fișier codat Macintosh AppleDouble</comment> - <comment xml:lang="ru">файл (закодированный Macintosh AppleDouble)</comment> + <comment xml:lang="ru">Файл, закодированный Macintosh AppleDouble</comment> <comment xml:lang="sk">Súbor kódovaný pomocou Macintosh AppleDouble</comment> <comment xml:lang="sl">Kodirana datoteka Macintosh (AppleDouble)</comment> <comment xml:lang="sq">File Macintosh i kodifikuar AppleDouble</comment> @@ -30133,7 +31076,7 @@ <comment xml:lang="hr">Poruka kratkg sadržaja</comment> <comment xml:lang="hu">ömlesztett üzenet</comment> <comment xml:lang="ia">Digesto de messages</comment> - <comment xml:lang="id">pesan digest</comment> + <comment xml:lang="id">digest pesan</comment> <comment xml:lang="it">Digest di messaggi</comment> <comment xml:lang="ja">メッセージダイジェスト</comment> <comment xml:lang="kk">мәлімдеме профилі</comment> @@ -30149,7 +31092,7 @@ <comment xml:lang="pt">grupo de mensagens</comment> <comment xml:lang="pt_BR">Resumo de mensagem</comment> <comment xml:lang="ro">colecție mesaje email</comment> - <comment xml:lang="ru">профиль сообщения</comment> + <comment xml:lang="ru">Дайджест сообщения</comment> <comment xml:lang="sk">Prehľad správ</comment> <comment xml:lang="sl">povzetek sporočila</comment> <comment xml:lang="sq">Shpërndarje mesazhesh</comment> @@ -30158,7 +31101,7 @@ <comment xml:lang="tr">mesaj özeti</comment> <comment xml:lang="uk">збірка повідомлень</comment> <comment xml:lang="vi">bản tóm tắt thông điệp</comment> - <comment xml:lang="zh_CN">消息摘要</comment> + <comment xml:lang="zh_CN">信件摘要</comment> <comment xml:lang="zh_TW">訊息摘要</comment> </mime-type> <mime-type type="multipart/encrypted"> @@ -30183,7 +31126,7 @@ <comment xml:lang="ga">teachtaireacht chriptithe</comment> <comment xml:lang="gl">mensaxe cifrado</comment> <comment xml:lang="he">הודעה מוצפנת</comment> - <comment xml:lang="hr">šifrirana poruka</comment> + <comment xml:lang="hr">Šifrirana poruka</comment> <comment xml:lang="hu">titkosított üzenet</comment> <comment xml:lang="ia">Message cryptate</comment> <comment xml:lang="id">pesan terenkripsi</comment> @@ -30202,7 +31145,7 @@ <comment xml:lang="pt">mensagem encriptada</comment> <comment xml:lang="pt_BR">Mensagem criptografada</comment> <comment xml:lang="ro">mesaj criptat</comment> - <comment xml:lang="ru">зашифрованное сообщение</comment> + <comment xml:lang="ru">Зашифрованное сообщение</comment> <comment xml:lang="sk">Zašifrovaná správa</comment> <comment xml:lang="sl">šifrirano sporočilo</comment> <comment xml:lang="sq">Mesazh i kriptuar</comment> @@ -30217,6 +31160,7 @@ <mime-type type="multipart/mixed"> <comment>compound documents</comment> <comment xml:lang="ar">مستندات مركبة</comment> + <comment xml:lang="ast">documentos compuestos</comment> <comment xml:lang="be@latin">składanyja dakumenty</comment> <comment xml:lang="bg">Съставни документи</comment> <comment xml:lang="ca">documents compostos</comment> @@ -30253,7 +31197,7 @@ <comment xml:lang="pt">documentos compostos</comment> <comment xml:lang="pt_BR">Documentos compostos</comment> <comment xml:lang="ro">documente compuse</comment> - <comment xml:lang="ru">составные документы</comment> + <comment xml:lang="ru">Составные документы</comment> <comment xml:lang="sk">Zložené dokumenty</comment> <comment xml:lang="sl">združeni dokumenti</comment> <comment xml:lang="sq">dokumente të përbërë</comment> @@ -30268,6 +31212,7 @@ <mime-type type="multipart/related"> <comment>compound document</comment> <comment xml:lang="ar">مستند مركب</comment> + <comment xml:lang="ast">documentu compuestu</comment> <comment xml:lang="az">birləşik sənəd</comment> <comment xml:lang="be@latin">składany dakument</comment> <comment xml:lang="bg">Съставен документ</comment> @@ -30306,7 +31251,7 @@ <comment xml:lang="pt">documento composto</comment> <comment xml:lang="pt_BR">Documento composto</comment> <comment xml:lang="ro">document compus</comment> - <comment xml:lang="ru">составной документ</comment> + <comment xml:lang="ru">Составной документ</comment> <comment xml:lang="sk">Zložený dokument</comment> <comment xml:lang="sl">združeni dokument</comment> <comment xml:lang="sq">dokumet i përbërë</comment> @@ -30337,7 +31282,7 @@ <comment xml:lang="fi">viestijärjestelmän ilmoitus</comment> <comment xml:lang="fo">postkervisfrásøgn</comment> <comment xml:lang="fr">rapport système de courriels</comment> - <comment xml:lang="ga">tuairisc chóras poist</comment> + <comment xml:lang="ga">tuairisc chórais r-phoist</comment> <comment xml:lang="gl">informe do sistema de correo</comment> <comment xml:lang="he">דו״ח של מערכת הדואר</comment> <comment xml:lang="hr">Izvještaj sustava pošte</comment> @@ -30359,7 +31304,7 @@ <comment xml:lang="pt">relatório de sistema de email</comment> <comment xml:lang="pt_BR">Relatório do sistema de correspondência</comment> <comment xml:lang="ro">raport sistem email</comment> - <comment xml:lang="ru">отчёт почтовой системы</comment> + <comment xml:lang="ru">Отчёт почтовой системы</comment> <comment xml:lang="sk">Správa poštového systému</comment> <comment xml:lang="sl">poročilo poštnega sistema</comment> <comment xml:lang="sq">Raport i sistemit të postës</comment> @@ -30393,7 +31338,7 @@ <comment xml:lang="ga">teachtaireacht sínithe</comment> <comment xml:lang="gl">mensaxe firmado</comment> <comment xml:lang="he">הודעה חתומה</comment> - <comment xml:lang="hr">potpisana poruka</comment> + <comment xml:lang="hr">Potpisana poruka</comment> <comment xml:lang="hu">aláírt üzenet</comment> <comment xml:lang="ia">Message signate</comment> <comment xml:lang="id">pesan ditandatangani</comment> @@ -30412,7 +31357,7 @@ <comment xml:lang="pt">mensagem assinada</comment> <comment xml:lang="pt_BR">Mensagem assinada</comment> <comment xml:lang="ro">mesaj semnat</comment> - <comment xml:lang="ru">подписанное сообщение</comment> + <comment xml:lang="ru">Подписанное сообщение</comment> <comment xml:lang="sk">Podpísaná správa</comment> <comment xml:lang="sl">podpisano sporočilo</comment> <comment xml:lang="sq">Mesazh i firmosur</comment> @@ -30444,7 +31389,7 @@ <comment xml:lang="ga">sruth sonraí (brú freastalaí)</comment> <comment xml:lang="gl">fluxo de datos (por iniciativa do servidor)</comment> <comment xml:lang="he">מידע בזרימה (דחיפה ע״י השרת)</comment> - <comment xml:lang="hr">Tok podataka (poslužiteljem pogurano)</comment> + <comment xml:lang="hr">Strujanje podataka (poslužiteljem pogurano)</comment> <comment xml:lang="hu">sugárzott adatfolyam (kiszolgálóról)</comment> <comment xml:lang="ia">Fluxo de datos (pulsate per servitor)</comment> <comment xml:lang="id">arus data (dorongan server)</comment> @@ -30463,7 +31408,7 @@ <comment xml:lang="pt">fluxo de dados (empurrados pelo servidor)</comment> <comment xml:lang="pt_BR">Fluxo de dados (por iniciativa do servidor)</comment> <comment xml:lang="ro">flux de date (de la server)</comment> - <comment xml:lang="ru">поток данных (server push)</comment> + <comment xml:lang="ru">Поток данных (server push)</comment> <comment xml:lang="sk">Prúd dát (posielaný serverom)</comment> <comment xml:lang="sl">pretok podatkov (strežniški)</comment> <comment xml:lang="sq">Fluks me të dhëna (server push)</comment> @@ -30472,7 +31417,7 @@ <comment xml:lang="tr">veri akışı (sunucudan gönderilen)</comment> <comment xml:lang="uk">потік даних (від сервера)</comment> <comment xml:lang="vi">luồng dữ liệu (trình phục vụ đẩy)</comment> - <comment xml:lang="zh_CN">数据流(服务器推送)</comment> + <comment xml:lang="zh_CN">数据流（服务器推送）</comment> <comment xml:lang="zh_TW">資料串流 (server push)</comment> </mime-type> <mime-type type="text/calendar"> @@ -30513,7 +31458,7 @@ <comment xml:lang="pt">calendário VCS/ICS</comment> <comment xml:lang="pt_BR">Calendário VCS/ICS</comment> <comment xml:lang="ro">Calendar VCS/ICS</comment> - <comment xml:lang="ru">календарь VCS/ICS</comment> + <comment xml:lang="ru">Календарь VCS/ICS</comment> <comment xml:lang="sk">Kalendár VCS/ICS</comment> <comment xml:lang="sl">Datoteka koledarja VCS/ICS</comment> <comment xml:lang="sq">Kalendar VCS/ICS</comment> @@ -30575,7 +31520,7 @@ <comment xml:lang="pt">folha de estilos CSS</comment> <comment xml:lang="pt_BR">Folha de estilo CSS</comment> <comment xml:lang="ro">Pagină de stil CSS</comment> - <comment xml:lang="ru">таблица стилей CSS</comment> + <comment xml:lang="ru">Таблица стилей CSS</comment> <comment xml:lang="sk">Štýly CSS</comment> <comment xml:lang="sl">Slogovna predloga CSS</comment> <comment xml:lang="sq">Fletë stili CSS</comment> @@ -30611,7 +31556,7 @@ <comment xml:lang="ga">cárta gnó leictreonach</comment> <comment xml:lang="gl">tarxeta de negocio electrónica</comment> <comment xml:lang="he">כרטיס ביקור אלקטרוני</comment> - <comment xml:lang="hr">elektronička posjetnica</comment> + <comment xml:lang="hr">Elektronička posjetnica</comment> <comment xml:lang="hu">elektronikus névjegykártya</comment> <comment xml:lang="ia">Carta de visita electronic</comment> <comment xml:lang="id">kartu bisnis elektronik</comment> @@ -30628,7 +31573,7 @@ <comment xml:lang="pt">cartão de visita eletrónico</comment> <comment xml:lang="pt_BR">Cartão de visitas eletrônico</comment> <comment xml:lang="ro">carte de vizită electronică</comment> - <comment xml:lang="ru">электронная визитная карточка</comment> + <comment xml:lang="ru">Электронная визитная карточка</comment> <comment xml:lang="sk">Elektronická vizitka</comment> <comment xml:lang="sl">elektronska poslovna vizitka</comment> <comment xml:lang="sq">Skedë elektronike biznesi</comment> @@ -30653,6 +31598,7 @@ </mime-type> <mime-type type="text/turtle"> <comment>Turtle document</comment> + <comment xml:lang="ast">Documentu Turtle</comment> <comment xml:lang="ca">document Turtle</comment> <comment xml:lang="cs">dokument Turtle</comment> <comment xml:lang="da">Turtle-dokument</comment> @@ -30663,6 +31609,7 @@ <comment xml:lang="eu">Turtle dokumentua</comment> <comment xml:lang="fi">Turtle-asiakirja</comment> <comment xml:lang="fr">document Turtle</comment> + <comment xml:lang="ga">cáipéis Turtle</comment> <comment xml:lang="he">מסמך Turtle</comment> <comment xml:lang="hr">Turtle dokument</comment> <comment xml:lang="hu">Turtle dokumentum</comment> @@ -30675,7 +31622,7 @@ <comment xml:lang="pl">Dokument Turtle</comment> <comment xml:lang="pt">documento Turtle</comment> <comment xml:lang="pt_BR">Documento Turtle</comment> - <comment xml:lang="ru">документ Turtle</comment> + <comment xml:lang="ru">Документ Turtle</comment> <comment xml:lang="sk">Dokument Turtle</comment> <comment xml:lang="sr">Тартл документ</comment> <comment xml:lang="sv">Turtle-dokument</comment> @@ -30689,6 +31636,7 @@ <mime-type type="text/x-txt2tags"> <comment>txt2tags document</comment> <comment xml:lang="ar">مستند txt2tags</comment> + <comment xml:lang="ast">Documentu txt2tags</comment> <comment xml:lang="be@latin">dakument txt2tags</comment> <comment xml:lang="bg">Документ — txt2tags</comment> <comment xml:lang="ca">document txt2tags</comment> @@ -30709,7 +31657,7 @@ <comment xml:lang="hr">txt2tags dokument</comment> <comment xml:lang="hu">txt2tags dokumentum</comment> <comment xml:lang="ia">Documento txt2tags</comment> - <comment xml:lang="id">dokumen txt2tags</comment> + <comment xml:lang="id">Dokumen txt2tags</comment> <comment xml:lang="it">Documento txt2tags</comment> <comment xml:lang="ja">txt2tags ドキュメント</comment> <comment xml:lang="ka">txt2tags დოკუმენტი</comment> @@ -30725,7 +31673,7 @@ <comment xml:lang="pt">documento txt2tags</comment> <comment xml:lang="pt_BR">Documento do txt2tags</comment> <comment xml:lang="ro">document txt2tags</comment> - <comment xml:lang="ru">документ txt2tags</comment> + <comment xml:lang="ru">Документ txt2tags</comment> <comment xml:lang="sk">Dokument txt2tags</comment> <comment xml:lang="sl">Dokument txt2tags</comment> <comment xml:lang="sq">Dokument txt2tags</comment> @@ -30747,7 +31695,7 @@ <comment>Verilog source code</comment> <comment xml:lang="bg">Изходен код — Verilog</comment> <comment xml:lang="ca">codi font en Verilog</comment> - <comment xml:lang="cs">zdrojový kód Verilog</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Verilog</comment> <comment xml:lang="da">Verilog-kildekode</comment> <comment xml:lang="de">Verilog-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Verilog</comment> @@ -30757,9 +31705,10 @@ <comment xml:lang="eu">Verilog iturburu-kodea</comment> <comment xml:lang="fi">Verilog-lähdekoodi</comment> <comment xml:lang="fr">code source Verilog</comment> + <comment xml:lang="ga">cód foinseach Verilog</comment> <comment xml:lang="gl">código fonte en Verilog</comment> <comment xml:lang="he">קוד מקור של </comment> - <comment xml:lang="hr">Verilog izvorni kod</comment> + <comment xml:lang="hr">Verilog izvorni kôd</comment> <comment xml:lang="hu">Verilog-forráskód</comment> <comment xml:lang="ia">Codice-fonte Verilog</comment> <comment xml:lang="id">Kode sumber Verilog</comment> @@ -30773,7 +31722,7 @@ <comment xml:lang="pl">Kod źródłowy Verilog</comment> <comment xml:lang="pt">código origem Verilog</comment> <comment xml:lang="pt_BR">Código-fonte Verilog</comment> - <comment xml:lang="ru">исходный код Verilog</comment> + <comment xml:lang="ru">Исходный код Verilog</comment> <comment xml:lang="sk">Zdrojový kód Verilog</comment> <comment xml:lang="sl">Datoteka izvorne kode Verilog</comment> <comment xml:lang="sr">изворни код Верилога</comment> @@ -30798,6 +31747,7 @@ <comment xml:lang="eu">SystemVerilog goiburua</comment> <comment xml:lang="fi">SystemVerilog-otsake</comment> <comment xml:lang="fr">en-tête </comment> + <comment xml:lang="ga">ceanntásc SystemVerilog</comment> <comment xml:lang="gl">Cabeceiras de SystemVerilog</comment> <comment xml:lang="he">כותרת SystemVerilog</comment> <comment xml:lang="hr">SystemVerilog zaglavlje</comment> @@ -30814,14 +31764,14 @@ <comment xml:lang="pl">Nagłówek SystemVerilog</comment> <comment xml:lang="pt">cabeçalho SystemVerilog</comment> <comment xml:lang="pt_BR">Cabeçalho de SystemVerilog</comment> - <comment xml:lang="ru">заголовочный файл SystemVerilog</comment> + <comment xml:lang="ru">Заголовочный файл SystemVerilog</comment> <comment xml:lang="sk">Hlavičky SystemVerilog</comment> <comment xml:lang="sl">Datoteka glave SystemVerilog</comment> <comment xml:lang="sr">заглавље Система Верилога</comment> <comment xml:lang="sv">SystemVerilog-headerfil</comment> <comment xml:lang="tr">SystemVerilog başlığı</comment> <comment xml:lang="uk">заголовки SystemVerilog</comment> - <comment xml:lang="zh_CN">SystemVerilog 头</comment> + <comment xml:lang="zh_CN">SystemVerilog 头文件</comment> <comment xml:lang="zh_TW">SystemVerilog 標頭</comment> <sub-class-of type="text/x-verilog"/> <glob pattern="*.svh"/> @@ -30839,9 +31789,10 @@ <comment xml:lang="eu">SystemVerilog iturburu-kodea</comment> <comment xml:lang="fi">SystemVerilog-lähdekoodi</comment> <comment xml:lang="fr">code source </comment> + <comment xml:lang="ga">cód foinseach SystemVerilog</comment> <comment xml:lang="gl">código fonte en SystemVerilog</comment> <comment xml:lang="he">קוד מקור של SystemVerilog</comment> - <comment xml:lang="hr">SystemVerilog izvorni kod</comment> + <comment xml:lang="hr">SystemVerilog izvorni kôd</comment> <comment xml:lang="hu">SystemVerilog-forráskód</comment> <comment xml:lang="ia">Codice-fonte SystemVerilog</comment> <comment xml:lang="id">Kode sumber SystemVerilog</comment> @@ -30855,7 +31806,7 @@ <comment xml:lang="pl">Kod źródłowy SystemVerilog</comment> <comment xml:lang="pt">código origem SystemVerilog</comment> <comment xml:lang="pt_BR">Código-fonte de SystemVerilog</comment> - <comment xml:lang="ru">исходный код SystemVerilog</comment> + <comment xml:lang="ru">Исходный код SystemVerilog</comment> <comment xml:lang="sk">Zdrojový kód SystemVerilog</comment> <comment xml:lang="sl">Datoteka izvorne kode SystemVerilog</comment> <comment xml:lang="sr">изворни код Система Верилога</comment> @@ -30871,7 +31822,7 @@ <comment>VHDL source code</comment> <comment xml:lang="bg">Изходен код — VHDL</comment> <comment xml:lang="ca">codi font en VHDL</comment> - <comment xml:lang="cs">zdrojový kód VHDL</comment> + <comment xml:lang="cs">zdrojový kód v jazyce VHDL</comment> <comment xml:lang="da">VHDL-kildekode</comment> <comment xml:lang="de">VHDL-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας VHDL</comment> @@ -30881,9 +31832,10 @@ <comment xml:lang="eu">VHDL iturburu-kodea</comment> <comment xml:lang="fi">VHDL-lähdekoodi</comment> <comment xml:lang="fr">code source VHDL</comment> + <comment xml:lang="ga">cód foinseach VHDL</comment> <comment xml:lang="gl">código fonte en VHDL</comment> <comment xml:lang="he">קוד מקור של VHDL</comment> - <comment xml:lang="hr">VHDL izvorni kod</comment> + <comment xml:lang="hr">VHDL izvorni kôd</comment> <comment xml:lang="hu">VHDL-forráskód</comment> <comment xml:lang="ia">Codice-fonte VHDL</comment> <comment xml:lang="id">Kode sumber VHDL</comment> @@ -30897,7 +31849,7 @@ <comment xml:lang="pl">Kod źródłowy VHDL</comment> <comment xml:lang="pt">código origem VHDL</comment> <comment xml:lang="pt_BR">Código-fonte VHDL</comment> - <comment xml:lang="ru">исходный код VHDL</comment> + <comment xml:lang="ru">Исходный код VHDL</comment> <comment xml:lang="sk">Zdrojový kód VHDL</comment> <comment xml:lang="sl">Datoteka izvorne kode VHDL</comment> <comment xml:lang="sr">ВХДЛ изворни код</comment> @@ -30915,6 +31867,7 @@ <mime-type type="text/enriched"> <comment>enriched text document</comment> <comment xml:lang="ar">مستند نصي مغنى</comment> + <comment xml:lang="ast">documentu de testu arriquecíu</comment> <comment xml:lang="az">zəngin mətn sənədi</comment> <comment xml:lang="be@latin">azdobleny tekstavy dakument</comment> <comment xml:lang="bg">Документ с обогатен текст</comment> @@ -30934,7 +31887,7 @@ <comment xml:lang="ga">cáipéis téacs saibhrithe</comment> <comment xml:lang="gl">documento de texto enriquecido</comment> <comment xml:lang="he">מסמך טקסט מועשר</comment> - <comment xml:lang="hr">obogaćeni tekstualni dokument</comment> + <comment xml:lang="hr">Obogaćeni tekstovni dokument</comment> <comment xml:lang="hu">enriched text dokumentum</comment> <comment xml:lang="ia">Documento de texto inricchite</comment> <comment xml:lang="id">dokumen teks diperkaya</comment> @@ -30953,7 +31906,7 @@ <comment xml:lang="pt">documento de texto rico</comment> <comment xml:lang="pt_BR">Documento de texto enriquecido</comment> <comment xml:lang="ro">document text îmbogățit</comment> - <comment xml:lang="ru">форматированный текстовый документ</comment> + <comment xml:lang="ru">Форматированный текстовый документ</comment> <comment xml:lang="sk">Rozšírený textový dokument</comment> <comment xml:lang="sl">dokument z obogatenim besedilom</comment> <comment xml:lang="sq">Dokument teksti i pasuruar</comment> @@ -30962,7 +31915,7 @@ <comment xml:lang="tr">zenginleştirilmiş metin belgesi</comment> <comment xml:lang="uk">форматований текстовий документ</comment> <comment xml:lang="vi">tài liệu văn bản có kiểu dáng</comment> - <comment xml:lang="zh_CN">富文本文档</comment> + <comment xml:lang="zh_CN">浓缩文本文档 (ETF)</comment> <comment xml:lang="zh_TW">豐富化文字文件</comment> <sub-class-of type="text/plain"/> </mime-type> @@ -30988,7 +31941,7 @@ <comment xml:lang="ga">leathanach cabhrach</comment> <comment xml:lang="gl">páxina de axuda</comment> <comment xml:lang="he">דף עזרה</comment> - <comment xml:lang="hr">stranica pomoći</comment> + <comment xml:lang="hr">Stranica pomoći</comment> <comment xml:lang="hu">súgóoldal</comment> <comment xml:lang="ia">Pagina de adjuta</comment> <comment xml:lang="id">halaman bantuan</comment> @@ -31007,7 +31960,7 @@ <comment xml:lang="pt">página de ajuda</comment> <comment xml:lang="pt_BR">Página de ajuda</comment> <comment xml:lang="ro">pagină de ajutor</comment> - <comment xml:lang="ru">страница справки</comment> + <comment xml:lang="ru">Страница справки</comment> <comment xml:lang="sk">Stránka Pomocníka</comment> <comment xml:lang="sl">stran pomoči</comment> <comment xml:lang="sq">Faqe ndihme</comment> @@ -31023,6 +31976,7 @@ <mime-type type="text/plain"> <comment>plain text document</comment> <comment xml:lang="ar">مستند نصي مجرد</comment> + <comment xml:lang="ast">documentu de testu planu</comment> <comment xml:lang="be@latin">prosty tekstavy dakument</comment> <comment xml:lang="bg">Документ с неформатиран текст</comment> <comment xml:lang="ca">document de text pla</comment> @@ -31039,10 +31993,10 @@ <comment xml:lang="ga">cáipéis ghnáth-théacs</comment> <comment xml:lang="gl">documento de texto sinxelo</comment> <comment xml:lang="he">מסמך טקסט פשוט</comment> - <comment xml:lang="hr">običan tekstualni dokument</comment> + <comment xml:lang="hr">Običan tekstovni dokument</comment> <comment xml:lang="hu">egyszerű szöveg</comment> <comment xml:lang="ia">Documento de texto simple</comment> - <comment xml:lang="id">dokumen teks biasa</comment> + <comment xml:lang="id">dokumen teks polos</comment> <comment xml:lang="it">Documento in testo semplice</comment> <comment xml:lang="ja">平文テキストドキュメント</comment> <comment xml:lang="kk">мәтіндік құжаты</comment> @@ -31058,7 +32012,7 @@ <comment xml:lang="pt">documento em texto simples</comment> <comment xml:lang="pt_BR">Documento de Texto</comment> <comment xml:lang="ro">document text simplu</comment> - <comment xml:lang="ru">текстовый документ</comment> + <comment xml:lang="ru">Текстовый документ</comment> <comment xml:lang="sk">Obyčajný textový dokument</comment> <comment xml:lang="sl">običajna besedilna datoteka</comment> <comment xml:lang="sq">Dokument në tekst të thjeshtë</comment> @@ -31115,7 +32069,7 @@ <comment xml:lang="pt">ficheiro RDF</comment> <comment xml:lang="pt_BR">Arquivo RDF</comment> <comment xml:lang="ro">Fișier RDF</comment> - <comment xml:lang="ru">файл RDF</comment> + <comment xml:lang="ru">Файл RDF</comment> <comment xml:lang="sk">Súbor RDF</comment> <comment xml:lang="sl">Datoteka RDF</comment> <comment xml:lang="sq">File RDF</comment> @@ -31146,6 +32100,7 @@ <comment xml:lang="es">archivo en XML OWL</comment> <comment xml:lang="eu">OWL XML fitxategia</comment> <comment xml:lang="fr">fichier XML OWL</comment> + <comment xml:lang="ga">comhad XML OWL</comment> <comment xml:lang="hr">OWL XML datoteka</comment> <comment xml:lang="hu">OWL XML-fájl</comment> <comment xml:lang="ia">File XML OWL</comment> @@ -31157,7 +32112,7 @@ <comment xml:lang="pl">Plik XML OWL</comment> <comment xml:lang="pt">ficheiro OWL XML</comment> <comment xml:lang="pt_BR">Arquivo OWL XML</comment> - <comment xml:lang="ru">файл XML OWL</comment> + <comment xml:lang="ru">Файл XML OWL</comment> <comment xml:lang="sk">Súbor XML OWL</comment> <comment xml:lang="sr">ОВЛ ИксМЛ датотека</comment> <comment xml:lang="sv">OWL XML-fil</comment> @@ -31196,14 +32151,14 @@ <comment xml:lang="ga">ceanntásca ríomhphoist</comment> <comment xml:lang="gl">cabeceiras de correo electrónico</comment> <comment xml:lang="he">כותרת דוא״ל</comment> - <comment xml:lang="hr">zaglavlja e-pošte</comment> + <comment xml:lang="hr">Zaglavlja e-pošte</comment> <comment xml:lang="hu">levélfejléc</comment> <comment xml:lang="ia">Capites de e-mail</comment> - <comment xml:lang="id">tajuk email</comment> + <comment xml:lang="id">header email</comment> <comment xml:lang="it">Intestazioni email</comment> <comment xml:lang="ja">メールヘッダー</comment> <comment xml:lang="kk">пошталық тақырыптамалары</comment> - <comment xml:lang="ko">전자 우편 헤더</comment> + <comment xml:lang="ko">전자메일 헤더</comment> <comment xml:lang="lt">el. laiško antraštės</comment> <comment xml:lang="lv">e-pasta galvene</comment> <comment xml:lang="ms">Pengepala emel</comment> @@ -31215,7 +32170,7 @@ <comment xml:lang="pt">cabeçalhos de email</comment> <comment xml:lang="pt_BR">Cabeçalhos de e-mail</comment> <comment xml:lang="ro">antete email</comment> - <comment xml:lang="ru">почтовые заголовки</comment> + <comment xml:lang="ru">Почтовые заголовки</comment> <comment xml:lang="sk">Hlavičky e-mailu</comment> <comment xml:lang="sl">glava elektronske pošte</comment> <comment xml:lang="sq">Header email</comment> @@ -31231,6 +32186,7 @@ <mime-type type="text/richtext"> <comment>rich text document</comment> <comment xml:lang="ar">مستند نصي غني</comment> + <comment xml:lang="ast">documentu de testu ricu</comment> <comment xml:lang="az">zəngin mətn sənədi</comment> <comment xml:lang="be@latin">azdobleny tekstavy dakument</comment> <comment xml:lang="bg">Документ — rich text</comment> @@ -31249,7 +32205,7 @@ <comment xml:lang="ga">cáipéis mhéith-théacs</comment> <comment xml:lang="gl">documento do texto enriquecido</comment> <comment xml:lang="he">מסמך טקסט עשיר</comment> - <comment xml:lang="hr">obogaćeni tekstualni dokument</comment> + <comment xml:lang="hr">Obogaćeni tekstovni dokument</comment> <comment xml:lang="hu">rich text-dokumentum</comment> <comment xml:lang="ia">Documento de texto inricchite</comment> <comment xml:lang="id">dokumen teks kaya</comment> @@ -31268,7 +32224,7 @@ <comment xml:lang="pt">documento em texto rico</comment> <comment xml:lang="pt_BR">Documento rich text</comment> <comment xml:lang="ro">document text îmbogățit</comment> - <comment xml:lang="ru">документ с форматированным текстом</comment> + <comment xml:lang="ru">Документ с форматированным текстом</comment> <comment xml:lang="sk">Textový dokument RTF</comment> <comment xml:lang="sl">dokument z oblikovanim besedilom</comment> <comment xml:lang="sq">Dokument rich text</comment> @@ -31277,7 +32233,7 @@ <comment xml:lang="tr">zengin metin belgesi</comment> <comment xml:lang="uk">форматований текстовий документ</comment> <comment xml:lang="vi">tài liệu văn bản có kiểu dáng (RTF)</comment> - <comment xml:lang="zh_CN">RTF 丰富文本文档</comment> + <comment xml:lang="zh_CN">富文本文档 (RTF)</comment> <comment xml:lang="zh_TW">豐富文字文件</comment> <sub-class-of type="text/plain"/> <glob pattern="*.rtx"/> @@ -31319,7 +32275,7 @@ <comment xml:lang="pt">resumo RSS</comment> <comment xml:lang="pt_BR">Resumo RSS</comment> <comment xml:lang="ro">Rezumat RSS</comment> - <comment xml:lang="ru">сводка RSS</comment> + <comment xml:lang="ru">Сводка RSS</comment> <comment xml:lang="sk">Súhrn RSS</comment> <comment xml:lang="sl">Datoteka povzetek RSS</comment> <comment xml:lang="sq">Përmbledhje RSS</comment> @@ -31366,7 +32322,7 @@ <comment xml:lang="it">Feed di distribuzione Atom</comment> <comment xml:lang="ja">Atom 配信フィード</comment> <comment xml:lang="kk">Atom жаңалықтар таспасы</comment> - <comment xml:lang="ko">Atom 동기화 피드</comment> + <comment xml:lang="ko">Atom 묶음 피드</comment> <comment xml:lang="lt">Atom sindikacijos kanalas</comment> <comment xml:lang="lv">Atom sindikāta barotne</comment> <comment xml:lang="nb">Atom syndikeringsstrøm</comment> @@ -31377,7 +32333,7 @@ <comment xml:lang="pt">feed Atom</comment> <comment xml:lang="pt_BR">Fonte de notícias Atom</comment> <comment xml:lang="ro">Flux agregare Atom</comment> - <comment xml:lang="ru">лента новостей Atom</comment> + <comment xml:lang="ru">Лента новостей Atom</comment> <comment xml:lang="sk">Kanál Atom</comment> <comment xml:lang="sl">Sindikalni vir Atom</comment> <comment xml:lang="sq">Feed për përhapje Atom</comment> @@ -31386,7 +32342,7 @@ <comment xml:lang="tr">Atom besleme kaynağı</comment> <comment xml:lang="uk">трансляція подач Atom</comment> <comment xml:lang="vi">Nguồn tin tức Atom</comment> - <comment xml:lang="zh_CN">Atom 更新种子</comment> + <comment xml:lang="zh_CN">Atom 聚合种子</comment> <comment xml:lang="zh_TW">Atom 聯合供稿饋流</comment> <sub-class-of type="application/xml"/> <generic-icon name="text-html"/> @@ -31432,7 +32388,7 @@ <comment xml:lang="pt">feed OPML</comment> <comment xml:lang="pt_BR">Fonte de notícias OPML</comment> <comment xml:lang="ro">Flux OPML syndication</comment> - <comment xml:lang="ru">лента новостей OPML</comment> + <comment xml:lang="ru">Лента новостей OPML</comment> <comment xml:lang="sk">Kanál OPML</comment> <comment xml:lang="sl">Sindikalni vir OPML</comment> <comment xml:lang="sq">Feed për përhapje OPML</comment> @@ -31454,6 +32410,7 @@ <mime-type type="text/sgml"> <comment>SGML document</comment> <comment xml:lang="ar">مستند SGML</comment> + <comment xml:lang="ast">Documentu SGML</comment> <comment xml:lang="be@latin">Dakument SGML</comment> <comment xml:lang="bg">Документ — SGML</comment> <comment xml:lang="ca">document SGML</comment> @@ -31491,7 +32448,7 @@ <comment xml:lang="pt">documento SGML</comment> <comment xml:lang="pt_BR">Documento SGML</comment> <comment xml:lang="ro">Document SGML</comment> - <comment xml:lang="ru">документ SGML</comment> + <comment xml:lang="ru">Документ SGML</comment> <comment xml:lang="sk">Dokument SGML</comment> <comment xml:lang="sl">Dokument SGML</comment> <comment xml:lang="sq">Dokument SGML</comment> @@ -31511,6 +32468,7 @@ <mime-type type="text/spreadsheet"> <comment>spreadsheet interchange document</comment> <comment xml:lang="ar">مستند تبادل الجدول</comment> + <comment xml:lang="ast">documentu d'intercambéu de fueyes de cálculu</comment> <comment xml:lang="be@latin">dakument dla abmienu raźlikovymi arkušami</comment> <comment xml:lang="bg">Документ за обмяна между програми за електронни таблици</comment> <comment xml:lang="ca">document d'intercanvi de full de càlcul</comment> @@ -31545,7 +32503,7 @@ <comment xml:lang="pt">documento de troca interna de folhas de cálculo</comment> <comment xml:lang="pt_BR">Documento de intercâmbio de planilhas</comment> <comment xml:lang="ro">document schimb filă de calcul</comment> - <comment xml:lang="ru">документ Spreadsheet Interchange</comment> + <comment xml:lang="ru">Документ Spreadsheet Interchange</comment> <comment xml:lang="sk">Zošitový prenosový dokument</comment> <comment xml:lang="sl">dokument izmenjeve preglednic</comment> <comment xml:lang="sq">Dokument shkëmbimi për fletë llogaritje</comment> @@ -31566,6 +32524,7 @@ <mime-type type="text/tab-separated-values"> <comment>TSV document</comment> <comment xml:lang="ar">مستند TSV</comment> + <comment xml:lang="ast">Documentu TSV</comment> <comment xml:lang="be@latin">Dakument TSV</comment> <comment xml:lang="bg">Документ — TSV</comment> <comment xml:lang="ca">document TSV</comment> @@ -31600,7 +32559,7 @@ <comment xml:lang="pt">documento TSV</comment> <comment xml:lang="pt_BR">Documento TSV</comment> <comment xml:lang="ro">Document TSV</comment> - <comment xml:lang="ru">документ TSV</comment> + <comment xml:lang="ru">Документ TSV</comment> <comment xml:lang="sk">Dokument TSV</comment> <comment xml:lang="sl">Dokument TSV</comment> <comment xml:lang="sq">Dokument TSV</comment> @@ -31658,7 +32617,7 @@ <comment xml:lang="tr">Graphviz DOT grafiği</comment> <comment xml:lang="uk">граф DOT Graphviz</comment> <comment xml:lang="vi">Biểu đồ DOT Graphviz</comment> - <comment xml:lang="zh_CN">Graphviz DOT 科学图形</comment> + <comment xml:lang="zh_CN">Graphviz DOT 图形</comment> <comment xml:lang="zh_TW">Graphviz DOT 圖</comment> <generic-icon name="x-office-document"/> <magic priority="50"> @@ -31673,6 +32632,7 @@ <mime-type type="text/vnd.sun.j2me.app-descriptor"> <comment>JAD document</comment> <comment xml:lang="ar">مستند JAD</comment> + <comment xml:lang="ast">Documentu JAD</comment> <comment xml:lang="be@latin">Dakument JAD</comment> <comment xml:lang="bg">Документ — JAD</comment> <comment xml:lang="ca">document JAD</comment> @@ -31708,7 +32668,7 @@ <comment xml:lang="pt">documento JAD</comment> <comment xml:lang="pt_BR">Documento JAD</comment> <comment xml:lang="ro">Document JAD</comment> - <comment xml:lang="ru">документ JAD</comment> + <comment xml:lang="ru">Документ JAD</comment> <comment xml:lang="sk">Dokument JAD</comment> <comment xml:lang="sl">Dokument JAD</comment> <comment xml:lang="sq">Dokument JAD</comment> @@ -31729,6 +32689,7 @@ <mime-type type="text/vnd.wap.wml"> <comment>WML document</comment> <comment xml:lang="ar">مستند WML</comment> + <comment xml:lang="ast">Documentu WML</comment> <comment xml:lang="az">WML sənədi</comment> <comment xml:lang="be@latin">Dakument WML</comment> <comment xml:lang="bg">Документ — WML</comment> @@ -31767,7 +32728,7 @@ <comment xml:lang="pt">documento WML</comment> <comment xml:lang="pt_BR">Documento WML</comment> <comment xml:lang="ro">Document WML</comment> - <comment xml:lang="ru">документ WML</comment> + <comment xml:lang="ru">Документ WML</comment> <comment xml:lang="sk">Dokument WML</comment> <comment xml:lang="sl">Dokument WML</comment> <comment xml:lang="sq">Dokument WML</comment> @@ -31820,7 +32781,7 @@ <comment xml:lang="pt">programa WMLScript</comment> <comment xml:lang="pt_BR">Programa WMLScript</comment> <comment xml:lang="ro">Program WMLScript</comment> - <comment xml:lang="ru">сценарий WMLScript</comment> + <comment xml:lang="ru">Программа WMLScript</comment> <comment xml:lang="sk">Program WMLScript</comment> <comment xml:lang="sl">Programska datoteka WMLScript</comment> <comment xml:lang="sq">Program WMLScript</comment> @@ -31872,7 +32833,7 @@ <comment xml:lang="pt">arquivo ACE</comment> <comment xml:lang="pt_BR">Pacote ACE</comment> <comment xml:lang="ro">Arhivă ACE</comment> - <comment xml:lang="ru">архив ACE</comment> + <comment xml:lang="ru">Архив ACE</comment> <comment xml:lang="sk">Archív ACE</comment> <comment xml:lang="sl">Datoteka arhiva ACE</comment> <comment xml:lang="sq">Arkiv ACE</comment> @@ -31909,10 +32870,10 @@ <comment xml:lang="ga">cód foinseach Ada</comment> <comment xml:lang="gl">código fonte en Ada</comment> <comment xml:lang="he">קוד מקור Ada</comment> - <comment xml:lang="hr">Ada izvorni kod</comment> + <comment xml:lang="hr">Ada izvorni kôd</comment> <comment xml:lang="hu">Ada-forráskód</comment> <comment xml:lang="ia">Codice-fonte Ada</comment> - <comment xml:lang="id">Kode program Ada</comment> + <comment xml:lang="id">Kode sumber Ada</comment> <comment xml:lang="it">Codice sorgente Ada</comment> <comment xml:lang="ja">Ada ソースコード</comment> <comment xml:lang="ka">Ada-ის საწყისი კოდი</comment> @@ -31929,7 +32890,7 @@ <comment xml:lang="pt">código origem Ada</comment> <comment xml:lang="pt_BR">Código-fonte Ada</comment> <comment xml:lang="ro">Cod sursă Ada</comment> - <comment xml:lang="ru">исходный код Ada</comment> + <comment xml:lang="ru">Исходный код Ada</comment> <comment xml:lang="sk">Zdrojový kód jazyka Ada</comment> <comment xml:lang="sl">Datoteka izvorne kode Ada</comment> <comment xml:lang="sq">Kod burues Ada</comment> @@ -31983,7 +32944,7 @@ <comment xml:lang="pt">lista de autores</comment> <comment xml:lang="pt_BR">Lista de autores</comment> <comment xml:lang="ro">listă autori</comment> - <comment xml:lang="ru">список авторов</comment> + <comment xml:lang="ru">Список авторов</comment> <comment xml:lang="sk">Zoznam autorov</comment> <comment xml:lang="sl">seznam avtorjev</comment> <comment xml:lang="sq">Lista e autorëve</comment> @@ -32000,6 +32961,7 @@ <mime-type type="text/x-bibtex"> <comment>BibTeX document</comment> <comment xml:lang="ar">مستند BibTeX</comment> + <comment xml:lang="ast">Documentu de BibTeX</comment> <comment xml:lang="be@latin">Dakument BibTeX</comment> <comment xml:lang="bg">Документ — BibTeX</comment> <comment xml:lang="ca">document BibTeX</comment> @@ -32036,7 +32998,7 @@ <comment xml:lang="pt">documento BibTeX</comment> <comment xml:lang="pt_BR">Documento BibTeX</comment> <comment xml:lang="ro">Document BibTeX</comment> - <comment xml:lang="ru">документ BibTeX</comment> + <comment xml:lang="ru">Документ BibTeX</comment> <comment xml:lang="sk">Dokument BibTeX</comment> <comment xml:lang="sl">Dokument BibTeX</comment> <comment xml:lang="sq">Dokument BibTeX</comment> @@ -32075,7 +33037,7 @@ <comment xml:lang="hr">C++ zaglavlje</comment> <comment xml:lang="hu">C++ fejléc</comment> <comment xml:lang="ia">Capite C++</comment> - <comment xml:lang="id">Tajuk C++</comment> + <comment xml:lang="id">Header C++</comment> <comment xml:lang="it">Header C++</comment> <comment xml:lang="ja">C++ ヘッダー</comment> <comment xml:lang="ka">C++-ის თავსართი</comment> @@ -32091,7 +33053,7 @@ <comment xml:lang="pt">cabeçalho C++</comment> <comment xml:lang="pt_BR">Cabeçalho C++</comment> <comment xml:lang="ro">Antet C++</comment> - <comment xml:lang="ru">заголовочный файл C++</comment> + <comment xml:lang="ru">Заголовочный файл C++</comment> <comment xml:lang="sk">Hlavičky jazyka C++</comment> <comment xml:lang="sl">Datoteka glave C++</comment> <comment xml:lang="sq">Header C++</comment> @@ -32100,7 +33062,7 @@ <comment xml:lang="tr">C++ başlığı</comment> <comment xml:lang="uk">файл заголовків мовою C++</comment> <comment xml:lang="vi">Phần đầu mã nguồn C++</comment> - <comment xml:lang="zh_CN">C++ 源代码头文件</comment> + <comment xml:lang="zh_CN">C++ 头文件</comment> <comment xml:lang="zh_TW">C++ 標頭檔</comment> <sub-class-of type="text/x-chdr"/> <glob pattern="*.hh"/> @@ -32115,7 +33077,7 @@ <comment xml:lang="be@latin">Kryničny kod C++</comment> <comment xml:lang="bg">Изходен код — C++</comment> <comment xml:lang="ca">codi font en C++</comment> - <comment xml:lang="cs">zdrojový kód C++</comment> + <comment xml:lang="cs">zdrojový kód v jazyce C++</comment> <comment xml:lang="da">C++-kildekode</comment> <comment xml:lang="de">C++-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας C++</comment> @@ -32129,10 +33091,10 @@ <comment xml:lang="ga">cód foinseach C++</comment> <comment xml:lang="gl">código fonte de C++</comment> <comment xml:lang="he">קוד מקור של C++</comment> - <comment xml:lang="hr">C++ izvorni kod</comment> + <comment xml:lang="hr">C++ izvorni kôd</comment> <comment xml:lang="hu">C++-forráskód</comment> <comment xml:lang="ia">Codice-fonte C++</comment> - <comment xml:lang="id">Kode program C++</comment> + <comment xml:lang="id">Kode sumber C++</comment> <comment xml:lang="it">Codice sorgente C++</comment> <comment xml:lang="ja">C++ ソースコード</comment> <comment xml:lang="ka">C++-ის საწყისი კოდი</comment> @@ -32149,7 +33111,7 @@ <comment xml:lang="pt">código origem C++</comment> <comment xml:lang="pt_BR">Código-fonte C++</comment> <comment xml:lang="ro">Cod sursă C++</comment> - <comment xml:lang="ru">исходный код C++</comment> + <comment xml:lang="ru">Исходный код C++</comment> <comment xml:lang="sk">Zdrojový kód jazyka C++</comment> <comment xml:lang="sl">Datoteka izvorne kode C++</comment> <comment xml:lang="sq">Kod burues C++</comment> @@ -32170,6 +33132,7 @@ <mime-type type="text/x-changelog"> <comment>ChangeLog document</comment> <comment xml:lang="ar">مستند ChangeLog</comment> + <comment xml:lang="ast">Documentu de rexistru de cambeos</comment> <comment xml:lang="be@latin">Dakument zafiksavanych źmienaŭ ChangeLog</comment> <comment xml:lang="bg">Дневник за промени — ChangeLog</comment> <comment xml:lang="ca">document de registre de canvis</comment> @@ -32186,7 +33149,7 @@ <comment xml:lang="ga">cáipéis ChangeLog</comment> <comment xml:lang="gl">documento Changelog</comment> <comment xml:lang="he">מסמך של ChangeLog</comment> - <comment xml:lang="hr">Dokument zaspisa promjena</comment> + <comment xml:lang="hr">Dokument zapisa promjena</comment> <comment xml:lang="hu">ChangeLog dokumentum</comment> <comment xml:lang="ia">Lista de cambiamentos</comment> <comment xml:lang="id">Dokumen ChangeLog</comment> @@ -32205,11 +33168,11 @@ <comment xml:lang="pt">documento ChangeLog</comment> <comment xml:lang="pt_BR">Documento ChangeLog</comment> <comment xml:lang="ro">Document ChangeLog</comment> - <comment xml:lang="ru">протокол изменений</comment> + <comment xml:lang="ru">Протокол изменений</comment> <comment xml:lang="sk">Dokument ChangeLog</comment> <comment xml:lang="sl">Dokument ChangeLog</comment> <comment xml:lang="sq">Dokument ChangeLog</comment> - <comment xml:lang="sr">Ченџ Лог документ</comment> + <comment xml:lang="sr">документ дневника измена</comment> <comment xml:lang="sv">Ändringsloggsdokument</comment> <comment xml:lang="tr">Değişim Günlüğü belgesi</comment> <comment xml:lang="uk">документ ChangeLog</comment> @@ -32241,7 +33204,7 @@ <comment xml:lang="hr">C zaglavlje</comment> <comment xml:lang="hu">C fejléc</comment> <comment xml:lang="ia">Capite C</comment> - <comment xml:lang="id">Tajuk C</comment> + <comment xml:lang="id">Header C</comment> <comment xml:lang="it">Header C</comment> <comment xml:lang="ja">C ヘッダー</comment> <comment xml:lang="ka">C-ის თავსართი</comment> @@ -32257,7 +33220,7 @@ <comment xml:lang="pt">cabeçalho C</comment> <comment xml:lang="pt_BR">Cabeçalho C</comment> <comment xml:lang="ro">Antet C</comment> - <comment xml:lang="ru">заголовочный файл C</comment> + <comment xml:lang="ru">Заголовочный файл C</comment> <comment xml:lang="sk">Hlavičky jazyka C</comment> <comment xml:lang="sl">Datoteka glave C</comment> <comment xml:lang="sq">Header C</comment> @@ -32291,10 +33254,10 @@ <comment xml:lang="ga">cód foinseach CMake</comment> <comment xml:lang="gl">código fonte de CMake</comment> <comment xml:lang="he">קוד מקור של CMake</comment> - <comment xml:lang="hr">CMake izvorni kod</comment> + <comment xml:lang="hr">CMake izvorni kôd</comment> <comment xml:lang="hu">CMake-forráskód</comment> <comment xml:lang="ia">Codice-fonte CMake</comment> - <comment xml:lang="id">Kode program CMake</comment> + <comment xml:lang="id">Kode sumber CMake</comment> <comment xml:lang="it">Codice sorgente CMake</comment> <comment xml:lang="ja">CMake ソースコード</comment> <comment xml:lang="ka">CMake-ის საწყისი კოდი</comment> @@ -32310,7 +33273,7 @@ <comment xml:lang="pt">código origem CMake</comment> <comment xml:lang="pt_BR">Código-fonte CMake</comment> <comment xml:lang="ro">Cod sursă CMake</comment> - <comment xml:lang="ru">исходный код CMake</comment> + <comment xml:lang="ru">Исходный код CMake</comment> <comment xml:lang="sk">Zdrojový kód CMake</comment> <comment xml:lang="sl">Datoteka izvorne kode CMake</comment> <comment xml:lang="sq">Kod burues CMake</comment> @@ -32328,6 +33291,7 @@ <mime-type type="text/csv"> <comment>CSV document</comment> <comment xml:lang="ar">مستند CSV</comment> + <comment xml:lang="ast">Documentu CVS</comment> <comment xml:lang="be@latin">Dakument CSV</comment> <comment xml:lang="bg">Документ — CSV</comment> <comment xml:lang="ca">document CSV</comment> @@ -32364,7 +33328,7 @@ <comment xml:lang="pt">documento CSV</comment> <comment xml:lang="pt_BR">Documento CSV</comment> <comment xml:lang="ro">Document CSV</comment> - <comment xml:lang="ru">документ CSV</comment> + <comment xml:lang="ru">Документ CSV</comment> <comment xml:lang="sk">Dokument CSV</comment> <comment xml:lang="sl">Dokument CSV</comment> <comment xml:lang="sq">Dokument CSV</comment> @@ -32384,6 +33348,7 @@ </mime-type> <mime-type type="text/csv-schema"> <comment>CSV Schema document</comment> + <comment xml:lang="ast">Documentu d'esquema CSV</comment> <comment xml:lang="ca">document Schema de CSV</comment> <comment xml:lang="cs">dokument schématu CSV</comment> <comment xml:lang="da">CSV Schema-dokument</comment> @@ -32392,6 +33357,8 @@ <comment xml:lang="es">documento esquemático CSV</comment> <comment xml:lang="eu">CSV Schema dokumentua</comment> <comment xml:lang="fr">document schéma CSV</comment> + <comment xml:lang="ga">cáipéis scéimre CSV</comment> + <comment xml:lang="he">מסמך פריסת CSV</comment> <comment xml:lang="hr">CSV Shema dokument</comment> <comment xml:lang="hu">CSV sémadokumentum</comment> <comment xml:lang="ia">Documento CSV Schema</comment> @@ -32402,7 +33369,7 @@ <comment xml:lang="pl">Dokument schematu CSV</comment> <comment xml:lang="pt">documento CSV Schema</comment> <comment xml:lang="pt_BR">Documento CSV Schema</comment> - <comment xml:lang="ru">документ CSV Schema</comment> + <comment xml:lang="ru">Документ CSV Schema</comment> <comment xml:lang="sk">Dokument schémy CSV</comment> <comment xml:lang="sr">документ ЦСВ шеме</comment> <comment xml:lang="sv">CSV Schema-dokument</comment> @@ -32418,6 +33385,7 @@ <mime-type type="text/x-copying"> <comment>license terms</comment> <comment xml:lang="ar">شروط الترخيص</comment> + <comment xml:lang="ast">términos de llicencia</comment> <comment xml:lang="be@latin">licenzijnyja ŭmovy</comment> <comment xml:lang="bg">Лицензни условия</comment> <comment xml:lang="ca">condicions de llicència</comment> @@ -32434,7 +33402,7 @@ <comment xml:lang="ga">téarmaí ceadúnais</comment> <comment xml:lang="gl">termos de licenza</comment> <comment xml:lang="he">תנאי רישיון</comment> - <comment xml:lang="hr">uvjeti licence</comment> + <comment xml:lang="hr">Uvjeti licence</comment> <comment xml:lang="hu">licencfeltételek</comment> <comment xml:lang="ia">Conditiones de licentia</comment> <comment xml:lang="id">persyaratan lisensi</comment> @@ -32452,7 +33420,7 @@ <comment xml:lang="pt">termos de licença</comment> <comment xml:lang="pt_BR">Termos de licença</comment> <comment xml:lang="ro">termeni de licență</comment> - <comment xml:lang="ru">лицензионное соглашение</comment> + <comment xml:lang="ru">Лицензионное соглашение</comment> <comment xml:lang="sk">Licenčné podmienky</comment> <comment xml:lang="sl">pogoji in dovoljenja uporabe</comment> <comment xml:lang="sq">Kushte liçence</comment> @@ -32469,6 +33437,7 @@ <mime-type type="text/x-credits"> <comment>author credits</comment> <comment xml:lang="ar">شكر وتقدير المؤلف</comment> + <comment xml:lang="ast">creitos del autor</comment> <comment xml:lang="be@latin">zasłuhi aŭtara</comment> <comment xml:lang="bg">Благодарности към авторите</comment> <comment xml:lang="ca">atribucions d'autor</comment> @@ -32502,7 +33471,7 @@ <comment xml:lang="pt">créditos de autor</comment> <comment xml:lang="pt_BR">Créditos do autor</comment> <comment xml:lang="ro">mulțumiri autori</comment> - <comment xml:lang="ru">авторы программы</comment> + <comment xml:lang="ru">Авторы программы</comment> <comment xml:lang="sk">Autorské zásluhy</comment> <comment xml:lang="sl">avtorske zasluge</comment> <comment xml:lang="sq">Kreditë e autorëve</comment> @@ -32522,7 +33491,7 @@ <comment xml:lang="be@latin">Kryničny kod C</comment> <comment xml:lang="bg">Изходен код — C</comment> <comment xml:lang="ca">codi font en C</comment> - <comment xml:lang="cs">zdrojový kód C</comment> + <comment xml:lang="cs">zdrojový kód v jazyce C</comment> <comment xml:lang="da">C-kildekode</comment> <comment xml:lang="de">C-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας C</comment> @@ -32536,10 +33505,10 @@ <comment xml:lang="ga">cód foinseach C</comment> <comment xml:lang="gl">código fonte en C</comment> <comment xml:lang="he">קוד מקור של C</comment> - <comment xml:lang="hr">C izvorni kod</comment> + <comment xml:lang="hr">C izvorni kôd</comment> <comment xml:lang="hu">C-forráskód</comment> <comment xml:lang="ia">Codice-fonte C</comment> - <comment xml:lang="id">Kode program C</comment> + <comment xml:lang="id">Kode sumber C</comment> <comment xml:lang="it">Codice sorgente C</comment> <comment xml:lang="ja">C ソースコード</comment> <comment xml:lang="ka">C-ის საწყისი კოდი</comment> @@ -32556,7 +33525,7 @@ <comment xml:lang="pt">código origem C</comment> <comment xml:lang="pt_BR">Código-fonte C</comment> <comment xml:lang="ro">Cod sursă C</comment> - <comment xml:lang="ru">исходный код C</comment> + <comment xml:lang="ru">Исходный код C</comment> <comment xml:lang="sk">Zdrojový kód jazyka C</comment> <comment xml:lang="sl">Datoteka izvorne kode C</comment> <comment xml:lang="sq">Kod burues C</comment> @@ -32582,7 +33551,7 @@ <comment xml:lang="be@latin">Kryničny kod C#</comment> <comment xml:lang="bg">Изходен код — C#</comment> <comment xml:lang="ca">codi font en C#</comment> - <comment xml:lang="cs">zdrojový kód C#</comment> + <comment xml:lang="cs">zdrojový kód v jazyce C#</comment> <comment xml:lang="da">C#-kildekode</comment> <comment xml:lang="de">C#-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας C#</comment> @@ -32596,10 +33565,10 @@ <comment xml:lang="ga">cód foinseach C#</comment> <comment xml:lang="gl">código fonte en C#</comment> <comment xml:lang="he">קוד מקור של C#</comment> - <comment xml:lang="hr">C# izvorni kod</comment> + <comment xml:lang="hr">C# izvorni kôd</comment> <comment xml:lang="hu">C#-forráskód</comment> <comment xml:lang="ia">Codice-fonte C#</comment> - <comment xml:lang="id">Kode program C#</comment> + <comment xml:lang="id">Kode sumber C#</comment> <comment xml:lang="it">Codice sorgente C#</comment> <comment xml:lang="ja">C# ソースコード</comment> <comment xml:lang="ka">C#-ის საწყისი კოდი</comment> @@ -32616,7 +33585,7 @@ <comment xml:lang="pt">código origem C#</comment> <comment xml:lang="pt_BR">Código-fonte C#</comment> <comment xml:lang="ro">Cod sursă C#</comment> - <comment xml:lang="ru">исходный код C#</comment> + <comment xml:lang="ru">Исходный код C#</comment> <comment xml:lang="sk">Zdrojový kód jazyka C#</comment> <comment xml:lang="sl">Datoteka izvorne kode C#</comment> <comment xml:lang="sq">Kod burues C#</comment> @@ -32636,7 +33605,7 @@ <comment xml:lang="be@latin">Kryničny kod Vala</comment> <comment xml:lang="bg">Изходен код — Vala</comment> <comment xml:lang="ca">codi font en Vala</comment> - <comment xml:lang="cs">zdrojový kód Vala</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Vala</comment> <comment xml:lang="da">Valakildekode</comment> <comment xml:lang="de">Vala-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Vala</comment> @@ -32650,10 +33619,10 @@ <comment xml:lang="ga">cód foinseach Vala</comment> <comment xml:lang="gl">código fonte en Vala</comment> <comment xml:lang="he">קוד מקור של Vala</comment> - <comment xml:lang="hr">Vala izvorni kod</comment> + <comment xml:lang="hr">Vala izvorni kôd</comment> <comment xml:lang="hu">Vala forráskód</comment> <comment xml:lang="ia">Codice-fonte Vala</comment> - <comment xml:lang="id">Kode program Vala</comment> + <comment xml:lang="id">Kode sumber Vala</comment> <comment xml:lang="it">Codice sorgente Vala</comment> <comment xml:lang="ja">Vala ソースコード</comment> <comment xml:lang="kk">Vala бастапқы коды</comment> @@ -32668,7 +33637,7 @@ <comment xml:lang="pt">código origem Vala</comment> <comment xml:lang="pt_BR">Código-fonte Vala</comment> <comment xml:lang="ro">Cod sursă Vala</comment> - <comment xml:lang="ru">исходный код Vala</comment> + <comment xml:lang="ru">Исходный код Vala</comment> <comment xml:lang="sk">Zdrojový kód Vala</comment> <comment xml:lang="sl">Datoteka izvorne kode Vala</comment> <comment xml:lang="sq">Kod burues Vala</comment> @@ -32697,9 +33666,10 @@ <comment xml:lang="eu">OOC iturburu-kodea</comment> <comment xml:lang="fi">OOC-lähdekoodi</comment> <comment xml:lang="fr">source code OOC</comment> + <comment xml:lang="ga">cód foinseach OOC</comment> <comment xml:lang="gl">código fonte de OOC</comment> <comment xml:lang="he">קוד מקור של OOC</comment> - <comment xml:lang="hr">OOC izvorni kod</comment> + <comment xml:lang="hr">OOC izvorni kôd</comment> <comment xml:lang="hu">OOC forráskód</comment> <comment xml:lang="ia">Codice-fonte OCC</comment> <comment xml:lang="id">Kode sumber OOC</comment> @@ -32714,14 +33684,14 @@ <comment xml:lang="pl">Kod źródłowy OOC</comment> <comment xml:lang="pt">código origem OOC</comment> <comment xml:lang="pt_BR">Código-fonte OOC</comment> - <comment xml:lang="ru">исходный код OOC</comment> + <comment xml:lang="ru">Исходный код OOC</comment> <comment xml:lang="sk">Zdrojový kód OOC</comment> <comment xml:lang="sl">Izvorna koda OOC</comment> <comment xml:lang="sr">ООЦ изворни ко̂д</comment> <comment xml:lang="sv">OOC-källkod</comment> <comment xml:lang="tr">OOC kaynak kodu</comment> <comment xml:lang="uk">вихідний код мовою OOC</comment> - <comment xml:lang="zh_CN">OOC</comment> + <comment xml:lang="zh_CN">OOC 源代码</comment> <comment xml:lang="zh_TW">OOC 源碼</comment> <acronym>OOC</acronym> <expanded-acronym>Out Of Class</expanded-acronym> @@ -32770,7 +33740,7 @@ <comment xml:lang="pt">script DCL</comment> <comment xml:lang="pt_BR">Script DCL</comment> <comment xml:lang="ro">Script DCL</comment> - <comment xml:lang="ru">сценарий DCL</comment> + <comment xml:lang="ru">Сценарий DCL</comment> <comment xml:lang="sk">Skript DCL</comment> <comment xml:lang="sl">Skriptna datoteka DCL</comment> <comment xml:lang="sq">Script DCL</comment> @@ -32789,6 +33759,7 @@ <mime-type type="text/x-dsl"> <comment>DSSSL document</comment> <comment xml:lang="ar">مستند DSSSL</comment> + <comment xml:lang="ast">Documentu DSSSL</comment> <comment xml:lang="az">DSSSL sənədi</comment> <comment xml:lang="be@latin">Dakument DSSSL</comment> <comment xml:lang="bg">Документ — DSSSL</comment> @@ -32828,7 +33799,7 @@ <comment xml:lang="pt">documento DSSSL</comment> <comment xml:lang="pt_BR">Documento DSSSL</comment> <comment xml:lang="ro">Document DSSSL</comment> - <comment xml:lang="ru">документ DSSSL</comment> + <comment xml:lang="ru">Документ DSSSL</comment> <comment xml:lang="sk">Dokument DSSSL</comment> <comment xml:lang="sl">Dokument DSSSL</comment> <comment xml:lang="sq">Dokument DSSSL</comment> @@ -32850,7 +33821,7 @@ <comment xml:lang="be@latin">Kryničny kod D</comment> <comment xml:lang="bg">Изходен код — D</comment> <comment xml:lang="ca">codi font en D</comment> - <comment xml:lang="cs">zdrojový kód D</comment> + <comment xml:lang="cs">zdrojový kód v jazyce D</comment> <comment xml:lang="da">D-kildekode</comment> <comment xml:lang="de">D-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας D</comment> @@ -32864,10 +33835,10 @@ <comment xml:lang="ga">cód foinseach D</comment> <comment xml:lang="gl">código fonte de D</comment> <comment xml:lang="he">קוד מקור לשפת D</comment> - <comment xml:lang="hr">D izvorni kod</comment> + <comment xml:lang="hr">D izvorni kôd</comment> <comment xml:lang="hu">D-forráskód</comment> <comment xml:lang="ia">Codice-fonte D</comment> - <comment xml:lang="id">Kode program D</comment> + <comment xml:lang="id">Kode sumber D</comment> <comment xml:lang="it">Codice sorgente D</comment> <comment xml:lang="ja">D ソースコード</comment> <comment xml:lang="ka">D-ის საწყისი კოდი</comment> @@ -32883,7 +33854,7 @@ <comment xml:lang="pt">código origem D</comment> <comment xml:lang="pt_BR">Código-fonte D</comment> <comment xml:lang="ro">Cod sursă D</comment> - <comment xml:lang="ru">исходный код D</comment> + <comment xml:lang="ru">Исходный код D</comment> <comment xml:lang="sk">Zdrojový kód jazyka D</comment> <comment xml:lang="sl">Datoteka izvorne kode D</comment> <comment xml:lang="sq">Kod burues D</comment> @@ -32937,7 +33908,7 @@ <comment xml:lang="pt">ficheiro DTD</comment> <comment xml:lang="pt_BR">Arquivo DTD</comment> <comment xml:lang="ro">Fișier DTD</comment> - <comment xml:lang="ru">файл DTD</comment> + <comment xml:lang="ru">Файл DTD</comment> <comment xml:lang="sk">Súbor DTD</comment> <comment xml:lang="sl">Datoteka DTD</comment> <comment xml:lang="sq">File DTD</comment> @@ -32961,7 +33932,7 @@ <comment xml:lang="be@latin">Kryničny kod Eiffel</comment> <comment xml:lang="bg">Изходен код — Eiffel</comment> <comment xml:lang="ca">codi font en Eiffel</comment> - <comment xml:lang="cs">zdrojový kód Eiffel</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Eiffel</comment> <comment xml:lang="da">Eiffelkildekode</comment> <comment xml:lang="de">Eiffel-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Eiffel</comment> @@ -32975,10 +33946,10 @@ <comment xml:lang="ga">cód foinseach Eiffel</comment> <comment xml:lang="gl">código fone de Eiffel</comment> <comment xml:lang="he">קוד מקור של Eiffel</comment> - <comment xml:lang="hr">Eiffel izvorni kod</comment> + <comment xml:lang="hr">Eiffel izvorni kôd</comment> <comment xml:lang="hu">Eiffel forráskód</comment> <comment xml:lang="ia">Codice-fonte Eiffel</comment> - <comment xml:lang="id">Kode program Eiffel</comment> + <comment xml:lang="id">Kode sumber Eiffel</comment> <comment xml:lang="it">Codice sorgente Eiffel</comment> <comment xml:lang="ja">Eiffel ソースコード</comment> <comment xml:lang="ka">Eiffel-ის საწყისი კოდი</comment> @@ -32994,7 +33965,7 @@ <comment xml:lang="pt">código origem Eiffel</comment> <comment xml:lang="pt_BR">Código-fonte Eiffel</comment> <comment xml:lang="ro">Cod sursă Eiffel</comment> - <comment xml:lang="ru">исходный код Eiffel</comment> + <comment xml:lang="ru">Исходный код Eiffel</comment> <comment xml:lang="sk">Zdrojový kód Eiffel</comment> <comment xml:lang="sl">Datoteka izvorne kode Eiffel</comment> <comment xml:lang="sq">Kod burues Eiffel</comment> @@ -33031,7 +34002,7 @@ <comment xml:lang="ga">cód foinseach Emacs Lisp</comment> <comment xml:lang="gl">código fonte de Emacs Lisp</comment> <comment xml:lang="he">קוד מקור של Emcas Lisp</comment> - <comment xml:lang="hr">Emacs Lisp izvorni kod</comment> + <comment xml:lang="hr">Emacs Lisp izvorni kôd</comment> <comment xml:lang="hu">Emacs Lisp-forráskód</comment> <comment xml:lang="ia">Codice-fonte Lisp de Emacs</comment> <comment xml:lang="id">Kode sumber Emacs Lisp</comment> @@ -33051,7 +34022,7 @@ <comment xml:lang="pt">código origem Emacs Lisp</comment> <comment xml:lang="pt_BR">Código-fonte Lisp do Emacs</comment> <comment xml:lang="ro">Cod sursă Emacs Lisp</comment> - <comment xml:lang="ru">исходный код Emacs Lisp</comment> + <comment xml:lang="ru">Исходный код Emacs Lisp</comment> <comment xml:lang="sk">Zdrojový kód Emacs Lisp</comment> <comment xml:lang="sl">Datoteka izvorne kode Emacs Lisp</comment> <comment xml:lang="sq">Kod burues Emacs Lisp</comment> @@ -33075,7 +34046,7 @@ <comment xml:lang="be@latin">Kryničny kod Erlang</comment> <comment xml:lang="bg">Изходен код — Erlang</comment> <comment xml:lang="ca">codi font en Erlang</comment> - <comment xml:lang="cs">zdrojový kód Erlang</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Erlang</comment> <comment xml:lang="da">Erlangkildekode</comment> <comment xml:lang="de">Erlang-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Erlang</comment> @@ -33089,10 +34060,10 @@ <comment xml:lang="ga">cód foinseach Erlang</comment> <comment xml:lang="gl">código fonte de Erlang</comment> <comment xml:lang="he">קוד מקור של Erlang</comment> - <comment xml:lang="hr">Erlang izvorni kod</comment> + <comment xml:lang="hr">Erlang izvorni kôd</comment> <comment xml:lang="hu">Erlang forráskód</comment> <comment xml:lang="ia">Codice-fonte Erlang</comment> - <comment xml:lang="id">Kode program Erlang</comment> + <comment xml:lang="id">Kode sumber Erlang</comment> <comment xml:lang="it">Codice sorgente Erlang</comment> <comment xml:lang="ja">Erlang ソースコード</comment> <comment xml:lang="ka">Erlang-ის საწყისი კოდი</comment> @@ -33108,7 +34079,7 @@ <comment xml:lang="pt">código origem Erlang</comment> <comment xml:lang="pt_BR">Código-fonte Erlang</comment> <comment xml:lang="ro">Cod sursă Erlang</comment> - <comment xml:lang="ru">исходный код Erlang</comment> + <comment xml:lang="ru">Исходный код Erlang</comment> <comment xml:lang="sk">Zdrojový kód Erlang</comment> <comment xml:lang="sl">Datoteka izvorne kode Erlang</comment> <comment xml:lang="sq">Kod burues Erlang</comment> @@ -33129,7 +34100,7 @@ <comment xml:lang="be@latin">Kryničny kod Fortran</comment> <comment xml:lang="bg">Изходен код — Fortran</comment> <comment xml:lang="ca">codi font en Fortran</comment> - <comment xml:lang="cs">zdrojový kód Fortran</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Fortran</comment> <comment xml:lang="cy">Ffynhonnell rhaglen FORTRAN</comment> <comment xml:lang="da">Fortrankildekode</comment> <comment xml:lang="de">Fortran-Quelltext</comment> @@ -33144,10 +34115,10 @@ <comment xml:lang="ga">cód foinseach Fortran</comment> <comment xml:lang="gl">código fonte de Fortran</comment> <comment xml:lang="he">קוד מקור של Fortran</comment> - <comment xml:lang="hr">Fortran izvorni kod</comment> + <comment xml:lang="hr">Fortran izvorni kôd</comment> <comment xml:lang="hu">Fortran-forráskód</comment> <comment xml:lang="ia">Codice-fonte Fortran</comment> - <comment xml:lang="id">Kode program Fortran</comment> + <comment xml:lang="id">Kode sumber Fortran</comment> <comment xml:lang="it">Codice sorgente Fortran</comment> <comment xml:lang="ja">Fortran ソースコード</comment> <comment xml:lang="ka">Fortran-ის საწყისი კოდი</comment> @@ -33164,7 +34135,7 @@ <comment xml:lang="pt">código origem Fortran</comment> <comment xml:lang="pt_BR">Código-fonte Fortran</comment> <comment xml:lang="ro">Cod sursă Fortran</comment> - <comment xml:lang="ru">исходный код Fortran</comment> + <comment xml:lang="ru">Исходный код Fortran</comment> <comment xml:lang="sk">Zdrojový kód Fortran</comment> <comment xml:lang="sl">Datoteka izvorne kode Fortran</comment> <comment xml:lang="sq">Kod burues Fortran</comment> @@ -33193,10 +34164,12 @@ <comment xml:lang="eu">Genie iturburu-kodea</comment> <comment xml:lang="fi">Genie-lähdekoodi</comment> <comment xml:lang="fr">code source Genie</comment> + <comment xml:lang="ga">cód foinseach Genie</comment> + <comment xml:lang="he">קוד מקור של Genie</comment> <comment xml:lang="hr">Genie izvorni kôd</comment> <comment xml:lang="hu">Genie forráskód</comment> <comment xml:lang="ia">Codice-fonte Genie</comment> - <comment xml:lang="id">Kode program Genie</comment> + <comment xml:lang="id">Kode sumber Genie</comment> <comment xml:lang="it">Codice sorgente Genie</comment> <comment xml:lang="kk">Genie бастапқы коды</comment> <comment xml:lang="ko">Genie 소스 코드</comment> @@ -33204,7 +34177,7 @@ <comment xml:lang="pl">Kod źródłowy Genie</comment> <comment xml:lang="pt">código origem Genie</comment> <comment xml:lang="pt_BR">Código-fonte Genie</comment> - <comment xml:lang="ru">исходный код Genie</comment> + <comment xml:lang="ru">Исходный код Genie</comment> <comment xml:lang="sk">Zdrojový kód Genie</comment> <comment xml:lang="sl">Izvorna koda Genie</comment> <comment xml:lang="sr">Гение изворни ко̂д</comment> @@ -33220,6 +34193,7 @@ <mime-type type="text/x-gettext-translation"> <comment>translation file</comment> <comment xml:lang="ar">ملف الترجمة</comment> + <comment xml:lang="ast">ficheru de traducción</comment> <comment xml:lang="be@latin">fajł pierakładu</comment> <comment xml:lang="bg">Превод</comment> <comment xml:lang="ca">fitxer de traducció</comment> @@ -33234,10 +34208,10 @@ <comment xml:lang="fi">käännöstiedosto</comment> <comment xml:lang="fo">týðingarfíla</comment> <comment xml:lang="fr">fichier de traduction</comment> - <comment xml:lang="ga">comhad aistrithe</comment> + <comment xml:lang="ga">comhad aistriúcháin</comment> <comment xml:lang="gl">ficheiro de tradución</comment> <comment xml:lang="he">קובץ תרגום</comment> - <comment xml:lang="hr">datoteka prijevoda</comment> + <comment xml:lang="hr">Datoteka prijevoda</comment> <comment xml:lang="hu">fordítási fájl</comment> <comment xml:lang="ia">File de traduction</comment> <comment xml:lang="id">berkas terjemahan</comment> @@ -33256,7 +34230,7 @@ <comment xml:lang="pt">ficheiro de tradução</comment> <comment xml:lang="pt_BR">Arquivo de tradução</comment> <comment xml:lang="ro">fișier traducere</comment> - <comment xml:lang="ru">файл переводов</comment> + <comment xml:lang="ru">Файл переводов</comment> <comment xml:lang="sk">Súbor prekladu</comment> <comment xml:lang="sl">datoteka prevoda programa</comment> <comment xml:lang="sq">File përkthimesh</comment> @@ -33265,7 +34239,7 @@ <comment xml:lang="tr">çeviri dosyası</comment> <comment xml:lang="uk">файл перекладу</comment> <comment xml:lang="vi">tập tin dịch</comment> - <comment xml:lang="zh_CN">消息翻译文件</comment> + <comment xml:lang="zh_CN">翻译文件</comment> <comment xml:lang="zh_TW">翻譯檔</comment> <sub-class-of type="text/plain"/> <glob pattern="*.po"/> @@ -33275,6 +34249,7 @@ <mime-type type="text/x-gettext-translation-template"> <comment>translation template</comment> <comment xml:lang="ar">قالب الترجمة</comment> + <comment xml:lang="ast">plantía de traducción</comment> <comment xml:lang="be@latin">šablon dla pierakładu</comment> <comment xml:lang="bg">Шаблон за преводи</comment> <comment xml:lang="ca">plantilla de traducció</comment> @@ -33289,10 +34264,10 @@ <comment xml:lang="fi">käännösmalli</comment> <comment xml:lang="fo">týðingarformur</comment> <comment xml:lang="fr">modèle de traduction</comment> - <comment xml:lang="ga">teimpléad aistrithe</comment> + <comment xml:lang="ga">teimpléad aistriúcháin</comment> <comment xml:lang="gl">plantilla de tradución</comment> <comment xml:lang="he">תבנית תרגום</comment> - <comment xml:lang="hr">predložak prijevoda</comment> + <comment xml:lang="hr">Predložak prijevoda</comment> <comment xml:lang="hu">fordítási sablon</comment> <comment xml:lang="ia">Patrono de traduction</comment> <comment xml:lang="id">templat terjemahan</comment> @@ -33311,7 +34286,7 @@ <comment xml:lang="pt">modelo de tradução</comment> <comment xml:lang="pt_BR">Modelo de tradução</comment> <comment xml:lang="ro">șablon de traducere</comment> - <comment xml:lang="ru">шаблон переводов</comment> + <comment xml:lang="ru">Шаблон переводов</comment> <comment xml:lang="sk">Šablóna prekladu</comment> <comment xml:lang="sl">predloga datoteke prevoda programa</comment> <comment xml:lang="sq">Model përkthimesh</comment> @@ -33320,7 +34295,7 @@ <comment xml:lang="tr">çeviri şablonu</comment> <comment xml:lang="uk">шаблон перекладу</comment> <comment xml:lang="vi">mẫu dịch</comment> - <comment xml:lang="zh_CN">消息翻译模板</comment> + <comment xml:lang="zh_CN">翻译模板</comment> <comment xml:lang="zh_TW">翻譯模版</comment> <sub-class-of type="text/plain"/> <glob pattern="*.pot"/> @@ -33332,18 +34307,27 @@ <mime-type type="text/x-gherkin"> <comment>feature specification in Gherkin format</comment> <comment xml:lang="ca">especificació de funcionalitat en format Gherkin</comment> + <comment xml:lang="cs">specifikace vlastností ve formátu Gherkin</comment> <comment xml:lang="da">funktionspecifikation i Gherkin-format</comment> <comment xml:lang="de">Funktionsspezifikation im Gherkin-Format</comment> + <comment xml:lang="en_GB">feature specification in Gherkin format</comment> <comment xml:lang="es">especificación de funcionalidad en formato Gherkin</comment> <comment xml:lang="fr">spécification fonctionnelle au format Gherkin</comment> + <comment xml:lang="ga">sonraíocht gnéithe i bhformáid Gherkin</comment> <comment xml:lang="he">פירוט תכונות בתבנית Gherkin</comment> + <comment xml:lang="hr">opis značajke u Gherkin formatu</comment> <comment xml:lang="hu">funkcióleírás Gherkin formátumban</comment> + <comment xml:lang="id">spesifikasi fitur dalam format Gherkin</comment> + <comment xml:lang="it">Specifica di funzionalità in formato Gherkin</comment> <comment xml:lang="kk">Gherkin пішіміндегі функционалды анықтамалар</comment> <comment xml:lang="ko">Gherkin 형식의 기능 명세</comment> <comment xml:lang="pl">Specyfikacja funkcji w formacie Gherkin</comment> <comment xml:lang="pt_BR">Especificação de recurso no formato Gherkin</comment> - <comment xml:lang="ru">функциональные определения в формате Gherkin</comment> + <comment xml:lang="ru">Функциональные определения в формате Gherkin</comment> <comment xml:lang="sk">Špecifikácia funkcie vo formáte Gherkin</comment> + <comment xml:lang="sr">одредба функције у запису Геркина</comment> + <comment xml:lang="sv">egenskapsspecifikation i Gherkin-format</comment> + <comment xml:lang="tr">Gherkin biçiminde özellik belirtimi</comment> <comment xml:lang="uk">специфікація можливості у форматі Gherkin</comment> <comment xml:lang="zh_CN">Gherkin 格式中的功能规范</comment> <comment xml:lang="zh_TW">Gherkin 格式的特徵規格</comment> @@ -33353,6 +34337,7 @@ <mime-type type="text/html"> <comment>HTML document</comment> <comment xml:lang="ar">مستند HTML</comment> + <comment xml:lang="ast">Documentu HTML</comment> <comment xml:lang="be@latin">Dakument HTML</comment> <comment xml:lang="bg">Документ — HTML</comment> <comment xml:lang="ca">document HTML</comment> @@ -33388,7 +34373,7 @@ <comment xml:lang="pt">documento HTML</comment> <comment xml:lang="pt_BR">Documento HTML</comment> <comment xml:lang="ro">Document HTML</comment> - <comment xml:lang="ru">документ HTML</comment> + <comment xml:lang="ru">Документ HTML</comment> <comment xml:lang="sk">Dokument HTML</comment> <comment xml:lang="sl">Dokument HTML</comment> <comment xml:lang="sq">Dokument HTML</comment> @@ -33434,7 +34419,7 @@ <comment xml:lang="de">Webanwendungscache-Manifest</comment> <comment xml:lang="el">Δηλωτικό λανθάνουσας μνήμης εφαρμογής Ιστού</comment> <comment xml:lang="en_GB">Web application cache manifest</comment> - <comment xml:lang="es">manifiesto de caché de aplicación web</comment> + <comment xml:lang="es">manifiesto de antememoria de aplicación web</comment> <comment xml:lang="eu">Web aplikazioaren cache-aren agiria</comment> <comment xml:lang="fo">Net nýtsluskipanarkova manifest</comment> <comment xml:lang="fr">manifeste de cache d'application Web</comment> @@ -33457,7 +34442,7 @@ <comment xml:lang="pt">manifesto de cache de aplicação web</comment> <comment xml:lang="pt_BR">Manifest de cache de aplicação web</comment> <comment xml:lang="ro">Manifest de cache pentru aplicații web</comment> - <comment xml:lang="ru">манифест кэша веб-приложения</comment> + <comment xml:lang="ru">Манифест кэша веб-приложения</comment> <comment xml:lang="sk">Manifest vyrovnávacej pamäte webovej aplikácie</comment> <comment xml:lang="sl">Predpomnilnik spletnega programa</comment> <comment xml:lang="sr">проглас оставе Веб програма</comment> @@ -33480,6 +34465,7 @@ <mime-type type="text/x-google-video-pointer"> <comment>Google Video Pointer</comment> <comment xml:lang="ar">مؤشر فيديو جوجل</comment> + <comment xml:lang="ast">Google Video Pointer</comment> <comment xml:lang="be@latin">Pakazalnik Google Video</comment> <comment xml:lang="bg">Документ-указател към видео на Google</comment> <comment xml:lang="ca">apuntador a vídeo de Google</comment> @@ -33539,7 +34525,7 @@ <comment xml:lang="be@latin">Kryničny kod Haskell</comment> <comment xml:lang="bg">Изходен код на Haskell</comment> <comment xml:lang="ca">codi font en Haskell</comment> - <comment xml:lang="cs">zdrojový kód Haskell</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Haskell</comment> <comment xml:lang="cy">Ffynhonnell rhaglen Haskell</comment> <comment xml:lang="da">Haskellkildekode</comment> <comment xml:lang="de">Haskell-Quelltext</comment> @@ -33554,10 +34540,10 @@ <comment xml:lang="ga">cód foinseach Haskell</comment> <comment xml:lang="gl">código fonte de Haskell</comment> <comment xml:lang="he">קוד מקור של Haskell</comment> - <comment xml:lang="hr">Haskell izvorni kod</comment> + <comment xml:lang="hr">Haskell izvorni kôd</comment> <comment xml:lang="hu">Haskell-forráskód</comment> <comment xml:lang="ia">Codice-fonte Haskell</comment> - <comment xml:lang="id">Kode program Haskell</comment> + <comment xml:lang="id">Kode sumber Haskell</comment> <comment xml:lang="it">Codice sorgente Haskell</comment> <comment xml:lang="ja">Haskell ソースコード</comment> <comment xml:lang="kk">Haskell бастапқы коды</comment> @@ -33573,7 +34559,7 @@ <comment xml:lang="pt">código origem Haskell</comment> <comment xml:lang="pt_BR">Código-fonte Haskell</comment> <comment xml:lang="ro">Cod sursă Haskell</comment> - <comment xml:lang="ru">исходный код Haskell</comment> + <comment xml:lang="ru">Исходный код Haskell</comment> <comment xml:lang="sk">Zdrojový kód Haskell</comment> <comment xml:lang="sl">Datoteka izvorne kode Haskell</comment> <comment xml:lang="sq">Kod burues Haskell</comment> @@ -33590,6 +34576,7 @@ <mime-type type="text/x-idl"> <comment>IDL document</comment> <comment xml:lang="ar">مستند IDL</comment> + <comment xml:lang="ast">Documentu IDL</comment> <comment xml:lang="az">IDL sənədi</comment> <comment xml:lang="be@latin">Dakument IDL</comment> <comment xml:lang="bg">Документ — IDL</comment> @@ -33628,7 +34615,7 @@ <comment xml:lang="pt">documento IDL</comment> <comment xml:lang="pt_BR">Documento IDL</comment> <comment xml:lang="ro">Document IDL</comment> - <comment xml:lang="ru">документ IDL</comment> + <comment xml:lang="ru">Документ IDL</comment> <comment xml:lang="sk">Dokument IDL</comment> <comment xml:lang="sl">Dokument IDL</comment> <comment xml:lang="sq">Dokument IDL</comment> @@ -33647,6 +34634,7 @@ <mime-type type="text/x-install"> <comment>installation instructions</comment> <comment xml:lang="ar">تعليمات التثبيت</comment> + <comment xml:lang="ast">instrucciones d'instalación</comment> <comment xml:lang="be@latin">instrukcyja dla instalavańnia</comment> <comment xml:lang="bg">Инструкции за инсталация</comment> <comment xml:lang="ca">instruccions d'instal·lació</comment> @@ -33663,7 +34651,7 @@ <comment xml:lang="ga">treoracha suiteála</comment> <comment xml:lang="gl">instrucións de instalación</comment> <comment xml:lang="he">הוראות התקנה</comment> - <comment xml:lang="hr">upute za instalaciju</comment> + <comment xml:lang="hr">Upute za instalaciju</comment> <comment xml:lang="hu">telepítési utasítások</comment> <comment xml:lang="ia">Instructiones de installation</comment> <comment xml:lang="id">instruksi instalasi</comment> @@ -33681,7 +34669,7 @@ <comment xml:lang="pt">instruções de instalação</comment> <comment xml:lang="pt_BR">Instruções de instalação</comment> <comment xml:lang="ro">instrucțiuni de instalare</comment> - <comment xml:lang="ru">инструкции по установке программы</comment> + <comment xml:lang="ru">Инструкции по установке</comment> <comment xml:lang="sk">Návod na inštaláciu</comment> <comment xml:lang="sl">navodila namestitve</comment> <comment xml:lang="sq">Udhëzime instalimi</comment> @@ -33701,7 +34689,7 @@ <comment xml:lang="be@latin">Kryničny kod Java</comment> <comment xml:lang="bg">Изходен код на Java</comment> <comment xml:lang="ca">codi font en Java</comment> - <comment xml:lang="cs">zdrojový kód Java</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Java</comment> <comment xml:lang="da">Javakildekode</comment> <comment xml:lang="de">Java-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Java</comment> @@ -33715,10 +34703,10 @@ <comment xml:lang="ga">cód foinseach Java</comment> <comment xml:lang="gl">código fonte de Java</comment> <comment xml:lang="he">קוד מקור ב־Java</comment> - <comment xml:lang="hr">Java izvorni kod</comment> + <comment xml:lang="hr">Java izvorni kôd</comment> <comment xml:lang="hu">Java-forráskód</comment> <comment xml:lang="ia">Codice-fonte Java</comment> - <comment xml:lang="id">Kode program Java</comment> + <comment xml:lang="id">Kode sumber Java</comment> <comment xml:lang="it">Codice sorgente Java</comment> <comment xml:lang="ja">Java ソースコード</comment> <comment xml:lang="kk">Java бастапқы коды</comment> @@ -33734,7 +34722,7 @@ <comment xml:lang="pt">código origem Java</comment> <comment xml:lang="pt_BR">Código-fonte Java</comment> <comment xml:lang="ro">Cod sursă Java</comment> - <comment xml:lang="ru">исходный код Java</comment> + <comment xml:lang="ru">Исходный код Java</comment> <comment xml:lang="sk">Zdrojový kód Java</comment> <comment xml:lang="sl">Datoteka izvorne kode Java</comment> <comment xml:lang="sq">Kod burues Java</comment> @@ -33765,7 +34753,7 @@ <comment xml:lang="fi">LDIF-osoitekirja</comment> <comment xml:lang="fo">LDIF adressubók</comment> <comment xml:lang="fr">carnet d'adresses LDIF</comment> - <comment xml:lang="ga">leabhar sheoltaí LDIF</comment> + <comment xml:lang="ga">leabhar seoltaí LDIF</comment> <comment xml:lang="gl">lista de enderezos LDIF</comment> <comment xml:lang="he">ספר כתובות של LDIF</comment> <comment xml:lang="hr">LDIF adresar</comment> @@ -33786,7 +34774,7 @@ <comment xml:lang="pt">livro de endereços LDIF</comment> <comment xml:lang="pt_BR">Livro de endereços LDIF</comment> <comment xml:lang="ro">Agendă LDIF</comment> - <comment xml:lang="ru">адресная книга LDIF</comment> + <comment xml:lang="ru">Адресная книга LDIF</comment> <comment xml:lang="sk">Adresár LDIF</comment> <comment xml:lang="sl">Datoteka imenika naslovov LDIF</comment> <comment xml:lang="sq">Rubrikë LDIF</comment> @@ -33842,7 +34830,7 @@ <comment xml:lang="pt">folha de música Lilypond</comment> <comment xml:lang="pt_BR">Partitura do Lilypond</comment> <comment xml:lang="ro">Fișă muzică Lilypond</comment> - <comment xml:lang="ru">список музыки Lilypond</comment> + <comment xml:lang="ru">Список музыки Lilypond</comment> <comment xml:lang="sk">Notový papier Lilypond</comment> <comment xml:lang="sl">Glasbena predloga Lilypond</comment> <comment xml:lang="sq">Partiturë Lilypond</comment> @@ -33876,10 +34864,10 @@ <comment xml:lang="ga">cód foinseach LHS</comment> <comment xml:lang="gl">código fonte en LHS</comment> <comment xml:lang="he">קוד מקור של LHS</comment> - <comment xml:lang="hr">LHS izvorni kod</comment> + <comment xml:lang="hr">LHS izvorni kôd</comment> <comment xml:lang="hu">LHS forráskód</comment> <comment xml:lang="ia">Codice-fonte LHS</comment> - <comment xml:lang="id">Kode program LHS</comment> + <comment xml:lang="id">Kode sumber LHS</comment> <comment xml:lang="it">Codice sorgente LHS</comment> <comment xml:lang="ja">LHS ソースコード</comment> <comment xml:lang="kk">LHS бастапқы коды</comment> @@ -33894,7 +34882,7 @@ <comment xml:lang="pt">código origem LHS</comment> <comment xml:lang="pt_BR">Código-fonte LHS</comment> <comment xml:lang="ro">Cod sursă LHS</comment> - <comment xml:lang="ru">исходный код LHS</comment> + <comment xml:lang="ru">Исходный код LHS</comment> <comment xml:lang="sk">Zdrojový kód LHS</comment> <comment xml:lang="sl">Datoteka izvorne kode LHS</comment> <comment xml:lang="sq">Kod burues LHS</comment> @@ -33913,6 +34901,7 @@ <mime-type type="text/x-log"> <comment>application log</comment> <comment xml:lang="ar">سجل التطبيق</comment> + <comment xml:lang="ast">rexistru d'aplicación</comment> <comment xml:lang="be@latin">časopis aplikacyi</comment> <comment xml:lang="bg">Файл-дневник на приложение</comment> <comment xml:lang="ca">registre d'aplicació</comment> @@ -33949,7 +34938,7 @@ <comment xml:lang="pt">diário de aplicação</comment> <comment xml:lang="pt_BR">Registro de aplicativo</comment> <comment xml:lang="ro">înregistrare aplicație</comment> - <comment xml:lang="ru">журнал сообщений</comment> + <comment xml:lang="ru">Журнал сообщений</comment> <comment xml:lang="sk">Záznam aplikácie</comment> <comment xml:lang="sl">dnevnik programa</comment> <comment xml:lang="sq">log i mesazheve të programit</comment> @@ -34005,7 +34994,7 @@ <comment xml:lang="pt">Makefile</comment> <comment xml:lang="pt_BR">Makefile (arquivo do make)</comment> <comment xml:lang="ro">Makefile</comment> - <comment xml:lang="ru">Makefile (файл сборки)</comment> + <comment xml:lang="ru">Файл Makefile</comment> <comment xml:lang="sk">Makefile</comment> <comment xml:lang="sl">Datoteka Makefile</comment> <comment xml:lang="sq">Makefile</comment> @@ -34029,6 +35018,7 @@ </mime-type> <mime-type type="text/markdown"> <comment>Markdown document</comment> + <comment xml:lang="ast">Documentu Markdown</comment> <comment xml:lang="bg">Документ — Markdown</comment> <comment xml:lang="ca">document Markdown</comment> <comment xml:lang="cs">dokument Markdown</comment> @@ -34040,6 +35030,7 @@ <comment xml:lang="eu">Markdown dokumentua</comment> <comment xml:lang="fi">Markdown-asiakirja</comment> <comment xml:lang="fr">document Markdown</comment> + <comment xml:lang="ga">cáipéis Markdown</comment> <comment xml:lang="gl">documento de Markdown</comment> <comment xml:lang="he">מסמך Markdown</comment> <comment xml:lang="hr">Markdown dokument</comment> @@ -34056,7 +35047,7 @@ <comment xml:lang="pl">Dokument Markdown</comment> <comment xml:lang="pt">documento Markdown</comment> <comment xml:lang="pt_BR">Documento Markdown</comment> - <comment xml:lang="ru">документ Markdown</comment> + <comment xml:lang="ru">Документ Markdown</comment> <comment xml:lang="sk">Dokument Markdown</comment> <comment xml:lang="sl">Dokument Markdown</comment> <comment xml:lang="sr">Маркдаун документ</comment> @@ -34108,7 +35099,7 @@ <comment xml:lang="pt">ficheiro Qt MOC</comment> <comment xml:lang="pt_BR">Arquivo Qt MOC</comment> <comment xml:lang="ro">Fișier Qt MOC</comment> - <comment xml:lang="ru">файл Qt MOC</comment> + <comment xml:lang="ru">Файл Qt MOC</comment> <comment xml:lang="sk">Súbor Qt MOC</comment> <comment xml:lang="sl">Datoteka Qt MOC</comment> <comment xml:lang="sq">File Qt MOC</comment> @@ -34117,7 +35108,7 @@ <comment xml:lang="tr">Qt MOC dosyası</comment> <comment xml:lang="uk">файл-метаоб'єкт Qt</comment> <comment xml:lang="vi">Tập tin MOC của Qt</comment> - <comment xml:lang="zh_CN">Qt 元对象编译文件</comment> + <comment xml:lang="zh_CN">Qt 元对象编译器文件</comment> <comment xml:lang="zh_TW">Qt MOC 檔</comment> <acronym>Qt MOC</acronym> <expanded-acronym>Qt Meta Object Compiler</expanded-acronym> @@ -34161,7 +35152,7 @@ <comment xml:lang="pt">extrato do registo do Windows</comment> <comment xml:lang="pt_BR">Extrator de registro do Windows</comment> <comment xml:lang="ro">Extras al registrului Windows</comment> - <comment xml:lang="ru">фрагмент Windows Registry</comment> + <comment xml:lang="ru">Фрагмент Windows Registry</comment> <comment xml:lang="sk">Časť registrov Windows</comment> <comment xml:lang="sl">izvleček vpisnika Windows</comment> <comment xml:lang="sq">Pjesë Windows Registry</comment> @@ -34170,7 +35161,7 @@ <comment xml:lang="tr">Windows Kayıt Defteri özü</comment> <comment xml:lang="uk">частина реєстру Windows</comment> <comment xml:lang="vi">Bản trích Registry Windows</comment> - <comment xml:lang="zh_CN">Windows 注册表文件</comment> + <comment xml:lang="zh_CN">Windows 注册表提取</comment> <comment xml:lang="zh_TW">Windows Registry 抽出</comment> <sub-class-of type="text/plain"/> <magic priority="50"> @@ -34216,7 +35207,7 @@ <comment xml:lang="pt">formato Managed Object</comment> <comment xml:lang="pt_BR">Formato de objeto gerenciado</comment> <comment xml:lang="ro">Managed Object Format</comment> - <comment xml:lang="ru">формат управляемого объекта</comment> + <comment xml:lang="ru">Формат управляемого объекта</comment> <comment xml:lang="sk">Formát Managed Object</comment> <comment xml:lang="sl">Datoteka Managed Object</comment> <comment xml:lang="sq">Managed Object Format</comment> @@ -34267,7 +35258,7 @@ <comment xml:lang="pt">publicação Mup</comment> <comment xml:lang="pt_BR">Publicação do Mup</comment> <comment xml:lang="ro">Publicație Mup</comment> - <comment xml:lang="ru">публикация Mup</comment> + <comment xml:lang="ru">Публикация Mup</comment> <comment xml:lang="sk">Publikácie Mup</comment> <comment xml:lang="sl">Datoteka objave Mup</comment> <comment xml:lang="sq">Publikim Mup</comment> @@ -34291,7 +35282,7 @@ <comment xml:lang="be@latin">Kryničny kod Objective-C</comment> <comment xml:lang="bg">Изходен код — Objective C</comment> <comment xml:lang="ca">codi font en Objective-C</comment> - <comment xml:lang="cs">zdrojový kód Objective-C</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Objective-C</comment> <comment xml:lang="da">Objektiv C-kildekode</comment> <comment xml:lang="de">Objective-C-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Objective-C</comment> @@ -34308,7 +35299,7 @@ <comment xml:lang="hr">Objective-C izvorni kôd</comment> <comment xml:lang="hu">Objective-C forráskód</comment> <comment xml:lang="ia">Codice-fonte Objective-C</comment> - <comment xml:lang="id">Kode program Objective-C</comment> + <comment xml:lang="id">Kode sumber Objective-C</comment> <comment xml:lang="it">Codice sorgente Objective-C</comment> <comment xml:lang="ja">Objective-C ソースコード</comment> <comment xml:lang="ka">Objective-C-ის საწყისი კოდი</comment> @@ -34325,7 +35316,7 @@ <comment xml:lang="pt">código origem Objective-C</comment> <comment xml:lang="pt_BR">Código-fonte Objective-C</comment> <comment xml:lang="ro">Cod sursă Objective-C</comment> - <comment xml:lang="ru">исходный код Objective-C</comment> + <comment xml:lang="ru">Исходный код Objective-C</comment> <comment xml:lang="sk">Zdrojový kód Objective-C</comment> <comment xml:lang="sl">Datoteka izvorne kode Objective-C</comment> <comment xml:lang="sq">Kod burues C objekt</comment> @@ -34348,7 +35339,7 @@ <comment xml:lang="be@latin">Kryničny kod OCaml</comment> <comment xml:lang="bg">Изходен код — OCaml</comment> <comment xml:lang="ca">codi font en OCaml</comment> - <comment xml:lang="cs">zdrojový kód OCaml</comment> + <comment xml:lang="cs">zdrojový kód v jazyce OCaml</comment> <comment xml:lang="da">OCaml-kildekode</comment> <comment xml:lang="de">OCaml-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας OCaml</comment> @@ -34362,10 +35353,10 @@ <comment xml:lang="ga">cód foinseach OCaml</comment> <comment xml:lang="gl">código fonte de OCaml</comment> <comment xml:lang="he">קוד מקור של OCaml</comment> - <comment xml:lang="hr">OCaml izvorni kod</comment> + <comment xml:lang="hr">OCaml izvorni kôd</comment> <comment xml:lang="hu">OCaml forráskód</comment> <comment xml:lang="ia">Codice-fonte OCaml</comment> - <comment xml:lang="id">Kode program OCaml</comment> + <comment xml:lang="id">Kode sumber OCaml</comment> <comment xml:lang="it">Codice sorgente OCaml</comment> <comment xml:lang="ja">OCaml ソースコード</comment> <comment xml:lang="kk">OCaml бастапқы коды</comment> @@ -34380,7 +35371,7 @@ <comment xml:lang="pt">código origem OCaml</comment> <comment xml:lang="pt_BR">Código-fonte OCaml</comment> <comment xml:lang="ro">Cod sursă OCaml</comment> - <comment xml:lang="ru">исходный код OCaml</comment> + <comment xml:lang="ru">Исходный код OCaml</comment> <comment xml:lang="sk">Zdrojový kód OCaml</comment> <comment xml:lang="sl">Datoteka izvorne kode OCaml</comment> <comment xml:lang="sq">Kod burues OCaml</comment> @@ -34394,6 +35385,33 @@ <glob pattern="*.ml"/> <glob pattern="*.mli"/> </mime-type> + <mime-type type="text/x-opencl-src"> + <comment>OpenCL source code</comment> + <comment xml:lang="ca">codi font en OpenCL</comment> + <comment xml:lang="cs">zdrojový kód v jazyce OpenCL</comment> + <comment xml:lang="de">OpenCL-Quelltext</comment> + <comment xml:lang="en_GB">OpenCL source code</comment> + <comment xml:lang="es">código fuente en OpenCL</comment> + <comment xml:lang="fi">OpenCL-lähdekoodi</comment> + <comment xml:lang="hr">OpenCL izvorni kôd</comment> + <comment xml:lang="hu">OpenCL forráskód</comment> + <comment xml:lang="id">Kode sumber OpenCL</comment> + <comment xml:lang="it">Codice sorgente OpenCL</comment> + <comment xml:lang="kk">OpenCL бастапқы коды</comment> + <comment xml:lang="ko">OpenCL 소스 코드</comment> + <comment xml:lang="pl">Kod źródłowy OpenCL</comment> + <comment xml:lang="pt_BR">Código-fonte do OpenCL</comment> + <comment xml:lang="ru">Исходный код OpenGL</comment> + <comment xml:lang="sk">Zdrojový kód OpenCL</comment> + <comment xml:lang="sv">OpenCL-källkod</comment> + <comment xml:lang="uk">вихідний код мовою OpenCL</comment> + <comment xml:lang="zh_CN">OpenCL 源代码</comment> + <comment xml:lang="zh_TW">OpenCL 源碼</comment> + <acronym>OpenCL</acronym> + <expanded-acronym>Open Computing Language</expanded-acronym> + <sub-class-of type="text/x-csrc"/> + <glob pattern="*.cl"/> + </mime-type> <mime-type type="text/x-matlab"> <comment>MATLAB script/function</comment> <comment xml:lang="ar">سكربت/وظيفة MATLAB</comment> @@ -34431,7 +35449,7 @@ <comment xml:lang="pt">script/função MATLAB</comment> <comment xml:lang="pt_BR">Script/função do MATLAB</comment> <comment xml:lang="ro">Funcție/script MATLAB</comment> - <comment xml:lang="ru">сценарий/функция MATLAB</comment> + <comment xml:lang="ru">Сценарий/функция MATLAB</comment> <comment xml:lang="sk">Skript/funkcia MATLAB</comment> <comment xml:lang="sl">Skriptna datoteka MATLAB</comment> <comment xml:lang="sq">Script/Funksion MATLAB</comment> @@ -34467,11 +35485,12 @@ <comment xml:lang="eu">Meson iturburu-kodea</comment> <comment xml:lang="fi">Meson-lähdekoodi</comment> <comment xml:lang="fr">code source Meson</comment> + <comment xml:lang="ga">cód foinseach Meson</comment> <comment xml:lang="he">קוד מקור Meson</comment> <comment xml:lang="hr">Meson izvorni kôd</comment> <comment xml:lang="hu">Meson forráskód</comment> <comment xml:lang="ia">Codice-fonte Meson</comment> - <comment xml:lang="id">Kode program Meson</comment> + <comment xml:lang="id">Kode sumber Meson</comment> <comment xml:lang="it">Codice sorgente Meson</comment> <comment xml:lang="kk">Meson бастапқы коды</comment> <comment xml:lang="ko">Meson 소스 코드</comment> @@ -34479,7 +35498,7 @@ <comment xml:lang="pl">Kod źródłowy Meson</comment> <comment xml:lang="pt">código origem Meson</comment> <comment xml:lang="pt_BR">Código-fonte Meson</comment> - <comment xml:lang="ru">исходный код Meson</comment> + <comment xml:lang="ru">Исходный код Meson</comment> <comment xml:lang="sk">Zdrojový kód Meson</comment> <comment xml:lang="sr">Месон изворни ко̂д</comment> <comment xml:lang="sv">Meson-källkod</comment> @@ -34503,6 +35522,7 @@ <comment xml:lang="eu">Modelica modeloa</comment> <comment xml:lang="fi">Modelica-malli</comment> <comment xml:lang="fr">modèle Modelica</comment> + <comment xml:lang="ga">samhail Modelica</comment> <comment xml:lang="gl">Modelo de Modelica</comment> <comment xml:lang="he">דגם של Modelica</comment> <comment xml:lang="hr">Modelica model</comment> @@ -34518,7 +35538,7 @@ <comment xml:lang="pl">Model Modelica</comment> <comment xml:lang="pt">modelo Modelica</comment> <comment xml:lang="pt_BR">Modelo da Modelica</comment> - <comment xml:lang="ru">модель Modelica</comment> + <comment xml:lang="ru">Модель Modelica</comment> <comment xml:lang="sk">Model Modelica</comment> <comment xml:lang="sl">Model Modelica</comment> <comment xml:lang="sr">модел Моделике</comment> @@ -34551,7 +35571,7 @@ <comment xml:lang="be@latin">Kryničny kod Pascal</comment> <comment xml:lang="bg">Изходен код — Pascal</comment> <comment xml:lang="ca">codi font en Pascal</comment> - <comment xml:lang="cs">zdrojový kód Pascal</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Pascal</comment> <comment xml:lang="da">Pascalkildekode</comment> <comment xml:lang="de">Pascal-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Pascal</comment> @@ -34568,7 +35588,7 @@ <comment xml:lang="hr">Pascal izvorni kôd</comment> <comment xml:lang="hu">Pascal-forráskód</comment> <comment xml:lang="ia">Codice-fonte Pascal</comment> - <comment xml:lang="id">Kode program Pascal</comment> + <comment xml:lang="id">Kode sumber Pascal</comment> <comment xml:lang="it">Codice sorgente Pascal</comment> <comment xml:lang="ja">Pascal ソースコード</comment> <comment xml:lang="kk">Pascal бастапқы коды</comment> @@ -34584,7 +35604,7 @@ <comment xml:lang="pt">código origem Pascal</comment> <comment xml:lang="pt_BR">Código-fonte Pascal</comment> <comment xml:lang="ro">Cod sursă Pascal</comment> - <comment xml:lang="ru">исходный код Pascal</comment> + <comment xml:lang="ru">Исходный код Pascal</comment> <comment xml:lang="sk">Zdrojový kód Pascal</comment> <comment xml:lang="sl">Datoteka izvorne kode Pascal</comment> <comment xml:lang="sq">Kod burues Pascal</comment> @@ -34619,7 +35639,7 @@ <comment xml:lang="ga">difríochtaí idir chomhaid</comment> <comment xml:lang="gl">diferenzas entre ficheiros</comment> <comment xml:lang="he">הבדל בין קבצים</comment> - <comment xml:lang="hr">razlike između datoteka</comment> + <comment xml:lang="hr">Razlike između datoteka</comment> <comment xml:lang="hu">diff-különbségfájl</comment> <comment xml:lang="ia">Differentias inter files</comment> <comment xml:lang="id">perbedaan diantara berkas</comment> @@ -34638,7 +35658,7 @@ <comment xml:lang="pt">diferenças entre ficheiros</comment> <comment xml:lang="pt_BR">Diferenças entre arquivos</comment> <comment xml:lang="ro">diferențe între fișiere</comment> - <comment xml:lang="ru">различия между файлами</comment> + <comment xml:lang="ru">Различия между файлами</comment> <comment xml:lang="sk">Rozdiely medzi súbormi</comment> <comment xml:lang="sl">razlike med datotekami</comment> <comment xml:lang="sq">Diferencë midis file</comment> @@ -34670,7 +35690,7 @@ <comment>Go source code</comment> <comment xml:lang="bg">Изходен код — Go</comment> <comment xml:lang="ca">codi font en Go</comment> - <comment xml:lang="cs">zdrojový kód Go</comment> + <comment xml:lang="cs">zdrojový kód v jazyce Go</comment> <comment xml:lang="da">Go-kildekode</comment> <comment xml:lang="de">Go-Quelltext</comment> <comment xml:lang="el">Πηγαίος κώδικας Go</comment> @@ -34680,9 +35700,10 @@ <comment xml:lang="eu">Go iturburu-kodea</comment> <comment xml:lang="fi">Go-lähdekoodi</comment> <comment xml:lang="fr">code source Go</comment> + <comment xml:lang="ga">cód foinseach Go</comment> <comment xml:lang="gl">código fonte de Go</comment> <comment xml:lang="he">קוד מקור של Go</comment> - <comment xml:lang="hr">Go izvorni kod</comment> + <comment xml:lang="hr">Go izvorni kôd</comment> <comment xml:lang="hu">Go forráskód</comment> <comment xml:lang="ia">Codice-fonte Go</comment> <comment xml:lang="id">Kode sumber Go</comment> @@ -34697,14 +35718,14 @@ <comment xml:lang="pl">Kod źródłowy Go</comment> <comment xml:lang="pt">cigo origem Go</comment> <comment xml:lang="pt_BR">Código-fonte Go</comment> - <comment xml:lang="ru">исходный код Go</comment> + <comment xml:lang="ru">Исходный код Go</comment> <comment xml:lang="sk">Zdrojový kód Go</comment> <comment xml:lang="sl">Izvorna koda Go</comment> <comment xml:lang="sr">Гоу изворни ко̂д</comment> <comment xml:lang="sv">Go-källkod</comment> <comment xml:lang="tr">Go kaynak kodu</comment> <comment xml:lang="uk">вихідний код мовою Go</comment> - <comment xml:lang="zh_CN">Go </comment> + <comment xml:lang="zh_CN">Go 源代码</comment> <comment xml:lang="zh_TW">Go 源碼</comment> <sub-class-of type="text/plain"/> <glob pattern="*.go"/> @@ -34721,6 +35742,7 @@ <comment xml:lang="eu">SCons konfigurazio-fitxategia</comment> <comment xml:lang="fi">SCons-asetustiedosto</comment> <comment xml:lang="fr">fichier de configuration SCons</comment> + <comment xml:lang="ga">comhad cumraíochta SCons</comment> <comment xml:lang="he">קובץ תצורה של SCons</comment> <comment xml:lang="hr">SCons datoteka podešavanja</comment> <comment xml:lang="hu">SCons beállítófájl</comment> @@ -34733,7 +35755,7 @@ <comment xml:lang="pl">Plik konfiguracji SCons</comment> <comment xml:lang="pt">ficheiro de configuração SCons</comment> <comment xml:lang="pt_BR">Arquivo de configuração do SCons</comment> - <comment xml:lang="ru">файл настроек SCons</comment> + <comment xml:lang="ru">Файл настроек SCons</comment> <comment xml:lang="sk">Konfiguračný súbor SCons</comment> <comment xml:lang="sl">Prilagoditvena datoteka SCons</comment> <comment xml:lang="sr">СКонс датотека подешавања</comment> @@ -34747,13 +35769,52 @@ <glob pattern="SConscript"/> <glob pattern="SConscript.*"/> </mime-type> + <mime-type type="text/x-python3"> + <comment>Python 3 script</comment> + <comment xml:lang="ca">script Python 3</comment> + <comment xml:lang="cs">skript v jazyce Python 3</comment> + <comment xml:lang="de">Python-3-Skript</comment> + <comment xml:lang="en_GB">Python 3 script</comment> + <comment xml:lang="es">secuencia de órdenes en Python 3</comment> + <comment xml:lang="fi">Python 3 -skripti</comment> + <comment xml:lang="hr">Python3 skripta</comment> + <comment xml:lang="hu">Python 3 parancsfájl</comment> + <comment xml:lang="id">Skrip Python 3</comment> + <comment xml:lang="it">Script Python 3</comment> + <comment xml:lang="kk">Python 3 скрипті</comment> + <comment xml:lang="ko">파이썬 3 스크립트</comment> + <comment xml:lang="pl">Skrypt Python 3</comment> + <comment xml:lang="pt_BR">Script Python 3</comment> + <comment xml:lang="ru">Сценарий Python 3</comment> + <comment xml:lang="sk">Skript Python 3</comment> + <comment xml:lang="sv">Python 3-skript</comment> + <comment xml:lang="uk">скрипт мовою Python 3</comment> + <comment xml:lang="zh_CN">Python 3 脚本</comment> + <comment xml:lang="zh_TW">Python 3 指令稿</comment> + <sub-class-of type='text/x-python'/> + <magic priority="60"> + <match value="#!/bin/python3" type="string" offset="0"/> + <match value="#! /bin/python3" type="string" offset="0"/> + <match value='eval \"exec /bin/python3' type="string" offset="0"/> + <match value="#!/usr/bin/python3" type="string" offset="0"/> + <match value="#! /usr/bin/python3" type="string" offset="0"/> + <match value='eval \"exec /usr/bin/python3' type="string" offset="0"/> + <match value="#!/usr/local/bin/python3" type="string" offset="0"/> + <match value="#! /usr/local/bin/python3" type="string" offset="0"/> + <match value='eval \"exec /usr/local/bin/python3' type="string" offset="0"/> + <match value='/bin/env python3' type="string" offset="2:16"/> + </magic> + <glob weight="50" pattern="*.py"/> + <glob weight="60" pattern="*.py3"/> + <glob weight="60" pattern="*.py3x"/> + </mime-type> <mime-type type="text/x-python"> <comment>Python script</comment> <comment xml:lang="ar">سكربت بايثون</comment> <comment xml:lang="be@latin">Skrypt Python</comment> <comment xml:lang="bg">Скрипт — Python</comment> <comment xml:lang="ca">script Python</comment> - <comment xml:lang="cs">skript Python</comment> + <comment xml:lang="cs">skript v jazyce Python</comment> <comment xml:lang="da">Pythonprogram</comment> <comment xml:lang="de">Python-Skript</comment> <comment xml:lang="el">Δέσμη ενεργειών Python</comment> @@ -34786,7 +35847,7 @@ <comment xml:lang="pt">script Python</comment> <comment xml:lang="pt_BR">Script Python</comment> <comment xml:lang="ro">Script Python</comment> - <comment xml:lang="ru">сценарий Python</comment> + <comment xml:lang="ru">Сценарий Python</comment> <comment xml:lang="sk">Skript Python</comment> <comment xml:lang="sl">Skriptna datoteka Python</comment> <comment xml:lang="sq">Script Python</comment> @@ -34811,9 +35872,9 @@ <match value='eval \"exec /usr/local/bin/python' type="string" offset="0"/> <match value='/bin/env python' type="string" offset="2:16"/> </magic> - <glob pattern="*.py"/> - <glob pattern="*.pyx"/> - <glob pattern="*.wsgi"/> + <glob weight="60" pattern="*.py"/> + <glob weight="60" pattern="*.pyx"/> + <glob weight="60" pattern="*.wsgi"/> </mime-type> <mime-type type="text/x-lua"> <comment>Lua script</comment> @@ -34821,7 +35882,7 @@ <comment xml:lang="be@latin">Skrypt Lua</comment> <comment xml:lang="bg">Скрипт на Lua</comment> <comment xml:lang="ca">script Lua</comment> - <comment xml:lang="cs">skript Lua</comment> + <comment xml:lang="cs">skript v jazyce Lua</comment> <comment xml:lang="da">Luaprogram</comment> <comment xml:lang="de">Lua-Skript</comment> <comment xml:lang="el">Δέσμη ενεργειών Lua</comment> @@ -34853,7 +35914,7 @@ <comment xml:lang="pt">script Lua</comment> <comment xml:lang="pt_BR">Script Lua</comment> <comment xml:lang="ro">Script Lua</comment> - <comment xml:lang="ru">сценарий Lua</comment> + <comment xml:lang="ru">Сценарий Lua</comment> <comment xml:lang="sk">Skript Lua</comment> <comment xml:lang="sl">Skriptna datoteka Lua</comment> <comment xml:lang="sq">Script Lua</comment> @@ -34877,6 +35938,7 @@ <mime-type type="text/x-readme"> <comment>README document</comment> <comment xml:lang="ar">مستند README</comment> + <comment xml:lang="ast">Documentu LLEIME</comment> <comment xml:lang="az">README sənədi</comment> <comment xml:lang="be@latin">Dakument README</comment> <comment xml:lang="bg">Документ — „Да се прочете“</comment> @@ -34915,7 +35977,7 @@ <comment xml:lang="pt">documento LEIA-ME</comment> <comment xml:lang="pt_BR">Documento README</comment> <comment xml:lang="ro">Document README</comment> - <comment xml:lang="ru">документ README</comment> + <comment xml:lang="ru">Документ README</comment> <comment xml:lang="sk">Dokument README</comment> <comment xml:lang="sl">Dokument README</comment> <comment xml:lang="sq">Dokument README</comment> @@ -34932,6 +35994,7 @@ <mime-type type="text/x-nfo"> <comment>NFO document</comment> <comment xml:lang="ar">مستند NFO</comment> + <comment xml:lang="ast">Documentu NFO</comment> <comment xml:lang="be@latin">Dakument NFO</comment> <comment xml:lang="bg">Документ — NFO</comment> <comment xml:lang="ca">document NFO</comment> @@ -34967,7 +36030,7 @@ <comment xml:lang="pt">documento NFO</comment> <comment xml:lang="pt_BR">Documento NFO</comment> <comment xml:lang="ro">Document NFO</comment> - <comment xml:lang="ru">документ NFO</comment> + <comment xml:lang="ru">Документ NFO</comment> <comment xml:lang="sk">Dokument NFO</comment> <comment xml:lang="sl">Dokument NFO</comment> <comment xml:lang="sq">Dokument NFO</comment> @@ -35018,7 +36081,7 @@ <comment xml:lang="pt">ficheiro de especificações RPM</comment> <comment xml:lang="pt_BR">Arquivo de especificação RPM</comment> <comment xml:lang="ro">Fișier RPM spec</comment> - <comment xml:lang="ru">файл описания RPM</comment> + <comment xml:lang="ru">Файл описания RPM</comment> <comment xml:lang="sk">Súbor RPM spec</comment> <comment xml:lang="sl">Določilna datoteka RPM</comment> <comment xml:lang="sq">File specifikimi RPM</comment> @@ -35041,18 +36104,27 @@ <mime-type type="text/x-sass"> <comment>Sass CSS pre-processor file</comment> <comment xml:lang="ca">fitxer preprocessador CSS Sass</comment> + <comment xml:lang="cs">soubor preprocesoru Sass CSS</comment> <comment xml:lang="da">Sass CSS-forbrænderfil</comment> <comment xml:lang="de">Sass-CSS-Präprozessordatei</comment> + <comment xml:lang="en_GB">Sass CSS pre-processor file</comment> <comment xml:lang="es">archivo de preprocesador de CSS Sass</comment> <comment xml:lang="fr">fichier de prétraitement CSS Sass</comment> + <comment xml:lang="ga">comhad réamhphróiseálaí CSS Sass</comment> <comment xml:lang="he">קובץ קדם עיבוד Sass CSS</comment> + <comment xml:lang="hr">Sass CSS datoteka predobrade</comment> <comment xml:lang="hu">Sass CSS előfeldolgozó fájl</comment> + <comment xml:lang="id">berkas pre-processor Sass CSS</comment> + <comment xml:lang="it">File CSS Sass</comment> <comment xml:lang="kk">Sass CSS препроцессор файлы</comment> <comment xml:lang="ko">Sass CSS 전처리기 파일</comment> <comment xml:lang="pl">Plik preprocesora CSS Sass</comment> <comment xml:lang="pt_BR">Arquivo de pré-processamento Sass CSS</comment> - <comment xml:lang="ru">файл препроцессора Sass CSS</comment> + <comment xml:lang="ru">Файл препроцессора Sass CSS</comment> <comment xml:lang="sk">Súbor Sass CSS pre-procesora</comment> + <comment xml:lang="sr">датотека Сас ЦСС пре-процесора</comment> + <comment xml:lang="sv">Sass CSS-preprocessorfil</comment> + <comment xml:lang="tr">Sass CSS önişlemci dosyası</comment> <comment xml:lang="uk">файл препроцесора CSS Sass</comment> <comment xml:lang="zh_CN">Sass CSS 预处理器文件</comment> <comment xml:lang="zh_TW">Sass CSS 處理器前檔案</comment> @@ -35073,9 +36145,10 @@ <comment xml:lang="eu">Scala iturburu-kodea</comment> <comment xml:lang="fi">Scala-lähdekoodi</comment> <comment xml:lang="fr">code source Scala</comment> + <comment xml:lang="ga">cód foinseach Scala</comment> <comment xml:lang="gl">código fnote en Scala</comment> <comment xml:lang="he">קוד מקור של Scala</comment> - <comment xml:lang="hr">Scala izvorni kod</comment> + <comment xml:lang="hr">Scala izvorni kôd</comment> <comment xml:lang="hu">Scala forráskód</comment> <comment xml:lang="ia">Codice-fonte Scala</comment> <comment xml:lang="id">Kode sumber Scala</comment> @@ -35090,7 +36163,7 @@ <comment xml:lang="pl">Kod źródłowy Scala</comment> <comment xml:lang="pt">código origem Scala</comment> <comment xml:lang="pt_BR">Código-fonte Scala</comment> - <comment xml:lang="ru">исходный код Scala</comment> + <comment xml:lang="ru">Исходный код Scala</comment> <comment xml:lang="sk">Zdrojový kód Scala</comment> <comment xml:lang="sl">Izvorna koda Scala</comment> <comment xml:lang="sr">Скала изворни ко̂д</comment> @@ -35124,7 +36197,7 @@ <comment xml:lang="ga">cód foinseach Scheme</comment> <comment xml:lang="gl">código fonte en Scheme</comment> <comment xml:lang="he">קוד מקור של Scheme</comment> - <comment xml:lang="hr">Scheme izvorni kod</comment> + <comment xml:lang="hr">Scheme izvorni kôd</comment> <comment xml:lang="hu">Scheme-forráskód</comment> <comment xml:lang="ia">Codice-fonte Scheme</comment> <comment xml:lang="id">Kode program Scheme</comment> @@ -35143,7 +36216,7 @@ <comment xml:lang="pt">código origem Scheme</comment> <comment xml:lang="pt_BR">Código-fonte Scheme</comment> <comment xml:lang="ro">Cod sursă Scheme</comment> - <comment xml:lang="ru">исходный код Scheme</comment> + <comment xml:lang="ru">Исходный код Scheme</comment> <comment xml:lang="sk">Zdrojový kód Scheme</comment> <comment xml:lang="sl">Datoteka izvorne kode Scheme</comment> <comment xml:lang="sq">Kod burues Scheme</comment> @@ -35161,18 +36234,27 @@ <mime-type type="text/x-scss"> <comment>Sass CSS pre-processor file</comment> <comment xml:lang="ca">fitxer preprocessador CSS Sass</comment> + <comment xml:lang="cs">soubor preprocesoru Sass CSS</comment> <comment xml:lang="da">Sass CSS-forbrænderfil</comment> <comment xml:lang="de">Sass-CSS-Präprozessordatei</comment> + <comment xml:lang="en_GB">Sass CSS pre-processor file</comment> <comment xml:lang="es">archivo de preprocesador de CSS Sass</comment> <comment xml:lang="fr">fichier de prétraitement CSS Sass</comment> + <comment xml:lang="ga">comhad réamhphróiseálaí CSS Sass</comment> <comment xml:lang="he">קובץ קדם עיבוד Sass CSS</comment> + <comment xml:lang="hr">Sass CSS datoteka predobrade</comment> <comment xml:lang="hu">Sass CSS előfeldolgozó fájl</comment> + <comment xml:lang="id">berkas pre-processor Sass CSS</comment> + <comment xml:lang="it">File CSS Sass</comment> <comment xml:lang="kk">Sass CSS препроцессор файлы</comment> <comment xml:lang="ko">Sass CSS 전처리기 파일</comment> <comment xml:lang="pl">Plik preprocesora CSS Sass</comment> <comment xml:lang="pt_BR">Arquivo de pré-processamento Sass CSS</comment> - <comment xml:lang="ru">файл препроцессора Sass CSS</comment> + <comment xml:lang="ru">Файл препроцессора Sass CSS</comment> <comment xml:lang="sk">Súbor Sass CSS pre-procesora</comment> + <comment xml:lang="sr">датотека Сас ЦСС пре-процесора</comment> + <comment xml:lang="sv">Sass CSS-preprocessorfil</comment> + <comment xml:lang="tr">Sass CSS önişlemci dosyası</comment> <comment xml:lang="uk">файл препроцесора CSS Sass</comment> <comment xml:lang="zh_CN">Sass CSS 预处理器文件</comment> <comment xml:lang="zh_TW">Sass CSS 處理器前檔案</comment> @@ -35183,6 +36265,7 @@ <mime-type type="text/x-setext"> <comment>Setext document</comment> <comment xml:lang="ar">مستند Setext</comment> + <comment xml:lang="ast">Documentu Setext</comment> <comment xml:lang="az">Setext sənədi</comment> <comment xml:lang="be@latin">Dakument Setext</comment> <comment xml:lang="bg">Документ — Setext</comment> @@ -35221,7 +36304,7 @@ <comment xml:lang="pt">documento Setext</comment> <comment xml:lang="pt_BR">Documento Setext</comment> <comment xml:lang="ro">Document Setext</comment> - <comment xml:lang="ru">документ Setext</comment> + <comment xml:lang="ru">Документ Setext</comment> <comment xml:lang="sk">Dokument Setext</comment> <comment xml:lang="sl">Dokument Setext</comment> <comment xml:lang="sq">Dokument Setext</comment> @@ -35257,7 +36340,7 @@ <comment xml:lang="ga">cód SQL</comment> <comment xml:lang="gl">código SQL</comment> <comment xml:lang="he">קוד SQL</comment> - <comment xml:lang="hr">SQL kod</comment> + <comment xml:lang="hr">SQL kôd</comment> <comment xml:lang="hu">SQL-kód</comment> <comment xml:lang="ia">Codice SQL</comment> <comment xml:lang="id">Kode SQL</comment> @@ -35276,7 +36359,7 @@ <comment xml:lang="pt">código SQL</comment> <comment xml:lang="pt_BR">Código SQL</comment> <comment xml:lang="ro">Cod SQL</comment> - <comment xml:lang="ru">код SQL</comment> + <comment xml:lang="ru">Код SQL</comment> <comment xml:lang="sk">Kód SQL</comment> <comment xml:lang="sl">Datoteka kode SQL</comment> <comment xml:lang="sq">Kod SQL</comment> @@ -35330,7 +36413,7 @@ <comment xml:lang="pt">script Tcl</comment> <comment xml:lang="pt_BR">Script Tcl</comment> <comment xml:lang="ro">Script Tcl</comment> - <comment xml:lang="ru">сценарий Tcl</comment> + <comment xml:lang="ru">Сценарий Tcl</comment> <comment xml:lang="sk">Skript Tcl</comment> <comment xml:lang="sl">Skriptna datoteka Tcl</comment> <comment xml:lang="sq">Script Tcl</comment> @@ -35348,6 +36431,7 @@ <mime-type type="text/x-tex"> <comment>TeX document</comment> <comment xml:lang="ar">مستند TeX</comment> + <comment xml:lang="ast">Documentu TeX</comment> <comment xml:lang="be@latin">Dakument TeX</comment> <comment xml:lang="bg">Документ — TeX</comment> <comment xml:lang="ca">document TeX</comment> @@ -35385,7 +36469,7 @@ <comment xml:lang="pt">documento TeX</comment> <comment xml:lang="pt_BR">Documento TeX</comment> <comment xml:lang="ro">Document TeX</comment> - <comment xml:lang="ru">документ TeX</comment> + <comment xml:lang="ru">Документ TeX</comment> <comment xml:lang="sk">Dokument TeX</comment> <comment xml:lang="sl">Dokument TeX</comment> <comment xml:lang="sq">Dokument TeX</comment> @@ -35415,6 +36499,7 @@ <mime-type type="text/x-texinfo"> <comment>TeXInfo document</comment> <comment xml:lang="ar">مستند TeXInfo</comment> + <comment xml:lang="ast">Documentu TeXInfo</comment> <comment xml:lang="az">TeXInfo sənədi</comment> <comment xml:lang="be@latin">Dakument TeXInfo</comment> <comment xml:lang="bg">Документ — TeXInfo</comment> @@ -35453,7 +36538,7 @@ <comment xml:lang="pt">documento TeXInfo</comment> <comment xml:lang="pt_BR">Documento TeXInfo</comment> <comment xml:lang="ro">Document TexInfo</comment> - <comment xml:lang="ru">документ TeXInfo</comment> + <comment xml:lang="ru">Документ TeXInfo</comment> <comment xml:lang="sk">Dokument TeXInfo</comment> <comment xml:lang="sl">Dokument TeXInfo</comment> <comment xml:lang="sq">Dokument TeXInfo</comment> @@ -35471,6 +36556,7 @@ <mime-type type="text/x-troff-me"> <comment>Troff ME input document</comment> <comment xml:lang="ar">مستند Troff ME input</comment> + <comment xml:lang="ast">Documentu d'entrada de Troff ME</comment> <comment xml:lang="be@latin">Uvodny dakument Troff ME</comment> <comment xml:lang="bg">Изходен документ — Troff ME</comment> <comment xml:lang="ca">document d'entrada Troff ME</comment> @@ -35485,7 +36571,7 @@ <comment xml:lang="fi">Troff ME -syöteasiakirja</comment> <comment xml:lang="fo">Troff ME inntaksskjal</comment> <comment xml:lang="fr">document d'entrée Troff ME</comment> - <comment xml:lang="ga">cáipéis ionchur Troff ME</comment> + <comment xml:lang="ga">cáipéis ionchurtha Troff ME</comment> <comment xml:lang="gl">documento de entrada Troff ME</comment> <comment xml:lang="he">מסמך קלט של Troff ME</comment> <comment xml:lang="hr">Troff ME ulazni dokument</comment> @@ -35507,7 +36593,7 @@ <comment xml:lang="pt">documento origem Troff ME</comment> <comment xml:lang="pt_BR">Documento de entrada Troff ME</comment> <comment xml:lang="ro">Document intrare Troff ME</comment> - <comment xml:lang="ru">входной документ Troff ME</comment> + <comment xml:lang="ru">Входной документ Troff ME</comment> <comment xml:lang="sk">Vstupný dokument Troff ME</comment> <comment xml:lang="sl">Vnosni dokument Troff ME</comment> <comment xml:lang="sq">Dokument i input Troff ME</comment> @@ -35524,6 +36610,7 @@ <mime-type type="text/x-troff-mm"> <comment>Troff MM input document</comment> <comment xml:lang="ar">مستند Troff MM input</comment> + <comment xml:lang="ast">Documentu d'entrada de Troff MM</comment> <comment xml:lang="be@latin">Uvodny dakument Troff MM</comment> <comment xml:lang="bg">Изходен документ — Troff MM</comment> <comment xml:lang="ca">document d'entrada Troff MM</comment> @@ -35538,7 +36625,7 @@ <comment xml:lang="fi">Troff MM -syöteasiakirja</comment> <comment xml:lang="fo">Troff MM inntaksskjal</comment> <comment xml:lang="fr">document d'entrée Troff MM</comment> - <comment xml:lang="ga">cáipéis ionchur Troff MM</comment> + <comment xml:lang="ga">cáipéis ionchurtha Troff MM</comment> <comment xml:lang="gl">documento de entrada Troff MM</comment> <comment xml:lang="he">מסמך קלט של Troff MM</comment> <comment xml:lang="hr">Troff MM ulazni dokument</comment> @@ -35560,7 +36647,7 @@ <comment xml:lang="pt">documento origem Troff MM</comment> <comment xml:lang="pt_BR">Documento de entrada Troff MM</comment> <comment xml:lang="ro">Document intrare Troff MM</comment> - <comment xml:lang="ru">входной документ Troff MM</comment> + <comment xml:lang="ru">Входной документ Troff MM</comment> <comment xml:lang="sk">Vstupný dokument Troff MM</comment> <comment xml:lang="sl">Vnosni dokument Troff MM</comment> <comment xml:lang="sq">Dokument i input Troff MM</comment> @@ -35577,6 +36664,7 @@ <mime-type type="text/x-troff-ms"> <comment>Troff MS input document</comment> <comment xml:lang="ar">مستند Troff MS input</comment> + <comment xml:lang="ast">Documentu d'entrada de Troff MS</comment> <comment xml:lang="be@latin">Uvodny dakument Troff MS</comment> <comment xml:lang="bg">Изходен документ — Troff MS</comment> <comment xml:lang="ca">document d'entrada Troff MS</comment> @@ -35591,7 +36679,7 @@ <comment xml:lang="fi">Troff MS -syöteasiakirja</comment> <comment xml:lang="fo">Troff MS inntaksskjal</comment> <comment xml:lang="fr">document d'entrée Troff MS</comment> - <comment xml:lang="ga">cáipéis ionchur Troff MS</comment> + <comment xml:lang="ga">cáipéis ionchurtha Troff MS</comment> <comment xml:lang="gl">documento de entrada Troff MS</comment> <comment xml:lang="he">מסמך קלט של Troff MS</comment> <comment xml:lang="hr">Troff MS ulazni dokument</comment> @@ -35613,7 +36701,7 @@ <comment xml:lang="pt">documento origem Troff MS</comment> <comment xml:lang="pt_BR">Documento de entrada Troff MS</comment> <comment xml:lang="ro">Document intrare Troff MS</comment> - <comment xml:lang="ru">входной документ Troff MS</comment> + <comment xml:lang="ru">Входной документ Troff MS</comment> <comment xml:lang="sk">Vstupný dokument Troff MS</comment> <comment xml:lang="sl">Vnosni dokument Troff MS</comment> <comment xml:lang="sq">Dokument i input Troff MS</comment> @@ -35630,18 +36718,28 @@ <mime-type type="text/x-twig"> <comment>Twig template</comment> <comment xml:lang="ca">plantilla Twig</comment> + <comment xml:lang="cs">šablona Twig</comment> <comment xml:lang="da">Twig-skabelon</comment> <comment xml:lang="de">Twig-Vorlage</comment> + <comment xml:lang="en_GB">Twig template</comment> <comment xml:lang="es">plantilla de Twig</comment> + <comment xml:lang="eu">Twig txantiloia</comment> <comment xml:lang="fr">modèle Twig</comment> + <comment xml:lang="ga">teimpléad Twig</comment> <comment xml:lang="he">תבנית Twig</comment> + <comment xml:lang="hr">Twig predložak</comment> <comment xml:lang="hu">Twig-sablon</comment> + <comment xml:lang="id">templat Twig</comment> + <comment xml:lang="it">Modello twig</comment> <comment xml:lang="kk">Twig үлгісі</comment> <comment xml:lang="ko">Twig 문서 서식</comment> <comment xml:lang="pl">Szablon Twig</comment> <comment xml:lang="pt_BR">Modelo Twig</comment> - <comment xml:lang="ru">шаблон Twig</comment> + <comment xml:lang="ru">Шаблон Twig</comment> <comment xml:lang="sk">Šablóna Twig</comment> + <comment xml:lang="sr">Твиг шаблон</comment> + <comment xml:lang="sv">Twig-mall</comment> + <comment xml:lang="tr">Twig şablonu</comment> <comment xml:lang="uk">шаблон twig</comment> <comment xml:lang="zh_CN">Twig 模板</comment> <comment xml:lang="zh_TW">Twig 範本</comment> @@ -35687,7 +36785,7 @@ <comment xml:lang="pt">tabela UIL do X-Motif</comment> <comment xml:lang="pt_BR">Tabela UIL do X-Motif</comment> <comment xml:lang="ro">Tabel X-Motif UIL</comment> - <comment xml:lang="ru">таблица UIL X-Motif</comment> + <comment xml:lang="ru">Таблица UIL X-Motif</comment> <comment xml:lang="sk">Tabuľka X-Motif UIL</comment> <comment xml:lang="sl">Preglednica X-Motif UIL</comment> <comment xml:lang="sq">Tabelë X-Motif UIL</comment> @@ -35721,7 +36819,7 @@ <comment xml:lang="ga">suíomh acmhainne</comment> <comment xml:lang="gl">localización do recurso</comment> <comment xml:lang="he">מיקום של משאב</comment> - <comment xml:lang="hr">položaj resursa</comment> + <comment xml:lang="hr">Lokacija resursa</comment> <comment xml:lang="hu">erőforrás-hely</comment> <comment xml:lang="ia">Loco de ressources</comment> <comment xml:lang="id">lokasi sumber daya</comment> @@ -35740,7 +36838,7 @@ <comment xml:lang="pt">localização de recurso</comment> <comment xml:lang="pt_BR">Localização de recurso</comment> <comment xml:lang="ro">locație de resursă</comment> - <comment xml:lang="ru">расположение ресурса</comment> + <comment xml:lang="ru">Расположение ресурса</comment> <comment xml:lang="sk">Umiestnenie zdroja</comment> <comment xml:lang="sl">mesto vira</comment> <comment xml:lang="sq">Pozicion rezerve</comment> @@ -35765,6 +36863,7 @@ <comment xml:lang="es">archivo codificado con uuencode</comment> <comment xml:lang="eu">uuencode-aturiko fitxategia</comment> <comment xml:lang="fr">fichier uuencodé</comment> + <comment xml:lang="ga">comhad uuencoded</comment> <comment xml:lang="gl">Ficheiro uuencoded</comment> <comment xml:lang="he">קובץ בקידוד uu</comment> <comment xml:lang="hr">uuencoded datoteka</comment> @@ -35780,14 +36879,14 @@ <comment xml:lang="pl">Plik zakodowany za pomocą uuencode</comment> <comment xml:lang="pt">ficheiro uuencoded</comment> <comment xml:lang="pt_BR">Arquivo codificado UUE</comment> - <comment xml:lang="ru">файл в кодировке uuencode</comment> + <comment xml:lang="ru">Файл, кодированный uuencode</comment> <comment xml:lang="sk">Súbor v kódovaní uuencode</comment> <comment xml:lang="sl">Datoteka uuencode</comment> <comment xml:lang="sr">уукодирана датотека</comment> <comment xml:lang="sv">uuencode-fil</comment> <comment xml:lang="tr">uuencoded dosyası</comment> <comment xml:lang="uk">файл даних у форматі UUE</comment> - <comment xml:lang="zh_CN">未编码的文件</comment> + <comment xml:lang="zh_CN">Uuencode 文件</comment> <comment xml:lang="zh_TW">uuencoded 檔</comment> <sub-class-of type="text/plain"/> <glob pattern="*.uue"/> @@ -35834,7 +36933,7 @@ <comment xml:lang="pt">ficheiro XMI</comment> <comment xml:lang="pt_BR">Arquivo XMI</comment> <comment xml:lang="ro">Fișier XMI</comment> - <comment xml:lang="ru">файл XMI</comment> + <comment xml:lang="ru">Файл XMI</comment> <comment xml:lang="sk">Súbor XMI</comment> <comment xml:lang="sl">Datoteka XMI</comment> <comment xml:lang="sq">File XMI</comment> @@ -35890,7 +36989,7 @@ <comment xml:lang="pt">ficheiro XSL FO</comment> <comment xml:lang="pt_BR">Arquivo XSL FO</comment> <comment xml:lang="ro">Fișier XSL FO</comment> - <comment xml:lang="ru">файл XSL FO</comment> + <comment xml:lang="ru">Файл XSL FO</comment> <comment xml:lang="sk">Súbor XSL FO</comment> <comment xml:lang="sl">Datoteka XSL FO</comment> <comment xml:lang="sq">File XSL FO</comment> @@ -35911,6 +37010,7 @@ <mime-type type="text/x-iptables"> <comment>iptables configuration file</comment> <comment xml:lang="ar">ملف تضبيط iptables</comment> + <comment xml:lang="ast">ficheru de configuración d'iptables</comment> <comment xml:lang="be@latin">kanfihuracyjny fajł iptables</comment> <comment xml:lang="bg">Настройки за iptables</comment> <comment xml:lang="ca">fitxer de configuració d'iptables</comment> @@ -35927,7 +37027,7 @@ <comment xml:lang="ga">comhad cumraíochta iptables</comment> <comment xml:lang="gl">ficheiro de configuración de iptables</comment> <comment xml:lang="he">קובץ הגדרה של iptables</comment> - <comment xml:lang="hr">iptables datoteka s postavkama</comment> + <comment xml:lang="hr">iptables datoteka podešavanja</comment> <comment xml:lang="hu">iptables beállítófájl</comment> <comment xml:lang="ia">File de configuration IPTables</comment> <comment xml:lang="id">berkas konfigurasi iptables</comment> @@ -35945,7 +37045,7 @@ <comment xml:lang="pt">ficheiro de configuração iptables</comment> <comment xml:lang="pt_BR">Arquivo de configuração do iptables</comment> <comment xml:lang="ro">fișier configurare iptables</comment> - <comment xml:lang="ru">файл настроек iptables</comment> + <comment xml:lang="ru">Файл настроек iptables</comment> <comment xml:lang="sk">Súbor nastavení iptables</comment> <comment xml:lang="sl">nastavitvena datoteka iptables</comment> <comment xml:lang="sq">File konfigurimi iptables</comment> @@ -35979,6 +37079,110 @@ </magic> <glob pattern="*.iptables"/> </mime-type> + <mime-type type="text/x-dbus-service"> + <comment>D-Bus service file</comment> + <comment xml:lang="ca">fitxer de servei de D-Bus</comment> + <comment xml:lang="cs">soubor služby D-Bus</comment> + <comment xml:lang="de">D-Bus-Dienstdatei</comment> + <comment xml:lang="en_GB">D-Bus service file</comment> + <comment xml:lang="es">archivo de servicio de D-Bus</comment> + <comment xml:lang="eu">D-Bus zerbitzu fitxategia</comment> + <comment xml:lang="fi">D-Bus-palvelutiedosto</comment> + <comment xml:lang="fr">fichier de service D-Bus</comment> + <comment xml:lang="ga">comhad seirbhíse D-Bus</comment> + <comment xml:lang="hr">Datoteka D-Bus usluge</comment> + <comment xml:lang="hu">D-Bus szolgáltatás fájl</comment> + <comment xml:lang="id">berkas layanan D-Bus</comment> + <comment xml:lang="it">File servizio D-Bus</comment> + <comment xml:lang="kk">D-Bus қызметтік файлы</comment> + <comment xml:lang="ko">D-Bus 서비스 파일</comment> + <comment xml:lang="pl">Plik usługi D-Bus</comment> + <comment xml:lang="pt_BR">Arquivo de serviço do D-Bus</comment> + <comment xml:lang="ru">Файл службы D-Bus</comment> + <comment xml:lang="sk">Súbor služby D-Bus</comment> + <comment xml:lang="sr">датотека услуге Д-сабирнице</comment> + <comment xml:lang="sv">D-BUS-tjänstfil</comment> + <comment xml:lang="tr">D-Bus hizmeti dosyası</comment> + <comment xml:lang="uk">файл служби D-Bus</comment> + <comment xml:lang="zh_CN">D-Bus 服务文件</comment> + <comment xml:lang="zh_TW">D-Bus 服務檔</comment> + <sub-class-of type="text/plain"/> + <magic priority="50"> + <match value="\n[D-BUS Service]\n" type="string" offset="0:256"/> + <match value="[D-BUS Service]\n" type="string" offset="0"/> + </magic> + <glob pattern="*.service"/> + </mime-type> + <mime-type type="text/x-systemd-unit"> + <comment>systemd unit file</comment> + <comment xml:lang="ast">ficheru d'unidaes de systemd</comment> + <comment xml:lang="ca">fitxer d'unitat de systemd</comment> + <comment xml:lang="cs">jednotkový soubor systemd</comment> + <comment xml:lang="de">systemd-Einheitsdatei</comment> + <comment xml:lang="en_GB">systemd unit file</comment> + <comment xml:lang="es">archivo de unidad de systemd</comment> + <comment xml:lang="eu">systemd unitate fitxategia</comment> + <comment xml:lang="fi">systemd-yksikkötiedosto</comment> + <comment xml:lang="fr">fichier d'unité systemd</comment> + <comment xml:lang="ga">comhad aonaid systemd</comment> + <comment xml:lang="hr">Datoteka systemd jedinice</comment> + <comment xml:lang="hu">systemd egység fájl</comment> + <comment xml:lang="id">berkas unit systemd</comment> + <comment xml:lang="it">File unità systemd</comment> + <comment xml:lang="kk">systemd юнит файлы</comment> + <comment xml:lang="ko">systemd 유닛 파일</comment> + <comment xml:lang="pl">Plik jednostki systemd</comment> + <comment xml:lang="pt_BR">Arquivo de unit do systemd</comment> + <comment xml:lang="ru">Модульный файл Systemd</comment> + <comment xml:lang="sk">Súbor jednotky systemd</comment> + <comment xml:lang="sr">датотека јединице системд-а</comment> + <comment xml:lang="sv">systemd-enhetsfil</comment> + <comment xml:lang="tr">systemd birim dosyası</comment> + <comment xml:lang="uk">файл модуля systemd</comment> + <comment xml:lang="zh_CN">systemd 单元文件</comment> + <comment xml:lang="zh_TW">systemd 單位檔</comment> + <sub-class-of type="text/plain"/> + <magic priority="50"> + + <match value="\n[Unit]\n" type="string" offset="0:256"/> + <match value="\n[Install]\n" type="string" offset="0:256"/> + <match value="\n[Automount]\n" type="string" offset="0:256"/> + + <match value="\n[Mount]\n" type="string" offset="0:256"/> + <match value="\n[Path]\n" type="string" offset="0:256"/> + <match value="\n[Scope]\n" type="string" offset="0:256"/> + <match value="\n[Service]\n" type="string" offset="0:256"/> + <match value="\n[Slice]\n" type="string" offset="0:256"/> + <match value="\n[Socket]\n" type="string" offset="0:256"/> + <match value="\n[Swap]\n" type="string" offset="0:256"/> + + <match value="\n[Timer]\n" type="string" offset="0:256"/> + + + <match value="[Unit]\n" type="string" offset="0"/> + <match value="[Install]\n" type="string" offset="0"/> + <match value="[Automount]\n" type="string" offset="0"/> + <match value="[Mount]\n" type="string" offset="0"/> + <match value="[Path]\n" type="string" offset="0"/> + <match value="[Scope]\n" type="string" offset="0"/> + <match value="[Service]\n" type="string" offset="0"/> + <match value="[Slice]\n" type="string" offset="0"/> + <match value="[Socket]\n" type="string" offset="0"/> + <match value="[Swap]\n" type="string" offset="0"/> + <match value="[Timer]\n" type="string" offset="0"/> + </magic> + <glob pattern="*.automount"/> + <glob pattern="*.device"/> + <glob pattern="*.mount"/> + <glob pattern="*.path"/> + <glob pattern="*.scope"/> + <glob pattern="*.service"/> + <glob pattern="*.slice"/> + <glob pattern="*.socket"/> + <glob pattern="*.swap"/> + <glob pattern="*.target"/> + <glob pattern="*.timer"/> + </mime-type> <mime-type type="application/xslt+xml"> <comment>XSLT stylesheet</comment> <comment xml:lang="ar">نمط XSLT</comment> @@ -36018,7 +37222,7 @@ <comment xml:lang="pt">folha de estilos XSLT</comment> <comment xml:lang="pt_BR">Folha de estilo XSLT</comment> <comment xml:lang="ro">Fișă de stil XSLT</comment> - <comment xml:lang="ru">таблица стилей XSLT</comment> + <comment xml:lang="ru">Таблица стилей XSLT</comment> <comment xml:lang="sk">Štýl XSLT</comment> <comment xml:lang="sl">Slogovna predloga XSLT</comment> <comment xml:lang="sq">Fletë stili XSLT</comment> @@ -36077,7 +37281,7 @@ <comment xml:lang="pt">base de dados XMCD CD</comment> <comment xml:lang="pt_BR">Banco de dados de CD XMCD</comment> <comment xml:lang="ro">Bază de date XMCD CD</comment> - <comment xml:lang="ru">база данных компакт-дисков XMCD</comment> + <comment xml:lang="ru">База данных компакт-дисков XMCD</comment> <comment xml:lang="sk">Databáza XMCD CD</comment> <comment xml:lang="sl">Podatkovna zbirka XMCD CD</comment> <comment xml:lang="sq">Bazë me të dhëna XMCD CD</comment> @@ -36096,6 +37300,7 @@ <mime-type type="application/xml"> <comment>XML document</comment> <comment xml:lang="ar">مستند XML</comment> + <comment xml:lang="ast">Documentu XML</comment> <comment xml:lang="be@latin">Dakument XML</comment> <comment xml:lang="bg">Документ — XML</comment> <comment xml:lang="ca">document XML</comment> @@ -36131,7 +37336,7 @@ <comment xml:lang="pt">documento XML</comment> <comment xml:lang="pt_BR">Documento XML</comment> <comment xml:lang="ro">Document XML</comment> - <comment xml:lang="ru">документ XML</comment> + <comment xml:lang="ru">Документ XML</comment> <comment xml:lang="sk">Dokument XML</comment> <comment xml:lang="sl">Dokument XML</comment> <comment xml:lang="sq">Dokument XML</comment> @@ -36159,6 +37364,7 @@ <mime-type type="application/xml-external-parsed-entity"> <comment>XML entities document</comment> <comment xml:lang="ar">مستند كيانات XML</comment> + <comment xml:lang="ast">Documentu d'entidaes XML</comment> <comment xml:lang="be@latin">Dakument elementaŭ XML</comment> <comment xml:lang="bg">Документ — заместващи последователности в XML</comment> <comment xml:lang="ca">document d'entitats XML</comment> @@ -36193,7 +37399,7 @@ <comment xml:lang="pt">documento de entidades XML</comment> <comment xml:lang="pt_BR">Documento de entidades XML</comment> <comment xml:lang="ro">Document entități XML</comment> - <comment xml:lang="ru">файл сущностей XML</comment> + <comment xml:lang="ru">Файл сущностей XML</comment> <comment xml:lang="sk">Dokument entít XML</comment> <comment xml:lang="sl">Dokument XML določil</comment> <comment xml:lang="sq">Dokument njësish XML</comment> @@ -36214,6 +37420,7 @@ <mime-type type="video/dv"> <comment>DV video</comment> <comment xml:lang="ar">DV مرئي</comment> + <comment xml:lang="ast">Videu en DV</comment> <comment xml:lang="be@latin">Videa DV</comment> <comment xml:lang="bg">Видео — DV</comment> <comment xml:lang="ca">vídeo DV</comment> @@ -36231,7 +37438,7 @@ <comment xml:lang="ga">físeán DV</comment> <comment xml:lang="gl">vídeo DV</comment> <comment xml:lang="he">וידאו DV</comment> - <comment xml:lang="hr">DV video</comment> + <comment xml:lang="hr">DV video snimka</comment> <comment xml:lang="hu">DV videó</comment> <comment xml:lang="ia">Video DV</comment> <comment xml:lang="id">Video DV</comment> @@ -36250,7 +37457,7 @@ <comment xml:lang="pt">vídeo DV</comment> <comment xml:lang="pt_BR">Vídeo DV</comment> <comment xml:lang="ro">Video DV</comment> - <comment xml:lang="ru">видео DV</comment> + <comment xml:lang="ru">Видео DV</comment> <comment xml:lang="sk">Video DV</comment> <comment xml:lang="sl">Video datoteka DV</comment> <comment xml:lang="sq">Video DV</comment> @@ -36271,6 +37478,7 @@ <mime-type type="video/isivideo"> <comment>ISI video</comment> <comment xml:lang="ar">مرئي ISI</comment> + <comment xml:lang="ast">Videu n'ISI</comment> <comment xml:lang="az">ISI video faylı</comment> <comment xml:lang="be@latin">Videa ISI</comment> <comment xml:lang="bg">Видео — ISI</comment> @@ -36290,7 +37498,7 @@ <comment xml:lang="ga">físeán ISI</comment> <comment xml:lang="gl">vídeo ISI</comment> <comment xml:lang="he">וידאו ISI</comment> - <comment xml:lang="hr">ISI video</comment> + <comment xml:lang="hr">ISI video snimka</comment> <comment xml:lang="hu">ISI-videó</comment> <comment xml:lang="ia">Video ISI</comment> <comment xml:lang="id">Video ISI</comment> @@ -36309,7 +37517,7 @@ <comment xml:lang="pt">vídeo ISI</comment> <comment xml:lang="pt_BR">Vídeo ISI</comment> <comment xml:lang="ro">Video ISI</comment> - <comment xml:lang="ru">видео ISI</comment> + <comment xml:lang="ru">Видео ISI</comment> <comment xml:lang="sk">Video ISI</comment> <comment xml:lang="sl">Video datoteka ISI</comment> <comment xml:lang="sq">Video ISI</comment> @@ -36336,10 +37544,10 @@ <comment xml:lang="fi">MPEG-2 -siirtobittivirta</comment> <comment xml:lang="fo">MPEG-2 flutningsstreymur</comment> <comment xml:lang="fr">flux de transport MPEG-2</comment> - <comment xml:lang="ga">Sruth aistrithe MPEG-2</comment> + <comment xml:lang="ga">sruth aistrithe MPEG-2</comment> <comment xml:lang="gl">fluxo de transporte MPEG-2</comment> <comment xml:lang="he">העברת זרימה של MPEG-2</comment> - <comment xml:lang="hr">MPEG-2 transportni tok</comment> + <comment xml:lang="hr">MPEG-2 transportno strujanje</comment> <comment xml:lang="hu">MPEG-2 átviteli adatfolyam</comment> <comment xml:lang="ia">Fluxo de transporto MPEG-2</comment> <comment xml:lang="id">Stream transport MPEG-2</comment> @@ -36356,7 +37564,7 @@ <comment xml:lang="pt">fluxo de transporte MPEG-2</comment> <comment xml:lang="pt_BR">Fluxo de transporte de MPEG-2</comment> <comment xml:lang="ro">Flux transport MPEG-2</comment> - <comment xml:lang="ru">транспортный поток MPEG-2</comment> + <comment xml:lang="ru">Транспортный поток MPEG-2</comment> <comment xml:lang="sk">MPEG-2 Transport Stream</comment> <comment xml:lang="sl">Pretočni vir prenosega MPEG</comment> <comment xml:lang="sr">МПЕГ-2 ток преноса</comment> @@ -36401,6 +37609,7 @@ <mime-type type="video/mpeg"> <comment>MPEG video</comment> <comment xml:lang="ar">MPEG مرئي</comment> + <comment xml:lang="ast">Videu en MPEG</comment> <comment xml:lang="be@latin">Videa MPEG</comment> <comment xml:lang="bg">Видео — MPEG</comment> <comment xml:lang="ca">vídeo MPEG</comment> @@ -36418,7 +37627,7 @@ <comment xml:lang="ga">físeán MPEG</comment> <comment xml:lang="gl">vídeo MPEG</comment> <comment xml:lang="he">וידאו MPEG</comment> - <comment xml:lang="hr">MPEG video</comment> + <comment xml:lang="hr">MPEG video snimka</comment> <comment xml:lang="hu">MPEG-videó</comment> <comment xml:lang="ia">Video MPEG</comment> <comment xml:lang="id">Video MPEG</comment> @@ -36438,7 +37647,7 @@ <comment xml:lang="pt">vídeo MPEG</comment> <comment xml:lang="pt_BR">Vídeo MPEG</comment> <comment xml:lang="ro">Video MPEG</comment> - <comment xml:lang="ru">видео MPEG</comment> + <comment xml:lang="ru">Видео MPEG</comment> <comment xml:lang="sk">Video MPEG</comment> <comment xml:lang="sl">Video datoteka MPEG</comment> <comment xml:lang="sq">Video MPEG</comment> @@ -36469,6 +37678,7 @@ </mime-type> <mime-type type="video/vnd.mpegurl"> <comment>MPEG video (streamed)</comment> + <comment xml:lang="ast">Videu en MPEG (tresmitíu)</comment> <comment xml:lang="bg">Видео — MPEG, поточно</comment> <comment xml:lang="ca">vídeo MPEG (flux)</comment> <comment xml:lang="cs">video MPEG (proud)</comment> @@ -36480,6 +37690,7 @@ <comment xml:lang="eu">MPEG bideoa (korronte bidez)</comment> <comment xml:lang="fi">MPEG-video (virtaus)</comment> <comment xml:lang="fr">vidéo MPEG (flux)</comment> + <comment xml:lang="ga">físeán MPEG (sruthaithe)</comment> <comment xml:lang="gl">vídeo MPEG (en stream)</comment> <comment xml:lang="he">קובץ MPEG (בהזרמה)</comment> <comment xml:lang="hr">MPEG video snimka (strujanje)</comment> @@ -36497,7 +37708,7 @@ <comment xml:lang="pl">Plik wideo MPEG (strumień)</comment> <comment xml:lang="pt">vídeo MPEG (em fluxo)</comment> <comment xml:lang="pt_BR">Vídeo MPEG (fluxo)</comment> - <comment xml:lang="ru">видео MPEG (потоковое)</comment> + <comment xml:lang="ru">Видео MPEG (потоковое)</comment> <comment xml:lang="sk">MPEG video (streamované)</comment> <comment xml:lang="sl">MPEG-video (pretočni)</comment> <comment xml:lang="sr">МПЕГ видео (проточни)</comment> @@ -36518,6 +37729,7 @@ <mime-type type="video/quicktime"> <comment>QuickTime video</comment> <comment xml:lang="ar">QuickTime مرئي</comment> + <comment xml:lang="ast">Videu en QuickTime</comment> <comment xml:lang="be@latin">Videa QuickTime</comment> <comment xml:lang="bg">Видео — QuickTime</comment> <comment xml:lang="ca">vídeo QuickTime</comment> @@ -36535,7 +37747,7 @@ <comment xml:lang="ga">físeán QuickTime</comment> <comment xml:lang="gl">vídeo QuickTime</comment> <comment xml:lang="he">וידאו של QuickTime</comment> - <comment xml:lang="hr">QuickTime video</comment> + <comment xml:lang="hr">QuickTime video snimka</comment> <comment xml:lang="hu">QuickTime videó</comment> <comment xml:lang="ia">Video QuickTime</comment> <comment xml:lang="id">Video QuickTime</comment> @@ -36554,7 +37766,7 @@ <comment xml:lang="pt">vídeo QuickTime</comment> <comment xml:lang="pt_BR">Vídeo do QuickTime</comment> <comment xml:lang="ro">Video QuickTime</comment> - <comment xml:lang="ru">видео QuickTime</comment> + <comment xml:lang="ru">Видео QuickTime</comment> <comment xml:lang="sk">Video QuickTime</comment> <comment xml:lang="sl">Video datoteka QuickTime</comment> <comment xml:lang="sq">Video QuickTime</comment> @@ -36614,7 +37826,7 @@ <comment xml:lang="pt">imagem QuickTime</comment> <comment xml:lang="pt_BR">Imagem do QuickTime</comment> <comment xml:lang="ro">Imagine QuickTime</comment> - <comment xml:lang="ru">изображение QuickTime</comment> + <comment xml:lang="ru">Изображение QuickTime</comment> <comment xml:lang="sk">Obrázok QuickTime</comment> <comment xml:lang="sl">Slikovna datoteka QuickTime</comment> <comment xml:lang="sq">Figurë QuickTime</comment> @@ -36631,9 +37843,44 @@ <glob pattern="*.qtif"/> <glob pattern="*.qif"/> </mime-type> + <mime-type type="image/ktx"> + <comment>Khronos texture image</comment> + <comment xml:lang="ca">imatge de textura de Khronos</comment> + <comment xml:lang="cs">obrázek s texturou Khronos</comment> + <comment xml:lang="de">Khronos-Texturbild</comment> + <comment xml:lang="en_GB">Khronos texture image</comment> + <comment xml:lang="es">imagen de textura de Khronos</comment> + <comment xml:lang="fr">image de texture Khronos</comment> + <comment xml:lang="ga">íomhá uigeachta Khronos</comment> + <comment xml:lang="hr">Khronos tekstura slika</comment> + <comment xml:lang="hu">Khronos textúra kép</comment> + <comment xml:lang="id">citra tekstur Khronos</comment> + <comment xml:lang="it">Immagine texture Khronos</comment> + <comment xml:lang="kk">Khronos текстура суреті</comment> + <comment xml:lang="ko">크로노스 텍스처 파일</comment> + <comment xml:lang="pl">Obraz tekstury Khronos</comment> + <comment xml:lang="pt_BR">Imagem de textura do Khronos</comment> + <comment xml:lang="ru">Изображение текстуры Khronos</comment> + <comment xml:lang="sk">Obrázok textúry Khronos</comment> + <comment xml:lang="sr">слика Кронос текстуре</comment> + <comment xml:lang="sv">Khronos-texturbild</comment> + <comment xml:lang="tr">Khronos kaplama görüntüsü</comment> + <comment xml:lang="uk">зображення текстури Khronos</comment> + <comment xml:lang="zh_CN">Khronos 纹理图像</comment> + <comment xml:lang="zh_TW">Khronos 紋理影像</comment> + <magic priority="80"> + <match value="0xAB4B5458" type="big32" offset="0"> + <match value="0x203131BB" type="big32" offset="4"> + <match value="0x0D0A1A0A" type="big32" offset="8"/> + </match> + </match> + </magic> + <glob pattern="*.ktx"/> + </mime-type> <mime-type type="video/vnd.vivo"> <comment>Vivo video</comment> <comment xml:lang="ar">Vivo مرئي</comment> + <comment xml:lang="ast">Videu en Vivo</comment> <comment xml:lang="az">Vivo video faylı</comment> <comment xml:lang="be@latin">Videa Vivo</comment> <comment xml:lang="bg">Видео — Vivo</comment> @@ -36653,7 +37900,7 @@ <comment xml:lang="ga">físeán Vivo</comment> <comment xml:lang="gl">vídeo Vivo</comment> <comment xml:lang="he">וידאו של Vivo</comment> - <comment xml:lang="hr">Vivo video</comment> + <comment xml:lang="hr">Vivo video snimka</comment> <comment xml:lang="hu">Vivo-videó</comment> <comment xml:lang="ia">Video Vivo</comment> <comment xml:lang="id">Video Vivo</comment> @@ -36672,7 +37919,7 @@ <comment xml:lang="pt">vídeo Vivo</comment> <comment xml:lang="pt_BR">Vídeo Vivo</comment> <comment xml:lang="ro">Video Vivo</comment> - <comment xml:lang="ru">видео Vivo</comment> + <comment xml:lang="ru">Видео Vivo</comment> <comment xml:lang="sk">Video Vivo</comment> <comment xml:lang="sl">Video datoteka Vivo</comment> <comment xml:lang="sq">Video Vivo</comment> @@ -36690,6 +37937,7 @@ <mime-type type="video/wavelet"> <comment>Wavelet video</comment> <comment xml:lang="ar">Wavelet مرئي</comment> + <comment xml:lang="ast">Videu en Wavelet</comment> <comment xml:lang="az">Wavelet video faylı</comment> <comment xml:lang="be@latin">Videa Wavelet</comment> <comment xml:lang="bg">Видео — Wavelet</comment> @@ -36709,7 +37957,7 @@ <comment xml:lang="ga">físeán Wavelet</comment> <comment xml:lang="gl">vídeo Wavelet</comment> <comment xml:lang="he">וידאו של Wavelet</comment> - <comment xml:lang="hr">Wavelet video</comment> + <comment xml:lang="hr">Wavelet video snimka</comment> <comment xml:lang="hu">Wavelet-videó</comment> <comment xml:lang="ia">Video Wavelet</comment> <comment xml:lang="id">Video Wavelet</comment> @@ -36728,7 +37976,7 @@ <comment xml:lang="pt">vídeo Wavelet</comment> <comment xml:lang="pt_BR">Vídeo Wavelet</comment> <comment xml:lang="ro">Video Wavelet</comment> - <comment xml:lang="ru">видео Wavelet</comment> + <comment xml:lang="ru">Видео Wavelet</comment> <comment xml:lang="sk">Video Wavelet</comment> <comment xml:lang="sl">Video datoteka Wavelet</comment> <comment xml:lang="sq">Video Wavelet</comment> @@ -36782,7 +38030,7 @@ <comment xml:lang="pt">animação ANIM</comment> <comment xml:lang="pt_BR">Animação ANIM</comment> <comment xml:lang="ro">Animație ANIM</comment> - <comment xml:lang="ru">анимация ANIM</comment> + <comment xml:lang="ru">Анимация ANIM</comment> <comment xml:lang="sk">Animácia ANIM</comment> <comment xml:lang="sl">Datoteka animacije ANIM</comment> <comment xml:lang="sq">Animim ANIM</comment> @@ -36833,7 +38081,7 @@ <comment xml:lang="pt">animação FLIC</comment> <comment xml:lang="pt_BR">Animação FLIC</comment> <comment xml:lang="ro">Animație FLIC</comment> - <comment xml:lang="ru">анимация FLIC</comment> + <comment xml:lang="ru">Анимация FLIC</comment> <comment xml:lang="sk">Animácia FLIC</comment> <comment xml:lang="sl">Datoteka animacije FLIC</comment> <comment xml:lang="sq">Animim FLIC</comment> @@ -36856,6 +38104,7 @@ <mime-type type="application/x-hwp"> <comment>Haansoft Hangul document</comment> <comment xml:lang="ar">مستند Haansoft Hangul</comment> + <comment xml:lang="ast">Documentu de Haansoft Hangul</comment> <comment xml:lang="be@latin">Dakument Haansoft Hangul</comment> <comment xml:lang="bg">Документ — Haansoft Hangul</comment> <comment xml:lang="ca">document d'Haansoft Hangul</comment> @@ -36890,7 +38139,7 @@ <comment xml:lang="pt">documento Haansoft Hangul</comment> <comment xml:lang="pt_BR">Documento do Haansoft Hangul</comment> <comment xml:lang="ro">Document Haansoft Hangul</comment> - <comment xml:lang="ru">документ Haansoft Hangul</comment> + <comment xml:lang="ru">Документ Haansoft Hangul</comment> <comment xml:lang="sk">Dokument Haansoft Hangul</comment> <comment xml:lang="sl">Dokument Haansoft Hangul</comment> <comment xml:lang="sq">Dokument Haansoft Hangul</comment> @@ -36911,6 +38160,7 @@ <mime-type type="application/x-hwt"> <comment>Haansoft Hangul document template</comment> <comment xml:lang="ar">قالب مستند Haansoft Hangul</comment> + <comment xml:lang="ast">Plantía de documentu de Haansoft Hangul</comment> <comment xml:lang="be@latin">Šablon dakumentu Haansoft Hangul</comment> <comment xml:lang="bg">Шаблон за документи — Haansoft Hangul</comment> <comment xml:lang="ca">plantilla de document d'Haansoft Hangul</comment> @@ -36945,7 +38195,7 @@ <comment xml:lang="pt">modelo de documento Haansoft Hangul</comment> <comment xml:lang="pt_BR">Modelo de documento do Haansoft Hangul</comment> <comment xml:lang="ro">Document șablon Haansoft Hangul</comment> - <comment xml:lang="ru">шаблон документа Haansoft Hangul</comment> + <comment xml:lang="ru">Шаблон документа Haansoft Hangul</comment> <comment xml:lang="sk">Šablóna dokumentu Haansoft Hangul</comment> <comment xml:lang="sl">Predloga dokumenta Haansoft Hangul</comment> <comment xml:lang="sq">Model dokumenti Haansoft Hangul</comment> @@ -36999,7 +38249,7 @@ <comment xml:lang="pt">animação MNG</comment> <comment xml:lang="pt_BR">Animação MNG</comment> <comment xml:lang="ro">Animație MNG</comment> - <comment xml:lang="ru">анимация MNG</comment> + <comment xml:lang="ru">Анимация MNG</comment> <comment xml:lang="sk">Animácia MNG</comment> <comment xml:lang="sl">Datoteka animacije MNG</comment> <comment xml:lang="sq">Animim MNG</comment> @@ -37020,6 +38270,7 @@ <mime-type type="application/vnd.ms-asf"> <comment>ASF video</comment> <comment xml:lang="ar">ASF مرئي</comment> + <comment xml:lang="ast">Videu n'ASF</comment> <comment xml:lang="be@latin">Videa ASF</comment> <comment xml:lang="bg">Видео — ASF</comment> <comment xml:lang="ca">vídeo ASF</comment> @@ -37037,7 +38288,7 @@ <comment xml:lang="ga">físeán ASF</comment> <comment xml:lang="gl">vídeo ASF</comment> <comment xml:lang="he">וידאו ASF</comment> - <comment xml:lang="hr">ASF video</comment> + <comment xml:lang="hr">ASF video snimka</comment> <comment xml:lang="hu">ASF videó</comment> <comment xml:lang="ia">Video ASF</comment> <comment xml:lang="id">Video ASF</comment> @@ -37056,7 +38307,7 @@ <comment xml:lang="pt">vídeo ASF</comment> <comment xml:lang="pt_BR">Vídeo ASF</comment> <comment xml:lang="ro">Video ASF</comment> - <comment xml:lang="ru">видео ASF</comment> + <comment xml:lang="ru">Видео ASF</comment> <comment xml:lang="sk">Video ASF</comment> <comment xml:lang="sl">Video datoteka ASF</comment> <comment xml:lang="sq">Video ASF</comment> @@ -37115,7 +38366,7 @@ <comment xml:lang="pt">ficheiro Windows Media Station</comment> <comment xml:lang="pt_BR">Arquivo de estação do Windows Media</comment> <comment xml:lang="ro">Fișier Windows Media Station</comment> - <comment xml:lang="ru">файл Windows Media Station</comment> + <comment xml:lang="ru">Файл Windows Media Station</comment> <comment xml:lang="sk">Súbor Windows Media Station</comment> <comment xml:lang="sl">Datoteka Windows Media Station</comment> <comment xml:lang="sq">File Windows Media Station</comment> @@ -37136,6 +38387,7 @@ <mime-type type="video/x-ms-wmv"> <comment>Windows Media video</comment> <comment xml:lang="ar">Windows Media مرئي</comment> + <comment xml:lang="ast">Videu de Windows Media</comment> <comment xml:lang="be@latin">Videa Windows Media</comment> <comment xml:lang="bg">Видео — Windows Media</comment> <comment xml:lang="ca">vídeo de Windows Media</comment> @@ -37152,7 +38404,7 @@ <comment xml:lang="ga">físeán Windows Media</comment> <comment xml:lang="gl">vídeo de Windows Media</comment> <comment xml:lang="he">וידאו של Windows Media</comment> - <comment xml:lang="hr">Windows Media video</comment> + <comment xml:lang="hr">Windows Media video snimka</comment> <comment xml:lang="hu">Windows Media videó</comment> <comment xml:lang="ia">Video Windows Media</comment> <comment xml:lang="id">Video Windows Media</comment> @@ -37170,7 +38422,7 @@ <comment xml:lang="pt">vídeo Windows Media</comment> <comment xml:lang="pt_BR">Vídeo do Windows Media</comment> <comment xml:lang="ro">Video Windows Media</comment> - <comment xml:lang="ru">видео Windows Media</comment> + <comment xml:lang="ru">Видео Windows Media</comment> <comment xml:lang="sk">Video Windows Media</comment> <comment xml:lang="sl">Video datoteka Windows Media</comment> <comment xml:lang="sq">Video Windows Media</comment> @@ -37187,6 +38439,7 @@ <mime-type type="video/x-msvideo"> <comment>AVI video</comment> <comment xml:lang="ar">AVI مرئي</comment> + <comment xml:lang="ast">Videu n'AVI</comment> <comment xml:lang="az">AVI video faylı</comment> <comment xml:lang="be@latin">Videa AVI</comment> <comment xml:lang="bg">Видео — AVI</comment> @@ -37206,7 +38459,7 @@ <comment xml:lang="ga">físeán AVI</comment> <comment xml:lang="gl">vídeo AVI</comment> <comment xml:lang="he">וידאו AVI</comment> - <comment xml:lang="hr">AVI video</comment> + <comment xml:lang="hr">AVI video snimka</comment> <comment xml:lang="hu">AVI-videó</comment> <comment xml:lang="ia">Video AVI</comment> <comment xml:lang="id">Video AVI</comment> @@ -37226,7 +38479,7 @@ <comment xml:lang="pt">vídeo AVI</comment> <comment xml:lang="pt_BR">Vídeo AVI</comment> <comment xml:lang="ro">Video AVI</comment> - <comment xml:lang="ru">видео AVI</comment> + <comment xml:lang="ru">Видео AVI</comment> <comment xml:lang="sk">Video AVI</comment> <comment xml:lang="sl">Video datoteka AVI</comment> <comment xml:lang="sq">Video AVI</comment> @@ -37259,6 +38512,7 @@ <mime-type type="video/x-nsv"> <comment>NullSoft video</comment> <comment xml:lang="ar">NullSoft مرئي</comment> + <comment xml:lang="ast">Videu de NullSoft</comment> <comment xml:lang="be@latin">Videa NullSoft</comment> <comment xml:lang="bg">Видео — NullSoft</comment> <comment xml:lang="ca">vídeo NullSoft</comment> @@ -37276,7 +38530,7 @@ <comment xml:lang="ga">físeán NullSoft</comment> <comment xml:lang="gl">vídeo de NullSoft</comment> <comment xml:lang="he">וידאו של NullSot</comment> - <comment xml:lang="hr">NullSoft video</comment> + <comment xml:lang="hr">NullSoft video snimka</comment> <comment xml:lang="hu">NullSoft videó</comment> <comment xml:lang="ia">Video NullSoft</comment> <comment xml:lang="id">Video NullSoft</comment> @@ -37294,7 +38548,7 @@ <comment xml:lang="pt">vídeo NullSoft</comment> <comment xml:lang="pt_BR">Vídeo do NullSoft</comment> <comment xml:lang="ro">Video NullSoft</comment> - <comment xml:lang="ru">видео Nullsoft</comment> + <comment xml:lang="ru">Видео Nullsoft</comment> <comment xml:lang="sk">Video NullSoft</comment> <comment xml:lang="sl">Video datoteka NullSoft</comment> <comment xml:lang="sq">Video NullSoft</comment> @@ -37303,7 +38557,7 @@ <comment xml:lang="tr">Nullsoft videosu</comment> <comment xml:lang="uk">відеокліп NullSoft</comment> <comment xml:lang="vi">Ảnh động NullSoft</comment> - <comment xml:lang="zh_CN">Nullsoft 视频</comment> + <comment xml:lang="zh_CN">NullSoft 视频</comment> <comment xml:lang="zh_TW">NullSoft 視訊</comment> <magic priority="50"> <match value="NSVf" type="string" offset="0"/> @@ -37347,7 +38601,7 @@ <comment xml:lang="pt">ficheiro de fluxo SDP multicast</comment> <comment xml:lang="pt_BR">Arquivo de canal multicast SDP</comment> <comment xml:lang="ro">Fișier flux multicast SDP</comment> - <comment xml:lang="ru">файл мультикаст-потока SDP</comment> + <comment xml:lang="ru">Файл мультикаст-потока SDP</comment> <comment xml:lang="sk">Súbor viacsmerového vysielania prúdu SDP</comment> <comment xml:lang="sl">Pretočni vir večsmernega oddajanja</comment> <comment xml:lang="sq">File stream multicast SDP</comment> @@ -37374,6 +38628,7 @@ <mime-type type="video/x-sgi-movie"> <comment>SGI video</comment> <comment xml:lang="ar">SGI مرئي</comment> + <comment xml:lang="ast">Videu en SGI</comment> <comment xml:lang="az">SGI video faylı</comment> <comment xml:lang="be@latin">Videa SGI</comment> <comment xml:lang="bg">Видео — SGI</comment> @@ -37393,7 +38648,7 @@ <comment xml:lang="ga">físeán SGI</comment> <comment xml:lang="gl">vídeo SGI</comment> <comment xml:lang="he">וידאו SGI</comment> - <comment xml:lang="hr">SGI video</comment> + <comment xml:lang="hr">SGI video snimka</comment> <comment xml:lang="hu">SGI-videó</comment> <comment xml:lang="ia">Video SGI</comment> <comment xml:lang="id">Video SGI</comment> @@ -37412,7 +38667,7 @@ <comment xml:lang="pt">vídeo SGI</comment> <comment xml:lang="pt_BR">Vídeo SGI</comment> <comment xml:lang="ro">Video SGI</comment> - <comment xml:lang="ru">видео SGI</comment> + <comment xml:lang="ru">Видео SGI</comment> <comment xml:lang="sk">Video SGI</comment> <comment xml:lang="sl">Video datoteka SGI</comment> <comment xml:lang="sq">Video SGI</comment> @@ -37465,7 +38720,7 @@ <comment xml:lang="pt">pacote transferido eMusic</comment> <comment xml:lang="pt_BR">Pacote de download do eMusic</comment> <comment xml:lang="ro">pachet descărcare eMusic</comment> - <comment xml:lang="ru">пакет загрузок eMusic</comment> + <comment xml:lang="ru">Пакет загрузок eMusic</comment> <comment xml:lang="sk">Balíček sťahovania eMusic</comment> <comment xml:lang="sl">Datoteka paketa eMusic</comment> <comment xml:lang="sq">Paketë shkarkimi eMusic</comment> @@ -37516,7 +38771,7 @@ <comment xml:lang="pt">dados geográficos KML</comment> <comment xml:lang="pt_BR">Dados geográficos KML</comment> <comment xml:lang="ro">Date geografice KML</comment> - <comment xml:lang="ru">географические данные KML</comment> + <comment xml:lang="ru">Географические данные KML</comment> <comment xml:lang="sk">Zemepisné údaje KML</comment> <comment xml:lang="sl">Datoteka geografskih podatkov KML</comment> <comment xml:lang="sr">КМЛ географски подаци</comment> @@ -37549,7 +38804,7 @@ <comment xml:lang="ga">sonraí comhbhrúite geografacha KML</comment> <comment xml:lang="gl">datos xeográficos KML comprimidos </comment> <comment xml:lang="he">מידע גאוגרפי דחוס KML</comment> - <comment xml:lang="hr">KML geografski komprimirani podaci</comment> + <comment xml:lang="hr">KML sažeti geografski podaci</comment> <comment xml:lang="hu">KML tömörített földrajzi adatok</comment> <comment xml:lang="ia">Datos geographic KML comprimite</comment> <comment xml:lang="id">Data geografis KML terkompresi</comment> @@ -37565,14 +38820,14 @@ <comment xml:lang="pt">dados geográficos comprimidos KML</comment> <comment xml:lang="pt_BR">Dados geográficos KML compactados</comment> <comment xml:lang="ro">Date geografice comprimate KML</comment> - <comment xml:lang="ru">сжатые географические данные KML</comment> + <comment xml:lang="ru">Сжатые географические данные KML</comment> <comment xml:lang="sk">Komprimované zemepisné údaje KML</comment> <comment xml:lang="sl">Skrčeni geografski podatki KML</comment> <comment xml:lang="sr">КМЛ географски запаковани подаци</comment> <comment xml:lang="sv">KML geografiskt komprimerat data</comment> <comment xml:lang="tr">KML sıkıştırılmış coğrafi verisi</comment> <comment xml:lang="uk">стиснуті географічні дані KML</comment> - <comment xml:lang="zh_CN">KML 压缩地理数据</comment> + <comment xml:lang="zh_CN">KML 地理压缩数据</comment> <comment xml:lang="zh_TW">KML 地理壓縮資料</comment> <acronym>KML</acronym> <expanded-acronym>Keyhole Markup Language</expanded-acronym> @@ -37588,6 +38843,7 @@ <comment xml:lang="en_GB">GeoJSON geospatial data</comment> <comment xml:lang="es">datos geoespaciales en GeoJSON</comment> <comment xml:lang="fr">données géospatiales GeoJSON</comment> + <comment xml:lang="ga">sonraí geospásúla GeoJSON</comment> <comment xml:lang="hr">GeoJSON geoprostorni podaci</comment> <comment xml:lang="hu">GeoJSON téradatok</comment> <comment xml:lang="id">Data geospasial GeoJSON</comment> @@ -37596,10 +38852,10 @@ <comment xml:lang="ko">GeoJSON 지리 정보 데이터</comment> <comment xml:lang="pl">Dane geoprzestrzenne GeoJSON</comment> <comment xml:lang="pt_BR">Dados geoespaciais GeoJSON</comment> - <comment xml:lang="ru">геопространственные данные GeoJSON</comment> + <comment xml:lang="ru">Геопространственные данные GeoJSON</comment> <comment xml:lang="sk">Geopriestorové údaje GeoJSON</comment> <comment xml:lang="sr">ГеоЈСОН геопросторни подаци</comment> - <comment xml:lang="sv">GeoJSON geospatial data</comment> + <comment xml:lang="sv">Geospatialt GeoJSON-data</comment> <comment xml:lang="tr">GeoJSON coğrafi veriler</comment> <comment xml:lang="uk">геопросторові дані GeoJSON</comment> <comment xml:lang="zh_CN">GeoJSON 地理空间数据</comment> @@ -37620,6 +38876,7 @@ <comment xml:lang="eu">GPX datu geografikoak</comment> <comment xml:lang="fi">GPX-paikkatieto</comment> <comment xml:lang="fr">données géographiques GPX</comment> + <comment xml:lang="ga">sonraí geografacha GPX</comment> <comment xml:lang="he">נתונים גאוגרפיים GPX</comment> <comment xml:lang="hr">GPX geografski podaci</comment> <comment xml:lang="hu">GPX földrajzi adatok</comment> @@ -37630,13 +38887,13 @@ <comment xml:lang="oc">Donadas geograficas GPX</comment> <comment xml:lang="pl">Dane geograficzne GPX</comment> <comment xml:lang="pt_BR">Dados geográficos GPX</comment> - <comment xml:lang="ru">географические данные GPX</comment> + <comment xml:lang="ru">Географические данные GPX</comment> <comment xml:lang="sk">Zemepisné údaje GPX</comment> <comment xml:lang="sr">ГПИкс географски подаци</comment> <comment xml:lang="sv">GPX geografisk data</comment> <comment xml:lang="tr">GPX coğrafi verileri</comment> <comment xml:lang="uk">географічні дані GPX</comment> - <comment xml:lang="zh_CN">GPX 地理空间数据</comment> + <comment xml:lang="zh_CN">GPX 地理数据</comment> <comment xml:lang="zh_TW">GPX 地理資料</comment> <acronym>GPX</acronym> <expanded-acronym>GPS Exchange Format</expanded-acronym> @@ -37686,7 +38943,7 @@ <comment xml:lang="pt">ficheiro de definições Citrix ICA</comment> <comment xml:lang="pt_BR">Arquivo de configuração do Citrix ICA</comment> <comment xml:lang="ro">Fișier de configurări Citrix ICA</comment> - <comment xml:lang="ru">файл настроек Citrix ICA</comment> + <comment xml:lang="ru">Файл настроек Citrix ICA</comment> <comment xml:lang="sk">Súbor nastavení Citrix ICA</comment> <comment xml:lang="sl">Nastavitvena datoteka Citrix ICA</comment> <comment xml:lang="sq">File rregullimesh Citrix ICA</comment> @@ -37706,6 +38963,7 @@ <mime-type type="application/vnd.mozilla.xul+xml"> <comment>XUL interface document</comment> <comment xml:lang="ar">مستند واجهة XUL</comment> + <comment xml:lang="ast">Documentu d'interfaz XUL</comment> <comment xml:lang="be@latin">Interfejsny dakument XUL</comment> <comment xml:lang="bg">Документ — интерфейс за XUL</comment> <comment xml:lang="ca">document d'interfície XUL</comment> @@ -37740,7 +38998,7 @@ <comment xml:lang="pt">documento de ambiente XUL</comment> <comment xml:lang="pt_BR">Documento de interface XUL</comment> <comment xml:lang="ro">Document interfață XUL</comment> - <comment xml:lang="ru">документ интерфейса XUL</comment> + <comment xml:lang="ru">Документ интерфейса XUL</comment> <comment xml:lang="sk">Dokument rozhrania XUL</comment> <comment xml:lang="sl">Dokument vmesnika XUL</comment> <comment xml:lang="sq">Dokument interfaqe XUL</comment> @@ -37792,7 +39050,7 @@ <comment xml:lang="pt">módulo de instalador XPInstall</comment> <comment xml:lang="pt_BR">Módulo de instalador XPInstall</comment> <comment xml:lang="ro">Modul de instalare XPInstall</comment> - <comment xml:lang="ru">модуль установщика XPInstall</comment> + <comment xml:lang="ru">Модуль установщика XPInstall</comment> <comment xml:lang="sk">Modul inštalátora XPInstall</comment> <comment xml:lang="sl">modul namestilnika XPInstall</comment> <comment xml:lang="sr">модул инсталатера Инсталирања ИксПе-а</comment> @@ -37807,6 +39065,7 @@ <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.document"> <comment>Word 2007 document</comment> <comment xml:lang="ar">مستند Word 2007</comment> + <comment xml:lang="ast">Documentu de Word 2007</comment> <comment xml:lang="bg">Документ — Word 2007</comment> <comment xml:lang="ca">document de Word 2007</comment> <comment xml:lang="cs">dokument Word 2007</comment> @@ -37838,7 +39097,7 @@ <comment xml:lang="pt">documento Word 2007</comment> <comment xml:lang="pt_BR">Documento do Word 2007</comment> <comment xml:lang="ro">Document Word 2007</comment> - <comment xml:lang="ru">документ Word 2007</comment> + <comment xml:lang="ru">Документ Word 2007</comment> <comment xml:lang="sk">Dokument Word 2007</comment> <comment xml:lang="sl">Dokument Word 2007</comment> <comment xml:lang="sr">документ Ворда 2007</comment> @@ -37846,7 +39105,7 @@ <comment xml:lang="tr">Word 2007 belgesi</comment> <comment xml:lang="uk">документ Word 2007</comment> <comment xml:lang="vi">Tài liệu Word 2007</comment> - <comment xml:lang="zh_CN">Microsoft Word 2007 文档</comment> + <comment xml:lang="zh_CN">Word 2007 文档</comment> <comment xml:lang="zh_TW">Word 2007 文件</comment> <glob pattern="*.docx"/> <sub-class-of type="application/zip"/> @@ -37854,6 +39113,7 @@ </mime-type> <mime-type type="application/vnd.openxmlformats-officedocument.wordprocessingml.template"> <comment>Word 2007 document template</comment> + <comment xml:lang="ast">Plantía de documentu de Word 2007</comment> <comment xml:lang="bg">Шаблон за документи — Word 2007</comment> <comment xml:lang="ca">plantilla de document de Word 2007</comment> <comment xml:lang="cs">šablona dokumentu Word 2007</comment> @@ -37865,6 +39125,7 @@ <comment xml:lang="eu">Word 2007 dokumentuaren txantiloia</comment> <comment xml:lang="fi">Word 2007 -asiakirjamalli</comment> <comment xml:lang="fr">modèle de document Word 2007</comment> + <comment xml:lang="ga">teimpléad cháipéis Word 2007</comment> <comment xml:lang="gl">Plantilla de documento de Word 2007</comment> <comment xml:lang="he">תבנית מסמך של Word 2007</comment> <comment xml:lang="hr">Word 2007 predložak dokumenta</comment> @@ -37882,7 +39143,7 @@ <comment xml:lang="pl">Szablon dokumentu Word 2007</comment> <comment xml:lang="pt">modelo de documento Word 2007</comment> <comment xml:lang="pt_BR">Modelo de documento do Word 2007</comment> - <comment xml:lang="ru">шаблон документа Word 2007</comment> + <comment xml:lang="ru">Шаблон документа Word 2007</comment> <comment xml:lang="sk">Šablóna dokumentu Word 2007</comment> <comment xml:lang="sl">Predloga dokumenta Word 2007</comment> <comment xml:lang="sr">шаблон документа Ворда 2007</comment> @@ -37929,7 +39190,7 @@ <comment xml:lang="pt">apresentação PowerPoint 2007</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint 2007</comment> <comment xml:lang="ro">Prezentare PowerPoint 2007</comment> - <comment xml:lang="ru">презентация PowerPoint 2007</comment> + <comment xml:lang="ru">Презентация PowerPoint 2007</comment> <comment xml:lang="sk">Prezentácia PowerPoint 2007</comment> <comment xml:lang="sl">Predstavitev Microsoft PowerPoint 2007</comment> <comment xml:lang="sr">презентација Пауер Поинта 2007</comment> @@ -37937,7 +39198,7 @@ <comment xml:lang="tr">PowerPoint 2007 sunumu</comment> <comment xml:lang="uk">презентація PowerPoint 2007</comment> <comment xml:lang="vi">Trình diễn PowerPoint 2007</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 2007 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 2007 演示文稿</comment> <comment xml:lang="zh_TW">PowerPoint 2007 簡報</comment> <glob pattern="*.pptx"/> <sub-class-of type="application/zip"/> @@ -37956,9 +39217,10 @@ <comment xml:lang="eu">PowerPoint 2007 diapositiba</comment> <comment xml:lang="fi">PowerPoint 2007 -dia</comment> <comment xml:lang="fr">diapositive PowerPoint 2007</comment> + <comment xml:lang="ga">sleamhnán PowerPoint 2007</comment> <comment xml:lang="gl">Diaporama de PowerPoint 2007</comment> <comment xml:lang="he">שקופית של PowerPoint 2007</comment> - <comment xml:lang="hr">PowerPoint 2007 slajd</comment> + <comment xml:lang="hr">PowerPoint 2007 slikovna prezentacija</comment> <comment xml:lang="hu">PowerPoint 2007 dia</comment> <comment xml:lang="ia">Diapositiva PowerPoint 2007</comment> <comment xml:lang="id">Slide PowerPoint 2007</comment> @@ -37973,14 +39235,14 @@ <comment xml:lang="pl">Slajd PowerPoint 2007</comment> <comment xml:lang="pt">diapositivo PowerPoint 2007</comment> <comment xml:lang="pt_BR">Slide do PowerPoint 2007</comment> - <comment xml:lang="ru">слайд PowerPoint 2007</comment> + <comment xml:lang="ru">Слайд PowerPoint 2007</comment> <comment xml:lang="sk">Snímka PowerPoint 2007</comment> <comment xml:lang="sl">Prosojnica PowerPoint 2007</comment> <comment xml:lang="sr">слајд Пауер Поинта 2007</comment> <comment xml:lang="sv">PowerPoint 2007-bildspel</comment> <comment xml:lang="tr">PowerPoint 2007 slaytı</comment> <comment xml:lang="uk">слайд PowerPoint 2007</comment> - <comment xml:lang="zh_CN">PowerPoint 2007 文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 2007 幻灯片</comment> <comment xml:lang="zh_TW">PowerPoint 2007 投影片</comment> <glob pattern="*.sldx"/> <sub-class-of type="application/zip"/> @@ -38020,14 +39282,14 @@ <comment xml:lang="pt">espetáculo PowerPoint 2007</comment> <comment xml:lang="pt_BR">Apresentação do PowerPoint 2007</comment> <comment xml:lang="ro">Prezentare PowerPoint 2007</comment> - <comment xml:lang="ru">презентация PowerPoint 2007</comment> + <comment xml:lang="ru">Презентация PowerPoint 2007</comment> <comment xml:lang="sk">Ukážka PowerPoint 2007</comment> <comment xml:lang="sl">Zagonska predstavitev PowerPoint 2007</comment> <comment xml:lang="sr">приказ Пауер Поинта 2007</comment> <comment xml:lang="sv">PowerPoint 2007-visning</comment> <comment xml:lang="tr">PowerPoint 2007 gösterisi</comment> <comment xml:lang="uk">показ слайдів PowerPoint 2007</comment> - <comment xml:lang="zh_CN">Microsoft PowerPoint 2007 演示文稿</comment> + <comment xml:lang="zh_CN">PowerPoint 2007 放映</comment> <comment xml:lang="zh_TW">PowerPoint 2007 展示</comment> <glob pattern="*.ppsx"/> <sub-class-of type="application/zip"/> @@ -38046,6 +39308,7 @@ <comment xml:lang="eu">PowerPoint 2007 aurkezpen txantiloia</comment> <comment xml:lang="fi">PowerPoint 2007 -esitysmalli</comment> <comment xml:lang="fr">modèle de présentation PowerPoint 2007</comment> + <comment xml:lang="ga">teimpléad láithreoireachta PowerPoint 2007</comment> <comment xml:lang="gl">modelo de presentación de PowerPoint 2007</comment> <comment xml:lang="he">תבנית למצגת של PowerPoint 2007</comment> <comment xml:lang="hr">PowerPoint 2007 predložak prezentacije</comment> @@ -38063,7 +39326,7 @@ <comment xml:lang="pl">Szablon prezentacji PowerPoint 2007</comment> <comment xml:lang="pt">modelo de apresentação PowerPoint 2007</comment> <comment xml:lang="pt_BR">Modelo de apresentação do PowerPoint 2007</comment> - <comment xml:lang="ru">шаблон презентации PowerPoint 2007</comment> + <comment xml:lang="ru">Шаблон презентации PowerPoint 2007</comment> <comment xml:lang="sk">Šablóna prezentácie PowerPoint 2007</comment> <comment xml:lang="sl">Predloga predstavitve PowerPoint 2007</comment> <comment xml:lang="sr">шаблон презентације Пауер Поинта 2007</comment> @@ -38111,7 +39374,7 @@ <comment xml:lang="pt">folha de cálculo Excel 2007</comment> <comment xml:lang="pt_BR">Planilha do Excel 2007</comment> <comment xml:lang="ro">Foaie de calcul Excel 2007</comment> - <comment xml:lang="ru">электронная таблица Excel 2007</comment> + <comment xml:lang="ru">Электронная таблица Excel 2007</comment> <comment xml:lang="sk">Zošit Excel 2007</comment> <comment xml:lang="sl">Razpredelnica Microsoft Excel 2007</comment> <comment xml:lang="sr">табела Ексела 2007</comment> @@ -38119,7 +39382,7 @@ <comment xml:lang="tr">Excel 2007 çalışma sayfası</comment> <comment xml:lang="uk">ел. таблиця Excel 2007</comment> <comment xml:lang="vi">Bảng tính Excel 2007</comment> - <comment xml:lang="zh_CN">Microsoft Excel 2007 工作簿</comment> + <comment xml:lang="zh_CN">Excel 2007 电子表格</comment> <comment xml:lang="zh_TW">Excel 2007 試算表</comment> <glob pattern="*.xlsx"/> <sub-class-of type="application/zip"/> @@ -38138,6 +39401,7 @@ <comment xml:lang="eu">Excel 2007 kalkulu-orri txantiloia</comment> <comment xml:lang="fi">Excel 2007 -taulukkomalli</comment> <comment xml:lang="fr">modèle de feuille de calcul Excel 2007</comment> + <comment xml:lang="ga">teimpléad scarbhileoige Excel 2007</comment> <comment xml:lang="gl">modelo de folla de cálculo Excel 2007</comment> <comment xml:lang="he">תבנית של גיליון נתונים של Excel 2007</comment> <comment xml:lang="hr">Excel 2007 predložak proračunske tablice</comment> @@ -38155,14 +39419,14 @@ <comment xml:lang="pl">Szablon arkusza Excel 2007</comment> <comment xml:lang="pt">modelo de folha de cálculo Excel 2007</comment> <comment xml:lang="pt_BR">Modelo de planilha do Excel 2007</comment> - <comment xml:lang="ru">шаблон электронной таблицы Excel 2007</comment> + <comment xml:lang="ru">Шаблон электронной таблицы Excel 2007</comment> <comment xml:lang="sk">Šablóna zošitu Excel 2007</comment> <comment xml:lang="sl">Predloga razpredelnice Excel 2007</comment> <comment xml:lang="sr">шаблон табеле Ексела 2007</comment> <comment xml:lang="sv">Excel 2007-kalkylarksmall</comment> <comment xml:lang="tr">Excel 2007 çalışma sayfası şablonu</comment> <comment xml:lang="uk">шаблон електронної таблиці Excel 2007</comment> - <comment xml:lang="zh_CN">Excel 2007 工作表模板</comment> + <comment xml:lang="zh_CN">Excel 2007 电子表格模板</comment> <comment xml:lang="zh_TW">Excel 2007 試算表範本</comment> <glob pattern="*.xltx"/> <sub-class-of type="application/zip"/> @@ -38171,6 +39435,7 @@ <mime-type type="application/x-t602"> <comment>T602 document</comment> <comment xml:lang="ar">مستند T602</comment> + <comment xml:lang="ast">Documentu T602</comment> <comment xml:lang="be@latin">Dakument T602</comment> <comment xml:lang="bg">Документ — T602</comment> <comment xml:lang="ca">document T602</comment> @@ -38206,7 +39471,7 @@ <comment xml:lang="pt">documento T602</comment> <comment xml:lang="pt_BR">Documento T602</comment> <comment xml:lang="ro">Document T602</comment> - <comment xml:lang="ru">документ T602</comment> + <comment xml:lang="ru">Документ T602</comment> <comment xml:lang="sk">Dokument T602</comment> <comment xml:lang="sl">Dokument T602</comment> <comment xml:lang="sq">Dokument T602</comment> @@ -38263,7 +39528,7 @@ <comment xml:lang="pt">definições de Cisco VPN</comment> <comment xml:lang="pt_BR">Configurações de VPN da Cisco</comment> <comment xml:lang="ro">Configurări VPN Cisco</comment> - <comment xml:lang="ru">файл настроек Cisco VPN</comment> + <comment xml:lang="ru">Файл настроек Cisco VPN</comment> <comment xml:lang="sk">Nastavenia Cisco VPN</comment> <comment xml:lang="sl">Datoteka nastavitev Cisco VPN</comment> <comment xml:lang="sq">Rregullime VPN Cisco</comment> @@ -38285,6 +39550,7 @@ <mime-type type="application/vnd.iccprofile"> <comment>ICC profile</comment> <comment xml:lang="ar">تشكيلة OCL</comment> + <comment xml:lang="ast">Perfil ICC</comment> <comment xml:lang="bg">Цветови профил — OCL</comment> <comment xml:lang="ca">perfil ICC</comment> <comment xml:lang="cs">profil ICC</comment> @@ -38317,14 +39583,14 @@ <comment xml:lang="pt">perfil ICC</comment> <comment xml:lang="pt_BR">Perfil ICC</comment> <comment xml:lang="ro">Profil ICC</comment> - <comment xml:lang="ru">профиль ICC</comment> + <comment xml:lang="ru">Профиль ICC</comment> <comment xml:lang="sk">Profil farieb ICC</comment> <comment xml:lang="sl">Datoteka profila ICC</comment> <comment xml:lang="sr">ИЦЦ профил</comment> <comment xml:lang="sv">ICC-profil</comment> <comment xml:lang="tr">ICC profili</comment> <comment xml:lang="uk">профіль ICC</comment> - <comment xml:lang="zh_CN">ICC 文件</comment> + <comment xml:lang="zh_CN">ICC 配置文件</comment> <comment xml:lang="zh_TW">ICC 設定檔</comment> <magic priority="50"> <match value="acsp" type="string" offset="36"/> @@ -38366,7 +39632,7 @@ <comment xml:lang="pt">ficheiro de calibração de cor IT 8.7</comment> <comment xml:lang="pt_BR">Arquivo de calibração de cor IT 8.7</comment> <comment xml:lang="ro">Fișier de calibrare a culorii IT 8.7</comment> - <comment xml:lang="ru">файл калибровки цвета IT 8.7</comment> + <comment xml:lang="ru">Файл калибровки цвета IT 8.7</comment> <comment xml:lang="sk">Súbor kalibrácie farieb IT 8.7</comment> <comment xml:lang="sl">Umeritvena datoteka barve IT 8.7</comment> <comment xml:lang="sr">ИТ 8.7 датотека калибрације боје</comment> @@ -38394,6 +39660,7 @@ <comment xml:lang="eu">CCMX kolore-kalibrazioaren fitxategia</comment> <comment xml:lang="fi">CCMX-värikorjaustiedosto</comment> <comment xml:lang="fr">fichier de correction colorimétrique CCMX</comment> + <comment xml:lang="ga">comhad ceartúchán dathanna CCMX</comment> <comment xml:lang="gl">Ficheiro de corrección de cor CCMX</comment> <comment xml:lang="he">קובץ תיקון צבע מסוג CCMX</comment> <comment xml:lang="hr">CCMX datotkea ispravka boja</comment> @@ -38409,7 +39676,7 @@ <comment xml:lang="pl">Plik korekcji kolorów CCMX</comment> <comment xml:lang="pt">ficheiro de correção de cor CCMX</comment> <comment xml:lang="pt_BR">Arquivo de correção de cor CCMX</comment> - <comment xml:lang="ru">файл цветовой коррекции CCMX</comment> + <comment xml:lang="ru">Файл цветовой коррекции CCMX</comment> <comment xml:lang="sk">Súbor korekcie farieb CCMX</comment> <comment xml:lang="sl">Datoteka barvne poprave CCMX</comment> <comment xml:lang="sr">ЦЦМИкс датотека поправке боје</comment> @@ -38437,6 +39704,7 @@ <comment xml:lang="eu">WinHelp laguntza fitxategia</comment> <comment xml:lang="fi">WinHelp-ohjetiedosto</comment> <comment xml:lang="fr">fichier d'aide WinHelp</comment> + <comment xml:lang="ga">comhad cabhrach WinHelp</comment> <comment xml:lang="gl">Ficheiro de axuda WinHelp</comment> <comment xml:lang="he">קובץ עזרה מסוג WinHelp</comment> <comment xml:lang="hr">WinHelp datoteka pomoći</comment> @@ -38452,7 +39720,7 @@ <comment xml:lang="pl">Plik pomocy WinHelp</comment> <comment xml:lang="pt">ficheiro de ajuda WinHelp</comment> <comment xml:lang="pt_BR">Arquivo de ajuda WinHelp</comment> - <comment xml:lang="ru">файл справки WinHelp</comment> + <comment xml:lang="ru">Файл справки WinHelp</comment> <comment xml:lang="sk">Súbor Pomocníka WinHelp</comment> <comment xml:lang="sl">Datoteka pomoči WinHelp</comment> <comment xml:lang="sr">датотека помоћи Вин хелпа</comment> @@ -38470,18 +39738,28 @@ <mime-type type="application/x-bsdiff"> <comment>binary differences between files</comment> <comment xml:lang="ca">diferencies binàries entre fitxers</comment> + <comment xml:lang="cs">binární rozdíl mezi soubory</comment> <comment xml:lang="da">binære forskelle mellem filer</comment> <comment xml:lang="de">binäre Unterschiede zwischen Dateien</comment> + <comment xml:lang="en_GB">binary differences between files</comment> <comment xml:lang="es">diferencias entre archivos binarios</comment> + <comment xml:lang="eu">fitxategi binarioen arteko ezberdinstasunak</comment> <comment xml:lang="fr">différences binaires entre fichiers</comment> + <comment xml:lang="ga">difríochtaí dénártha idir comhaid</comment> <comment xml:lang="he">הבדלים בינריים בין קבצים</comment> + <comment xml:lang="hr">Binarne razlike između datoteka</comment> <comment xml:lang="hu">bináris különbségfájl</comment> + <comment xml:lang="id">perbedaan biner antar berkas</comment> + <comment xml:lang="it">Differenze binarie tra file</comment> <comment xml:lang="kk">файлдар арасындағы бинарлық айырмашылықтар</comment> <comment xml:lang="ko">바이너리 차이 비교 파일</comment> <comment xml:lang="pl">Binarna różnica pomiędzy plikami</comment> <comment xml:lang="pt_BR">Diferenças binárias entre arquivos</comment> - <comment xml:lang="ru">двоичные различия между файлами</comment> + <comment xml:lang="ru">Двоичные различия между файлами</comment> <comment xml:lang="sk">Binárne rozdiely medzi súbormi</comment> + <comment xml:lang="sr">бинарне разлике датотека</comment> + <comment xml:lang="sv">binära skillnader mellan filer</comment> + <comment xml:lang="tr">dosyalar arasındaki ikilik farklar</comment> <comment xml:lang="uk">двійкова різниця між файлами</comment> <comment xml:lang="zh_CN">文件的二进制区别</comment> <comment xml:lang="zh_TW">檔案間的二進位差異</comment> @@ -38513,7 +39791,7 @@ <comment xml:lang="ga">grianghraif dhigiteacha</comment> <comment xml:lang="gl">fotos dixitais</comment> <comment xml:lang="he">תמונות דיגיטליות</comment> - <comment xml:lang="hr">digitalne fotografije</comment> + <comment xml:lang="hr">Digitalne fotografije</comment> <comment xml:lang="hu">digitális fényképek</comment> <comment xml:lang="ia">Photos digital</comment> <comment xml:lang="id">foto digital</comment> @@ -38530,7 +39808,7 @@ <comment xml:lang="pt">fotografias digitais</comment> <comment xml:lang="pt_BR">Fotos digitais</comment> <comment xml:lang="ro">fotografii digitale</comment> - <comment xml:lang="ru">цифровые фотографии</comment> + <comment xml:lang="ru">Цифровые фотографии</comment> <comment xml:lang="sk">Digitálne fotografie</comment> <comment xml:lang="sl">digitalne fotografije</comment> <comment xml:lang="sq">Fotografi dixhitale</comment> @@ -38550,6 +39828,7 @@ <comment>Video CD</comment> <comment xml:lang="ar">Video CD</comment> + <comment xml:lang="ast">CD de videu</comment> <comment xml:lang="be@latin">Videa CD</comment> <comment xml:lang="bg">CD — видео</comment> <comment xml:lang="ca">Video CD</comment> @@ -38564,7 +39843,7 @@ <comment xml:lang="fi">Video CD</comment> <comment xml:lang="fo">Video CD</comment> <comment xml:lang="fr">CD vidéo</comment> - <comment xml:lang="ga">Video CD</comment> + <comment xml:lang="ga">dlúthdhiosca físe</comment> <comment xml:lang="gl">Video CD</comment> <comment xml:lang="he">תקליטור וידאו</comment> <comment xml:lang="hr">Video CD</comment> @@ -38584,7 +39863,7 @@ <comment xml:lang="pt">Video CD</comment> <comment xml:lang="pt_BR">CD de vídeo</comment> <comment xml:lang="ro">CD video</comment> - <comment xml:lang="ru">видеодиск VCD</comment> + <comment xml:lang="ru">Видео CD</comment> <comment xml:lang="sk">Video CD</comment> <comment xml:lang="sl">Video CD</comment> <comment xml:lang="sq">CD Video</comment> @@ -38604,6 +39883,7 @@ <comment>Super Video CD</comment> <comment xml:lang="ar">Super Video CD</comment> + <comment xml:lang="ast">CD de Super Video</comment> <comment xml:lang="be@latin">Super Video CD</comment> <comment xml:lang="bg">CD — супер видео</comment> <comment xml:lang="ca">Super Video CD</comment> @@ -38618,7 +39898,7 @@ <comment xml:lang="fi">Super Video CD</comment> <comment xml:lang="fo">Super Video CD</comment> <comment xml:lang="fr">Super VCD</comment> - <comment xml:lang="ga">Super Video CD</comment> + <comment xml:lang="ga">dlúthdhiosca Super Video</comment> <comment xml:lang="gl">Super vídeo CD</comment> <comment xml:lang="he">Super Video CD</comment> <comment xml:lang="hr">Super Video CD</comment> @@ -38638,7 +39918,7 @@ <comment xml:lang="pt">Super Video CD</comment> <comment xml:lang="pt_BR">CD de Super Vídeo (SVCD)</comment> <comment xml:lang="ro">Super Video CD</comment> - <comment xml:lang="ru">компакт-диск Super Video</comment> + <comment xml:lang="ru">Super Video CD</comment> <comment xml:lang="sk">Super Video CD</comment> <comment xml:lang="sl">Super Video CD</comment> <comment xml:lang="sq">CD Super Video</comment> @@ -38658,6 +39938,7 @@ <comment>video DVD</comment> <comment xml:lang="ar">DVD مرئي</comment> + <comment xml:lang="ast">DVD de videu</comment> <comment xml:lang="be@latin">videa DVD</comment> <comment xml:lang="bg">DVD — видео</comment> <comment xml:lang="ca">DVD-Video</comment> @@ -38675,7 +39956,7 @@ <comment xml:lang="ga">DVD físe</comment> <comment xml:lang="gl">DVD de vídeo</comment> <comment xml:lang="he">DVD וידאו</comment> - <comment xml:lang="hr">video DVD</comment> + <comment xml:lang="hr">Video DVD</comment> <comment xml:lang="hu">video DVD</comment> <comment xml:lang="ia">DVD video</comment> <comment xml:lang="id">DVD video</comment> @@ -38693,7 +39974,7 @@ <comment xml:lang="pt">DVD vídeo</comment> <comment xml:lang="pt_BR">DVD de vídeo</comment> <comment xml:lang="ro">DVD video</comment> - <comment xml:lang="ru">видео-DVD</comment> + <comment xml:lang="ru">Видео DVD</comment> <comment xml:lang="sk">DVD-Video</comment> <comment xml:lang="sl">video DVD</comment> <comment xml:lang="sq">DVD video</comment> @@ -38750,7 +40031,7 @@ <comment xml:lang="pt">CD áudio</comment> <comment xml:lang="pt_BR">CD de áudio</comment> <comment xml:lang="ro">CD audio</comment> - <comment xml:lang="ru">звуковой CD</comment> + <comment xml:lang="ru">Аудио CD</comment> <comment xml:lang="sk">Zvukové CD</comment> <comment xml:lang="sl">zvočni CD</comment> <comment xml:lang="sq">CD audio</comment> @@ -38800,7 +40081,7 @@ <comment xml:lang="pt">CD vazio</comment> <comment xml:lang="pt_BR">Disco CD vazio</comment> <comment xml:lang="ro">disc gol CD</comment> - <comment xml:lang="ru">чистый компакт-диск</comment> + <comment xml:lang="ru">Чистый диск CD</comment> <comment xml:lang="sk">Prázdny disk CD</comment> <comment xml:lang="sl">prazen CD disk</comment> <comment xml:lang="sq">Disk bosh CD</comment> @@ -38850,7 +40131,7 @@ <comment xml:lang="pt">DVD vazio</comment> <comment xml:lang="pt_BR">Disco DVD vazio</comment> <comment xml:lang="ro">disc gol DVD</comment> - <comment xml:lang="ru">чистый диск DVD</comment> + <comment xml:lang="ru">Чистый диск DVD</comment> <comment xml:lang="sk">Prázdny disk DVD</comment> <comment xml:lang="sl">prazen DVD disk</comment> <comment xml:lang="sq">Disk bosh DVD</comment> @@ -38900,7 +40181,7 @@ <comment xml:lang="pt">Blu-Ray vazio</comment> <comment xml:lang="pt_BR">Disco Blu-ray vazio</comment> <comment xml:lang="ro">disc gol Blu-ray</comment> - <comment xml:lang="ru">чистый диск Blu-ray</comment> + <comment xml:lang="ru">Чистый диск Blu-ray</comment> <comment xml:lang="sk">Prázdny disk Blu-ray</comment> <comment xml:lang="sl">prazen Blu-Ray disk</comment> <comment xml:lang="sq">Disk bosh Blu-ray</comment> @@ -38950,7 +40231,7 @@ <comment xml:lang="pt">HD DVD vazio</comment> <comment xml:lang="pt_BR">Disco HD DVD vazio</comment> <comment xml:lang="ro">disc gol HD DVD</comment> - <comment xml:lang="ru">чистый диск HD DVD</comment> + <comment xml:lang="ru">Чистый диск HD DVD</comment> <comment xml:lang="sk">Prázdny disk HD DVD</comment> <comment xml:lang="sl">prazen HD DVD disk</comment> <comment xml:lang="sq">Disk bosh DVD HD</comment> @@ -39001,7 +40282,7 @@ <comment xml:lang="pt">DVD áudio</comment> <comment xml:lang="pt_BR">DVD de áudio</comment> <comment xml:lang="ro">DVD audio</comment> - <comment xml:lang="ru">звуковой DVD</comment> + <comment xml:lang="ru">Аудио DVD</comment> <comment xml:lang="sk">Zvukové DVD</comment> <comment xml:lang="sl">zvočni DVD</comment> <comment xml:lang="sq">DVD audio</comment> @@ -39022,6 +40303,7 @@ <comment>Blu-ray video disc</comment> <comment xml:lang="ar">قرص بلو-راي مرئي</comment> + <comment xml:lang="ast">Discu Blu-ray de videu</comment> <comment xml:lang="be@latin">Videadysk Blu-ray</comment> <comment xml:lang="bg">Blu-ray — видео</comment> <comment xml:lang="ca">disc de vídeo Blu-Ray</comment> @@ -39056,7 +40338,7 @@ <comment xml:lang="pt">Blu-ray de vídeo</comment> <comment xml:lang="pt_BR">Disco de vídeo Blu-ray</comment> <comment xml:lang="ro">Disc video Blu-ray</comment> - <comment xml:lang="ru">видеодиск Blu-ray</comment> + <comment xml:lang="ru">Видеодиск Blu-ray</comment> <comment xml:lang="sk">Videodisk Blu-ray</comment> <comment xml:lang="sl">Blu-ray video disk</comment> <comment xml:lang="sq">Disk video Blu-ray</comment> @@ -39077,6 +40359,7 @@ <comment>HD DVD video disc</comment> <comment xml:lang="ar">قرص HD DVD مرئي</comment> + <comment xml:lang="ast">Discu HD DVD de videu</comment> <comment xml:lang="be@latin">Videadysk HD DVD</comment> <comment xml:lang="bg">HD DVD — видео</comment> <comment xml:lang="ca">disc de vídeo HD-DVD</comment> @@ -39110,7 +40393,7 @@ <comment xml:lang="pt">HD DVD de vídeo</comment> <comment xml:lang="pt_BR">Disco de vídeo HD DVD</comment> <comment xml:lang="ro">Disc video HD DVD</comment> - <comment xml:lang="ru">видеодиск HD DVD</comment> + <comment xml:lang="ru">Видеодиск HD DVD</comment> <comment xml:lang="sk">Videodisk HD DVD</comment> <comment xml:lang="sl">HD DVD video disk</comment> <comment xml:lang="sq">Disk video DVD HD</comment> @@ -39142,9 +40425,10 @@ <comment xml:lang="eu">e-book irakurlea</comment> <comment xml:lang="fi">e-kirjan lukulaite</comment> <comment xml:lang="fr">lecteur de livre numérique</comment> + <comment xml:lang="ga">léitheoir r-leabhair</comment> <comment xml:lang="gl">lector de libros electrónicos</comment> <comment xml:lang="he">קורא ספרים אלקטרוניים</comment> - <comment xml:lang="hr">čitač e-knjiga</comment> + <comment xml:lang="hr">Čitač e-knjiga</comment> <comment xml:lang="hu">e-könyvolvasó</comment> <comment xml:lang="ia">Lector de libro electronic</comment> <comment xml:lang="id">Pembaca e-book</comment> @@ -39158,7 +40442,7 @@ <comment xml:lang="pl">Czytnik e-booków</comment> <comment xml:lang="pt">leitor de ebooks</comment> <comment xml:lang="pt_BR">Leitor de e-book</comment> - <comment xml:lang="ru">устройство для чтения электронных книг</comment> + <comment xml:lang="ru">Устройство для чтения электронных книг</comment> <comment xml:lang="sk">Čítačka e-kníh</comment> <comment xml:lang="sl">Bralnik elektronskih knjig</comment> <comment xml:lang="sr">читач ел. књига</comment> @@ -39190,7 +40474,7 @@ <comment xml:lang="fi">Picture CD</comment> <comment xml:lang="fo">Picture CD</comment> <comment xml:lang="fr">CD Picture</comment> - <comment xml:lang="ga">Picture CD</comment> + <comment xml:lang="ga">dlúthdhiosca grianghraf</comment> <comment xml:lang="gl">Picture CD</comment> <comment xml:lang="he">תקליטור תמונות</comment> <comment xml:lang="hr">Slikovni CD</comment> @@ -39246,7 +40530,7 @@ <comment xml:lang="ga">seinnteoir iniompartha fuaime</comment> <comment xml:lang="gl">dispositivo de son portábel</comment> <comment xml:lang="he">נגן מוזיקה נייד</comment> - <comment xml:lang="hr">prenosivi audio svirač</comment> + <comment xml:lang="hr">Prenosivi glazbeni svirač</comment> <comment xml:lang="hu">hordozható zenelejátszó</comment> <comment xml:lang="ia">Lector audio portabile</comment> <comment xml:lang="id">pemutar audio portable</comment> @@ -39263,7 +40547,7 @@ <comment xml:lang="pt">reprodutor áudio portátil</comment> <comment xml:lang="pt_BR">Reprodutor de áudio portátil</comment> <comment xml:lang="ro">player audio portabil</comment> - <comment xml:lang="ru">портативный аудиопроигрыватель</comment> + <comment xml:lang="ru">Портативный аудиопроигрыватель</comment> <comment xml:lang="sk">Prenosný hudobný prehrávač</comment> <comment xml:lang="sl">prenosni predvajalnik zvoka</comment> <comment xml:lang="sq">Lexues audio portativ</comment> @@ -39296,7 +40580,7 @@ <comment xml:lang="ga">bogearraí</comment> <comment xml:lang="gl">software</comment> <comment xml:lang="he">תכנה</comment> - <comment xml:lang="hr">softver</comment> + <comment xml:lang="hr">Softver</comment> <comment xml:lang="hu">szoftver</comment> <comment xml:lang="ia">Software</comment> <comment xml:lang="id">peranti lunak</comment> @@ -39314,7 +40598,7 @@ <comment xml:lang="pt">programa</comment> <comment xml:lang="pt_BR">Aplicativo</comment> <comment xml:lang="ro">software</comment> - <comment xml:lang="ru">программное обеспечение</comment> + <comment xml:lang="ru">Программное обеспечение</comment> <comment xml:lang="sk">Softvér</comment> <comment xml:lang="sl">programska oprema</comment> <comment xml:lang="sq">Software</comment> @@ -39362,7 +40646,7 @@ <comment xml:lang="pt">programa UNIX</comment> <comment xml:lang="pt_BR">Aplicativo UNIX</comment> <comment xml:lang="ro">Software UNIX</comment> - <comment xml:lang="ru">программа UNIX</comment> + <comment xml:lang="ru">Программа UNIX</comment> <comment xml:lang="sk">Softvér UNIX</comment> <comment xml:lang="sl">Programska datoteka UNIX</comment> <comment xml:lang="sr">ЈУНИКС-ов софтвер</comment> @@ -39414,7 +40698,7 @@ <comment xml:lang="pt">programa Windows</comment> <comment xml:lang="pt_BR">Programa do Windows</comment> <comment xml:lang="ro">Software Windows</comment> - <comment xml:lang="ru">программа Windows</comment> + <comment xml:lang="ru">Программа Windows</comment> <comment xml:lang="sk">Softvér Windows</comment> <comment xml:lang="sl">Programska oprema za okolje Windows</comment> <comment xml:lang="sr">Виндоузов софтвер</comment> @@ -39430,9 +40714,9 @@ </treemagic> </mime-type> - <mime-type type="application/x-trig"> - + <mime-type type="application/trig"> <comment>TriG RDF document</comment> + <comment xml:lang="ast">Documentu RDF TriG</comment> <comment xml:lang="ca">document TriG RDF</comment> <comment xml:lang="cs">dokument Trig RDF</comment> <comment xml:lang="da">TriG RDF-dokument</comment> @@ -39443,6 +40727,7 @@ <comment xml:lang="eu">TriG RDF dokumentua</comment> <comment xml:lang="fi">TriG RDF -asiakirja</comment> <comment xml:lang="fr">document RDF TriG</comment> + <comment xml:lang="ga">cáipéis RDF TriG</comment> <comment xml:lang="gl">Documento RDF TriG</comment> <comment xml:lang="he">מסמך RDF של TriG</comment> <comment xml:lang="hr">TriG RDF dokument</comment> @@ -39469,6 +40754,7 @@ <expanded-acronym>TriG RDF Graph Triple Language</expanded-acronym> <sub-class-of type="text/plain"/> <glob pattern="*.trig"/> + <alias type="application/x-trig"/> </mime-type> <mime-type type="application/x-iwork-keynote-sffkey"> @@ -39483,6 +40769,7 @@ <comment xml:lang="eu">Apple Keynote 5 aurkezpena</comment> <comment xml:lang="fi">Apple Keynote 5 -esitys</comment> <comment xml:lang="fr">présentation Apple Keynote 5</comment> + <comment xml:lang="ga">láithreoireacht Apple Keynote 5</comment> <comment xml:lang="gl">Presentación de Apple Keynote 5</comment> <comment xml:lang="he">מצגת Apple Keynote 5</comment> <comment xml:lang="hr">Apple Keynote 5 prezentacija</comment> @@ -39528,6 +40815,7 @@ <comment xml:lang="eu">Adobe PageMaker</comment> <comment xml:lang="fi">Adobe PageMaker</comment> <comment xml:lang="fr">Adobe PageMaker</comment> + <comment xml:lang="ga">Adobe PageMaker</comment> <comment xml:lang="gl">Adobe PageMaker</comment> <comment xml:lang="he">Adobe PageMaker</comment> <comment xml:lang="hr">Adobe PageMaker</comment> @@ -39568,6 +40856,7 @@ <comment xml:lang="es">WAD de Doom</comment> <comment xml:lang="eu">Doom WAD</comment> <comment xml:lang="fr">WAD Doom</comment> + <comment xml:lang="ga">WAD Doom</comment> <comment xml:lang="hr">Doom WAD</comment> <comment xml:lang="hu">Doom WAD</comment> <comment xml:lang="ia">WAD pro Doom</comment> @@ -39608,6 +40897,7 @@ <comment xml:lang="eu">Amiga disko irudia</comment> <comment xml:lang="fi">Amiga-levytiedosto</comment> <comment xml:lang="fr">image disque Amiga</comment> + <comment xml:lang="ga">íomhá diosca Amiga</comment> <comment xml:lang="he">דמות כונן Amiga</comment> <comment xml:lang="hr">Amiga slika diska</comment> <comment xml:lang="hu">Amiga lemezkép</comment> @@ -39615,18 +40905,18 @@ <comment xml:lang="id">Image disk Amiga</comment> <comment xml:lang="it">Disco immagine Amiga</comment> <comment xml:lang="kk">Amiga диск бейнесі</comment> - <comment xml:lang="ko">아미가 디스크 이미지</comment> + <comment xml:lang="ko">Amiga 디스크 이미지</comment> <comment xml:lang="oc">imatge disc Amiga</comment> <comment xml:lang="pl">Obraz dysku Amiga</comment> <comment xml:lang="pt">imagem de disco Amiga</comment> <comment xml:lang="pt_BR">Imagem de disco Amiga</comment> - <comment xml:lang="ru">образ диска Amiga</comment> + <comment xml:lang="ru">Образ диска Amiga</comment> <comment xml:lang="sk">Obraz disku Amiga</comment> <comment xml:lang="sr">слика диска Амиге</comment> <comment xml:lang="sv">Amiga-diskavbild</comment> <comment xml:lang="tr">Amiga disk kalıbı</comment> <comment xml:lang="uk">образ диска Amiga</comment> - <comment xml:lang="zh_CN">Amiga 磁盘镜像</comment> + <comment xml:lang="zh_CN">Amiga 磁盘映像</comment> <comment xml:lang="zh_TW">Amiga 磁碟映像檔</comment> <magic priority="50"> <match value="DOS\x00" type="string" offset="0"/> @@ -39637,19 +40927,31 @@ <mime-type type="application/vnd.flatpak"> <comment>Flatpak application bundle</comment> <comment xml:lang="ca">paquet d'aplicació Flatpak</comment> + <comment xml:lang="cs">balíček Flatpak s aplikací</comment> <comment xml:lang="da">Flatpak-programsamling</comment> <comment xml:lang="de">Flatpak-Anwendungspaket</comment> + <comment xml:lang="en_GB">Flatpak application bundle</comment> <comment xml:lang="es">paquete de aplicación Flatpak</comment> + <comment xml:lang="eu">Flatpak aplikazio bilduma</comment> + <comment xml:lang="fi">Flatpak-sovelluspaketti</comment> <comment xml:lang="fr">lot applicatif Flatpak</comment> + <comment xml:lang="ga">burla feidhmchláir Flatpak</comment> + <comment xml:lang="he">חבילת יישומי Flatpak</comment> + <comment xml:lang="hr">Flatpak paket aplikacije</comment> <comment xml:lang="hu">Flatpak alkalmazáscsomag</comment> + <comment xml:lang="id">bundel aplikasi Flatpak</comment> + <comment xml:lang="it">Bundle applicazione Flatpak</comment> <comment xml:lang="kk">Flatpak қолданбалар дестесі</comment> <comment xml:lang="ko">Flatpak 프로그램 번들</comment> <comment xml:lang="pl">Pakiet programu Flatpak</comment> <comment xml:lang="pt_BR">Pacote de aplicativo Flatpak</comment> - <comment xml:lang="ru">пакет приложений Flatpak</comment> + <comment xml:lang="ru">Пакет приложения Flatpak</comment> <comment xml:lang="sk">Balík aplikácií Flatpak</comment> + <comment xml:lang="sr">скуп програма Флатпака</comment> + <comment xml:lang="sv">Flatpak-programbunt</comment> + <comment xml:lang="tr">Flatpak uygulama paketi</comment> <comment xml:lang="uk">пакунок із програмами Flatpak</comment> - <comment xml:lang="zh_CN">Flatpak 应用包</comment> + <comment xml:lang="zh_CN">Flatpak 应用组合包</comment> <comment xml:lang="zh_TW">Flatpak 應用程式套組</comment> <generic-icon name="package-x-generic"/> <magic priority="50"> @@ -39664,17 +40966,29 @@ <mime-type type="application/vnd.flatpak.repo"> <comment>Flatpak repository description</comment> <comment xml:lang="ca">descripció de dipòsit de Flatpak</comment> + <comment xml:lang="cs">popis repozitáře Flatpak</comment> <comment xml:lang="da">Flatpak-arkivbeskrivelse</comment> <comment xml:lang="de">Flatpak-Repositoriumsbeschreibung</comment> + <comment xml:lang="en_GB">Flatpak repository description</comment> <comment xml:lang="es">descripción de repositorio de Flatpak</comment> + <comment xml:lang="eu">Flatpak biltegi deskribapena</comment> + <comment xml:lang="fi">Flatpak-ohjelmistolähdekuvaus</comment> <comment xml:lang="fr">description de dépôt Flatpak</comment> + <comment xml:lang="ga">cur síos ar stórlann Flatpak</comment> + <comment xml:lang="he">תיאור מאגר Flatpak</comment> + <comment xml:lang="hr">Flatpak opis repozitorija</comment> <comment xml:lang="hu">Flatpak tárolóleírás</comment> + <comment xml:lang="id">deskripsi repositori Flatpak</comment> + <comment xml:lang="it">Descrizione repository Flatpack</comment> <comment xml:lang="kk">Flatpak репозиторийі сипаттамасы</comment> <comment xml:lang="ko">Flatpak 저장소 디스크립션</comment> <comment xml:lang="pl">Opis repozytorium Flatpak</comment> <comment xml:lang="pt_BR">Descrição de repositório Flatpak</comment> - <comment xml:lang="ru">описание репозитория Flatpak</comment> + <comment xml:lang="ru">Описание репозитория Flatpak</comment> <comment xml:lang="sk">Popis repozitára Flatpak</comment> + <comment xml:lang="sr">опис ризнице Флатпака</comment> + <comment xml:lang="sv">Flatpak-förrådsbeskrivning</comment> + <comment xml:lang="tr">Flatpak depo açıklaması</comment> <comment xml:lang="uk">опис сховища Flatpak</comment> <comment xml:lang="zh_CN">Flatpak 软件库描述</comment> <comment xml:lang="zh_TW">Flatpak 軟體庫描述</comment> @@ -39688,6 +41002,31 @@ <mime-type type="application/vnd.flatpak.ref"> <comment>Flatpak repository reference</comment> + <comment xml:lang="ca">referència de dipòsit Flatpak</comment> + <comment xml:lang="cs">odkaz na repozitář Flatpak</comment> + <comment xml:lang="de">Flatpak-Repositoriumsreferenz</comment> + <comment xml:lang="en_GB">Flatpak repository reference</comment> + <comment xml:lang="es">referencia a repositorio de Flatpak</comment> + <comment xml:lang="eu">Flatpak biltegi erreferentzia</comment> + <comment xml:lang="fi">Flatpak-ohjelmistolähdeviite</comment> + <comment xml:lang="fr">référence de dépôt Flatpak</comment> + <comment xml:lang="ga">tagairt do stórlann Flatpak</comment> + <comment xml:lang="hr">Flatpak preporučeni repozitorij</comment> + <comment xml:lang="hu">Flatpak tárolóhivatkozás</comment> + <comment xml:lang="id">acuan repositori Flatpak</comment> + <comment xml:lang="it">Riferimento repository Flatpack</comment> + <comment xml:lang="kk">Flatpak репозиторийіне сілтеме</comment> + <comment xml:lang="ko">Flatpak 저장소 참조</comment> + <comment xml:lang="pl">Odwołanie do repozytorium Flatpak</comment> + <comment xml:lang="pt_BR">Referência de repositório Flatpak</comment> + <comment xml:lang="ru">Ссылка на репозиторий Flatpak</comment> + <comment xml:lang="sk">Referencia repozitára Flatpak</comment> + <comment xml:lang="sr">упута ризнице Флатпака</comment> + <comment xml:lang="sv">Flatpak-förrådsreferens</comment> + <comment xml:lang="tr">Flatpak depo başvurusu</comment> + <comment xml:lang="uk">посилання на сховище Flatpak</comment> + <comment xml:lang="zh_CN">Flatpak 软件库引用</comment> + <comment xml:lang="zh_TW">Flatpak 軟體庫參照</comment> <generic-icon name="package-x-generic"/> <sub-class-of type="text/plain"/> <magic priority="50"> @@ -39699,18 +41038,29 @@ <mime-type type="application/vnd.squashfs"> <comment>Squashfs filesystem</comment> <comment xml:lang="ca">Sistema de fitxers Squashfs</comment> + <comment xml:lang="cs">souborový systém Squashfs</comment> <comment xml:lang="da">Squashfs-filsystem</comment> <comment xml:lang="de">Squashfs-Dateisystem</comment> + <comment xml:lang="en_GB">Squashfs filesystem</comment> <comment xml:lang="es">sistema de archivos Squashfs</comment> + <comment xml:lang="eu">Squashfs fitxategi sistema</comment> + <comment xml:lang="fi">Squashfs-tiedostojärjestelmä</comment> <comment xml:lang="fr">système de fichiers Squashfs</comment> + <comment xml:lang="ga">córas comhad Squashfs</comment> <comment xml:lang="he">מערכת קבצים Squashfs</comment> + <comment xml:lang="hr">Squashfs datotečni sustav</comment> <comment xml:lang="hu">Squashfs fájlrendszer</comment> + <comment xml:lang="id">sistem berkas Squashfs</comment> + <comment xml:lang="it">File system squashfs</comment> <comment xml:lang="kk">Squashfs файлдық жүйесі</comment> <comment xml:lang="ko">Squashfs 파일 시스템</comment> <comment xml:lang="pl">System plików SquashFS</comment> <comment xml:lang="pt_BR">Sistema de arquivos Squashfs</comment> - <comment xml:lang="ru">файловая система Squashfs</comment> + <comment xml:lang="ru">Файловая система Squashfs</comment> <comment xml:lang="sk">Systém súborov Squashfs</comment> + <comment xml:lang="sr">систем датотека Сквошфс</comment> + <comment xml:lang="sv">Squashfs-filsystem</comment> + <comment xml:lang="tr">Squashfs dosya sistemi</comment> <comment xml:lang="uk">файлова система squashfs</comment> <comment xml:lang="zh_CN">Squashfs 文件系统</comment> <comment xml:lang="zh_TW">Squashfs 檔案系統</comment> @@ -39721,21 +41071,77 @@ <glob pattern="*.sqsh"/> </mime-type> + + <mime-type type="application/vnd.appimage"> + <comment>AppImage application bundle</comment> + <comment xml:lang="ca">paquet d'aplicació AppImage</comment> + <comment xml:lang="cs">balíček AppImage s aplikací</comment> + <comment xml:lang="da">Applmage-programsamling</comment> + <comment xml:lang="de">AppImage-Anwendungspaket</comment> + <comment xml:lang="en_GB">AppImage application bundle</comment> + <comment xml:lang="es">paquete de aplicación AppImage</comment> + <comment xml:lang="eu">AppImage aplikazio bilduma</comment> + <comment xml:lang="fi">AppImage-sovelluspaketti</comment> + <comment xml:lang="fr">lot applicatif AppImage</comment> + <comment xml:lang="ga">burla feidhmchláir AppImage</comment> + <comment xml:lang="he">חבילת יישומי AppImage</comment> + <comment xml:lang="hr">AppImage paket aplikacije</comment> + <comment xml:lang="hu">AppImage alkalmazáscsomag</comment> + <comment xml:lang="id">bundel aplikasi AppImage</comment> + <comment xml:lang="it">Bundle applicazione AppImage</comment> + <comment xml:lang="kk">AppImage қолданбалар дестесі</comment> + <comment xml:lang="ko">AppImage 프로그램 번들</comment> + <comment xml:lang="pl">Pakiet programu AppImage</comment> + <comment xml:lang="pt_BR">Pacote de aplicativo AppImage</comment> + <comment xml:lang="ru">Пакет приложения AppImage</comment> + <comment xml:lang="sk">Balík aplikácií AppImage</comment> + <comment xml:lang="sr">скуп програма Ап-слике</comment> + <comment xml:lang="sv">AppImage-programbunt</comment> + <comment xml:lang="tr">AppImage uygulama paketi</comment> + <comment xml:lang="uk">пакунок із програмами AppImage</comment> + <comment xml:lang="zh_CN">AppImage 应用组合包</comment> + <comment xml:lang="zh_TW">AppImage 應用程式套組</comment> + <sub-class-of type="application/x-executable"/> + <sub-class-of type="application/vnd.squashfs"/> + <generic-icon name="application-x-executable"/> + <magic priority="50"> + <match value="ELF" type="string" offset="1"> + <match value="0x41" type="byte" offset="8"> + <match value="0x49" type="byte" offset="9"> + <match value="0x02" type="byte" offset="10"/> + </match> + </match> + </match> + </magic> + <glob weight="60" pattern="*.appimage"/> + </mime-type> + <mime-type type="application/vnd.snap"> <comment>Snap package</comment> <comment xml:lang="ca">Paquet Snap</comment> + <comment xml:lang="cs">balíček Snap</comment> <comment xml:lang="da">Snap-pakke</comment> <comment xml:lang="de">Snap-Paket</comment> + <comment xml:lang="en_GB">Snap package</comment> <comment xml:lang="es">paquete Snap</comment> + <comment xml:lang="eu">Snap paketea</comment> + <comment xml:lang="fi">Snap-paketti</comment> <comment xml:lang="fr">paquet Snap</comment> + <comment xml:lang="ga">pacáiste Snap</comment> <comment xml:lang="he">חבילת Snap</comment> + <comment xml:lang="hr">Snap paket</comment> <comment xml:lang="hu">Snap-csomag</comment> + <comment xml:lang="id">paket Snap</comment> + <comment xml:lang="it">Pacchetto snap</comment> <comment xml:lang="kk">Snap дестесі</comment> <comment xml:lang="ko">Snap 패키지</comment> <comment xml:lang="pl">Pakiet Snap</comment> <comment xml:lang="pt_BR">Pacote Snap</comment> - <comment xml:lang="ru">пакет Snap</comment> + <comment xml:lang="ru">Пакет Snap</comment> <comment xml:lang="sk">Balík Snap</comment> + <comment xml:lang="sr">Снап пакет</comment> + <comment xml:lang="sv">Snap-paket</comment> + <comment xml:lang="tr">Snap paketi</comment> <comment xml:lang="uk">пакунок snap</comment> <comment xml:lang="zh_CN">Snap 软件包</comment> <comment xml:lang="zh_TW">Snap 軟體包</comment> @@ -39743,4 +41149,85 @@ <sub-class-of type="application/vnd.squashfs"/> </mime-type> + + <mime-type type="model/stl"> + <comment>STL 3D model</comment> + <acronym>STL</acronym> + <expanded-acronym>StereoLithography</expanded-acronym> + <magic priority="50"> + <match value="solid" type="string" offset="0"/> + <match value="SOLID" type="string" offset="0"/> + </magic> + <glob pattern="*.stl"/> + <alias type="model/x.stl-ascii"/> + <alias type="model/x.stl-binary"/> + </mime-type> + + <mime-type type="text/x.gcode"> + <comment>G-code file</comment> + <comment xml:lang="ca">fitxer G-code</comment> + <comment xml:lang="cs">soubor G-code</comment> + <comment xml:lang="de">G-Code-Datei</comment> + <comment xml:lang="en_GB">G-code file</comment> + <comment xml:lang="es">archivo G-code</comment> + <comment xml:lang="eu">G-code fitxategia</comment> + <comment xml:lang="fi">G-code-tiedosto</comment> + <comment xml:lang="fr">fichier G-code</comment> + <comment xml:lang="ga">comhad G-code</comment> + <comment xml:lang="hr">G-kôd datoteka</comment> + <comment xml:lang="hu">G-code fájl</comment> + <comment xml:lang="id">berkas G-code</comment> + <comment xml:lang="it">File G-code</comment> + <comment xml:lang="kk">G-code файлы</comment> + <comment xml:lang="ko">지-코드 파일</comment> + <comment xml:lang="pl">Plik G-code</comment> + <comment xml:lang="pt_BR">Arquivo G-code</comment> + <comment xml:lang="ru">Файл G-code</comment> + <comment xml:lang="sk">Súbor G-code</comment> + <comment xml:lang="sr">датотека Г-ко̂да</comment> + <comment xml:lang="sv">G-code-fil</comment> + <comment xml:lang="tr">G-code dosyası</comment> + <comment xml:lang="uk">файл G-code</comment> + <comment xml:lang="zh_CN">G-code 文件</comment> + <comment xml:lang="zh_TW">G-code 檔案</comment> + <sub-class-of type="text/plain"/> + <generic-icon name="text-x-generic"/> + <glob pattern="*.gcode"/> + </mime-type> + + <mime-type type="application/x-fds-disk"> + <comment>Nintendo FDS disk image</comment> + <comment xml:lang="ca">Imatge de disc Nintendo FDS</comment> + <comment xml:lang="cs">obraz disku pro Nintendo FDS</comment> + <comment xml:lang="de">Nintendo-FDS-Datenträgerabbild</comment> + <comment xml:lang="en_GB">Nintendo FDS disk image</comment> + <comment xml:lang="es">imagen de disco FDS de Nintendo</comment> + <comment xml:lang="eu">Nintendo FDS disko irudia</comment> + <comment xml:lang="fi">Nintendo FDS -levykuva</comment> + <comment xml:lang="fr">image disque Nintendo FDS</comment> + <comment xml:lang="ga">íomhá diosca Nintendo FDS</comment> + <comment xml:lang="hr">Nintendo FDS slika diska</comment> + <comment xml:lang="hu">Nintendo FDS lemezkép</comment> + <comment xml:lang="id">image disk Nintendo FDS</comment> + <comment xml:lang="it">Immagine disco Nintendo FDS</comment> + <comment xml:lang="kk">Nintendo FDS диск бейнесі</comment> + <comment xml:lang="ko">닌텐도 FDS 디스크 이미지</comment> + <comment xml:lang="pl">Obraz dysku Nintendo FDS</comment> + <comment xml:lang="pt_BR">Imagem de disco Nintendo FDS</comment> + <comment xml:lang="ru">Образ диска Nintendo FDS</comment> + <comment xml:lang="sk">Obraz disku Nintendo FDS</comment> + <comment xml:lang="sr">Нинтендо ФДС слика диска</comment> + <comment xml:lang="sv">Nintendo FDS-diskavbild</comment> + <comment xml:lang="tr">Nintendo FDS disk kalıbı</comment> + <comment xml:lang="uk">образ диска FDS Nintendo</comment> + <comment xml:lang="zh_CN">任天堂 FDS 磁盘映像</comment> + <comment xml:lang="zh_TW">Nintendo FDS 磁碟映像檔</comment> + <acronym>FDS</acronym> + <expanded-acronym>Famicom Disk System</expanded-acronym> + <glob pattern="*.fds"/> + <magic> + <match value="*NINTENDO-HVC*" type="string" offset="1"/> + </magic> + </mime-type> + </mime-info> diff --git a/src/corelib/mimetypes/mimetypes.pri b/src/corelib/mimetypes/mimetypes.pri index 870b6c65a5..62bbe348e4 100644 --- a/src/corelib/mimetypes/mimetypes.pri +++ b/src/corelib/mimetypes/mimetypes.pri @@ -21,5 +21,5 @@ qtConfig(mimetype) { mimetypes/qmimeglobpattern.cpp \ mimetypes/qmimeprovider.cpp - RESOURCES += mimetypes/mimetypes.qrc + qtConfig(mimetype-database): RESOURCES += mimetypes/mimetypes.qrc } diff --git a/src/corelib/mimetypes/mimetypes.qrc b/src/corelib/mimetypes/mimetypes.qrc index 19bc1d3e2a..4720bd302a 100644 --- a/src/corelib/mimetypes/mimetypes.qrc +++ b/src/corelib/mimetypes/mimetypes.qrc @@ -1,5 +1,5 @@ <RCC> <qresource prefix="/qt-project.org/qmime/packages"> - <file alias="freedesktop.org.xml">mime/packages/freedesktop.org.xml</file> + <file alias="freedesktop.org.xml" compression-algorithm="best">mime/packages/freedesktop.org.xml</file> </qresource> </RCC> diff --git a/src/corelib/mimetypes/qmimedatabase.cpp b/src/corelib/mimetypes/qmimedatabase.cpp index bfe9be559a..24a7a35ea5 100644 --- a/src/corelib/mimetypes/qmimedatabase.cpp +++ b/src/corelib/mimetypes/qmimedatabase.cpp @@ -74,7 +74,6 @@ QMimeDatabasePrivate::QMimeDatabasePrivate() QMimeDatabasePrivate::~QMimeDatabasePrivate() { - qDeleteAll(m_providers); } #ifdef QT_BUILD_INTERNAL @@ -107,52 +106,52 @@ void QMimeDatabasePrivate::loadProviders() mimeDirs.prepend(QLatin1String(":/qt-project.org/qmime")); //qDebug() << "mime dirs:" << mimeDirs; - QVector<QMimeProviderBase *> currentProviders = m_providers; - m_providers.clear(); + Providers currentProviders; + std::swap(m_providers, currentProviders); m_providers.reserve(mimeDirs.size()); for (const QString &mimeDir : qAsConst(mimeDirs)) { const QString cacheFile = mimeDir + QStringLiteral("/mime.cache"); QFileInfo fileInfo(cacheFile); // Check if we already have a provider for this dir - const auto it = std::find_if(currentProviders.begin(), currentProviders.end(), [mimeDir](QMimeProviderBase *prov) { return prov->directory() == mimeDir; }); + const auto predicate = [mimeDir](const std::unique_ptr<QMimeProviderBase> &prov) + { + return prov && prov->directory() == mimeDir; + }; + const auto it = std::find_if(currentProviders.begin(), currentProviders.end(), predicate); if (it == currentProviders.end()) { - QMimeProviderBase *provider = nullptr; + std::unique_ptr<QMimeProviderBase> provider; #if defined(QT_USE_MMAP) if (qEnvironmentVariableIsEmpty("QT_NO_MIME_CACHE") && fileInfo.exists()) { - provider = new QMimeBinaryProvider(this, mimeDir); + provider.reset(new QMimeBinaryProvider(this, mimeDir)); //qDebug() << "Created binary provider for" << mimeDir; if (!provider->isValid()) { - delete provider; - provider = nullptr; + provider.reset(); } } #endif if (!provider) { - provider = new QMimeXMLProvider(this, mimeDir); + provider.reset(new QMimeXMLProvider(this, mimeDir)); //qDebug() << "Created XML provider for" << mimeDir; } - m_providers.append(provider); + m_providers.push_back(std::move(provider)); } else { - QMimeProviderBase *provider = *it; - currentProviders.erase(it); + auto provider = std::move(*it); // take provider out of the vector provider->ensureLoaded(); if (!provider->isValid()) { - delete provider; - provider = new QMimeXMLProvider(this, mimeDir); + provider.reset(new QMimeXMLProvider(this, mimeDir)); //qDebug() << "Created XML provider to replace binary provider for" << mimeDir; } - m_providers.append(provider); + m_providers.push_back(std::move(provider)); } } - qDeleteAll(currentProviders); } -QVector<QMimeProviderBase *> QMimeDatabasePrivate::providers() +const QMimeDatabasePrivate::Providers &QMimeDatabasePrivate::providers() { #ifndef Q_OS_WASM // stub implementation always returns true Q_ASSERT(!mutex.tryLock()); // caller should have locked mutex #endif - if (m_providers.isEmpty()) { + if (m_providers.empty()) { loadProviders(); m_lastCheck.start(); } else { @@ -164,8 +163,7 @@ QVector<QMimeProviderBase *> QMimeDatabasePrivate::providers() QString QMimeDatabasePrivate::resolveAlias(const QString &nameOrAlias) { - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { const QString ret = provider->resolveAlias(nameOrAlias); if (!ret.isEmpty()) return ret; @@ -179,9 +177,8 @@ QString QMimeDatabasePrivate::resolveAlias(const QString &nameOrAlias) */ QMimeType QMimeDatabasePrivate::mimeTypeForName(const QString &nameOrAlias) { - const auto allProviders = providers(); const QString mimeName = resolveAlias(nameOrAlias); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { const QMimeType mime = provider->mimeTypeForName(mimeName); if (mime.isValid()) return mime; @@ -205,8 +202,7 @@ QMimeGlobMatchResult QMimeDatabasePrivate::findByFileName(const QString &fileNam { QMimeGlobMatchResult result; // TODO this parses in the order (local, global). Check that it handles "NOGLOBS" correctly. - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addFileNameMatches(fileName, result); return result; } @@ -227,8 +223,7 @@ void QMimeDatabasePrivate::loadGenericIcon(QMimeTypePrivate &mimePrivate) QMutexLocker locker(&mutex); if (mimePrivate.fromCache) { mimePrivate.genericIconName.clear(); - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { provider->loadGenericIcon(mimePrivate); if (!mimePrivate.genericIconName.isEmpty()) break; @@ -241,8 +236,7 @@ void QMimeDatabasePrivate::loadIcon(QMimeTypePrivate &mimePrivate) QMutexLocker locker(&mutex); if (mimePrivate.fromCache) { mimePrivate.iconName.clear(); - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) { + for (const auto &provider : providers()) { provider->loadIcon(mimePrivate); if (!mimePrivate.iconName.isEmpty()) break; @@ -276,8 +270,7 @@ QStringList QMimeDatabasePrivate::parents(const QString &mimeName) { Q_ASSERT(!mutex.tryLock()); QStringList result; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addParents(mimeName, result); if (result.isEmpty()) { const QString parent = fallbackParent(mimeName); @@ -291,8 +284,7 @@ QStringList QMimeDatabasePrivate::listAliases(const QString &mimeName) { QMutexLocker locker(&mutex); QStringList result; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addAliases(mimeName, result); return result; } @@ -331,8 +323,7 @@ QMimeType QMimeDatabasePrivate::findByData(const QByteArray &data, int *accuracy *accuracyPtr = 0; QMimeType candidate; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->findByMagic(data, accuracyPtr, candidate); if (candidate.isValid()) @@ -414,8 +405,7 @@ QMimeType QMimeDatabasePrivate::mimeTypeForFileNameAndData(const QString &fileNa QList<QMimeType> QMimeDatabasePrivate::allMimeTypes() { QList<QMimeType> result; - const auto allProviders = providers(); - for (QMimeProviderBase *provider : allProviders) + for (const auto &provider : providers()) provider->addAllMimeTypes(result); return result; } @@ -432,7 +422,7 @@ bool QMimeDatabasePrivate::inherits(const QString &mime, const QString &parent) toCheck.pop(); const auto parentList = parents(mimeName); for (const QString &par : parentList) - toCheck.push(par); + toCheck.push(resolveAlias(par)); } return false; } diff --git a/src/corelib/mimetypes/qmimedatabase_p.h b/src/corelib/mimetypes/qmimedatabase_p.h index 1e605d9a24..d9cf446d44 100644 --- a/src/corelib/mimetypes/qmimedatabase_p.h +++ b/src/corelib/mimetypes/qmimedatabase_p.h @@ -63,6 +63,8 @@ QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qmutex.h> #include <QtCore/qvector.h> +#include <memory> + QT_BEGIN_NAMESPACE class QIODevice; @@ -72,7 +74,7 @@ class QMimeProviderBase; class QMimeDatabasePrivate { public: - Q_DISABLE_COPY(QMimeDatabasePrivate) + Q_DISABLE_COPY_MOVE(QMimeDatabasePrivate) QMimeDatabasePrivate(); ~QMimeDatabasePrivate(); @@ -102,11 +104,12 @@ public: bool mimeInherits(const QString &mime, const QString &parent); private: - QVector<QMimeProviderBase *> providers(); + using Providers = std::vector<std::unique_ptr<QMimeProviderBase>>; + const Providers &providers(); bool shouldCheck(); void loadProviders(); - mutable QVector<QMimeProviderBase *> m_providers; + mutable Providers m_providers; QElapsedTimer m_lastCheck; public: diff --git a/src/corelib/mimetypes/qmimeglobpattern.cpp b/src/corelib/mimetypes/qmimeglobpattern.cpp index cd42b4da83..ad78cd9ffa 100644 --- a/src/corelib/mimetypes/qmimeglobpattern.cpp +++ b/src/corelib/mimetypes/qmimeglobpattern.cpp @@ -39,7 +39,9 @@ #include "qmimeglobpattern_p.h" -#include <QRegExp> +#if QT_CONFIG(regularexpression) +#include <QRegularExpression> +#endif #include <QStringList> #include <QDebug> @@ -142,8 +144,12 @@ bool QMimeGlobPattern::matchFileName(const QString &inputFilename) const return (m_pattern == filename); // Other (quite rare) patterns, like "*.anim[1-9j]": use slow but correct method - QRegExp rx(m_pattern, Qt::CaseSensitive, QRegExp::WildcardUnix); - return rx.exactMatch(filename); +#if QT_CONFIG(regularexpression) + QRegularExpression rx(QRegularExpression::wildcardToRegularExpression(m_pattern)); + return rx.match(filename).hasMatch(); +#else + return false; +#endif } static bool isFastPattern(const QString &pattern) diff --git a/src/corelib/mimetypes/qmimeglobpattern_p.h b/src/corelib/mimetypes/qmimeglobpattern_p.h index bb6f64320b..cf27d6ab30 100644 --- a/src/corelib/mimetypes/qmimeglobpattern_p.h +++ b/src/corelib/mimetypes/qmimeglobpattern_p.h @@ -88,7 +88,7 @@ public: { } - void swap(QMimeGlobPattern &other) Q_DECL_NOTHROW + void swap(QMimeGlobPattern &other) noexcept { qSwap(m_pattern, other.m_pattern); qSwap(m_mimeType, other.m_mimeType); diff --git a/src/corelib/mimetypes/qmimemagicrule_p.h b/src/corelib/mimetypes/qmimemagicrule_p.h index 6962a6ca59..5091d483b6 100644 --- a/src/corelib/mimetypes/qmimemagicrule_p.h +++ b/src/corelib/mimetypes/qmimemagicrule_p.h @@ -69,7 +69,7 @@ public: QMimeMagicRule(const QString &typeStr, const QByteArray &value, const QString &offsets, const QByteArray &mask, QString *errorString); - void swap(QMimeMagicRule &other) Q_DECL_NOTHROW + void swap(QMimeMagicRule &other) noexcept { qSwap(m_type, other.m_type); qSwap(m_value, other.m_value); diff --git a/src/corelib/mimetypes/qmimemagicrulematcher_p.h b/src/corelib/mimetypes/qmimemagicrulematcher_p.h index 5e74e2e3fc..fe714987e6 100644 --- a/src/corelib/mimetypes/qmimemagicrulematcher_p.h +++ b/src/corelib/mimetypes/qmimemagicrulematcher_p.h @@ -66,7 +66,7 @@ class QMimeMagicRuleMatcher public: explicit QMimeMagicRuleMatcher(const QString &mime, unsigned priority = 65535); - void swap(QMimeMagicRuleMatcher &other) Q_DECL_NOTHROW + void swap(QMimeMagicRuleMatcher &other) noexcept { qSwap(m_list, other.m_list); qSwap(m_priority, other.m_priority); diff --git a/src/corelib/mimetypes/qmimeprovider.cpp b/src/corelib/mimetypes/qmimeprovider.cpp index aac51184a4..a3a6b9615c 100644 --- a/src/corelib/mimetypes/qmimeprovider.cpp +++ b/src/corelib/mimetypes/qmimeprovider.cpp @@ -54,7 +54,9 @@ static void initResources() { +#if QT_CONFIG(mimetype_database) Q_INIT_RESOURCE(mimetypes); +#endif } QT_BEGIN_NAMESPACE @@ -445,10 +447,10 @@ void QMimeBinaryProvider::addAllMimeTypes(QList<QMimeType> &result) loadMimeTypeList(); if (result.isEmpty()) { result.reserve(m_mimetypeNames.count()); - for (const QString &name : m_mimetypeNames) + for (const QString &name : qAsConst(m_mimetypeNames)) result.append(mimeTypeForNameUnchecked(name)); } else { - for (const QString &name : m_mimetypeNames) + for (const QString &name : qAsConst(m_mimetypeNames)) if (std::find_if(result.constBegin(), result.constEnd(), [name](const QMimeType &mime) -> bool { return mime.name() == name; }) == result.constEnd()) result.append(mimeTypeForNameUnchecked(name)); @@ -458,6 +460,7 @@ void QMimeBinaryProvider::addAllMimeTypes(QList<QMimeType> &result) void QMimeBinaryProvider::loadMimeTypePrivate(QMimeTypePrivate &data) { #ifdef QT_NO_XMLSTREAMREADER + Q_UNUSED(data); qWarning("Cannot load mime type since QXmlStreamReader is not available."); return; #else @@ -670,7 +673,7 @@ void QMimeXMLProvider::load(const QString &fileName) { QString errorMessage; if (!load(fileName, &errorMessage)) - qWarning("QMimeDatabase: Error loading %s\n%s", qPrintable(fileName), qPrintable(errorMessage)); + qWarning("QMimeDatabase: Error loading %ls\n%ls", qUtf16Printable(fileName), qUtf16Printable(errorMessage)); } bool QMimeXMLProvider::load(const QString &fileName, QString *errorMessage) diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index 875ff9e0eb..b6268210c0 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -97,17 +97,17 @@ public: QMimeBinaryProvider(QMimeDatabasePrivate *db, const QString &directory); virtual ~QMimeBinaryProvider(); - virtual bool isValid() override; - virtual QMimeType mimeTypeForName(const QString &name) override; + bool isValid() override; + QMimeType mimeTypeForName(const QString &name) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override; void addParents(const QString &mime, QStringList &result) override; - virtual QString resolveAlias(const QString &name) override; + QString resolveAlias(const QString &name) override; void addAliases(const QString &name, QStringList &result) override; void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void addAllMimeTypes(QList<QMimeType> &result) override; static void loadMimeTypePrivate(QMimeTypePrivate &); - virtual void loadIcon(QMimeTypePrivate &) override; - virtual void loadGenericIcon(QMimeTypePrivate &) override; + void loadIcon(QMimeTypePrivate &) override; + void loadGenericIcon(QMimeTypePrivate &) override; void ensureLoaded() override; private: @@ -135,11 +135,11 @@ public: QMimeXMLProvider(QMimeDatabasePrivate *db, const QString &directory); ~QMimeXMLProvider(); - virtual bool isValid() override; - virtual QMimeType mimeTypeForName(const QString &name) override; + bool isValid() override; + QMimeType mimeTypeForName(const QString &name) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override; void addParents(const QString &mime, QStringList &result) override; - virtual QString resolveAlias(const QString &name) override; + QString resolveAlias(const QString &name) override; void addAliases(const QString &name, QStringList &result) override; void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void addAllMimeTypes(QList<QMimeType> &result) override; diff --git a/src/corelib/mimetypes/qmimetype.cpp b/src/corelib/mimetypes/qmimetype.cpp index 55c7de0c87..de450c68f4 100644 --- a/src/corelib/mimetypes/qmimetype.cpp +++ b/src/corelib/mimetypes/qmimetype.cpp @@ -192,7 +192,7 @@ bool QMimeType::operator==(const QMimeType &other) const Returns the hash value for \a key, using \a seed to seed the calculation. */ -uint qHash(const QMimeType &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QMimeType &key, uint seed) noexcept { return qHash(key.d->name, seed); } @@ -253,7 +253,7 @@ QString QMimeType::name() const */ QString QMimeType::comment() const { - QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d); + QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d)); QStringList languageList; languageList << QLocale().name(); @@ -294,7 +294,7 @@ QString QMimeType::comment() const */ QString QMimeType::genericIconName() const { - QMimeDatabasePrivate::instance()->loadGenericIcon(*d); + QMimeDatabasePrivate::instance()->loadGenericIcon(const_cast<QMimeTypePrivate&>(*d)); if (d->genericIconName.isEmpty()) { // From the spec: // If the generic icon name is empty (not specified by the mimetype definition) @@ -311,6 +311,14 @@ QString QMimeType::genericIconName() const return d->genericIconName; } +static QString make_default_icon_name_from_mimetype_name(QString iconName) +{ + const int slashindex = iconName.indexOf(QLatin1Char('/')); + if (slashindex != -1) + iconName[slashindex] = QLatin1Char('-'); + return iconName; +} + /*! \property QMimeType::iconName \brief the file name of an icon image that represents the MIME type @@ -322,13 +330,9 @@ QString QMimeType::genericIconName() const */ QString QMimeType::iconName() const { - QMimeDatabasePrivate::instance()->loadIcon(*d); + QMimeDatabasePrivate::instance()->loadIcon(const_cast<QMimeTypePrivate&>(*d)); if (d->iconName.isEmpty()) { - // Make default icon name from the mimetype name - d->iconName = name(); - const int slashindex = d->iconName.indexOf(QLatin1Char('/')); - if (slashindex != -1) - d->iconName[slashindex] = QLatin1Char('-'); + return make_default_icon_name_from_mimetype_name(name()); } return d->iconName; } @@ -342,7 +346,7 @@ QString QMimeType::iconName() const */ QStringList QMimeType::globPatterns() const { - QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d); + QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d)); return d->globPatterns; } @@ -437,7 +441,7 @@ QStringList QMimeType::aliases() const */ QStringList QMimeType::suffixes() const { - QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d); + QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d)); QStringList result; for (const QString &pattern : qAsConst(d->globPatterns)) { @@ -480,7 +484,7 @@ QString QMimeType::preferredSuffix() const */ QString QMimeType::filterString() const { - QMimeDatabasePrivate::instance()->loadMimeTypePrivate(*d); + QMimeDatabasePrivate::instance()->loadMimeTypePrivate(const_cast<QMimeTypePrivate&>(*d)); QString filter; if (!d->globPatterns.empty()) { diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index 8287f1434b..df1b60f2ce 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -48,14 +48,14 @@ QT_REQUIRE_CONFIG(mimetype); #include <QtCore/qobjectdefs.h> #include <QtCore/qshareddata.h> #include <QtCore/qstring.h> +#include <QtCore/qstringlist.h> QT_BEGIN_NAMESPACE class QMimeTypePrivate; -class QStringList; class QMimeType; -Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed = 0) noexcept; class Q_CORE_EXPORT QMimeType { @@ -78,10 +78,8 @@ public: QMimeType(); QMimeType(const QMimeType &other); QMimeType &operator=(const QMimeType &other); -#ifdef Q_COMPILER_RVALUE_REFS - QMimeType &operator=(QMimeType &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif - void swap(QMimeType &other) Q_DECL_NOTHROW + QMimeType &operator=(QMimeType &&other) noexcept { swap(other); return *this; } + void swap(QMimeType &other) noexcept { qSwap(d, other.d); } @@ -121,7 +119,7 @@ protected: friend class QMimeXMLProvider; friend class QMimeBinaryProvider; friend class QMimeTypePrivate; - friend Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed) Q_DECL_NOTHROW; + friend Q_CORE_EXPORT uint qHash(const QMimeType &key, uint seed) noexcept; QExplicitlySharedDataPointer<QMimeTypePrivate> d; }; diff --git a/src/corelib/mimetypes/qmimetype_p.h b/src/corelib/mimetypes/qmimetype_p.h index 5a36e6613c..0d6b4b4b12 100644 --- a/src/corelib/mimetypes/qmimetype_p.h +++ b/src/corelib/mimetypes/qmimetype_p.h @@ -84,26 +84,6 @@ public: QT_END_NAMESPACE -#define QMIMETYPE_BUILDER \ - QT_BEGIN_NAMESPACE \ - static QMimeType buildQMimeType ( \ - const QString &name, \ - const QString &genericIconName, \ - const QString &iconName, \ - const QStringList &globPatterns \ - ) \ - { \ - QMimeTypePrivate qMimeTypeData; \ - qMimeTypeData.name = name; \ - qMimeTypeData.loaded = true; \ - qMimeTypeData.genericIconName = genericIconName; \ - qMimeTypeData.iconName = iconName; \ - qMimeTypeData.globPatterns = globPatterns; \ - return QMimeType(qMimeTypeData); \ - } \ - QT_END_NAMESPACE - -#ifdef Q_COMPILER_RVALUE_REFS #define QMIMETYPE_BUILDER_FROM_RVALUE_REFS \ QT_BEGIN_NAMESPACE \ static QMimeType buildQMimeType ( \ @@ -122,6 +102,5 @@ QT_END_NAMESPACE return QMimeType(qMimeTypeData); \ } \ QT_END_NAMESPACE -#endif #endif // QMIMETYPE_P_H diff --git a/src/corelib/mimetypes/qmimetypeparser.cpp b/src/corelib/mimetypes/qmimetypeparser.cpp index d10575cfe9..815e0aa03b 100644 --- a/src/corelib/mimetypes/qmimetypeparser.cpp +++ b/src/corelib/mimetypes/qmimetypeparser.cpp @@ -194,8 +194,9 @@ static CreateMagicMatchRuleResult createMagicMatchRule(const QXmlStreamAttribute bool QMimeTypeParserBase::parse(QIODevice *dev, const QString &fileName, QString *errorMessage) { #ifdef QT_NO_XMLSTREAMREADER + Q_UNUSED(dev); if (errorMessage) - *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse."); + *errorMessage = QString::fromLatin1("QXmlStreamReader is not available, cannot parse '%1'.").arg(fileName); return false; #else QMimeTypePrivate data; diff --git a/src/corelib/mimetypes/qmimetypeparser_p.h b/src/corelib/mimetypes/qmimetypeparser_p.h index 6e3f5fd556..d6a1444592 100644 --- a/src/corelib/mimetypes/qmimetypeparser_p.h +++ b/src/corelib/mimetypes/qmimetypeparser_p.h @@ -64,7 +64,7 @@ class QIODevice; class QMimeTypeParserBase { - Q_DISABLE_COPY(QMimeTypeParserBase) + Q_DISABLE_COPY_MOVE(QMimeTypeParserBase) public: QMimeTypeParserBase() {} diff --git a/src/corelib/platform/platform.pri b/src/corelib/platform/platform.pri new file mode 100644 index 0000000000..1fe2db81b0 --- /dev/null +++ b/src/corelib/platform/platform.pri @@ -0,0 +1 @@ +wasm:include(wasm/wasm.pri) diff --git a/src/corelib/platform/wasm/qstdweb.cpp b/src/corelib/platform/wasm/qstdweb.cpp new file mode 100644 index 0000000000..198ce897ca --- /dev/null +++ b/src/corelib/platform/wasm/qstdweb.cpp @@ -0,0 +1,236 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qstdweb_p.h" + +#include <emscripten/bind.h> +#include <cstdint> +#include <iostream> + +QT_BEGIN_NAMESPACE + +namespace qstdweb { + +typedef double uint53_t; // see Number.MAX_SAFE_INTEGER + +ArrayBuffer::ArrayBuffer(const emscripten::val &arrayBuffer) + :m_arrayBuffer(arrayBuffer) +{ + +} + +uint32_t ArrayBuffer::byteLength() const +{ + if (m_arrayBuffer.isUndefined() || m_arrayBuffer.isNull()) + return 0; + + return m_arrayBuffer["byteLength"].as<uint32_t>(); +} + +Blob::Blob(const emscripten::val &blob) + :m_blob(blob) +{ + +} + +uint32_t Blob::size() const +{ + return m_blob["size"].as<uint32_t>(); +} + +File::File(const emscripten::val &file) +:m_file(file) +{ + +} + +Blob File::slice(uint64_t begin, uint64_t end) const +{ + return Blob(m_file.call<emscripten::val>("slice", uint53_t(begin), uint53_t(end))); +} + +std::string File::name() const +{ + return m_file["name"].as<std::string>(); +} + +uint64_t File::size() const +{ + return uint64_t(m_file["size"].as<uint53_t>()); +} + +FileList::FileList(const emscripten::val &fileList) + :m_fileList(fileList) +{ + +} + +int FileList::length() const +{ + return m_fileList["length"].as<int>(); +} + +File FileList::item(int index) const +{ + return File(m_fileList[index]); +} + +File FileList::operator[](int index) const +{ + return item(index); +} + +ArrayBuffer FileReader::result() const +{ + return ArrayBuffer(m_fileReader["result"]); +} + +void FileReader::readAsArrayBuffer(const Blob &blob) const +{ + m_fileReader.call<void>("readAsArrayBuffer", blob.m_blob); +} + +void FileReader::onLoad(const std::function<void ()> &onLoad) +{ + m_onLoad.reset(new EventCallback(m_fileReader, "load", onLoad)); +} + +void FileReader::onError(const std::function<void ()> &onError) +{ + m_onError.reset(new EventCallback(m_fileReader, "error", onError)); +} + +void FileReader::onAbort(const std::function<void ()> &onAbort) +{ + m_onAbort.reset(new EventCallback(m_fileReader, "abort", onAbort)); +} + +Uint8Array Uint8Array::heap() +{ + return Uint8Array(heap_()); +} + +Uint8Array::Uint8Array(const emscripten::val &uint8Array) +: m_uint8Array(uint8Array) +{ + +} + +Uint8Array::Uint8Array(const ArrayBuffer &buffer) +: m_uint8Array(Uint8Array::constructor_().new_(buffer.m_arrayBuffer)) +{ + +} + +Uint8Array::Uint8Array(const ArrayBuffer &buffer, uint32_t offset, uint32_t length) +: m_uint8Array(Uint8Array::constructor_().new_(buffer.m_arrayBuffer, offset, length)) +{ + +} + +Uint8Array::Uint8Array(char *buffer, uint32_t size) +:m_uint8Array(Uint8Array::constructor_().new_(Uint8Array::heap().buffer().m_arrayBuffer, uint32_t(buffer), size)) +{ + +} + +ArrayBuffer Uint8Array::buffer() const +{ + return ArrayBuffer(m_uint8Array["buffer"]); +} + +uint32_t Uint8Array::length() const +{ + return m_uint8Array["length"].as<uint32_t>(); +} + +void Uint8Array::set(const Uint8Array &source) +{ + m_uint8Array.call<void>("set", source.m_uint8Array); // copies source content +} + +void Uint8Array::copyTo(char *destination) const +{ + Uint8Array(destination, length()).set(*this); +} + +void Uint8Array::copy(char *destination, const Uint8Array &source) +{ + Uint8Array(destination, source.length()).set(source); +} + +emscripten::val Uint8Array::heap_() +{ + return emscripten::val::module_property("HEAPU8"); +} + +emscripten::val Uint8Array::constructor_() +{ + return emscripten::val::global("Uint8Array"); +} + +// Registers a callback function for a named event on the given element. The event +// name must be the name as returned by the Event.type property: e.g. "load", "error". +EventCallback::EventCallback(emscripten::val element, const std::string &name, const std::function<void ()> &fn) +:m_fn(fn) +{ + element.set(contextPropertyName(name).c_str(), emscripten::val(intptr_t(this))); + element.set((std::string("on") + name).c_str(), emscripten::val::module_property("qtStdWebEventCallbackActivate")); +} + +void EventCallback::activate(emscripten::val event) +{ + emscripten::val target = event["target"]; + std::string eventName = event["type"].as<std::string>(); + EventCallback *that = reinterpret_cast<EventCallback *>(target[contextPropertyName(eventName).c_str()].as<intptr_t>()); + that->m_fn(); +} + +std::string EventCallback::contextPropertyName(const std::string &eventName) +{ + return std::string("data-qtEventCallbackContext") + eventName; +} + +EMSCRIPTEN_BINDINGS(qtStdwebCalback) { + emscripten::function("qtStdWebEventCallbackActivate", &EventCallback::activate); +} + +} // namespace qstdweb + +QT_END_NAMESPACE diff --git a/src/corelib/platform/wasm/qstdweb_p.h b/src/corelib/platform/wasm/qstdweb_p.h new file mode 100644 index 0000000000..75c2ec34b1 --- /dev/null +++ b/src/corelib/platform/wasm/qstdweb_p.h @@ -0,0 +1,169 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSTDWEB_P_H +#define QSTDWEB_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <qglobal.h> +#include <emscripten/val.h> +#include <cstdint> +#include <functional> + +QT_BEGIN_NAMESPACE + +namespace qstdweb { + + // DOM API in C++, implemented using emscripten val.h and bind.h. + // This is private API and can be extened and changed as needed. + + class ArrayBuffer; + class Blob; + class File; + class FileList; + class FileReader; + class Uint8Array; + class EventCallback; + + class ArrayBuffer { + public: + explicit ArrayBuffer(const emscripten::val &arrayBuffer); + uint32_t byteLength() const; + + private: + friend class Uint8Array; + emscripten::val m_arrayBuffer = emscripten::val::undefined(); + }; + + class Blob { + public: + explicit Blob(const emscripten::val &blob); + uint32_t size() const; + + private: + friend class FileReader; + emscripten::val m_blob = emscripten::val::undefined(); + }; + + class File { + public: + File() = default; + explicit File(const emscripten::val &file); + + Blob slice(uint64_t begin, uint64_t end) const; + std::string name() const; + uint64_t size() const; + + private: + emscripten::val m_file = emscripten::val::undefined(); + }; + + class FileList { + public: + FileList() = default; + explicit FileList(const emscripten::val &fileList); + + int length() const; + File item(int index) const; + File operator[](int index) const; + + private: + emscripten::val m_fileList = emscripten::val::undefined(); + }; + + class FileReader { + public: + ArrayBuffer result() const; + void readAsArrayBuffer(const Blob &blob) const; + + void onLoad(const std::function<void ()> &onLoad); + void onError(const std::function<void ()> &onError); + void onAbort(const std::function<void ()> &onAbort); + + private: + emscripten::val m_fileReader = emscripten::val::global("FileReader").new_(); + std::unique_ptr<EventCallback> m_onLoad; + std::unique_ptr<EventCallback> m_onError; + std::unique_ptr<EventCallback> m_onAbort; + }; + + class Uint8Array { + public: + static Uint8Array heap(); + explicit Uint8Array(const emscripten::val &uint8Array); + explicit Uint8Array(const ArrayBuffer &buffer); + Uint8Array(const ArrayBuffer &buffer, uint32_t offset, uint32_t length); + Uint8Array(char *buffer, uint32_t size); + + ArrayBuffer buffer() const; + uint32_t length() const; + void set(const Uint8Array &source); + + void copyTo(char *destination) const; + static void copy(char *destination, const Uint8Array &source); + private: + static emscripten::val heap_(); + static emscripten::val constructor_(); + emscripten::val m_uint8Array = emscripten::val::undefined(); + }; + + class EventCallback + { + public: + EventCallback(emscripten::val element, const std::string &name, const std::function<void ()> &fn); + static void activate(emscripten::val event); + private: + static std::string contextPropertyName(const std::string &eventName); + std::function<void ()> m_fn; + }; +} + +QT_END_NAMESPACE + +#endif diff --git a/src/corelib/platform/wasm/wasm.pri b/src/corelib/platform/wasm/wasm.pri new file mode 100644 index 0000000000..73447030fb --- /dev/null +++ b/src/corelib/platform/wasm/wasm.pri @@ -0,0 +1,3 @@ +INCLUDEDIR += $$PWD +HEADERS += $$PWD/qstdweb_p.h +SOURCES += $$PWD/qstdweb.cpp diff --git a/src/corelib/plugin/qfactoryinterface.h b/src/corelib/plugin/qfactoryinterface.h index f306460690..3aec4ddd55 100644 --- a/src/corelib/plugin/qfactoryinterface.h +++ b/src/corelib/plugin/qfactoryinterface.h @@ -52,8 +52,9 @@ struct Q_CORE_EXPORT QFactoryInterface virtual QStringList keys() const = 0; }; - +#ifndef Q_CLANG_QDOC Q_DECLARE_INTERFACE(QFactoryInterface, "org.qt-project.Qt.QFactoryInterface") +#endif QT_END_NAMESPACE diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index 35c64180d4..8e349f23ce 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -239,7 +239,7 @@ void QFactoryLoader::update() library = QLibraryPrivate::findOrCreate(QFileInfo(fileName).canonicalFilePath()); if (!library->isPlugin()) { if (qt_debug_component()) { - qDebug() << library->errorString << endl + qDebug() << library->errorString << Qt::endl << " not a plugin"; } library->release(); diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp index 29ef697fe8..1ace28c93f 100644 --- a/src/corelib/plugin/qlibrary.cpp +++ b/src/corelib/plugin/qlibrary.cpp @@ -74,7 +74,7 @@ QT_BEGIN_NAMESPACE # define QLIBRARY_AS_DEBUG true #endif -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) || defined(Q_CC_MINGW) // We don't use separate debug and release libs on UNIX, so we want // to allow loading plugins, regardless of how they were built. # define QT_NO_DEBUG_PLUGIN_CHECK @@ -133,8 +133,8 @@ QT_BEGIN_NAMESPACE The following code snippet loads a library, resolves the symbol "mysymbol", and calls the function if everything succeeded. If something goes wrong, e.g. the library file does not exist or the - symbol is not defined, the function pointer will be 0 and won't be - called. + symbol is not defined, the function pointer will be \nullptr and + won't be called. \snippet code/src_corelib_plugin_qlibrary.cpp 0 @@ -241,8 +241,8 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib) if (lib) lib->errorString = file.errorString(); if (qt_debug_component()) { - qWarning("%s: %s", QFile::encodeName(library).constData(), - qPrintable(QSystemError::stdString())); + qWarning("%s: %ls", QFile::encodeName(library).constData(), + qUtf16Printable(QSystemError::stdString())); } return false; } @@ -275,7 +275,7 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib) int r = QElfParser().parse(filedata, fdlen, library, lib, &pos, &fdlen); if (r == QElfParser::Corrupt || r == QElfParser::NotElf) { if (lib && qt_debug_component()) { - qWarning("QElfParser: %s",qPrintable(lib->errorString)); + qWarning("QElfParser: %ls", qUtf16Printable(lib->errorString)); } return false; } else if (r == QElfParser::QtMetaDataSection) { @@ -292,7 +292,7 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib) int r = QMachOParser::parse(filedata, fdlen, library, &errorString, &pos, &fdlen); if (r == QMachOParser::NotSuitable) { if (qt_debug_component()) - qWarning("QMachOParser: %s", qPrintable(errorString)); + qWarning("QMachOParser: %ls", qUtf16Printable(errorString)); if (lib) lib->errorString = errorString; return false; @@ -319,8 +319,8 @@ static bool findPatternUnloaded(const QString &library, QLibraryPrivate *lib) QString errMsg; QJsonDocument doc = qJsonFromRawLibraryMetaData(data, fdlen, &errMsg); if (doc.isNull()) { - qWarning("Found invalid metadata in lib %s: %s", - qPrintable(library), qPrintable(errMsg)); + qWarning("Found invalid metadata in lib %ls: %ls", + qUtf16Printable(library), qUtf16Printable(errMsg)); } else { lib->metaData = doc.object(); if (qt_debug_component()) @@ -356,11 +356,11 @@ static void installCoverageTool(QLibraryPrivate *libPrivate) if (qt_debug_component()) { if (ret >= 0) { - qDebug("coverage data for %s registered", - qPrintable(libPrivate->fileName)); + qDebug("coverage data for %ls registered", + qUtf16Printable(libPrivate->fileName)); } else { - qWarning("could not register %s: error %d; coverage data may be incomplete", - qPrintable(libPrivate->fileName), + qWarning("could not register %ls: error %d; coverage data may be incomplete", + qUtf16Printable(libPrivate->fileName), ret); } } @@ -405,10 +405,10 @@ inline void QLibraryStore::cleanup() LibraryMap::Iterator it = data->libraryMap.begin(); for (; it != data->libraryMap.end(); ++it) { QLibraryPrivate *lib = it.value(); - if (lib->libraryRefCount.load() == 1) { - if (lib->libraryUnloadCount.load() > 0) { + if (lib->libraryRefCount.loadRelaxed() == 1) { + if (lib->libraryUnloadCount.loadRelaxed() > 0) { Q_ASSERT(lib->pHnd); - lib->libraryUnloadCount.store(1); + lib->libraryUnloadCount.storeRelaxed(1); #ifdef __GLIBC__ // glibc has a bug in unloading from global destructors // see https://bugzilla.novell.com/show_bug.cgi?id=622977 @@ -428,7 +428,7 @@ inline void QLibraryStore::cleanup() for (QLibraryPrivate *lib : qAsConst(data->libraryMap)) { if (lib) qDebug() << "On QtCore unload," << lib->fileName << "was leaked, with" - << lib->libraryRefCount.load() << "users"; + << lib->libraryRefCount.loadRelaxed() << "users"; } } @@ -487,7 +487,7 @@ inline void QLibraryStore::releaseLibrary(QLibraryPrivate *lib) } // no one else is using - Q_ASSERT(lib->libraryUnloadCount.load() == 0); + Q_ASSERT(lib->libraryUnloadCount.loadRelaxed() == 0); if (Q_LIKELY(data) && !lib->fileName.isEmpty()) { QLibraryPrivate *that = data->libraryMap.take(lib->fileName); @@ -501,7 +501,7 @@ QLibraryPrivate::QLibraryPrivate(const QString &canonicalFileName, const QString : pHnd(0), fileName(canonicalFileName), fullVersion(version), instance(0), libraryRefCount(0), libraryUnloadCount(0), pluginState(MightBeAPlugin) { - loadHintsInt.store(loadHints); + loadHintsInt.storeRelaxed(loadHints); if (canonicalFileName.isEmpty()) errorString = QLibrary::tr("The shared library was not found."); } @@ -522,7 +522,7 @@ void QLibraryPrivate::mergeLoadHints(QLibrary::LoadHints lh) if (pHnd) return; - loadHintsInt.store(lh); + loadHintsInt.storeRelaxed(lh); } QFunctionPointer QLibraryPrivate::resolve(const char *symbol) @@ -575,7 +575,7 @@ bool QLibraryPrivate::unload(UnloadFlag flag) { if (!pHnd) return false; - if (libraryUnloadCount.load() > 0 && !libraryUnloadCount.deref()) { // only unload if ALL QLibrary instance wanted to + if (libraryUnloadCount.loadRelaxed() > 0 && !libraryUnloadCount.deref()) { // only unload if ALL QLibrary instance wanted to delete inst.data(); if (flag == NoUnloadSys || unload_sys()) { if (qt_debug_component()) diff --git a/src/corelib/plugin/qlibrary_p.h b/src/corelib/plugin/qlibrary_p.h index 3f650501c8..db5afac98e 100644 --- a/src/corelib/plugin/qlibrary_p.h +++ b/src/corelib/plugin/qlibrary_p.h @@ -92,11 +92,11 @@ public: QFunctionPointer resolve(const char *); QLibrary::LoadHints loadHints() const - { return QLibrary::LoadHints(loadHintsInt.load()); } + { return QLibrary::LoadHints(loadHintsInt.loadRelaxed()); } void setLoadHints(QLibrary::LoadHints lh); static QLibraryPrivate *findOrCreate(const QString &fileName, const QString &version = QString(), - QLibrary::LoadHints loadHints = 0); + QLibrary::LoadHints loadHints = nullptr); static QStringList suffixes_sys(const QString &fullVersion); static QStringList prefixes_sys(); diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp index e03814984c..84fcc53d52 100644 --- a/src/corelib/plugin/qlibrary_unix.cpp +++ b/src/corelib/plugin/qlibrary_unix.cpp @@ -77,14 +77,14 @@ QStringList QLibraryPrivate::suffixes_sys(const QString& fullVersion) // .so is preferred. # if defined(__ia64) if (!fullVersion.isEmpty()) { - suffixes << QString::fromLatin1(".so.%1").arg(fullVersion); + suffixes << QLatin1String(".so.%1").arg(fullVersion); } else { suffixes << QLatin1String(".so"); } # endif if (!fullVersion.isEmpty()) { - suffixes << QString::fromLatin1(".sl.%1").arg(fullVersion); - suffixes << QString::fromLatin1(".%1").arg(fullVersion); + suffixes << QLatin1String(".sl.%1").arg(fullVersion); + suffixes << QLatin1String(".%1").arg(fullVersion); } else { suffixes << QLatin1String(".sl"); } @@ -93,15 +93,15 @@ QStringList QLibraryPrivate::suffixes_sys(const QString& fullVersion) #else if (!fullVersion.isEmpty()) { - suffixes << QString::fromLatin1(".so.%1").arg(fullVersion); + suffixes << QLatin1String(".so.%1").arg(fullVersion); } else { suffixes << QLatin1String(".so"); } #endif # ifdef Q_OS_MAC if (!fullVersion.isEmpty()) { - suffixes << QString::fromLatin1(".%1.bundle").arg(fullVersion); - suffixes << QString::fromLatin1(".%1.dylib").arg(fullVersion); + suffixes << QLatin1String(".%1.bundle").arg(fullVersion); + suffixes << QLatin1String(".%1.dylib").arg(fullVersion); } else { suffixes << QLatin1String(".bundle") << QLatin1String(".dylib"); } diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index 5aca22497a..c176155c28 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2018 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -71,13 +72,34 @@ inline constexpr unsigned char qPluginArchRequirements() } typedef QObject *(*QtPluginInstanceFunction)(); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) typedef const char *(*QtPluginMetaDataFunction)(); +#else +struct QPluginMetaData +{ + const uchar *data; + size_t size; +}; +typedef QPluginMetaData (*QtPluginMetaDataFunction)(); +#endif + struct Q_CORE_EXPORT QStaticPlugin { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +public: + constexpr QStaticPlugin(QtPluginInstanceFunction i, QtPluginMetaDataFunction m) + : instance(i), rawMetaData(m().data), rawMetaDataSize(m().size) + {} + QtPluginInstanceFunction instance; +private: + // ### Qt 6: revise, as this is not standard-layout + const void *rawMetaData; + qsizetype rawMetaDataSize; +public: +#elif !defined(Q_QDOC) // Note: This struct is initialized using an initializer list. // As such, it cannot have any new constructors or variables. -#ifndef Q_QDOC QtPluginInstanceFunction instance; QtPluginMetaDataFunction rawMetaData; #else @@ -139,6 +161,16 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); #if defined(QT_STATICPLUGIN) +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +# define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME) \ + static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##PLUGINCLASSNAME() \ + Q_PLUGIN_INSTANCE(PLUGINCLASS) \ + static QPluginMetaData qt_plugin_query_metadata_##PLUGINCLASSNAME() \ + { return { qt_pluginMetaData, sizeof qt_pluginMetaData }; } \ + const QT_PREPEND_NAMESPACE(QStaticPlugin) qt_static_plugin_##PLUGINCLASSNAME() { \ + return { qt_plugin_instance_##PLUGINCLASSNAME, qt_plugin_query_metadata_##PLUGINCLASSNAME}; \ + } +#else # define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME) \ static QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance_##PLUGINCLASSNAME() \ Q_PLUGIN_INSTANCE(PLUGINCLASS) \ @@ -147,6 +179,17 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); QT_PREPEND_NAMESPACE(QStaticPlugin) plugin = { qt_plugin_instance_##PLUGINCLASSNAME, qt_plugin_query_metadata_##PLUGINCLASSNAME}; \ return plugin; \ } +#endif + +#else +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + +# define QT_MOC_EXPORT_PLUGIN(PLUGINCLASS, PLUGINCLASSNAME) \ + Q_EXTERN_C Q_DECL_EXPORT \ + QPluginMetaData qt_plugin_query_metadata() \ + { return { qt_pluginMetaData, sizeof qt_pluginMetaData }; } \ + Q_EXTERN_C Q_DECL_EXPORT QT_PREPEND_NAMESPACE(QObject) *qt_plugin_instance() \ + Q_PLUGIN_INSTANCE(PLUGINCLASS) #else @@ -159,6 +202,7 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); #endif +#endif #define Q_EXPORT_PLUGIN(PLUGIN) \ Q_EXPORT_PLUGIN2(PLUGIN, PLUGIN) diff --git a/src/corelib/plugin/qplugin_p.h b/src/corelib/plugin/qplugin_p.h index 717129268b..ce45ebf700 100644 --- a/src/corelib/plugin/qplugin_p.h +++ b/src/corelib/plugin/qplugin_p.h @@ -60,7 +60,8 @@ enum class QtPluginMetaDataKeys { Requirements, IID, ClassName, - MetaData + MetaData, + URI }; // F(IntKey, StringKey, Description) @@ -68,7 +69,8 @@ enum class QtPluginMetaDataKeys { #define QT_PLUGIN_FOREACH_METADATA(F) \ F(QtPluginMetaDataKeys::IID, "IID", "Plugin's Interface ID") \ F(QtPluginMetaDataKeys::ClassName, "className", "Plugin class name") \ - F(QtPluginMetaDataKeys::MetaData, "MetaData", "Other meta data") + F(QtPluginMetaDataKeys::MetaData, "MetaData", "Other meta data") \ + F(QtPluginMetaDataKeys::URI, "URI", "Plugin URI") QT_END_NAMESPACE diff --git a/src/corelib/plugin/quuid.cpp b/src/corelib/plugin/quuid.cpp index b113ca13ce..83873edf6f 100644 --- a/src/corelib/plugin/quuid.cpp +++ b/src/corelib/plugin/quuid.cpp @@ -112,7 +112,7 @@ static char *_q_uuidToHex(const QUuid &uuid, char *dst, QUuid::StringFormat mode Parses the string representation of a UUID (with optional surrounding "{}") by reading at most MaxStringUuidLength (38) characters from \a src, which - may be \c nullptr. Stops at the first invalid character (which includes a + may be \nullptr. Stops at the first invalid character (which includes a premature NUL). Returns the successfully parsed QUuid, or a null QUuid in case of failure. @@ -397,7 +397,7 @@ QUuid::QUuid(const QString &text) \sa toString(), QUuid() */ -QUuid QUuid::fromString(QStringView text) Q_DECL_NOTHROW +QUuid QUuid::fromString(QStringView text) noexcept { if (text.size() > MaxStringUuidLength) text = text.left(MaxStringUuidLength); // text.truncate(MaxStringUuidLength); @@ -427,7 +427,7 @@ QUuid QUuid::fromString(QStringView text) Q_DECL_NOTHROW \sa toString(), QUuid() */ -QUuid QUuid::fromString(QLatin1String text) Q_DECL_NOTHROW +QUuid QUuid::fromString(QLatin1String text) noexcept { if (Q_UNLIKELY(text.size() < MaxStringUuidLength - 2 || (text.front() == QLatin1Char('{') && text.size() < MaxStringUuidLength - 1))) { @@ -864,7 +864,7 @@ QDataStream &operator>>(QDataStream &s, QUuid &id) Returns \c true if this is the null UUID {00000000-0000-0000-0000-000000000000}; otherwise returns \c false. */ -bool QUuid::isNull() const Q_DECL_NOTHROW +bool QUuid::isNull() const noexcept { return data4[0] == 0 && data4[1] == 0 && data4[2] == 0 && data4[3] == 0 && data4[4] == 0 && data4[5] == 0 && data4[6] == 0 && data4[7] == 0 && @@ -913,7 +913,7 @@ bool QUuid::isNull() const Q_DECL_NOTHROW \sa version() */ -QUuid::Variant QUuid::variant() const Q_DECL_NOTHROW +QUuid::Variant QUuid::variant() const noexcept { if (isNull()) return VarUnknown; @@ -934,7 +934,7 @@ QUuid::Variant QUuid::variant() const Q_DECL_NOTHROW \sa variant() */ -QUuid::Version QUuid::version() const Q_DECL_NOTHROW +QUuid::Version QUuid::version() const noexcept { // Check the 4 MSB of data3 Version ver = (Version)(data3>>12); @@ -957,7 +957,7 @@ QUuid::Version QUuid::version() const Q_DECL_NOTHROW \sa variant() */ -bool QUuid::operator<(const QUuid &other) const Q_DECL_NOTHROW +bool QUuid::operator<(const QUuid &other) const noexcept { if (variant() != other.variant()) return variant() < other.variant(); @@ -984,7 +984,7 @@ bool QUuid::operator<(const QUuid &other) const Q_DECL_NOTHROW \sa variant() */ -bool QUuid::operator>(const QUuid &other) const Q_DECL_NOTHROW +bool QUuid::operator>(const QUuid &other) const noexcept { return other < *this; } @@ -1089,7 +1089,7 @@ QDebug operator<<(QDebug dbg, const QUuid &id) \relates QUuid Returns a hash of the UUID \a uuid, using \a seed to seed the calculation. */ -uint qHash(const QUuid &uuid, uint seed) Q_DECL_NOTHROW +uint qHash(const QUuid &uuid, uint seed) noexcept { return uuid.data1 ^ uuid.data2 ^ (uuid.data3 << 16) ^ ((uuid.data4[0] << 24) | (uuid.data4[1] << 16) | (uuid.data4[2] << 8) | uuid.data4[3]) diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index 08a1843640..713ca070c8 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -93,13 +93,13 @@ public: #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_CLANG_QDOC) - Q_DECL_CONSTEXPR QUuid() Q_DECL_NOTHROW : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {} + Q_DECL_CONSTEXPR QUuid() noexcept : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {} Q_DECL_CONSTEXPR QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, - uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) Q_DECL_NOTHROW + uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) noexcept : data1(l), data2(w1), data3(w2), data4{b1, b2, b3, b4, b5, b6, b7, b8} {} #else - QUuid() Q_DECL_NOTHROW + QUuid() noexcept { data1 = 0; data2 = 0; @@ -107,7 +107,7 @@ public: for(int i = 0; i < 8; i++) data4[i] = 0; } - QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) Q_DECL_NOTHROW + QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) noexcept { data1 = l; data2 = w1; @@ -124,8 +124,8 @@ public: #endif QUuid(const QString &); - static QUuid fromString(QStringView string) Q_DECL_NOTHROW; - static QUuid fromString(QLatin1String string) Q_DECL_NOTHROW; + static QUuid fromString(QStringView string) noexcept; + static QUuid fromString(QLatin1String string) noexcept; QUuid(const char *); QString toString() const; QString toString(StringFormat mode) const; // ### Qt6: merge with previous @@ -134,9 +134,9 @@ public: QByteArray toByteArray(StringFormat mode) const; // ### Qt6: merge with previous QByteArray toRfc4122() const; static QUuid fromRfc4122(const QByteArray &); - bool isNull() const Q_DECL_NOTHROW; + bool isNull() const noexcept; - Q_DECL_RELAXED_CONSTEXPR bool operator==(const QUuid &orig) const Q_DECL_NOTHROW + Q_DECL_RELAXED_CONSTEXPR bool operator==(const QUuid &orig) const noexcept { if (data1 != orig.data1 || data2 != orig.data2 || data3 != orig.data3) @@ -149,24 +149,24 @@ public: return true; } - Q_DECL_RELAXED_CONSTEXPR bool operator!=(const QUuid &orig) const Q_DECL_NOTHROW + Q_DECL_RELAXED_CONSTEXPR bool operator!=(const QUuid &orig) const noexcept { return !(*this == orig); } - bool operator<(const QUuid &other) const Q_DECL_NOTHROW; - bool operator>(const QUuid &other) const Q_DECL_NOTHROW; + bool operator<(const QUuid &other) const noexcept; + bool operator>(const QUuid &other) const noexcept; #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) // On Windows we have a type GUID that is used by the platform API, so we // provide convenience operators to cast from and to this type. #if defined(Q_COMPILER_UNIFORM_INIT) && !defined(Q_CLANG_QDOC) - Q_DECL_CONSTEXPR QUuid(const GUID &guid) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QUuid(const GUID &guid) noexcept : data1(guid.Data1), data2(guid.Data2), data3(guid.Data3), data4{guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], guid.Data4[4], guid.Data4[5], guid.Data4[6], guid.Data4[7]} {} #else - QUuid(const GUID &guid) Q_DECL_NOTHROW + QUuid(const GUID &guid) noexcept { data1 = guid.Data1; data2 = guid.Data2; @@ -176,24 +176,24 @@ public: } #endif - Q_DECL_RELAXED_CONSTEXPR QUuid &operator=(const GUID &guid) Q_DECL_NOTHROW + Q_DECL_RELAXED_CONSTEXPR QUuid &operator=(const GUID &guid) noexcept { *this = QUuid(guid); return *this; } - Q_DECL_RELAXED_CONSTEXPR operator GUID() const Q_DECL_NOTHROW + Q_DECL_RELAXED_CONSTEXPR operator GUID() const noexcept { GUID guid = { data1, data2, data3, { data4[0], data4[1], data4[2], data4[3], data4[4], data4[5], data4[6], data4[7] } }; return guid; } - Q_DECL_RELAXED_CONSTEXPR bool operator==(const GUID &guid) const Q_DECL_NOTHROW + Q_DECL_RELAXED_CONSTEXPR bool operator==(const GUID &guid) const noexcept { return *this == QUuid(guid); } - Q_DECL_RELAXED_CONSTEXPR bool operator!=(const GUID &guid) const Q_DECL_NOTHROW + Q_DECL_RELAXED_CONSTEXPR bool operator!=(const GUID &guid) const noexcept { return !(*this == guid); } @@ -216,8 +216,8 @@ public: } - QUuid::Variant variant() const Q_DECL_NOTHROW; - QUuid::Version version() const Q_DECL_NOTHROW; + QUuid::Variant variant() const noexcept; + QUuid::Version version() const noexcept; #if defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC) static QUuid fromCFUUID(CFUUIDRef uuid); @@ -243,11 +243,11 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QUuid &); Q_CORE_EXPORT QDebug operator<<(QDebug, const QUuid &); #endif -Q_CORE_EXPORT uint qHash(const QUuid &uuid, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QUuid &uuid, uint seed = 0) noexcept; -inline bool operator<=(const QUuid &lhs, const QUuid &rhs) Q_DECL_NOTHROW +inline bool operator<=(const QUuid &lhs, const QUuid &rhs) noexcept { return !(rhs < lhs); } -inline bool operator>=(const QUuid &lhs, const QUuid &rhs) Q_DECL_NOTHROW +inline bool operator>=(const QUuid &lhs, const QUuid &rhs) noexcept { return !(lhs < rhs); } QT_END_NAMESPACE diff --git a/src/corelib/serialization/qcborarray.cpp b/src/corelib/serialization/qcborarray.cpp index c56536cdb1..28ae40f3df 100644 --- a/src/corelib/serialization/qcborarray.cpp +++ b/src/corelib/serialization/qcborarray.cpp @@ -39,6 +39,7 @@ #include "qcborarray.h" #include "qcborvalue_p.h" +#include "qdatastream.h" QT_BEGIN_NAMESPACE @@ -1218,4 +1219,23 @@ QDebug operator<<(QDebug dbg, const QCborArray &a) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QCborArray &value) +{ + stream << value.toCborValue().toCbor(); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QCborArray &value) +{ + QByteArray buffer; + stream >> buffer; + QCborParserError parseError{}; + value = QCborValue::fromCbor(buffer, &parseError).toArray(); + if (parseError.error) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h index ed0f4912ba..e06544f245 100644 --- a/src/corelib/serialization/qcborarray.h +++ b/src/corelib/serialization/qcborarray.h @@ -47,6 +47,7 @@ QT_BEGIN_NAMESPACE class QJsonArray; +class QDataStream; class QCborContainerPrivate; class Q_CORE_EXPORT QCborArray @@ -271,6 +272,7 @@ private: void detach(qsizetype reserve = 0); friend QCborValue; + friend QCborValueRef; explicit QCborArray(QCborContainerPrivate &dd) noexcept; QExplicitlySharedDataPointer<QCborContainerPrivate> d; }; @@ -298,6 +300,11 @@ Q_CORE_EXPORT uint qHash(const QCborArray &array, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborArray &a); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QCborArray &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborArray &); +#endif + QT_END_NAMESPACE #endif // QCBORARRAY_H diff --git a/src/corelib/serialization/qcborcommon.h b/src/corelib/serialization/qcborcommon.h index f8278f1649..3dfe50cd09 100644 --- a/src/corelib/serialization/qcborcommon.h +++ b/src/corelib/serialization/qcborcommon.h @@ -133,6 +133,11 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, QCborKnownTags tg); Q_CORE_EXPORT QDebug operator<<(QDebug, QCborTag tg); #endif +#if !defined(QT_NO_DEBUG_STREAM) +QDataStream &operator<<(QDataStream &ds, QCborSimpleType st); +QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st); +#endif + inline uint qHash(QCborSimpleType tag, uint seed = 0) { return qHash(quint8(tag), seed); diff --git a/src/corelib/serialization/qcbormap.cpp b/src/corelib/serialization/qcbormap.cpp index 33f9249993..4b28ca4a2e 100644 --- a/src/corelib/serialization/qcbormap.cpp +++ b/src/corelib/serialization/qcbormap.cpp @@ -1763,4 +1763,23 @@ QDebug operator<<(QDebug dbg, const QCborMap &m) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QCborMap &value) +{ + stream << value.toCborValue().toCbor(); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QCborMap &value) +{ + QByteArray buffer; + stream >> buffer; + QCborParserError parseError{}; + value = QCborValue::fromCbor(buffer, &parseError).toMap(); + if (parseError.error) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h index 3eb2107691..4aea901eef 100644 --- a/src/corelib/serialization/qcbormap.h +++ b/src/corelib/serialization/qcbormap.h @@ -52,6 +52,7 @@ typedef QMap<QString, QVariant> QVariantMap; template <class Key, class T> class QHash; typedef QHash<QString, QVariant> QVariantHash; class QJsonObject; +class QDataStream; class QCborContainerPrivate; class Q_CORE_EXPORT QCborMap @@ -117,6 +118,8 @@ public: QCborValueRef item; // points to the value friend class Iterator; friend class QCborMap; + friend class QCborValue; + friend class QCborValueRef; ConstIterator(QCborContainerPrivate *dd, qsizetype ii) : item(dd, ii) {} public: typedef std::random_access_iterator_tag iterator_category; @@ -170,7 +173,7 @@ public: : QCborMap() { detach(args.size()); - for (auto pair : args) + for (const auto &pair : args) insert(pair.first, pair.second); } ~QCborMap(); @@ -322,9 +325,10 @@ public: QJsonObject toJsonObject() const; private: + friend class QCborValue; + friend class QCborValueRef; void detach(qsizetype reserve = 0); - friend QCborValue; explicit QCborMap(QCborContainerPrivate &dd) noexcept; QExplicitlySharedDataPointer<QCborContainerPrivate> d; }; @@ -352,6 +356,12 @@ Q_CORE_EXPORT uint qHash(const QCborMap &map, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborMap &m); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QCborMap &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborMap &); +#endif + + QT_END_NAMESPACE #endif // QCBORMAP_H diff --git a/src/corelib/serialization/qcborstream.cpp b/src/corelib/serialization/qcborstream.cpp index 87ae316041..078c14a32d 100644 --- a/src/corelib/serialization/qcborstream.cpp +++ b/src/corelib/serialization/qcborstream.cpp @@ -44,6 +44,7 @@ #include <qbuffer.h> #include <qdebug.h> #include <qstack.h> +#include <qdatastream.h> QT_BEGIN_NAMESPACE @@ -180,6 +181,21 @@ Q_CORE_EXPORT const char *qt_cbor_simpletype_id(QCborSimpleType st) return nullptr; } +#if !defined(QT_NO_DATASTREAM) +QDataStream &operator<<(QDataStream &ds, QCborSimpleType st) +{ + return ds << quint8(st); +} + +QDataStream &operator>>(QDataStream &ds, QCborSimpleType &st) +{ + quint8 v; + ds >> v; + st = QCborSimpleType(v); + return ds; +} +#endif + #if !defined(QT_NO_DEBUG_STREAM) QDebug operator<<(QDebug dbg, QCborSimpleType st) { diff --git a/src/corelib/serialization/qcborvalue.cpp b/src/corelib/serialization/qcborvalue.cpp index 80ef515fd2..ba616c0a7d 100644 --- a/src/corelib/serialization/qcborvalue.cpp +++ b/src/corelib/serialization/qcborvalue.cpp @@ -39,7 +39,7 @@ #include "qcborvalue.h" #include "qcborvalue_p.h" - +#include "qdatastream.h" #include "qcborarray.h" #include "qcbormap.h" #include "qcborstream.h" @@ -108,7 +108,7 @@ QT_BEGIN_NAMESPACE QCborValue can contain a value of "null", which is not of any specific type. It resembles the C++ \c {std::nullptr_t} type, whose only possible value is - \c nullptr. QCborValue has a constructor taking such a type and creates a + \nullptr. QCborValue has a constructor taking such a type and creates a null QCborValue. Null values are used to indicate that an optional value is not present. In @@ -128,10 +128,11 @@ QT_BEGIN_NAMESPACE Such values are completely valid and may appear in CBOR streams, unlike JSON content and QJsonValue's undefined bit. But like QJsonValue's - Undefined, it is returned by QCborArray::value() when out of range or - QCborMap::operator[] when the key is not found in the container. It is not - possible to tell such a case apart from the value of Undefined, so if that - is required, check the QCborArray size and use the QCborMap iterator API. + Undefined, it is returned by a CBOR container's value() or read-only + operator[] for invalid look-ups (index out of range for QCborArray, or key + not found for QCborMap). It is not possible to tell such a case apart from + the value of Undefined, so if that is required, check the QCborArray size + and use the QCborMap iterator API. \section1 Simple types @@ -416,7 +417,7 @@ QT_BEGIN_NAMESPACE using toSimpleType() as well as isSimpleType(st). CBOR simple types are types that do not have any associated value, like - C++'s \c{std::nullptr_t} type, whose only possible value is \c nullptr. + C++'s \c{std::nullptr_t} type, whose only possible value is \nullptr. If \a st is \c{QCborSimpleType::Null}, the resulting QCborValue will be of the \l{Type}{Null} type and similarly for \c{QCborSimpleType::Undefined}. @@ -457,7 +458,7 @@ QT_BEGIN_NAMESPACE \fn QCborValue::QCborValue(QCborValue &&other) \overload - Moves the contents of the \a other CBorValue object into this one and frees + Moves the contents of the \a other QCborValue object into this one and frees the resources of this one. */ @@ -465,7 +466,7 @@ QT_BEGIN_NAMESPACE \fn QCborValue &&QCborValue::operator=(QCborValue &&other) \overload - Moves the contents of the \a other CBorValue object into this one and frees + Moves the contents of the \a other QCborValue object into this one and frees the resources of this one. Returns a reference to this object. */ @@ -765,8 +766,8 @@ static void writeDoubleToCbor(QCborStreamWriter &writer, double d, QCborValue::E if (qt_is_nan(d)) { if (opt & QCborValue::UseFloat16) { if ((opt & QCborValue::UseFloat16) == QCborValue::UseFloat16) - return writer.append(qfloat16(qt_qnan())); - return writer.append(float(qt_qnan())); + return writer.append(std::numeric_limits<qfloat16>::quiet_NaN()); + return writer.append(std::numeric_limits<float>::quiet_NaN()); } return writer.append(qt_qnan()); } @@ -848,7 +849,7 @@ QCborContainerPrivate *QCborContainerPrivate::clone(QCborContainerPrivate *d, qs QCborContainerPrivate *QCborContainerPrivate::detach(QCborContainerPrivate *d, qsizetype reserved) { - if (!d || d->ref.load() != 1) + if (!d || d->ref.loadRelaxed() != 1) return clone(d, reserved); return d; } @@ -883,12 +884,12 @@ void QCborContainerPrivate::replaceAt_complex(Element &e, const QCborValue &valu // detect self-assignment if (Q_UNLIKELY(this == value.container)) { - Q_ASSERT(ref.load() >= 2); + Q_ASSERT(ref.loadRelaxed() >= 2); if (disp == MoveContainer) ref.deref(); // not deref() because it can't drop to 0 QCborContainerPrivate *d = QCborContainerPrivate::clone(this); d->elements.detach(); - d->ref.store(1); + d->ref.storeRelaxed(1); e.container = d; } else { e.container = value.container; @@ -1367,7 +1368,7 @@ static Element decodeBasicValueFromCbor(QCborStreamReader &reader) static inline QCborContainerPrivate *createContainerFromCbor(QCborStreamReader &reader) { auto d = new QCborContainerPrivate; - d->ref.store(1); + d->ref.storeRelaxed(1); d->decodeFromCbor(reader); return d; } @@ -1642,7 +1643,7 @@ QCborValue::QCborValue(const QByteArray &ba) : n(0), container(new QCborContainerPrivate), t(ByteArray) { container->appendByteData(ba.constData(), ba.size(), t); - container->ref.store(1); + container->ref.storeRelaxed(1); } /*! @@ -1655,7 +1656,7 @@ QCborValue::QCborValue(const QString &s) : n(0), container(new QCborContainerPrivate), t(String) { container->append(s); - container->ref.store(1); + container->ref.storeRelaxed(1); } /*! @@ -1670,7 +1671,7 @@ QCborValue::QCborValue(QLatin1String s) : n(0), container(new QCborContainerPrivate), t(String) { container->append(s); - container->ref.store(1); + container->ref.storeRelaxed(1); } /*! @@ -1718,7 +1719,7 @@ QCborValue::QCborValue(const QCborMap &m) QCborValue::QCborValue(QCborTag t, const QCborValue &tv) : n(-1), container(new QCborContainerPrivate), t(Tag) { - container->ref.store(1); + container->ref.storeRelaxed(1); container->append(t); container->append(tv); } @@ -1986,12 +1987,24 @@ QUuid QCborValue::toUuid(const QUuid &defaultValue) const return QUuid::fromRfc4122(byteData->asByteArrayView()); } -QCborArray QCborValue::toArray() const -{ - return toArray(QCborArray()); -} +/*! + \fn QCborArray QCborValue::toArray() const + \fn QCborArray QCborValue::toArray(const QCborArray &defaultValue) const + + Returns the array value stored in this QCborValue, if it is of the array + type. Otherwise, it returns \a defaultValue. + + Note that this function performs no conversion from other types to + QCborArray. + + \sa isArray(), isByteArray(), isMap(), isContainer(), toMap() + */ /*! + \fn QCborArray QCborValueRef::toArray() const + \fn QCborArray QCborValueRef::toArray(const QCborArray &defaultValue) const + \internal + Returns the array value stored in this QCborValue, if it is of the array type. Otherwise, it returns \a defaultValue. @@ -2000,6 +2013,11 @@ QCborArray QCborValue::toArray() const \sa isArray(), isByteArray(), isMap(), isContainer(), toMap() */ +QCborArray QCborValue::toArray() const +{ + return toArray(QCborArray()); +} + QCborArray QCborValue::toArray(const QCborArray &defaultValue) const { if (!isArray()) @@ -2011,12 +2029,24 @@ QCborArray QCborValue::toArray(const QCborArray &defaultValue) const return dd ? QCborArray(*dd) : defaultValue; } -QCborMap QCborValue::toMap() const -{ - return toMap(QCborMap()); -} +/*! + \fn QCborMap QCborValue::toMap() const + \fn QCborMap QCborValue::toMap(const QCborMap &defaultValue) const + + Returns the map value stored in this QCborValue, if it is of the map type. + Otherwise, it returns \a defaultValue. + + Note that this function performs no conversion from other types to + QCborMap. + + \sa isMap(), isArray(), isContainer(), toArray() + */ /*! + \fn QCborMap QCborValueRef::toMap() const + \fn QCborMap QCborValueRef::toMap(const QCborMap &defaultValue) const + \internal + Returns the map value stored in this QCborValue, if it is of the map type. Otherwise, it returns \a defaultValue. @@ -2025,6 +2055,11 @@ QCborMap QCborValue::toMap() const \sa isMap(), isArray(), isContainer(), toArray() */ +QCborMap QCborValue::toMap() const +{ + return toMap(QCborMap()); +} + QCborMap QCborValue::toMap(const QCborMap &defaultValue) const { if (!isMap()) @@ -2077,15 +2112,16 @@ const QCborValue QCborValue::operator[](QLatin1String key) const } /*! + \overload + If this QCborValue is a QCborMap, searches elements for the value whose key - matches \a key. If this is an array, returns the element whose index is \a - key. If there's no matching value in the array or map, or if this + matches \a key. If this is a QCborArray, returns the element whose index is + \a key. If there's no matching value in the array or map, or if this QCborValue object is not an array or map, returns the undefined value. \sa operator[], QCborMap::operator[], QCborMap::value(), QCborMap::find(), QCborArray::operator[], QCborArray::at() */ - const QCborValue QCborValue::operator[](qint64 key) const { if (isMap()) @@ -2096,6 +2132,191 @@ const QCborValue QCborValue::operator[](qint64 key) const } /*! + \internal + */ +static Q_DECL_COLD_FUNCTION QCborMap arrayAsMap(const QCborArray &array) +{ + if (array.size()) + qWarning("Using CBOR array as map forced conversion"); + QCborMap map; + for (qsizetype i = array.size(); i-- > 0; ) { + QCborValue entry = array.at(i); + // Ignore padding entries that may have been added to grow the array + // when inserting past its end: + if (!entry.isInvalid()) + map[i] = entry; + } + return map; +} + +/*! + \internal + */ +static QCborContainerPrivate *maybeDetach(QCborContainerPrivate *container, qsizetype size) +{ + auto replace = QCborContainerPrivate::detach(container, size); + Q_ASSERT(replace); + if (replace != container) { + if (container) + container->deref(); + replace->ref.ref(); + } + return replace; +} + +/*! + \internal + */ +static QCborContainerPrivate *maybeGrow(QCborContainerPrivate *container, qsizetype index) +{ + auto replace = QCborContainerPrivate::grow(container, index); + Q_ASSERT(replace); + if (replace != container) { + if (container) + container->deref(); + replace->ref.ref(); + } + if (replace->elements.size() == index) + replace->append(Undefined()); + else + Q_ASSERT(replace->elements.size() > index); + return replace; +} + +/*! + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValue is a QCborMap, + this function is equivalent to the matching operator[] on that map. + + Before returning the reference: if this QCborValue was an array, it is first + converted to a map (so that \c{map[i]} is \c{array[i]} for each index, \c i, + with valid \c{array[i]}); otherwise, if it was not a map it will be + over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValue::operator[](const QString &key) +{ + if (!isMap()) + *this = QCborValue(isArray() ? arrayAsMap(toArray()) : QCborMap()); + + const qsizetype size = container ? container->elements.size() : 0; + qsizetype index = size + 1; + bool found = false; + if (container) { + QCborMap proxy(*container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + container = maybeDetach(container, size + (found ? 0 : 2)); + Q_ASSERT(container); + if (!found) { + container->append(key); + container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(container->elements.size() & 1)); + Q_ASSERT(index < container->elements.size()); + return { container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValue is a QCborMap, + this function is equivalent to the matching operator[] on that map. + + Before returning the reference: if this QCborValue was an array, it is first + converted to a map (so that \c{map[i]} is \c{array[i]} for each index, \c i, + with valid \c{array[i]}); otherwise, if it was not a map it will be + over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValue::operator[](QLatin1String key) +{ + if (!isMap()) + *this = QCborValue(isArray() ? arrayAsMap(toArray()) : QCborMap()); + + const qsizetype size = container ? container->elements.size() : 0; + qsizetype index = size + 1; + bool found = false; + if (container) { + QCborMap proxy(*container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + container = maybeDetach(container, size + (found ? 0 : 2)); + Q_ASSERT(container); + if (!found) { + container->append(key); + container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(container->elements.size() & 1)); + Q_ASSERT(index < container->elements.size()); + return { container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map or array, with the given \a key. When this QCborValue is a + QCborMap or, for 0 <= key < 0x10000, a QCborArray, this function is + equivalent to the matching operator[] on that map or array. + + Before returning the reference: if this QCborValue was an array but the key + is out of range, the array is first converted to a map (so that \c{map[i]} + is \c{array[i]} for each index, \c i, with valid \c{array[i]}); otherwise, + if it was not a map it will be over-written with an empty map. + + \sa operator[], QCborMap::operator[], QCborMap::value(), + QCborMap::find(), QCborArray::operator[], QCborArray::at() + */ +QCborValueRef QCborValue::operator[](qint64 key) +{ + if (isArray() && key >= 0 && key < 0x10000) { + container = maybeGrow(container, key); + return { container, qsizetype(key) }; + } + if (!isMap()) + *this = QCborValue(isArray() ? arrayAsMap(toArray()) : QCborMap()); + + const qsizetype size = container ? container->elements.size() : 0; + Q_ASSERT(!(size & 1)); + qsizetype index = size + 1; + bool found = false; + if (container) { + QCborMap proxy(*container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + container = maybeDetach(container, size + (found ? 0 : 2)); + Q_ASSERT(container); + if (!found) { + container->append(key); + container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(container->elements.size() & 1)); + Q_ASSERT(index < container->elements.size()); + return { container, index }; +} + +/*! Decodes one item from the CBOR stream found in \a reader and returns the equivalent representation. This function is recursive: if the item is a map or array, it will decode all items found in that map or array, until the @@ -2359,6 +2580,255 @@ QCborValue::Type QCborValueRef::concreteType(QCborValueRef self) noexcept return self.d->elements.at(self.i).type; } +/*! + If this QCborValueRef refers to a QCborMap, searches elements for the value + whose key matches \a key. If there's no key matching \a key in the map or if + this QCborValueRef object is not a map, returns the undefined value. + + This function is equivalent to: + + \code + value.toMap().value(key); + \endcode + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +const QCborValue QCborValueRef::operator[](const QString &key) const +{ + const QCborValue item = d->valueAt(i); + return item[key]; +} + +/*! + \overload + + If this QCborValueRef refers to a QCborMap, searches elements for the value + whose key matches \a key. If there's no key matching \a key in the map or if + this QCborValueRef object is not a map, returns the undefined value. + + This function is equivalent to: + + \code + value.toMap().value(key); + \endcode + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +const QCborValue QCborValueRef::operator[](QLatin1String key) const +{ + const QCborValue item = d->valueAt(i); + return item[key]; +} + +/*! + \overload + + If this QCborValueRef refers to a QCborMap, searches elements for the value + whose key matches \a key. If this is a QCborArray, returns the element whose + index is \a key. If there's no matching value in the array or map, or if + this QCborValueRef object is not an array or map, returns the undefined + value. + + \sa operator[], QCborMap::operator[], QCborMap::value(), + QCborMap::find(), QCborArray::operator[], QCborArray::at() + */ +const QCborValue QCborValueRef::operator[](qint64 key) const +{ + const QCborValue item = d->valueAt(i); + return item[key]; +} + +/*! + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValueRef refers to a + QCborMap, this function is equivalent to the matching operator[] on that + map. + + Before returning the reference: if the QCborValue referenced was an array, + it is first converted to a map (so that \c{map[i]} is \c{array[i]} for each + index, \c i, with valid \c{array[i]}); otherwise, if it was not a map it + will be over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValueRef::operator[](const QString &key) +{ + auto &e = d->elements[i]; + qsizetype size = 0; + if (e.flags & QtCbor::Element::IsContainer) { + if (e.container) { + if (e.type == QCborValue::Array) { + QCborValue repack = QCborValue(arrayAsMap(QCborArray(*e.container))); + qSwap(e.container, repack.container); + } else if (e.type != QCborValue::Map) { + e.container->deref(); + e.container = nullptr; + } + } + e.type = QCborValue::Map; + if (e.container) + size = e.container->elements.size(); + } else { + // Stomp any prior e.value, replace with a map (that we'll grow) + e.container = nullptr; + e.type = QCborValue::Map; + e.flags = QtCbor::Element::IsContainer; + } + + qsizetype index = size + 1; + bool found = false; + if (e.container) { + QCborMap proxy(*e.container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + e.container = maybeDetach(e.container, size + (found ? 0 : 2)); + Q_ASSERT(e.container); + if (!found) { + e.container->append(key); + e.container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(e.container->elements.size() & 1)); + Q_ASSERT(index < e.container->elements.size()); + return { e.container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map, with the given \a key. When this QCborValue is a QCborMap, + this function is equivalent to the matching operator[] on that map. + + Before returning the reference: if the QCborValue referenced was an array, + it is first converted to a map (so that \c{map[i]} is \c{array[i]} for each + index, \c i, with valid \c{array[i]}); otherwise, if it was not a map it + will be over-written with an empty map. + + \sa operator[](qint64), QCborMap::operator[], QCborMap::value(), + QCborMap::find() + */ +QCborValueRef QCborValueRef::operator[](QLatin1String key) +{ + auto &e = d->elements[i]; + qsizetype size = 0; + if (e.flags & QtCbor::Element::IsContainer) { + if (e.container) { + if (e.type == QCborValue::Array) { + QCborValue repack = QCborValue(arrayAsMap(QCborArray(*e.container))); + qSwap(e.container, repack.container); + } else if (e.type != QCborValue::Map) { + e.container->deref(); + e.container = nullptr; + } + } + e.type = QCborValue::Map; + if (e.container) + size = e.container->elements.size(); + } else { + // Stomp any prior e.value, replace with a map (that we'll grow) + e.container = nullptr; + e.type = QCborValue::Map; + e.flags = QtCbor::Element::IsContainer; + } + + qsizetype index = size + 1; + bool found = false; + if (e.container) { + QCborMap proxy(*e.container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + e.container = maybeDetach(e.container, size + (found ? 0 : 2)); + Q_ASSERT(e.container); + if (!found) { + e.container->append(key); + e.container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(e.container->elements.size() & 1)); + Q_ASSERT(index < e.container->elements.size()); + return { e.container, index }; +} + +/*! + \overload + + Returns a QCborValueRef that can be used to read or modify the entry in + this, as a map or array, with the given \a key. When this QCborValue is a + QCborMap or, for 0 <= key < 0x10000, a QCborArray, this function is + equivalent to the matching operator[] on that map or array. + + Before returning the reference: if the QCborValue referenced was an array + but the key is out of range, the array is first converted to a map (so that + \c{map[i]} is \c{array[i]} for each index, \c i, with valid \c{array[i]}); + otherwise, if it was not a map it will be over-written with an empty map. + + \sa operator[], QCborMap::operator[], QCborMap::value(), + QCborMap::find(), QCborArray::operator[], QCborArray::at() + */ +QCborValueRef QCborValueRef::operator[](qint64 key) +{ + auto &e = d->elements[i]; + if (e.type == QCborValue::Array && key >= 0 && key < 0x10000) { + e.container = maybeGrow(e.container, key); + return { e.container, qsizetype(key) }; + } + qsizetype size = 0; + if (e.flags & QtCbor::Element::IsContainer) { + if (e.container) { + if (e.type == QCborValue::Array) { + QCborValue repack = QCborValue(arrayAsMap(QCborArray(*e.container))); + qSwap(e.container, repack.container); + } else if (e.type != QCborValue::Map) { + e.container->deref(); + e.container = nullptr; + } + } + e.type = QCborValue::Map; + if (e.container) + size = e.container->elements.size(); + } else { + // Stomp any prior e.value, replace with a map (that we'll grow) + e.container = nullptr; + e.type = QCborValue::Map; + e.flags = QtCbor::Element::IsContainer; + } + Q_ASSERT(!(size & 1)); + + qsizetype index = size + 1; + bool found = false; + if (e.container) { + QCborMap proxy(*e.container); + auto it = proxy.constFind(key); + if (it < proxy.constEnd()) { + found = true; + index = it.item.i; + } + } + + e.container = maybeDetach(e.container, size + (found ? 0 : 2)); + Q_ASSERT(e.container); + if (!found) { + e.container->append(key); + e.container->append(QCborValue()); + } + Q_ASSERT(index & 1 && !(e.container->elements.size() & 1)); + Q_ASSERT(index < e.container->elements.size()); + return { e.container, index }; +} + + inline QCborArray::QCborArray(QCborContainerPrivate &dd) noexcept : d(&dd) { @@ -2471,7 +2941,7 @@ static QDebug debugContents(QDebug &dbg, const QCborValue &v) } if (v.isSimpleType()) return dbg << v.toSimpleType(); - return dbg << "<unknown type " << hex << int(v.type()) << dec << '>'; + return dbg << "<unknown type " << Qt::hex << int(v.type()) << Qt::dec << '>'; } QDebug operator<<(QDebug dbg, const QCborValue &v) { @@ -2481,6 +2951,26 @@ QDebug operator<<(QDebug dbg, const QCborValue &v) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QCborValue &value) +{ + stream << QCborValue(value).toCbor(); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QCborValue &value) +{ + QByteArray buffer; + stream >> buffer; + QCborParserError parseError{}; + value = QCborValue::fromCbor(buffer, &parseError); + if (parseError.error) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + + QT_END_NAMESPACE #include "qcborarray.cpp" diff --git a/src/corelib/serialization/qcborvalue.h b/src/corelib/serialization/qcborvalue.h index d6ba4e88d8..f542e44c47 100644 --- a/src/corelib/serialization/qcborvalue.h +++ b/src/corelib/serialization/qcborvalue.h @@ -69,6 +69,7 @@ class QCborArray; class QCborMap; class QCborStreamReader; class QCborStreamWriter; +class QDataStream; struct QCborParserError { @@ -78,6 +79,7 @@ struct QCborParserError QString errorString() const { return error.toString(); } }; +class QCborValueRef; class QCborContainerPrivate; class Q_CORE_EXPORT QCborValue { @@ -242,20 +244,18 @@ public: #endif QUuid toUuid(const QUuid &defaultValue = {}) const; -#ifdef Q_QDOC - QCborArray toArray(const QCborArray &a = {}) const; - QCborMap toMap(const QCborMap &m = {}) const; -#else // only forward-declared, need split functions QCborArray toArray() const; QCborArray toArray(const QCborArray &defaultValue) const; QCborMap toMap() const; QCborMap toMap(const QCborMap &defaultValue) const; -#endif const QCborValue operator[](const QString &key) const; const QCborValue operator[](QLatin1String key) const; const QCborValue operator[](qint64 key) const; + QCborValueRef operator[](qint64 key); + QCborValueRef operator[](QLatin1String key); + QCborValueRef operator[](const QString & key); int compare(const QCborValue &other) const; #if 0 && QT_HAS_INCLUDE(<compare>) @@ -393,16 +393,18 @@ public: QUuid toUuid(const QUuid &defaultValue = {}) const { return concrete().toUuid(defaultValue); } -#ifdef Q_QDOC - QCborArray toArray(const QCborArray &a = {}) const; - QCborMap toMap(const QCborMap &m = {}) const; -#else // only forward-declared, need split functions. Implemented in qcbor{array,map}.h QCborArray toArray() const; QCborArray toArray(const QCborArray &a) const; QCborMap toMap() const; QCborMap toMap(const QCborMap &m) const; -#endif + + const QCborValue operator[](const QString &key) const; + const QCborValue operator[](QLatin1String key) const; + const QCborValue operator[](qint64 key) const; + QCborValueRef operator[](qint64 key); + QCborValueRef operator[](QLatin1String key); + QCborValueRef operator[](const QString & key); int compare(const QCborValue &other) const { return concrete().compare(other); } @@ -434,6 +436,7 @@ public: { return concrete().toDiagnosticNotation(opt); } private: + friend class QCborValue; friend class QCborArray; friend class QCborMap; friend class QCborContainerPrivate; @@ -465,6 +468,11 @@ Q_CORE_EXPORT uint qHash(const QCborValue &value, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QCborValue &v); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QCborValue &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QCborValue &); +#endif + QT_END_NAMESPACE #if defined(QT_X11_DEFINES_FOUND) diff --git a/src/corelib/serialization/qdatastream.cpp b/src/corelib/serialization/qdatastream.cpp index 951f6c9736..b3330d6cea 100644 --- a/src/corelib/serialization/qdatastream.cpp +++ b/src/corelib/serialization/qdatastream.cpp @@ -98,6 +98,10 @@ QT_BEGIN_NAMESPACE ensures that you get integers of the size you want and insulates you from compiler and platform differences. + Enumerations can be serialized through QDataStream without the + need of manually defining streaming operators. Enum classes are + serialized using the declared size. + To take one example, a \c{char *} string is written as a 32-bit integer equal to the length of the string including the '\\0' byte, followed by all the characters of the string including the @@ -273,7 +277,7 @@ QT_BEGIN_NAMESPACE QDataStream::QDataStream() { - dev = 0; + dev = nullptr; owndev = false; byteorder = BigEndian; ver = Qt_DefaultCompiledVersion; @@ -368,7 +372,7 @@ QDataStream::~QDataStream() /*! \fn QIODevice *QDataStream::device() const - Returns the I/O device currently set, or 0 if no + Returns the I/O device currently set, or \nullptr if no device is currently set. \sa setDevice() @@ -377,7 +381,7 @@ QDataStream::~QDataStream() /*! void QDataStream::setDevice(QIODevice *d) - Sets the I/O device to \a d, which can be 0 + Sets the I/O device to \a d, which can be \nullptr to unset to current I/O device. \sa device() @@ -392,17 +396,18 @@ void QDataStream::setDevice(QIODevice *d) dev = d; } +#if QT_DEPRECATED_SINCE(5, 13) /*! \obsolete Unsets the I/O device. - Use setDevice(0) instead. + Use setDevice(nullptr) instead. */ void QDataStream::unsetDevice() { - setDevice(0); + setDevice(nullptr); } - +#endif /*! \fn bool QDataStream::atEnd() const @@ -428,7 +433,7 @@ bool QDataStream::atEnd() const */ QDataStream::FloatingPointPrecision QDataStream::floatingPointPrecision() const { - return d == 0 ? QDataStream::DoublePrecision : d->floatingPointPrecision; + return d ? d->floatingPointPrecision : QDataStream::DoublePrecision; } /*! @@ -453,7 +458,7 @@ QDataStream::FloatingPointPrecision QDataStream::floatingPointPrecision() const */ void QDataStream::setFloatingPointPrecision(QDataStream::FloatingPointPrecision precision) { - if (d == 0) + if (!d) d.reset(new QDataStreamPrivate()); d->floatingPointPrecision = precision; } @@ -559,6 +564,8 @@ void QDataStream::setByteOrder(ByteOrder bo) \value Qt_5_10 Same as Qt_5_6 \value Qt_5_11 Same as Qt_5_6 \value Qt_5_12 Version 18 (Qt 5.12) + \value Qt_5_13 Version 19 (Qt 5.13) + \value Qt_5_14 Same as Qt_5_13 \omitvalue Qt_DefaultCompiledVersion \sa setVersion(), version() @@ -632,7 +639,7 @@ void QDataStream::startTransaction() { CHECK_STREAM_PRECOND(Q_VOID) - if (d == 0) + if (!d) d.reset(new QDataStreamPrivate()); if (++d->transactionDepth == 1) { @@ -1026,8 +1033,7 @@ QDataStream &QDataStream::operator>>(char *&s) \c{delete []} operator. The \a l parameter is set to the length of the buffer. If the - string read is empty, \a l is set to 0 and \a s is set to - a null pointer. + string read is empty, \a l is set to 0 and \a s is set to \nullptr. The serialization format is a quint32 length specifier first, then \a l bytes of data. @@ -1037,7 +1043,7 @@ QDataStream &QDataStream::operator>>(char *&s) QDataStream &QDataStream::readBytes(char *&s, uint &l) { - s = 0; + s = nullptr; l = 0; CHECK_STREAM_PRECOND(*this) @@ -1048,8 +1054,8 @@ QDataStream &QDataStream::readBytes(char *&s, uint &l) const quint32 Step = 1024 * 1024; quint32 allocated = 0; - char *prevBuf = 0; - char *curBuf = 0; + char *prevBuf = nullptr; + char *curBuf = nullptr; do { int blockSize = qMin(Step, len - allocated); diff --git a/src/corelib/serialization/qdatastream.h b/src/corelib/serialization/qdatastream.h index eae0146553..cfcd89333b 100644 --- a/src/corelib/serialization/qdatastream.h +++ b/src/corelib/serialization/qdatastream.h @@ -55,7 +55,6 @@ class QByteArray; class QIODevice; template <typename T> class QList; -template <typename T> class QLinkedList; template <typename T> class QVector; template <typename T> class QSet; template <class Key, class T> class QHash; @@ -99,10 +98,20 @@ public: Qt_5_10 = Qt_5_9, Qt_5_11 = Qt_5_10, Qt_5_12 = 18, -#if QT_VERSION >= 0x050d00 + Qt_5_13 = 19, + Qt_5_14 = Qt_5_13, +#if QT_VERSION >= 0x050f00 + Qt_5_15 = Qt_5_14, + Qt_DefaultCompiledVersion = Qt_5_15 +#elif QT_VERSION >= 0x060000 + Qt_6_0 = Qt_5_15, + Qt_DefaultCompiledVersion = Qt_6_0 +#else + Qt_DefaultCompiledVersion = Qt_5_14 +#endif +#if QT_VERSION >= 0x060100 #error Add the datastream version for this Qt version and update Qt_DefaultCompiledVersion #endif - Qt_DefaultCompiledVersion = Qt_5_12 }; enum ByteOrder { @@ -130,7 +139,10 @@ public: QIODevice *device() const; void setDevice(QIODevice *); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QDataStream::setDevice(nullptr) instead") void unsetDevice(); +#endif bool atEnd() const; @@ -373,25 +385,23 @@ inline QDataStream &operator>>(QDataStream &s, QFlags<Enum> &e) { return s >> e.i; } template <typename T> -inline QDataStream &operator>>(QDataStream &s, QList<T> &l) -{ - return QtPrivate::readArrayBasedContainer(s, l); -} +typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type& +operator<<(QDataStream &s, const T &t) +{ return s << static_cast<typename std::underlying_type<T>::type>(t); } template <typename T> -inline QDataStream &operator<<(QDataStream &s, const QList<T> &l) -{ - return QtPrivate::writeSequentialContainer(s, l); -} +typename std::enable_if<std::is_enum<T>::value, QDataStream &>::type& +operator>>(QDataStream &s, T &t) +{ return s >> reinterpret_cast<typename std::underlying_type<T>::type &>(t); } template <typename T> -inline QDataStream &operator>>(QDataStream &s, QLinkedList<T> &l) +inline QDataStream &operator>>(QDataStream &s, QList<T> &l) { - return QtPrivate::readListBasedContainer(s, l); + return QtPrivate::readArrayBasedContainer(s, l); } template <typename T> -inline QDataStream &operator<<(QDataStream &s, const QLinkedList<T> &l) +inline QDataStream &operator<<(QDataStream &s, const QList<T> &l) { return QtPrivate::writeSequentialContainer(s, l); } diff --git a/src/corelib/serialization/qjson_p.h b/src/corelib/serialization/qjson_p.h index feba1faac6..9de53d5b74 100644 --- a/src/corelib/serialization/qjson_p.h +++ b/src/corelib/serialization/qjson_p.h @@ -304,7 +304,7 @@ public: return *this; } - QLatin1String toQLatin1String() const Q_DECL_NOTHROW { + QLatin1String toQLatin1String() const noexcept { return QLatin1String(d->latin1, d->length); } @@ -339,23 +339,23 @@ public: }; #define DEF_OP(op) \ - inline bool operator op(Latin1String lhs, Latin1String rhs) Q_DECL_NOTHROW \ + inline bool operator op(Latin1String lhs, Latin1String rhs) noexcept \ { \ return lhs.toQLatin1String() op rhs.toQLatin1String(); \ } \ - inline bool operator op(QLatin1String lhs, Latin1String rhs) Q_DECL_NOTHROW \ + inline bool operator op(QLatin1String lhs, Latin1String rhs) noexcept \ { \ return lhs op rhs.toQLatin1String(); \ } \ - inline bool operator op(Latin1String lhs, QLatin1String rhs) Q_DECL_NOTHROW \ + inline bool operator op(Latin1String lhs, QLatin1String rhs) noexcept \ { \ return lhs.toQLatin1String() op rhs; \ } \ - inline bool operator op(const QString &lhs, Latin1String rhs) Q_DECL_NOTHROW \ + inline bool operator op(const QString &lhs, Latin1String rhs) noexcept \ { \ return lhs op rhs.toQLatin1String(); \ } \ - inline bool operator op(Latin1String lhs, const QString &rhs) Q_DECL_NOTHROW \ + inline bool operator op(Latin1String lhs, const QString &rhs) noexcept \ { \ return lhs.toQLatin1String() op rhs; \ } \ @@ -686,7 +686,7 @@ public: { } inline Data(int reserved, QJsonValue::Type valueType) - : rawData(0), compactionCounter(0), ownsData(true) + : rawData(nullptr), compactionCounter(0), ownsData(true) { Q_ASSERT(valueType == QJsonValue::Array || valueType == QJsonValue::Object); @@ -719,7 +719,7 @@ public: Data *clone(Base *b, int reserve = 0) { int size = sizeof(Header) + b->size; - if (b == header->root() && ref.load() == 1 && alloc >= size + reserve) + if (b == header->root() && ref.loadRelaxed() == 1 && alloc >= size + reserve) return this; if (reserve) { @@ -728,7 +728,7 @@ public: size = qMax(size + reserve, qMin(size *2, (int)Value::MaxSize)); if (size > Value::MaxSize) { qWarning("QJson: Document too large to store in data structure"); - return 0; + return nullptr; } } char *raw = (char *)malloc(size); @@ -746,7 +746,7 @@ public: bool valid() const; private: - Q_DISABLE_COPY(Data) + Q_DISABLE_COPY_MOVE(Data) }; } diff --git a/src/corelib/serialization/qjsonarray.cpp b/src/corelib/serialization/qjsonarray.cpp index 1187bb03a3..6b327619ad 100644 --- a/src/corelib/serialization/qjsonarray.cpp +++ b/src/corelib/serialization/qjsonarray.cpp @@ -132,7 +132,7 @@ QT_BEGIN_NAMESPACE Creates an empty array. */ QJsonArray::QJsonArray() - : d(0), a(0) + : d(nullptr), a(nullptr) { } @@ -168,8 +168,8 @@ QJsonArray::QJsonArray(QJsonPrivate::Data *data, QJsonPrivate::Array *array) */ void QJsonArray::initialize() { - d = 0; - a = 0; + d = nullptr; + a = nullptr; } /*! @@ -675,6 +675,14 @@ bool QJsonArray::operator!=(const QJsonArray &other) const \sa begin(), constEnd() */ +/*! \fn QJsonArray::const_iterator QJsonArray::cbegin() const + + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the first item + in the array. + + \sa begin(), cend() +*/ + /*! \fn QJsonArray::iterator QJsonArray::end() Returns an \l{STL-style iterators}{STL-style iterator} pointing to the imaginary item @@ -696,6 +704,14 @@ bool QJsonArray::operator!=(const QJsonArray &other) const \sa constBegin(), end() */ +/*! \fn QJsonArray::const_iterator QJsonArray::cend() const + + Returns a const \l{STL-style iterators}{STL-style iterator} pointing to the imaginary + item after the last item in the array. + + \sa cbegin(), end() +*/ + /*! \fn void QJsonArray::push_back(const QJsonValue &value) This function is provided for STL compatibility. It is equivalent @@ -1210,7 +1226,7 @@ bool QJsonArray::detach2(uint reserve) d->ref.ref(); return true; } - if (reserve == 0 && d->ref.load() == 1) + if (reserve == 0 && d->ref.loadRelaxed() == 1) return true; QJsonPrivate::Data *x = d->clone(a, reserve); @@ -1259,5 +1275,22 @@ QDebug operator<<(QDebug dbg, const QJsonArray &a) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonArray &array) +{ + QJsonDocument doc{array}; + stream << doc.toJson(QJsonDocument::Compact); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonArray &array) +{ + QJsonDocument doc; + stream >> doc; + array = doc.array(); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsonarray.h b/src/corelib/serialization/qjsonarray.h index 5dff4a0aa9..983a6753b5 100644 --- a/src/corelib/serialization/qjsonarray.h +++ b/src/corelib/serialization/qjsonarray.h @@ -42,9 +42,7 @@ #include <QtCore/qjsonvalue.h> #include <QtCore/qiterator.h> -#if defined(Q_COMPILER_INITIALIZER_LISTS) #include <initializer_list> -#endif QT_BEGIN_NAMESPACE @@ -58,21 +56,19 @@ class Q_CORE_EXPORT QJsonArray public: QJsonArray(); -#if defined(Q_COMPILER_INITIALIZER_LISTS) || defined(Q_QDOC) QJsonArray(std::initializer_list<QJsonValue> args) { initialize(); for (std::initializer_list<QJsonValue>::const_iterator i = args.begin(); i != args.end(); ++i) append(*i); } -#endif ~QJsonArray(); QJsonArray(const QJsonArray &other); QJsonArray &operator =(const QJsonArray &other); - QJsonArray(QJsonArray &&other) Q_DECL_NOTHROW + QJsonArray(QJsonArray &&other) noexcept : d(other.d), a(other.a) { @@ -80,7 +76,7 @@ public: other.a = nullptr; } - QJsonArray &operator =(QJsonArray &&other) Q_DECL_NOTHROW + QJsonArray &operator =(QJsonArray &&other) noexcept { swap(other); return *this; @@ -115,7 +111,7 @@ public: bool operator==(const QJsonArray &other) const; bool operator!=(const QJsonArray &other) const; - void swap(QJsonArray &other) Q_DECL_NOTHROW + void swap(QJsonArray &other) noexcept { qSwap(d, other.d); qSwap(a, other.a); @@ -214,9 +210,11 @@ public: inline iterator begin() { detach2(); return iterator(this, 0); } inline const_iterator begin() const { return const_iterator(this, 0); } inline const_iterator constBegin() const { return const_iterator(this, 0); } + inline const_iterator cbegin() const { return const_iterator(this, 0); } inline iterator end() { detach2(); return iterator(this, size()); } inline const_iterator end() const { return const_iterator(this, size()); } inline const_iterator constEnd() const { return const_iterator(this, size()); } + inline const_iterator cend() const { return const_iterator(this, size()); } iterator insert(iterator before, const QJsonValue &value) { insert(before.i, value); return before; } iterator erase(iterator it) { removeAt(it.i); return it; } @@ -271,6 +269,11 @@ Q_CORE_EXPORT uint qHash(const QJsonArray &array, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonArray &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonArray &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonArray &); +#endif + QT_END_NAMESPACE #endif // QJSONARRAY_H diff --git a/src/corelib/serialization/qjsoncbor.cpp b/src/corelib/serialization/qjsoncbor.cpp index 4603750d11..e0c390f610 100644 --- a/src/corelib/serialization/qjsoncbor.cpp +++ b/src/corelib/serialization/qjsoncbor.cpp @@ -826,7 +826,7 @@ QCborArray QCborArray::fromJsonArray(const QJsonArray &array) { QCborArray a; a.detach(array.size()); - for (const QJsonValue v : array) { + for (const QJsonValue &v : array) { if (v.isString()) a.d->append(v.toString()); else diff --git a/src/corelib/serialization/qjsondocument.cpp b/src/corelib/serialization/qjsondocument.cpp index 0cd86d3ded..f8027efb58 100644 --- a/src/corelib/serialization/qjsondocument.cpp +++ b/src/corelib/serialization/qjsondocument.cpp @@ -47,6 +47,7 @@ #include "qjsonwriter_p.h" #include "qjsonparser_p.h" #include "qjson_p.h" +#include "qdatastream.h" QT_BEGIN_NAMESPACE @@ -83,7 +84,7 @@ QT_BEGIN_NAMESPACE * Constructs an empty and invalid document. */ QJsonDocument::QJsonDocument() - : d(0) + : d(nullptr) { } @@ -91,7 +92,7 @@ QJsonDocument::QJsonDocument() * Creates a QJsonDocument from \a object. */ QJsonDocument::QJsonDocument(const QJsonObject &object) - : d(0) + : d(nullptr) { setObject(object); } @@ -100,7 +101,7 @@ QJsonDocument::QJsonDocument(const QJsonObject &object) * Constructs a QJsonDocument from \a array. */ QJsonDocument::QJsonDocument(const QJsonArray &array) - : d(0) + : d(nullptr) { setArray(array); } @@ -235,7 +236,7 @@ const char *QJsonDocument::rawData(int *size) const { if (!d) { *size = 0; - return 0; + return nullptr; } *size = d->alloc; return d->rawData; @@ -634,7 +635,7 @@ bool QJsonDocument::operator==(const QJsonDocument &other) const */ bool QJsonDocument::isNull() const { - return (d == 0); + return (d == nullptr); } #if !defined(QT_NO_DEBUG_STREAM) && !defined(QT_JSON_READONLY) @@ -657,4 +658,23 @@ QDebug operator<<(QDebug dbg, const QJsonDocument &o) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonDocument &doc) +{ + stream << doc.toJson(QJsonDocument::Compact); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonDocument &doc) +{ + QByteArray buffer; + stream >> buffer; + QJsonParseError parseError{}; + doc = QJsonDocument::fromJson(buffer, &parseError); + if (parseError.error && !buffer.isEmpty()) + stream.setStatus(QDataStream::ReadCorruptData); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsondocument.h b/src/corelib/serialization/qjsondocument.h index b784890c54..a8006a6cc5 100644 --- a/src/corelib/serialization/qjsondocument.h +++ b/src/corelib/serialization/qjsondocument.h @@ -93,19 +93,19 @@ public: QJsonDocument(const QJsonDocument &other); QJsonDocument &operator =(const QJsonDocument &other); - QJsonDocument(QJsonDocument &&other) Q_DECL_NOTHROW + QJsonDocument(QJsonDocument &&other) noexcept : d(other.d) { other.d = nullptr; } - QJsonDocument &operator =(QJsonDocument &&other) Q_DECL_NOTHROW + QJsonDocument &operator =(QJsonDocument &&other) noexcept { swap(other); return *this; } - void swap(QJsonDocument &other) Q_DECL_NOTHROW + void swap(QJsonDocument &other) noexcept { qSwap(d, other.d); } @@ -172,6 +172,11 @@ Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonDocument) Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonDocument &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonDocument &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonDocument &); +#endif + QT_END_NAMESPACE #endif // QJSONDOCUMENT_H diff --git a/src/corelib/serialization/qjsonobject.cpp b/src/corelib/serialization/qjsonobject.cpp index 950bec535b..c1a6328b2f 100644 --- a/src/corelib/serialization/qjsonobject.cpp +++ b/src/corelib/serialization/qjsonobject.cpp @@ -110,7 +110,7 @@ QT_BEGIN_NAMESPACE \sa isEmpty() */ QJsonObject::QJsonObject() - : d(0), o(0) + : d(nullptr), o(nullptr) { } @@ -149,8 +149,8 @@ QJsonObject::QJsonObject(QJsonPrivate::Data *data, QJsonPrivate::Object *object) void QJsonObject::initialize() { - d = 0; - o = 0; + d = nullptr; + o = nullptr; } /*! @@ -646,7 +646,7 @@ bool QJsonObject::operator!=(const QJsonObject &other) const */ QJsonObject::iterator QJsonObject::erase(QJsonObject::iterator it) { - Q_ASSERT(d && d->ref.load() == 1); + Q_ASSERT(d && d->ref.loadRelaxed() == 1); if (it.o != this || it.i < 0 || it.i >= (int)o->length) return iterator(this, o->length); @@ -1231,7 +1231,7 @@ bool QJsonObject::detach2(uint reserve) d->ref.ref(); return true; } - if (reserve == 0 && d->ref.load() == 1) + if (reserve == 0 && d->ref.loadRelaxed() == 1) return true; QJsonPrivate::Data *x = d->clone(o, reserve); @@ -1320,4 +1320,21 @@ QDebug operator<<(QDebug dbg, const QJsonObject &o) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonObject &object) +{ + QJsonDocument doc{object}; + stream << doc.toJson(QJsonDocument::Compact); + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonObject &object) +{ + QJsonDocument doc; + stream >> doc; + object = doc.object(); + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsonobject.h b/src/corelib/serialization/qjsonobject.h index be42d3747a..d8e2ab9ca7 100644 --- a/src/corelib/serialization/qjsonobject.h +++ b/src/corelib/serialization/qjsonobject.h @@ -42,10 +42,8 @@ #include <QtCore/qjsonvalue.h> #include <QtCore/qiterator.h> -#ifdef Q_COMPILER_INITIALIZER_LISTS #include <QtCore/qpair.h> #include <initializer_list> -#endif QT_BEGIN_NAMESPACE @@ -60,34 +58,32 @@ class Q_CORE_EXPORT QJsonObject public: QJsonObject(); -#if defined(Q_COMPILER_INITIALIZER_LISTS) || defined(Q_QDOC) QJsonObject(std::initializer_list<QPair<QString, QJsonValue> > args) { initialize(); for (std::initializer_list<QPair<QString, QJsonValue> >::const_iterator i = args.begin(); i != args.end(); ++i) insert(i->first, i->second); } -#endif ~QJsonObject(); QJsonObject(const QJsonObject &other); QJsonObject &operator =(const QJsonObject &other); - QJsonObject(QJsonObject &&other) Q_DECL_NOTHROW + QJsonObject(QJsonObject &&other) noexcept : d(other.d), o(other.o) { other.d = nullptr; other.o = nullptr; } - QJsonObject &operator =(QJsonObject &&other) Q_DECL_NOTHROW + QJsonObject &operator =(QJsonObject &&other) noexcept { swap(other); return *this; } - void swap(QJsonObject &other) Q_DECL_NOTHROW + void swap(QJsonObject &other) noexcept { qSwap(d, other.d); qSwap(o, other.o); @@ -268,6 +264,11 @@ Q_CORE_EXPORT uint qHash(const QJsonObject &object, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonObject &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonObject &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonObject &); +#endif + QT_END_NAMESPACE #endif // QJSONOBJECT_H diff --git a/src/corelib/serialization/qjsonparser.cpp b/src/corelib/serialization/qjsonparser.cpp index bfba95520e..cd36bd5a5b 100644 --- a/src/corelib/serialization/qjsonparser.cpp +++ b/src/corelib/serialization/qjsonparser.cpp @@ -198,7 +198,9 @@ QString QJsonParseError::errorString() const using namespace QJsonPrivate; Parser::Parser(const char *json, int length) - : head(json), json(json), data(0), dataLength(0), current(0), nestingLevel(0), lastError(QJsonParseError::NoError) + : head(json), json(json), data(nullptr) + , dataLength(0), current(0), nestingLevel(0) + , lastError(QJsonParseError::NoError) { end = json + length; } @@ -316,7 +318,7 @@ QJsonDocument Parser::parse(QJsonParseError *error) eatBOM(); char token = nextToken(); - DEBUG << hex << (uint)token; + DEBUG << Qt::hex << (uint)token; if (token == BeginArray) { if (!parseArray()) goto error; diff --git a/src/corelib/serialization/qjsonvalue.cpp b/src/corelib/serialization/qjsonvalue.cpp index 2c04da4885..0bd28581f3 100644 --- a/src/corelib/serialization/qjsonvalue.cpp +++ b/src/corelib/serialization/qjsonvalue.cpp @@ -45,6 +45,7 @@ #include <qvariant.h> #include <qstringlist.h> #include <qdebug.h> +#include "qdatastream.h" #ifndef QT_BOOTSTRAPPED # include <qcborarray.h> @@ -111,7 +112,7 @@ QT_BEGIN_NAMESPACE The default is to create a Null value. */ QJsonValue::QJsonValue(Type type) - : ui(0), d(0), t(type) + : ui(0), d(nullptr), t(type) { } @@ -119,7 +120,7 @@ QJsonValue::QJsonValue(Type type) \internal */ QJsonValue::QJsonValue(QJsonPrivate::Data *data, QJsonPrivate::Base *base, const QJsonPrivate::Value &v) - : d(0) + : d(nullptr) { t = (Type)(uint)v.type; switch (t) { @@ -153,7 +154,7 @@ QJsonValue::QJsonValue(QJsonPrivate::Data *data, QJsonPrivate::Base *base, const Creates a value of type Bool, with value \a b. */ QJsonValue::QJsonValue(bool b) - : d(0), t(Bool) + : d(nullptr), t(Bool) { this->b = b; } @@ -162,7 +163,7 @@ QJsonValue::QJsonValue(bool b) Creates a value of type Double, with value \a n. */ QJsonValue::QJsonValue(double n) - : d(0), t(Double) + : d(nullptr), t(Double) { this->dbl = n; } @@ -172,7 +173,7 @@ QJsonValue::QJsonValue(double n) Creates a value of type Double, with value \a n. */ QJsonValue::QJsonValue(int n) - : d(0), t(Double) + : d(nullptr), t(Double) { this->dbl = n; } @@ -184,7 +185,7 @@ QJsonValue::QJsonValue(int n) If you pass in values outside this range expect a loss of precision to occur. */ QJsonValue::QJsonValue(qint64 n) - : d(0), t(Double) + : d(nullptr), t(Double) { this->dbl = double(n); } @@ -193,7 +194,7 @@ QJsonValue::QJsonValue(qint64 n) Creates a value of type String, with value \a s. */ QJsonValue::QJsonValue(const QString &s) - : d(0), t(String) + : d(nullptr), t(String) { stringDataFromQStringHelper(s); } @@ -220,7 +221,7 @@ void QJsonValue::stringDataFromQStringHelper(const QString &string) Creates a value of type String, with value \a s. */ QJsonValue::QJsonValue(QLatin1String s) - : d(0), t(String) + : d(nullptr), t(String) { // ### FIXME: Avoid creating the temp QString below QString str(s); @@ -933,4 +934,78 @@ QDebug operator<<(QDebug dbg, const QJsonValue &o) } #endif +#ifndef QT_NO_DATASTREAM +QDataStream &operator<<(QDataStream &stream, const QJsonValue &v) +{ + quint8 type = v.t; + stream << type; + switch (type) { + case QJsonValue::Undefined: + case QJsonValue::Null: + break; + case QJsonValue::Bool: + stream << v.toBool(); + break; + case QJsonValue::Double: + stream << v.toDouble(); + break; + case QJsonValue::String: + stream << v.toString(); + break; + case QJsonValue::Array: + stream << v.toArray(); + break; + case QJsonValue::Object: + stream << v.toObject(); + break; + } + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QJsonValue &v) +{ + quint8 type; + stream >> type; + switch (type) { + case QJsonValue::Undefined: + case QJsonValue::Null: + v = QJsonValue{QJsonValue::Type(type)}; + break; + case QJsonValue::Bool: { + bool b; + stream >> b; + v = QJsonValue(b); + break; + } case QJsonValue::Double: { + double d; + stream >> d; + v = QJsonValue{d}; + break; + } case QJsonValue::String: { + QString s; + stream >> s; + v = QJsonValue{s}; + break; + } + case QJsonValue::Array: { + QJsonArray a; + stream >> a; + v = QJsonValue{a}; + break; + } + case QJsonValue::Object: { + QJsonObject o; + stream >> o; + v = QJsonValue{o}; + break; + } + default: { + stream.setStatus(QDataStream::ReadCorruptData); + v = QJsonValue{QJsonValue::Undefined}; + } + } + return stream; +} +#endif + QT_END_NAMESPACE diff --git a/src/corelib/serialization/qjsonvalue.h b/src/corelib/serialization/qjsonvalue.h index d8e121524d..37d84f9e60 100644 --- a/src/corelib/serialization/qjsonvalue.h +++ b/src/corelib/serialization/qjsonvalue.h @@ -92,7 +92,7 @@ public: QJsonValue(const QJsonValue &other); QJsonValue &operator =(const QJsonValue &other); - QJsonValue(QJsonValue &&other) Q_DECL_NOTHROW + QJsonValue(QJsonValue &&other) noexcept : ui(other.ui), d(other.d), t(other.t) @@ -102,13 +102,13 @@ public: other.t = Null; } - QJsonValue &operator =(QJsonValue &&other) Q_DECL_NOTHROW + QJsonValue &operator =(QJsonValue &&other) noexcept { swap(other); return *this; } - void swap(QJsonValue &other) Q_DECL_NOTHROW + void swap(QJsonValue &other) noexcept { qSwap(ui, other.ui); qSwap(d, other.d); @@ -152,6 +152,7 @@ private: friend class QJsonObject; friend class QCborValue; friend Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); + friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonValue &); QJsonValue(QJsonPrivate::Data *d, QJsonPrivate::Base *b, const QJsonPrivate::Value& v); void stringDataFromQStringHelper(const QString &string); @@ -218,7 +219,6 @@ private: uint index : 31; }; -#ifndef Q_QDOC // ### Qt 6: Get rid of these fake pointer classes class QJsonValuePtr { @@ -243,7 +243,6 @@ public: QJsonValueRef& operator*() { return valueRef; } QJsonValueRef* operator->() { return &valueRef; } }; -#endif Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QJsonValue) @@ -253,6 +252,11 @@ Q_CORE_EXPORT uint qHash(const QJsonValue &value, uint seed = 0); Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); #endif +#ifndef QT_NO_DATASTREAM +Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QJsonValue &); +Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QJsonValue &); +#endif + QT_END_NAMESPACE #endif // QJSONVALUE_H diff --git a/src/corelib/serialization/qjsonwriter.cpp b/src/corelib/serialization/qjsonwriter.cpp index 12ce20ef09..5b246837d2 100644 --- a/src/corelib/serialization/qjsonwriter.cpp +++ b/src/corelib/serialization/qjsonwriter.cpp @@ -58,7 +58,6 @@ static inline uchar hexdig(uint u) static QByteArray escapedString(const QString &s) { - const uchar replacement = '?'; QByteArray ba(s.length(), Qt::Uninitialized); uchar *cursor = reinterpret_cast<uchar *>(const_cast<char *>(ba.constData())); @@ -111,9 +110,14 @@ static QByteArray escapedString(const QString &s) } else { *cursor++ = (uchar)u; } - } else { - if (QUtf8Functions::toUtf8<QUtf8BaseTraits>(u, cursor, src, end) < 0) - *cursor++ = replacement; + } else if (QUtf8Functions::toUtf8<QUtf8BaseTraits>(u, cursor, src, end) < 0) { + // failed to get valid utf8 use JSON escape sequence + *cursor++ = '\\'; + *cursor++ = 'u'; + *cursor++ = hexdig(u>>12 & 0x0f); + *cursor++ = hexdig(u>>8 & 0x0f); + *cursor++ = hexdig(u>>4 & 0x0f); + *cursor++ = hexdig(u & 0x0f); } } diff --git a/src/corelib/serialization/qtextstream.cpp b/src/corelib/serialization/qtextstream.cpp index fb7b677b2d..9d4bc223ab 100644 --- a/src/corelib/serialization/qtextstream.cpp +++ b/src/corelib/serialization/qtextstream.cpp @@ -135,30 +135,30 @@ static const int QTEXTSTREAM_BUFFERSIZE = 16384; \table \header \li Manipulator \li Description - \row \li \c bin \li Same as setIntegerBase(2). - \row \li \c oct \li Same as setIntegerBase(8). - \row \li \c dec \li Same as setIntegerBase(10). - \row \li \c hex \li Same as setIntegerBase(16). - \row \li \c showbase \li Same as setNumberFlags(numberFlags() | ShowBase). - \row \li \c forcesign \li Same as setNumberFlags(numberFlags() | ForceSign). - \row \li \c forcepoint \li Same as setNumberFlags(numberFlags() | ForcePoint). - \row \li \c noshowbase \li Same as setNumberFlags(numberFlags() & ~ShowBase). - \row \li \c noforcesign \li Same as setNumberFlags(numberFlags() & ~ForceSign). - \row \li \c noforcepoint \li Same as setNumberFlags(numberFlags() & ~ForcePoint). - \row \li \c uppercasebase \li Same as setNumberFlags(numberFlags() | UppercaseBase). - \row \li \c uppercasedigits \li Same as setNumberFlags(numberFlags() | UppercaseDigits). - \row \li \c lowercasebase \li Same as setNumberFlags(numberFlags() & ~UppercaseBase). - \row \li \c lowercasedigits \li Same as setNumberFlags(numberFlags() & ~UppercaseDigits). - \row \li \c fixed \li Same as setRealNumberNotation(FixedNotation). - \row \li \c scientific \li Same as setRealNumberNotation(ScientificNotation). - \row \li \c left \li Same as setFieldAlignment(AlignLeft). - \row \li \c right \li Same as setFieldAlignment(AlignRight). - \row \li \c center \li Same as setFieldAlignment(AlignCenter). - \row \li \c endl \li Same as operator<<('\\n') and flush(). - \row \li \c flush \li Same as flush(). - \row \li \c reset \li Same as reset(). - \row \li \c ws \li Same as skipWhiteSpace(). - \row \li \c bom \li Same as setGenerateByteOrderMark(true). + \row \li \c Qt::bin \li Same as setIntegerBase(2). + \row \li \c Qt::oct \li Same as setIntegerBase(8). + \row \li \c Qt::dec \li Same as setIntegerBase(10). + \row \li \c Qt::hex \li Same as setIntegerBase(16). + \row \li \c Qt::showbase \li Same as setNumberFlags(numberFlags() | ShowBase). + \row \li \c Qt::forcesign \li Same as setNumberFlags(numberFlags() | ForceSign). + \row \li \c Qt::forcepoint \li Same as setNumberFlags(numberFlags() | ForcePoint). + \row \li \c Qt::noshowbase \li Same as setNumberFlags(numberFlags() & ~ShowBase). + \row \li \c Qt::noforcesign \li Same as setNumberFlags(numberFlags() & ~ForceSign). + \row \li \c Qt::noforcepoint \li Same as setNumberFlags(numberFlags() & ~ForcePoint). + \row \li \c Qt::uppercasebase \li Same as setNumberFlags(numberFlags() | UppercaseBase). + \row \li \c Qt::uppercasedigits \li Same as setNumberFlags(numberFlags() | UppercaseDigits). + \row \li \c Qt::lowercasebase \li Same as setNumberFlags(numberFlags() & ~UppercaseBase). + \row \li \c Qt::lowercasedigits \li Same as setNumberFlags(numberFlags() & ~UppercaseDigits). + \row \li \c Qt::fixed \li Same as setRealNumberNotation(FixedNotation). + \row \li \c Qt::scientific \li Same as setRealNumberNotation(ScientificNotation). + \row \li \c Qt::left \li Same as setFieldAlignment(AlignLeft). + \row \li \c Qt::right \li Same as setFieldAlignment(AlignRight). + \row \li \c Qt::center \li Same as setFieldAlignment(AlignCenter). + \row \li \c Qt::endl \li Same as operator<<('\\n') and flush(). + \row \li \c Qt::flush \li Same as flush(). + \row \li \c Qt::reset \li Same as reset(). + \row \li \c Qt::ws \li Same as skipWhiteSpace(). + \row \li \c Qt::bom \li Same as setGenerateByteOrderMark(true). \endtable In addition, Qt provides three global manipulators that take a @@ -327,7 +327,7 @@ QT_BEGIN_NAMESPACE QTextStreamPrivate::QTextStreamPrivate(QTextStream *q_ptr) : #if QT_CONFIG(textcodec) - readConverterSavedState(0), + readConverterSavedState(nullptr), #endif readConverterSavedStateOffset(0), locale(QLocale::c()) @@ -381,7 +381,7 @@ void QTextStreamPrivate::Params::reset() padChar = QLatin1Char(' '); fieldAlignment = QTextStream::AlignRight; realNumberNotation = QTextStream::SmartNotation; - numberFlags = 0; + numberFlags = { }; } /*! @@ -391,9 +391,9 @@ void QTextStreamPrivate::reset() { params.reset(); - device = 0; + device = nullptr; deleteDevice = false; - string = 0; + string = nullptr; stringOffset = 0; stringOpenMode = QIODevice::NotOpen; @@ -406,7 +406,7 @@ void QTextStreamPrivate::reset() resetCodecConverterStateHelper(&readConverterState); resetCodecConverterStateHelper(&writeConverterState); delete readConverterSavedState; - readConverterSavedState = 0; + readConverterSavedState = nullptr; writeConverterState.flags |= QTextCodec::IgnoreHeader; autoDetectUnicode = true; #endif @@ -1207,7 +1207,7 @@ bool QTextStream::seek(qint64 pos) resetCodecConverterStateHelper(&d->readConverterState); resetCodecConverterStateHelper(&d->writeConverterState); delete d->readConverterSavedState; - d->readConverterSavedState = 0; + d->readConverterSavedState = nullptr; d->writeConverterState.flags |= QTextCodec::IgnoreHeader; #endif return true; @@ -1295,7 +1295,7 @@ void QTextStream::skipWhiteSpace() { Q_D(QTextStream); CHECK_VALID_STREAM(Q_VOID); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); + d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace); d->consumeLastToken(); } @@ -1332,7 +1332,7 @@ void QTextStream::setDevice(QIODevice *device) /*! Returns the current device associated with the QTextStream, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice(), string() */ @@ -1369,8 +1369,8 @@ void QTextStream::setString(QString *string, QIODevice::OpenMode openMode) } /*! - Returns the current string assigned to the QTextStream, or 0 if no - string has been assigned. + Returns the current string assigned to the QTextStream, or + \nullptr if no string has been assigned. \sa setString(), device() */ @@ -1751,7 +1751,7 @@ QString QTextStream::read(qint64 maxlen) */ QTextStreamPrivate::NumberParsingStatus QTextStreamPrivate::getNumber(qulonglong *ret) { - scan(0, 0, 0, NotSpace); + scan(nullptr, nullptr, 0, NotSpace); consumeLastToken(); // detect int encoding @@ -1980,7 +1980,7 @@ bool QTextStreamPrivate::getReal(double *f) ParserState state = Init; InputToken input = None; - scan(0, 0, 0, NotSpace); + scan(nullptr, nullptr, 0, NotSpace); consumeLastToken(); const int BufferSize = 128; @@ -2084,7 +2084,7 @@ QTextStream &QTextStream::operator>>(QChar &c) { Q_D(QTextStream); CHECK_VALID_STREAM(*this); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); + d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace); if (!d->getChar(&c)) setStatus(ReadPastEnd); return *this; @@ -2245,7 +2245,7 @@ QTextStream &QTextStream::operator>>(QString &str) CHECK_VALID_STREAM(*this); str.clear(); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); + d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace); d->consumeLastToken(); const QChar *ptr; @@ -2273,7 +2273,7 @@ QTextStream &QTextStream::operator>>(QByteArray &array) CHECK_VALID_STREAM(*this); array.clear(); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); + d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace); d->consumeLastToken(); const QChar *ptr; @@ -2308,7 +2308,7 @@ QTextStream &QTextStream::operator>>(char *c) Q_D(QTextStream); *c = 0; CHECK_VALID_STREAM(*this); - d->scan(0, 0, 0, QTextStreamPrivate::NotSpace); + d->scan(nullptr, nullptr, 0, QTextStreamPrivate::NotSpace); d->consumeLastToken(); const QChar *ptr; @@ -2356,7 +2356,7 @@ void QTextStreamPrivate::putNumber(qulonglong number, bool negative) } else if (negative) { // Workaround for backward compatibility for writing negative // numbers in octal and hex: - // QTextStream(result) << showbase << hex << -1 << oct << -1 + // QTextStream(result) << Qt::showbase << Qt::hex << -1 << oct << -1 // should output: -0x1 -0b1 result = dd->unsLongLongToString(number, -1, base, -1, flags); result.prepend(locale.negativeSign()); @@ -2689,6 +2689,11 @@ QTextStream &QTextStream::operator<<(const void *ptr) d->params.numberFlags = oldFlags; return *this; } +#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +namespace Qt { +#else +namespace QTextStreamFunctions { +#endif /*! \relates QTextStream @@ -2973,7 +2978,7 @@ QTextStream ¢er(QTextStream &stream) */ QTextStream &endl(QTextStream &stream) { - return stream << QLatin1Char('\n') << flush; + return stream << QLatin1Char('\n') << Qt::flush; } /*! @@ -3015,6 +3020,8 @@ QTextStream &ws(QTextStream &stream) return stream; } +} // namespace QTextStreamFunctions + /*! \fn QTextStreamManipulator qSetFieldWidth(int width) \relates QTextStream @@ -3037,6 +3044,12 @@ QTextStream &ws(QTextStream &stream) */ #if QT_CONFIG(textcodec) + +#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +namespace Qt { +#else +namespace QTextStreamFunctions { +#endif /*! \relates QTextStream @@ -3051,6 +3064,8 @@ QTextStream &bom(QTextStream &stream) return stream; } +} // namespace QTextStreamFunctions + /*! Sets the codec for this stream to \a codec. The codec is used for decoding any data that is read from the assigned device, and for @@ -3200,6 +3215,43 @@ QLocale QTextStream::locale() const return d->locale; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC) +// Binary compatible definitions for Qt<5.14 +Q_CORE_EXPORT QTextStream &bin(QTextStream &s) { return Qt::bin(s); } +Q_CORE_EXPORT QTextStream &oct(QTextStream &s) { return Qt::oct(s); } +Q_CORE_EXPORT QTextStream &dec(QTextStream &s) { return Qt::dec(s); } +Q_CORE_EXPORT QTextStream &hex(QTextStream &s) { return Qt::hex(s); } + +Q_CORE_EXPORT QTextStream &showbase(QTextStream &s) { return Qt::showbase(s); } +Q_CORE_EXPORT QTextStream &forcesign(QTextStream &s) { return Qt::forcesign(s); } +Q_CORE_EXPORT QTextStream &forcepoint(QTextStream &s) { return Qt::forcepoint(s); } +Q_CORE_EXPORT QTextStream &noshowbase(QTextStream &s) { return Qt::noshowbase(s); } +Q_CORE_EXPORT QTextStream &noforcesign(QTextStream &s) { return Qt::noforcesign(s); } +Q_CORE_EXPORT QTextStream &noforcepoint(QTextStream &s) { return Qt::noforcepoint(s); } + +Q_CORE_EXPORT QTextStream &uppercasebase(QTextStream &s) { return Qt::uppercasebase(s); } +Q_CORE_EXPORT QTextStream &uppercasedigits(QTextStream &s) { return Qt::uppercasedigits(s); } +Q_CORE_EXPORT QTextStream &lowercasebase(QTextStream &s) { return Qt::lowercasebase(s); } +Q_CORE_EXPORT QTextStream &lowercasedigits(QTextStream &s) { return Qt::lowercasedigits(s); } + +Q_CORE_EXPORT QTextStream &fixed(QTextStream &s) { return Qt::fixed(s); } +Q_CORE_EXPORT QTextStream &scientific(QTextStream &s) { return Qt::scientific(s); } + +Q_CORE_EXPORT QTextStream &left(QTextStream &s) { return Qt::left(s); } +Q_CORE_EXPORT QTextStream &right(QTextStream &s) { return Qt::right(s); } +Q_CORE_EXPORT QTextStream ¢er(QTextStream &s) { return Qt::center(s); } + +Q_CORE_EXPORT QTextStream &endl(QTextStream &s) { return Qt::endl(s); } +Q_CORE_EXPORT QTextStream &flush(QTextStream &s) { return Qt::flush(s); } +Q_CORE_EXPORT QTextStream &reset(QTextStream &s) { return Qt::reset(s); } + +Q_CORE_EXPORT QTextStream &ws(QTextStream &s) { return Qt::ws(s); } + +#if QT_CONFIG(textcodec) +Q_CORE_EXPORT QTextStream &bom(QTextStream &s) { return Qt::bom(s); } +#endif +#endif + QT_END_NAMESPACE #ifndef QT_NO_QOBJECT diff --git a/src/corelib/serialization/qtextstream.h b/src/corelib/serialization/qtextstream.h index 1d86a18b9c..4efa84f1f1 100644 --- a/src/corelib/serialization/qtextstream.h +++ b/src/corelib/serialization/qtextstream.h @@ -213,8 +213,8 @@ typedef void (QTextStream::*QTSMFC)(QChar); // manipulator w/QChar argument class Q_CORE_EXPORT QTextStreamManipulator { public: - Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFI m, int a) Q_DECL_NOTHROW : mf(m), mc(nullptr), arg(a), ch() {} - Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFC m, QChar c) Q_DECL_NOTHROW : mf(nullptr), mc(m), arg(-1), ch(c) {} + Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFI m, int a) noexcept : mf(m), mc(nullptr), arg(a), ch() {} + Q_DECL_CONSTEXPR QTextStreamManipulator(QTSMFC m, QChar c) noexcept : mf(nullptr), mc(m), arg(-1), ch(c) {} void exec(QTextStream &s) { if (mf) { (s.*mf)(arg); } else { (s.*mc)(ch); } } private: @@ -233,6 +233,13 @@ inline QTextStream &operator<<(QTextStream &s, QTextStreamFunction f) inline QTextStream &operator<<(QTextStream &s, QTextStreamManipulator m) { m.exec(s); return s; } +#if defined(Q_QDOC) || QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +namespace Qt { +#else +// This namespace only exists for 'using namespace' declarations. +namespace QTextStreamFunctions { +#endif + Q_CORE_EXPORT QTextStream &bin(QTextStream &s); Q_CORE_EXPORT QTextStream &oct(QTextStream &s); Q_CORE_EXPORT QTextStream &dec(QTextStream &s); @@ -265,6 +272,18 @@ Q_CORE_EXPORT QTextStream &bom(QTextStream &s); Q_CORE_EXPORT QTextStream &ws(QTextStream &s); +} // namespace QTextStreamFunctions + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC) +namespace Qt { +using namespace QTextStreamFunctions; +} + +// We use 'using namespace' as that doesn't cause +// conflicting definitions compiler errors. +using namespace QTextStreamFunctions; +#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0) && !defined(Q_QDOC) + inline QTextStreamManipulator qSetFieldWidth(int width) { QTSMFI func = &QTextStream::setFieldWidth; diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 827996ee2d..be3a476cb2 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -58,9 +58,9 @@ // case for most bootstrapped applications. #define Q_DECLARE_TR_FUNCTIONS(context) \ public: \ - static inline QString tr(const char *sourceText, const char *comment = 0) \ + static inline QString tr(const char *sourceText, const char *comment = nullptr) \ { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \ - static inline QString trUtf8(const char *sourceText, const char *comment = 0) \ + static inline QString trUtf8(const char *sourceText, const char *comment = nullptr) \ { Q_UNUSED(comment); return QString::fromLatin1(sourceText); } \ static inline QString tr(const char *sourceText, const char*, int) \ { return QString::fromLatin1(sourceText); } \ @@ -223,7 +223,7 @@ QString QXmlStreamReaderPrivate::resolveUndeclaredEntity(const QString &name) The stream reader does \e not take ownership of the resolver. It's the callers responsibility to ensure that the resolver is valid during the entire life-time of the stream reader object, or until - another resolver or 0 is set. + another resolver or \nullptr is set. \sa entityResolver() */ @@ -236,7 +236,7 @@ void QXmlStreamReader::setEntityResolver(QXmlStreamEntityResolver *resolver) /*! \since 4.4 - Returns the entity resolver, or 0 if there is no entity resolver. + Returns the entity resolver, or \nullptr if there is no entity resolver. \sa setEntityResolver() */ @@ -480,7 +480,7 @@ void QXmlStreamReader::setDevice(QIODevice *device) /*! Returns the current device associated with the QXmlStreamReader, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice() */ @@ -548,7 +548,7 @@ void QXmlStreamReader::clear() if (d->device) { if (d->deleteDevice) delete d->device; - d->device = 0; + d->device = nullptr; } } @@ -792,16 +792,16 @@ QXmlStreamPrivateTagStack::QXmlStreamPrivateTagStack() QXmlStreamReaderPrivate::QXmlStreamReaderPrivate(QXmlStreamReader *q) :q_ptr(q) { - device = 0; + device = nullptr; deleteDevice = false; #if QT_CONFIG(textcodec) - decoder = 0; + decoder = nullptr; #endif stack_size = 64; - sym_stack = 0; - state_stack = 0; + sym_stack = nullptr; + state_stack = nullptr; reallocateStack(); - entityResolver = 0; + entityResolver = nullptr; init(); #define ADD_PREDEFINED(n, v) \ do { \ @@ -843,11 +843,11 @@ void QXmlStreamReaderPrivate::init() #if QT_CONFIG(textcodec) codec = QTextCodec::codecForMib(106); // utf8 delete decoder; - decoder = 0; + decoder = nullptr; #endif attributeStack.clear(); attributeStack.reserve(16); - entityParser = 0; + entityParser = nullptr; hasCheckedStartDocument = false; normalizeLiterals = false; hasSeenTag = false; @@ -2285,12 +2285,14 @@ QXmlStreamAttribute::QXmlStreamAttribute() m_isDefault = false; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! Destructs an attribute. */ QXmlStreamAttribute::~QXmlStreamAttribute() { } +#endif /*! Constructs an attribute in the namespace described with \a namespaceUri with \a name and value \a value. @@ -2366,6 +2368,7 @@ QXmlStreamAttribute::QXmlStreamAttribute(const QString &qualifiedName, const QSt */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! Creates a copy of \a other. */ @@ -2386,7 +2389,7 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o m_isDefault = other.m_isDefault; return *this; } - +#endif /*! \class QXmlStreamAttributes @@ -2442,6 +2445,8 @@ QXmlStreamAttribute& QXmlStreamAttribute::operator=(const QXmlStreamAttribute &o QXmlStreamNotationDeclaration::QXmlStreamNotationDeclaration() { } + +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! Creates a copy of \a other. */ @@ -2467,6 +2472,7 @@ Destructs this notation declaration. QXmlStreamNotationDeclaration::~QXmlStreamNotationDeclaration() { } +#endif /*! \fn QStringRef QXmlStreamNotationDeclaration::name() const @@ -2539,6 +2545,7 @@ QXmlStreamNamespaceDeclaration::QXmlStreamNamespaceDeclaration(const QString &pr m_namespaceUri = namespaceUri; } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! Creates a copy of \a other. */ @@ -2562,6 +2569,7 @@ Destructs this namespace declaration. QXmlStreamNamespaceDeclaration::~QXmlStreamNamespaceDeclaration() { } +#endif /*! \fn QStringRef QXmlStreamNamespaceDeclaration::prefix() const @@ -2609,6 +2617,7 @@ QXmlStreamEntityDeclaration::QXmlStreamEntityDeclaration() { } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) /*! Creates a copy of \a other. */ @@ -2636,6 +2645,7 @@ QXmlStreamEntityDeclaration& QXmlStreamEntityDeclaration::operator=(const QXmlSt QXmlStreamEntityDeclaration::~QXmlStreamEntityDeclaration() { } +#endif /*! \fn QXmlStreamStringRef::swap(QXmlStreamStringRef &other) \since 5.6 @@ -3014,8 +3024,8 @@ QXmlStreamWriterPrivate::QXmlStreamWriterPrivate(QXmlStreamWriter *q) :autoFormattingIndent(4, ' ') { q_ptr = q; - device = 0; - stringDevice = 0; + device = nullptr; + stringDevice = nullptr; deleteDevice = false; #if QT_CONFIG(textcodec) codec = QTextCodec::codecForMib(106); // utf8 @@ -3305,7 +3315,7 @@ void QXmlStreamWriter::setDevice(QIODevice *device) Q_D(QXmlStreamWriter); if (device == d->device) return; - d->stringDevice = 0; + d->stringDevice = nullptr; if (d->deleteDevice) { delete d->device; d->deleteDevice = false; @@ -3315,7 +3325,7 @@ void QXmlStreamWriter::setDevice(QIODevice *device) /*! Returns the current device associated with the QXmlStreamWriter, - or 0 if no device has been assigned. + or \nullptr if no device has been assigned. \sa setDevice() */ diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g index 10bfcd491c..12ecc9bdb2 100644 --- a/src/corelib/serialization/qxmlstream.g +++ b/src/corelib/serialization/qxmlstream.g @@ -41,6 +41,8 @@ %merged_output qxmlstream_p.h +%expect 4 + %token NOTOKEN %token SPACE " " %token LANGLE "<" @@ -144,7 +146,12 @@ %start document + + /. + +#include <QtCore/private/qglobal_p.h> + template <typename T> class QXmlStreamSimpleStack { T *data; int tos, cap; @@ -155,7 +162,8 @@ public: inline void reserve(int extraCapacity) { if (tos + extraCapacity + 1 > cap) { cap = qMax(tos + extraCapacity + 1, cap << 1 ); - data = reinterpret_cast<T *>(realloc(data, cap * sizeof(T))); + void *ptr = realloc(static_cast<void *>(data), cap * sizeof(T)); + data = reinterpret_cast<T *>(ptr); Q_CHECK_PTR(data); } } @@ -498,7 +506,7 @@ public: int fastScanLiteralContent(); int fastScanSpace(); int fastScanContentCharList(); - int fastScanName(int *prefix = 0); + int fastScanName(int *prefix = nullptr); inline int fastScanNMTOKEN(); @@ -753,7 +761,7 @@ bool QXmlStreamReaderPrivate::parse() state_stack[tos] = 0; return true; } else if (act > 0) { - if (++tos == stack_size-1) + if (++tos >= stack_size-1) reallocateStack(); Value &val = sym_stack[tos]; @@ -890,7 +898,7 @@ doctype_decl ::= langle_bang DOCTYPE qname markup space_opt RANGLE; /. case $rule_number: dtdName = symString(3); - // fall through + Q_FALLTHROUGH(); ./ doctype_decl ::= doctype_decl_start external_id space_opt markup space_opt RANGLE; /. diff --git a/src/corelib/serialization/qxmlstream.h b/src/corelib/serialization/qxmlstream.h index d30c6bc01f..7d0aa64570 100644 --- a/src/corelib/serialization/qxmlstream.h +++ b/src/corelib/serialization/qxmlstream.h @@ -59,19 +59,15 @@ public: inline QXmlStreamStringRef(const QStringRef &aString) :m_string(aString.string()?*aString.string():QString()), m_position(aString.position()), m_size(aString.size()){} QXmlStreamStringRef(const QString &aString) : m_string(aString), m_position(0), m_size(m_string.size()) {} -#ifdef Q_COMPILER_RVALUE_REFS - QXmlStreamStringRef(QString &&aString) Q_DECL_NOTHROW : m_string(std::move(aString)), m_position(0), m_size(m_string.size()) {} -#endif + QXmlStreamStringRef(QString &&aString) noexcept : m_string(std::move(aString)), m_position(0), m_size(m_string.size()) {} #if QT_VERSION < QT_VERSION_CHECK(6,0,0) QXmlStreamStringRef(const QXmlStreamStringRef &other) // = default : m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {} -#ifdef Q_COMPILER_RVALUE_REFS - QXmlStreamStringRef(QXmlStreamStringRef &&other) Q_DECL_NOTHROW // = default + QXmlStreamStringRef(QXmlStreamStringRef &&other) noexcept // = default : m_string(std::move(other.m_string)), m_position(other.m_position), m_size(other.m_size) {} - QXmlStreamStringRef &operator=(QXmlStreamStringRef &&other) Q_DECL_NOTHROW // = default + QXmlStreamStringRef &operator=(QXmlStreamStringRef &&other) noexcept // = default { swap(other); return *this; } -#endif QXmlStreamStringRef &operator=(const QXmlStreamStringRef &other) // = default { m_string = other.m_string; m_position = other.m_position; m_size = other.m_size; return *this; } inline ~QXmlStreamStringRef() {} // ### this prevents (or deprecates) all the move/copy special member functions, @@ -79,7 +75,7 @@ public: // ### Qt 5, since that would change the way its passed to functions. In Qt 6, remove all. #endif // Qt < 6.0 - void swap(QXmlStreamStringRef &other) Q_DECL_NOTHROW + void swap(QXmlStreamStringRef &other) noexcept { qSwap(m_string, other.m_string); qSwap(m_position, other.m_position); @@ -108,11 +104,10 @@ class Q_CORE_EXPORT QXmlStreamAttribute { public: QXmlStreamAttribute(); QXmlStreamAttribute(const QString &qualifiedName, const QString &value); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QXmlStreamAttribute(const QString &namespaceUri, const QString &name, const QString &value); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QXmlStreamAttribute(const QXmlStreamAttribute &); -#ifdef Q_COMPILER_RVALUE_REFS - QXmlStreamAttribute(QXmlStreamAttribute &&other) Q_DECL_NOTHROW // = default; + QXmlStreamAttribute(QXmlStreamAttribute &&other) noexcept // = default; : m_name(std::move(other.m_name)), m_namespaceUri(std::move(other.m_namespaceUri)), m_qualifiedName(std::move(other.m_qualifiedName)), @@ -122,7 +117,7 @@ public: { other.reserved = nullptr; } - QXmlStreamAttribute &operator=(QXmlStreamAttribute &&other) Q_DECL_NOTHROW // = default; + QXmlStreamAttribute &operator=(QXmlStreamAttribute &&other) noexcept // = default; { m_name = std::move(other.m_name); m_namespaceUri = std::move(other.m_namespaceUri); @@ -132,7 +127,6 @@ public: m_isDefault = other.m_isDefault; return *this; } -#endif QXmlStreamAttribute& operator=(const QXmlStreamAttribute &); ~QXmlStreamAttribute(); #endif // < Qt 6 @@ -197,23 +191,23 @@ class Q_CORE_EXPORT QXmlStreamNamespaceDeclaration { friend class QXmlStreamReaderPrivate; public: QXmlStreamNamespaceDeclaration(); + QXmlStreamNamespaceDeclaration(const QString &prefix, const QString &namespaceUri); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QXmlStreamNamespaceDeclaration(const QXmlStreamNamespaceDeclaration &); - QXmlStreamNamespaceDeclaration(QXmlStreamNamespaceDeclaration &&other) Q_DECL_NOTHROW // = default + QXmlStreamNamespaceDeclaration(QXmlStreamNamespaceDeclaration &&other) noexcept // = default : m_prefix(std::move(other.m_prefix)), m_namespaceUri(std::move(other.m_namespaceUri)), reserved(other.reserved) { other.reserved = nullptr; } - QXmlStreamNamespaceDeclaration &operator=(QXmlStreamNamespaceDeclaration &&other) Q_DECL_NOTHROW // = default + QXmlStreamNamespaceDeclaration &operator=(QXmlStreamNamespaceDeclaration &&other) noexcept // = default { m_prefix = std::move(other.m_prefix); m_namespaceUri = std::move(other.m_namespaceUri); qSwap(reserved, other.reserved); return *this; } - QXmlStreamNamespaceDeclaration(const QString &prefix, const QString &namespaceUri); ~QXmlStreamNamespaceDeclaration(); QXmlStreamNamespaceDeclaration& operator=(const QXmlStreamNamespaceDeclaration &); #endif // < Qt 6 @@ -242,7 +236,7 @@ public: #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ~QXmlStreamNotationDeclaration(); QXmlStreamNotationDeclaration(const QXmlStreamNotationDeclaration &); - QXmlStreamNotationDeclaration(QXmlStreamNotationDeclaration &&other) Q_DECL_NOTHROW // = default + QXmlStreamNotationDeclaration(QXmlStreamNotationDeclaration &&other) noexcept // = default : m_name(std::move(other.m_name)), m_systemId(std::move(other.m_systemId)), m_publicId(std::move(other.m_publicId)), @@ -251,7 +245,7 @@ public: other.reserved = nullptr; } QXmlStreamNotationDeclaration& operator=(const QXmlStreamNotationDeclaration &); - QXmlStreamNotationDeclaration &operator=(QXmlStreamNotationDeclaration &&other) Q_DECL_NOTHROW // = default + QXmlStreamNotationDeclaration &operator=(QXmlStreamNotationDeclaration &&other) noexcept // = default { m_name = std::move(other.m_name); m_systemId = std::move(other.m_systemId); @@ -287,7 +281,7 @@ public: #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ~QXmlStreamEntityDeclaration(); QXmlStreamEntityDeclaration(const QXmlStreamEntityDeclaration &); - QXmlStreamEntityDeclaration(QXmlStreamEntityDeclaration &&other) Q_DECL_NOTHROW // = default + QXmlStreamEntityDeclaration(QXmlStreamEntityDeclaration &&other) noexcept // = default : m_name(std::move(other.m_name)), m_notationName(std::move(other.m_notationName)), m_systemId(std::move(other.m_systemId)), @@ -298,7 +292,7 @@ public: other.reserved = nullptr; } QXmlStreamEntityDeclaration& operator=(const QXmlStreamEntityDeclaration &); - QXmlStreamEntityDeclaration &operator=(QXmlStreamEntityDeclaration &&other) Q_DECL_NOTHROW // = default + QXmlStreamEntityDeclaration &operator=(QXmlStreamEntityDeclaration &&other) noexcept // = default { m_name = std::move(other.m_name); m_notationName = std::move(other.m_notationName); diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h index 61f501f81b..cde66a48a3 100644 --- a/src/corelib/serialization/qxmlstream_p.h +++ b/src/corelib/serialization/qxmlstream_p.h @@ -162,12 +162,12 @@ public: const char *const QXmlStreamReader_Table::spell [] = { - "end of file", 0, " ", "<", ">", "&", "#", "\'", "\"", "[", + "end of file", nullptr, " ", "<", ">", "&", "#", "\'", "\"", "[", "]", "(", ")", "|", "=", "%", "/", ":", ";", ",", "-", "+", "*", ".", "?", "!", "[a-zA-Z]", "[0-9]", "[CDATA[", "DOCTYPE", "ELEMENT", "ATTLIST", "ENTITY", "NOTATION", "SYSTEM", "PUBLIC", "NDATA", "REQUIRED", "IMPLIED", "FIXED", - "EMPTY", "ANY", "PCDATA", 0, 0, 0, 0, "CDATA", "ID", "IDREF", - "IDREFS", "ENTITIES", "NMTOKEN", "NMTOKENS", "<?xml", "version", 0}; + "EMPTY", "ANY", "PCDATA", nullptr, nullptr, nullptr, nullptr, "CDATA", "ID", "IDREF", + "IDREFS", "ENTITIES", "NMTOKEN", "NMTOKENS", "<?xml", "version", nullptr}; const short QXmlStreamReader_Table::lhs [] = { 57, 57, 59, 59, 59, 59, 59, 59, 59, 59, @@ -645,7 +645,7 @@ template <typename T> class QXmlStreamSimpleStack { T *data; int tos, cap; public: - inline QXmlStreamSimpleStack():data(0), tos(-1), cap(0){} + inline QXmlStreamSimpleStack():data(nullptr), tos(-1), cap(0){} inline ~QXmlStreamSimpleStack(){ if (data) free(data); } inline void reserve(int extraCapacity) { @@ -995,7 +995,7 @@ public: int fastScanLiteralContent(); int fastScanSpace(); int fastScanContentCharList(); - int fastScanName(int *prefix = 0); + int fastScanName(int *prefix = nullptr); inline int fastScanNMTOKEN(); diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp index 1a9ad4601d..0db44bc427 100644 --- a/src/corelib/statemachine/qabstractstate.cpp +++ b/src/corelib/statemachine/qabstractstate.cpp @@ -155,7 +155,8 @@ QAbstractState::~QAbstractState() } /*! - Returns this state's parent state, or 0 if the state has no parent state. + Returns this state's parent state, or \nullptr if the state has no + parent state. */ QState *QAbstractState::parentState() const { @@ -166,8 +167,8 @@ QState *QAbstractState::parentState() const } /*! - Returns the state machine that this state is part of, or 0 if the state is - not part of a state machine. + Returns the state machine that this state is part of, or \nullptr if + the state is not part of a state machine. */ QStateMachine *QAbstractState::machine() const { diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp index ebf33e120a..d841fd3c8b 100644 --- a/src/corelib/statemachine/qabstracttransition.cpp +++ b/src/corelib/statemachine/qabstracttransition.cpp @@ -195,8 +195,8 @@ QAbstractTransition::~QAbstractTransition() } /*! - Returns the source state of this transition, or 0 if this transition has no - source state. + Returns the source state of this transition, or \nullptr if this + transition has no source state. */ QState *QAbstractTransition::sourceState() const { @@ -205,14 +205,14 @@ QState *QAbstractTransition::sourceState() const } /*! - Returns the target state of this transition, or 0 if the transition has no - target. + Returns the target state of this transition, or \nullptr if the + transition has no target. */ QAbstractState *QAbstractTransition::targetState() const { Q_D(const QAbstractTransition); if (d->targetStates.isEmpty()) - return 0; + return nullptr; return d->targetStates.first().data(); } @@ -325,8 +325,8 @@ void QAbstractTransition::setTransitionType(TransitionType type) } /*! - Returns the state machine that this transition is part of, or 0 if the - transition is not part of a state machine. + Returns the state machine that this transition is part of, or + \nullptr if the transition is not part of a state machine. */ QStateMachine *QAbstractTransition::machine() const { diff --git a/src/corelib/statemachine/qsignaleventgenerator_p.h b/src/corelib/statemachine/qsignaleventgenerator_p.h index 271f6317bd..72592b8731 100644 --- a/src/corelib/statemachine/qsignaleventgenerator_p.h +++ b/src/corelib/statemachine/qsignaleventgenerator_p.h @@ -71,7 +71,7 @@ private: void execute(void **_a); private: - Q_DISABLE_COPY(QSignalEventGenerator) + Q_DISABLE_COPY_MOVE(QSignalEventGenerator) }; QT_END_NAMESPACE diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index 0666e600a4..b3de334677 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -70,7 +70,7 @@ public: void unregister(); void maybeRegister(); - virtual void callOnTransition(QEvent *e) override; + void callOnTransition(QEvent *e) override; const QObject *sender; QByteArray signal; diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 2531874a87..62dd4f0284 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -285,7 +285,7 @@ QAbstractState *QState::errorState() const /*! Sets this state's error state to be the given \a state. If the error state - is not set, or if it is set to 0, the state will inherit its parent's error + is not set, or if it is set to \nullptr, the state will inherit its parent's error state recursively. If no error state is set for the state itself or any of its ancestors, an error will cause the machine to stop executing and an error will be printed to the console. @@ -473,7 +473,8 @@ void QState::onExit(QEvent *event) } /*! - Returns this state's initial state, or 0 if the state has no initial state. + Returns this state's initial state, or \nullptr if the state has no + initial state. */ QAbstractState *QState::initialState() const { diff --git a/src/corelib/statemachine/qstate_p.h b/src/corelib/statemachine/qstate_p.h index 7fb40392e7..ec746caae1 100644 --- a/src/corelib/statemachine/qstate_p.h +++ b/src/corelib/statemachine/qstate_p.h @@ -68,14 +68,14 @@ QT_BEGIN_NAMESPACE struct QPropertyAssignment { QPropertyAssignment() - : object(0), explicitlySet(true) {} + : object(nullptr), explicitlySet(true) {} QPropertyAssignment(QObject *o, const QByteArray &n, const QVariant &v, bool es = true) : object(o), propertyName(n), value(v), explicitlySet(es) {} bool objectDeleted() const { return !object; } - void write() const { Q_ASSERT(object != 0); object->setProperty(propertyName, value); } + void write() const { Q_ASSERT(object != nullptr); object->setProperty(propertyName, value); } bool hasTarget(QObject *o, const QByteArray &pn) const { return object == o && propertyName == pn; } @@ -99,8 +99,8 @@ public: QStatePrivate(); ~QStatePrivate(); - static QStatePrivate *get(QState *q) { return q ? q->d_func() : 0; } - static const QStatePrivate *get(const QState *q) { return q? q->d_func() : 0; } + static QStatePrivate *get(QState *q) { return q ? q->d_func() : nullptr; } + static const QStatePrivate *get(const QState *q) { return q? q->d_func() : nullptr; } QList<QAbstractState*> childStates() const; QList<QHistoryState*> historyStates() const; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 7388d496d9..3a86d971e2 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -140,6 +140,10 @@ QT_BEGIN_NAMESPACE no error state applies to the erroneous state, the machine will stop executing and an error message will be printed to the console. + \note Important: setting the \l{ChildMode} of a state machine to parallel (\l{ParallelStates}) + results in an invalid state machine. It can only be set to (or kept as) + \l{ExclusiveStates}. + \sa QAbstractState, QAbstractTransition, QState, {The State Machine Framework} */ @@ -370,10 +374,11 @@ static QList<QAbstractState *> getEffectiveTargetStates(QAbstractTransition *tra QList<QAbstractState*> historyConfiguration = QHistoryStatePrivate::get(historyState)->configuration; if (!historyConfiguration.isEmpty()) { // There is a saved history, so apply that. - targets.unite(historyConfiguration.toSet()); + targets.unite(QSet<QAbstractState *>(historyConfiguration.constBegin(), historyConfiguration.constEnd())); } else if (QAbstractTransition *defaultTransition = historyState->defaultTransition()) { // No saved history, take all default transition targets. - targets.unite(defaultTransition->targetStates().toSet()); + const auto &targetStates = defaultTransition->targetStates(); + targets.unite(QSet<QAbstractState *>(targetStates.constBegin(), targetStates.constEnd())); } else { // Woops, we found a history state without a default state. That's not valid! QStateMachinePrivate *m = QStateMachinePrivate::get(historyState->machine()); @@ -384,7 +389,7 @@ static QList<QAbstractState *> getEffectiveTargetStates(QAbstractTransition *tra } } - targetsList = targets.toList(); + targetsList = targets.values(); cache->insert(transition, targetsList); return targetsList; } @@ -518,7 +523,7 @@ bool QStateMachinePrivate::stateExitLessThan(QAbstractState *s1, QAbstractState } } -QState *QStateMachinePrivate::findLCA(const QList<QAbstractState*> &states, bool onlyCompound) const +QState *QStateMachinePrivate::findLCA(const QList<QAbstractState*> &states, bool onlyCompound) { if (states.isEmpty()) return 0; @@ -537,10 +542,16 @@ QState *QStateMachinePrivate::findLCA(const QList<QAbstractState*> &states, bool if (ok) return anc; } - return 0; + + // Oops, this should never happen! The state machine itself is a common ancestor of all states, + // no matter what. But, for the onlyCompound case: we probably have a state machine whose + // childMode is set to parallel, which is illegal. However, we're stuck with it (and with + // exposing this invalid/dangerous API to users), so recover in the least horrible way. + setError(QStateMachine::StateMachineChildModeSetToParallelError, q_func()); + return q_func(); // make the statemachine the LCA/LCCA (which it should have been anyway) } -QState *QStateMachinePrivate::findLCCA(const QList<QAbstractState*> &states) const +QState *QStateMachinePrivate::findLCCA(const QList<QAbstractState*> &states) { return findLCA(states, true); } @@ -740,7 +751,7 @@ QList<QAbstractState*> QStateMachinePrivate::computeExitSet(const QList<QAbstrac { Q_ASSERT(cache); - QList<QAbstractState*> statesToExit_sorted = computeExitSet_Unordered(enabledTransitions, cache).toList(); + QList<QAbstractState*> statesToExit_sorted = computeExitSet_Unordered(enabledTransitions, cache).values(); std::sort(statesToExit_sorted.begin(), statesToExit_sorted.end(), stateExitLessThan); return statesToExit_sorted; } @@ -777,7 +788,7 @@ QSet<QAbstractState*> QStateMachinePrivate::computeExitSet_Unordered(QAbstractTr // makes the state machine invalid. if (error == QStateMachine::NoError) setError(QStateMachine::NoCommonAncestorForTransitionError, t->sourceState()); - QList<QAbstractState *> lst = pendingErrorStates.toList(); + QList<QAbstractState *> lst = pendingErrorStates.values(); lst.prepend(t->sourceState()); domain = findLCCA(lst); @@ -879,7 +890,7 @@ QList<QAbstractState*> QStateMachinePrivate::computeEntrySet(const QList<QAbstra pendingErrorStatesForDefaultEntry.clear(); } - QList<QAbstractState*> statesToEnter_sorted = statesToEnter.toList(); + QList<QAbstractState*> statesToEnter_sorted = statesToEnter.values(); std::sort(statesToEnter_sorted.begin(), statesToEnter_sorted.end(), stateEntryLessThan); return statesToEnter_sorted; } @@ -902,7 +913,7 @@ function getTransitionDomain(t) */ QAbstractState *QStateMachinePrivate::getTransitionDomain(QAbstractTransition *t, const QList<QAbstractState *> &effectiveTargetStates, - CalculationCache *cache) const + CalculationCache *cache) { Q_ASSERT(cache); @@ -1483,6 +1494,14 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta errorString = QStateMachine::tr("No common ancestor for targets and source of transition from state '%1'") .arg(currentContext->objectName()); break; + + case QStateMachine::StateMachineChildModeSetToParallelError: + Q_ASSERT(currentContext != nullptr); + + errorString = QStateMachine::tr("Child mode of state machine '%1' is not 'ExclusiveStates'!") + .arg(currentContext->objectName()); + break; + default: errorString = QStateMachine::tr("Unknown error"); }; @@ -1507,8 +1526,8 @@ void QStateMachinePrivate::setError(QStateMachine::Error errorCode, QAbstractSta addAncestorStatesToEnter(currentErrorState, rootState(), pendingErrorStates, pendingErrorStatesForDefaultEntry); pendingErrorStates -= configuration; } else { - qWarning("Unrecoverable error detected in running state machine: %s", - qPrintable(errorString)); + qWarning("Unrecoverable error detected in running state machine: %ls", + qUtf16Printable(errorString)); q->stop(); } } @@ -1721,8 +1740,8 @@ QAbstractTransition *QStateMachinePrivate::createInitialTransition() const : QAbstractTransition() { setTargetStates(targets); } protected: - virtual bool eventTest(QEvent *) override { return true; } - virtual void onTransition(QEvent *) override {} + bool eventTest(QEvent *) override { return true; } + void onTransition(QEvent *) override {} }; QState *root = rootState(); @@ -2444,9 +2463,13 @@ QStateMachine::QStateMachine(QObject *parent) /*! \since 5.0 + \deprecated Constructs a new state machine with the given \a childMode and \a parent. + + \warning Do not set the \a childMode to anything else than \l{ExclusiveStates}, otherwise the + state machine is invalid, and might work incorrectly! */ QStateMachine::QStateMachine(QState::ChildMode childMode, QObject *parent) : QState(*new QStateMachinePrivate, /*parentState=*/0) @@ -2454,6 +2477,18 @@ QStateMachine::QStateMachine(QState::ChildMode childMode, QObject *parent) Q_D(QStateMachine); d->childMode = childMode; setParent(parent); // See comment in constructor above + + if (childMode != ExclusiveStates) { + //### FIXME for Qt6: remove this constructor completely, and hide the childMode property. + // Yes, the StateMachine itself is conceptually a state, but it should only expose a limited + // number of properties. The execution algorithm (in the URL below) treats a state machine + // as a state, but from an API point of view, it's questionable if the QStateMachine should + // inherit from QState. + // + // See function findLCCA in https://www.w3.org/TR/2014/WD-scxml-20140529/#AlgorithmforSCXMLInterpretation + // to see where setting childMode to parallel will break down. + qWarning() << "Invalid childMode for QStateMachine" << this; + } } /*! diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index e520285437..07781d09a4 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -106,7 +106,8 @@ public: NoError, NoInitialStateError, NoDefaultStateInHistoryStateError, - NoCommonAncestorForTransitionError + NoCommonAncestorForTransitionError, + StateMachineChildModeSetToParallelError }; explicit QStateMachine(QObject *parent = nullptr); diff --git a/src/corelib/statemachine/qstatemachine_p.h b/src/corelib/statemachine/qstatemachine_p.h index f3366ca5f7..f140023e31 100644 --- a/src/corelib/statemachine/qstatemachine_p.h +++ b/src/corelib/statemachine/qstatemachine_p.h @@ -108,10 +108,10 @@ public: ~QStateMachinePrivate(); static QStateMachinePrivate *get(QStateMachine *q) - { return q ? q->d_func() : 0; } + { return q ? q->d_func() : nullptr; } - QState *findLCA(const QList<QAbstractState*> &states, bool onlyCompound = false) const; - QState *findLCCA(const QList<QAbstractState*> &states) const; + QState *findLCA(const QList<QAbstractState*> &states, bool onlyCompound = false); + QState *findLCCA(const QList<QAbstractState*> &states); static bool transitionStateEntryLessThan(QAbstractTransition *t1, QAbstractTransition *t2); static bool stateEntryLessThan(QAbstractState *s1, QAbstractState *s2); @@ -160,7 +160,7 @@ public: QSet<QAbstractState*> &statesForDefaultEntry, CalculationCache *cache); QAbstractState *getTransitionDomain(QAbstractTransition *t, const QList<QAbstractState *> &effectiveTargetStates, - CalculationCache *cache) const; + CalculationCache *cache); void addDescendantStatesToEnter(QAbstractState *state, QSet<QAbstractState*> &statesToEnter, QSet<QAbstractState*> &statesForDefaultEntry); @@ -218,18 +218,18 @@ public: QByteArray prop; // two overloads because friends can't have default arguments friend uint qHash(const RestorableId &key, uint seed) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(std::declval<QByteArray>()))) + noexcept(noexcept(qHash(std::declval<QByteArray>()))) { return qHash(qMakePair(key.obj, key.prop), seed); } - friend uint qHash(const RestorableId &key) Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(key, 0U))) + friend uint qHash(const RestorableId &key) noexcept(noexcept(qHash(key, 0U))) { return qHash(key, 0U); } - friend bool operator==(const RestorableId &lhs, const RestorableId &rhs) Q_DECL_NOTHROW + friend bool operator==(const RestorableId &lhs, const RestorableId &rhs) noexcept { return lhs.obj == rhs.obj && lhs.prop == rhs.prop; } - friend bool operator!=(const RestorableId &lhs, const RestorableId &rhs) Q_DECL_NOTHROW + friend bool operator!=(const RestorableId &lhs, const RestorableId &rhs) noexcept { return !operator==(lhs, rhs); } public: - explicit RestorableId(QObject *o, QByteArray p) Q_DECL_NOTHROW : guard(o), obj(o), prop(qMove(p)) {} - QObject *object() const Q_DECL_NOTHROW { return guard; } - QByteArray propertyName() const Q_DECL_NOTHROW { return prop; } + explicit RestorableId(QObject *o, QByteArray p) noexcept : guard(o), obj(o), prop(std::move(p)) {} + QObject *object() const noexcept { return guard; } + QByteArray propertyName() const noexcept { return prop; } }; QHash<QAbstractState*, QHash<RestorableId, QVariant> > registeredRestorablesForState; bool hasRestorable(QAbstractState *state, QObject *object, const QByteArray &propertyName) const; @@ -271,7 +271,7 @@ public: QList<QAbstractAnimation*> handledAnimations; QList<QAbstractAnimation*> localResetEndValues; - void swap(InitializeAnimationResult &other) Q_DECL_NOTHROW + void swap(InitializeAnimationResult &other) noexcept { qSwap(handledAnimations, other.handledAnimations); qSwap(localResetEndValues, other.localResetEndValues); @@ -313,7 +313,7 @@ public: DelayedEvent(QEvent *e, int tid) : event(e), timerId(tid) {} DelayedEvent() - : event(0), timerId(0) {} + : event(nullptr), timerId(0) {} }; QHash<int, DelayedEvent> delayedEvents; QHash<int, int> timerIdToDelayedEventId; diff --git a/src/corelib/thread/qatomic.cpp b/src/corelib/thread/qatomic.cpp index c161bec537..b1a7edad91 100644 --- a/src/corelib/thread/qatomic.cpp +++ b/src/corelib/thread/qatomic.cpp @@ -258,12 +258,26 @@ /*! \fn template <typename T> T QAtomicInteger<T>::load() const + \obsolete + + Use loadRelaxed() instead. Atomically loads the value of this QAtomicInteger using relaxed memory ordering. The value is not modified in any way, but note that there's no guarantee that it remains so. - \sa store(), loadAcquire() + \sa storeRelaxed(), loadAcquire() +*/ + +/*! + \fn template <typename T> T QAtomicInteger<T>::loadRelaxed() const + \since 5.14 + + Atomically loads the value of this QAtomicInteger using relaxed memory + ordering. The value is not modified in any way, but note that there's no + guarantee that it remains so. + + \sa storeRelaxed(), loadAcquire() */ /*! @@ -273,16 +287,29 @@ ordering. The value is not modified in any way, but note that there's no guarantee that it remains so. - \sa store(), load() + \sa storeRelaxed(), loadRelaxed() */ /*! \fn template <typename T> void QAtomicInteger<T>::store(T newValue) + \obsolete + + Use storeRelaxed() instead. Atomically stores the \a newValue value into this atomic type, using relaxed memory ordering. - \sa storeRelease(), load() + \sa storeRelease(), loadRelaxed() +*/ + +/*! + \fn template <typename T> void QAtomicInteger<T>::storeRelaxed(T newValue) + \since 5.14 + + Atomically stores the \a newValue value into this atomic type, using + relaxed memory ordering. + + \sa storeRelease(), loadRelaxed() */ /*! @@ -291,7 +318,7 @@ Atomically stores the \a newValue value into this atomic type, using the "Release" memory ordering. - \sa store(), load() + \sa store(), loadAcquire() */ /*! @@ -303,7 +330,7 @@ value is not modified in any way, but note that there's no guarantee that it remains so. - \sa load(), loadAcquire() + \sa loadRelaxed(), loadAcquire() */ /*! @@ -314,7 +341,7 @@ sequentially consistent memory ordering if possible; or "Release" ordering if not. This function returns a reference to this object. - \sa store(), storeRelease() + \sa storeRelaxed(), storeRelease() */ /*! \fn template <typename T> bool QAtomicInteger<T>::isReferenceCountingNative() @@ -1278,31 +1305,59 @@ /*! \fn template <typename T> T *QAtomicPointer<T>::load() const + \obsolete + + Use loadRelaxed() instead. Atomically loads the value of this QAtomicPointer using relaxed memory ordering. The value is not modified in any way, but note that there's no guarantee that it remains so. - \sa store(), loadAcquire() + \sa storeRelaxed(), loadAcquire() */ /*! + \fn template <typename T> T *QAtomicPointer<T>::loadRelaxed() const + \since 5.14 + + Atomically loads the value of this QAtomicPointer using relaxed memory + ordering. The value is not modified in any way, but note that there's no + guarantee that it remains so. + + \sa storeRelaxed(), loadAcquire() +*/ + + +/*! \fn template <typename T> T *QAtomicPointer<T>::loadAcquire() const Atomically loads the value of this QAtomicPointer using the "Acquire" memory ordering. The value is not modified in any way, but note that there's no guarantee that it remains so. - \sa store(), load() + \sa storeRelease(), loadRelaxed() */ /*! \fn template <typename T> void QAtomicPointer<T>::store(T *newValue) + \obsolete + + Use storeRelaxed() instead. + + Atomically stores the \a newValue value into this atomic type, using + relaxed memory ordering. + + \sa storeRelease(), loadRelaxed() +*/ + +/*! + \fn template <typename T> void QAtomicPointer<T>::storeRelaxed(T *newValue) + \since 5.14 Atomically stores the \a newValue value into this atomic type, using relaxed memory ordering. - \sa storeRelease(), load() + \sa storeRelease(), loadRelaxed() */ /*! @@ -1311,7 +1366,7 @@ Atomically stores the \a newValue value into this atomic type, using the "Release" memory ordering. - \sa store(), load() + \sa storeRelaxed(), loadRelaxed() */ /*! \fn template <typename T> bool QAtomicPointer<T>::isTestAndSetNative() diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index f842534c38..a3b9be0729 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -57,15 +57,15 @@ class QAtomicInteger : public QBasicAtomicInteger<T> public: // Non-atomic API #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS - constexpr QAtomicInteger(T value = 0) Q_DECL_NOTHROW : QBasicAtomicInteger<T>(value) {} + constexpr QAtomicInteger(T value = 0) noexcept : QBasicAtomicInteger<T>(value) {} #else - inline QAtomicInteger(T value = 0) Q_DECL_NOTHROW + inline QAtomicInteger(T value = 0) noexcept { this->_q_value = value; } #endif - inline QAtomicInteger(const QAtomicInteger &other) Q_DECL_NOTHROW + inline QAtomicInteger(const QAtomicInteger &other) noexcept #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS : QBasicAtomicInteger<T>() #endif @@ -73,7 +73,7 @@ public: this->storeRelease(other.loadAcquire()); } - inline QAtomicInteger &operator=(const QAtomicInteger &other) Q_DECL_NOTHROW + inline QAtomicInteger &operator=(const QAtomicInteger &other) noexcept { this->storeRelease(other.loadAcquire()); return *this; @@ -81,8 +81,10 @@ public: #ifdef Q_CLANG_QDOC T load() const; + T loadRelaxed() const; T loadAcquire() const; void store(T newValue); + void storeRelaxed(T newValue); void storeRelease(T newValue); operator T() const; @@ -159,7 +161,7 @@ public: #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS constexpr #endif - QAtomicInt(int value = 0) Q_DECL_NOTHROW : QAtomicInteger<int>(value) {} + QAtomicInt(int value = 0) noexcept : QAtomicInteger<int>(value) {} }; // High-level atomic pointer operations @@ -168,14 +170,14 @@ class QAtomicPointer : public QBasicAtomicPointer<T> { public: #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS - constexpr QAtomicPointer(T *value = nullptr) Q_DECL_NOTHROW : QBasicAtomicPointer<T>(value) {} + constexpr QAtomicPointer(T *value = nullptr) noexcept : QBasicAtomicPointer<T>(value) {} #else - inline QAtomicPointer(T *value = nullptr) Q_DECL_NOTHROW + inline QAtomicPointer(T *value = nullptr) noexcept { - this->store(value); + this->storeRelaxed(value); } #endif - inline QAtomicPointer(const QAtomicPointer<T> &other) Q_DECL_NOTHROW + inline QAtomicPointer(const QAtomicPointer<T> &other) noexcept #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS : QBasicAtomicPointer<T>() #endif @@ -183,7 +185,7 @@ public: this->storeRelease(other.loadAcquire()); } - inline QAtomicPointer<T> &operator=(const QAtomicPointer<T> &other) Q_DECL_NOTHROW + inline QAtomicPointer<T> &operator=(const QAtomicPointer<T> &other) noexcept { this->storeRelease(other.loadAcquire()); return *this; @@ -255,7 +257,7 @@ inline void qAtomicAssign(T *&d, T *x) template <typename T> inline void qAtomicDetach(T *&d) { - if (d->ref.load() == 1) + if (d->ref.loadRelaxed() == 1) return; T *x = d; d = new T(*d); diff --git a/src/corelib/thread/qatomic_bootstrap.h b/src/corelib/thread/qatomic_bootstrap.h index b463f817bd..c4279ee7b1 100644 --- a/src/corelib/thread/qatomic_bootstrap.h +++ b/src/corelib/thread/qatomic_bootstrap.h @@ -56,16 +56,16 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> > { typedef T Type; - static bool ref(T &_q_value) Q_DECL_NOTHROW + static bool ref(T &_q_value) noexcept { return ++_q_value != 0; } - static bool deref(T &_q_value) Q_DECL_NOTHROW + static bool deref(T &_q_value) noexcept { return --_q_value != 0; } - static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue = 0) Q_DECL_NOTHROW + static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept { if (currentValue) *currentValue = _q_value; @@ -76,7 +76,7 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> > return false; } - static T fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW + static T fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept { T tmp = _q_value; _q_value = newValue; @@ -84,7 +84,7 @@ template <typename T> struct QAtomicOps: QGenericAtomicOps<QAtomicOps<T> > } template <typename AdditiveType> static - T fetchAndAddRelaxed(T &_q_value, AdditiveType valueToAdd) Q_DECL_NOTHROW + T fetchAndAddRelaxed(T &_q_value, AdditiveType valueToAdd) noexcept { T returnValue = _q_value; _q_value += valueToAdd; diff --git a/src/corelib/thread/qatomic_cxx11.h b/src/corelib/thread/qatomic_cxx11.h index 2fc0bf5419..7386aee126 100644 --- a/src/corelib/thread/qatomic_cxx11.h +++ b/src/corelib/thread/qatomic_cxx11.h @@ -222,43 +222,61 @@ template <typename X> struct QAtomicOps typedef std::atomic<X> Type; template <typename T> static inline - T load(const std::atomic<T> &_q_value) Q_DECL_NOTHROW + T load(const std::atomic<T> &_q_value) noexcept { return _q_value.load(std::memory_order_relaxed); } template <typename T> static inline - T load(const volatile std::atomic<T> &_q_value) Q_DECL_NOTHROW + T load(const volatile std::atomic<T> &_q_value) noexcept { return _q_value.load(std::memory_order_relaxed); } template <typename T> static inline - T loadAcquire(const std::atomic<T> &_q_value) Q_DECL_NOTHROW + T loadRelaxed(const std::atomic<T> &_q_value) noexcept + { + return _q_value.load(std::memory_order_relaxed); + } + + template <typename T> static inline + T loadRelaxed(const volatile std::atomic<T> &_q_value) noexcept + { + return _q_value.load(std::memory_order_relaxed); + } + + template <typename T> static inline + T loadAcquire(const std::atomic<T> &_q_value) noexcept { return _q_value.load(std::memory_order_acquire); } template <typename T> static inline - T loadAcquire(const volatile std::atomic<T> &_q_value) Q_DECL_NOTHROW + T loadAcquire(const volatile std::atomic<T> &_q_value) noexcept { return _q_value.load(std::memory_order_acquire); } template <typename T> static inline - void store(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW + void store(std::atomic<T> &_q_value, T newValue) noexcept + { + _q_value.store(newValue, std::memory_order_relaxed); + } + + template <typename T> static inline + void storeRelaxed(std::atomic<T> &_q_value, T newValue) noexcept { _q_value.store(newValue, std::memory_order_relaxed); } template <typename T> static inline - void storeRelease(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW + void storeRelease(std::atomic<T> &_q_value, T newValue) noexcept { _q_value.store(newValue, std::memory_order_release); } - static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return isTestAndSetNative(); } - static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept { return isTestAndSetNative(); } + static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept { return false; } template <typename T> static inline bool ref(std::atomic<T> &_q_value) { @@ -266,17 +284,17 @@ template <typename X> struct QAtomicOps } template <typename T> - static inline bool deref(std::atomic<T> &_q_value) Q_DECL_NOTHROW + static inline bool deref(std::atomic<T> &_q_value) noexcept { return --_q_value != 0; } - static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW + static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return QAtomicTraits<sizeof(X)>::isLockFree(); } - static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return false; } template <typename T> - static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW + static bool testAndSetRelaxed(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept { bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_relaxed, std::memory_order_relaxed); if (currentValue) @@ -285,7 +303,7 @@ template <typename X> struct QAtomicOps } template <typename T> - static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW + static bool testAndSetAcquire(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept { bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acquire, std::memory_order_acquire); if (currentValue) @@ -294,7 +312,7 @@ template <typename X> struct QAtomicOps } template <typename T> - static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW + static bool testAndSetRelease(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept { bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_release, std::memory_order_relaxed); if (currentValue) @@ -303,7 +321,7 @@ template <typename X> struct QAtomicOps } template <typename T> - static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) Q_DECL_NOTHROW + static bool testAndSetOrdered(std::atomic<T> &_q_value, T expectedValue, T newValue, T *currentValue = nullptr) noexcept { bool tmp = _q_value.compare_exchange_strong(expectedValue, newValue, std::memory_order_acq_rel, std::memory_order_acquire); if (currentValue) @@ -311,158 +329,158 @@ template <typename X> struct QAtomicOps return tmp; } - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return isTestAndSetNative(); } - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return isTestAndSetNative(); } + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return false; } template <typename T> - static T fetchAndStoreRelaxed(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW + static T fetchAndStoreRelaxed(std::atomic<T> &_q_value, T newValue) noexcept { return _q_value.exchange(newValue, std::memory_order_relaxed); } template <typename T> - static T fetchAndStoreAcquire(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW + static T fetchAndStoreAcquire(std::atomic<T> &_q_value, T newValue) noexcept { return _q_value.exchange(newValue, std::memory_order_acquire); } template <typename T> - static T fetchAndStoreRelease(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW + static T fetchAndStoreRelease(std::atomic<T> &_q_value, T newValue) noexcept { return _q_value.exchange(newValue, std::memory_order_release); } template <typename T> - static T fetchAndStoreOrdered(std::atomic<T> &_q_value, T newValue) Q_DECL_NOTHROW + static T fetchAndStoreOrdered(std::atomic<T> &_q_value, T newValue) noexcept { return _q_value.exchange(newValue, std::memory_order_acq_rel); } - static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return isTestAndSetNative(); } - static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return isTestAndSetNative(); } + static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return false; } template <typename T> static inline - T fetchAndAddRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_add(valueToAdd, std::memory_order_relaxed); } template <typename T> static inline - T fetchAndAddAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_add(valueToAdd, std::memory_order_acquire); } template <typename T> static inline - T fetchAndAddRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_add(valueToAdd, std::memory_order_release); } template <typename T> static inline - T fetchAndAddOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_add(valueToAdd, std::memory_order_acq_rel); } template <typename T> static inline - T fetchAndSubRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndSubRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_sub(valueToAdd, std::memory_order_relaxed); } template <typename T> static inline - T fetchAndSubAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndSubAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_sub(valueToAdd, std::memory_order_acquire); } template <typename T> static inline - T fetchAndSubRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndSubRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_sub(valueToAdd, std::memory_order_release); } template <typename T> static inline - T fetchAndSubOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndSubOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_sub(valueToAdd, std::memory_order_acq_rel); } template <typename T> static inline - T fetchAndAndRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAndRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_and(valueToAdd, std::memory_order_relaxed); } template <typename T> static inline - T fetchAndAndAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAndAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_and(valueToAdd, std::memory_order_acquire); } template <typename T> static inline - T fetchAndAndRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAndRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_and(valueToAdd, std::memory_order_release); } template <typename T> static inline - T fetchAndAndOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAndOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_and(valueToAdd, std::memory_order_acq_rel); } template <typename T> static inline - T fetchAndOrRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndOrRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_or(valueToAdd, std::memory_order_relaxed); } template <typename T> static inline - T fetchAndOrAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndOrAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_or(valueToAdd, std::memory_order_acquire); } template <typename T> static inline - T fetchAndOrRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndOrRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_or(valueToAdd, std::memory_order_release); } template <typename T> static inline - T fetchAndOrOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndOrOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_or(valueToAdd, std::memory_order_acq_rel); } template <typename T> static inline - T fetchAndXorRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndXorRelaxed(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_xor(valueToAdd, std::memory_order_relaxed); } template <typename T> static inline - T fetchAndXorAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndXorAcquire(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_xor(valueToAdd, std::memory_order_acquire); } template <typename T> static inline - T fetchAndXorRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndXorRelease(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_xor(valueToAdd, std::memory_order_release); } template <typename T> static inline - T fetchAndXorOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndXorOrdered(std::atomic<T> &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return _q_value.fetch_xor(valueToAdd, std::memory_order_acq_rel); } }; -#if defined(Q_COMPILER_CONSTEXPR) && defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS) +#if defined(Q_COMPILER_CONSTEXPR) # define Q_BASIC_ATOMIC_INITIALIZER(a) { a } #else # define Q_BASIC_ATOMIC_INITIALIZER(a) { ATOMIC_VAR_INIT(a) } diff --git a/src/corelib/thread/qatomic_msvc.h b/src/corelib/thread/qatomic_msvc.h index 5eae2bdc48..67b5224cd7 100644 --- a/src/corelib/thread/qatomic_msvc.h +++ b/src/corelib/thread/qatomic_msvc.h @@ -269,24 +269,24 @@ template <> struct QAtomicWindowsType<4> { typedef long Type; }; template <int N> struct QAtomicOpsBySize : QGenericAtomicOps<QAtomicOpsBySize<N> > { - static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return true; } - static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW { return true; } - template <typename T> static bool ref(T &_q_value) Q_DECL_NOTHROW; - template <typename T> static bool deref(T &_q_value) Q_DECL_NOTHROW; - - static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return true; } - static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return true; } - template <typename T> static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW; + static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept { return true; } + static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept { return true; } + template <typename T> static bool ref(T &_q_value) noexcept; + template <typename T> static bool deref(T &_q_value) noexcept; + + static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return true; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return true; } + template <typename T> static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept; template <typename T> - static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW; + static bool testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept; - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return true; } - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return true; } - template <typename T> static T fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW; + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return true; } + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return true; } + template <typename T> static T fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept; - static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return true; } - static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return true; } - template <typename T> static T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW; + static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return true; } + static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return true; } + template <typename T> static T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept; private: typedef typename QAtomicWindowsType<N>::Type Type; @@ -303,76 +303,76 @@ struct QAtomicOps : QAtomicOpsBySize<sizeof(T)> }; template<> template<typename T> -inline bool QAtomicOpsBySize<4>::ref(T &_q_value) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<4>::ref(T &_q_value) noexcept { return QT_INTERLOCKED_FUNCTION(Increment)(atomic(&_q_value)) != 0; } template<> template<typename T> -inline bool QAtomicOpsBySize<4>::deref(T &_q_value) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<4>::deref(T &_q_value) noexcept { return QT_INTERLOCKED_FUNCTION(Decrement)(atomic(&_q_value)) != 0; } template<> template<typename T> -inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept { return QT_INTERLOCKED_FUNCTION(CompareExchange)(atomic(&_q_value), value(newValue), value(expectedValue)) == value(expectedValue); } template<> template <typename T> -inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<4>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept { *currentValue = T(QT_INTERLOCKED_FUNCTION(CompareExchange)(atomic(&_q_value), newValue, expectedValue)); return *currentValue == expectedValue; } template<> template<typename T> -inline T QAtomicOpsBySize<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW +inline T QAtomicOpsBySize<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept { return QT_INTERLOCKED_FUNCTION(Exchange)(atomic(&_q_value), value(newValue)); } template<> template<typename T> -inline T QAtomicOpsBySize<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW +inline T QAtomicOpsBySize<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return QT_INTERLOCKED_FUNCTION(ExchangeAdd)(atomic(&_q_value), value<T>(valueToAdd * QAtomicAdditiveType<T>::AddScale)); } #ifdef Q_ATOMIC_INT16_IS_SUPPORTED template<> template<typename T> -inline bool QAtomicOpsBySize<2>::ref(T &_q_value) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<2>::ref(T &_q_value) noexcept { return QT_INTERLOCKED_FUNCTION(Increment16)(atomic(&_q_value)) != 0; } template<> template<typename T> -inline bool QAtomicOpsBySize<2>::deref(T &_q_value) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<2>::deref(T &_q_value) noexcept { return QT_INTERLOCKED_FUNCTION(Decrement16)(atomic(&_q_value)) != 0; } template<> template<typename T> -inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept { return QT_INTERLOCKED_FUNCTION(CompareExchange16)(atomic(&_q_value), value(newValue), value(expectedValue)) == value(expectedValue); } template<> template <typename T> -inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<2>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept { *currentValue = T(QT_INTERLOCKED_FUNCTION(CompareExchange16)(atomic(&_q_value), newValue, expectedValue)); return *currentValue == expectedValue; } template<> template<typename T> -inline T QAtomicOpsBySize<2>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW +inline T QAtomicOpsBySize<2>::fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept { return QT_INTERLOCKED_FUNCTION(Exchange16)(atomic(&_q_value), value(newValue)); } template<> template<typename T> -inline T QAtomicOpsBySize<2>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW +inline T QAtomicOpsBySize<2>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return QT_INTERLOCKED_FUNCTION(ExchangeAdd16)(atomic(&_q_value), value<T>(valueToAdd * QAtomicAdditiveType<T>::AddScale)); } @@ -380,38 +380,38 @@ inline T QAtomicOpsBySize<2>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAd #ifdef Q_ATOMIC_INT64_IS_SUPPORTED template<> template<typename T> -inline bool QAtomicOpsBySize<8>::ref(T &_q_value) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<8>::ref(T &_q_value) noexcept { return QT_INTERLOCKED_FUNCTION(Increment64)(atomic(&_q_value)) != 0; } template<> template<typename T> -inline bool QAtomicOpsBySize<8>::deref(T &_q_value) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<8>::deref(T &_q_value) noexcept { return QT_INTERLOCKED_FUNCTION(Decrement64)(atomic(&_q_value)) != 0; } template<> template<typename T> -inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue) noexcept { return QT_INTERLOCKED_FUNCTION(CompareExchange64)(atomic(&_q_value), value(newValue), value(expectedValue)) == value(expectedValue); } template<> template <typename T> -inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) Q_DECL_NOTHROW +inline bool QAtomicOpsBySize<8>::testAndSetRelaxed(T &_q_value, T expectedValue, T newValue, T *currentValue) noexcept { *currentValue = T(QT_INTERLOCKED_FUNCTION(CompareExchange64)(atomic(&_q_value), newValue, expectedValue)); return *currentValue == expectedValue; } template<> template<typename T> -inline T QAtomicOpsBySize<8>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW +inline T QAtomicOpsBySize<8>::fetchAndStoreRelaxed(T &_q_value, T newValue) noexcept { return QT_INTERLOCKED_FUNCTION(Exchange64)(atomic(&_q_value), value(newValue)); } template<> template<typename T> -inline T QAtomicOpsBySize<8>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW +inline T QAtomicOpsBySize<8>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { return QT_INTERLOCKED_FUNCTION(ExchangeAdd64)(atomic(&_q_value), value<T>(valueToAdd * QAtomicAdditiveType<T>::AddScale)); } @@ -423,41 +423,41 @@ struct QAtomicOps<T *> : QGenericAtomicOps<QAtomicOps<T *> > { typedef T *Type; - static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return true; } - static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return true; } - static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) Q_DECL_NOTHROW; - static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) Q_DECL_NOTHROW; + static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return true; } + static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return true; } + static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) noexcept; + static bool testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) noexcept; - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return true; } - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return true; } - static T *fetchAndStoreRelaxed(T *&_q_value, T *newValue) Q_DECL_NOTHROW; + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return true; } + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return true; } + static T *fetchAndStoreRelaxed(T *&_q_value, T *newValue) noexcept; - static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return true; } - static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return true; } - static T *fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) Q_DECL_NOTHROW; + static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return true; } + static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return true; } + static T *fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) noexcept; }; template <typename T> -inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) Q_DECL_NOTHROW +inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue) noexcept { return QT_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&_q_value, newValue, expectedValue) == expectedValue; } template <typename T> -inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) Q_DECL_NOTHROW +inline bool QAtomicOps<T *>::testAndSetRelaxed(T *&_q_value, T *expectedValue, T *newValue, T **currentValue) noexcept { *currentValue = reinterpret_cast<T *>(QT_INTERLOCKED_COMPARE_EXCHANGE_POINTER(&_q_value, newValue, expectedValue)); return *currentValue == expectedValue; } template <typename T> -inline T *QAtomicOps<T *>::fetchAndStoreRelaxed(T *&_q_value, T *newValue) Q_DECL_NOTHROW +inline T *QAtomicOps<T *>::fetchAndStoreRelaxed(T *&_q_value, T *newValue) noexcept { return reinterpret_cast<T *>(QT_INTERLOCKED_EXCHANGE_POINTER(&_q_value, newValue)); } template <typename T> -inline T *QAtomicOps<T *>::fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) Q_DECL_NOTHROW +inline T *QAtomicOps<T *>::fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) noexcept { return reinterpret_cast<T *>(QT_INTERLOCKED_EXCHANGE_ADD_POINTER(&_q_value, valueToAdd * sizeof(T))); } diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 6b6ac10713..9804e60119 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -75,7 +75,7 @@ QT_END_NAMESPACE // New atomics -#if defined(Q_COMPILER_CONSTEXPR) && defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS) +#if defined(Q_COMPILER_CONSTEXPR) # if defined(Q_CC_CLANG) && Q_CC_CLANG < 303 /* Do not define QT_BASIC_ATOMIC_HAS_CONSTRUCTORS for Clang before version 3.3. @@ -99,126 +99,130 @@ public: typename Ops::Type _q_value; // Everything below is either implemented in ../arch/qatomic_XXX.h or (as fallback) in qgenericatomic.h +#if QT_DEPRECATED_SINCE(5, 14) + QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") T load() const noexcept { return loadRelaxed(); } + QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(T newValue) noexcept { storeRelaxed(newValue); } +#endif - T load() const Q_DECL_NOTHROW { return Ops::load(_q_value); } - void store(T newValue) Q_DECL_NOTHROW { Ops::store(_q_value, newValue); } + T loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); } + void storeRelaxed(T newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); } - T loadAcquire() const Q_DECL_NOTHROW { return Ops::loadAcquire(_q_value); } - void storeRelease(T newValue) Q_DECL_NOTHROW { Ops::storeRelease(_q_value, newValue); } - operator T() const Q_DECL_NOTHROW { return loadAcquire(); } - T operator=(T newValue) Q_DECL_NOTHROW { storeRelease(newValue); return newValue; } + T loadAcquire() const noexcept { return Ops::loadAcquire(_q_value); } + void storeRelease(T newValue) noexcept { Ops::storeRelease(_q_value, newValue); } + operator T() const noexcept { return loadAcquire(); } + T operator=(T newValue) noexcept { storeRelease(newValue); return newValue; } - static Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW { return Ops::isReferenceCountingNative(); } - static Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW { return Ops::isReferenceCountingWaitFree(); } + static Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept { return Ops::isReferenceCountingNative(); } + static Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept { return Ops::isReferenceCountingWaitFree(); } - bool ref() Q_DECL_NOTHROW { return Ops::ref(_q_value); } - bool deref() Q_DECL_NOTHROW { return Ops::deref(_q_value); } + bool ref() noexcept { return Ops::ref(_q_value); } + bool deref() noexcept { return Ops::deref(_q_value); } - static Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return Ops::isTestAndSetNative(); } - static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return Ops::isTestAndSetWaitFree(); } + static Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return Ops::isTestAndSetNative(); } + static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return Ops::isTestAndSetWaitFree(); } - bool testAndSetRelaxed(T expectedValue, T newValue) Q_DECL_NOTHROW + bool testAndSetRelaxed(T expectedValue, T newValue) noexcept { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue); } - bool testAndSetAcquire(T expectedValue, T newValue) Q_DECL_NOTHROW + bool testAndSetAcquire(T expectedValue, T newValue) noexcept { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue); } - bool testAndSetRelease(T expectedValue, T newValue) Q_DECL_NOTHROW + bool testAndSetRelease(T expectedValue, T newValue) noexcept { return Ops::testAndSetRelease(_q_value, expectedValue, newValue); } - bool testAndSetOrdered(T expectedValue, T newValue) Q_DECL_NOTHROW + bool testAndSetOrdered(T expectedValue, T newValue) noexcept { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue); } - bool testAndSetRelaxed(T expectedValue, T newValue, T ¤tValue) Q_DECL_NOTHROW + bool testAndSetRelaxed(T expectedValue, T newValue, T ¤tValue) noexcept { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue, ¤tValue); } - bool testAndSetAcquire(T expectedValue, T newValue, T ¤tValue) Q_DECL_NOTHROW + bool testAndSetAcquire(T expectedValue, T newValue, T ¤tValue) noexcept { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue, ¤tValue); } - bool testAndSetRelease(T expectedValue, T newValue, T ¤tValue) Q_DECL_NOTHROW + bool testAndSetRelease(T expectedValue, T newValue, T ¤tValue) noexcept { return Ops::testAndSetRelease(_q_value, expectedValue, newValue, ¤tValue); } - bool testAndSetOrdered(T expectedValue, T newValue, T ¤tValue) Q_DECL_NOTHROW + bool testAndSetOrdered(T expectedValue, T newValue, T ¤tValue) noexcept { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue, ¤tValue); } - static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return Ops::isFetchAndStoreNative(); } - static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndStoreWaitFree(); } + static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return Ops::isFetchAndStoreNative(); } + static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return Ops::isFetchAndStoreWaitFree(); } - T fetchAndStoreRelaxed(T newValue) Q_DECL_NOTHROW + T fetchAndStoreRelaxed(T newValue) noexcept { return Ops::fetchAndStoreRelaxed(_q_value, newValue); } - T fetchAndStoreAcquire(T newValue) Q_DECL_NOTHROW + T fetchAndStoreAcquire(T newValue) noexcept { return Ops::fetchAndStoreAcquire(_q_value, newValue); } - T fetchAndStoreRelease(T newValue) Q_DECL_NOTHROW + T fetchAndStoreRelease(T newValue) noexcept { return Ops::fetchAndStoreRelease(_q_value, newValue); } - T fetchAndStoreOrdered(T newValue) Q_DECL_NOTHROW + T fetchAndStoreOrdered(T newValue) noexcept { return Ops::fetchAndStoreOrdered(_q_value, newValue); } - static Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return Ops::isFetchAndAddNative(); } - static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndAddWaitFree(); } + static Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return Ops::isFetchAndAddNative(); } + static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return Ops::isFetchAndAddWaitFree(); } - T fetchAndAddRelaxed(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAddRelaxed(T valueToAdd) noexcept { return Ops::fetchAndAddRelaxed(_q_value, valueToAdd); } - T fetchAndAddAcquire(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAddAcquire(T valueToAdd) noexcept { return Ops::fetchAndAddAcquire(_q_value, valueToAdd); } - T fetchAndAddRelease(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAddRelease(T valueToAdd) noexcept { return Ops::fetchAndAddRelease(_q_value, valueToAdd); } - T fetchAndAddOrdered(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAddOrdered(T valueToAdd) noexcept { return Ops::fetchAndAddOrdered(_q_value, valueToAdd); } - T fetchAndSubRelaxed(T valueToAdd) Q_DECL_NOTHROW + T fetchAndSubRelaxed(T valueToAdd) noexcept { return Ops::fetchAndSubRelaxed(_q_value, valueToAdd); } - T fetchAndSubAcquire(T valueToAdd) Q_DECL_NOTHROW + T fetchAndSubAcquire(T valueToAdd) noexcept { return Ops::fetchAndSubAcquire(_q_value, valueToAdd); } - T fetchAndSubRelease(T valueToAdd) Q_DECL_NOTHROW + T fetchAndSubRelease(T valueToAdd) noexcept { return Ops::fetchAndSubRelease(_q_value, valueToAdd); } - T fetchAndSubOrdered(T valueToAdd) Q_DECL_NOTHROW + T fetchAndSubOrdered(T valueToAdd) noexcept { return Ops::fetchAndSubOrdered(_q_value, valueToAdd); } - T fetchAndAndRelaxed(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAndRelaxed(T valueToAdd) noexcept { return Ops::fetchAndAndRelaxed(_q_value, valueToAdd); } - T fetchAndAndAcquire(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAndAcquire(T valueToAdd) noexcept { return Ops::fetchAndAndAcquire(_q_value, valueToAdd); } - T fetchAndAndRelease(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAndRelease(T valueToAdd) noexcept { return Ops::fetchAndAndRelease(_q_value, valueToAdd); } - T fetchAndAndOrdered(T valueToAdd) Q_DECL_NOTHROW + T fetchAndAndOrdered(T valueToAdd) noexcept { return Ops::fetchAndAndOrdered(_q_value, valueToAdd); } - T fetchAndOrRelaxed(T valueToAdd) Q_DECL_NOTHROW + T fetchAndOrRelaxed(T valueToAdd) noexcept { return Ops::fetchAndOrRelaxed(_q_value, valueToAdd); } - T fetchAndOrAcquire(T valueToAdd) Q_DECL_NOTHROW + T fetchAndOrAcquire(T valueToAdd) noexcept { return Ops::fetchAndOrAcquire(_q_value, valueToAdd); } - T fetchAndOrRelease(T valueToAdd) Q_DECL_NOTHROW + T fetchAndOrRelease(T valueToAdd) noexcept { return Ops::fetchAndOrRelease(_q_value, valueToAdd); } - T fetchAndOrOrdered(T valueToAdd) Q_DECL_NOTHROW + T fetchAndOrOrdered(T valueToAdd) noexcept { return Ops::fetchAndOrOrdered(_q_value, valueToAdd); } - T fetchAndXorRelaxed(T valueToAdd) Q_DECL_NOTHROW + T fetchAndXorRelaxed(T valueToAdd) noexcept { return Ops::fetchAndXorRelaxed(_q_value, valueToAdd); } - T fetchAndXorAcquire(T valueToAdd) Q_DECL_NOTHROW + T fetchAndXorAcquire(T valueToAdd) noexcept { return Ops::fetchAndXorAcquire(_q_value, valueToAdd); } - T fetchAndXorRelease(T valueToAdd) Q_DECL_NOTHROW + T fetchAndXorRelease(T valueToAdd) noexcept { return Ops::fetchAndXorRelease(_q_value, valueToAdd); } - T fetchAndXorOrdered(T valueToAdd) Q_DECL_NOTHROW + T fetchAndXorOrdered(T valueToAdd) noexcept { return Ops::fetchAndXorOrdered(_q_value, valueToAdd); } - T operator++() Q_DECL_NOTHROW + T operator++() noexcept { return fetchAndAddOrdered(1) + 1; } - T operator++(int) Q_DECL_NOTHROW + T operator++(int) noexcept { return fetchAndAddOrdered(1); } - T operator--() Q_DECL_NOTHROW + T operator--() noexcept { return fetchAndSubOrdered(1) - 1; } - T operator--(int) Q_DECL_NOTHROW + T operator--(int) noexcept { return fetchAndSubOrdered(1); } - T operator+=(T v) Q_DECL_NOTHROW + T operator+=(T v) noexcept { return fetchAndAddOrdered(v) + v; } - T operator-=(T v) Q_DECL_NOTHROW + T operator-=(T v) noexcept { return fetchAndSubOrdered(v) - v; } - T operator&=(T v) Q_DECL_NOTHROW + T operator&=(T v) noexcept { return fetchAndAndOrdered(v) & v; } - T operator|=(T v) Q_DECL_NOTHROW + T operator|=(T v) noexcept { return fetchAndOrOrdered(v) | v; } - T operator^=(T v) Q_DECL_NOTHROW + T operator^=(T v) noexcept { return fetchAndXorOrdered(v) ^ v; } #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS QBasicAtomicInteger() = default; - constexpr QBasicAtomicInteger(T value) Q_DECL_NOTHROW : _q_value(value) {} + constexpr QBasicAtomicInteger(T value) noexcept : _q_value(value) {} QBasicAtomicInteger(const QBasicAtomicInteger &) = delete; QBasicAtomicInteger &operator=(const QBasicAtomicInteger &) = delete; QBasicAtomicInteger &operator=(const QBasicAtomicInteger &) volatile = delete; @@ -236,85 +240,91 @@ public: AtomicType _q_value; - Type load() const Q_DECL_NOTHROW { return Ops::load(_q_value); } - void store(Type newValue) Q_DECL_NOTHROW { Ops::store(_q_value, newValue); } - operator Type() const Q_DECL_NOTHROW { return loadAcquire(); } - Type operator=(Type newValue) Q_DECL_NOTHROW { storeRelease(newValue); return newValue; } +#if QT_DEPRECATED_SINCE(5, 14) + QT_DEPRECATED_VERSION_X_5_14("Use loadRelaxed") Type load() const noexcept { return loadRelaxed(); } + QT_DEPRECATED_VERSION_X_5_14("Use storeRelaxed") void store(Type newValue) noexcept { storeRelaxed(newValue); } +#endif + + Type loadRelaxed() const noexcept { return Ops::loadRelaxed(_q_value); } + void storeRelaxed(Type newValue) noexcept { Ops::storeRelaxed(_q_value, newValue); } + + operator Type() const noexcept { return loadAcquire(); } + Type operator=(Type newValue) noexcept { storeRelease(newValue); return newValue; } // Atomic API, implemented in qatomic_XXX.h - Type loadAcquire() const Q_DECL_NOTHROW { return Ops::loadAcquire(_q_value); } - void storeRelease(Type newValue) Q_DECL_NOTHROW { Ops::storeRelease(_q_value, newValue); } + Type loadAcquire() const noexcept { return Ops::loadAcquire(_q_value); } + void storeRelease(Type newValue) noexcept { Ops::storeRelease(_q_value, newValue); } - static Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW { return Ops::isTestAndSetNative(); } - static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW { return Ops::isTestAndSetWaitFree(); } + static Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept { return Ops::isTestAndSetNative(); } + static Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept { return Ops::isTestAndSetWaitFree(); } - bool testAndSetRelaxed(Type expectedValue, Type newValue) Q_DECL_NOTHROW + bool testAndSetRelaxed(Type expectedValue, Type newValue) noexcept { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue); } - bool testAndSetAcquire(Type expectedValue, Type newValue) Q_DECL_NOTHROW + bool testAndSetAcquire(Type expectedValue, Type newValue) noexcept { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue); } - bool testAndSetRelease(Type expectedValue, Type newValue) Q_DECL_NOTHROW + bool testAndSetRelease(Type expectedValue, Type newValue) noexcept { return Ops::testAndSetRelease(_q_value, expectedValue, newValue); } - bool testAndSetOrdered(Type expectedValue, Type newValue) Q_DECL_NOTHROW + bool testAndSetOrdered(Type expectedValue, Type newValue) noexcept { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue); } - bool testAndSetRelaxed(Type expectedValue, Type newValue, Type ¤tValue) Q_DECL_NOTHROW + bool testAndSetRelaxed(Type expectedValue, Type newValue, Type ¤tValue) noexcept { return Ops::testAndSetRelaxed(_q_value, expectedValue, newValue, ¤tValue); } - bool testAndSetAcquire(Type expectedValue, Type newValue, Type ¤tValue) Q_DECL_NOTHROW + bool testAndSetAcquire(Type expectedValue, Type newValue, Type ¤tValue) noexcept { return Ops::testAndSetAcquire(_q_value, expectedValue, newValue, ¤tValue); } - bool testAndSetRelease(Type expectedValue, Type newValue, Type ¤tValue) Q_DECL_NOTHROW + bool testAndSetRelease(Type expectedValue, Type newValue, Type ¤tValue) noexcept { return Ops::testAndSetRelease(_q_value, expectedValue, newValue, ¤tValue); } - bool testAndSetOrdered(Type expectedValue, Type newValue, Type ¤tValue) Q_DECL_NOTHROW + bool testAndSetOrdered(Type expectedValue, Type newValue, Type ¤tValue) noexcept { return Ops::testAndSetOrdered(_q_value, expectedValue, newValue, ¤tValue); } - static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return Ops::isFetchAndStoreNative(); } - static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndStoreWaitFree(); } + static Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return Ops::isFetchAndStoreNative(); } + static Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return Ops::isFetchAndStoreWaitFree(); } - Type fetchAndStoreRelaxed(Type newValue) Q_DECL_NOTHROW + Type fetchAndStoreRelaxed(Type newValue) noexcept { return Ops::fetchAndStoreRelaxed(_q_value, newValue); } - Type fetchAndStoreAcquire(Type newValue) Q_DECL_NOTHROW + Type fetchAndStoreAcquire(Type newValue) noexcept { return Ops::fetchAndStoreAcquire(_q_value, newValue); } - Type fetchAndStoreRelease(Type newValue) Q_DECL_NOTHROW + Type fetchAndStoreRelease(Type newValue) noexcept { return Ops::fetchAndStoreRelease(_q_value, newValue); } - Type fetchAndStoreOrdered(Type newValue) Q_DECL_NOTHROW + Type fetchAndStoreOrdered(Type newValue) noexcept { return Ops::fetchAndStoreOrdered(_q_value, newValue); } - static Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return Ops::isFetchAndAddNative(); } - static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return Ops::isFetchAndAddWaitFree(); } + static Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return Ops::isFetchAndAddNative(); } + static Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return Ops::isFetchAndAddWaitFree(); } - Type fetchAndAddRelaxed(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndAddRelaxed(qptrdiff valueToAdd) noexcept { return Ops::fetchAndAddRelaxed(_q_value, valueToAdd); } - Type fetchAndAddAcquire(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndAddAcquire(qptrdiff valueToAdd) noexcept { return Ops::fetchAndAddAcquire(_q_value, valueToAdd); } - Type fetchAndAddRelease(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndAddRelease(qptrdiff valueToAdd) noexcept { return Ops::fetchAndAddRelease(_q_value, valueToAdd); } - Type fetchAndAddOrdered(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndAddOrdered(qptrdiff valueToAdd) noexcept { return Ops::fetchAndAddOrdered(_q_value, valueToAdd); } - Type fetchAndSubRelaxed(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndSubRelaxed(qptrdiff valueToAdd) noexcept { return Ops::fetchAndSubRelaxed(_q_value, valueToAdd); } - Type fetchAndSubAcquire(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndSubAcquire(qptrdiff valueToAdd) noexcept { return Ops::fetchAndSubAcquire(_q_value, valueToAdd); } - Type fetchAndSubRelease(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndSubRelease(qptrdiff valueToAdd) noexcept { return Ops::fetchAndSubRelease(_q_value, valueToAdd); } - Type fetchAndSubOrdered(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type fetchAndSubOrdered(qptrdiff valueToAdd) noexcept { return Ops::fetchAndSubOrdered(_q_value, valueToAdd); } - Type operator++() Q_DECL_NOTHROW + Type operator++() noexcept { return fetchAndAddOrdered(1) + 1; } - Type operator++(int) Q_DECL_NOTHROW + Type operator++(int) noexcept { return fetchAndAddOrdered(1); } - Type operator--() Q_DECL_NOTHROW + Type operator--() noexcept { return fetchAndSubOrdered(1) - 1; } - Type operator--(int) Q_DECL_NOTHROW + Type operator--(int) noexcept { return fetchAndSubOrdered(1); } - Type operator+=(qptrdiff valueToAdd) Q_DECL_NOTHROW + Type operator+=(qptrdiff valueToAdd) noexcept { return fetchAndAddOrdered(valueToAdd) + valueToAdd; } - Type operator-=(qptrdiff valueToSub) Q_DECL_NOTHROW + Type operator-=(qptrdiff valueToSub) noexcept { return fetchAndSubOrdered(valueToSub) - valueToSub; } #ifdef QT_BASIC_ATOMIC_HAS_CONSTRUCTORS QBasicAtomicPointer() = default; - constexpr QBasicAtomicPointer(Type value) Q_DECL_NOTHROW : _q_value(value) {} + constexpr QBasicAtomicPointer(Type value) noexcept : _q_value(value) {} QBasicAtomicPointer(const QBasicAtomicPointer &) = delete; QBasicAtomicPointer &operator=(const QBasicAtomicPointer &) = delete; QBasicAtomicPointer &operator=(const QBasicAtomicPointer &) volatile = delete; diff --git a/src/corelib/thread/qfutex_p.h b/src/corelib/thread/qfutex_p.h index 483664c783..7bec4554b7 100644 --- a/src/corelib/thread/qfutex_p.h +++ b/src/corelib/thread/qfutex_p.h @@ -81,15 +81,43 @@ QT_END_NAMESPACE // if not defined in linux/futex.h # define FUTEX_PRIVATE_FLAG 128 // added in v2.6.22 +# if QT_HAS_FEATURE(thread_sanitizer) || defined(__SANITIZE_THREAD__) +# include <sanitizer/tsan_interface.h> +inline void _q_tsan_acquire(void *addr, void *addr2) +{ + __tsan_acquire(addr); + if (addr2) + __tsan_acquire(addr2); +} +inline void _q_tsan_release(void *addr, void *addr2) +{ + if (addr2) + __tsan_release(addr2); + __tsan_release(addr); +} +# else +inline void _q_tsan_acquire(void *, void *) {} +inline void _q_tsan_release(void *, void *) {} +# endif // QT_HAS_FEATURE(thread_sanitizer) || defined(__SANITIZE_THREAD__) + QT_BEGIN_NAMESPACE namespace QtLinuxFutex { constexpr inline bool futexAvailable() { return true; } inline int _q_futex(int *addr, int op, int val, quintptr val2 = 0, - int *addr2 = nullptr, int val3 = 0) Q_DECL_NOTHROW + int *addr2 = nullptr, int val3 = 0) noexcept { + // A futex call ensures total ordering on the futex words + // (in either success or failure of the call). Instruct TSAN accordingly, + // as TSAN does not understand the futex(2) syscall. + _q_tsan_release(addr, addr2); + // we use __NR_futex because some libcs (like Android's bionic) don't // provide SYS_futex etc. - return syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); + int result = syscall(__NR_futex, addr, op | FUTEX_PRIVATE_FLAG, val, val2, addr2, val3); + + _q_tsan_acquire(addr, addr2); + + return result; } template <typename T> int *addr(T *ptr) { diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h index a456dd9139..d3135510b3 100644 --- a/src/corelib/thread/qfuture.h +++ b/src/corelib/thread/qfuture.h @@ -111,33 +111,79 @@ public: typedef const T &reference; inline const_iterator() {} - inline const_iterator(QFuture const * const _future, int _index) : future(_future), index(_index) {} + inline const_iterator(QFuture const * const _future, int _index) + : future(_future), index(advanceIndex(_index, 0)) { } inline const_iterator(const const_iterator &o) : future(o.future), index(o.index) {} inline const_iterator &operator=(const const_iterator &o) { future = o.future; index = o.index; return *this; } inline const T &operator*() const { return future->d.resultReference(index); } inline const T *operator->() const { return future->d.resultPointer(index); } - - inline bool operator!=(const const_iterator &other) const + inline bool operator!=(const const_iterator &other) const { return index != other.index; } + inline bool operator==(const const_iterator &o) const { return !operator!=(o); } + inline const_iterator &operator++() + { index = advanceIndex(index, 1); return *this; } + inline const_iterator &operator--() + { index = advanceIndex(index, -1); return *this; } + inline const_iterator operator++(int) + { + const_iterator r = *this; + index = advanceIndex(index, 1); + return r; + } + inline const_iterator operator--(int) { - if (index == -1 && other.index == -1) // comparing end != end? - return false; - if (other.index == -1) - return (future->isRunning() || (index < future->resultCount())); - return (index != other.index); + const_iterator r = *this; + index = advanceIndex(index, -1); + return r; } + inline const_iterator operator+(int j) const + { return const_iterator(future, advanceIndex(index, j)); } + inline const_iterator operator-(int j) const + { return const_iterator(future, advanceIndex(index, -j)); } + inline const_iterator &operator+=(int j) + { index = advanceIndex(index, j); return *this; } + inline const_iterator &operator-=(int j) + { index = advanceIndex(index, -j); return *this; } + friend inline const_iterator operator+(int j, const_iterator k) + { return const_iterator(k.future, k.advanceIndex(k.index, j)); } - inline bool operator==(const const_iterator &o) const { return !operator!=(o); } - inline const_iterator &operator++() { ++index; return *this; } - inline const_iterator operator++(int) { const_iterator r = *this; ++index; return r; } - inline const_iterator &operator--() { --index; return *this; } - inline const_iterator operator--(int) { const_iterator r = *this; --index; return r; } - inline const_iterator operator+(int j) const { return const_iterator(future, index + j); } - inline const_iterator operator-(int j) const { return const_iterator(future, index - j); } - inline const_iterator &operator+=(int j) { index += j; return *this; } - inline const_iterator &operator-=(int j) { index -= j; return *this; } - friend inline const_iterator operator+(int j, const_iterator k) { return k + j; } private: + /*! \internal + + Advances the iterator index \a idx \a n steps, waits for the + result at the target index, and returns the target index. + + The index may be -1, indicating the end iterator, either + as the argument or as the return value. The end iterator + may be decremented. + + The caller is responsible for not advancing the iterator + before begin() or past end(), with the exception that + attempting to advance a non-end iterator past end() for + a running future is allowed and will return the end iterator. + + Note that n == 0 is valid and will wait for the result + at the given index. + */ + int advanceIndex(int idx, int n) const + { + // The end iterator can be decremented, leave as-is for other cases + if (idx == -1 && n >= 0) + return idx; + + // Special case for decrementing the end iterator: wait for + // finished to get the total result count. + if (idx == -1 && future->isRunning()) + future->d.waitForFinished(); + + // Wait for result at target index + const int targetIndex = (idx == -1) ? future->resultCount() + n : idx + n; + future->d.waitForResult(targetIndex); + + // After waiting there is either a result or the end was reached + return (targetIndex < future->resultCount()) ? targetIndex : -1; + } + QFuture const * future; int index; }; diff --git a/src/corelib/thread/qfutureinterface.cpp b/src/corelib/thread/qfutureinterface.cpp index dfbed5fb0f..8f4cae8816 100644 --- a/src/corelib/thread/qfutureinterface.cpp +++ b/src/corelib/thread/qfutureinterface.cpp @@ -97,7 +97,7 @@ static inline int switch_off(QAtomicInt &a, int which) static inline int switch_from_to(QAtomicInt &a, int from, int to) { int newValue; - int expected = a.load(); + int expected = a.loadRelaxed(); do { newValue = (expected & ~from) | to; } while (!a.testAndSetRelaxed(expected, newValue, expected)); @@ -107,7 +107,7 @@ static inline int switch_from_to(QAtomicInt &a, int from, int to) void QFutureInterfaceBase::cancel() { QMutexLocker locker(&d->m_mutex); - if (d->state.load() & Canceled) + if (d->state.loadRelaxed() & Canceled) return; switch_from_to(d->state, Paused, Canceled); @@ -132,7 +132,7 @@ void QFutureInterfaceBase::setPaused(bool paused) void QFutureInterfaceBase::togglePaused() { QMutexLocker locker(&d->m_mutex); - if (d->state.load() & Paused) { + if (d->state.loadRelaxed() & Paused) { switch_off(d->state, Paused); d->pausedWaitCondition.wakeAll(); d->sendCallOut(QFutureCallOutEvent(QFutureCallOutEvent::Resumed)); @@ -149,7 +149,7 @@ void QFutureInterfaceBase::setThrottled(bool enable) switch_on(d->state, Throttled); } else { switch_off(d->state, Throttled); - if (!(d->state.load() & Paused)) + if (!(d->state.loadRelaxed() & Paused)) d->pausedWaitCondition.wakeAll(); } } @@ -201,13 +201,13 @@ void QFutureInterfaceBase::waitForResume() { // return early if possible to avoid taking the mutex lock. { - const int state = d->state.load(); + const int state = d->state.loadRelaxed(); if (!(state & Paused) || (state & Canceled)) return; } QMutexLocker lock(&d->m_mutex); - const int state = d->state.load(); + const int state = d->state.loadRelaxed(); if (!(state & Paused) || (state & Canceled)) return; @@ -256,7 +256,7 @@ bool QFutureInterfaceBase::isProgressUpdateNeeded() const void QFutureInterfaceBase::reportStarted() { QMutexLocker locker(&d->m_mutex); - if (d->state.load() & (Started|Canceled|Finished)) + if (d->state.loadRelaxed() & (Started|Canceled|Finished)) return; d->setState(State(Started | Running)); @@ -272,7 +272,7 @@ void QFutureInterfaceBase::reportCanceled() void QFutureInterfaceBase::reportException(const QException &exception) { QMutexLocker locker(&d->m_mutex); - if (d->state.load() & (Canceled|Finished)) + if (d->state.loadRelaxed() & (Canceled|Finished)) return; d->m_exceptionStore.setException(exception); @@ -307,7 +307,7 @@ int QFutureInterfaceBase::expectedResultCount() bool QFutureInterfaceBase::queryState(State state) const { - return d->state.load() & state; + return d->state.loadRelaxed() & state; } void QFutureInterfaceBase::waitForResult(int resultIndex) @@ -352,7 +352,7 @@ void QFutureInterfaceBase::waitForFinished() void QFutureInterfaceBase::reportResultsReady(int beginIndex, int endIndex) { - if (beginIndex == endIndex || (d->state.load() & (Canceled|Finished))) + if (beginIndex == endIndex || (d->state.loadRelaxed() & (Canceled|Finished))) return; d->waitCondition.wakeAll(); @@ -414,7 +414,7 @@ void QFutureInterfaceBase::setProgressValueAndText(int progressValue, if (d->m_progressValue >= progressValue) return; - if (d->state.load() & (Canceled|Finished)) + if (d->state.loadRelaxed() & (Canceled|Finished)) return; if (d->internal_updateProgress(progressValue, progressText)) { @@ -486,10 +486,10 @@ bool QFutureInterfaceBasePrivate::internal_waitForNextResult() if (m_results.hasNextResult()) return true; - while ((state.load() & QFutureInterfaceBase::Running) && m_results.hasNextResult() == false) + while ((state.loadRelaxed() & QFutureInterfaceBase::Running) && m_results.hasNextResult() == false) waitCondition.wait(&m_mutex); - return !(state.load() & QFutureInterfaceBase::Canceled) && m_results.hasNextResult(); + return !(state.loadRelaxed() & QFutureInterfaceBase::Canceled) && m_results.hasNextResult(); } bool QFutureInterfaceBasePrivate::internal_updateProgress(int progress, @@ -512,8 +512,8 @@ bool QFutureInterfaceBasePrivate::internal_updateProgress(int progress, void QFutureInterfaceBasePrivate::internal_setThrottled(bool enable) { // bail out if we are not changing the state - if ((enable && (state.load() & QFutureInterfaceBase::Throttled)) - || (!enable && !(state.load() & QFutureInterfaceBase::Throttled))) + if ((enable && (state.loadRelaxed() & QFutureInterfaceBase::Throttled)) + || (!enable && !(state.loadRelaxed() & QFutureInterfaceBase::Throttled))) return; // change the state @@ -521,7 +521,7 @@ void QFutureInterfaceBasePrivate::internal_setThrottled(bool enable) switch_on(state, QFutureInterfaceBase::Throttled); } else { switch_off(state, QFutureInterfaceBase::Throttled); - if (!(state.load() & QFutureInterfaceBase::Paused)) + if (!(state.loadRelaxed() & QFutureInterfaceBase::Paused)) pausedWaitCondition.wakeAll(); } } @@ -556,7 +556,7 @@ void QFutureInterfaceBasePrivate::connectOutputInterface(QFutureCallOutInterface { QMutexLocker locker(&m_mutex); - if (state.load() & QFutureInterfaceBase::Started) { + if (state.loadRelaxed() & QFutureInterfaceBase::Started) { interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Started)); interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::ProgressRange, m_progressMinimum, @@ -576,13 +576,13 @@ void QFutureInterfaceBasePrivate::connectOutputInterface(QFutureCallOutInterface it.batchedAdvance(); } - if (state.load() & QFutureInterfaceBase::Paused) + if (state.loadRelaxed() & QFutureInterfaceBase::Paused) interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Paused)); - if (state.load() & QFutureInterfaceBase::Canceled) + if (state.loadRelaxed() & QFutureInterfaceBase::Canceled) interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Canceled)); - if (state.load() & QFutureInterfaceBase::Finished) + if (state.loadRelaxed() & QFutureInterfaceBase::Finished) interface->postCallOutEvent(QFutureCallOutEvent(QFutureCallOutEvent::Finished)); outputConnections.append(interface); @@ -601,7 +601,7 @@ void QFutureInterfaceBasePrivate::disconnectOutputInterface(QFutureCallOutInterf void QFutureInterfaceBasePrivate::setState(QFutureInterfaceBase::State newState) { - state.store(newState); + state.storeRelaxed(newState); } QT_END_NAMESPACE diff --git a/src/corelib/thread/qfutureinterface_p.h b/src/corelib/thread/qfutureinterface_p.h index 63e534464f..b297dff633 100644 --- a/src/corelib/thread/qfutureinterface_p.h +++ b/src/corelib/thread/qfutureinterface_p.h @@ -144,11 +144,11 @@ public: // Default ref counter for QFIBP inline bool ref() { return m_refCount.ref(); } inline bool deref() { return m_refCount.deref(); } - inline int load() const { return m_refCount.load(); } + inline int load() const { return m_refCount.loadRelaxed(); } // Ref counter for type T inline bool refT() { return m_refCountT.ref(); } inline bool derefT() { return m_refCountT.deref(); } - inline int loadT() const { return m_refCountT.load(); } + inline int loadT() const { return m_refCountT.loadRelaxed(); } private: QAtomicInt m_refCount; diff --git a/src/corelib/thread/qfuturewatcher.cpp b/src/corelib/thread/qfuturewatcher.cpp index 8e90d043ef..06bc4740f9 100644 --- a/src/corelib/thread/qfuturewatcher.cpp +++ b/src/corelib/thread/qfuturewatcher.cpp @@ -402,7 +402,7 @@ void QFutureWatcherBase::disconnectOutputInterface(bool pendingAssignment) { if (pendingAssignment) { Q_D(QFutureWatcherBase); - d->pendingResultsReady.store(0); + d->pendingResultsReady.storeRelaxed(0); qDeleteAll(d->pendingCallOutEvents); d->pendingCallOutEvents.clear(); d->finished = false; /* May soon be amended, during connectOutputInterface() */ @@ -441,7 +441,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event) emit q->finished(); break; case QFutureCallOutEvent::Canceled: - pendingResultsReady.store(0); + pendingResultsReady.storeRelaxed(0); emit q->canceled(); break; case QFutureCallOutEvent::Paused: @@ -466,7 +466,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event) emit q->resultsReadyAt(beginIndex, endIndex); - if (resultAtConnected.load() <= 0) + if (resultAtConnected.loadRelaxed() <= 0) break; for (int i = beginIndex; i < endIndex; ++i) @@ -479,7 +479,7 @@ void QFutureWatcherBasePrivate::sendCallOutEvent(QFutureCallOutEvent *event) emit q->progressValueChanged(event->index1); if (!event->text.isNull()) // ### - q->progressTextChanged(event->text); + emit q->progressTextChanged(event->text); break; case QFutureCallOutEvent::ProgressRange: emit q->progressRangeChanged(event->index1, event->index2); diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h index 89c4fe9a11..e9e5f3c74b 100644 --- a/src/corelib/thread/qgenericatomic.h +++ b/src/corelib/thread/qgenericatomic.h @@ -72,32 +72,44 @@ template <typename BaseClass> struct QGenericAtomicOps { template <typename T> struct AtomicType { typedef T Type; typedef T *PointerType; }; - template <typename T> static void acquireMemoryFence(const T &_q_value) Q_DECL_NOTHROW + template <typename T> static void acquireMemoryFence(const T &_q_value) noexcept { BaseClass::orderedMemoryFence(_q_value); } - template <typename T> static void releaseMemoryFence(const T &_q_value) Q_DECL_NOTHROW + template <typename T> static void releaseMemoryFence(const T &_q_value) noexcept { BaseClass::orderedMemoryFence(_q_value); } - template <typename T> static void orderedMemoryFence(const T &) Q_DECL_NOTHROW + template <typename T> static void orderedMemoryFence(const T &) noexcept { } template <typename T> static Q_ALWAYS_INLINE - T load(const T &_q_value) Q_DECL_NOTHROW + T load(const T &_q_value) noexcept { return _q_value; } template <typename T, typename X> static Q_ALWAYS_INLINE - void store(T &_q_value, X newValue) Q_DECL_NOTHROW + void store(T &_q_value, X newValue) noexcept { _q_value = newValue; } template <typename T> static Q_ALWAYS_INLINE - T loadAcquire(const T &_q_value) Q_DECL_NOTHROW + T loadRelaxed(const T &_q_value) noexcept + { + return _q_value; + } + + template <typename T, typename X> static Q_ALWAYS_INLINE + void storeRelaxed(T &_q_value, X newValue) noexcept + { + _q_value = newValue; + } + + template <typename T> static Q_ALWAYS_INLINE + T loadAcquire(const T &_q_value) noexcept { T tmp = *static_cast<const volatile T *>(&_q_value); BaseClass::acquireMemoryFence(_q_value); @@ -105,24 +117,24 @@ template <typename BaseClass> struct QGenericAtomicOps } template <typename T, typename X> static Q_ALWAYS_INLINE - void storeRelease(T &_q_value, X newValue) Q_DECL_NOTHROW + void storeRelease(T &_q_value, X newValue) noexcept { BaseClass::releaseMemoryFence(_q_value); *static_cast<volatile T *>(&_q_value) = newValue; } - static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() Q_DECL_NOTHROW + static inline Q_DECL_CONSTEXPR bool isReferenceCountingNative() noexcept { return BaseClass::isFetchAndAddNative(); } - static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() Q_DECL_NOTHROW + static inline Q_DECL_CONSTEXPR bool isReferenceCountingWaitFree() noexcept { return BaseClass::isFetchAndAddWaitFree(); } template <typename T> static Q_ALWAYS_INLINE - bool ref(T &_q_value) Q_DECL_NOTHROW + bool ref(T &_q_value) noexcept { return BaseClass::fetchAndAddRelaxed(_q_value, 1) != T(-1); } template <typename T> static Q_ALWAYS_INLINE - bool deref(T &_q_value) Q_DECL_NOTHROW + bool deref(T &_q_value) noexcept { return BaseClass::fetchAndAddRelaxed(_q_value, -1) != 1; } @@ -130,16 +142,16 @@ template <typename BaseClass> struct QGenericAtomicOps #if 0 // These functions have no default implementation // Archictectures must implement them - static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() Q_DECL_NOTHROW; - static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() Q_DECL_NOTHROW; + static inline Q_DECL_CONSTEXPR bool isTestAndSetNative() noexcept; + static inline Q_DECL_CONSTEXPR bool isTestAndSetWaitFree() noexcept; template <typename T, typename X> static inline - bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW; + bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue) noexcept; template <typename T, typename X> static inline - bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW; + bool testAndSetRelaxed(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept; #endif template <typename T, typename X> static Q_ALWAYS_INLINE - bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW + bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue) noexcept { bool tmp = BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue); BaseClass::acquireMemoryFence(_q_value); @@ -147,21 +159,21 @@ template <typename BaseClass> struct QGenericAtomicOps } template <typename T, typename X> static Q_ALWAYS_INLINE - bool testAndSetRelease(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW + bool testAndSetRelease(T &_q_value, X expectedValue, X newValue) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue); } template <typename T, typename X> static Q_ALWAYS_INLINE - bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue) Q_DECL_NOTHROW + bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue); } template <typename T, typename X> static Q_ALWAYS_INLINE - bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW + bool testAndSetAcquire(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept { bool tmp = BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue); BaseClass::acquireMemoryFence(_q_value); @@ -169,35 +181,35 @@ template <typename BaseClass> struct QGenericAtomicOps } template <typename T, typename X> static Q_ALWAYS_INLINE - bool testAndSetRelease(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW + bool testAndSetRelease(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue); } template <typename T, typename X> static Q_ALWAYS_INLINE - bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue, X *currentValue) Q_DECL_NOTHROW + bool testAndSetOrdered(T &_q_value, X expectedValue, X newValue, X *currentValue) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::testAndSetRelaxed(_q_value, expectedValue, newValue, currentValue); } - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() Q_DECL_NOTHROW { return false; } - static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreNative() noexcept { return false; } + static inline Q_DECL_CONSTEXPR bool isFetchAndStoreWaitFree() noexcept { return false; } template <typename T, typename X> static Q_ALWAYS_INLINE - T fetchAndStoreRelaxed(T &_q_value, X newValue) Q_DECL_NOTHROW + T fetchAndStoreRelaxed(T &_q_value, X newValue) noexcept { // implement fetchAndStore on top of testAndSet Q_FOREVER { - T tmp = load(_q_value); + T tmp = loadRelaxed(_q_value); if (BaseClass::testAndSetRelaxed(_q_value, tmp, newValue)) return tmp; } } template <typename T, typename X> static Q_ALWAYS_INLINE - T fetchAndStoreAcquire(T &_q_value, X newValue) Q_DECL_NOTHROW + T fetchAndStoreAcquire(T &_q_value, X newValue) noexcept { T tmp = BaseClass::fetchAndStoreRelaxed(_q_value, newValue); BaseClass::acquireMemoryFence(_q_value); @@ -205,34 +217,34 @@ template <typename BaseClass> struct QGenericAtomicOps } template <typename T, typename X> static Q_ALWAYS_INLINE - T fetchAndStoreRelease(T &_q_value, X newValue) Q_DECL_NOTHROW + T fetchAndStoreRelease(T &_q_value, X newValue) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::fetchAndStoreRelaxed(_q_value, newValue); } template <typename T, typename X> static Q_ALWAYS_INLINE - T fetchAndStoreOrdered(T &_q_value, X newValue) Q_DECL_NOTHROW + T fetchAndStoreOrdered(T &_q_value, X newValue) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::fetchAndStoreRelaxed(_q_value, newValue); } - static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() Q_DECL_NOTHROW { return false; } - static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() Q_DECL_NOTHROW { return false; } + static inline Q_DECL_CONSTEXPR bool isFetchAndAddNative() noexcept { return false; } + static inline Q_DECL_CONSTEXPR bool isFetchAndAddWaitFree() noexcept { return false; } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { // implement fetchAndAdd on top of testAndSet Q_FOREVER { - T tmp = BaseClass::load(_q_value); + T tmp = BaseClass::loadRelaxed(_q_value); if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp + valueToAdd))) return tmp; } } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAddAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { T tmp = BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd); BaseClass::acquireMemoryFence(_q_value); @@ -240,14 +252,14 @@ template <typename BaseClass> struct QGenericAtomicOps } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAddRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAddOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) Q_DECL_NOTHROW + T fetchAndAddOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT valueToAdd) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::fetchAndAddRelaxed(_q_value, valueToAdd); @@ -256,7 +268,7 @@ template <typename BaseClass> struct QGenericAtomicOps QT_WARNING_PUSH QT_WARNING_DISABLE_MSVC(4146) // unary minus operator applied to unsigned type, result still unsigned template <typename T> static Q_ALWAYS_INLINE - T fetchAndSubRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW + T fetchAndSubRelaxed(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept { // implement fetchAndSub on top of fetchAndAdd return fetchAndAddRelaxed(_q_value, -operand); @@ -264,7 +276,7 @@ QT_WARNING_DISABLE_MSVC(4146) // unary minus operator applied to unsigned type QT_WARNING_POP template <typename T> static Q_ALWAYS_INLINE - T fetchAndSubAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW + T fetchAndSubAcquire(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept { T tmp = BaseClass::fetchAndSubRelaxed(_q_value, operand); BaseClass::acquireMemoryFence(_q_value); @@ -272,24 +284,24 @@ QT_WARNING_POP } template <typename T> static Q_ALWAYS_INLINE - T fetchAndSubRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW + T fetchAndSubRelease(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::fetchAndSubRelaxed(_q_value, operand); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndSubOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) Q_DECL_NOTHROW + T fetchAndSubOrdered(T &_q_value, typename QAtomicAdditiveType<T>::AdditiveT operand) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::fetchAndSubRelaxed(_q_value, operand); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAndRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndAndRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { // implement fetchAndAnd on top of testAndSet - T tmp = BaseClass::load(_q_value); + T tmp = BaseClass::loadRelaxed(_q_value); Q_FOREVER { if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp & operand), &tmp)) return tmp; @@ -297,7 +309,7 @@ QT_WARNING_POP } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAndAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndAndAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { T tmp = BaseClass::fetchAndAndRelaxed(_q_value, operand); BaseClass::acquireMemoryFence(_q_value); @@ -305,24 +317,24 @@ QT_WARNING_POP } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAndRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndAndRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::fetchAndAndRelaxed(_q_value, operand); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndAndOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndAndOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::fetchAndAndRelaxed(_q_value, operand); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndOrRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndOrRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { // implement fetchAndOr on top of testAndSet - T tmp = BaseClass::load(_q_value); + T tmp = BaseClass::loadRelaxed(_q_value); Q_FOREVER { if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp | operand), &tmp)) return tmp; @@ -330,7 +342,7 @@ QT_WARNING_POP } template <typename T> static Q_ALWAYS_INLINE - T fetchAndOrAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndOrAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { T tmp = BaseClass::fetchAndOrRelaxed(_q_value, operand); BaseClass::acquireMemoryFence(_q_value); @@ -338,24 +350,24 @@ QT_WARNING_POP } template <typename T> static Q_ALWAYS_INLINE - T fetchAndOrRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndOrRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::fetchAndOrRelaxed(_q_value, operand); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndOrOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndOrOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::fetchAndOrRelaxed(_q_value, operand); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndXorRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndXorRelaxed(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { // implement fetchAndXor on top of testAndSet - T tmp = BaseClass::load(_q_value); + T tmp = BaseClass::loadRelaxed(_q_value); Q_FOREVER { if (BaseClass::testAndSetRelaxed(_q_value, tmp, T(tmp ^ operand), &tmp)) return tmp; @@ -363,7 +375,7 @@ QT_WARNING_POP } template <typename T> static Q_ALWAYS_INLINE - T fetchAndXorAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndXorAcquire(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { T tmp = BaseClass::fetchAndXorRelaxed(_q_value, operand); BaseClass::acquireMemoryFence(_q_value); @@ -371,14 +383,14 @@ QT_WARNING_POP } template <typename T> static Q_ALWAYS_INLINE - T fetchAndXorRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndXorRelease(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { BaseClass::releaseMemoryFence(_q_value); return BaseClass::fetchAndXorRelaxed(_q_value, operand); } template <typename T> static Q_ALWAYS_INLINE - T fetchAndXorOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) Q_DECL_NOTHROW + T fetchAndXorOrdered(T &_q_value, typename std::enable_if<QTypeInfo<T>::isIntegral, T>::type operand) noexcept { BaseClass::orderedMemoryFence(_q_value); return BaseClass::fetchAndXorRelaxed(_q_value, operand); diff --git a/src/corelib/thread/qmutex.cpp b/src/corelib/thread/qmutex.cpp index 3881ac017e..bd3a0fa7ba 100644 --- a/src/corelib/thread/qmutex.cpp +++ b/src/corelib/thread/qmutex.cpp @@ -82,7 +82,7 @@ public: QMutex mutex; bool lock(int timeout) QT_MUTEX_LOCK_NOEXCEPT; - void unlock() Q_DECL_NOTHROW; + void unlock() noexcept; }; /* @@ -179,7 +179,7 @@ public: */ QMutex::QMutex(RecursionMode mode) { - d_ptr.store(mode == Recursive ? new QRecursiveMutexPrivate : 0); + d_ptr.storeRelaxed(mode == Recursive ? new QRecursiveMutexPrivate : 0); } /*! @@ -189,12 +189,12 @@ QMutex::QMutex(RecursionMode mode) */ QMutex::~QMutex() { - QMutexData *d = d_ptr.load(); + QMutexData *d = d_ptr.loadRelaxed(); if (isRecursive()) { delete static_cast<QRecursiveMutexPrivate *>(d); } else if (d) { #ifndef QT_LINUX_FUTEX - if (d != dummyLocked() && static_cast<QMutexPrivate *>(d)->possiblyUnlocked.load() + if (d != dummyLocked() && static_cast<QMutexPrivate *>(d)->possiblyUnlocked.loadRelaxed() && tryLock()) { unlock(); return; @@ -329,7 +329,7 @@ bool QMutex::tryLock(int timeout) QT_MUTEX_LOCK_NOEXCEPT \sa lock() */ -void QMutex::unlock() Q_DECL_NOTHROW +void QMutex::unlock() noexcept { QMutexData *current; if (fastTryUnlock(current)) @@ -348,7 +348,7 @@ void QMutex::unlock() Q_DECL_NOTHROW Returns \c true if the mutex is recursive. */ -bool QBasicMutex::isRecursive() Q_DECL_NOTHROW +bool QBasicMutex::isRecursive() noexcept { return QT_PREPEND_NAMESPACE(isRecursive)(d_ptr.loadAcquire()); } @@ -358,7 +358,7 @@ bool QBasicMutex::isRecursive() Q_DECL_NOTHROW Returns \c true if the mutex is recursive. */ -bool QBasicMutex::isRecursive() const Q_DECL_NOTHROW +bool QBasicMutex::isRecursive() const noexcept { return QT_PREPEND_NAMESPACE(isRecursive)(d_ptr.loadAcquire()); } @@ -517,7 +517,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT } QMutexPrivate *d = static_cast<QMutexPrivate *>(copy); - if (timeout == 0 && !d->possiblyUnlocked.load()) + if (timeout == 0 && !d->possiblyUnlocked.loadRelaxed()) return false; // At this point we have a pointer to a QMutexPrivate. But the other thread @@ -541,7 +541,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT // is set to the BigNumber magic value set in unlockInternal() int old_waiters; do { - old_waiters = d->waiters.load(); + old_waiters = d->waiters.loadRelaxed(); if (old_waiters == -QMutexPrivate::BigNumber) { // we are unlocking, and the thread that unlocks is about to change d to 0 // we try to acquire the mutex by changing to dummyLocked() @@ -550,7 +550,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT d->deref(); return true; } else { - Q_ASSERT(d != d_ptr.load()); //else testAndSetAcquire should have succeeded + Q_ASSERT(d != d_ptr.loadRelaxed()); //else testAndSetAcquire should have succeeded // Mutex is likely to bo 0, we should continue the outer-loop, // set old_waiters to the magic value of BigNumber old_waiters = QMutexPrivate::BigNumber; @@ -563,7 +563,7 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT // The mutex was unlocked before we incremented waiters. if (old_waiters != QMutexPrivate::BigNumber) { //we did not break the previous loop - Q_ASSERT(d->waiters.load() >= 1); + Q_ASSERT(d->waiters.loadRelaxed() >= 1); d->waiters.deref(); } d->deref(); @@ -572,11 +572,11 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT if (d->wait(timeout)) { // reset the possiblyUnlocked flag if needed (and deref its corresponding reference) - if (d->possiblyUnlocked.load() && d->possiblyUnlocked.testAndSetRelaxed(true, false)) + if (d->possiblyUnlocked.loadRelaxed() && d->possiblyUnlocked.testAndSetRelaxed(true, false)) d->deref(); d->derefWaiters(1); //we got the lock. (do not deref) - Q_ASSERT(d == d_ptr.load()); + Q_ASSERT(d == d_ptr.loadRelaxed()); return true; } else { Q_ASSERT(timeout >= 0); @@ -593,14 +593,14 @@ bool QBasicMutex::lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT return false; } } - Q_ASSERT(d_ptr.load() != 0); + Q_ASSERT(d_ptr.loadRelaxed() != 0); return true; } /*! \internal */ -void QBasicMutex::unlockInternal() Q_DECL_NOTHROW +void QBasicMutex::unlockInternal() noexcept { QMutexData *copy = d_ptr.loadAcquire(); Q_ASSERT(copy); //we must be locked @@ -618,7 +618,7 @@ void QBasicMutex::unlockInternal() Q_DECL_NOTHROW //there is no one waiting on this mutex anymore, set the mutex as unlocked (d = 0) if (d_ptr.testAndSetRelease(d, 0)) { // reset the possiblyUnlocked flag if needed (and deref its corresponding reference) - if (d->possiblyUnlocked.load() && d->possiblyUnlocked.testAndSetRelaxed(true, false)) + if (d->possiblyUnlocked.loadRelaxed() && d->possiblyUnlocked.testAndSetRelaxed(true, false)) d->deref(); } d->derefWaiters(0); @@ -657,30 +657,30 @@ QMutexPrivate *QMutexPrivate::allocate() int i = freelist()->next(); QMutexPrivate *d = &(*freelist())[i]; d->id = i; - Q_ASSERT(d->refCount.load() == 0); + Q_ASSERT(d->refCount.loadRelaxed() == 0); Q_ASSERT(!d->recursive); - Q_ASSERT(!d->possiblyUnlocked.load()); - Q_ASSERT(d->waiters.load() == 0); - d->refCount.store(1); + Q_ASSERT(!d->possiblyUnlocked.loadRelaxed()); + Q_ASSERT(d->waiters.loadRelaxed() == 0); + d->refCount.storeRelaxed(1); return d; } void QMutexPrivate::release() { Q_ASSERT(!recursive); - Q_ASSERT(refCount.load() == 0); - Q_ASSERT(!possiblyUnlocked.load()); - Q_ASSERT(waiters.load() == 0); + Q_ASSERT(refCount.loadRelaxed() == 0); + Q_ASSERT(!possiblyUnlocked.loadRelaxed()); + Q_ASSERT(waiters.loadRelaxed() == 0); freelist()->release(id); } // atomically subtract "value" to the waiters, and remove the QMutexPrivate::BigNumber flag -void QMutexPrivate::derefWaiters(int value) Q_DECL_NOTHROW +void QMutexPrivate::derefWaiters(int value) noexcept { int old_waiters; int new_waiters; do { - old_waiters = waiters.load(); + old_waiters = waiters.loadRelaxed(); new_waiters = old_waiters; if (new_waiters < 0) { new_waiters += QMutexPrivate::BigNumber; @@ -696,7 +696,7 @@ void QMutexPrivate::derefWaiters(int value) Q_DECL_NOTHROW inline bool QRecursiveMutexPrivate::lock(int timeout) QT_MUTEX_LOCK_NOEXCEPT { Qt::HANDLE self = QThread::currentThreadId(); - if (owner.load() == self) { + if (owner.loadRelaxed() == self) { ++count; Q_ASSERT_X(count != 0, "QMutex::lock", "Overflow in recursion counter"); return true; @@ -709,19 +709,19 @@ inline bool QRecursiveMutexPrivate::lock(int timeout) QT_MUTEX_LOCK_NOEXCEPT } if (success) - owner.store(self); + owner.storeRelaxed(self); return success; } /*! \internal */ -inline void QRecursiveMutexPrivate::unlock() Q_DECL_NOTHROW +inline void QRecursiveMutexPrivate::unlock() noexcept { if (count > 0) { count--; } else { - owner.store(0); + owner.storeRelaxed(0); mutex.QBasicMutex::unlock(); } } diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 837355a602..0de0869cb2 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE #if QT_CONFIG(thread) || defined(Q_CLANG_QDOC) #ifdef Q_OS_LINUX -# define QT_MUTEX_LOCK_NOEXCEPT Q_DECL_NOTHROW +# define QT_MUTEX_LOCK_NOEXCEPT noexcept #else # define QT_MUTEX_LOCK_NOEXCEPT #endif @@ -80,39 +80,39 @@ public: } // BasicLockable concept - inline void unlock() Q_DECL_NOTHROW { - Q_ASSERT(d_ptr.load()); //mutex must be locked + inline void unlock() noexcept { + Q_ASSERT(d_ptr.loadRelaxed()); //mutex must be locked if (!fastTryUnlock()) unlockInternal(); } - bool tryLock() Q_DECL_NOTHROW { + bool tryLock() noexcept { return fastTryLock(); } // Lockable concept - bool try_lock() Q_DECL_NOTHROW { return tryLock(); } + bool try_lock() noexcept { return tryLock(); } - bool isRecursive() Q_DECL_NOTHROW; //### Qt6: remove me - bool isRecursive() const Q_DECL_NOTHROW; + bool isRecursive() noexcept; //### Qt6: remove me + bool isRecursive() const noexcept; private: - inline bool fastTryLock() Q_DECL_NOTHROW { + inline bool fastTryLock() noexcept { return d_ptr.testAndSetAcquire(nullptr, dummyLocked()); } - inline bool fastTryUnlock() Q_DECL_NOTHROW { + inline bool fastTryUnlock() noexcept { return d_ptr.testAndSetRelease(dummyLocked(), nullptr); } - inline bool fastTryLock(QMutexData *¤t) Q_DECL_NOTHROW { + inline bool fastTryLock(QMutexData *¤t) noexcept { return d_ptr.testAndSetAcquire(nullptr, dummyLocked(), current); } - inline bool fastTryUnlock(QMutexData *¤t) Q_DECL_NOTHROW { + inline bool fastTryUnlock(QMutexData *¤t) noexcept { return d_ptr.testAndSetRelease(dummyLocked(), nullptr, current); } void lockInternal() QT_MUTEX_LOCK_NOEXCEPT; bool lockInternal(int timeout) QT_MUTEX_LOCK_NOEXCEPT; - void unlockInternal() Q_DECL_NOTHROW; + void unlockInternal() noexcept; QBasicAtomicPointer<QMutexData> d_ptr; static inline QMutexData *dummyLocked() { @@ -134,7 +134,7 @@ public: void lock() QT_MUTEX_LOCK_NOEXCEPT; bool tryLock(int timeout = 0) QT_MUTEX_LOCK_NOEXCEPT; // BasicLockable concept - void unlock() Q_DECL_NOTHROW; + void unlock() noexcept; // Lockable concept bool try_lock() QT_MUTEX_LOCK_NOEXCEPT { return tryLock(); } @@ -158,7 +158,7 @@ public: } #endif - bool isRecursive() const Q_DECL_NOTHROW + bool isRecursive() const noexcept { return QBasicMutex::isRecursive(); } private: @@ -212,7 +212,7 @@ public: #endif inline ~QMutexLocker() { unlock(); } - inline void unlock() Q_DECL_NOTHROW + inline void unlock() noexcept { if ((val & quintptr(1u)) == quintptr(1u)) { val &= ~quintptr(1u); @@ -257,24 +257,24 @@ class Q_CORE_EXPORT QMutex public: enum RecursionMode { NonRecursive, Recursive }; - inline Q_DECL_CONSTEXPR explicit QMutex(RecursionMode = NonRecursive) Q_DECL_NOTHROW { } + inline Q_DECL_CONSTEXPR explicit QMutex(RecursionMode = NonRecursive) noexcept { } - inline void lock() Q_DECL_NOTHROW {} - inline bool tryLock(int timeout = 0) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; } - inline bool try_lock() Q_DECL_NOTHROW { return true; } - inline void unlock() Q_DECL_NOTHROW {} - inline bool isRecursive() const Q_DECL_NOTHROW { return true; } + inline void lock() noexcept {} + inline bool tryLock(int timeout = 0) noexcept { Q_UNUSED(timeout); return true; } + inline bool try_lock() noexcept { return true; } + inline void unlock() noexcept {} + inline bool isRecursive() const noexcept { return true; } #if QT_HAS_INCLUDE(<chrono>) template <class Rep, class Period> - inline bool try_lock_for(std::chrono::duration<Rep, Period> duration) Q_DECL_NOTHROW + inline bool try_lock_for(std::chrono::duration<Rep, Period> duration) noexcept { Q_UNUSED(duration); return true; } template<class Clock, class Duration> - inline bool try_lock_until(std::chrono::time_point<Clock, Duration> timePoint) Q_DECL_NOTHROW + inline bool try_lock_until(std::chrono::time_point<Clock, Duration> timePoint) noexcept { Q_UNUSED(timePoint); return true; @@ -288,12 +288,12 @@ private: class Q_CORE_EXPORT QMutexLocker { public: - inline explicit QMutexLocker(QMutex *) Q_DECL_NOTHROW {} - inline ~QMutexLocker() Q_DECL_NOTHROW {} + inline explicit QMutexLocker(QMutex *) noexcept {} + inline ~QMutexLocker() noexcept {} - inline void unlock() Q_DECL_NOTHROW {} - void relock() Q_DECL_NOTHROW {} - inline QMutex *mutex() const Q_DECL_NOTHROW { return nullptr; } + inline void unlock() noexcept {} + void relock() noexcept {} + inline QMutex *mutex() const noexcept { return nullptr; } private: Q_DISABLE_COPY(QMutexLocker) diff --git a/src/corelib/thread/qmutex_linux.cpp b/src/corelib/thread/qmutex_linux.cpp index 507e72cb76..3270875471 100644 --- a/src/corelib/thread/qmutex_linux.cpp +++ b/src/corelib/thread/qmutex_linux.cpp @@ -106,7 +106,7 @@ static inline QMutexData *dummyFutexValue() } template <bool IsTimed> static inline -bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -1, QElapsedTimer *elapsedTimer = 0) Q_DECL_NOTHROW +bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = -1, QElapsedTimer *elapsedTimer = 0) noexcept { if (!IsTimed) timeout = -1; @@ -149,17 +149,17 @@ bool lockInternal_helper(QBasicAtomicPointer<QMutexData> &d_ptr, int timeout = - } } - Q_ASSERT(d_ptr.load()); + Q_ASSERT(d_ptr.loadRelaxed()); return true; } -void QBasicMutex::lockInternal() Q_DECL_NOTHROW +void QBasicMutex::lockInternal() noexcept { Q_ASSERT(!isRecursive()); lockInternal_helper<false>(d_ptr); } -bool QBasicMutex::lockInternal(int timeout) Q_DECL_NOTHROW +bool QBasicMutex::lockInternal(int timeout) noexcept { Q_ASSERT(!isRecursive()); QElapsedTimer elapsedTimer; @@ -167,9 +167,9 @@ bool QBasicMutex::lockInternal(int timeout) Q_DECL_NOTHROW return lockInternal_helper<true>(d_ptr, timeout, &elapsedTimer); } -void QBasicMutex::unlockInternal() Q_DECL_NOTHROW +void QBasicMutex::unlockInternal() noexcept { - QMutexData *d = d_ptr.load(); + QMutexData *d = d_ptr.loadRelaxed(); Q_ASSERT(d); //we must be locked Q_ASSERT(d != dummyLocked()); // testAndSetRelease(dummyLocked(), 0) failed Q_UNUSED(d); diff --git a/src/corelib/thread/qmutex_mac.cpp b/src/corelib/thread/qmutex_mac.cpp index 9a8d9bc750..923f89f697 100644 --- a/src/corelib/thread/qmutex_mac.cpp +++ b/src/corelib/thread/qmutex_mac.cpp @@ -79,7 +79,7 @@ bool QMutexPrivate::wait(int timeout) return (r == KERN_SUCCESS); } -void QMutexPrivate::wakeUp() Q_DECL_NOTHROW +void QMutexPrivate::wakeUp() noexcept { semaphore_signal(mach_semaphore); } diff --git a/src/corelib/thread/qmutex_p.h b/src/corelib/thread/qmutex_p.h index ec9bfc1152..048d8707c4 100644 --- a/src/corelib/thread/qmutex_p.h +++ b/src/corelib/thread/qmutex_p.h @@ -92,28 +92,28 @@ public: QMutexPrivate(); bool wait(int timeout = -1); - void wakeUp() Q_DECL_NOTHROW; + void wakeUp() noexcept; // Control the lifetime of the privates QAtomicInt refCount; int id; bool ref() { - Q_ASSERT(refCount.load() >= 0); + Q_ASSERT(refCount.loadRelaxed() >= 0); int c; do { - c = refCount.load(); + c = refCount.loadRelaxed(); if (c == 0) return false; } while (!refCount.testAndSetRelaxed(c, c + 1)); - Q_ASSERT(refCount.load() >= 0); + Q_ASSERT(refCount.loadRelaxed() >= 0); return true; } void deref() { - Q_ASSERT(refCount.load() >= 0); + Q_ASSERT(refCount.loadRelaxed() >= 0); if (!refCount.deref()) release(); - Q_ASSERT(refCount.load() >= 0); + Q_ASSERT(refCount.loadRelaxed() >= 0); } void release(); static QMutexPrivate *allocate(); @@ -125,7 +125,7 @@ public: when the mutex is unlocked. */ enum { BigNumber = 0x100000 }; //Must be bigger than the possible number of waiters (number of threads) - void derefWaiters(int value) Q_DECL_NOTHROW; + void derefWaiters(int value) noexcept; //platform specific stuff #if defined(Q_OS_MAC) diff --git a/src/corelib/thread/qmutex_unix.cpp b/src/corelib/thread/qmutex_unix.cpp index 3ee24a292c..df2f606a23 100644 --- a/src/corelib/thread/qmutex_unix.cpp +++ b/src/corelib/thread/qmutex_unix.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE static void report_error(int code, const char *where, const char *what) { if (code != 0) - qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code))); + qErrnoWarning(code, "%s: %s failure", where, what); } #ifdef QT_UNIX_SEMAPHORE @@ -99,7 +99,7 @@ bool QMutexPrivate::wait(int timeout) return true; } -void QMutexPrivate::wakeUp() Q_DECL_NOTHROW +void QMutexPrivate::wakeUp() noexcept { report_error(sem_post(&semaphore), "QMutex::unlock", "sem_post"); } @@ -146,7 +146,7 @@ bool QMutexPrivate::wait(int timeout) return ret; } -void QMutexPrivate::wakeUp() Q_DECL_NOTHROW +void QMutexPrivate::wakeUp() noexcept { report_error(pthread_mutex_lock(&mutex), "QMutex::unlock", "mutex lock"); wakeup = true; diff --git a/src/corelib/thread/qmutex_win.cpp b/src/corelib/thread/qmutex_win.cpp index 3c314a4c0c..e221bc89cb 100644 --- a/src/corelib/thread/qmutex_win.cpp +++ b/src/corelib/thread/qmutex_win.cpp @@ -64,7 +64,7 @@ bool QMutexPrivate::wait(int timeout) return (WaitForSingleObjectEx(event, timeout < 0 ? INFINITE : timeout, FALSE) == WAIT_OBJECT_0); } -void QMutexPrivate::wakeUp() Q_DECL_NOTHROW +void QMutexPrivate::wakeUp() noexcept { SetEvent(event); } QT_END_NAMESPACE diff --git a/src/corelib/thread/qmutexpool.cpp b/src/corelib/thread/qmutexpool.cpp index 3f9e8da942..2a02197859 100644 --- a/src/corelib/thread/qmutexpool.cpp +++ b/src/corelib/thread/qmutexpool.cpp @@ -93,7 +93,7 @@ QMutexPool::QMutexPool(QMutex::RecursionMode recursionMode, int size) : mutexes(size), recursionMode(recursionMode) { for (int index = 0; index < mutexes.count(); ++index) { - mutexes[index].store(0); + mutexes[index].storeRelaxed(0); } } @@ -104,7 +104,7 @@ QMutexPool::QMutexPool(QMutex::RecursionMode recursionMode, int size) QMutexPool::~QMutexPool() { for (int index = 0; index < mutexes.count(); ++index) - delete mutexes[index].load(); + delete mutexes[index].loadRelaxed(); } /*! @@ -131,7 +131,7 @@ QMutex *QMutexPool::createMutex(int index) QMutex *newMutex = new QMutex(recursionMode); if (!mutexes[index].testAndSetRelease(0, newMutex)) delete newMutex; - return mutexes[index].load(); + return mutexes[index].loadRelaxed(); } /*! diff --git a/src/corelib/thread/qmutexpool_p.h b/src/corelib/thread/qmutexpool_p.h index 89d006ac29..1a47231abc 100644 --- a/src/corelib/thread/qmutexpool_p.h +++ b/src/corelib/thread/qmutexpool_p.h @@ -68,7 +68,7 @@ public: inline QMutex *get(const void *address) { int index = uint(quintptr(address)) % mutexes.count(); - QMutex *m = mutexes[index].load(); + QMutex *m = mutexes[index].loadRelaxed(); if (m) return m; else diff --git a/src/corelib/thread/qorderedmutexlocker_p.h b/src/corelib/thread/qorderedmutexlocker_p.h index ded102d32d..e0a67388d4 100644 --- a/src/corelib/thread/qorderedmutexlocker_p.h +++ b/src/corelib/thread/qorderedmutexlocker_p.h @@ -58,6 +58,8 @@ QT_BEGIN_NAMESPACE +#if QT_CONFIG(thread) + /* Locks 2 mutexes in a defined order, avoiding a recursive lock if we're trying to lock the same mutex twice. @@ -65,9 +67,9 @@ QT_BEGIN_NAMESPACE class QOrderedMutexLocker { public: - QOrderedMutexLocker(QMutex *m1, QMutex *m2) - : mtx1((m1 == m2) ? m1 : (std::less<QMutex *>()(m1, m2) ? m1 : m2)), - mtx2((m1 == m2) ? 0 : (std::less<QMutex *>()(m1, m2) ? m2 : m1)), + QOrderedMutexLocker(QBasicMutex *m1, QBasicMutex *m2) + : mtx1((m1 == m2) ? m1 : (std::less<QBasicMutex *>()(m1, m2) ? m1 : m2)), + mtx2((m1 == m2) ? 0 : (std::less<QBasicMutex *>()(m1, m2) ? m2 : m1)), locked(false) { relock(); @@ -95,12 +97,12 @@ public: } } - static bool relock(QMutex *mtx1, QMutex *mtx2) + static bool relock(QBasicMutex *mtx1, QBasicMutex *mtx2) { // mtx1 is already locked, mtx2 not... do we need to unlock and relock? if (mtx1 == mtx2) return false; - if (std::less<QMutex *>()(mtx1, mtx2)) { + if (std::less<QBasicMutex *>()(mtx1, mtx2)) { mtx2->lock(); return true; } @@ -113,10 +115,58 @@ public: } private: - QMutex *mtx1, *mtx2; + QBasicMutex *mtx1, *mtx2; bool locked; }; +class QBasicMutexLocker +{ +public: + inline explicit QBasicMutexLocker(QBasicMutex *m) QT_MUTEX_LOCK_NOEXCEPT + : m(m), isLocked(true) + { + m->lock(); + } + inline ~QBasicMutexLocker() { if (isLocked) unlock(); } + + inline void unlock() noexcept + { + isLocked = false; + m->unlock(); + } + + inline void relock() QT_MUTEX_LOCK_NOEXCEPT + { + isLocked = true; + m->lock(); + } + +private: + Q_DISABLE_COPY(QBasicMutexLocker) + + QBasicMutex *m; + bool isLocked; +}; + +#else + +class QOrderedMutexLocker +{ +public: + QOrderedMutexLocker(QBasicMutex *, QBasicMutex *) {} + ~QOrderedMutexLocker() {} + + void relock() {} + void unlock() {} + + static bool relock(QBasicMutex *, QBasicMutex *) {} +}; + +using QBasicMutexLocker = QMutexLocker; + +#endif + + QT_END_NAMESPACE #endif diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp index d7cf7a7284..30e9b95a52 100644 --- a/src/corelib/thread/qreadwritelock.cpp +++ b/src/corelib/thread/qreadwritelock.cpp @@ -143,7 +143,7 @@ inline bool isUncontendedLocked(const QReadWriteLockPrivate *d) QReadWriteLock::QReadWriteLock(RecursionMode recursionMode) : d_ptr(recursionMode == Recursive ? new QReadWriteLockPrivate(true) : nullptr) { - Q_ASSERT_X(!(quintptr(d_ptr.load()) & StateMask), "QReadWriteLock::QReadWriteLock", "bad d_ptr alignment"); + Q_ASSERT_X(!(quintptr(d_ptr.loadRelaxed()) & StateMask), "QReadWriteLock::QReadWriteLock", "bad d_ptr alignment"); } /*! @@ -154,7 +154,7 @@ QReadWriteLock::QReadWriteLock(RecursionMode recursionMode) */ QReadWriteLock::~QReadWriteLock() { - auto d = d_ptr.load(); + auto d = d_ptr.loadRelaxed(); if (isUncontendedLocked(d)) { qWarning("QReadWriteLock: destroying locked QReadWriteLock"); return; @@ -263,7 +263,7 @@ bool QReadWriteLock::tryLockForRead(int timeout) return d->recursiveLockForRead(timeout); QMutexLocker lock(&d->mutex); - if (d != d_ptr.load()) { + if (d != d_ptr.loadRelaxed()) { // d_ptr has changed: this QReadWriteLock was unlocked before we had // time to lock d->mutex. // We are holding a lock to a mutex within a QReadWriteLockPrivate @@ -370,7 +370,7 @@ bool QReadWriteLock::tryLockForWrite(int timeout) return d->recursiveLockForWrite(timeout); QMutexLocker lock(&d->mutex); - if (d != d_ptr.load()) { + if (d != d_ptr.loadRelaxed()) { // The mutex was unlocked before we had time to lock the mutex. // We are holding to a mutex within a QReadWriteLockPrivate that is already released // (or even is already re-used) but that's ok because the QFreeList never frees them. @@ -433,7 +433,7 @@ void QReadWriteLock::unlock() if (d->waitingReaders || d->waitingWriters) { d->unlock(); } else { - Q_ASSERT(d_ptr.load() == d); // should not change when we still hold the mutex + Q_ASSERT(d_ptr.loadRelaxed() == d); // should not change when we still hold the mutex d_ptr.storeRelease(nullptr); d->release(); } @@ -444,7 +444,7 @@ void QReadWriteLock::unlock() /*! \internal Helper for QWaitCondition::wait */ QReadWriteLock::StateForWaitCondition QReadWriteLock::stateForWaitCondition() const { - QReadWriteLockPrivate *d = d_ptr.load(); + QReadWriteLockPrivate *d = d_ptr.loadRelaxed(); switch (quintptr(d) & StateMask) { case StateLockedForRead: return LockedForRead; case StateLockedForWrite: return LockedForWrite; diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index 65fa76fd6d..139fde9214 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -180,18 +180,18 @@ class Q_CORE_EXPORT QReadWriteLock { public: enum RecursionMode { NonRecursive, Recursive }; - inline explicit QReadWriteLock(RecursionMode = NonRecursive) Q_DECL_NOTHROW { } + inline explicit QReadWriteLock(RecursionMode = NonRecursive) noexcept { } inline ~QReadWriteLock() { } - static inline void lockForRead() Q_DECL_NOTHROW { } - static inline bool tryLockForRead() Q_DECL_NOTHROW { return true; } - static inline bool tryLockForRead(int timeout) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; } + static inline void lockForRead() noexcept { } + static inline bool tryLockForRead() noexcept { return true; } + static inline bool tryLockForRead(int timeout) noexcept { Q_UNUSED(timeout); return true; } - static inline void lockForWrite() Q_DECL_NOTHROW { } - static inline bool tryLockForWrite() Q_DECL_NOTHROW { return true; } - static inline bool tryLockForWrite(int timeout) Q_DECL_NOTHROW { Q_UNUSED(timeout); return true; } + static inline void lockForWrite() noexcept { } + static inline bool tryLockForWrite() noexcept { return true; } + static inline bool tryLockForWrite(int timeout) noexcept { Q_UNUSED(timeout); return true; } - static inline void unlock() Q_DECL_NOTHROW { } + static inline void unlock() noexcept { } private: Q_DISABLE_COPY(QReadWriteLock) @@ -200,12 +200,12 @@ private: class Q_CORE_EXPORT QReadLocker { public: - inline QReadLocker(QReadWriteLock *) Q_DECL_NOTHROW { } - inline ~QReadLocker() Q_DECL_NOTHROW { } + inline QReadLocker(QReadWriteLock *) noexcept { } + inline ~QReadLocker() noexcept { } - static inline void unlock() Q_DECL_NOTHROW { } - static inline void relock() Q_DECL_NOTHROW { } - static inline QReadWriteLock *readWriteLock() Q_DECL_NOTHROW { return nullptr; } + static inline void unlock() noexcept { } + static inline void relock() noexcept { } + static inline QReadWriteLock *readWriteLock() noexcept { return nullptr; } private: Q_DISABLE_COPY(QReadLocker) @@ -214,12 +214,12 @@ private: class Q_CORE_EXPORT QWriteLocker { public: - inline explicit QWriteLocker(QReadWriteLock *) Q_DECL_NOTHROW { } - inline ~QWriteLocker() Q_DECL_NOTHROW { } + inline explicit QWriteLocker(QReadWriteLock *) noexcept { } + inline ~QWriteLocker() noexcept { } - static inline void unlock() Q_DECL_NOTHROW { } - static inline void relock() Q_DECL_NOTHROW { } - static inline QReadWriteLock *readWriteLock() Q_DECL_NOTHROW { return nullptr; } + static inline void unlock() noexcept { } + static inline void relock() noexcept { } + static inline QReadWriteLock *readWriteLock() noexcept { return nullptr; } private: Q_DISABLE_COPY(QWriteLocker) diff --git a/src/corelib/thread/qresultstore.cpp b/src/corelib/thread/qresultstore.cpp index e0ce1b4b78..1b3bc20eca 100644 --- a/src/corelib/thread/qresultstore.cpp +++ b/src/corelib/thread/qresultstore.cpp @@ -43,6 +43,21 @@ QT_BEGIN_NAMESPACE namespace QtPrivate { +/*! + \class QtPrivate::ResultItem + \internal + */ + +/*! + \class QtPrivate::ResultIteratorBase + \internal + */ + +/*! + \class QtPrivate::ResultStoreBase + \internal + */ + ResultIteratorBase::ResultIteratorBase() : mapIterator(QMap<int, ResultItem>::const_iterator()), m_vectorIndex(0) { } ResultIteratorBase::ResultIteratorBase(QMap<int, ResultItem>::const_iterator _mapIterator, int _vectorIndex) diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h index 39f0a6d1bb..7a65089396 100644 --- a/src/corelib/thread/qresultstore.h +++ b/src/corelib/thread/qresultstore.h @@ -56,7 +56,6 @@ QT_BEGIN_NAMESPACE either individually or in batches. */ -#ifndef Q_QDOC namespace QtPrivate { @@ -143,7 +142,7 @@ public: template <typename T> int addResult(int index, const T *result) { - if (result == 0) + if (result == nullptr) return addResult(index, static_cast<void *>(nullptr)); else return addResult(index, static_cast<void *>(new T(*result))); @@ -159,7 +158,7 @@ public: int addResults(int index, const QVector<T> *results, int totalCount) { if (m_filterMode == true && results->count() != totalCount && 0 == results->count()) - return addResults(index, 0, 0, totalCount); + return addResults(index, nullptr, 0, totalCount); else return addResults(index, new QVector<T>(*results), results->count(), totalCount); } @@ -196,7 +195,6 @@ public: Q_DECLARE_TYPEINFO(QtPrivate::ResultItem, Q_PRIMITIVE_TYPE); -#endif //Q_QDOC QT_END_NAMESPACE diff --git a/src/corelib/thread/qsemaphore.cpp b/src/corelib/thread/qsemaphore.cpp index aa04fb10ff..d4fb756b94 100644 --- a/src/corelib/thread/qsemaphore.cpp +++ b/src/corelib/thread/qsemaphore.cpp @@ -264,7 +264,7 @@ template <bool IsTimed> bool futexSemaphoreTryAcquire(QBasicAtomicInteger<quintp if (futexHasWaiterCount) { // decrement the number of threads waiting - Q_ASSERT(futexHigh32(&u)->load() & 0x7fffffffU); + Q_ASSERT(futexHigh32(&u)->loadRelaxed() & 0x7fffffffU); u.fetchAndSubRelaxed(oneWaiter); } return false; @@ -293,7 +293,7 @@ QSemaphore::QSemaphore(int n) quintptr nn = unsigned(n); if (futexHasWaiterCount) nn |= quint64(nn) << 32; // token count replicated in high word - u.store(nn); + u.storeRelaxed(nn); } else { d = new QSemaphorePrivate(n); } @@ -425,7 +425,7 @@ void QSemaphore::release(int n) int QSemaphore::available() const { if (futexAvailable()) - return futexAvailCounter(u.load()); + return futexAvailCounter(u.loadRelaxed()); QMutexLocker locker(&d->mutex); return d->avail; @@ -606,7 +606,7 @@ bool QSemaphore::tryAcquire(int n, int timeout) \fn QSemaphoreReleaser::semaphore() const Returns a pointer to the QSemaphore object provided to the constructor, - or by the last move assignment, if any. Otherwise, returns \c nullptr. + or by the last move assignment, if any. Otherwise, returns \nullptr. */ /*! @@ -614,7 +614,7 @@ bool QSemaphore::tryAcquire(int n, int timeout) Cancels this QSemaphoreReleaser such that the destructor will no longer call \c{semaphore()->release()}. Returns the value of semaphore() - before this call. After this call, semaphore() will return \c nullptr. + before this call. After this call, semaphore() will return \nullptr. To enable again, assign a new QSemaphoreReleaser: diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h index b830ff1bfd..58c12997ad 100644 --- a/src/corelib/thread/qsemaphore.h +++ b/src/corelib/thread/qsemaphore.h @@ -75,14 +75,14 @@ class QSemaphoreReleaser { public: QSemaphoreReleaser() = default; - explicit QSemaphoreReleaser(QSemaphore &sem, int n = 1) Q_DECL_NOTHROW + explicit QSemaphoreReleaser(QSemaphore &sem, int n = 1) noexcept : m_sem(&sem), m_n(n) {} - explicit QSemaphoreReleaser(QSemaphore *sem, int n = 1) Q_DECL_NOTHROW + explicit QSemaphoreReleaser(QSemaphore *sem, int n = 1) noexcept : m_sem(sem), m_n(n) {} - QSemaphoreReleaser(QSemaphoreReleaser &&other) Q_DECL_NOTHROW + QSemaphoreReleaser(QSemaphoreReleaser &&other) noexcept : m_sem(other.m_sem), m_n(other.m_n) { other.m_sem = nullptr; } - QSemaphoreReleaser &operator=(QSemaphoreReleaser &&other) Q_DECL_NOTHROW + QSemaphoreReleaser &operator=(QSemaphoreReleaser &&other) noexcept { QSemaphoreReleaser moved(std::move(other)); swap(moved); return *this; } ~QSemaphoreReleaser() @@ -91,16 +91,16 @@ public: m_sem->release(m_n); } - void swap(QSemaphoreReleaser &other) Q_DECL_NOTHROW + void swap(QSemaphoreReleaser &other) noexcept { qSwap(m_sem, other.m_sem); qSwap(m_n, other.m_n); } - QSemaphore *semaphore() const Q_DECL_NOTHROW + QSemaphore *semaphore() const noexcept { return m_sem; } - QSemaphore *cancel() Q_DECL_NOTHROW + QSemaphore *cancel() noexcept { QSemaphore *old = m_sem; m_sem = nullptr; diff --git a/src/corelib/thread/qthread.cpp b/src/corelib/thread/qthread.cpp index 9f60de1f87..1eac7db11d 100644 --- a/src/corelib/thread/qthread.cpp +++ b/src/corelib/thread/qthread.cpp @@ -65,7 +65,7 @@ QThreadData::QThreadData(int initialRefCount) QThreadData::~QThreadData() { - Q_ASSERT(_ref.load() == 0); + Q_ASSERT(_ref.loadRelaxed() == 0); // In the odd case that Qt is running on a secondary thread, the main // thread instance will have been dereffed asunder because of the deref in @@ -105,7 +105,7 @@ void QThreadData::ref() { #if QT_CONFIG(thread) (void) _ref.ref(); - Q_ASSERT(_ref.load() != 0); + Q_ASSERT(_ref.loadRelaxed() != 0); #endif } @@ -839,7 +839,7 @@ bool QThread::event(QEvent* event) return QObject::event(event); } -Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW +Qt::HANDLE QThread::currentThreadId() noexcept { return Qt::HANDLE(currentThread()); } @@ -849,7 +849,7 @@ QThread *QThread::currentThread() return QThreadData::current()->thread; } -int QThread::idealThreadCount() Q_DECL_NOTHROW +int QThread::idealThreadCount() noexcept { return 1; } @@ -878,11 +878,11 @@ QThreadData *QThreadData::current(bool createIfNecessary) if (!data && createIfNecessary) { data = new QThreadData; data->thread = new QAdoptedThread(data); - data->threadId.store(Qt::HANDLE(data->thread)); + data->threadId.storeRelaxed(Qt::HANDLE(data->thread)); data->deref(); data->isAdopted = true; if (!QCoreApplicationPrivate::theMainThread) - QCoreApplicationPrivate::theMainThread = data->thread.load(); + QCoreApplicationPrivate::theMainThread = data->thread.loadRelaxed(); } return data; } @@ -925,7 +925,7 @@ QThreadPrivate::~QThreadPrivate() QAbstractEventDispatcher *QThread::eventDispatcher() const { Q_D(const QThread); - return d->data->eventDispatcher.load(); + return d->data->eventDispatcher.loadRelaxed(); } /*! diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index b6c5bf47d0..c7a6dc8f1a 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -70,9 +70,9 @@ class Q_CORE_EXPORT QThread : public QObject { Q_OBJECT public: - static Qt::HANDLE currentThreadId() Q_DECL_NOTHROW Q_DECL_PURE_FUNCTION; + static Qt::HANDLE currentThreadId() noexcept Q_DECL_PURE_FUNCTION; static QThread *currentThread(); - static int idealThreadCount() Q_DECL_NOTHROW; + static int idealThreadCount() noexcept; static void yieldCurrentThread(); explicit QThread(QObject *parent = nullptr); @@ -209,7 +209,6 @@ struct Callable { } -#if defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS) // Apply the same semantics of a lambda closure type w.r.t. the special // member functions, if possible: delete the copy assignment operator, // bring back all the others as per the RO5 (cf. §8.1.5.1/11 [expr.prim.lambda.closure]) @@ -218,7 +217,6 @@ struct Callable Callable(Callable &&) = default; Callable &operator=(const Callable &) = delete; Callable &operator=(Callable &&) = default; -#endif void operator()() { diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index 7d9442ab79..b2d1628e6e 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -89,7 +89,7 @@ public: QEvent *event; int priority; inline QPostEvent() - : receiver(0), event(0), priority(0) + : receiver(nullptr), event(nullptr), priority(0) { } inline QPostEvent(QObject *r, QEvent *e, int p) : receiver(r), event(e), priority(p) @@ -148,7 +148,7 @@ private: class Q_CORE_EXPORT QDaemonThread : public QThread { public: - QDaemonThread(QObject *parent = 0); + QDaemonThread(QObject *parent = nullptr); ~QDaemonThread(); }; @@ -157,7 +157,7 @@ class QThreadPrivate : public QObjectPrivate Q_DECLARE_PUBLIC(QThread) public: - QThreadPrivate(QThreadData *d = 0); + QThreadPrivate(QThreadData *d = nullptr); ~QThreadPrivate(); void setPriority(QThread::Priority prio); @@ -187,14 +187,17 @@ public: #endif // Q_OS_UNIX #ifdef Q_OS_WIN - static unsigned int __stdcall start(void *) Q_DECL_NOEXCEPT; - static void finish(void *, bool lockAnyway=true) Q_DECL_NOEXCEPT; + static unsigned int __stdcall start(void *) noexcept; + static void finish(void *, bool lockAnyway=true) noexcept; Qt::HANDLE handle; unsigned int id; int waiters; bool terminationEnabled, terminatePending; #endif // Q_OS_WIN +#ifdef Q_OS_WASM + static int idealThreadCount; +#endif QThreadData *data; static QAbstractEventDispatcher *createEventDispatcher(QThreadData *data); @@ -248,17 +251,17 @@ public: #endif static void clearCurrentThreadData(); static QThreadData *get2(QThread *thread) - { Q_ASSERT_X(thread != 0, "QThread", "internal error"); return thread->d_func()->data; } + { Q_ASSERT_X(thread != nullptr, "QThread", "internal error"); return thread->d_func()->data; } void ref(); void deref(); inline bool hasEventDispatcher() const - { return eventDispatcher.load() != nullptr; } + { return eventDispatcher.loadRelaxed() != nullptr; } QAbstractEventDispatcher *createEventDispatcher(); QAbstractEventDispatcher *ensureEventDispatcher() { - QAbstractEventDispatcher *ed = eventDispatcher.load(); + QAbstractEventDispatcher *ed = eventDispatcher.loadRelaxed(); if (Q_LIKELY(ed)) return ed; return createEventDispatcher(); @@ -281,7 +284,7 @@ public: public: FlaggedDebugSignatures() : idx(0) - { std::fill_n(locations, Count, static_cast<char*>(0)); } + { std::fill_n(locations, Count, static_cast<char*>(nullptr)); } void store(const char* method) { locations[idx++ % Count] = method; } @@ -328,7 +331,7 @@ class QAdoptedThread : public QThread Q_DECLARE_PRIVATE(QThread) public: - QAdoptedThread(QThreadData *data = 0); + QAdoptedThread(QThreadData *data = nullptr); ~QAdoptedThread(); void init(); diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index 695d45d8e7..89efbff6aa 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -100,7 +100,6 @@ #include <sys/neutrino.h> #endif - QT_BEGIN_NAMESPACE #if QT_CONFIG(thread) @@ -116,6 +115,9 @@ enum { ThreadPriorityResetFlag = 0x80000000 }; #if defined(Q_CC_XLC) || defined (Q_CC_SUN) #define HAVE_TLS #endif +#if defined(Q_OS_RTEMS) +#define HAVE_TLS +#endif #ifdef HAVE_TLS static __thread QThreadData *currentThreadData = 0; @@ -250,9 +252,9 @@ QThreadData *QThreadData::current(bool createIfNecessary) } data->deref(); data->isAdopted = true; - data->threadId.store(to_HANDLE(pthread_self())); + data->threadId.storeRelaxed(to_HANDLE(pthread_self())); if (!QCoreApplicationPrivate::theMainThread) - QCoreApplicationPrivate::theMainThread = data->thread.load(); + QCoreApplicationPrivate::theMainThread = data->thread.loadRelaxed(); } return data; } @@ -332,7 +334,7 @@ void *QThreadPrivate::start(void *arg) thr->d_func()->setPriority(QThread::Priority(thr->d_func()->priority & ~ThreadPriorityResetFlag)); } - data->threadId.store(to_HANDLE(pthread_self())); + data->threadId.storeRelaxed(to_HANDLE(pthread_self())); set_thread_data(data); data->ref(); @@ -402,7 +404,7 @@ void QThreadPrivate::finish(void *arg) QThreadStorageData::finish((void **)data); locker.relock(); - QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.load(); + QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.loadRelaxed(); if (eventDispatcher) { d->data->eventDispatcher = 0; locker.unlock(); @@ -440,7 +442,7 @@ void QThreadPrivate::finish(void *arg) ** QThread *************************************************************************/ -Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW +Qt::HANDLE QThread::currentThreadId() noexcept { // requires a C cast here otherwise we run into trouble on AIX return to_HANDLE(pthread_self()); @@ -451,7 +453,11 @@ Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW # define _SC_NPROCESSORS_ONLN 84 #endif -int QThread::idealThreadCount() Q_DECL_NOTHROW +#ifdef Q_OS_WASM +int QThreadPrivate::idealThreadCount = 1; +#endif + +int QThread::idealThreadCount() noexcept { int cores = 1; @@ -499,6 +505,8 @@ int QThread::idealThreadCount() Q_DECL_NOTHROW // as of aug 2008 VxWorks < 6.6 only supports one single core CPU cores = 1; # endif +#elif defined(Q_OS_WASM) + cores = QThreadPrivate::idealThreadCount; #else // the rest: Linux, Solaris, AIX, Tru64 cores = (int)sysconf(_SC_NPROCESSORS_ONLN); @@ -709,8 +717,7 @@ void QThread::start(Priority priority) #endif // _POSIX_THREAD_ATTR_STACKSIZE if (code) { - qWarning("QThread::start: Thread stack size error: %s", - qPrintable(qt_error_string(code))); + qErrnoWarning(code, "QThread::start: Thread stack size error"); // we failed to set the stacksize, and as the documentation states, // the thread will fail to run... @@ -736,16 +743,16 @@ void QThread::start(Priority priority) #endif code = pthread_create(&threadId, &attr, QThreadPrivate::start, this); } - d->data->threadId.store(to_HANDLE(threadId)); + d->data->threadId.storeRelaxed(to_HANDLE(threadId)); pthread_attr_destroy(&attr); if (code) { - qWarning("QThread::start: Thread creation error: %s", qPrintable(qt_error_string(code))); + qErrnoWarning(code, "QThread::start: Thread creation error"); d->running = false; d->finished = false; - d->data->threadId.store(nullptr); + d->data->threadId.storeRelaxed(nullptr); } } @@ -755,13 +762,12 @@ void QThread::terminate() Q_D(QThread); QMutexLocker locker(&d->mutex); - if (!d->data->threadId.load()) + if (!d->data->threadId.loadRelaxed()) return; - int code = pthread_cancel(from_HANDLE<pthread_t>(d->data->threadId.load())); + int code = pthread_cancel(from_HANDLE<pthread_t>(d->data->threadId.loadRelaxed())); if (code) { - qWarning("QThread::start: Thread termination error: %s", - qPrintable(qt_error_string((code)))); + qErrnoWarning(code, "QThread::start: Thread termination error"); } #endif } @@ -771,7 +777,7 @@ bool QThread::wait(unsigned long time) Q_D(QThread); QMutexLocker locker(&d->mutex); - if (from_HANDLE<pthread_t>(d->data->threadId.load()) == pthread_self()) { + if (from_HANDLE<pthread_t>(d->data->threadId.loadRelaxed()) == pthread_self()) { qWarning("QThread::wait: Thread tried to wait on itself"); return false; } @@ -813,7 +819,7 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority) int sched_policy; sched_param param; - if (pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.load()), &sched_policy, ¶m) != 0) { + if (pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), &sched_policy, ¶m) != 0) { // failed to get the scheduling policy, don't bother setting // the priority qWarning("QThread::setPriority: Cannot get scheduler parameters"); @@ -829,15 +835,15 @@ void QThreadPrivate::setPriority(QThread::Priority threadPriority) } param.sched_priority = prio; - int status = pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.load()), sched_policy, ¶m); + int status = pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), sched_policy, ¶m); # ifdef SCHED_IDLE // were we trying to set to idle priority and failed? if (status == -1 && sched_policy == SCHED_IDLE && errno == EINVAL) { // reset to lowest priority possible - pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.load()), &sched_policy, ¶m); + pthread_getschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), &sched_policy, ¶m); param.sched_priority = sched_get_priority_min(sched_policy); - pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.load()), sched_policy, ¶m); + pthread_setschedparam(from_HANDLE<pthread_t>(data->threadId.loadRelaxed()), sched_policy, ¶m); } # else Q_UNUSED(status); diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index e56fe2c6ae..f8a0b0abaa 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -138,11 +138,11 @@ QThreadData *QThreadData::current(bool createIfNecessary) } threadData->deref(); threadData->isAdopted = true; - threadData->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); + threadData->threadId.storeRelaxed(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); #ifndef Q_OS_WINRT if (!QCoreApplicationPrivate::theMainThread) { - QCoreApplicationPrivate::theMainThread = threadData->thread.load(); + QCoreApplicationPrivate::theMainThread = threadData->thread.loadRelaxed(); } else { #else // for winrt the main thread is set explicitly in QCoreApplication's constructor as the @@ -184,9 +184,9 @@ void QThreadData::setMainThread() } threadData->deref(); threadData->isAdopted = true; - threadData->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); + threadData->threadId.storeRelaxed(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); } - QCoreApplicationPrivate::theMainThread = threadData->thread.load(); + QCoreApplicationPrivate::theMainThread = threadData->thread.loadRelaxed(); } #endif @@ -372,14 +372,14 @@ QAbstractEventDispatcher *QThreadPrivate::createEventDispatcher(QThreadData *dat #if QT_CONFIG(thread) -unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(void *arg) Q_DECL_NOEXCEPT +unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(void *arg) noexcept { QThread *thr = reinterpret_cast<QThread *>(arg); QThreadData *data = QThreadData::get2(thr); qt_create_tls(); TlsSetValue(qt_current_thread_data_tls_index, data); - data->threadId.store(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); + data->threadId.storeRelaxed(reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId()))); QThread::setTerminationEnabled(false); @@ -406,7 +406,7 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi return 0; } -void QThreadPrivate::finish(void *arg, bool lockAnyway) Q_DECL_NOEXCEPT +void QThreadPrivate::finish(void *arg, bool lockAnyway) noexcept { QThread *thr = reinterpret_cast<QThread *>(arg); QThreadPrivate *d = thr->d_func(); @@ -421,7 +421,7 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway) Q_DECL_NOEXCEPT QThreadStorageData::finish(tls_data); locker.relock(); - QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.load(); + QAbstractEventDispatcher *eventDispatcher = d->data->eventDispatcher.loadRelaxed(); if (eventDispatcher) { d->data->eventDispatcher = 0; locker.unlock(); @@ -447,12 +447,12 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway) Q_DECL_NOEXCEPT ** QThread *************************************************************************/ -Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW +Qt::HANDLE QThread::currentThreadId() noexcept { return reinterpret_cast<Qt::HANDLE>(quintptr(GetCurrentThreadId())); } -int QThread::idealThreadCount() Q_DECL_NOTHROW +int QThread::idealThreadCount() noexcept { SYSTEM_INFO sysinfo; #ifndef Q_OS_WINRT diff --git a/src/corelib/thread/qthreadpool_p.h b/src/corelib/thread/qthreadpool_p.h index 952e02ef20..01852d8366 100644 --- a/src/corelib/thread/qthreadpool_p.h +++ b/src/corelib/thread/qthreadpool_p.h @@ -162,7 +162,7 @@ public: void tryToStartMoreThreads(); bool tooManyThreadsActive() const; - void startThread(QRunnable *runnable = 0); + void startThread(QRunnable *runnable = nullptr); void reset(); bool waitForDone(int msecs); bool waitForDone(const QDeadlineTimer &timer); diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp index 8b82118a5c..fdc484d2d2 100644 --- a/src/corelib/thread/qthreadstorage.cpp +++ b/src/corelib/thread/qthreadstorage.cpp @@ -126,7 +126,7 @@ void **QThreadStorageData::get() const DEBUG_MSG("QThreadStorageData: Returning storage %d, data %p, for thread %p", id, *v, - data->thread.load()); + data->thread.loadRelaxed()); return *v ? v : 0; } @@ -148,7 +148,7 @@ void **QThreadStorageData::set(void *p) DEBUG_MSG("QThreadStorageData: Deleting previous storage %d, data %p, for thread %p", id, value, - data->thread.load()); + data->thread.loadRelaxed()); QMutexLocker locker(&destructorsMutex); DestructorMap *destr = destructors(); @@ -164,7 +164,7 @@ void **QThreadStorageData::set(void *p) // store new data value = p; - DEBUG_MSG("QThreadStorageData: Set storage %d for thread %p to %p", id, data->thread.load(), p); + DEBUG_MSG("QThreadStorageData: Set storage %d for thread %p to %p", id, data->thread.loadRelaxed(), p); return &value; } diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h index 55fc482da3..9eb8672e92 100644 --- a/src/corelib/thread/qthreadstorage.h +++ b/src/corelib/thread/qthreadstorage.h @@ -69,7 +69,7 @@ inline T *&qThreadStorage_localData(QThreadStorageData &d, T **) { void **v = d.get(); - if (!v) v = d.set(0); + if (!v) v = d.set(nullptr); return *(reinterpret_cast<T**>(v)); } @@ -139,7 +139,7 @@ public: inline ~QThreadStorage() { } inline bool hasLocalData() const - { return d.get() != 0; } + { return d.get() != nullptr; } inline T& localData() { return qThreadStorage_localData(d, reinterpret_cast<T*>(0)); } diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp index 0ba90763cf..dd7475cec5 100644 --- a/src/corelib/thread/qwaitcondition_unix.cpp +++ b/src/corelib/thread/qwaitcondition_unix.cpp @@ -72,7 +72,7 @@ __attribute__((weakref("__pthread_cond_timedwait_relative"))); static void report_error(int code, const char *where, const char *what) { if (code != 0) - qWarning("%s: %s failure: %s", where, what, qPrintable(qt_error_string(code))); + qErrnoWarning(code, "%s: %s failure", where, what); } void qt_initialize_pthread_cond(pthread_cond_t *cond, const char *where) diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/time/qdatetime.cpp index 9b0ed18742..e34ce71212 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/time/qdatetime.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -58,6 +58,9 @@ #endif #include <cmath> +#ifdef Q_CC_MINGW +# include <unistd.h> // Define _POSIX_THREAD_SAFE_FUNCTIONS to obtain localtime_r() +#endif #include <time.h> #ifdef Q_OS_WIN # include <qt_windows.h> @@ -169,12 +172,11 @@ static ParsedDate getDateFromJulianDay(qint64 julianDay) Date/Time formatting helper functions *****************************************************************************/ -static const char monthDays[] = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; - #if QT_CONFIG(textdate) static const char qt_shortMonthNames[][4] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun", - "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" }; + "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" +}; static int qt_monthNumberFromShortName(QStringRef shortName) { @@ -256,7 +258,7 @@ static QString toOffsetString(Qt::DateFormat format, int offset) #if QT_CONFIG(datestring) // Parse offset in [+-]HH[[:]mm] format -static int fromOffsetString(const QStringRef &offsetString, bool *valid) Q_DECL_NOTHROW +static int fromOffsetString(const QStringRef &offsetString, bool *valid) noexcept { *valid = false; @@ -301,6 +303,12 @@ static int fromOffsetString(const QStringRef &offsetString, bool *valid) Q_DECL_ } #endif // datestring +static constexpr int daysInUsualMonth(int month) // (February isn't usual.) +{ + // Long if odd up to July = 7, or if even from 8 = August onwards: + return Q_ASSERT(month != 2 && month > 0 && month <= 12), 30 | ((month & 1) ^ (month >> 3)); +} + /***************************************************************************** QDate member functions *****************************************************************************/ @@ -417,7 +425,6 @@ QDate::QDate(int y, int m, int d) \sa isValid() */ - /*! \fn bool QDate::isValid() const @@ -426,7 +433,6 @@ QDate::QDate(int y, int m, int d) \sa isNull() */ - /*! Returns the year of this date. Negative numbers indicate years before 1 CE, such that year -44 is 44 BCE. @@ -542,10 +548,10 @@ int QDate::daysInMonth() const return 0; const ParsedDate pd = getDateFromJulianDay(jd); - if (pd.month == 2 && isLeapYear(pd.year)) - return 29; - else - return monthDays[pd.month]; + if (pd.month == 2) + return isLeapYear(pd.year) ? 29 : 28; + + return daysInUsualMonth(pd.month); } /*! @@ -607,12 +613,275 @@ int QDate::weekNumber(int *yearNumber) const Q_ASSERT(week == 53 || week == 1); } - if (yearNumber != 0) + if (yearNumber) *yearNumber = year; return week; } +static bool inDateTimeRange(qint64 jd, bool start) +{ + using Bounds = std::numeric_limits<qint64>; + if (jd < Bounds::min() + JULIAN_DAY_FOR_EPOCH) + return false; + jd -= JULIAN_DAY_FOR_EPOCH; + const qint64 maxDay = Bounds::max() / MSECS_PER_DAY; + const qint64 minDay = Bounds::min() / MSECS_PER_DAY - 1; + // (Divisions rounded towards zero, as MSECS_PER_DAY has factors other than two.) + // Range includes start of last day and end of first: + if (start) + return jd > minDay && jd <= maxDay; + return jd >= minDay && jd < maxDay; +} + +static QDateTime toEarliest(const QDate &day, const QDateTime &form) +{ + const Qt::TimeSpec spec = form.timeSpec(); + const int offset = (spec == Qt::OffsetFromUTC) ? form.offsetFromUtc() : 0; +#if QT_CONFIG(timezone) + QTimeZone zone; + if (spec == Qt::TimeZone) + zone = form.timeZone(); +#endif + auto moment = [=](QTime time) { + switch (spec) { + case Qt::OffsetFromUTC: return QDateTime(day, time, spec, offset); +#if QT_CONFIG(timezone) + case Qt::TimeZone: return QDateTime(day, time, zone); +#endif + default: return QDateTime(day, time, spec); + } + }; + // Longest routine time-zone transition is 2 hours: + QDateTime when = moment(QTime(2, 0)); + if (!when.isValid()) { + // Noon should be safe ... + when = moment(QTime(12, 0)); + if (!when.isValid()) { + // ... unless it's a 24-hour jump (moving the date-line) + when = moment(QTime(23, 59, 59, 999)); + if (!when.isValid()) + return QDateTime(); + } + } + int high = when.time().msecsSinceStartOfDay() / 60000; + int low = 0; + // Binary chop to the right minute + while (high > low + 1) { + int mid = (high + low) / 2; + QDateTime probe = moment(QTime(mid / 60, mid % 60)); + if (probe.isValid() && probe.date() == day) { + high = mid; + when = probe; + } else { + low = mid; + } + } + return when; +} + +/*! + \since 5.14 + \fn QDateTime QDate::startOfDay(Qt::TimeSpec spec, int offsetSeconds) const + \fn QDateTime QDate::startOfDay(const QTimeZone &zone) const + + Returns the start-moment of the day. Usually, this shall be midnight at the + start of the day: however, if a time-zone transition causes the given date + to skip over that midnight (e.g. a DST spring-forward skipping from the end + of the previous day to 01:00 of the new day), the actual earliest time in + the day is returned. This can only arise when the start-moment is specified + in terms of a time-zone (by passing its QTimeZone as \a zone) or in terms of + local time (by passing Qt::LocalTime as \a spec; this is its default). + + The \a offsetSeconds is ignored unless \a spec is Qt::OffsetFromUTC, when it + gives the implied zone's offset from UTC. As UTC and such zones have no + transitions, the start of the day is QTime(0, 0) in these cases. + + In the rare case of a date that was entirely skipped (this happens when a + zone east of the international date-line switches to being west of it), the + return shall be invalid. Passing Qt::TimeZone as \a spec (instead of + passing a QTimeZone) or passing an invalid time-zone as \a zone will also + produce an invalid result, as shall dates that start outside the range + representable by QDateTime. + + \sa endOfDay() +*/ +QDateTime QDate::startOfDay(Qt::TimeSpec spec, int offsetSeconds) const +{ + if (!inDateTimeRange(jd, true)) + return QDateTime(); + + switch (spec) { + case Qt::TimeZone: // should pass a QTimeZone instead of Qt::TimeZone + qWarning() << "Called QDate::startOfDay(Qt::TimeZone) on" << *this; + return QDateTime(); + case Qt::OffsetFromUTC: + case Qt::UTC: + return QDateTime(*this, QTime(0, 0), spec, offsetSeconds); + + case Qt::LocalTime: + if (offsetSeconds) + qWarning("Ignoring offset (%d seconds) passed with Qt::LocalTime", offsetSeconds); + break; + } + QDateTime when(*this, QTime(0, 0), spec); + if (!when.isValid()) + when = toEarliest(*this, when); + + return when.isValid() ? when : QDateTime(); +} + +#if QT_CONFIG(timezone) +/*! + \overload + \since 5.14 +*/ +QDateTime QDate::startOfDay(const QTimeZone &zone) const +{ + if (!inDateTimeRange(jd, true) || !zone.isValid()) + return QDateTime(); + + QDateTime when(*this, QTime(0, 0), zone); + if (when.isValid()) + return when; + + // The start of the day must have fallen in a spring-forward's gap; find the spring-forward: + if (zone.hasTransitions()) { + QTimeZone::OffsetData tran = zone.previousTransition(QDateTime(*this, QTime(23, 59, 59, 999), zone)); + const QDateTime &at = tran.atUtc.toTimeZone(zone); + if (at.isValid() && at.date() == *this) + return at; + } + + when = toEarliest(*this, when); + return when.isValid() ? when : QDateTime(); +} +#endif // timezone + +static QDateTime toLatest(const QDate &day, const QDateTime &form) +{ + const Qt::TimeSpec spec = form.timeSpec(); + const int offset = (spec == Qt::OffsetFromUTC) ? form.offsetFromUtc() : 0; +#if QT_CONFIG(timezone) + QTimeZone zone; + if (spec == Qt::TimeZone) + zone = form.timeZone(); +#endif + auto moment = [=](QTime time) { + switch (spec) { + case Qt::OffsetFromUTC: return QDateTime(day, time, spec, offset); +#if QT_CONFIG(timezone) + case Qt::TimeZone: return QDateTime(day, time, zone); +#endif + default: return QDateTime(day, time, spec); + } + }; + // Longest routine time-zone transition is 2 hours: + QDateTime when = moment(QTime(21, 59, 59, 999)); + if (!when.isValid()) { + // Noon should be safe ... + when = moment(QTime(12, 0)); + if (!when.isValid()) { + // ... unless it's a 24-hour jump (moving the date-line) + when = moment(QTime(0, 0)); + if (!when.isValid()) + return QDateTime(); + } + } + int high = 24 * 60; + int low = when.time().msecsSinceStartOfDay() / 60000; + // Binary chop to the right minute + while (high > low + 1) { + int mid = (high + low) / 2; + QDateTime probe = moment(QTime(mid / 60, mid % 60, 59, 999)); + if (probe.isValid() && probe.date() == day) { + low = mid; + when = probe; + } else { + high = mid; + } + } + return when; +} + +/*! + \since 5.14 + \fn QDateTime QDate::endOfDay(Qt::TimeSpec spec, int offsetSeconds) const + \fn QDateTime QDate::endOfDay(const QTimeZone &zone) const + + Returns the end-moment of the day. Usually, this is one millisecond before + the midnight at the end of the day: however, if a time-zone transition + causes the given date to skip over that midnight (e.g. a DST spring-forward + skipping from just before 23:00 to the start of the next day), the actual + latest time in the day is returned. This can only arise when the + start-moment is specified in terms of a time-zone (by passing its QTimeZone + as \a zone) or in terms of local time (by passing Qt::LocalTime as \a spec; + this is its default). + + The \a offsetSeconds is ignored unless \a spec is Qt::OffsetFromUTC, when it + gives the implied zone's offset from UTC. As UTC and such zones have no + transitions, the end of the day is QTime(23, 59, 59, 999) in these cases. + + In the rare case of a date that was entirely skipped (this happens when a + zone east of the international date-line switches to being west of it), the + return shall be invalid. Passing Qt::TimeZone as \a spec (instead of + passing a QTimeZone) will also produce an invalid result, as shall dates + that end outside the range representable by QDateTime. + + \sa startOfDay() +*/ +QDateTime QDate::endOfDay(Qt::TimeSpec spec, int offsetSeconds) const +{ + if (!inDateTimeRange(jd, false)) + return QDateTime(); + + switch (spec) { + case Qt::TimeZone: // should pass a QTimeZone instead of Qt::TimeZone + qWarning() << "Called QDate::endOfDay(Qt::TimeZone) on" << *this; + return QDateTime(); + case Qt::UTC: + case Qt::OffsetFromUTC: + return QDateTime(*this, QTime(23, 59, 59, 999), spec, offsetSeconds); + + case Qt::LocalTime: + if (offsetSeconds) + qWarning("Ignoring offset (%d seconds) passed with Qt::LocalTime", offsetSeconds); + break; + } + QDateTime when(*this, QTime(23, 59, 59, 999), spec); + if (!when.isValid()) + when = toLatest(*this, when); + return when.isValid() ? when : QDateTime(); +} + +#if QT_CONFIG(timezone) +/*! + \overload + \since 5.14 +*/ +QDateTime QDate::endOfDay(const QTimeZone &zone) const +{ + if (!inDateTimeRange(jd, false) || !zone.isValid()) + return QDateTime(); + + QDateTime when(*this, QTime(23, 59, 59, 999), zone); + if (when.isValid()) + return when; + + // The end of the day must have fallen in a spring-forward's gap; find the spring-forward: + if (zone.hasTransitions()) { + QTimeZone::OffsetData tran = zone.nextTransition(QDateTime(*this, QTime(0, 0), zone)); + const QDateTime &at = tran.atUtc.toTimeZone(zone); + if (at.isValid() && at.date() == *this) + return at; + } + + when = toLatest(*this, when); + return when.isValid() ? when : QDateTime(); +} +#endif // timezone + #if QT_DEPRECATED_SINCE(5, 11) && QT_CONFIG(textdate) + /*! \since 4.5 \deprecated @@ -1208,8 +1477,6 @@ qint64 QDate::daysTo(const QDate &d) const #if QT_CONFIG(datestring) /*! - \fn QDate QDate::fromString(const QString &string, Qt::DateFormat format) - Returns the QDate represented by the \a string, using the \a format given, or an invalid date if the string cannot be parsed. @@ -1220,7 +1487,8 @@ qint64 QDate::daysTo(const QDate &d) const \sa toString(), QLocale::toDate() */ -QDate QDate::fromString(const QString& string, Qt::DateFormat format) + +QDate QDate::fromString(const QString &string, Qt::DateFormat format) { if (string.isEmpty()) return QDate(); @@ -1246,19 +1514,17 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format) if (parts.count() != 4) return QDate(); - QStringRef monthName = parts.at(1); - const int month = fromShortMonthName(monthName); - if (month == -1) { - // Month name matches neither English nor other localised name. - return QDate(); - } - bool ok = false; int year = parts.at(3).toInt(&ok); - if (!ok) + int day = ok ? parts.at(2).toInt(&ok) : 0; + if (!ok || !day) return QDate(); - return QDate(year, month, parts.at(2).toInt()); + const int month = fromShortMonthName(parts.at(1)); + if (month == -1) // Month name matches no English or localised name. + return QDate(); + + return QDate(year, month, day); } #endif // textdate case Qt::ISODate: { @@ -1277,8 +1543,6 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format) } /*! - \fn QDate QDate::fromString(const QString &string, const QString &format) - Returns the QDate represented by the \a string, using the \a format given, or an invalid date if the string cannot be parsed. @@ -1371,12 +1635,9 @@ QDate QDate::fromString(const QString &string, const QString &format) bool QDate::isValid(int year, int month, int day) { - // there is no year 0 in the Gregorian calendar - if (year == 0) - return false; - - return (day > 0 && month > 0 && month <= 12) && - (day <= monthDays[month] || (day == 29 && month == 2 && isLeapYear(year))); + // There is no year 0 in the Gregorian calendar. + return year && day > 0 && month > 0 && month <= 12 && + day <= (month == 2 ? isLeapYear(year) ? 29 : 28 : daysInUsualMonth(month)); } /*! @@ -1421,12 +1682,10 @@ bool QDate::isLeapYear(int y) \brief The QTime class provides clock time functions. - A QTime object contains a clock time, which it can express as the - numbers of hours, minutes, seconds, and milliseconds since - midnight. It can read the current time from the system clock and - measure a span of elapsed time. It provides functions for - comparing times and for manipulating a time by adding a number of - milliseconds. + A QTime object contains a clock time, which it can express as the numbers of + hours, minutes, seconds, and milliseconds since midnight. It provides + functions for comparing times and for manipulating a time by adding a number + of milliseconds. QTime uses the 24-hour clock format; it has no concept of AM/PM. Unlike QDateTime, QTime knows nothing about time zones or @@ -1451,18 +1710,15 @@ bool QDate::isLeapYear(int y) objects; an earlier time is considered smaller than a later one; if A.msecsTo(B) is positive, then A < B. - QTime can be used to measure a span of elapsed time using the - start(), restart(), and elapsed() functions. - \sa QDate, QDateTime */ /*! \fn QTime::QTime() - Constructs a null time object. A null time can be a QTime(0, 0, 0, 0) - (i.e., midnight) object, except that isNull() returns \c true and isValid() - returns \c false. + Constructs a null time object. For a null time, isNull() returns \c true and + isValid() returns \c false. If you need a zero time, use QTime(0, 0). For + the start of a day, see QDate::startOfDay(). \sa isNull(), isValid() */ @@ -1976,8 +2232,6 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format, } /*! - \fn QTime QTime::fromString(const QString &string, Qt::DateFormat format) - Returns the time represented in the \a string as a QTime using the \a format given, or an invalid time if this is not possible. @@ -1989,7 +2243,7 @@ static QTime fromIsoTimeString(const QStringRef &string, Qt::DateFormat format, \sa toString(), QLocale::toTime() */ -QTime QTime::fromString(const QString& string, Qt::DateFormat format) +QTime QTime::fromString(const QString &string, Qt::DateFormat format) { if (string.isEmpty()) return QTime(); @@ -2011,13 +2265,11 @@ QTime QTime::fromString(const QString& string, Qt::DateFormat format) case Qt::ISODateWithMs: case Qt::TextDate: default: - return fromIsoTimeString(QStringRef(&string), format, 0); + return fromIsoTimeString(QStringRef(&string), format, nullptr); } } /*! - \fn QTime QTime::fromString(const QString &string, const QString &format) - Returns the QTime represented by the \a string, using the \a format given, or an invalid time if the string cannot be parsed. @@ -2107,7 +2359,7 @@ bool QTime::isValid(int h, int m, int s, int ms) return (uint)h < 24 && (uint)m < 60 && (uint)s < 60 && (uint)ms < 1000; } - +#if QT_DEPRECATED_SINCE(5, 14) // ### Qt 6: remove /*! Sets this time to the current time. This is practical for timing: @@ -2176,6 +2428,7 @@ int QTime::elapsed() const n += 86400 * 1000; return n; } +#endif // Use QElapsedTimer instead ! /***************************************************************************** QDateTime static helper functions @@ -2185,16 +2438,6 @@ int QTime::elapsed() const typedef QDateTimePrivate::QDateTimeShortData ShortData; typedef QDateTimePrivate::QDateTimeData QDateTimeData; -// Calls the platform variant of tzset -static void qt_tzset() -{ -#if defined(Q_OS_WIN) - _tzset(); -#else - tzset(); -#endif // Q_OS_WIN -} - // Returns the platform variant of timezone, i.e. the standard time offset // The timezone external variable is documented as always holding the // Standard Time offset as seconds west of Greenwich, i.e. UTC+01:00 is -3600 @@ -2269,7 +2512,7 @@ int QDateTimeParser::startsWithLocalTimeZone(const QStringRef name) // then null date/time will be returned, you should adjust the date first if // you need a guaranteed result. static qint64 qt_mktime(QDate *date, QTime *time, QDateTimePrivate::DaylightStatus *daylightStatus, - QString *abbreviation, bool *ok = 0) + QString *abbreviation, bool *ok = nullptr) { const qint64 msec = time->msec(); int yy, mm, dd; @@ -2292,7 +2535,7 @@ static qint64 qt_mktime(QDate *date, QTime *time, QDateTimePrivate::DaylightStat #if defined(Q_OS_WIN) int hh = local.tm_hour; #endif // Q_OS_WIN - time_t secsSinceEpoch = mktime(&local); + time_t secsSinceEpoch = qMkTime(&local); if (secsSinceEpoch != time_t(-1)) { *date = QDate(local.tm_year + 1900, local.tm_mon + 1, local.tm_mday); *time = QTime(local.tm_hour, local.tm_min, local.tm_sec, msec); @@ -2351,14 +2594,14 @@ static bool qt_localtime(qint64 msecsSinceEpoch, QDate *localDate, QTime *localT tm local; bool valid = false; - // localtime() is required to work as if tzset() was called before it. - // localtime_r() does not have this requirement, so make an explicit call. + // localtime() is specified to work as if it called tzset(). + // localtime_r() does not have this constraint, so make an explicit call. // The explicit call should also request the timezone info be re-parsed. - qt_tzset(); + qTzSet(); #if QT_CONFIG(thread) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) // Use the reentrant version of localtime() where available // as is thread-safe and doesn't use a shared static data area - tm *res = 0; + tm *res = nullptr; res = localtime_r(&secsSinceEpoch, &local); if (res) valid = true; @@ -2368,7 +2611,7 @@ static bool qt_localtime(qint64 msecsSinceEpoch, QDate *localDate, QTime *localT #else // Returns shared static data which may be overwritten at any time // So copy the result asap - tm *res = 0; + tm *res = nullptr; res = localtime(&secsSinceEpoch); if (res) { local = *res; @@ -2402,8 +2645,8 @@ static void msecsToTime(qint64 msecs, QDate *date, QTime *time) qint64 jd = JULIAN_DAY_FOR_EPOCH; qint64 ds = 0; - if (qAbs(msecs) >= MSECS_PER_DAY) { - jd += (msecs / MSECS_PER_DAY); + if (msecs >= MSECS_PER_DAY || msecs <= -MSECS_PER_DAY) { + jd += msecs / MSECS_PER_DAY; msecs %= MSECS_PER_DAY; } @@ -2431,12 +2674,12 @@ static qint64 timeToMSecs(const QDate &date, const QTime &time) // Convert an MSecs Since Epoch into Local Time static bool epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTime *localTime, - QDateTimePrivate::DaylightStatus *daylightStatus = 0) + QDateTimePrivate::DaylightStatus *daylightStatus = nullptr) { if (msecs < 0) { // Docs state any LocalTime before 1970-01-01 will *not* have any Daylight Time applied // Instead just use the standard offset from UTC to convert to UTC time - qt_tzset(); + qTzSet(); msecsToTime(msecs - qt_timezone() * 1000, localDate, localTime); if (daylightStatus) *daylightStatus = QDateTimePrivate::StandardTime; @@ -2471,8 +2714,8 @@ static bool epochMSecsToLocalTime(qint64 msecs, QDate *localDate, QTime *localTi // values from mktime for the adjusted local date and time. static qint64 localMSecsToEpochMSecs(qint64 localMsecs, QDateTimePrivate::DaylightStatus *daylightStatus, - QDate *localDate = 0, QTime *localTime = 0, - QString *abbreviation = 0) + QDate *localDate = nullptr, QTime *localTime = nullptr, + QString *abbreviation = nullptr) { QDate dt; QTime tm; @@ -2499,7 +2742,7 @@ static qint64 localMSecsToEpochMSecs(qint64 localMsecs, } } else { // If we don't call mktime then need to call tzset to get offset - qt_tzset(); + qTzSet(); } // Time is clearly before 1970-01-01 so just use standard offset to convert qint64 utcMsecs = localMsecs + qt_timezone() * 1000; @@ -2775,7 +3018,7 @@ static void setDateTime(QDateTimeData &d, const QDate &date, const QTime &time) if (!useTime.isValid() && date.isValid()) useTime = QTime::fromMSecsSinceStartOfDay(0); - QDateTimePrivate::StatusFlags newStatus = 0; + QDateTimePrivate::StatusFlags newStatus = { }; // Set date value and status qint64 days = 0; @@ -2853,7 +3096,7 @@ inline QDateTime::Data::Data(Qt::TimeSpec spec) // the structure is too small, we need to detach d = new QDateTimePrivate; d->ref.ref(); - d->m_status = mergeSpec(0, spec); + d->m_status = mergeSpec(nullptr, spec); } } @@ -2938,13 +3181,13 @@ inline void QDateTime::Data::detach() x->m_status = QDateTimePrivate::StatusFlag(data.status & ~QDateTimePrivate::ShortData); x->m_msecs = data.msecs; } else { - if (d->ref.load() == 1) + if (d->ref.loadRelaxed() == 1) return; x = new QDateTimePrivate(*d); } - x->ref.store(1); + x->ref.storeRelaxed(1); if (!wasShort && !d->ref.deref()) delete d; d = x; @@ -2960,7 +3203,7 @@ inline QDateTimePrivate *QDateTime::Data::operator->() { // should we attempt to detach here? Q_ASSERT(!isShort()); - Q_ASSERT(d->ref.load() == 1); + Q_ASSERT(d->ref.loadRelaxed() == 1); return d; } @@ -3149,7 +3392,7 @@ inline qint64 QDateTimePrivate::zoneMSecsToEpochMSecs(qint64 zoneMSecs, const QT \sa isValid() */ -QDateTime::QDateTime() Q_DECL_NOEXCEPT_EXPR(Data::CanBeSmall) +QDateTime::QDateTime() noexcept(Data::CanBeSmall) { } @@ -3160,7 +3403,7 @@ QDateTime::QDateTime() Q_DECL_NOEXCEPT_EXPR(Data::CanBeSmall) */ QDateTime::QDateTime(const QDate &date) - : d(QDateTimePrivate::create(date, QTime(0, 0, 0), Qt::LocalTime, 0)) + : d(QDateTimePrivate::create(date, QTime(0, 0), Qt::LocalTime, 0)) { } @@ -3228,7 +3471,7 @@ QDateTime::QDateTime(const QDate &date, const QTime &time, const QTimeZone &time /*! Constructs a copy of the \a other datetime. */ -QDateTime::QDateTime(const QDateTime &other) Q_DECL_NOTHROW +QDateTime::QDateTime(const QDateTime &other) noexcept : d(other.d) { } @@ -3238,7 +3481,7 @@ QDateTime::QDateTime(const QDateTime &other) Q_DECL_NOTHROW Moves the content of the temporary \a other datetime to this object and leaves \a other in an unspecified (but proper) state. */ -QDateTime::QDateTime(QDateTime &&other) Q_DECL_NOTHROW +QDateTime::QDateTime(QDateTime &&other) noexcept : d(std::move(other.d)) { } @@ -3255,7 +3498,7 @@ QDateTime::~QDateTime() copy. */ -QDateTime &QDateTime::operator=(const QDateTime &other) Q_DECL_NOTHROW +QDateTime &QDateTime::operator=(const QDateTime &other) noexcept { d = other.d; return *this; @@ -3312,7 +3555,7 @@ QDate QDateTime::date() const if (!status.testFlag(QDateTimePrivate::ValidDate)) return QDate(); QDate dt; - msecsToTime(getMSecs(d), &dt, 0); + msecsToTime(getMSecs(d), &dt, nullptr); return dt; } @@ -3328,7 +3571,7 @@ QTime QDateTime::time() const if (!status.testFlag(QDateTimePrivate::ValidTime)) return QTime(); QTime tm; - msecsToTime(getMSecs(d), 0, &tm); + msecsToTime(getMSecs(d), nullptr, &tm); return tm; } @@ -3446,7 +3689,7 @@ QString QDateTime::timeZoneAbbreviation() const case Qt::LocalTime: { QString abbrev; auto status = extractDaylightStatus(getStatus(d)); - localMSecsToEpochMSecs(getMSecs(d), &status, 0, 0, &abbrev); + localMSecsToEpochMSecs(getMSecs(d), &status, nullptr, nullptr, &abbrev); return abbrev; } } @@ -4483,7 +4726,7 @@ QDateTime QDateTime::currentDateTimeUtc() return QDateTime(d, t, Qt::UTC); } -qint64 QDateTime::currentMSecsSinceEpoch() Q_DECL_NOTHROW +qint64 QDateTime::currentMSecsSinceEpoch() noexcept { SYSTEMTIME st; memset(&st, 0, sizeof(SYSTEMTIME)); @@ -4494,7 +4737,7 @@ qint64 QDateTime::currentMSecsSinceEpoch() Q_DECL_NOTHROW - julianDayFromDate(1970, 1, 1)) * Q_INT64_C(86400000); } -qint64 QDateTime::currentSecsSinceEpoch() Q_DECL_NOTHROW +qint64 QDateTime::currentSecsSinceEpoch() noexcept { SYSTEMTIME st; memset(&st, 0, sizeof(SYSTEMTIME)); @@ -4526,19 +4769,19 @@ QDateTime QDateTime::currentDateTimeUtc() return fromMSecsSinceEpoch(currentMSecsSinceEpoch(), Qt::UTC); } -qint64 QDateTime::currentMSecsSinceEpoch() Q_DECL_NOTHROW +qint64 QDateTime::currentMSecsSinceEpoch() noexcept { // posix compliant system // we have milliseconds struct timeval tv; - gettimeofday(&tv, 0); + gettimeofday(&tv, nullptr); return qint64(tv.tv_sec) * Q_INT64_C(1000) + tv.tv_usec / 1000; } -qint64 QDateTime::currentSecsSinceEpoch() Q_DECL_NOTHROW +qint64 QDateTime::currentSecsSinceEpoch() noexcept { struct timeval tv; - gettimeofday(&tv, 0); + gettimeofday(&tv, nullptr); return qint64(tv.tv_sec); } #else @@ -4752,8 +4995,6 @@ int QDateTime::utcOffset() const #if QT_CONFIG(datestring) /*! - \fn QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format) - Returns the QDateTime represented by the \a string, using the \a format given, or an invalid datetime if this is not possible. @@ -4763,7 +5004,7 @@ int QDateTime::utcOffset() const \sa toString(), QLocale::toDateTime() */ -QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format) +QDateTime QDateTime::fromString(const QString &string, Qt::DateFormat format) { if (string.isEmpty()) return QDateTime(); @@ -4862,48 +5103,45 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format) return QDateTime(); // Accept "Sun Dec 1 13:02:00 1974" and "Sun 1. Dec 13:02:00 1974" + + // Year and time can be in either order. + // Guess which by looking for ':' in the time + int yearPart = 3; + int timePart = 3; + if (parts.at(3).contains(QLatin1Char(':'))) + yearPart = 4; + else if (parts.at(4).contains(QLatin1Char(':'))) + timePart = 4; + else + return QDateTime(); + int month = 0; int day = 0; bool ok = false; - // First try month then day + int year = parts.at(yearPart).toInt(&ok); + if (!ok || year == 0) + return QDateTime(); + + // Next try month then day month = fromShortMonthName(parts.at(1)); if (month) - day = parts.at(2).toInt(); + day = parts.at(2).toInt(&ok); - // If failed try day then month - if (!month || !day) { + // If failed, try day then month + if (!ok || !month || !day) { month = fromShortMonthName(parts.at(2)); if (month) { QStringRef dayStr = parts.at(1); if (dayStr.endsWith(QLatin1Char('.'))) { dayStr = dayStr.left(dayStr.size() - 1); - day = dayStr.toInt(); + day = dayStr.toInt(&ok); } } } // If both failed, give up - if (!month || !day) - return QDateTime(); - - // Year can be before or after time, "Sun Dec 1 1974 13:02:00" or "Sun Dec 1 13:02:00 1974" - // Guess which by looking for ':' in the time - int year = 0; - int yearPart = 0; - int timePart = 0; - if (parts.at(3).contains(QLatin1Char(':'))) { - yearPart = 4; - timePart = 3; - } else if (parts.at(4).contains(QLatin1Char(':'))) { - yearPart = 3; - timePart = 4; - } else { - return QDateTime(); - } - - year = parts.at(yearPart).toInt(&ok); - if (!ok) + if (!ok || !month || !day) return QDateTime(); QDate date(year, month, day); @@ -4970,8 +5208,6 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format) } /*! - \fn QDateTime QDateTime::fromString(const QString &string, const QString &format) - Returns the QDateTime represented by the \a string, using the \a format given, or an invalid datetime if the string cannot be parsed. @@ -5432,7 +5668,7 @@ uint qHash(const QDateTime &key, uint seed) Returns the hash value for the \a key, using \a seed to seed the calculation. */ -uint qHash(const QDate &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QDate &key, uint seed) noexcept { return qHash(key.toJulianDay(), seed); } @@ -5443,7 +5679,7 @@ uint qHash(const QDate &key, uint seed) Q_DECL_NOTHROW Returns the hash value for the \a key, using \a seed to seed the calculation. */ -uint qHash(const QTime &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QTime &key, uint seed) noexcept { return qHash(key.msecsSinceStartOfDay(), seed); } diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/time/qdatetime.h index 43271b34ed..3e3b953b52 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/time/qdatetime.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -55,6 +55,7 @@ Q_FORWARD_DECLARE_OBJC_CLASS(NSDate); QT_BEGIN_NAMESPACE class QTimeZone; +class QDateTime; class Q_CORE_EXPORT QDate { @@ -81,6 +82,13 @@ public: int daysInYear() const; int weekNumber(int *yearNum = nullptr) const; + QDateTime startOfDay(Qt::TimeSpec spec = Qt::LocalTime, int offsetSeconds = 0) const; + QDateTime endOfDay(Qt::TimeSpec spec = Qt::LocalTime, int offsetSeconds = 0) const; +#if QT_CONFIG(timezone) + QDateTime startOfDay(const QTimeZone &zone) const; + QDateTime endOfDay(const QTimeZone &zone) const; +#endif + #if QT_DEPRECATED_SINCE(5, 10) && QT_CONFIG(textdate) QT_DEPRECATED_X("Use QLocale::monthName or QLocale::standaloneMonthName") static QString shortMonthName(int month, MonthNameType type = DateFormat); @@ -99,8 +107,8 @@ public: QString toString(QStringView format) const; #endif #if QT_DEPRECATED_SINCE(5,0) -QT_DEPRECATED inline bool setYMD(int y, int m, int d) -{ if (uint(y) <= 99) y += 1900; return setDate(y, m, d); } + QT_DEPRECATED_X("Use setDate() instead") inline bool setYMD(int y, int m, int d) + { if (uint(y) <= 99) y += 1900; return setDate(y, m, d); } #endif bool setDate(int year, int month, int day); @@ -198,9 +206,11 @@ public: #endif static bool isValid(int h, int m, int s, int ms = 0); - void start(); - int restart(); - int elapsed() const; +#if QT_DEPRECATED_SINCE(5, 14) // ### Qt 6: remove + QT_DEPRECATED_X("Use QElapsedTimer instead") void start(); + QT_DEPRECATED_X("Use QElapsedTimer instead") int restart(); + QT_DEPRECATED_X("Use QElapsedTimer instead") int elapsed() const; +#endif private: enum TimeFlag { NullTime = -1 }; Q_DECL_CONSTEXPR inline int ds() const { return mds == -1 ? 0 : mds; } @@ -258,7 +268,7 @@ class Q_CORE_EXPORT QDateTime }; public: - QDateTime() Q_DECL_NOEXCEPT_EXPR(Data::CanBeSmall); + QDateTime() noexcept(Data::CanBeSmall); explicit QDateTime(const QDate &); QDateTime(const QDate &, const QTime &, Qt::TimeSpec spec = Qt::LocalTime); // ### Qt 6: Merge with above with default offsetSeconds = 0 @@ -266,16 +276,14 @@ public: #if QT_CONFIG(timezone) QDateTime(const QDate &date, const QTime &time, const QTimeZone &timeZone); #endif // timezone - QDateTime(const QDateTime &other) Q_DECL_NOTHROW; - QDateTime(QDateTime &&other) Q_DECL_NOTHROW; + QDateTime(const QDateTime &other) noexcept; + QDateTime(QDateTime &&other) noexcept; ~QDateTime(); -#ifdef Q_COMPILER_RVALUE_REFS - QDateTime &operator=(QDateTime &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif - QDateTime &operator=(const QDateTime &other) Q_DECL_NOTHROW; + QDateTime &operator=(QDateTime &&other) noexcept { swap(other); return *this; } + QDateTime &operator=(const QDateTime &other) noexcept; - void swap(QDateTime &other) Q_DECL_NOTHROW { qSwap(d.d, other.d.d); } + void swap(QDateTime &other) noexcept { qSwap(d.d, other.d.d); } bool isNull() const; bool isValid() const; @@ -335,9 +343,9 @@ public: inline bool operator>(const QDateTime &other) const { return other < *this; } inline bool operator>=(const QDateTime &other) const { return !(*this < other); } -#if QT_DEPRECATED_SINCE(5, 2) - QT_DEPRECATED void setUtcOffset(int seconds); - QT_DEPRECATED int utcOffset() const; +#if QT_DEPRECATED_SINCE(5, 2) // ### Qt 6: remove + QT_DEPRECATED_X("Use setOffsetFromUtc() instead") void setUtcOffset(int seconds); + QT_DEPRECATED_X("Use offsetFromUtc() instead") int utcOffset() const; #endif // QT_DEPRECATED_SINCE static QDateTime currentDateTime(); @@ -366,8 +374,8 @@ public: static QDateTime fromSecsSinceEpoch(qint64 secs, const QTimeZone &timeZone); #endif - static qint64 currentMSecsSinceEpoch() Q_DECL_NOTHROW; - static qint64 currentSecsSinceEpoch() Q_DECL_NOTHROW; + static qint64 currentMSecsSinceEpoch() noexcept; + static qint64 currentSecsSinceEpoch() noexcept; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) static QDateTime fromCFDate(CFDateRef date); @@ -410,8 +418,8 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QDateTime &); // QDateTime is not noexcept for now -- to be revised once // timezone and calendaring support is added Q_CORE_EXPORT uint qHash(const QDateTime &key, uint seed = 0); -Q_CORE_EXPORT uint qHash(const QDate &key, uint seed = 0) Q_DECL_NOTHROW; -Q_CORE_EXPORT uint qHash(const QTime &key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QDate &key, uint seed = 0) noexcept; +Q_CORE_EXPORT uint qHash(const QTime &key, uint seed = 0) noexcept; QT_END_NAMESPACE diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/time/qdatetime_p.h index b3d00745d0..6018f8f7b0 100644 --- a/src/corelib/tools/qdatetime_p.h +++ b/src/corelib/time/qdatetime_p.h @@ -135,7 +135,7 @@ public: #if QT_CONFIG(timezone) static qint64 zoneMSecsToEpochMSecs(qint64 msecs, const QTimeZone &zone, DaylightStatus hint = UnknownDaylightTime, - QDate *localDate = 0, QTime *localTime = 0); + QDate *localDate = nullptr, QTime *localTime = nullptr); // Inlined for its one caller in qdatetime.cpp inline void setUtcOffsetByTZ(qint64 atMSecsSinceEpoch); diff --git a/src/corelib/tools/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp index e8470f6cde..728b066db1 100644 --- a/src/corelib/tools/qdatetimeparser.cpp +++ b/src/corelib/time/qdatetimeparser.cpp @@ -47,7 +47,6 @@ #if QT_CONFIG(timezone) #include "qtimezone.h" #endif -#include "qregexp.h" #include "qdebug.h" //#define QDATETIMEPARSER_DEBUG @@ -78,8 +77,8 @@ int QDateTimeParser::getDigit(const QDateTime &t, int index) const { if (index < 0 || index >= sectionNodes.size()) { #if QT_CONFIG(datestring) - qWarning("QDateTimeParser::getDigit() Internal error (%s %d)", - qPrintable(t.toString()), index); + qWarning("QDateTimeParser::getDigit() Internal error (%ls %d)", + qUtf16Printable(t.toString()), index); #else qWarning("QDateTimeParser::getDigit() Internal error (%d)", index); #endif @@ -104,8 +103,8 @@ int QDateTimeParser::getDigit(const QDateTime &t, int index) const } #if QT_CONFIG(datestring) - qWarning("QDateTimeParser::getDigit() Internal error 2 (%s %d)", - qPrintable(t.toString()), index); + qWarning("QDateTimeParser::getDigit() Internal error 2 (%ls %d)", + qUtf16Printable(t.toString()), index); #else qWarning("QDateTimeParser::getDigit() Internal error 2 (%d)", index); #endif @@ -128,8 +127,8 @@ bool QDateTimeParser::setDigit(QDateTime &v, int index, int newVal) const { if (index < 0 || index >= sectionNodes.size()) { #if QT_CONFIG(datestring) - qWarning("QDateTimeParser::setDigit() Internal error (%s %d %d)", - qPrintable(v.toString()), index, newVal); + qWarning("QDateTimeParser::setDigit() Internal error (%ls %d %d)", + qUtf16Printable(v.toString()), index, newVal); #else qWarning("QDateTimeParser::setDigit() Internal error (%d %d)", index, newVal); #endif @@ -177,8 +176,8 @@ bool QDateTimeParser::setDigit(QDateTime &v, int index, int newVal) const break; case AmPmSection: hour = (newVal == 0 ? hour % 12 : (hour % 12) + 12); break; default: - qWarning("QDateTimeParser::setDigit() Internal error (%s)", - qPrintable(node.name())); + qWarning("QDateTimeParser::setDigit() Internal error (%ls)", + qUtf16Printable(node.name())); break; } @@ -239,8 +238,8 @@ int QDateTimeParser::absoluteMax(int s, const QDateTime &cur) const case AmPmSection: return 1; default: break; } - qWarning("QDateTimeParser::absoluteMax() Internal error (%s)", - qPrintable(sn.name())); + qWarning("QDateTimeParser::absoluteMax() Internal error (%ls)", + qUtf16Printable(sn.name())); return -1; } @@ -271,8 +270,8 @@ int QDateTimeParser::absoluteMin(int s) const case AmPmSection: return 0; default: break; } - qWarning("QDateTimeParser::absoluteMin() Internal error (%s, %0x)", - qPrintable(sn.name()), sn.type); + qWarning("QDateTimeParser::absoluteMin() Internal error (%ls, %0x)", + qUtf16Printable(sn.name()), sn.type); return -1; } @@ -327,7 +326,7 @@ int QDateTimeParser::sectionPos(const SectionNode &sn) const default: break; } if (sn.pos == -1) { - qWarning("QDateTimeParser::sectionPos Internal error (%s)", qPrintable(sn.name())); + qWarning("QDateTimeParser::sectionPos Internal error (%ls)", qUtf16Printable(sn.name())); return -1; } return sn.pos; @@ -734,8 +733,8 @@ QDateTimeParser::parseSection(const QDateTime ¤tValue, int sectionIndex, ParsedSection result; // initially Invalid const SectionNode &sn = sectionNode(sectionIndex); if (sn.type & Internal) { - qWarning("QDateTimeParser::parseSection Internal error (%s %d)", - qPrintable(sn.name()), sectionIndex); + qWarning("QDateTimeParser::parseSection Internal error (%ls %d)", + qUtf16Printable(sn.name()), sectionIndex); return result; } @@ -885,8 +884,8 @@ QDateTimeParser::parseSection(const QDateTime ¤tValue, int sectionIndex, } break; } default: - qWarning("QDateTimeParser::parseSection Internal error (%s %d)", - qPrintable(sn.name()), sectionIndex); + qWarning("QDateTimeParser::parseSection Internal error (%ls %d)", + qUtf16Printable(sn.name()), sectionIndex); return result; } Q_ASSERT(result.state != Invalid || result.value == -1); @@ -1200,8 +1199,8 @@ QDateTimeParser::scanString(const QDateTime &defaultValue, case DaySection: current = &day; sect.value = qMax<int>(1, sect.value); break; case AmPmSection: current = &m; break; default: - qWarning("QDateTimeParser::parse Internal error (%s)", - qPrintable(sn.name())); + qWarning("QDateTimeParser::parse Internal error (%ls)", + qUtf16Printable(sn.name())); break; } @@ -1391,8 +1390,8 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu if (context != FromString && scan.value < minimum) { const QLatin1Char space(' '); if (scan.value >= minimum) - qWarning("QDateTimeParser::parse Internal error 3 (%s %s)", - qPrintable(scan.value.toString()), qPrintable(minimum.toString())); + qWarning("QDateTimeParser::parse Internal error 3 (%ls %ls)", + qUtf16Printable(scan.value.toString()), qUtf16Printable(minimum.toString())); bool done = false; scan.state = Invalid; @@ -1474,8 +1473,8 @@ QDateTimeParser::parse(QString input, int position, const QDateTime &defaultValu const int min = getDigit(minimum, i); if (min == -1) { - qWarning("QDateTimeParser::parse Internal error 4 (%s)", - qPrintable(sn.name())); + qWarning("QDateTimeParser::parse Internal error 4 (%ls)", + qUtf16Printable(sn.name())); scan.state = Invalid; done = true; break; @@ -1773,8 +1772,8 @@ int QDateTimeParser::SectionNode::maxChange() const case YearSection: return 9999 * 365; case YearSection2Digits: return 100 * 365; default: - qWarning("QDateTimeParser::maxChange() Internal error (%s)", - qPrintable(name())); + qWarning("QDateTimeParser::maxChange() Internal error (%ls)", + qUtf16Printable(name())); } return -1; @@ -1822,8 +1821,8 @@ QDateTimeParser::FieldInfo QDateTimeParser::fieldInfo(int index) const case TimeZoneSection: break; default: - qWarning("QDateTimeParser::fieldInfo Internal error 2 (%d %s %d)", - index, qPrintable(sn.name()), sn.count); + qWarning("QDateTimeParser::fieldInfo Internal error 2 (%d %ls %d)", + index, qUtf16Printable(sn.name()), sn.count); break; } return ret; @@ -1846,8 +1845,8 @@ QString QDateTimeParser::SectionNode::format() const case YearSection2Digits: case YearSection: fillChar = QLatin1Char('y'); break; default: - qWarning("QDateTimeParser::sectionFormat Internal error (%s)", - qPrintable(name(type))); + qWarning("QDateTimeParser::sectionFormat Internal error (%ls)", + qUtf16Printable(name(type))); return QString(); } if (fillChar.isNull()) { @@ -1983,7 +1982,7 @@ QString QDateTimeParser::stateName(State s) const #if QT_CONFIG(datestring) bool QDateTimeParser::fromString(const QString &t, QDate *date, QTime *time) const { - QDateTime val(QDate(1900, 1, 1), QDATETIMEEDIT_TIME_MIN); + QDateTime val(QDate(1900, 1, 1).startOfDay()); const StateNode tmp = parse(t, -1, val, false); if (tmp.state != Acceptable || tmp.conflicts) { return false; @@ -2011,20 +2010,20 @@ QDateTime QDateTimeParser::getMinimum() const { // Cache the most common case if (spec == Qt::LocalTime) { - static const QDateTime localTimeMin(QDATETIMEEDIT_DATE_MIN, QDATETIMEEDIT_TIME_MIN, Qt::LocalTime); + static const QDateTime localTimeMin(QDATETIMEEDIT_DATE_MIN.startOfDay(Qt::LocalTime)); return localTimeMin; } - return QDateTime(QDATETIMEEDIT_DATE_MIN, QDATETIMEEDIT_TIME_MIN, spec); + return QDateTime(QDATETIMEEDIT_DATE_MIN.startOfDay(spec)); } QDateTime QDateTimeParser::getMaximum() const { // Cache the most common case if (spec == Qt::LocalTime) { - static const QDateTime localTimeMax(QDATETIMEEDIT_DATE_MAX, QDATETIMEEDIT_TIME_MAX, Qt::LocalTime); + static const QDateTime localTimeMax(QDATETIMEEDIT_DATE_MAX.endOfDay(Qt::LocalTime)); return localTimeMax; } - return QDateTime(QDATETIMEEDIT_DATE_MAX, QDATETIMEEDIT_TIME_MAX, spec); + return QDateTime(QDATETIMEEDIT_DATE_MAX.endOfDay(spec)); } QString QDateTimeParser::getAmPmText(AmPm ap, Case cs) const diff --git a/src/corelib/tools/qdatetimeparser_p.h b/src/corelib/time/qdatetimeparser_p.h index f7e6e351fe..d9e39f0795 100644 --- a/src/corelib/tools/qdatetimeparser_p.h +++ b/src/corelib/time/qdatetimeparser_p.h @@ -65,14 +65,11 @@ QT_REQUIRE_CONFIG(datetimeparser); -#define QDATETIMEEDIT_TIME_MIN QTime(0, 0, 0, 0) -#define QDATETIMEEDIT_TIME_MAX QTime(23, 59, 59, 999) +#define QDATETIMEEDIT_TIME_MIN QTime(0, 0) // Prefer QDate::startOfDay() +#define QDATETIMEEDIT_TIME_MAX QTime(23, 59, 59, 999) // Prefer QDate::endOfDay() #define QDATETIMEEDIT_DATE_MIN QDate(100, 1, 1) #define QDATETIMEEDIT_COMPAT_DATE_MIN QDate(1752, 9, 14) #define QDATETIMEEDIT_DATE_MAX QDate(9999, 12, 31) -#define QDATETIMEEDIT_DATETIME_MIN QDateTime(QDATETIMEEDIT_DATE_MIN, QDATETIMEEDIT_TIME_MIN) -#define QDATETIMEEDIT_COMPAT_DATETIME_MIN QDateTime(QDATETIMEEDIT_COMPAT_DATE_MIN, QDATETIMEEDIT_TIME_MIN) -#define QDATETIMEEDIT_DATETIME_MAX QDateTime(QDATETIMEEDIT_DATE_MAX, QDATETIMEEDIT_TIME_MAX) #define QDATETIMEEDIT_DATE_INITIAL QDate(2000, 1, 1) QT_BEGIN_NAMESPACE @@ -86,7 +83,7 @@ public: DateTimeEdit }; QDateTimeParser(QVariant::Type t, Context ctx) - : currentSectionIndex(-1), display(0), cachedDay(-1), parserType(t), + : currentSectionIndex(-1), display(nullptr), cachedDay(-1), parserType(t), fixday(false), spec(Qt::LocalTime), context(ctx) { defaultLocale = QLocale::system(); @@ -218,9 +215,9 @@ private: ParsedSection parseSection(const QDateTime ¤tValue, int sectionIndex, int offset, QString *text) const; int findMonth(const QString &str1, int monthstart, int sectionIndex, - QString *monthName = 0, int *used = 0) const; + QString *monthName = nullptr, int *used = nullptr) const; int findDay(const QString &str1, int intDaystart, int sectionIndex, - QString *dayName = 0, int *used = 0) const; + QString *dayName = nullptr, int *used = nullptr) const; ParsedSection findTimeZone(QStringRef str, const QDateTime &when, int maxVal, int minVal) const; #if QT_CONFIG(timezone) @@ -236,7 +233,7 @@ private: PossiblePM = 3, PossibleBoth = 4 }; - AmPmFinder findAmPm(QString &str, int index, int *used = 0) const; + AmPmFinder findAmPm(QString &str, int index, int *used = nullptr) const; #endif // datestring bool potentialValue(const QStringRef &str, int min, int max, int index, diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/time/qtimezone.cpp index cbc6b50c98..ef323de14a 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/time/qtimezone.cpp @@ -317,7 +317,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz); Create a null/invalid time zone instance. */ -QTimeZone::QTimeZone() Q_DECL_NOTHROW +QTimeZone::QTimeZone() noexcept : d(0) { } diff --git a/src/corelib/tools/qtimezone.h b/src/corelib/time/qtimezone.h index 29d8a4dbe5..62ecee49bb 100644 --- a/src/corelib/tools/qtimezone.h +++ b/src/corelib/time/qtimezone.h @@ -89,7 +89,7 @@ public: }; typedef QVector<OffsetData> OffsetDataList; - QTimeZone() Q_DECL_NOTHROW; + QTimeZone() noexcept; explicit QTimeZone(const QByteArray &ianaId); explicit QTimeZone(int offsetSeconds); /*implicit*/ QTimeZone(const QByteArray &zoneId, int offsetSeconds, const QString &name, @@ -99,11 +99,9 @@ public: ~QTimeZone(); QTimeZone &operator=(const QTimeZone &other); - #ifdef Q_COMPILER_RVALUE_REFS - QTimeZone &operator=(QTimeZone &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QTimeZone &operator=(QTimeZone &&other) noexcept { swap(other); return *this; } - void swap(QTimeZone &other) Q_DECL_NOTHROW + void swap(QTimeZone &other) noexcept { d.swap(other.d); } bool operator==(const QTimeZone &other) const; diff --git a/src/corelib/tools/qtimezoneprivate.cpp b/src/corelib/time/qtimezoneprivate.cpp index 569b343187..569b343187 100644 --- a/src/corelib/tools/qtimezoneprivate.cpp +++ b/src/corelib/time/qtimezoneprivate.cpp diff --git a/src/corelib/tools/qtimezoneprivate_android.cpp b/src/corelib/time/qtimezoneprivate_android.cpp index be4f374fdd..be4f374fdd 100644 --- a/src/corelib/tools/qtimezoneprivate_android.cpp +++ b/src/corelib/time/qtimezoneprivate_android.cpp diff --git a/src/corelib/time/qtimezoneprivate_data_p.h b/src/corelib/time/qtimezoneprivate_data_p.h new file mode 100644 index 0000000000..40d6c972c2 --- /dev/null +++ b/src/corelib/time/qtimezoneprivate_data_p.h @@ -0,0 +1,1257 @@ +/**************************************************************************** +** +** Copyright (C) 2013 John Layt <jlayt@kde.org> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#ifndef QTIMEZONEPRIVATE_DATA_P_H +#define QTIMEZONEPRIVATE_DATA_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of internal files. This header file may change from version to version +// without notice, or even be removed. +// +// We mean it. +// + +#include <QtCore/private/qglobal_p.h> + +QT_BEGIN_NAMESPACE + +/* + Windows Zone ID support, included in default base class build so can be used on all platforms, + e.g. an app running on Linux may need to communicate with a Windows Outlook server. These + tables can also be used to look-up Region Codes and UTC Offsets on platforms that don't directly + support them., e.g. Mac does not support availableTimeZones() filtering by region or offset. + + Another data table is provided for generic UTC+00:00 format time zones to be used as a + fall-back if no system time zones are available (QT_NO_SYSTEMLOCALE is set) or for QDateTimes + with a QT:Spec of OffsetFromUTC + + These tables are automatically adapted from the CLDR supplemental/windowsZones.xml data file + using a script in qtbase/util/locale_database. Please do not edit this data directly. In the + future if ICU is made a hard dependency then the ICU resource can be used directly and this + table removed +*/ + +struct QZoneData { + quint16 windowsIdKey; // Windows ID Key + quint16 country; // Country of IANA ID's, AnyCountry means No Country + quint16 ianaIdIndex; // All IANA ID's for the Windows ID and Country, space separated +}; + +struct QWindowsData { + quint16 windowsIdKey; // Windows ID Key + quint16 windowsIdIndex; // Windows ID Literal + quint16 ianaIdIndex; // Default IANA ID for the Windows ID + qint32 offsetFromUtc; // Standard Time Offset from UTC, used for quick look-ups +}; + +struct QUtcData { + quint16 ianaIdIndex; // IANA ID's + qint32 offsetFromUtc; // Offset form UTC is seconds +}; + +/* + COPYRIGHT AND PERMISSION NOTICE + + Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under + the Terms of Use in http://www.unicode.org/copyright.html. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of the Unicode data files and any associated documentation (the "Data + Files") or Unicode software and any associated documentation (the "Software") + to deal in the Data Files or Software without restriction, including without + limitation the rights to use, copy, modify, merge, publish, distribute, and/or + sell copies of the Data Files or Software, and to permit persons to whom the + Data Files or Software are furnished to do so, provided that (a) the above + copyright notice(s) and this permission notice appear with all copies of the + Data Files or Software, (b) both the above copyright notice(s) and this + permission notice appear in associated documentation, and (c) there is clear + notice in each modified Data File or in the Software as well as in the + documentation associated with the Data File(s) or Software that the data or + software has been modified. +*/ + +// GENERATED PART STARTS HERE + +/* + This part of the file was generated on 2019-05-28 from the + Common Locale Data Repository v35.1 supplemental/windowsZones.xml file $Revision: 14742 $ + + http://www.unicode.org/cldr/ + + Do not edit this code: run cldr2qtimezone.py on updated (or + edited) CLDR data; see qtbase/util/locale_database/. +*/ + +// Windows ID Key, Country Enum, IANA ID Index +static const QZoneData zoneDataTable[] = { + { 131, 143, 0 }, // W. Mongolia Standard Time / Mongolia + { 124, 112, 10 }, // UTC+12 / Kiribati + { 52, 94, 25 }, // Haiti Standard Time / Haiti + { 32, 44, 48 }, // China Standard Time / China + { 95, 244, 62 }, // SA Western Standard Time / Saint Barthelemy + { 25, 116, 84 }, // Central Asia Standard Time / Kyrgyzstan + { 36, 8, 97 }, // E. Africa Standard Time / Antarctica + { 33, 154, 114 }, // Chatham Islands Standard Time / New Zealand + { 95, 144, 130 }, // SA Western Standard Time / Montserrat + { 37, 13, 149 }, // E. Australia Standard Time / Australia + { 61, 0, 187 }, // Line Islands Standard Time / AnyCountry + { 132, 218, 198 }, // West Asia Standard Time / Turkmenistan + { 122, 30, 212 }, // UTC-02 / Brazil + { 24, 52, 228 }, // Central America Standard Time / Costa Rica + { 36, 67, 247 }, // E. Africa Standard Time / Eritrea + { 128, 8, 261 }, // W. Australia Standard Time / Antarctica + { 101, 101, 278 }, // SE Asia Standard Time / Indonesia + { 93, 8, 306 }, // SA Eastern Standard Time / Antarctica + { 4, 178, 325 }, // Altai Standard Time / Russia + { 95, 256, 338 }, // SA Western Standard Time / Sint Maarten + { 95, 60, 360 }, // SA Western Standard Time / Dominica + { 134, 167, 377 }, // West Pacific Standard Time / Papua New Guinea + { 13, 13, 398 }, // AUS Eastern Standard Time / Australia + { 69, 236, 435 }, // Morocco Standard Time / Western Sahara + { 39, 30, 451 }, // E. South America Standard Time / Brazil + { 124, 134, 469 }, // UTC+12 / Marshall Islands + { 125, 112, 502 }, // UTC+13 / Kiribati + { 103, 146, 520 }, // South Africa Standard Time / Mozambique + { 94, 30, 534 }, // SA Pacific Standard Time / Brazil + { 88, 74, 570 }, // Romance Standard Time / France + { 71, 38, 583 }, // Mountain Standard Time / Canada + { 72, 147, 657 }, // Myanmar Standard Time / Myanmar + { 26, 30, 670 }, // Central Brazilian Standard Time / Brazil + { 130, 123, 706 }, // W. Europe Standard Time / Liechtenstein + { 46, 73, 719 }, // FLE Standard Time / Finland + { 93, 70, 735 }, // SA Eastern Standard Time / Falkland Islands + { 78, 159, 752 }, // Norfolk Standard Time / Norfolk Island + { 53, 0, 768 }, // Hawaiian Standard Time / AnyCountry + { 28, 54, 779 }, // Central European Standard Time / Croatia + { 75, 150, 793 }, // Nepal Standard Time / Nepal + { 46, 33, 807 }, // FLE Standard Time / Bulgaria + { 6, 162, 820 }, // Arabian Standard Time / Oman + { 132, 131, 832 }, // West Asia Standard Time / Maldives + { 88, 197, 848 }, // Romance Standard Time / Spain + { 50, 91, 875 }, // Greenwich Standard Time / Guinea + { 5, 237, 890 }, // Arab Standard Time / Yemen + { 92, 222, 900 }, // Russian Standard Time / Ukraine + { 103, 204, 918 }, // South Africa Standard Time / Swaziland + { 130, 203, 933 }, // W. Europe Standard Time / Svalbard And Jan Mayen Islands + { 7, 103, 953 }, // Arabic Standard Time / Iraq + { 119, 226, 966 }, // UTC-11 / United States Minor Outlying Islands + { 5, 115, 981 }, // Arab Standard Time / Kuwait + { 50, 189, 993 }, // Greenwich Standard Time / Sierra Leone + { 31, 0, 1009 }, // Central Standard Time / AnyCountry + { 53, 51, 1017 }, // Hawaiian Standard Time / Cook Islands + { 129, 50, 1035 }, // W. Central Africa Standard Time / Congo Brazzaville + { 64, 43, 1054 }, // Magallanes Standard Time / Chile + { 119, 0, 1075 }, // UTC-11 / AnyCountry + { 84, 38, 1086 }, // Pacific Standard Time / Canada + { 22, 11, 1138 }, // Caucasus Standard Time / Armenia + { 130, 142, 1151 }, // W. Europe Standard Time / Monaco + { 103, 239, 1165 }, // South Africa Standard Time / Zambia + { 46, 222, 1179 }, // FLE Standard Time / Ukraine + { 87, 168, 1225 }, // Paraguay Standard Time / Paraguay + { 57, 109, 1242 }, // Jordan Standard Time / Jordan + { 109, 30, 1253 }, // Tocantins Standard Time / Brazil + { 55, 102, 1271 }, // Iran Standard Time / Iran + { 101, 8, 1283 }, // SE Asia Standard Time / Antarctica + { 27, 57, 1300 }, // Central Europe Standard Time / Czech Republic + { 95, 215, 1314 }, // SA Western Standard Time / Trinidad And Tobago + { 103, 28, 1336 }, // South Africa Standard Time / Botswana + { 132, 0, 1352 }, // West Asia Standard Time / AnyCountry + { 94, 63, 1362 }, // SA Pacific Standard Time / Ecuador + { 51, 85, 1380 }, // GTB Standard Time / Greece + { 36, 128, 1394 }, // E. Africa Standard Time / Madagascar + { 53, 226, 1414 }, // Hawaiian Standard Time / United States Minor Outlying Islands + { 94, 107, 1431 }, // SA Pacific Standard Time / Jamaica + { 104, 198, 1447 }, // Sri Lanka Standard Time / Sri Lanka + { 27, 243, 1460 }, // Central Europe Standard Time / Serbia + { 25, 110, 1476 }, // Central Asia Standard Time / Kazakhstan + { 125, 0, 1502 }, // UTC+13 / AnyCountry + { 94, 38, 1513 }, // SA Pacific Standard Time / Canada + { 25, 31, 1535 }, // Central Asia Standard Time / British Indian Ocean Territory + { 108, 13, 1549 }, // Tasmania Standard Time / Australia + { 95, 174, 1583 }, // SA Western Standard Time / Puerto Rico + { 95, 180, 1603 }, // SA Western Standard Time / Saint Kitts And Nevis + { 130, 206, 1620 }, // W. Europe Standard Time / Switzerland + { 117, 225, 1634 }, // US Eastern Standard Time / United States + { 29, 140, 1701 }, // Central Pacific Standard Time / Micronesia + { 120, 77, 1731 }, // UTC-09 / French Polynesia + { 129, 156, 1747 }, // W. Central Africa Standard Time / Niger + { 118, 139, 1761 }, // US Mountain Standard Time / Mexico + { 36, 194, 1780 }, // E. Africa Standard Time / Somalia + { 118, 0, 1797 }, // US Mountain Standard Time / AnyCountry + { 10, 24, 1807 }, // Atlantic Standard Time / Bermuda + { 103, 240, 1824 }, // South Africa Standard Time / Zimbabwe + { 32, 126, 1838 }, // China Standard Time / Macau + { 129, 66, 1849 }, // W. Central Africa Standard Time / Equatorial Guinea + { 66, 137, 1863 }, // Mauritius Standard Time / Mauritius + { 46, 68, 1880 }, // FLE Standard Time / Estonia + { 50, 187, 1895 }, // Greenwich Standard Time / Senegal + { 132, 110, 1908 }, // West Asia Standard Time / Kazakhstan + { 25, 44, 1968 }, // Central Asia Standard Time / China + { 130, 106, 1980 }, // W. Europe Standard Time / Italy + { 48, 251, 1992 }, // GMT Standard Time / Isle Of Man + { 36, 210, 2011 }, // E. Africa Standard Time / Tanzania + { 10, 86, 2032 }, // Atlantic Standard Time / Greenland + { 123, 86, 2046 }, // UTC / Greenland + { 20, 38, 2067 }, // Canada Central Standard Time / Canada + { 15, 86, 2104 }, // Azores Standard Time / Greenland + { 69, 145, 2125 }, // Morocco Standard Time / Morocco + { 115, 219, 2143 }, // Turks And Caicos Standard Time / Turks And Caicos Islands + { 50, 80, 2162 }, // Greenwich Standard Time / Gambia + { 129, 42, 2176 }, // W. Central Africa Standard Time / Chad + { 56, 105, 2192 }, // Israel Standard Time / Israel + { 64, 8, 2207 }, // Magallanes Standard Time / Antarctica + { 12, 13, 2225 }, // Aus Central W. Standard Time / Australia + { 24, 155, 2241 }, // Central America Standard Time / Nicaragua + { 102, 170, 2257 }, // Singapore Standard Time / Philippines + { 134, 160, 2269 }, // West Pacific Standard Time / Northern Mariana Islands + { 43, 64, 2284 }, // Egypt Standard Time / Egypt + { 88, 21, 2297 }, // Romance Standard Time / Belgium + { 76, 8, 2313 }, // New Zealand Standard Time / Antarctica + { 51, 177, 2332 }, // GTB Standard Time / Romania + { 103, 0, 2349 }, // South Africa Standard Time / AnyCountry + { 41, 225, 2359 }, // Eastern Standard Time / United States + { 129, 23, 2516 }, // W. Central Africa Standard Time / Benin + { 79, 178, 2534 }, // North Asia East Standard Time / Russia + { 116, 143, 2547 }, // Ulaanbaatar Standard Time / Mongolia + { 130, 14, 2580 }, // W. Europe Standard Time / Austria + { 41, 38, 2594 }, // Eastern Standard Time / Canada + { 95, 255, 2699 }, // SA Western Standard Time / Bonaire + { 124, 149, 2718 }, // UTC+12 / Nauru + { 134, 8, 2732 }, // West Pacific Standard Time / Antarctica + { 63, 178, 2758 }, // Magadan Standard Time / Russia + { 130, 161, 2771 }, // W. Europe Standard Time / Norway + { 110, 0, 2783 }, // Tokyo Standard Time / AnyCountry + { 24, 63, 2793 }, // Central America Standard Time / Ecuador + { 103, 35, 2811 }, // South Africa Standard Time / Burundi + { 10, 38, 2828 }, // Atlantic Standard Time / Canada + { 29, 0, 2896 }, // Central Pacific Standard Time / AnyCountry + { 95, 87, 2907 }, // SA Western Standard Time / Grenada + { 29, 153, 2923 }, // Central Pacific Standard Time / New Caledonia + { 42, 139, 2938 }, // Eastern Standard Time (Mexico) / Mexico + { 2, 225, 2953 }, // Alaskan Standard Time / United States + { 49, 86, 3029 }, // Greenland Standard Time / Greenland + { 50, 92, 3045 }, // Greenwich Standard Time / Guinea Bissau + { 130, 184, 3059 }, // W. Europe Standard Time / San Marino + { 27, 98, 3077 }, // Central Europe Standard Time / Hungary + { 24, 96, 3093 }, // Central America Standard Time / Honduras + { 62, 13, 3113 }, // Lord Howe Standard Time / Australia + { 36, 0, 3133 }, // E. Africa Standard Time / AnyCountry + { 129, 79, 3143 }, // W. Central Africa Standard Time / Gabon + { 95, 182, 3161 }, // SA Western Standard Time / Saint Vincent And The Grenadines + { 48, 224, 3180 }, // GMT Standard Time / United Kingdom + { 68, 227, 3194 }, // Montevideo Standard Time / Uruguay + { 124, 0, 3213 }, // UTC+12 / AnyCountry + { 130, 230, 3224 }, // W. Europe Standard Time / Vatican City State + { 50, 99, 3239 }, // Greenwich Standard Time / Iceland + { 34, 55, 3258 }, // Cuba Standard Time / Cuba + { 41, 16, 3273 }, // Eastern Standard Time / Bahamas + { 122, 196, 3288 }, // UTC-02 / South Georgia And The South Sandwich Islands + { 24, 65, 3311 }, // Central America Standard Time / El Salvador + { 31, 225, 3331 }, // Central Standard Time / United States + { 95, 0, 3499 }, // SA Western Standard Time / AnyCountry + { 94, 166, 3509 }, // SA Pacific Standard Time / Panama + { 94, 47, 3524 }, // SA Pacific Standard Time / Colombia + { 70, 139, 3539 }, // Mountain Standard Time (Mexico) / Mexico + { 124, 220, 3574 }, // UTC+12 / Tuvalu + { 130, 84, 3591 }, // W. Europe Standard Time / Gibraltar + { 82, 178, 3608 }, // Omsk Standard Time / Russia + { 60, 122, 3618 }, // Libya Standard Time / Libya + { 25, 8, 3633 }, // Central Asia Standard Time / Antarctica + { 95, 12, 3651 }, // SA Western Standard Time / Aruba + { 67, 119, 3665 }, // Middle East Standard Time / Lebanon + { 102, 0, 3677 }, // Singapore Standard Time / AnyCountry + { 74, 148, 3687 }, // Namibia Standard Time / Namibia + { 126, 231, 3703 }, // Venezuela Standard Time / Venezuela + { 95, 234, 3719 }, // SA Western Standard Time / United States Virgin Islands + { 21, 0, 3737 }, // Cape Verde Standard Time / AnyCountry + { 95, 9, 3747 }, // SA Western Standard Time / Antigua And Barbuda + { 94, 169, 3763 }, // SA Pacific Standard Time / Peru + { 46, 248, 3776 }, // FLE Standard Time / Aland Islands + { 50, 199, 3793 }, // Greenwich Standard Time / Saint Helena + { 134, 140, 3812 }, // West Pacific Standard Time / Micronesia + { 102, 190, 3825 }, // Singapore Standard Time / Singapore + { 95, 61, 3840 }, // SA Western Standard Time / Dominican Republic + { 103, 129, 3862 }, // South Africa Standard Time / Malawi + { 30, 139, 3878 }, // Central Standard Time (Mexico) / Mexico + { 102, 130, 3954 }, // Singapore Standard Time / Malaysia + { 45, 72, 3985 }, // Fiji Standard Time / Fiji + { 118, 225, 3998 }, // US Mountain Standard Time / United States + { 17, 25, 4014 }, // Bangladesh Standard Time / Bhutan + { 130, 133, 4027 }, // W. Europe Standard Time / Malta + { 92, 178, 4040 }, // Russian Standard Time / Russia + { 95, 135, 4084 }, // SA Western Standard Time / Martinique + { 35, 0, 4103 }, // Dateline Standard Time / AnyCountry + { 135, 178, 4114 }, // Yakutsk Standard Time / Russia + { 1, 1, 4141 }, // Afghanistan Standard Time / Afghanistan + { 123, 0, 4152 }, // UTC / AnyCountry + { 31, 139, 4168 }, // Central Standard Time / Mexico + { 6, 0, 4186 }, // Arabian Standard Time / AnyCountry + { 101, 45, 4196 }, // SE Asia Standard Time / Christmas Island + { 15, 173, 4213 }, // Azores Standard Time / Portugal + { 129, 0, 4229 }, // W. Central Africa Standard Time / AnyCountry + { 17, 18, 4239 }, // Bangladesh Standard Time / Bangladesh + { 31, 38, 4250 }, // Central Standard Time / Canada + { 94, 0, 4325 }, // SA Pacific Standard Time / AnyCountry + { 125, 213, 4335 }, // UTC+13 / Tokelau + { 73, 178, 4351 }, // N. Central Asia Standard Time / Russia + { 133, 165, 4368 }, // West Bank Standard Time / Palestinian Territories + { 114, 217, 4390 }, // Turkey Standard Time / Turkey + { 3, 225, 4406 }, // Aleutian Standard Time / United States + { 101, 0, 4419 }, // SE Asia Standard Time / AnyCountry + { 71, 225, 4429 }, // Mountain Standard Time / United States + { 36, 69, 4458 }, // E. Africa Standard Time / Ethiopia + { 130, 151, 4477 }, // W. Europe Standard Time / Netherlands + { 95, 245, 4494 }, // SA Western Standard Time / Saint Martin + { 48, 173, 4510 }, // GMT Standard Time / Portugal + { 46, 124, 4541 }, // FLE Standard Time / Lithuania + { 130, 82, 4556 }, // W. Europe Standard Time / Germany + { 65, 77, 4586 }, // Marquesas Standard Time / French Polynesia + { 80, 178, 4604 }, // North Asia Standard Time / Russia + { 61, 112, 4639 }, // Line Islands Standard Time / Kiribati + { 96, 200, 4658 }, // Saint Pierre Standard Time / Saint Pierre And Miquelon + { 48, 104, 4675 }, // GMT Standard Time / Ireland + { 5, 186, 4689 }, // Arab Standard Time / Saudi Arabia + { 83, 43, 4701 }, // Pacific SA Standard Time / Chile + { 91, 178, 4718 }, // Russia Time Zone 11 / Russia + { 36, 48, 4745 }, // E. Africa Standard Time / Comoros + { 95, 152, 4759 }, // SA Western Standard Time / Cura Sao + { 38, 141, 4775 }, // E. Europe Standard Time / Moldova + { 24, 22, 4791 }, // Central America Standard Time / Belize + { 103, 195, 4806 }, // South Africa Standard Time / South Africa + { 127, 178, 4826 }, // Vladivostok Standard Time / Russia + { 122, 0, 4857 }, // UTC-02 / AnyCountry + { 106, 207, 4867 }, // Syria Standard Time / Syria + { 93, 76, 4881 }, // SA Eastern Standard Time / French Guiana + { 50, 136, 4897 }, // Greenwich Standard Time / Mauritania + { 41, 0, 4915 }, // Eastern Standard Time / AnyCountry + { 16, 30, 4923 }, // Bahia Standard Time / Brazil + { 40, 43, 4937 }, // Easter Island Standard Time / Chile + { 93, 0, 4952 }, // SA Eastern Standard Time / AnyCountry + { 9, 178, 4962 }, // Astrakhan Standard Time / Russia + { 95, 30, 4996 }, // SA Western Standard Time / Brazil + { 18, 20, 5049 }, // Belarus Standard Time / Belarus + { 95, 181, 5062 }, // SA Western Standard Time / Saint Lucia + { 129, 6, 5079 }, // W. Central Africa Standard Time / Angola + { 129, 157, 5093 }, // W. Central Africa Standard Time / Nigeria + { 130, 5, 5106 }, // W. Europe Standard Time / Andorra + { 58, 178, 5121 }, // Kaliningrad Standard Time / Russia + { 71, 0, 5140 }, // Mountain Standard Time / AnyCountry + { 95, 7, 5148 }, // SA Western Standard Time / Anguilla + { 124, 235, 5165 }, // UTC+12 / Wallis And Futuna Islands + { 6, 223, 5180 }, // Arabian Standard Time / United Arab Emirates + { 94, 40, 5191 }, // SA Pacific Standard Time / Cayman Islands + { 101, 211, 5206 }, // SE Asia Standard Time / Thailand + { 29, 193, 5219 }, // Central Pacific Standard Time / Solomon Islands + { 47, 81, 5239 }, // Georgian Standard Time / Georgia + { 101, 36, 5252 }, // SE Asia Standard Time / Cambodia + { 132, 228, 5268 }, // West Asia Standard Time / Uzbekistan + { 51, 56, 5297 }, // GTB Standard Time / Cyprus + { 95, 88, 5325 }, // SA Western Standard Time / Guadeloupe + { 101, 232, 5344 }, // SE Asia Standard Time / Vietnam + { 113, 178, 5356 }, // Transbaikal Standard Time / Russia + { 50, 121, 5367 }, // Greenwich Standard Time / Liberia + { 95, 233, 5383 }, // SA Western Standard Time / British Virgin Islands + { 129, 49, 5399 }, // W. Central Africa Standard Time / Congo Kinshasa + { 97, 178, 5415 }, // Sakhalin Standard Time / Russia + { 124, 226, 5429 }, // UTC+12 / United States Minor Outlying Islands + { 50, 83, 5442 }, // Greenwich Standard Time / Ghana + { 76, 154, 5455 }, // New Zealand Standard Time / New Zealand + { 23, 13, 5472 }, // Cen. Australia Standard Time / Australia + { 53, 77, 5513 }, // Hawaiian Standard Time / French Polynesia + { 50, 34, 5528 }, // Greenwich Standard Time / Burkina Faso + { 132, 78, 5547 }, // West Asia Standard Time / French Southern Territories + { 121, 0, 5564 }, // UTC-08 / AnyCountry + { 27, 2, 5574 }, // Central Europe Standard Time / Albania + { 107, 208, 5588 }, // Taipei Standard Time / Taiwan + { 88, 58, 5600 }, // Romance Standard Time / Denmark + { 36, 221, 5618 }, // E. Africa Standard Time / Uganda + { 95, 19, 5633 }, // SA Western Standard Time / Barbados + { 14, 15, 5650 }, // Azerbaijan Standard Time / Azerbaijan + { 32, 97, 5660 }, // China Standard Time / Hong Kong + { 110, 101, 5675 }, // Tokyo Standard Time / Indonesia + { 53, 225, 5689 }, // Hawaiian Standard Time / United States + { 36, 111, 5706 }, // E. Africa Standard Time / Kenya + { 134, 89, 5721 }, // West Pacific Standard Time / Guam + { 36, 254, 5734 }, // E. Africa Standard Time / South Sudan + { 48, 71, 5746 }, // GMT Standard Time / Faroe Islands + { 90, 178, 5762 }, // Russia Time Zone 10 / Russia + { 119, 158, 5781 }, // UTC-11 / Niue + { 129, 3, 5794 }, // W. Central Africa Standard Time / Algeria + { 110, 62, 5809 }, // Tokyo Standard Time / East Timor + { 93, 30, 5819 }, // SA Eastern Standard Time / Brazil + { 27, 242, 5898 }, // Central Europe Standard Time / Montenegro + { 129, 37, 5915 }, // W. Central Africa Standard Time / Cameroon + { 101, 117, 5929 }, // SE Asia Standard Time / Laos + { 85, 139, 5944 }, // Pacific Standard Time (Mexico) / Mexico + { 50, 212, 5981 }, // Greenwich Standard Time / Togo + { 46, 118, 5993 }, // FLE Standard Time / Latvia + { 95, 38, 6005 }, // SA Western Standard Time / Canada + { 132, 209, 6026 }, // West Asia Standard Time / Tajikistan + { 77, 38, 6040 }, // Newfoundland Standard Time / Canada + { 110, 108, 6057 }, // Tokyo Standard Time / Japan + { 25, 0, 6068 }, // Central Asia Standard Time / AnyCountry + { 28, 27, 6078 }, // Central European Standard Time / Bosnia And Herzegowina + { 27, 191, 6094 }, // Central Europe Standard Time / Slovakia + { 95, 93, 6112 }, // SA Western Standard Time / Guyana + { 48, 197, 6127 }, // GMT Standard Time / Spain + { 19, 167, 6143 }, // Bougainville Standard Time / Papua New Guinea + { 5, 17, 6164 }, // Arab Standard Time / Bahrain + { 24, 90, 6177 }, // Central America Standard Time / Guatemala + { 95, 26, 6195 }, // SA Western Standard Time / Bolivia + { 81, 113, 6210 }, // North Korea Standard Time / North Korea + { 119, 4, 6225 }, // UTC-11 / American Samoa + { 66, 176, 6243 }, // Mauritius Standard Time / Reunion + { 103, 120, 6258 }, // South Africa Standard Time / Lesotho + { 84, 0, 6272 }, // Pacific Standard Time / AnyCountry + { 120, 0, 6280 }, // UTC-09 / AnyCountry + { 129, 216, 6290 }, // W. Central Africa Standard Time / Tunisia + { 99, 185, 6303 }, // Sao Tome Standard Time / Sao Tome And Principe + { 100, 178, 6319 }, // Saratov Standard Time / Russia + { 105, 201, 6334 }, // Sudan Standard Time / Sudan + { 48, 252, 6350 }, // GMT Standard Time / Jersey + { 29, 13, 6364 }, // Central Pacific Standard Time / Australia + { 71, 139, 6385 }, // Mountain Standard Time / Mexico + { 21, 39, 6401 }, // Cape Verde Standard Time / Cape Verde + { 102, 101, 6421 }, // Singapore Standard Time / Indonesia + { 27, 192, 6435 }, // Central Europe Standard Time / Slovenia + { 48, 75, 6452 }, // GMT Standard Time / Guernsey + { 132, 8, 6468 }, // West Asia Standard Time / Antarctica + { 8, 10, 6486 }, // Argentina Standard Time / Argentina + { 98, 183, 6759 }, // Samoa Standard Time / Samoa + { 129, 41, 6772 }, // W. Central Africa Standard Time / Central African Republic + { 111, 178, 6786 }, // Tomsk Standard Time / Russia + { 110, 164, 6797 }, // Tokyo Standard Time / Palau + { 11, 13, 6811 }, // AUS Central Standard Time / Australia + { 121, 171, 6828 }, // UTC-08 / Pitcairn + { 102, 32, 6845 }, // Singapore Standard Time / Brunei + { 112, 214, 6857 }, // Tonga Standard Time / Tonga + { 89, 178, 6875 }, // Russia Time Zone 3 / Russia + { 128, 13, 6889 }, // W. Australia Standard Time / Australia + { 28, 172, 6905 }, // Central European Standard Time / Poland + { 72, 46, 6919 }, // Myanmar Standard Time / Cocos Islands + { 66, 188, 6932 }, // Mauritius Standard Time / Seychelles + { 84, 225, 6944 }, // Pacific Standard Time / United States + { 54, 100, 6983 }, // India Standard Time / India + { 50, 53, 6997 }, // Greenwich Standard Time / Ivory Coast + { 24, 0, 7012 }, // Central America Standard Time / AnyCountry + { 29, 229, 7022 }, // Central Pacific Standard Time / Vanuatu + { 130, 125, 7036 }, // W. Europe Standard Time / Luxembourg + { 50, 132, 7054 }, // Greenwich Standard Time / Mali + { 103, 179, 7068 }, // South Africa Standard Time / Rwanda + { 5, 175, 7082 }, // Arab Standard Time / Qatar + { 86, 163, 7093 }, // Pakistan Standard Time / Pakistan + { 134, 0, 7106 }, // West Pacific Standard Time / AnyCountry + { 36, 59, 7117 }, // E. Africa Standard Time / Djibouti + { 44, 178, 7133 }, // Ekaterinburg Standard Time / Russia + { 118, 38, 7152 }, // US Mountain Standard Time / Canada + { 36, 138, 7209 }, // E. Africa Standard Time / Mayotte + { 28, 127, 7224 }, // Central European Standard Time / Macedonia + { 59, 114, 7238 }, // Korea Standard Time / South Korea + { 93, 202, 7249 }, // SA Eastern Standard Time / Suriname + { 130, 205, 7268 }, // W. Europe Standard Time / Sweden + { 103, 49, 7285 }, // South Africa Standard Time / Congo Kinshasa + { 0, 0, 0 } // Trailing zeroes +}; + +// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset +static const QWindowsData windowsDataTable[] = { + { 1, 0, 4141, 16200 }, // Afghanistan Standard Time + { 2, 26, 7303,-32400 }, // Alaskan Standard Time + { 3, 48, 4406,-36000 }, // Aleutian Standard Time + { 4, 71, 325, 25200 }, // Altai Standard Time + { 5, 91, 4689, 10800 }, // Arab Standard Time + { 6, 110, 5180, 14400 }, // Arabian Standard Time + { 7, 132, 953, 10800 }, // Arabic Standard Time + { 8, 153, 7321,-10800 }, // Argentina Standard Time + { 9, 177, 7342, 14400 }, // Astrakhan Standard Time + { 10, 201, 7359,-14400 }, // Atlantic Standard Time + { 11, 224, 6811, 34200 }, // AUS Central Standard Time + { 12, 250, 2225, 31500 }, // Aus Central W. Standard Time + { 13, 279, 7375, 36000 }, // AUS Eastern Standard Time + { 14, 305, 5650, 14400 }, // Azerbaijan Standard Time + { 15, 330, 4213, -3600 }, // Azores Standard Time + { 16, 351, 4923,-10800 }, // Bahia Standard Time + { 17, 371, 4239, 21600 }, // Bangladesh Standard Time + { 18, 396, 5049, 10800 }, // Belarus Standard Time + { 19, 418, 6143, 39600 }, // Bougainville Standard Time + { 20, 445, 7392,-21600 }, // Canada Central Standard Time + { 21, 474, 6401, -3600 }, // Cape Verde Standard Time + { 22, 499, 1138, 14400 }, // Caucasus Standard Time + { 23, 522, 7407, 34200 }, // Cen. Australia Standard Time + { 24, 551, 6177,-21600 }, // Central America Standard Time + { 25, 581, 7426, 21600 }, // Central Asia Standard Time + { 26, 608, 7438,-14400 }, // Central Brazilian Standard Time + { 27, 640, 3077, 3600 }, // Central Europe Standard Time + { 28, 669, 6905, 3600 }, // Central European Standard Time + { 29, 700, 5219, 39600 }, // Central Pacific Standard Time + { 30, 730, 7453,-21600 }, // Central Standard Time (Mexico) + { 31, 761, 7473,-21600 }, // Central Standard Time + { 32, 783, 48, 28800 }, // China Standard Time + { 33, 803, 114, 45900 }, // Chatham Islands Standard Time + { 34, 833, 3258,-18000 }, // Cuba Standard Time + { 35, 852, 4103,-43200 }, // Dateline Standard Time + { 36, 875, 5706, 10800 }, // E. Africa Standard Time + { 37, 899, 7489, 36000 }, // E. Australia Standard Time + { 38, 926, 4775, 7200 }, // E. Europe Standard Time + { 39, 950, 451,-10800 }, // E. South America Standard Time + { 40, 981, 4937,-21600 }, // Easter Island Standard Time + { 41, 1009, 7508,-18000 }, // Eastern Standard Time + { 42, 1031, 2938,-18000 }, // Eastern Standard Time (Mexico) + { 43, 1062, 2284, 7200 }, // Egypt Standard Time + { 44, 1082, 7133, 18000 }, // Ekaterinburg Standard Time + { 45, 1109, 3985, 43200 }, // Fiji Standard Time + { 46, 1128, 7525, 7200 }, // FLE Standard Time + { 47, 1146, 5239, 14400 }, // Georgian Standard Time + { 48, 1169, 3180, 0 }, // GMT Standard Time + { 49, 1187, 3029,-10800 }, // Greenland Standard Time + { 50, 1211, 3239, 0 }, // Greenwich Standard Time + { 51, 1235, 2332, 7200 }, // GTB Standard Time + { 52, 1253, 25,-18000 }, // Haiti Standard Time + { 53, 1273, 5689,-36000 }, // Hawaiian Standard Time + { 54, 1296, 6983, 19800 }, // India Standard Time + { 55, 1316, 1271, 12600 }, // Iran Standard Time + { 56, 1335, 2192, 7200 }, // Israel Standard Time + { 57, 1356, 1242, 7200 }, // Jordan Standard Time + { 58, 1377, 5121, 7200 }, // Kaliningrad Standard Time + { 59, 1403, 7238, 32400 }, // Korea Standard Time + { 60, 1423, 3618, 7200 }, // Libya Standard Time + { 61, 1443, 4639, 50400 }, // Line Islands Standard Time + { 62, 1470, 3113, 37800 }, // Lord Howe Standard Time + { 63, 1494, 2758, 36000 }, // Magadan Standard Time + { 64, 1516, 1054,-10800 }, // Magallanes Standard Time + { 65, 1541, 4586,-34200 }, // Marquesas Standard Time + { 66, 1565, 1863, 14400 }, // Mauritius Standard Time + { 67, 1589, 3665, 7200 }, // Middle East Standard Time + { 68, 1615, 3194,-10800 }, // Montevideo Standard Time + { 69, 1640, 2125, 0 }, // Morocco Standard Time + { 70, 1662, 7537,-25200 }, // Mountain Standard Time (Mexico) + { 71, 1694, 7555,-25200 }, // Mountain Standard Time + { 72, 1717, 657, 23400 }, // Myanmar Standard Time + { 73, 1739, 4351, 21600 }, // N. Central Asia Standard Time + { 74, 1769, 3687, 3600 }, // Namibia Standard Time + { 75, 1791, 793, 20700 }, // Nepal Standard Time + { 76, 1811, 5455, 43200 }, // New Zealand Standard Time + { 77, 1837, 6040,-12600 }, // Newfoundland Standard Time + { 78, 1864, 752, 39600 }, // Norfolk Standard Time + { 79, 1886, 2534, 28800 }, // North Asia East Standard Time + { 80, 1916, 7570, 25200 }, // North Asia Standard Time + { 81, 1941, 6210, 30600 }, // North Korea Standard Time + { 82, 1967, 3608, 21600 }, // Omsk Standard Time + { 83, 1986, 4701,-10800 }, // Pacific SA Standard Time + { 84, 2011, 7587,-28800 }, // Pacific Standard Time + { 85, 2033, 7607,-28800 }, // Pacific Standard Time (Mexico) + { 86, 2064, 7093, 18000 }, // Pakistan Standard Time + { 87, 2087, 1225,-14400 }, // Paraguay Standard Time + { 88, 2110, 570, 3600 }, // Romance Standard Time + { 89, 2132, 6875, 14400 }, // Russia Time Zone 3 + { 90, 2151, 5762, 39600 }, // Russia Time Zone 10 + { 91, 2171, 7623, 43200 }, // Russia Time Zone 11 + { 92, 2191, 7638, 10800 }, // Russian Standard Time + { 93, 2213, 4881,-10800 }, // SA Eastern Standard Time + { 94, 2238, 3524,-18000 }, // SA Pacific Standard Time + { 95, 2263, 6195,-14400 }, // SA Western Standard Time + { 96, 2288, 4658,-10800 }, // Saint Pierre Standard Time + { 97, 2315, 5415, 39600 }, // Sakhalin Standard Time + { 98, 2338, 6759, 46800 }, // Samoa Standard Time + { 99, 2358, 6303, 0 }, // Sao Tome Standard Time + { 100, 2381, 6319, 14400 }, // Saratov Standard Time + { 101, 2403, 5206, 25200 }, // SE Asia Standard Time + { 102, 2425, 3825, 28800 }, // Singapore Standard Time + { 103, 2449, 4806, 7200 }, // South Africa Standard Time + { 104, 2476, 1447, 19800 }, // Sri Lanka Standard Time + { 105, 2500, 6334, 7200 }, // Sudan Standard Time + { 106, 2520, 4867, 7200 }, // Syria Standard Time + { 107, 2540, 5588, 28800 }, // Taipei Standard Time + { 108, 2561, 7652, 36000 }, // Tasmania Standard Time + { 109, 2584, 1253,-10800 }, // Tocantins Standard Time + { 110, 2608, 6057, 32400 }, // Tokyo Standard Time + { 111, 2628, 6786, 25200 }, // Tomsk Standard Time + { 112, 2648, 6857, 46800 }, // Tonga Standard Time + { 113, 2668, 5356, 32400 }, // Transbaikal Standard Time + { 114, 2694, 4390, 7200 }, // Turkey Standard Time + { 115, 2715, 2143,-14400 }, // Turks And Caicos Standard Time + { 116, 2746, 7669, 28800 }, // Ulaanbaatar Standard Time + { 117, 2772, 7686,-18000 }, // US Eastern Standard Time + { 118, 2797, 3998,-25200 }, // US Mountain Standard Time + { 119, 2823, 1075,-39600 }, // UTC-11 + { 120, 2830, 6280,-32400 }, // UTC-09 + { 121, 2837, 5564,-28800 }, // UTC-08 + { 122, 2844, 4857, -7200 }, // UTC-02 + { 123, 2851, 7707, 0 }, // UTC + { 124, 2855, 3213, 43200 }, // UTC+12 + { 125, 2862, 1502, 46800 }, // UTC+13 + { 126, 2869, 3703,-16200 }, // Venezuela Standard Time + { 127, 2893, 7715, 36000 }, // Vladivostok Standard Time + { 128, 2919, 6889, 28800 }, // W. Australia Standard Time + { 129, 2946, 5093, 3600 }, // W. Central Africa Standard Time + { 130, 2978, 7732, 3600 }, // W. Europe Standard Time + { 131, 3002, 0, 25200 }, // W. Mongolia Standard Time + { 132, 3028, 7746, 18000 }, // West Asia Standard Time + { 133, 3052, 7760, 7200 }, // West Bank Standard Time + { 134, 3076, 377, 36000 }, // West Pacific Standard Time + { 135, 3103, 7772, 32400 }, // Yakutsk Standard Time + { 0, 0, 0, 0 } // Trailing zeroes +}; + +// IANA ID Index, UTC Offset +static const QUtcData utcDataTable[] = { + { 7785, 0 }, // UTC + { 7789,-50400 }, // UTC-14:00 + { 7799,-46800 }, // UTC-13:00 + { 7809,-43200 }, // UTC-12:00 + { 7819,-39600 }, // UTC-11:00 + { 7829,-36000 }, // UTC-10:00 + { 7839,-32400 }, // UTC-09:00 + { 7849,-28800 }, // UTC-08:00 + { 7859,-25200 }, // UTC-07:00 + { 7869,-21600 }, // UTC-06:00 + { 7879,-18000 }, // UTC-05:00 + { 7889,-16200 }, // UTC-04:30 + { 7899,-14400 }, // UTC-04:00 + { 7909,-12600 }, // UTC-03:30 + { 7919,-10800 }, // UTC-03:00 + { 7929, -7200 }, // UTC-02:00 + { 7939, -3600 }, // UTC-01:00 + { 7949, 0 }, // UTC-00:00 + { 7959, 0 }, // UTC+00:00 + { 7969, 3600 }, // UTC+01:00 + { 7979, 7200 }, // UTC+02:00 + { 7989, 10800 }, // UTC+03:00 + { 7999, 12600 }, // UTC+03:30 + { 8009, 14400 }, // UTC+04:00 + { 8019, 16200 }, // UTC+04:30 + { 8029, 18000 }, // UTC+05:00 + { 8039, 19800 }, // UTC+05:30 + { 8049, 20700 }, // UTC+05:45 + { 8059, 21600 }, // UTC+06:00 + { 8069, 23400 }, // UTC+06:30 + { 8079, 25200 }, // UTC+07:00 + { 8089, 28800 }, // UTC+08:00 + { 8099, 30600 }, // UTC+08:30 + { 8109, 32400 }, // UTC+09:00 + { 8119, 34200 }, // UTC+09:30 + { 8129, 36000 }, // UTC+10:00 + { 8139, 39600 }, // UTC+11:00 + { 8149, 43200 }, // UTC+12:00 + { 8159, 46800 }, // UTC+13:00 + { 8169, 50400 }, // UTC+14:00 + { 0, 0 } // Trailing zeroes +}; + +static const char windowsIdData[] = { +0x41, 0x66, 0x67, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, +0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x61, 0x73, 0x6b, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x65, 0x75, 0x74, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x74, 0x61, 0x69, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x20, 0x53, 0x74, 0x61, 0x6e, +0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, +0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x63, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, +0x6e, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x73, 0x74, +0x72, 0x61, 0x6b, 0x68, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, +0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, +0x69, 0x6d, 0x65, 0x0, 0x41, 0x55, 0x53, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, +0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x75, 0x73, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, +0x6c, 0x20, 0x57, 0x2e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, +0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, +0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x65, 0x72, 0x62, 0x61, 0x69, 0x6a, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, +0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x68, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x6e, 0x67, 0x6c, 0x61, 0x64, 0x65, 0x73, +0x68, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x65, 0x6c, 0x61, +0x72, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x6f, +0x75, 0x67, 0x61, 0x69, 0x6e, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, +0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, +0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x70, 0x65, 0x20, 0x56, +0x65, 0x72, 0x64, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, +0x61, 0x75, 0x63, 0x61, 0x73, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, +0x65, 0x0, 0x43, 0x65, 0x6e, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, +0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x42, 0x72, 0x61, 0x7a, +0x69, 0x6c, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, +0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, +0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72, +0x6f, 0x70, 0x65, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, +0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, +0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, +0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, +0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x43, 0x68, 0x69, 0x6e, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6d, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x75, 0x62, 0x61, 0x20, 0x53, 0x74, +0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x44, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6e, 0x65, +0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x41, 0x66, +0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, +0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, +0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, +0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, +0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, +0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, +0x29, 0x0, 0x45, 0x67, 0x79, 0x70, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, +0x65, 0x0, 0x45, 0x6b, 0x61, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, +0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x46, 0x69, 0x6a, 0x69, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x46, 0x4c, 0x45, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, +0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, +0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x4d, 0x54, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, +0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x77, 0x69, 0x63, 0x68, +0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x54, 0x42, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x48, 0x61, 0x69, 0x74, 0x69, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x48, 0x61, 0x77, 0x61, 0x69, 0x69, 0x61, +0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x6e, 0x64, 0x69, +0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x72, 0x61, 0x6e, +0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x73, 0x72, 0x61, 0x65, +0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4a, 0x6f, 0x72, 0x64, +0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4b, 0x61, 0x6c, +0x69, 0x6e, 0x69, 0x6e, 0x67, 0x72, 0x61, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x4b, 0x6f, 0x72, 0x65, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x4c, 0x69, 0x62, 0x79, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x4c, 0x69, 0x6e, 0x65, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, +0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4c, 0x6f, 0x72, 0x64, 0x20, 0x48, 0x6f, 0x77, 0x65, 0x20, +0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x67, 0x61, 0x64, 0x61, +0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x67, 0x61, +0x6c, 0x6c, 0x61, 0x6e, 0x65, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, +0x0, 0x4d, 0x61, 0x72, 0x71, 0x75, 0x65, 0x73, 0x61, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, +0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, +0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x45, 0x61, 0x73, 0x74, +0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x6f, 0x6e, 0x74, 0x65, +0x76, 0x69, 0x64, 0x65, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, +0x4d, 0x6f, 0x72, 0x6f, 0x63, 0x63, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, +0x65, 0x0, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, +0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, +0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x79, 0x61, +0x6e, 0x6d, 0x61, 0x72, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, +0x2e, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, +0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x70, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, 0x61, 0x6c, 0x61, +0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x77, +0x66, 0x6f, 0x75, 0x6e, 0x64, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, +0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, +0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x45, 0x61, 0x73, +0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74, +0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, +0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x4b, 0x6f, 0x72, 0x65, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, +0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4f, 0x6d, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, +0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x41, 0x20, 0x53, 0x74, 0x61, +0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, +0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, +0x63, 0x6f, 0x29, 0x0, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, +0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x72, 0x61, 0x67, 0x75, 0x61, 0x79, 0x20, 0x53, 0x74, 0x61, 0x6e, +0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x52, 0x6f, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x53, 0x74, +0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, +0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x33, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x30, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x31, 0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x45, 0x61, 0x73, 0x74, +0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41, +0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x57, 0x65, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, 0x69, 0x6e, 0x74, 0x20, 0x50, 0x69, 0x65, 0x72, 0x72, 0x65, +0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, 0x6b, 0x68, 0x61, +0x6c, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, +0x6d, 0x6f, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, +0x6f, 0x20, 0x54, 0x6f, 0x6d, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, +0x0, 0x53, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x76, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x53, 0x45, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, +0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, +0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, +0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x72, 0x69, 0x20, +0x4c, 0x61, 0x6e, 0x6b, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, +0x53, 0x75, 0x64, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, +0x53, 0x79, 0x72, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, +0x54, 0x61, 0x69, 0x70, 0x65, 0x69, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, +0x0, 0x54, 0x61, 0x73, 0x6d, 0x61, 0x6e, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, +0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x63, 0x61, 0x6e, 0x74, 0x69, 0x6e, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x6b, 0x79, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x6d, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x62, 0x61, 0x69, 0x6b, 0x61, 0x6c, 0x20, +0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x75, 0x72, 0x6b, 0x65, 0x79, +0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x75, 0x72, 0x6b, 0x73, +0x20, 0x41, 0x6e, 0x64, 0x20, 0x43, 0x61, 0x69, 0x63, 0x6f, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, +0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x20, 0x53, 0x74, +0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, +0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20, +0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x31, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x39, 0x0, 0x55, 0x54, 0x43, +0x2d, 0x30, 0x38, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x32, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, +0x32, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x33, 0x0, 0x56, 0x65, 0x6e, 0x65, 0x7a, 0x75, 0x65, 0x6c, 0x61, 0x20, 0x53, +0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, +0x73, 0x74, 0x6f, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, +0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, +0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72, +0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, +0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, +0x65, 0x0, 0x57, 0x2e, 0x20, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, +0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, +0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74, 0x20, 0x42, 0x61, 0x6e, +0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74, +0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, +0x6d, 0x65, 0x0, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, +0x54, 0x69, 0x6d, 0x65, 0x0 +}; + +static const char ianaIdData[] = { +0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x76, 0x64, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x61, +0x72, 0x61, 0x77, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x2d, 0x61, 0x75, +0x2d, 0x50, 0x72, 0x69, 0x6e, 0x63, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x68, 0x61, 0x6e, 0x67, 0x68, 0x61, +0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x42, 0x61, 0x72, 0x74, 0x68, 0x65, 0x6c, +0x65, 0x6d, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x68, 0x6b, 0x65, 0x6b, 0x0, 0x41, 0x6e, 0x74, +0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x79, 0x6f, 0x77, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, +0x63, 0x2f, 0x43, 0x68, 0x61, 0x74, 0x68, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, +0x6e, 0x74, 0x73, 0x65, 0x72, 0x72, 0x61, 0x74, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42, +0x72, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4c, 0x69, +0x6e, 0x64, 0x65, 0x6d, 0x61, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x34, 0x0, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x41, 0x73, 0x68, 0x67, 0x61, 0x62, 0x61, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x4e, 0x6f, 0x72, 0x6f, 0x6e, 0x68, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x73, 0x74, +0x61, 0x5f, 0x52, 0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x6d, 0x65, 0x72, 0x61, +0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x65, 0x79, 0x0, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x4a, 0x61, 0x6b, 0x61, 0x72, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x6f, 0x6e, 0x74, +0x69, 0x61, 0x6e, 0x61, 0x6b, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x6f, 0x74, +0x68, 0x65, 0x72, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x72, 0x6e, 0x61, 0x75, 0x6c, 0x0, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x5f, 0x50, 0x72, 0x69, 0x6e, 0x63, 0x65, 0x73, 0x0, +0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x69, 0x63, 0x61, 0x0, 0x50, 0x61, 0x63, +0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f, 0x4d, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79, 0x0, 0x41, 0x75, +0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, +0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4d, 0x65, 0x6c, 0x62, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x45, 0x6c, 0x5f, 0x41, 0x61, 0x69, 0x75, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, +0x61, 0x6f, 0x5f, 0x50, 0x61, 0x75, 0x6c, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x61, 0x6a, +0x75, 0x72, 0x6f, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x77, 0x61, 0x6a, 0x61, 0x6c, 0x65, 0x69, +0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x75, 0x72, 0x79, 0x0, +0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x70, 0x75, 0x74, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x52, 0x69, 0x6f, 0x5f, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x45, 0x69, 0x72, 0x75, 0x6e, 0x65, 0x70, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x61, 0x72, +0x69, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x64, 0x6d, 0x6f, 0x6e, 0x74, 0x6f, 0x6e, 0x20, +0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x5f, 0x42, 0x61, +0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x75, 0x76, 0x69, 0x6b, 0x20, 0x41, 0x6d, 0x65, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x59, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6b, 0x6e, 0x69, 0x66, 0x65, 0x0, 0x41, 0x73, 0x69, +0x61, 0x2f, 0x52, 0x61, 0x6e, 0x67, 0x6f, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, +0x69, 0x61, 0x62, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x70, 0x6f, 0x5f, 0x47, +0x72, 0x61, 0x6e, 0x64, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x61, 0x64, 0x75, 0x7a, 0x0, 0x45, +0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x48, 0x65, 0x6c, 0x73, 0x69, 0x6e, 0x6b, 0x69, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, +0x74, 0x69, 0x63, 0x2f, 0x53, 0x74, 0x61, 0x6e, 0x6c, 0x65, 0x79, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, +0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x30, 0x0, 0x45, +0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61, 0x67, 0x72, 0x65, 0x62, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, +0x74, 0x6d, 0x61, 0x6e, 0x64, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6f, 0x66, 0x69, 0x61, 0x0, +0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x75, 0x73, 0x63, 0x61, 0x74, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, +0x61, 0x6c, 0x64, 0x69, 0x76, 0x65, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61, 0x64, 0x72, 0x69, +0x64, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x65, 0x75, 0x74, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x43, 0x6f, 0x6e, 0x61, 0x6b, 0x72, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x64, 0x65, 0x6e, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x69, 0x6d, 0x66, 0x65, 0x72, 0x6f, 0x70, 0x6f, 0x6c, 0x0, 0x41, 0x66, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x62, 0x61, 0x62, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x72, 0x63, 0x74, 0x69, 0x63, 0x2f, +0x4c, 0x6f, 0x6e, 0x67, 0x79, 0x65, 0x61, 0x72, 0x62, 0x79, 0x65, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, +0x67, 0x68, 0x64, 0x61, 0x64, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x69, 0x64, 0x77, 0x61, 0x79, +0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x77, 0x61, 0x69, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x46, 0x72, 0x65, 0x65, 0x74, 0x6f, 0x77, 0x6e, 0x0, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x0, 0x50, 0x61, 0x63, +0x69, 0x66, 0x69, 0x63, 0x2f, 0x52, 0x61, 0x72, 0x6f, 0x74, 0x6f, 0x6e, 0x67, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x42, 0x72, 0x61, 0x7a, 0x7a, 0x61, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x50, 0x75, 0x6e, 0x74, 0x61, 0x5f, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, +0x4d, 0x54, 0x2b, 0x31, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x56, 0x61, 0x6e, 0x63, 0x6f, 0x75, +0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6f, 0x72, 0x73, 0x65, 0x0, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x59, 0x65, 0x72, 0x65, 0x76, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, +0x6e, 0x61, 0x63, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x73, 0x61, 0x6b, 0x61, 0x0, 0x45, +0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x55, 0x7a, +0x68, 0x67, 0x6f, 0x72, 0x6f, 0x64, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61, 0x70, 0x6f, 0x72, 0x6f, +0x7a, 0x68, 0x79, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x75, 0x6e, 0x63, 0x69, 0x6f, +0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6d, 0x6d, 0x61, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x41, 0x72, 0x61, 0x67, 0x75, 0x61, 0x69, 0x6e, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x65, 0x68, 0x72, +0x61, 0x6e, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x76, 0x69, 0x73, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x72, 0x61, 0x67, 0x75, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f, 0x6f, 0x66, 0x5f, 0x53, 0x70, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, +0x63, 0x61, 0x2f, 0x47, 0x61, 0x62, 0x6f, 0x72, 0x6f, 0x6e, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, +0x35, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x79, 0x61, 0x71, 0x75, 0x69, 0x6c, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x74, 0x68, 0x65, 0x6e, 0x73, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, +0x2f, 0x41, 0x6e, 0x74, 0x61, 0x6e, 0x61, 0x6e, 0x61, 0x72, 0x69, 0x76, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, +0x63, 0x2f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x74, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, +0x61, 0x6d, 0x61, 0x69, 0x63, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x6f, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65, 0x6c, 0x67, 0x72, 0x61, 0x64, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, +0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x6f, 0x73, 0x74, 0x61, 0x6e, 0x61, +0x79, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x33, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x43, 0x6f, 0x72, 0x61, 0x6c, 0x5f, 0x48, 0x61, 0x72, 0x62, 0x6f, 0x75, 0x72, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, +0x6e, 0x2f, 0x43, 0x68, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x48, +0x6f, 0x62, 0x61, 0x72, 0x74, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x72, +0x69, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x75, 0x65, 0x72, 0x74, 0x6f, 0x5f, 0x52, 0x69, +0x63, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4b, 0x69, 0x74, 0x74, 0x73, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x75, 0x72, 0x69, 0x63, 0x68, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, +0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x65, 0x6e, 0x67, 0x6f, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x65, 0x76, 0x61, 0x79, +0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x6e, 0x61, 0x70, 0x65, 0x20, 0x50, 0x61, 0x63, 0x69, +0x66, 0x69, 0x63, 0x2f, 0x4b, 0x6f, 0x73, 0x72, 0x61, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, +0x61, 0x6d, 0x62, 0x69, 0x65, 0x72, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x61, 0x6d, 0x65, 0x79, +0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x69, 0x6c, 0x6c, 0x6f, 0x0, +0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x67, 0x61, 0x64, 0x69, 0x73, 0x68, 0x75, 0x0, 0x45, 0x74, 0x63, +0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x37, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x42, 0x65, 0x72, 0x6d, +0x75, 0x64, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x72, 0x61, 0x72, 0x65, 0x0, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x61, 0x75, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6c, 0x61, +0x62, 0x6f, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x54, 0x61, 0x6c, 0x6c, 0x69, 0x6e, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x44, 0x61, 0x6b, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x61, 0x75, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x6f, 0x62, 0x65, +0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x74, 0x79, 0x72, 0x61, 0x75, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x79, +0x7a, 0x79, 0x6c, 0x6f, 0x72, 0x64, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x72, 0x75, 0x6d, 0x71, 0x69, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x52, 0x6f, 0x6d, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x49, +0x73, 0x6c, 0x65, 0x5f, 0x6f, 0x66, 0x5f, 0x4d, 0x61, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, +0x72, 0x5f, 0x65, 0x73, 0x5f, 0x53, 0x61, 0x6c, 0x61, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x54, 0x68, 0x75, 0x6c, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x6e, 0x6d, 0x61, 0x72, +0x6b, 0x73, 0x68, 0x61, 0x76, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65, 0x67, 0x69, 0x6e, +0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x77, 0x69, 0x66, 0x74, 0x5f, 0x43, 0x75, 0x72, 0x72, +0x65, 0x6e, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79, +0x73, 0x75, 0x6e, 0x64, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x61, 0x62, 0x6c, 0x61, 0x6e, +0x63, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72, 0x61, 0x6e, 0x64, 0x5f, 0x54, 0x75, 0x72, +0x6b, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x6a, 0x75, 0x6c, 0x0, 0x41, 0x66, 0x72, 0x69, +0x63, 0x61, 0x2f, 0x4e, 0x64, 0x6a, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4a, 0x65, 0x72, +0x75, 0x73, 0x61, 0x6c, 0x65, 0x6d, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, +0x6c, 0x6d, 0x65, 0x72, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x45, 0x75, 0x63, 0x6c, 0x61, +0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x75, 0x61, 0x0, 0x41, 0x73, 0x69, +0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x69, 0x6c, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x53, 0x61, 0x69, +0x70, 0x61, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x69, 0x72, 0x6f, 0x0, 0x45, 0x75, 0x72, +0x6f, 0x70, 0x65, 0x2f, 0x42, 0x72, 0x75, 0x73, 0x73, 0x65, 0x6c, 0x73, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, +0x69, 0x63, 0x61, 0x2f, 0x4d, 0x63, 0x4d, 0x75, 0x72, 0x64, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, +0x75, 0x63, 0x68, 0x61, 0x72, 0x65, 0x73, 0x74, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x32, 0x0, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, 0x59, 0x6f, 0x72, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, +0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x74, 0x72, 0x6f, 0x69, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x50, 0x65, 0x74, 0x65, 0x72, 0x73, 0x62, 0x75, 0x72, 0x67, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x69, 0x6e, 0x63, 0x65, +0x6e, 0x6e, 0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, +0x2f, 0x57, 0x69, 0x6e, 0x61, 0x6d, 0x61, 0x63, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x65, 0x6e, +0x74, 0x75, 0x63, 0x6b, 0x79, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x69, 0x63, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x41, 0x6d, 0x65, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x75, 0x69, 0x73, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, +0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x6f, 0x2d, 0x4e, 0x6f, 0x76, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x49, +0x72, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61, +0x74, 0x61, 0x72, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x68, 0x6f, 0x69, 0x62, 0x61, 0x6c, 0x73, 0x61, 0x6e, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x65, 0x6e, 0x6e, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x54, 0x6f, 0x72, 0x6f, 0x6e, 0x74, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x71, +0x61, 0x6c, 0x75, 0x69, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x72, 0x65, +0x61, 0x6c, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x70, 0x69, 0x67, 0x6f, 0x6e, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e, 0x67, 0x6e, 0x69, 0x72, 0x74, 0x75, 0x6e, 0x67, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x68, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x5f, 0x42, 0x61, 0x79, 0x0, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x69, 0x6a, 0x6b, 0x0, 0x50, 0x61, +0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x61, 0x75, 0x72, 0x75, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, +0x63, 0x61, 0x2f, 0x44, 0x75, 0x6d, 0x6f, 0x6e, 0x74, 0x44, 0x55, 0x72, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x4d, 0x61, 0x67, 0x61, 0x64, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4f, 0x73, +0x6c, 0x6f, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x39, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, +0x2f, 0x47, 0x61, 0x6c, 0x61, 0x70, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, +0x6a, 0x75, 0x6d, 0x62, 0x75, 0x72, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69, +0x66, 0x61, 0x78, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6c, 0x61, 0x63, 0x65, 0x5f, 0x42, 0x61, +0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6f, 0x6f, 0x73, 0x65, 0x5f, 0x42, 0x61, 0x79, 0x20, +0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x63, 0x74, 0x6f, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, +0x47, 0x4d, 0x54, 0x2d, 0x31, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72, 0x65, 0x6e, 0x61, +0x64, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x6f, 0x75, 0x6d, 0x65, 0x61, 0x0, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6e, 0x63, 0x75, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, +0x75, 0x6e, 0x65, 0x61, 0x75, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x6d, 0x65, 0x20, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x69, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6f, 0x64, +0x74, 0x68, 0x61, 0x62, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x73, 0x61, 0x75, 0x0, 0x45, +0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4d, 0x61, 0x72, 0x69, 0x6e, 0x6f, 0x0, 0x45, 0x75, 0x72, +0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x64, 0x61, 0x70, 0x65, 0x73, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x54, 0x65, 0x67, 0x75, 0x63, 0x69, 0x67, 0x61, 0x6c, 0x70, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, +0x69, 0x61, 0x2f, 0x4c, 0x6f, 0x72, 0x64, 0x5f, 0x48, 0x6f, 0x77, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, +0x2d, 0x33, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x62, 0x72, 0x65, 0x76, 0x69, 0x6c, 0x6c, 0x65, +0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x56, 0x69, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x6f, 0x6e, 0x64, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, +0x2d, 0x31, 0x32, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6e, 0x0, 0x41, +0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x52, 0x65, 0x79, 0x6b, 0x6a, 0x61, 0x76, 0x69, 0x6b, 0x0, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x76, 0x61, 0x6e, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x4e, 0x61, 0x73, 0x73, 0x61, 0x75, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x53, 0x6f, 0x75, +0x74, 0x68, 0x5f, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, +0x6c, 0x5f, 0x53, 0x61, 0x6c, 0x76, 0x61, 0x64, 0x6f, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, +0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, +0x6e, 0x61, 0x2f, 0x4b, 0x6e, 0x6f, 0x78, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, +0x61, 0x6e, 0x61, 0x2f, 0x54, 0x65, 0x6c, 0x6c, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x65, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x42, 0x65, 0x75, 0x6c, 0x61, 0x68, 0x20, +0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, +0x2f, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, +0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, 0x53, 0x61, 0x6c, 0x65, 0x6d, 0x0, 0x45, +0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x34, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e, +0x61, 0x6d, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x67, 0x6f, 0x74, 0x61, 0x0, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x41, 0x6d, 0x65, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x7a, 0x61, 0x74, 0x6c, 0x61, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, +0x63, 0x2f, 0x46, 0x75, 0x6e, 0x61, 0x66, 0x75, 0x74, 0x69, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47, 0x69, +0x62, 0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x6d, 0x73, 0x6b, 0x0, 0x41, 0x66, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x72, 0x69, 0x70, 0x6f, 0x6c, 0x69, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, +0x69, 0x63, 0x61, 0x2f, 0x56, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, +0x72, 0x75, 0x62, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x65, 0x69, 0x72, 0x75, 0x74, 0x0, 0x45, 0x74, 0x63, +0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x38, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x69, 0x6e, 0x64, 0x68, 0x6f, +0x65, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x72, 0x61, 0x63, 0x61, 0x73, 0x0, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x54, 0x68, 0x6f, 0x6d, 0x61, 0x73, 0x0, 0x45, 0x74, 0x63, +0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x74, 0x69, 0x67, +0x75, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x6d, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, +0x70, 0x65, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x65, 0x68, 0x61, 0x6d, 0x6e, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, +0x63, 0x2f, 0x53, 0x74, 0x5f, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, +0x54, 0x72, 0x75, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x0, +0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x6f, 0x5f, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, +0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6c, 0x61, 0x6e, 0x74, 0x79, 0x72, 0x65, 0x0, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x20, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x5f, 0x42, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x61, 0x73, +0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x72, 0x69, 0x64, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, +0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x72, 0x72, 0x65, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, +0x75, 0x61, 0x6c, 0x61, 0x5f, 0x4c, 0x75, 0x6d, 0x70, 0x75, 0x72, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x63, +0x68, 0x69, 0x6e, 0x67, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x46, 0x69, 0x6a, 0x69, 0x0, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x68, 0x6f, 0x65, 0x6e, 0x69, 0x78, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, +0x68, 0x69, 0x6d, 0x70, 0x68, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61, 0x6c, 0x74, 0x61, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, +0x2f, 0x4b, 0x69, 0x72, 0x6f, 0x76, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x6f, 0x6c, 0x67, 0x6f, 0x67, +0x72, 0x61, 0x64, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x69, 0x71, +0x75, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x32, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, +0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x68, 0x61, 0x6e, 0x64, 0x79, 0x67, 0x61, +0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x62, 0x75, 0x6c, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x20, +0x45, 0x74, 0x63, 0x2f, 0x55, 0x54, 0x43, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x74, 0x61, +0x6d, 0x6f, 0x72, 0x6f, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x34, 0x0, 0x49, 0x6e, 0x64, 0x69, +0x61, 0x6e, 0x2f, 0x43, 0x68, 0x72, 0x69, 0x73, 0x74, 0x6d, 0x61, 0x73, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, +0x63, 0x2f, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x0, 0x41, +0x73, 0x69, 0x61, 0x2f, 0x44, 0x68, 0x61, 0x6b, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x69, +0x6e, 0x6e, 0x69, 0x70, 0x65, 0x67, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x61, 0x69, 0x6e, 0x79, +0x5f, 0x52, 0x69, 0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x61, 0x6e, 0x6b, 0x69, +0x6e, 0x5f, 0x49, 0x6e, 0x6c, 0x65, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65, 0x73, 0x6f, +0x6c, 0x75, 0x74, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x35, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, +0x69, 0x63, 0x2f, 0x46, 0x61, 0x6b, 0x61, 0x6f, 0x66, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f, +0x73, 0x69, 0x62, 0x69, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x65, 0x62, 0x72, 0x6f, 0x6e, 0x20, +0x41, 0x73, 0x69, 0x61, 0x2f, 0x47, 0x61, 0x7a, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x49, 0x73, 0x74, +0x61, 0x6e, 0x62, 0x75, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x64, 0x61, 0x6b, 0x0, 0x45, +0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x37, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e, +0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x69, 0x73, 0x65, 0x0, 0x41, 0x66, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x64, 0x64, 0x69, 0x73, 0x5f, 0x41, 0x62, 0x61, 0x62, 0x61, 0x0, 0x45, 0x75, 0x72, +0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6d, 0x73, 0x74, 0x65, 0x72, 0x64, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x67, 0x6f, 0x74, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x69, 0x73, +0x62, 0x6f, 0x6e, 0x20, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x4d, 0x61, 0x64, 0x65, 0x69, 0x72, 0x61, +0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x6c, 0x6e, 0x69, 0x75, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, +0x70, 0x65, 0x2f, 0x42, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x73, +0x69, 0x6e, 0x67, 0x65, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x61, 0x72, 0x71, 0x75, 0x65, +0x73, 0x61, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e, 0x6f, 0x79, 0x61, 0x72, 0x73, 0x6b, +0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f, 0x6b, 0x75, 0x7a, 0x6e, 0x65, 0x74, 0x73, 0x6b, 0x0, 0x50, +0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x69, 0x72, 0x69, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x0, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x69, 0x71, 0x75, 0x65, 0x6c, 0x6f, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, +0x65, 0x2f, 0x44, 0x75, 0x62, 0x6c, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x52, 0x69, 0x79, 0x61, 0x64, 0x68, +0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x69, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6e, +0x61, 0x64, 0x79, 0x72, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x6f, 0x6d, 0x6f, 0x72, 0x6f, 0x0, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x61, 0x63, 0x61, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, +0x65, 0x2f, 0x43, 0x68, 0x69, 0x73, 0x69, 0x6e, 0x61, 0x75, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, +0x65, 0x6c, 0x69, 0x7a, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x6f, 0x68, 0x61, 0x6e, 0x6e, 0x65, +0x73, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74, +0x6f, 0x6b, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x73, 0x74, 0x2d, 0x4e, 0x65, 0x72, 0x61, 0x0, 0x45, 0x74, 0x63, +0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x32, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x61, 0x6d, 0x61, 0x73, 0x63, 0x75, 0x73, +0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x79, 0x65, 0x6e, 0x6e, 0x65, 0x0, 0x41, 0x66, 0x72, +0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x75, 0x61, 0x6b, 0x63, 0x68, 0x6f, 0x74, 0x74, 0x0, 0x45, 0x53, 0x54, 0x35, 0x45, +0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x0, 0x50, 0x61, 0x63, +0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, +0x33, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x73, 0x74, 0x72, 0x61, 0x6b, 0x68, 0x61, 0x6e, 0x20, 0x45, +0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x55, 0x6c, 0x79, 0x61, 0x6e, 0x6f, 0x76, 0x73, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, +0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x61, 0x75, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, +0x6f, 0x61, 0x5f, 0x56, 0x69, 0x73, 0x74, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, +0x74, 0x6f, 0x5f, 0x56, 0x65, 0x6c, 0x68, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x69, 0x6e, 0x73, +0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4c, 0x75, 0x63, 0x69, 0x61, 0x0, 0x41, +0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x61, 0x6e, 0x64, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x4c, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6e, 0x64, 0x6f, 0x72, 0x72, 0x61, +0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x61, 0x6c, 0x69, 0x6e, 0x69, 0x6e, 0x67, 0x72, 0x61, 0x64, 0x0, +0x4d, 0x53, 0x54, 0x37, 0x4d, 0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x67, 0x75, +0x69, 0x6c, 0x6c, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x57, 0x61, 0x6c, 0x6c, 0x69, 0x73, 0x0, +0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x75, 0x62, 0x61, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, +0x61, 0x79, 0x6d, 0x61, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x67, 0x6b, 0x6f, 0x6b, 0x0, 0x50, +0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x75, 0x61, 0x64, 0x61, 0x6c, 0x63, 0x61, 0x6e, 0x61, 0x6c, 0x0, 0x41, +0x73, 0x69, 0x61, 0x2f, 0x54, 0x62, 0x69, 0x6c, 0x69, 0x73, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x68, 0x6e, +0x6f, 0x6d, 0x5f, 0x50, 0x65, 0x6e, 0x68, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e, +0x74, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x6e, 0x64, 0x0, 0x41, 0x73, 0x69, +0x61, 0x2f, 0x46, 0x61, 0x6d, 0x61, 0x67, 0x75, 0x73, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x69, 0x63, +0x6f, 0x73, 0x69, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x64, 0x65, 0x6c, 0x6f, +0x75, 0x70, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x69, 0x67, 0x6f, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, +0x2f, 0x43, 0x68, 0x69, 0x74, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x72, 0x6f, 0x76, +0x69, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x6f, 0x72, 0x74, 0x6f, 0x6c, 0x61, 0x0, 0x41, +0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x6e, 0x73, 0x68, 0x61, 0x73, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, +0x53, 0x61, 0x6b, 0x68, 0x61, 0x6c, 0x69, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x57, 0x61, 0x6b, +0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x63, 0x63, 0x72, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, +0x69, 0x63, 0x2f, 0x41, 0x75, 0x63, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, +0x61, 0x2f, 0x41, 0x64, 0x65, 0x6c, 0x61, 0x69, 0x64, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, +0x2f, 0x42, 0x72, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x48, 0x69, 0x6c, 0x6c, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, +0x2f, 0x54, 0x61, 0x68, 0x69, 0x74, 0x69, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4f, 0x75, 0x61, 0x67, 0x61, +0x64, 0x6f, 0x75, 0x67, 0x6f, 0x75, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4b, 0x65, 0x72, 0x67, 0x75, 0x65, +0x6c, 0x65, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x38, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, +0x2f, 0x54, 0x69, 0x72, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x69, 0x70, 0x65, 0x69, 0x0, +0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x43, 0x6f, 0x70, 0x65, 0x6e, 0x68, 0x61, 0x67, 0x65, 0x6e, 0x0, 0x41, 0x66, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x70, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x6f, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6b, 0x75, 0x0, +0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x6e, 0x67, 0x5f, 0x4b, 0x6f, 0x6e, 0x67, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, +0x4a, 0x61, 0x79, 0x61, 0x70, 0x75, 0x72, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x48, 0x6f, 0x6e, +0x6f, 0x6c, 0x75, 0x6c, 0x75, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x61, 0x69, 0x72, 0x6f, 0x62, 0x69, +0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x75, 0x61, 0x6d, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x4a, 0x75, 0x62, 0x61, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x46, 0x61, 0x65, 0x72, 0x6f, +0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x72, 0x65, 0x64, 0x6e, 0x65, 0x6b, 0x6f, 0x6c, 0x79, 0x6d, 0x73, 0x6b, +0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x69, 0x75, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x41, 0x6c, 0x67, 0x69, 0x65, 0x72, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x69, 0x6c, 0x69, 0x0, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72, 0x74, 0x61, 0x6c, 0x65, 0x7a, 0x61, 0x20, 0x41, 0x6d, 0x65, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x65, 0x6c, 0x65, 0x6d, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, +0x61, 0x63, 0x65, 0x69, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65, 0x63, 0x69, 0x66, 0x65, +0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x61, 0x72, 0x65, 0x6d, 0x0, 0x45, 0x75, +0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x6f, 0x64, 0x67, 0x6f, 0x72, 0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x44, 0x6f, 0x75, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x69, 0x65, 0x6e, 0x74, 0x69, +0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x69, 0x6a, 0x75, 0x61, 0x6e, 0x61, 0x20, +0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x61, 0x5f, 0x49, 0x73, 0x61, 0x62, 0x65, 0x6c, +0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x6d, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, +0x52, 0x69, 0x67, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6c, 0x61, 0x6e, 0x63, 0x2d, 0x53, +0x61, 0x62, 0x6c, 0x6f, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x62, 0x65, 0x0, +0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x0, 0x41, 0x73, 0x69, +0x61, 0x2f, 0x54, 0x6f, 0x6b, 0x79, 0x6f, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x36, 0x0, 0x45, 0x75, +0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x72, 0x61, 0x6a, 0x65, 0x76, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, +0x2f, 0x42, 0x72, 0x61, 0x74, 0x69, 0x73, 0x6c, 0x61, 0x76, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x43, 0x61, 0x6e, 0x61, +0x72, 0x79, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x42, 0x6f, 0x75, 0x67, 0x61, 0x69, 0x6e, 0x76, 0x69, +0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x72, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x6d, 0x65, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x74, 0x65, 0x6d, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, +0x63, 0x61, 0x2f, 0x4c, 0x61, 0x5f, 0x50, 0x61, 0x7a, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x79, 0x6f, 0x6e, 0x67, +0x79, 0x61, 0x6e, 0x67, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x67, 0x6f, 0x5f, 0x50, 0x61, +0x67, 0x6f, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x52, 0x65, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x0, 0x41, 0x66, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x73, 0x65, 0x72, 0x75, 0x0, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x0, +0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x39, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x75, 0x6e, +0x69, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6f, 0x5f, 0x54, 0x6f, 0x6d, 0x65, 0x0, 0x45, +0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x72, 0x61, 0x74, 0x6f, 0x76, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x4b, 0x68, 0x61, 0x72, 0x74, 0x6f, 0x75, 0x6d, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4a, 0x65, 0x72, +0x73, 0x65, 0x79, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x71, 0x75, +0x61, 0x72, 0x69, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4f, 0x6a, 0x69, 0x6e, 0x61, 0x67, 0x61, +0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x43, 0x61, 0x70, 0x65, 0x5f, 0x56, 0x65, 0x72, 0x64, 0x65, +0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x61, 0x6b, 0x61, 0x73, 0x73, 0x61, 0x72, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, +0x65, 0x2f, 0x4c, 0x6a, 0x75, 0x62, 0x6c, 0x6a, 0x61, 0x6e, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47, +0x75, 0x65, 0x72, 0x6e, 0x73, 0x65, 0x79, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d, +0x61, 0x77, 0x73, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73, +0x5f, 0x41, 0x69, 0x72, 0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, +0x74, 0x69, 0x6e, 0x61, 0x2f, 0x4c, 0x61, 0x5f, 0x52, 0x69, 0x6f, 0x6a, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, +0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x52, 0x69, 0x6f, 0x5f, 0x47, 0x61, 0x6c, 0x6c, +0x65, 0x67, 0x6f, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, +0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6c, 0x74, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, +0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, +0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4c, 0x75, +0x69, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, +0x2f, 0x54, 0x75, 0x63, 0x75, 0x6d, 0x61, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, +0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x55, 0x73, 0x68, 0x75, 0x61, 0x69, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, +0x63, 0x61, 0x2f, 0x43, 0x61, 0x74, 0x61, 0x6d, 0x61, 0x72, 0x63, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x43, 0x6f, 0x72, 0x64, 0x6f, 0x62, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x75, 0x6a, +0x75, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x64, 0x6f, 0x7a, 0x61, 0x0, 0x50, +0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x41, 0x70, 0x69, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, +0x61, 0x6e, 0x67, 0x75, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x6f, 0x6d, 0x73, 0x6b, 0x0, 0x50, 0x61, 0x63, +0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x6c, 0x61, 0x75, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, +0x2f, 0x44, 0x61, 0x72, 0x77, 0x69, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x69, 0x74, 0x63, +0x61, 0x69, 0x72, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x0, 0x50, 0x61, 0x63, +0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x74, 0x61, 0x70, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, +0x65, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x50, +0x65, 0x72, 0x74, 0x68, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x57, 0x61, 0x72, 0x73, 0x61, 0x77, 0x0, 0x49, +0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x6f, 0x63, 0x6f, 0x73, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, +0x61, 0x68, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x73, 0x5f, 0x41, 0x6e, 0x67, 0x65, +0x6c, 0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x74, 0x6c, 0x61, 0x6b, 0x61, 0x74, +0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x74, 0x74, 0x61, 0x0, 0x41, 0x66, 0x72, +0x69, 0x63, 0x61, 0x2f, 0x41, 0x62, 0x69, 0x64, 0x6a, 0x61, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, +0x36, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x66, 0x61, 0x74, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, +0x70, 0x65, 0x2f, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x6f, 0x75, 0x72, 0x67, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x42, 0x61, 0x6d, 0x61, 0x6b, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x67, 0x61, 0x6c, +0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x61, 0x74, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, +0x72, 0x61, 0x63, 0x68, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x30, 0x0, 0x41, 0x66, 0x72, +0x69, 0x63, 0x61, 0x2f, 0x44, 0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x65, +0x6b, 0x61, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x5f, 0x43, 0x72, 0x65, 0x65, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x43, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72, +0x74, 0x5f, 0x4e, 0x65, 0x6c, 0x73, 0x6f, 0x6e, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x79, 0x6f, +0x74, 0x74, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6b, 0x6f, 0x70, 0x6a, 0x65, 0x0, 0x41, 0x73, +0x69, 0x61, 0x2f, 0x53, 0x65, 0x6f, 0x75, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x72, +0x61, 0x6d, 0x61, 0x72, 0x69, 0x62, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x74, 0x6f, 0x63, 0x6b, +0x68, 0x6f, 0x6c, 0x6d, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x62, 0x75, 0x6d, 0x62, 0x61, 0x73, +0x68, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, +0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73, 0x5f, 0x41, 0x69, 0x72, 0x65, +0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x73, 0x74, 0x72, 0x61, 0x6b, 0x68, 0x61, 0x6e, 0x0, 0x41, +0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69, 0x66, 0x61, 0x78, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, +0x61, 0x6c, 0x69, 0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, +0x52, 0x65, 0x67, 0x69, 0x6e, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x41, 0x64, 0x65, +0x6c, 0x61, 0x69, 0x64, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x0, 0x41, 0x6d, +0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x69, 0x61, 0x62, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, +0x2f, 0x43, 0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42, +0x72, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, +0x59, 0x6f, 0x72, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x0, 0x41, 0x6d, 0x65, +0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, +0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e, +0x6f, 0x79, 0x61, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x73, 0x5f, 0x41, +0x6e, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x69, 0x6a, 0x75, 0x61, +0x6e, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61, 0x0, 0x45, 0x75, +0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, +0x61, 0x2f, 0x48, 0x6f, 0x62, 0x61, 0x72, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62, +0x61, 0x61, 0x74, 0x61, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, +0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, +0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, +0x65, 0x72, 0x6c, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e, 0x74, 0x0, +0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, 0x65, 0x62, 0x72, 0x6f, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x61, 0x6b, +0x75, 0x74, 0x73, 0x6b, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x31, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x31, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x38, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x36, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x30, 0x35, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x33, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x33, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2d, 0x30, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x34, 0x35, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x33, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x31, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, +0x54, 0x43, 0x2b, 0x31, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x34, 0x3a, 0x30, 0x30, 0x0 +}; +// GENERATED PART ENDS HERE + +QT_END_NAMESPACE + +#endif // QTIMEZONEPRIVATE_DATA_P_H diff --git a/src/corelib/tools/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp index 5570ce7571..5570ce7571 100644 --- a/src/corelib/tools/qtimezoneprivate_icu.cpp +++ b/src/corelib/time/qtimezoneprivate_icu.cpp diff --git a/src/corelib/tools/qtimezoneprivate_mac.mm b/src/corelib/time/qtimezoneprivate_mac.mm index d3c4fbe5da..d3c4fbe5da 100644 --- a/src/corelib/tools/qtimezoneprivate_mac.mm +++ b/src/corelib/time/qtimezoneprivate_mac.mm diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/time/qtimezoneprivate_p.h index 24a9a00f11..5f6491ef81 100644 --- a/src/corelib/tools/qtimezoneprivate_p.h +++ b/src/corelib/time/qtimezoneprivate_p.h @@ -53,7 +53,7 @@ // #include "qtimezone.h" -#include "qlocale_p.h" +#include "private/qlocale_p.h" #include "qvector.h" #if QT_CONFIG(icu) @@ -282,9 +282,9 @@ struct QTzTransitionRule quint8 abbreviationIndex; }; Q_DECLARE_TYPEINFO(QTzTransitionRule, Q_PRIMITIVE_TYPE); -Q_DECL_CONSTEXPR inline bool operator==(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator==(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) noexcept { return lhs.stdOffset == rhs.stdOffset && lhs.dstOffset == rhs.dstOffset && lhs.abbreviationIndex == rhs.abbreviationIndex; } -Q_DECL_CONSTEXPR inline bool operator!=(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator!=(const QTzTransitionRule &lhs, const QTzTransitionRule &rhs) noexcept { return !operator==(lhs, rhs); } class Q_AUTOTEST_EXPORT QTzTimeZonePrivate final : public QTimeZonePrivate diff --git a/src/corelib/tools/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp index 57bc000af5..f62d7998c8 100644 --- a/src/corelib/tools/qtimezoneprivate_tz.cpp +++ b/src/corelib/time/qtimezoneprivate_tz.cpp @@ -40,6 +40,7 @@ #include "qtimezone.h" #include "qtimezoneprivate_p.h" #include "qdatetime_p.h" // ### Qt 5.14: remove once YearRange is on QDateTime +#include "private/qlocale_tools_p.h" #include <QtCore/QFile> #include <QtCore/QHash> @@ -48,8 +49,6 @@ #include <qdebug.h> -#include "qlocale_tools_p.h" - #include <algorithm> #include <errno.h> #include <limits.h> @@ -474,7 +473,7 @@ struct PosixZone static PosixZone invalid() { return {QString(), InvalidOffset}; } static PosixZone parse(const char *&pos, const char *end); - bool hasValidOffset() const Q_DECL_NOTHROW { return offset != InvalidOffset; } + bool hasValidOffset() const noexcept { return offset != InvalidOffset; } }; } // unnamed namespace @@ -522,6 +521,10 @@ PosixZone PosixZone::parse(const char *&pos, const char *end) QString name = QString::fromUtf8(nameBegin, nameEnd - nameBegin); const int offset = zoneEnd > zoneBegin ? parsePosixOffset(zoneBegin, zoneEnd) : InvalidOffset; pos = zoneEnd; + // UTC+hh:mm:ss or GMT+hh:mm:ss should be read as offsets from UTC, not as a + // POSIX rule naming a zone as UTC or GMT and specifying a non-zero offset. + if (offset != 0 && (name == QLatin1String("UTC") || name == QLatin1String("GMT"))) + return invalid(); return {std::move(name), offset}; } @@ -660,8 +663,17 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); if (!tzif.open(QIODevice::ReadOnly)) { tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); - if (!tzif.open(QIODevice::ReadOnly)) + if (!tzif.open(QIODevice::ReadOnly)) { + // ianaId may be a POSIX rule, taken from $TZ or /etc/TZ + const QByteArray zoneInfo = ianaId.split(',').at(0); + const char *begin = zoneInfo.constBegin(); + if (PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset() + && (begin == zoneInfo.constEnd() + || PosixZone::parse(begin, zoneInfo.constEnd()).hasValidOffset())) { + m_id = m_posixRule = ianaId; + } return; + } } } @@ -1100,7 +1112,7 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const path = QFile::symLinkTarget(path); if (index >= 0) { // /etc/localtime is a symlink to the current TZ file, so extract from path - ianaId = path.mid(index + zoneinfo.size()).toUtf8(); + ianaId = path.midRef(index + zoneinfo.size()).toUtf8(); } } @@ -1126,14 +1138,21 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() const while (ianaId.isEmpty() && !ts.atEnd() && ts.status() == QTextStream::Ok) { line = ts.readLine(); if (line.startsWith(QLatin1String("ZONE="))) { - ianaId = line.mid(6, line.size() - 7).toUtf8(); + ianaId = line.midRef(6, line.size() - 7).toUtf8(); } else if (line.startsWith(QLatin1String("TIMEZONE="))) { - ianaId = line.mid(10, line.size() - 11).toUtf8(); + ianaId = line.midRef(10, line.size() - 11).toUtf8(); } } } } + // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ: + if (ianaId.isEmpty()) { + QFile zone(QStringLiteral("/etc/TZ")); + if (zone.open(QIODevice::ReadOnly)) + ianaId = zone.readAll().trimmed(); + } + // Give up for now and return UTC if (ianaId.isEmpty()) ianaId = utcQByteArray(); diff --git a/src/corelib/tools/qtimezoneprivate_win.cpp b/src/corelib/time/qtimezoneprivate_win.cpp index 1bf2366748..1bf2366748 100644 --- a/src/corelib/tools/qtimezoneprivate_win.cpp +++ b/src/corelib/time/qtimezoneprivate_win.cpp diff --git a/src/corelib/time/time.pri b/src/corelib/time/time.pri new file mode 100644 index 0000000000..bacb7e875d --- /dev/null +++ b/src/corelib/time/time.pri @@ -0,0 +1,34 @@ +# Qt time / date / zone / calendar module + +HEADERS += \ + time/qdatetime.h \ + time/qdatetime_p.h + +SOURCES += time/qdatetime.cpp + +qtConfig(timezone) { + HEADERS += \ + time/qtimezone.h \ + time/qtimezoneprivate_p.h \ + time/qtimezoneprivate_data_p.h + SOURCES += \ + time/qtimezone.cpp \ + time/qtimezoneprivate.cpp + !nacl:darwin: { + SOURCES += time/qtimezoneprivate_mac.mm + } else: android:!android-embedded: { + SOURCES += time/qtimezoneprivate_android.cpp + } else: unix: { + SOURCES += time/qtimezoneprivate_tz.cpp + qtConfig(icu): SOURCES += time/qtimezoneprivate_icu.cpp + } else: qtConfig(icu): { + SOURCES += time/qtimezoneprivate_icu.cpp + } else: win32: { + SOURCES += time/qtimezoneprivate_win.cpp + } +} + +qtConfig(datetimeparser) { + HEADERS += time/qdatetimeparser_p.h + SOURCES += time/qdatetimeparser.cpp +} diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 0146e22fa3..b01ce0db58 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -524,7 +524,7 @@ QT_DEPRECATED_X("Use std::binary_search") Q_OUTOFLINE_TEMPLATE RandomAccessItera # if (defined __apple_build_version__ && __clang_major__ >= 7) || (Q_CC_CLANG >= 307) # define QT_HAS_CONSTEXPR_BUILTINS # endif -#elif defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) && !defined(Q_OS_WINCE) && !defined(Q_PROCESSOR_ARM) +#elif defined(Q_CC_MSVC) && !defined(Q_CC_INTEL) && !defined(Q_PROCESSOR_ARM) # define QT_HAS_CONSTEXPR_BUILTINS #elif defined(Q_CC_GNU) # define QT_HAS_CONSTEXPR_BUILTINS @@ -533,7 +533,7 @@ QT_DEPRECATED_X("Use std::binary_search") Q_OUTOFLINE_TEMPLATE RandomAccessItera #if defined QT_HAS_CONSTEXPR_BUILTINS #if defined(Q_CC_GNU) || defined(Q_CC_CLANG) # define QT_HAS_BUILTIN_CTZS -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) noexcept { # if QT_HAS_BUILTIN(__builtin_ctzs) return __builtin_ctzs(v); @@ -542,7 +542,7 @@ Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) Q_DECL_NOTHROW # endif } #define QT_HAS_BUILTIN_CLZS -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) noexcept { # if QT_HAS_BUILTIN(__builtin_clzs) return __builtin_clzs(v); @@ -551,44 +551,44 @@ Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW # endif } #define QT_HAS_BUILTIN_CTZ -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctz(quint32 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctz(quint32 v) noexcept { return __builtin_ctz(v); } #define QT_HAS_BUILTIN_CLZ -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clz(quint32 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clz(quint32 v) noexcept { return __builtin_clz(v); } #define QT_HAS_BUILTIN_CTZLL -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzll(quint64 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_ctzll(quint64 v) noexcept { return __builtin_ctzll(v); } #define QT_HAS_BUILTIN_CLZLL -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzll(quint64 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_clzll(quint64 v) noexcept { return __builtin_clzll(v); } #define QALGORITHMS_USE_BUILTIN_POPCOUNT -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) noexcept { return __builtin_popcount(v); } -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) noexcept { return __builtin_popcount(v); } -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) noexcept { return __builtin_popcount(v); } #define QALGORITHMS_USE_BUILTIN_POPCOUNTLL -Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) noexcept { return __builtin_popcountll(v); } -#elif defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) && !defined(Q_PROCESSOR_ARM) +#elif defined(Q_CC_MSVC) && !defined(Q_PROCESSOR_ARM) #define QT_POPCOUNT_CONSTEXPR #define QT_POPCOUNT_RELAXED_CONSTEXPR #define QT_HAS_BUILTIN_CTZ @@ -630,12 +630,12 @@ Q_ALWAYS_INLINE unsigned long qt_builtin_clzll(quint64 val) } #endif // MSVC 64bit # define QT_HAS_BUILTIN_CTZS -Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) Q_DECL_NOTHROW +Q_ALWAYS_INLINE uint qt_builtin_ctzs(quint16 v) noexcept { return qt_builtin_ctz(v); } #define QT_HAS_BUILTIN_CLZS -Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW +Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) noexcept { return qt_builtin_clz(v) - 16U; } @@ -652,19 +652,19 @@ Q_ALWAYS_INLINE uint qt_builtin_clzs(quint16 v) Q_DECL_NOTHROW #if defined(__AVX__) || defined(__SSE4_2__) || defined(__POPCNT__) #define QALGORITHMS_USE_BUILTIN_POPCOUNT #define QALGORITHMS_USE_BUILTIN_POPCOUNTLL -Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) Q_DECL_NOTHROW +Q_ALWAYS_INLINE uint qt_builtin_popcount(quint32 v) noexcept { return __popcnt(v); } -Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) Q_DECL_NOTHROW +Q_ALWAYS_INLINE uint qt_builtin_popcount(quint8 v) noexcept { return __popcnt16(v); } -Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) Q_DECL_NOTHROW +Q_ALWAYS_INLINE uint qt_builtin_popcount(quint16 v) noexcept { return __popcnt16(v); } -Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NOTHROW +Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) noexcept { #if Q_PROCESSOR_WORDSIZE == 8 return __popcnt64(v); @@ -685,7 +685,7 @@ Q_ALWAYS_INLINE uint qt_builtin_popcountll(quint64 v) Q_DECL_NOTHROW } //namespace QAlgorithmsPrivate -Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint32 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint32 v) noexcept { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT return QAlgorithmsPrivate::qt_builtin_popcount(v); @@ -698,7 +698,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint32 #endif } -Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint8 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint8 v) noexcept { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT return QAlgorithmsPrivate::qt_builtin_popcount(v); @@ -708,7 +708,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint8 #endif } -Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint16 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint16 v) noexcept { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNT return QAlgorithmsPrivate::qt_builtin_popcount(v); @@ -719,7 +719,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint16 #endif } -Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint64 v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint64 v) noexcept { #ifdef QALGORITHMS_USE_BUILTIN_POPCOUNTLL return QAlgorithmsPrivate::qt_builtin_popcountll(v); @@ -734,7 +734,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(quint64 #endif } -Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(long unsigned int v) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(long unsigned int v) noexcept { return qPopulationCount(static_cast<quint64>(v)); } @@ -744,7 +744,7 @@ Q_DECL_CONST_FUNCTION QT_POPCOUNT_CONSTEXPR inline uint qPopulationCount(long un #endif #undef QT_POPCOUNT_CONSTEXPR -Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint32 v) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint32 v) noexcept { #if defined(QT_HAS_BUILTIN_CTZ) return v ? QAlgorithmsPrivate::qt_builtin_ctz(v) : 32U; @@ -762,7 +762,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint32 v) Q_DECL_NO #endif } -Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint8 v) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint8 v) noexcept { #if defined(QT_HAS_BUILTIN_CTZ) return v ? QAlgorithmsPrivate::qt_builtin_ctz(v) : 8U; @@ -777,7 +777,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint8 v) Q_DECL_NOT #endif } -Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) noexcept { #if defined(QT_HAS_BUILTIN_CTZS) return v ? QAlgorithmsPrivate::qt_builtin_ctzs(v) : 16U; @@ -793,7 +793,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint16 v) Q_DECL_NO #endif } -Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint64 v) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint64 v) noexcept { #if defined(QT_HAS_BUILTIN_CTZLL) return v ? QAlgorithmsPrivate::qt_builtin_ctzll(v) : 64; @@ -804,12 +804,12 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(quint64 v) Q_DECL_NO #endif } -Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(unsigned long v) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline uint qCountTrailingZeroBits(unsigned long v) noexcept { return qCountTrailingZeroBits(QIntegerForSizeof<long>::Unsigned(v)); } -Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint32 v) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint32 v) noexcept { #if defined(QT_HAS_BUILTIN_CLZ) return v ? QAlgorithmsPrivate::qt_builtin_clz(v) : 32U; @@ -824,7 +824,7 @@ Q_DECL_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint32 v) Q_DECL_NOT #endif } -QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL_NOTHROW +QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) noexcept { #if defined(QT_HAS_BUILTIN_CLZ) return v ? QAlgorithmsPrivate::qt_builtin_clz(v)-24U : 8U; @@ -836,7 +836,7 @@ QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint8 v) Q_DECL #endif } -QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DECL_NOTHROW +QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) noexcept { #if defined(QT_HAS_BUILTIN_CLZS) return v ? QAlgorithmsPrivate::qt_builtin_clzs(v) : 16U; @@ -849,7 +849,7 @@ QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint16 v) Q_DEC #endif } -QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) Q_DECL_NOTHROW +QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) noexcept { #if defined(QT_HAS_BUILTIN_CLZLL) return v ? QAlgorithmsPrivate::qt_builtin_clzll(v) : 64U; @@ -864,7 +864,7 @@ QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(quint64 v) Q_DEC #endif } -QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(unsigned long v) Q_DECL_NOTHROW +QT_POPCOUNT_RELAXED_CONSTEXPR inline uint qCountLeadingZeroBits(unsigned long v) noexcept { return qCountLeadingZeroBits(QIntegerForSizeof<long>::Unsigned(v)); } diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp index a04536b18b..234a44f6b6 100644 --- a/src/corelib/tools/qarraydata.cpp +++ b/src/corelib/tools/qarraydata.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -41,11 +41,114 @@ #include <QtCore/qarraydata.h> #include <QtCore/private/qnumeric_p.h> #include <QtCore/private/qtools_p.h> +#include <QtCore/qmath.h> #include <stdlib.h> QT_BEGIN_NAMESPACE +/* + * This pair of functions is declared in qtools_p.h and is used by the Qt + * containers to allocate memory and grow the memory block during append + * operations. + * + * They take size_t parameters and return size_t so they will change sizes + * according to the pointer width. However, knowing Qt containers store the + * container size and element indexes in ints, these functions never return a + * size larger than INT_MAX. This is done by casting the element count and + * memory block size to int in several comparisons: the check for negative is + * very fast on most platforms as the code only needs to check the sign bit. + * + * These functions return SIZE_MAX on overflow, which can be passed to malloc() + * and will surely cause a NULL return (there's no way you can allocate a + * memory block the size of your entire VM space). + */ + +/*! + \internal + \since 5.7 + + Returns the memory block size for a container containing \a elementCount + elements, each of \a elementSize bytes, plus a header of \a headerSize + bytes. That is, this function returns \c + {elementCount * elementSize + headerSize} + + but unlike the simple calculation, it checks for overflows during the + multiplication and the addition. + + Both \a elementCount and \a headerSize can be zero, but \a elementSize + cannot. + + This function returns SIZE_MAX (~0) on overflow or if the memory block size + would not fit an int. +*/ +size_t qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) noexcept +{ + unsigned count = unsigned(elementCount); + unsigned size = unsigned(elementSize); + unsigned header = unsigned(headerSize); + Q_ASSERT(elementSize); + Q_ASSERT(size == elementSize); + Q_ASSERT(header == headerSize); + + if (Q_UNLIKELY(count != elementCount)) + return std::numeric_limits<size_t>::max(); + + unsigned bytes; + if (Q_UNLIKELY(mul_overflow(size, count, &bytes)) || + Q_UNLIKELY(add_overflow(bytes, header, &bytes))) + return std::numeric_limits<size_t>::max(); + if (Q_UNLIKELY(int(bytes) < 0)) // catches bytes >= 2GB + return std::numeric_limits<size_t>::max(); + + return bytes; +} + +/*! + \internal + \since 5.7 + + Returns the memory block size and the number of elements that will fit in + that block for a container containing \a elementCount elements, each of \a + elementSize bytes, plus a header of \a headerSize bytes. This function + assumes the container will grow and pre-allocates a growth factor. + + Both \a elementCount and \a headerSize can be zero, but \a elementSize + cannot. + + This function returns SIZE_MAX (~0) on overflow or if the memory block size + would not fit an int. + + \note The memory block may contain up to \a elementSize - 1 bytes more than + needed. +*/ +CalculateGrowingBlockSizeResult +qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) noexcept +{ + CalculateGrowingBlockSizeResult result = { + std::numeric_limits<size_t>::max(),std::numeric_limits<size_t>::max() + }; + + unsigned bytes = unsigned(qCalculateBlockSize(elementCount, elementSize, headerSize)); + if (int(bytes) < 0) // catches std::numeric_limits<size_t>::max() + return result; + + unsigned morebytes = qNextPowerOfTwo(bytes); + if (Q_UNLIKELY(int(morebytes) < 0)) { + // catches morebytes == 2GB + // grow by half the difference between bytes and morebytes + bytes += (morebytes - bytes) / 2; + } else { + bytes = morebytes; + } + + result.elementCount = (bytes - unsigned(headerSize)) / unsigned(elementSize); + result.size = bytes; + return result; +} + +// End of qtools_p.h implementation + QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wmissing-field-initializers") @@ -87,7 +190,7 @@ static QArrayData *reallocateData(QArrayData *header, size_t allocSize, uint opt } QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, - size_t capacity, AllocationOptions options) Q_DECL_NOTHROW + size_t capacity, AllocationOptions options) noexcept { // Alignment is a power of two Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData) @@ -112,7 +215,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, headerSize += (alignment - Q_ALIGNOF(QArrayData)); if (headerSize > size_t(MaxAllocSize)) - return 0; + return nullptr; size_t allocSize = calculateBlockSize(capacity, objectSize, headerSize, options); QArrayData *header = static_cast<QArrayData *>(::malloc(allocSize)); @@ -121,9 +224,9 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, & ~(alignment - 1); #if !defined(QT_NO_UNSHARABLE_CONTAINERS) - header->ref.atomic.store(bool(!(options & Unsharable))); + header->ref.atomic.storeRelaxed(bool(!(options & Unsharable))); #else - header->ref.atomic.store(1); + header->ref.atomic.storeRelaxed(1); #endif header->size = 0; header->alloc = capacity; @@ -135,7 +238,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment, } QArrayData *QArrayData::reallocateUnaligned(QArrayData *data, size_t objectSize, size_t capacity, - AllocationOptions options) Q_DECL_NOTHROW + AllocationOptions options) noexcept { Q_ASSERT(data); Q_ASSERT(data->isMutable()); @@ -150,7 +253,7 @@ QArrayData *QArrayData::reallocateUnaligned(QArrayData *data, size_t objectSize, } void QArrayData::deallocate(QArrayData *data, size_t objectSize, - size_t alignment) Q_DECL_NOTHROW + size_t alignment) noexcept { // Alignment is a power of two Q_ASSERT(alignment >= Q_ALIGNOF(QArrayData) @@ -163,7 +266,7 @@ void QArrayData::deallocate(QArrayData *data, size_t objectSize, #endif Q_ASSERT_X(data == 0 || !data->ref.isStatic(), "QArrayData::deallocate", - "Static data can not be deleted"); + "Static data cannot be deleted"); ::free(data); } diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index a642fb9b39..074072b987 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -113,14 +113,14 @@ struct Q_CORE_EXPORT QArrayData } Q_REQUIRED_RESULT static QArrayData *allocate(size_t objectSize, size_t alignment, - size_t capacity, AllocationOptions options = Default) Q_DECL_NOTHROW; + size_t capacity, AllocationOptions options = Default) noexcept; Q_REQUIRED_RESULT static QArrayData *reallocateUnaligned(QArrayData *data, size_t objectSize, - size_t newCapacity, AllocationOptions newOptions = Default) Q_DECL_NOTHROW; + size_t newCapacity, AllocationOptions newOptions = Default) noexcept; static void deallocate(QArrayData *data, size_t objectSize, - size_t alignment) Q_DECL_NOTHROW; + size_t alignment) noexcept; static const QArrayData shared_null[2]; - static QArrayData *sharedNull() Q_DECL_NOTHROW { return const_cast<QArrayData*>(shared_null); } + static QArrayData *sharedNull() noexcept { return const_cast<QArrayData*>(shared_null); } }; Q_DECLARE_OPERATORS_FOR_FLAGS(QArrayData::AllocationOptions) @@ -254,7 +254,7 @@ struct QTypedArrayData return result; } - static QTypedArrayData *sharedNull() Q_DECL_NOTHROW + static QTypedArrayData *sharedNull() noexcept { Q_STATIC_ASSERT(sizeof(QTypedArrayData) == sizeof(QArrayData)); return static_cast<QTypedArrayData *>(QArrayData::sharedNull()); @@ -306,8 +306,6 @@ struct QArrayDataPointerRef // accomplished by hiding a static const instance of QStaticArrayData, which is // POD. -#if defined(Q_COMPILER_VARIADIC_MACROS) -#if defined(Q_COMPILER_LAMBDA) // Hide array inside a lambda #define Q_ARRAY_LITERAL(Type, ...) \ ([]() -> QArrayDataPointerRef<Type> { \ @@ -324,15 +322,12 @@ struct QArrayDataPointerRef return StaticWrapper::get(); \ }()) \ /**/ -#endif -#endif // defined(Q_COMPILER_VARIADIC_MACROS) -#if defined(Q_ARRAY_LITERAL) #define Q_ARRAY_LITERAL_IMPL(Type, ...) \ - union { Type type_must_be_POD; } dummy; Q_UNUSED(dummy) \ + Q_STATIC_ASSERT(std::is_literal_type<Type>::value); \ \ /* Portable compile-time array size computation */ \ - Type data[] = { __VA_ARGS__ }; Q_UNUSED(data) \ + Q_CONSTEXPR Type data[] = { __VA_ARGS__ }; Q_UNUSED(data); \ enum { Size = sizeof(data) / sizeof(data[0]) }; \ \ static const QStaticArrayData<Type, Size> literal = { \ @@ -342,31 +337,6 @@ struct QArrayDataPointerRef { static_cast<QTypedArrayData<Type> *>( \ const_cast<QArrayData *>(&literal.header)) }; \ /**/ -#else -// As a fallback, memory is allocated and data copied to the heap. - -// The fallback macro does NOT use variadic macros and does NOT support -// variable number of arguments. It is suitable for char arrays. - -namespace QtPrivate { - template <class T, size_t N> - inline QArrayDataPointerRef<T> qMakeArrayLiteral(const T (&array)[N]) - { - union { T type_must_be_POD; } dummy; Q_UNUSED(dummy) - - QArrayDataPointerRef<T> result = { QTypedArrayData<T>::allocate(N) }; - Q_CHECK_PTR(result.ptr); - - ::memcpy(result.ptr->data(), array, N * sizeof(T)); - result.ptr->size = N; - - return result; - } -} - -#define Q_ARRAY_LITERAL(Type, Array) \ - QT_PREPEND_NAMESPACE(QtPrivate::qMakeArrayLiteral)<Type>( Array ) -#endif // !defined(Q_ARRAY_LITERAL) namespace QtPrivate { struct Q_CORE_EXPORT QContainerImplHelper diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index 7e1b43f9b1..8e19525f07 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -106,7 +106,7 @@ struct QPodArrayOps void destroyAll() // Call from destructors, ONLY! { Q_ASSERT(this->isMutable()); - Q_ASSERT(this->ref.atomic.load() == 0); + Q_ASSERT(this->ref.atomic.loadRelaxed() == 0); // As this is to be called only from destructor, it doesn't need to be // exception safe; size not updated. @@ -204,7 +204,7 @@ struct QGenericArrayOps // As this is to be called only from destructor, it doesn't need to be // exception safe; size not updated. - Q_ASSERT(this->ref.atomic.load() == 0); + Q_ASSERT(this->ref.atomic.loadRelaxed() == 0); const T *const b = this->begin(); const T *i = this->end(); diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h index 51cfa6e849..0322615f91 100644 --- a/src/corelib/tools/qarraydatapointer.h +++ b/src/corelib/tools/qarraydatapointer.h @@ -52,7 +52,7 @@ private: typedef QArrayDataOps<T> DataOps; public: - QArrayDataPointer() Q_DECL_NOTHROW + QArrayDataPointer() noexcept : d(Data::sharedNull()) { } @@ -82,20 +82,18 @@ public: return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - QArrayDataPointer(QArrayDataPointer &&other) Q_DECL_NOTHROW + QArrayDataPointer(QArrayDataPointer &&other) noexcept : d(other.d) { other.d = Data::sharedNull(); } - QArrayDataPointer &operator=(QArrayDataPointer &&other) Q_DECL_NOTHROW + QArrayDataPointer &operator=(QArrayDataPointer &&other) noexcept { QArrayDataPointer moved(std::move(other)); this->swap(moved); return *this; } -#endif DataOps &operator*() const { @@ -150,7 +148,7 @@ public: bool isSharable() const { return d->isSharable(); } #endif - void swap(QArrayDataPointer &other) Q_DECL_NOTHROW + void swap(QArrayDataPointer &other) noexcept { qSwap(d, other.d); } diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h index ff40bf5654..9b0e931aca 100644 --- a/src/corelib/tools/qbitarray.h +++ b/src/corelib/tools/qbitarray.h @@ -50,21 +50,19 @@ class Q_CORE_EXPORT QBitArray { friend Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, const QBitArray &); friend Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QBitArray &); - friend Q_CORE_EXPORT uint qHash(const QBitArray &key, uint seed) Q_DECL_NOTHROW; + friend Q_CORE_EXPORT uint qHash(const QBitArray &key, uint seed) noexcept; QByteArray d; public: - inline QBitArray() Q_DECL_NOTHROW {} + inline QBitArray() noexcept {} explicit QBitArray(int size, bool val = false); QBitArray(const QBitArray &other) : d(other.d) {} inline QBitArray &operator=(const QBitArray &other) { d = other.d; return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - inline QBitArray(QBitArray &&other) Q_DECL_NOTHROW : d(std::move(other.d)) {} - inline QBitArray &operator=(QBitArray &&other) Q_DECL_NOTHROW + inline QBitArray(QBitArray &&other) noexcept : d(std::move(other.d)) {} + inline QBitArray &operator=(QBitArray &&other) noexcept { qSwap(d, other.d); return *this; } -#endif - inline void swap(QBitArray &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + inline void swap(QBitArray &other) noexcept { qSwap(d, other.d); } inline int size() const { return (d.size() << 3) - *d.constData(); } inline int count() const { return (d.size() << 3) - *d.constData(); } diff --git a/src/corelib/tools/qbytearray.cpp b/src/corelib/tools/qbytearray.cpp index c8bb384532..c25d39461f 100644 --- a/src/corelib/tools/qbytearray.cpp +++ b/src/corelib/tools/qbytearray.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -130,106 +130,6 @@ int qFindByteArray( const char *haystack0, int haystackLen, int from, const char *needle0, int needleLen); -/* - * This pair of functions is declared in qtools_p.h and is used by the Qt - * containers to allocate memory and grow the memory block during append - * operations. - * - * They take size_t parameters and return size_t so they will change sizes - * according to the pointer width. However, knowing Qt containers store the - * container size and element indexes in ints, these functions never return a - * size larger than INT_MAX. This is done by casting the element count and - * memory block size to int in several comparisons: the check for negative is - * very fast on most platforms as the code only needs to check the sign bit. - * - * These functions return SIZE_MAX on overflow, which can be passed to malloc() - * and will surely cause a NULL return (there's no way you can allocate a - * memory block the size of your entire VM space). - */ - -/*! - \internal - \since 5.7 - - Returns the memory block size for a container containing \a elementCount - elements, each of \a elementSize bytes, plus a header of \a headerSize - bytes. That is, this function returns \c - {elementCount * elementSize + headerSize} - - but unlike the simple calculation, it checks for overflows during the - multiplication and the addition. - - Both \a elementCount and \a headerSize can be zero, but \a elementSize - cannot. - - This function returns SIZE_MAX (~0) on overflow or if the memory block size - would not fit an int. -*/ -size_t qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) Q_DECL_NOTHROW -{ - unsigned count = unsigned(elementCount); - unsigned size = unsigned(elementSize); - unsigned header = unsigned(headerSize); - Q_ASSERT(elementSize); - Q_ASSERT(size == elementSize); - Q_ASSERT(header == headerSize); - - if (Q_UNLIKELY(count != elementCount)) - return std::numeric_limits<size_t>::max(); - - unsigned bytes; - if (Q_UNLIKELY(mul_overflow(size, count, &bytes)) || - Q_UNLIKELY(add_overflow(bytes, header, &bytes))) - return std::numeric_limits<size_t>::max(); - if (Q_UNLIKELY(int(bytes) < 0)) // catches bytes >= 2GB - return std::numeric_limits<size_t>::max(); - - return bytes; -} - -/*! - \internal - \since 5.7 - - Returns the memory block size and the number of elements that will fit in - that block for a container containing \a elementCount elements, each of \a - elementSize bytes, plus a header of \a headerSize bytes. This function - assumes the container will grow and pre-allocates a growth factor. - - Both \a elementCount and \a headerSize can be zero, but \a elementSize - cannot. - - This function returns SIZE_MAX (~0) on overflow or if the memory block size - would not fit an int. - - \note The memory block may contain up to \a elementSize - 1 bytes more than - needed. -*/ -CalculateGrowingBlockSizeResult -qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize) Q_DECL_NOTHROW -{ - CalculateGrowingBlockSizeResult result = { - std::numeric_limits<size_t>::max(),std::numeric_limits<size_t>::max() - }; - - unsigned bytes = unsigned(qCalculateBlockSize(elementCount, elementSize, headerSize)); - if (int(bytes) < 0) // catches std::numeric_limits<size_t>::max() - return result; - - unsigned morebytes = qNextPowerOfTwo(bytes); - if (Q_UNLIKELY(int(morebytes) < 0)) { - // catches morebytes == 2GB - // grow by half the difference between bytes and morebytes - bytes += (morebytes - bytes) / 2; - } else { - bytes = morebytes; - } - - result.elementCount = (bytes - unsigned(headerSize)) / unsigned(elementSize); - result.size = bytes; - return result; -} - /***************************************************************************** Safe and portable C string functions; extensions to standard string.h *****************************************************************************/ @@ -239,8 +139,8 @@ qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t heade Returns a duplicate string. Allocates space for a copy of \a src, copies it, and returns a - pointer to the copy. If \a src is nullptr, it immediately returns - nullptr. + pointer to the copy. If \a src is \nullptr, it immediately returns + \nullptr. Ownership is passed to the caller, so the returned string must be deleted using \c delete[]. @@ -258,7 +158,7 @@ char *qstrdup(const char *src) Copies all the characters up to and including the '\\0' from \a src into \a dst and returns a pointer to \a dst. If \a src is - nullptr, it immediately returns nullptr. + \nullptr, it immediately returns \nullptr. This function assumes that \a dst is large enough to hold the contents of \a src. @@ -291,7 +191,7 @@ char *qstrcpy(char *dst, const char *src) Copies at most \a len bytes from \a src (stopping at \a len or the terminating '\\0' whichever comes first) into \a dst and returns a pointer to \a dst. Guarantees that \a dst is '\\0'-terminated. If - \a src or \a dst is nullptr, returns nullptr immediately. + \a src or \a dst is \nullptr, returns \nullptr immediately. This function assumes that \a dst is at least \a len characters long. @@ -326,7 +226,7 @@ char *qstrncpy(char *dst, const char *src, uint len) A safe \c strlen() function. Returns the number of characters that precede the terminating '\\0', - or 0 if \a str is nullptr. + or 0 if \a str is \nullptr. \sa qstrnlen() */ @@ -338,7 +238,7 @@ char *qstrncpy(char *dst, const char *src, uint len) A safe \c strnlen() function. Returns the number of characters that precede the terminating '\\0', but - at most \a maxlen. If \a str is nullptr, returns 0. + at most \a maxlen. If \a str is \nullptr, returns 0. \sa qstrlen() */ @@ -352,10 +252,10 @@ char *qstrncpy(char *dst, const char *src, uint len) is less than \a str2, 0 if \a str1 is equal to \a str2 or a positive value if \a str1 is greater than \a str2. - Special case 1: Returns 0 if \a str1 and \a str2 are both nullptr. + Special case 1: Returns 0 if \a str1 and \a str2 are both \nullptr. Special case 2: Returns an arbitrary non-zero value if \a str1 is - nullptr or \a str2 is nullptr (but not both). + \nullptr or \a str2 is \nullptr (but not both). \sa qstrncmp(), qstricmp(), qstrnicmp(), {8-bit Character Comparisons}, QByteArray::compare() @@ -378,10 +278,10 @@ int qstrcmp(const char *str1, const char *str2) str1 is equal to \a str2 or a positive value if \a str1 is greater than \a str2. - Special case 1: Returns 0 if \a str1 and \a str2 are both nullptr. + Special case 1: Returns 0 if \a str1 and \a str2 are both \nullptr. - Special case 2: Returns a random non-zero value if \a str1 is nullptr - or \a str2 is nullptr (but not both). + Special case 2: Returns a random non-zero value if \a str1 is \nullptr + or \a str2 is \nullptr (but not both). \sa qstrcmp(), qstricmp(), qstrnicmp(), {8-bit Character Comparisons}, QByteArray::compare() @@ -398,10 +298,10 @@ int qstrcmp(const char *str1, const char *str2) str1 is equal to \a str2 or a positive value if \a str1 is greater than \a str2. - Special case 1: Returns 0 if \a str1 and \a str2 are both nullptr. + Special case 1: Returns 0 if \a str1 and \a str2 are both \nullptr. - Special case 2: Returns a random non-zero value if \a str1 is nullptr - or \a str2 is nullptr (but not both). + Special case 2: Returns a random non-zero value if \a str1 is \nullptr + or \a str2 is \nullptr (but not both). \sa qstrcmp(), qstrncmp(), qstrnicmp(), {8-bit Character Comparisons}, QByteArray::compare() @@ -491,10 +391,10 @@ int qstricmp(const char *str1, const char *str2) is equal to \a str2 or a positive value if \a str1 is greater than \a str2. - Special case 1: Returns 0 if \a str1 and \a str2 are both nullptr. + Special case 1: Returns 0 if \a str1 and \a str2 are both \nullptr. - Special case 2: Returns a random non-zero value if \a str1 is nullptr - or \a str2 is nullptr (but not both). + Special case 2: Returns a random non-zero value if \a str1 is \nullptr + or \a str2 is \nullptr (but not both). \sa qstrcmp(), qstrncmp(), qstricmp(), {8-bit Character Comparisons}, QByteArray::compare() @@ -523,7 +423,7 @@ int qstrnicmp(const char *str1, const char *str2, uint len) A helper for QByteArray::compare. Compares \a len1 bytes from \a str1 to \a len2 bytes from \a str2. If \a len2 is -1, then \a str2 is expected to be - null-terminated. + '\\0'-terminated. */ int qstrnicmp(const char *str1, qsizetype len1, const char *str2, qsizetype len2) { @@ -1038,8 +938,8 @@ QByteArray qUncompress(const uchar* data, int nbytes) \snippet code/src_corelib_tools_qbytearray.cpp 5 All functions except isNull() treat null byte arrays the same as - empty byte arrays. For example, data() returns a pointer to a - '\\0' character for a null byte array (\e not a null pointer), + empty byte arrays. For example, data() returns a valid pointer + (\e not nullptr) to a '\\0' character for a byte array and QByteArray() compares equal to QByteArray(""). We recommend that you always use isEmpty() and avoid isNull(). @@ -1281,7 +1181,7 @@ QByteArray qUncompress(const uchar* data, int nbytes) Assigns \a other to this byte array and returns a reference to this byte array. */ -QByteArray &QByteArray::operator=(const QByteArray & other) Q_DECL_NOTHROW +QByteArray &QByteArray::operator=(const QByteArray & other) noexcept { other.d->ref.ref(); if (!d->ref.deref()) @@ -1537,6 +1437,15 @@ QByteArray &QByteArray::operator=(const char *str) will apply to the character in the QByteArray from which you got the reference. + \note Before Qt 5.14 it was possible to use this operator to access + a character at an out-of-bounds position in the byte array, and + then assign to such a position, causing the byte array to be + automatically resized. Furthermore, assigning a value to the + returned QByteRef would cause a detach of the byte array, even if the + byte array has been copied in the meanwhile (and the QByteRef kept + alive while the copy was taken). These behaviors are deprecated, + and will be changed in a future version of Qt. + \sa at() */ @@ -1765,9 +1674,10 @@ void QByteArray::chop(int n) If \a data is 0, a null byte array is constructed. - If \a size is negative, \a data is assumed to point to a nul-terminated - string and its length is determined dynamically. The terminating - nul-character is not considered part of the byte array. + If \a size is negative, \a data is assumed to point to a + '\\0'-terminated string and its length is determined dynamically. + The terminating \\0 character is not considered part of the + byte array. QByteArray makes a deep copy of the string data. @@ -1924,7 +1834,7 @@ void QByteArray::expand(int i) /*! \internal - Return a QByteArray that is sure to be NUL-terminated. + Return a QByteArray that is sure to be '\\0'-terminated. By default, all QByteArray have an extra NUL at the end, guaranteeing that assumption. However, if QByteArray::fromRawData @@ -2162,7 +2072,7 @@ static inline QByteArray &qbytearray_insert(QByteArray *ba, { Q_ASSERT(pos >= 0); - if (pos < 0 || len <= 0 || arr == 0) + if (pos < 0 || len <= 0 || arr == nullptr) return *ba; int oldsize = ba->size(); @@ -2336,8 +2246,8 @@ QByteArray &QByteArray::replace(int pos, int len, const QByteArray &after) \overload - Replaces \a len bytes from index position \a pos with the zero terminated - string \a after. + Replaces \a len bytes from index position \a pos with the + '\\0'-terminated string \a after. Notice: this can change the length of the byte array. */ @@ -2415,7 +2325,7 @@ QByteArray &QByteArray::replace(const char *c, const QByteArray &after) Replaces every occurrence of the string \a before with the string \a after. Since the sizes of the strings are given by \a bsize and \a asize, they - may contain zero characters and do not need to be zero-terminated. + may contain zero characters and do not need to be '\\0'-terminated. */ QByteArray &QByteArray::replace(const char *before, int bsize, const char *after, int asize) @@ -3281,10 +3191,10 @@ static QByteArray toCase_template(T &input, const uchar * table) } if (firstBad == e) - return qMove(input); + return std::move(input); // transform the rest - QByteArray s = qMove(input); // will copy if T is const QByteArray + QByteArray s = std::move(input); // will copy if T is const QByteArray char *b = s.begin(); // will detach if necessary char *p = b + (firstBad - orig_begin); e = b + s.size(); @@ -3882,9 +3792,7 @@ static qulonglong toIntegral_helper(const char *data, bool *ok, int base, qulong template <typename T> static inline T toIntegral_helper(const char *data, bool *ok, int base) { - // ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type - const bool isUnsigned = T(0) < T(-1); - typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64; + using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type; #if defined(QT_CHECK_RANGE) if (base != 0 && (base < 2 || base > 36)) { @@ -3914,7 +3822,7 @@ T toIntegral_helper(const char *data, bool *ok, int base) Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \note The conversion of the number is performed in the default C locale, @@ -3940,7 +3848,7 @@ qlonglong QByteArray::toLongLong(bool *ok, int base) const Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \note The conversion of the number is performed in the default C locale, @@ -3965,7 +3873,7 @@ qulonglong QByteArray::toULongLong(bool *ok, int base) const Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \snippet code/src_corelib_tools_qbytearray.cpp 36 @@ -3992,7 +3900,7 @@ int QByteArray::toInt(bool *ok, int base) const Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \note The conversion of the number is performed in the default C locale, @@ -4019,7 +3927,7 @@ uint QByteArray::toUInt(bool *ok, int base) const Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \snippet code/src_corelib_tools_qbytearray.cpp 37 @@ -4047,7 +3955,7 @@ long QByteArray::toLong(bool *ok, int base) const Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \note The conversion of the number is performed in the default C locale, @@ -4071,7 +3979,7 @@ ulong QByteArray::toULong(bool *ok, int base) const Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \note The conversion of the number is performed in the default C locale, @@ -4096,7 +4004,7 @@ short QByteArray::toShort(bool *ok, int base) const Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \note The conversion of the number is performed in the default C locale, @@ -4117,7 +4025,7 @@ ushort QByteArray::toUShort(bool *ok, int base) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for other reasons (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \snippet code/src_corelib_tools_qbytearray.cpp 38 @@ -4137,10 +4045,9 @@ ushort QByteArray::toUShort(bool *ok, int base) const double QByteArray::toDouble(bool *ok) const { - QByteArray nulled = nulTerminated(); bool nonNullOk = false; int processed = 0; - double d = qt_asciiToDouble(nulled.constData(), nulled.length(), + double d = qt_asciiToDouble(constData(), size(), nonNullOk, processed, WhitespacesAllowed); if (ok) *ok = nonNullOk; @@ -4153,7 +4060,7 @@ double QByteArray::toDouble(bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for other reasons (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \snippet code/src_corelib_tools_qbytearray.cpp 38float @@ -4543,7 +4450,7 @@ QByteArray QByteArray::number(double n, char f, int prec) \snippet code/src_corelib_tools_qbytearray.cpp 43 \warning A byte array created with fromRawData() is \e not - null-terminated, unless the raw data contains a 0 character at + '\\0'-terminated, unless the raw data contains a 0 character at position \a size. While that does not matter for QDataStream or functions like indexOf(), passing the byte array to a function accepting a \c{const char *} expected to be '\\0'-terminated will @@ -4868,7 +4775,7 @@ static void q_toPercentEncoding(QByteArray *ba, const char *dontEncode, const ch QByteArray input = *ba; int len = input.count(); const char *inputData = input.constData(); - char *output = 0; + char *output = nullptr; int length = 0; for (int i = 0; i < len; ++i) { @@ -4908,7 +4815,7 @@ void q_toPercentEncoding(QByteArray *ba, const char *exclude, const char *includ void q_normalizePercentEncoding(QByteArray *ba, const char *exclude) { q_fromPercentEncoding(ba, '%'); - q_toPercentEncoding(ba, exclude, 0, '%'); + q_toPercentEncoding(ba, exclude, nullptr, '%'); } /*! @@ -5056,4 +4963,41 @@ QByteArray QByteArray::toPercentEncoding(const QByteArray &exclude, const QByteA \sa QStringLiteral */ +namespace QtPrivate { +namespace DeprecatedRefClassBehavior { +void warn(WarningType w, EmittingClass c) +{ + static const char deprecatedBehaviorString[] = + "The corresponding behavior is deprecated, and will be changed" + " in a future version of Qt."; + + const char *emittingClassName = nullptr; + const char *containerClassName = nullptr; + + switch (c) { + case EmittingClass::QByteRef: + emittingClassName = "QByteRef"; + containerClassName = "QByteArray"; + break; + case EmittingClass::QCharRef: + emittingClassName = "QCharRef"; + containerClassName = "QString"; + break; + } + + switch (w) { + case WarningType::OutOfRange: + qWarning("Using %s with an index pointing outside the valid range of a %s. %s", + emittingClassName, containerClassName, deprecatedBehaviorString); + break; + case WarningType::DelayedDetach: + qWarning("Using %s with on a %s that is not already detached. %s", + emittingClassName, containerClassName, deprecatedBehaviorString); + break; + } +} +} // namespace DeprecatedRefClassBehavior +} // namespace QtPrivate + + QT_END_NAMESPACE diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 8ee3a29ecc..a81051d309 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -168,22 +168,20 @@ public: }; Q_DECLARE_FLAGS(Base64Options, Base64Option) - inline QByteArray() Q_DECL_NOTHROW; + inline QByteArray() noexcept; QByteArray(const char *, int size = -1); QByteArray(int size, char c); QByteArray(int size, Qt::Initialization); - inline QByteArray(const QByteArray &) Q_DECL_NOTHROW; + inline QByteArray(const QByteArray &) noexcept; inline ~QByteArray(); - QByteArray &operator=(const QByteArray &) Q_DECL_NOTHROW; + QByteArray &operator=(const QByteArray &) noexcept; QByteArray &operator=(const char *str); -#ifdef Q_COMPILER_RVALUE_REFS - inline QByteArray(QByteArray && other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); } - inline QByteArray &operator=(QByteArray &&other) Q_DECL_NOTHROW + inline QByteArray(QByteArray && other) noexcept : d(other.d) { other.d = Data::sharedNull(); } + inline QByteArray &operator=(QByteArray &&other) noexcept { qSwap(d, other.d); return *this; } -#endif - inline void swap(QByteArray &other) Q_DECL_NOTHROW + inline void swap(QByteArray &other) noexcept { qSwap(d, other.d); } inline int size() const; @@ -211,8 +209,8 @@ public: inline char at(int i) const; inline char operator[](int i) const; inline char operator[](uint i) const; - inline QByteRef operator[](int i); - inline QByteRef operator[](uint i); + Q_REQUIRED_RESULT inline QByteRef operator[](int i); + Q_REQUIRED_RESULT inline QByteRef operator[](uint i); Q_REQUIRED_RESULT char front() const { return at(0); } Q_REQUIRED_RESULT inline QByteRef front(); Q_REQUIRED_RESULT char back() const { return at(size() - 1); } @@ -472,7 +470,7 @@ public: Q_DECLARE_OPERATORS_FOR_FLAGS(QByteArray::Base64Options) -inline QByteArray::QByteArray() Q_DECL_NOTHROW : d(Data::sharedNull()) { } +inline QByteArray::QByteArray() noexcept : d(Data::sharedNull()) { } inline QByteArray::~QByteArray() { if (!d->ref.deref()) Data::deallocate(d); } inline int QByteArray::size() const { return d->size; } @@ -502,7 +500,7 @@ inline void QByteArray::detach() { if (d->ref.isShared() || (d->offset != sizeof(QByteArrayData))) reallocData(uint(d->size) + 1u, d->detachFlags()); } inline bool QByteArray::isDetached() const { return !d->ref.isShared(); } -inline QByteArray::QByteArray(const QByteArray &a) Q_DECL_NOTHROW : d(a.d) +inline QByteArray::QByteArray(const QByteArray &a) noexcept : d(a.d) { d->ref.ref(); } inline int QByteArray::capacity() const @@ -530,7 +528,27 @@ inline void QByteArray::squeeze() } } -class Q_CORE_EXPORT QByteRef { +namespace QtPrivate { +namespace DeprecatedRefClassBehavior { + enum class EmittingClass { + QByteRef, + QCharRef, + }; + + enum class WarningType { + OutOfRange, + DelayedDetach, + }; + + Q_CORE_EXPORT Q_DECL_COLD_FUNCTION void warn(WarningType w, EmittingClass c); +} // namespace DeprecatedAssignmentOperatorBehavior +} // namespace QtPrivate + +class +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +Q_CORE_EXPORT +#endif +QByteRef { QByteArray &a; int i; inline QByteRef(QByteArray &array, int idx) @@ -538,13 +556,37 @@ class Q_CORE_EXPORT QByteRef { friend class QByteArray; public: inline operator char() const - { return i < a.d->size ? a.d->data()[i] : char(0); } + { + using namespace QtPrivate::DeprecatedRefClassBehavior; + if (Q_LIKELY(i < a.d->size)) + return a.d->data()[i]; +#ifdef QT_DEBUG + warn(WarningType::OutOfRange, EmittingClass::QByteRef); +#endif + return char(0); + } inline QByteRef &operator=(char c) - { if (i >= a.d->size) a.expand(i); else a.detach(); - a.d->data()[i] = c; return *this; } + { + using namespace QtPrivate::DeprecatedRefClassBehavior; + if (Q_UNLIKELY(i >= a.d->size)) { +#ifdef QT_DEBUG + warn(WarningType::OutOfRange, EmittingClass::QByteRef); +#endif + a.expand(i); + } else { +#ifdef QT_DEBUG + if (Q_UNLIKELY(!a.isDetached())) + warn(WarningType::DelayedDetach, EmittingClass::QByteRef); +#endif + a.detach(); + } + a.d->data()[i] = c; + return *this; + } inline QByteRef &operator=(const QByteRef &c) - { if (i >= a.d->size) a.expand(i); else a.detach(); - a.d->data()[i] = c.a.d->data()[c.i]; return *this; } + { + return operator=(char(c)); + } inline bool operator==(char c) const { return a.d->data()[i] == c; } inline bool operator!=(char c) const @@ -560,9 +602,9 @@ public: }; inline QByteRef QByteArray::operator[](int i) -{ Q_ASSERT(i >= 0); return QByteRef(*this, i); } +{ Q_ASSERT(i >= 0); detach(); return QByteRef(*this, i); } inline QByteRef QByteArray::operator[](uint i) -{ return QByteRef(*this, i); } +{ detach(); return QByteRef(*this, i); } inline QByteRef QByteArray::front() { return operator[](0); } inline QByteRef QByteArray::back() { return operator[](size() - 1); } inline QByteArray::iterator QByteArray::begin() @@ -617,41 +659,41 @@ inline int QByteArray::compare(const QByteArray &a, Qt::CaseSensitivity cs) cons return cs == Qt::CaseSensitive ? qstrcmp(*this, a) : qstrnicmp(data(), size(), a.data(), a.size()); } -inline bool operator==(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator==(const QByteArray &a1, const QByteArray &a2) noexcept { return (a1.size() == a2.size()) && (memcmp(a1.constData(), a2.constData(), a1.size())==0); } -inline bool operator==(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW +inline bool operator==(const QByteArray &a1, const char *a2) noexcept { return a2 ? qstrcmp(a1,a2) == 0 : a1.isEmpty(); } -inline bool operator==(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator==(const char *a1, const QByteArray &a2) noexcept { return a1 ? qstrcmp(a1,a2) == 0 : a2.isEmpty(); } -inline bool operator!=(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator!=(const QByteArray &a1, const QByteArray &a2) noexcept { return !(a1==a2); } -inline bool operator!=(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW +inline bool operator!=(const QByteArray &a1, const char *a2) noexcept { return a2 ? qstrcmp(a1,a2) != 0 : !a1.isEmpty(); } -inline bool operator!=(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator!=(const char *a1, const QByteArray &a2) noexcept { return a1 ? qstrcmp(a1,a2) != 0 : !a2.isEmpty(); } -inline bool operator<(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator<(const QByteArray &a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) < 0; } - inline bool operator<(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW + inline bool operator<(const QByteArray &a1, const char *a2) noexcept { return qstrcmp(a1, a2) < 0; } -inline bool operator<(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator<(const char *a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) < 0; } -inline bool operator<=(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator<=(const QByteArray &a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) <= 0; } -inline bool operator<=(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW +inline bool operator<=(const QByteArray &a1, const char *a2) noexcept { return qstrcmp(a1, a2) <= 0; } -inline bool operator<=(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator<=(const char *a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) <= 0; } -inline bool operator>(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator>(const QByteArray &a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) > 0; } -inline bool operator>(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW +inline bool operator>(const QByteArray &a1, const char *a2) noexcept { return qstrcmp(a1, a2) > 0; } -inline bool operator>(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator>(const char *a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) > 0; } -inline bool operator>=(const QByteArray &a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator>=(const QByteArray &a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) >= 0; } -inline bool operator>=(const QByteArray &a1, const char *a2) Q_DECL_NOTHROW +inline bool operator>=(const QByteArray &a1, const char *a2) noexcept { return qstrcmp(a1, a2) >= 0; } -inline bool operator>=(const char *a1, const QByteArray &a2) Q_DECL_NOTHROW +inline bool operator>=(const char *a1, const QByteArray &a2) noexcept { return qstrcmp(a1, a2) >= 0; } #if !defined(QT_USE_QSTRINGBUILDER) inline const QByteArray operator+(const QByteArray &a1, const QByteArray &a2) diff --git a/src/corelib/tools/qbytearraylist.cpp b/src/corelib/tools/qbytearraylist.cpp index c815e766ab..d04555ed4d 100644 --- a/src/corelib/tools/qbytearraylist.cpp +++ b/src/corelib/tools/qbytearraylist.cpp @@ -150,4 +150,26 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char return res; } +/*! + \fn int QByteArrayList::indexOf(const char *needle, int from) const + + Returns the index position of the first occurrence of \a needle in + the list, searching forward from index position \a from. Returns + -1 if no item matched. + + \a needle must be NUL-terminated. + + This overload doesn't require creating a QByteArray, thus saving a + memory allocation and some CPU time. + + \since 5.13 + \overload +*/ + +int QtPrivate::QByteArrayList_indexOf(const QByteArrayList *that, const char *needle, int from) +{ + const auto it = std::find_if(that->begin() + from, that->end(), [needle](const QByteArray &item) { return item == needle; }); + return it == that->end() ? -1 : int(std::distance(that->begin(), it)); +} + QT_END_NAMESPACE diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h index ed014dd157..1261e1757c 100644 --- a/src/corelib/tools/qbytearraylist.h +++ b/src/corelib/tools/qbytearraylist.h @@ -50,23 +50,24 @@ QT_BEGIN_NAMESPACE typedef QListIterator<QByteArray> QByteArrayListIterator; typedef QMutableListIterator<QByteArray> QMutableByteArrayListIterator; -#ifndef Q_QDOC +#ifndef Q_CLANG_QDOC typedef QList<QByteArray> QByteArrayList; namespace QtPrivate { QByteArray Q_CORE_EXPORT QByteArrayList_join(const QByteArrayList *that, const char *separator, int separatorLength); + int Q_CORE_EXPORT QByteArrayList_indexOf(const QByteArrayList *that, const char *needle, int from); } #endif -#ifdef Q_QDOC +#ifdef Q_CLANG_QDOC class QByteArrayList : public QList<QByteArray> #else template <> struct QListSpecialMethods<QByteArray> #endif { -#ifndef Q_QDOC +#ifndef Q_CLANG_QDOC protected: - ~QListSpecialMethods() {} + ~QListSpecialMethods() = default; #endif public: inline QByteArray join() const @@ -76,6 +77,9 @@ public: inline QByteArray join(char sep) const { return QtPrivate::QByteArrayList_join(self(), &sep, 1); } + inline int indexOf(const char *needle, int from = 0) const + { return QtPrivate::QByteArrayList_indexOf(self(), needle, from); } + private: typedef QList<QByteArray> Self; Self *self() { return static_cast<Self *>(this); } diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp index 72f0e0519d..72e09226af 100644 --- a/src/corelib/tools/qbytearraymatcher.cpp +++ b/src/corelib/tools/qbytearraymatcher.cpp @@ -116,9 +116,9 @@ static inline int bm_find(const uchar *cc, int l, int index, const uchar *puc, u Call setPattern() to give it a pattern to match. */ QByteArrayMatcher::QByteArrayMatcher() - : d(0) + : d(nullptr) { - p.p = 0; + p.p = nullptr; p.l = 0; memset(p.q_skiptable, 0, sizeof(p.q_skiptable)); } @@ -129,7 +129,7 @@ QByteArrayMatcher::QByteArrayMatcher() the destructor does not delete \a pattern. */ QByteArrayMatcher::QByteArrayMatcher(const char *pattern, int length) - : d(0) + : d(nullptr) { p.p = reinterpret_cast<const uchar *>(pattern); p.l = length; @@ -141,7 +141,7 @@ QByteArrayMatcher::QByteArrayMatcher(const char *pattern, int length) Call indexIn() to perform a search. */ QByteArrayMatcher::QByteArrayMatcher(const QByteArray &pattern) - : d(0), q_pattern(pattern) + : d(nullptr), q_pattern(pattern) { p.p = reinterpret_cast<const uchar *>(pattern.constData()); p.l = pattern.size(); @@ -152,7 +152,7 @@ QByteArrayMatcher::QByteArrayMatcher(const QByteArray &pattern) Copies the \a other byte array matcher to this byte array matcher. */ QByteArrayMatcher::QByteArrayMatcher(const QByteArrayMatcher &other) - : d(0) + : d(nullptr) { operator=(other); } @@ -404,7 +404,7 @@ int qFindByteArray( /*! \internal */ -int QStaticByteArrayMatcherBase::indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const Q_DECL_NOTHROW +int QStaticByteArrayMatcherBase::indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const noexcept { if (from < 0) from = 0; diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index dafaea9c12..0eedfc1d20 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -90,15 +90,15 @@ class QStaticByteArrayMatcherBase uchar data[256]; } m_skiptable; protected: - explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcherBase(const char *pattern, uint n) Q_DECL_NOTHROW + explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcherBase(const char *pattern, uint n) noexcept : m_skiptable(generate(pattern, n)) {} // compiler-generated copy/more ctors/assignment operators are ok! // compiler-generated dtor is ok! - Q_CORE_EXPORT int indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const Q_DECL_NOTHROW; + Q_CORE_EXPORT int indexOfIn(const char *needle, uint nlen, const char *haystack, int hlen, int from) const noexcept; private: - static Q_DECL_RELAXED_CONSTEXPR Skiptable generate(const char *pattern, uint n) Q_DECL_NOTHROW + static Q_DECL_RELAXED_CONSTEXPR Skiptable generate(const char *pattern, uint n) noexcept { const auto uchar_max = (std::numeric_limits<uchar>::max)(); uchar max = n > uchar_max ? uchar_max : n; @@ -140,23 +140,23 @@ class QStaticByteArrayMatcher : QStaticByteArrayMatcherBase char m_pattern[N]; Q_STATIC_ASSERT_X(N > 2, "QStaticByteArrayMatcher makes no sense for finding a single-char pattern"); public: - explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher(const char (&patternToMatch)[N]) Q_DECL_NOTHROW + explicit Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher(const char (&patternToMatch)[N]) noexcept : QStaticByteArrayMatcherBase(patternToMatch, N - 1), m_pattern() { for (uint i = 0; i < N; ++i) m_pattern[i] = patternToMatch[i]; } - int indexIn(const QByteArray &haystack, int from = 0) const Q_DECL_NOTHROW + int indexIn(const QByteArray &haystack, int from = 0) const noexcept { return this->indexOfIn(m_pattern, N - 1, haystack.data(), haystack.size(), from); } - int indexIn(const char *haystack, int hlen, int from = 0) const Q_DECL_NOTHROW + int indexIn(const char *haystack, int hlen, int from = 0) const noexcept { return this->indexOfIn(m_pattern, N - 1, haystack, hlen, from); } QByteArray pattern() const { return QByteArray(m_pattern, int(N - 1)); } }; template <uint N> -Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher<N> qMakeStaticByteArrayMatcher(const char (&pattern)[N]) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR QStaticByteArrayMatcher<N> qMakeStaticByteArrayMatcher(const char (&pattern)[N]) noexcept { return QStaticByteArrayMatcher<N>(pattern); } QT_END_NAMESPACE diff --git a/src/corelib/tools/qbytedata_p.h b/src/corelib/tools/qbytedata_p.h index 8331be112d..b319d75811 100644 --- a/src/corelib/tools/qbytedata_p.h +++ b/src/corelib/tools/qbytedata_p.h @@ -199,7 +199,7 @@ public: } // the number of QByteArrays - inline qint64 bufferCount() const + inline int bufferCount() const { return buffers.length(); } diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h index 8c0e7860f7..4fcde46fbc 100644 --- a/src/corelib/tools/qcache.h +++ b/src/corelib/tools/qcache.h @@ -51,7 +51,7 @@ class QCache struct Node { inline Node() : keyPtr(0) {} inline Node(T *data, int cost) - : keyPtr(0), t(data), c(cost), p(0), n(0) {} + : keyPtr(nullptr), t(data), c(cost), p(nullptr), n(nullptr) {} const Key *keyPtr; T *t; int c; Node *p,*n; }; Node *f, *l; @@ -71,14 +71,14 @@ class QCache inline T *relink(const Key &key) { typename QHash<Key, Node>::iterator i = hash.find(key); if (typename QHash<Key, Node>::const_iterator(i) == hash.constEnd()) - return 0; + return nullptr; Node &n = *i; if (f != &n) { if (n.p) n.p->n = n.n; if (n.n) n.n->p = n.p; if (l == &n) l = n.p; - n.p = 0; + n.p = nullptr; n.n = f; f->p = &n; f = &n; @@ -89,7 +89,7 @@ class QCache Q_DISABLE_COPY(QCache) public: - inline explicit QCache(int maxCost = 100) Q_DECL_NOTHROW; + inline explicit QCache(int maxCost = 100) noexcept; inline ~QCache() { clear(); } inline int maxCost() const { return mx; } @@ -116,13 +116,13 @@ private: }; template <class Key, class T> -inline QCache<Key, T>::QCache(int amaxCost) Q_DECL_NOTHROW - : f(0), l(0), mx(amaxCost), total(0) {} +inline QCache<Key, T>::QCache(int amaxCost) noexcept + : f(nullptr), l(nullptr), mx(amaxCost), total(0) {} template <class Key, class T> inline void QCache<Key,T>::clear() { while (f) { delete f->t; f = f->n; } - hash.clear(); l = 0; total = 0; } + hash.clear(); l = nullptr; total = 0; } template <class Key, class T> inline void QCache<Key,T>::setMaxCost(int m) @@ -153,11 +153,11 @@ inline T *QCache<Key,T>::take(const Key &key) { typename QHash<Key, Node>::iterator i = hash.find(key); if (i == hash.end()) - return 0; + return nullptr; Node &n = *i; T *t = n.t; - n.t = 0; + n.t = nullptr; unlink(n); return t; } diff --git a/src/corelib/tools/qcache.qdoc b/src/corelib/tools/qcache.qdoc index 31dfcb42cf..ffc21318f4 100644 --- a/src/corelib/tools/qcache.qdoc +++ b/src/corelib/tools/qcache.qdoc @@ -70,7 +70,7 @@ To look up objects in the cache, use object() or operator[](). This function looks up an object by its key, and returns either a pointer to the cached object (which is owned by - the cache) or 0. + the cache) or \nullptr. If you want to remove an object from the cache for a particular key, call remove(). This will also delete the object. If you want to @@ -171,7 +171,7 @@ /*! \fn template <class Key, class T> T *QCache<Key, T>::object(const Key &key) const - Returns the object associated with key \a key, or 0 if the key does + Returns the object associated with key \a key, or \nullptr if the key does not exist in the cache. \warning The returned object is owned by QCache and may be @@ -190,7 +190,7 @@ /*! \fn template <class Key, class T> T *QCache<Key, T>::operator[](const Key &key) const - Returns the object associated with key \a key, or 0 if the key does + Returns the object associated with key \a key, or \nullptr if the key does not exist in the cache. This is the same as object(). diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp index 47c853084b..e097e4a5fe 100644 --- a/src/corelib/tools/qchar.cpp +++ b/src/corelib/tools/qchar.cpp @@ -733,7 +733,7 @@ QT_BEGIN_NAMESPACE Note that this gives no indication of whether the character is available in a particular font. */ -bool QChar::isPrint(uint ucs4) Q_DECL_NOTHROW +bool QChar::isPrint(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -766,7 +766,7 @@ bool QChar::isPrint(uint ucs4) Q_DECL_NOTHROW /*! \internal */ -bool QT_FASTCALL QChar::isSpace_helper(uint ucs4) Q_DECL_NOTHROW +bool QT_FASTCALL QChar::isSpace_helper(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -792,7 +792,7 @@ bool QT_FASTCALL QChar::isSpace_helper(uint ucs4) Q_DECL_NOTHROW Returns \c true if the UCS-4-encoded character specified by \a ucs4 is a mark (Mark_* categories); otherwise returns \c false. */ -bool QChar::isMark(uint ucs4) Q_DECL_NOTHROW +bool QChar::isMark(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -816,7 +816,7 @@ bool QChar::isMark(uint ucs4) Q_DECL_NOTHROW Returns \c true if the UCS-4-encoded character specified by \a ucs4 is a punctuation mark (Punctuation_* categories); otherwise returns \c false. */ -bool QChar::isPunct(uint ucs4) Q_DECL_NOTHROW +bool QChar::isPunct(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -844,7 +844,7 @@ bool QChar::isPunct(uint ucs4) Q_DECL_NOTHROW Returns \c true if the UCS-4-encoded character specified by \a ucs4 is a symbol (Symbol_* categories); otherwise returns \c false. */ -bool QChar::isSymbol(uint ucs4) Q_DECL_NOTHROW +bool QChar::isSymbol(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -874,7 +874,7 @@ bool QChar::isSymbol(uint ucs4) Q_DECL_NOTHROW /*! \internal */ -bool QT_FASTCALL QChar::isLetter_helper(uint ucs4) Q_DECL_NOTHROW +bool QT_FASTCALL QChar::isLetter_helper(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -909,7 +909,7 @@ bool QT_FASTCALL QChar::isLetter_helper(uint ucs4) Q_DECL_NOTHROW /*! \internal */ -bool QT_FASTCALL QChar::isNumber_helper(uint ucs4) Q_DECL_NOTHROW +bool QT_FASTCALL QChar::isNumber_helper(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -938,7 +938,7 @@ bool QT_FASTCALL QChar::isNumber_helper(uint ucs4) Q_DECL_NOTHROW /*! \internal */ -bool QT_FASTCALL QChar::isLetterOrNumber_helper(uint ucs4) Q_DECL_NOTHROW +bool QT_FASTCALL QChar::isLetterOrNumber_helper(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -1101,7 +1101,7 @@ bool QT_FASTCALL QChar::isLetterOrNumber_helper(uint ucs4) Q_DECL_NOTHROW Returns the numeric value of the digit specified by the UCS-4-encoded character, \a ucs4, or -1 if the character is not a digit. */ -int QChar::digitValue(uint ucs4) Q_DECL_NOTHROW +int QChar::digitValue(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return -1; @@ -1118,7 +1118,7 @@ int QChar::digitValue(uint ucs4) Q_DECL_NOTHROW \overload Returns the category of the UCS-4-encoded character specified by \a ucs4. */ -QChar::Category QChar::category(uint ucs4) Q_DECL_NOTHROW +QChar::Category QChar::category(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return QChar::Other_NotAssigned; @@ -1135,7 +1135,7 @@ QChar::Category QChar::category(uint ucs4) Q_DECL_NOTHROW \overload Returns the direction of the UCS-4-encoded character specified by \a ucs4. */ -QChar::Direction QChar::direction(uint ucs4) Q_DECL_NOTHROW +QChar::Direction QChar::direction(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return QChar::DirL; @@ -1158,7 +1158,7 @@ QChar::Direction QChar::direction(uint ucs4) Q_DECL_NOTHROW character specified by \a ucs4 (needed for certain languages such as Arabic or Syriac). */ -QChar::JoiningType QChar::joiningType(uint ucs4) Q_DECL_NOTHROW +QChar::JoiningType QChar::joiningType(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return QChar::Joining_None; @@ -1181,7 +1181,7 @@ QChar::JoiningType QChar::joiningType(uint ucs4) Q_DECL_NOTHROW Returns information about the joining properties of the UCS-4-encoded character specified by \a ucs4 (needed for certain languages such as Arabic). */ -QChar::Joining QChar::joining(uint ucs4) Q_DECL_NOTHROW +QChar::Joining QChar::joining(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return QChar::OtherJoining; @@ -1217,7 +1217,7 @@ QChar::Joining QChar::joining(uint ucs4) Q_DECL_NOTHROW \sa mirroredChar() */ -bool QChar::hasMirrored(uint ucs4) Q_DECL_NOTHROW +bool QChar::hasMirrored(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return false; @@ -1299,7 +1299,7 @@ bool QChar::hasMirrored(uint ucs4) Q_DECL_NOTHROW \sa hasMirrored() */ -uint QChar::mirroredChar(uint ucs4) Q_DECL_NOTHROW +uint QChar::mirroredChar(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return ucs4; @@ -1339,7 +1339,7 @@ static const unsigned short * QT_FASTCALL decompositionHelper if (index == 0xffff) { *length = 0; *tag = QChar::NoDecomposition; - return 0; + return nullptr; } const unsigned short *decomposition = uc_decomposition_map+index; @@ -1383,7 +1383,7 @@ QString QChar::decomposition(uint ucs4) Returns the tag defining the composition of the UCS-4-encoded character specified by \a ucs4. Returns QChar::NoDecomposition if no decomposition exists. */ -QChar::Decomposition QChar::decompositionTag(uint ucs4) Q_DECL_NOTHROW +QChar::Decomposition QChar::decompositionTag(uint ucs4) noexcept { if (ucs4 >= Hangul_SBase && ucs4 < Hangul_SBase + Hangul_SCount) return QChar::Canonical; @@ -1409,7 +1409,7 @@ QChar::Decomposition QChar::decompositionTag(uint ucs4) Q_DECL_NOTHROW Returns the combining class for the UCS-4-encoded character specified by \a ucs4, as defined in the Unicode standard. */ -unsigned char QChar::combiningClass(uint ucs4) Q_DECL_NOTHROW +unsigned char QChar::combiningClass(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return 0; @@ -1430,7 +1430,7 @@ unsigned char QChar::combiningClass(uint ucs4) Q_DECL_NOTHROW Returns the Unicode script property value for the character specified in its UCS-4-encoded form as \a ucs4. */ -QChar::Script QChar::script(uint ucs4) Q_DECL_NOTHROW +QChar::Script QChar::script(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return QChar::Script_Unknown; @@ -1448,7 +1448,7 @@ QChar::Script QChar::script(uint ucs4) Q_DECL_NOTHROW Returns the Unicode version that introduced the character specified in its UCS-4-encoded form as \a ucs4. */ -QChar::UnicodeVersion QChar::unicodeVersion(uint ucs4) Q_DECL_NOTHROW +QChar::UnicodeVersion QChar::unicodeVersion(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return QChar::Unicode_Unassigned; @@ -1458,14 +1458,14 @@ QChar::UnicodeVersion QChar::unicodeVersion(uint ucs4) Q_DECL_NOTHROW /*! Returns the most recent supported Unicode version. */ -QChar::UnicodeVersion QChar::currentUnicodeVersion() Q_DECL_NOTHROW +QChar::UnicodeVersion QChar::currentUnicodeVersion() noexcept { return UNICODE_DATA_VERSION; } template <typename Traits, typename T> -Q_DECL_CONST_FUNCTION static inline T convertCase_helper(T uc) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION static inline T convertCase_helper(T uc) noexcept { const QUnicodeTables::Properties *prop = qGetProp(uc); @@ -1491,7 +1491,7 @@ Q_DECL_CONST_FUNCTION static inline T convertCase_helper(T uc) Q_DECL_NOTHROW by \a ucs4 if the character is uppercase or titlecase; otherwise returns the character itself. */ -uint QChar::toLower(uint ucs4) Q_DECL_NOTHROW +uint QChar::toLower(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return ucs4; @@ -1511,7 +1511,7 @@ uint QChar::toLower(uint ucs4) Q_DECL_NOTHROW by \a ucs4 if the character is lowercase or titlecase; otherwise returns the character itself. */ -uint QChar::toUpper(uint ucs4) Q_DECL_NOTHROW +uint QChar::toUpper(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return ucs4; @@ -1531,7 +1531,7 @@ uint QChar::toUpper(uint ucs4) Q_DECL_NOTHROW by \a ucs4 if the character is lowercase or uppercase; otherwise returns the character itself. */ -uint QChar::toTitleCase(uint ucs4) Q_DECL_NOTHROW +uint QChar::toTitleCase(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return ucs4; @@ -1546,7 +1546,7 @@ static inline uint foldCase(const ushort *ch, const ushort *start) return convertCase_helper<QUnicodeTables::CasefoldTraits>(ucs4); } -static inline uint foldCase(uint ch, uint &last) Q_DECL_NOTHROW +static inline uint foldCase(uint ch, uint &last) noexcept { uint ucs4 = ch; if (QChar::isLowSurrogate(ucs4) && QChar::isHighSurrogate(last)) @@ -1555,12 +1555,12 @@ static inline uint foldCase(uint ch, uint &last) Q_DECL_NOTHROW return convertCase_helper<QUnicodeTables::CasefoldTraits>(ucs4); } -static inline ushort foldCase(ushort ch) Q_DECL_NOTHROW +static inline ushort foldCase(ushort ch) noexcept { return convertCase_helper<QUnicodeTables::CasefoldTraits>(ch); } -static inline QChar foldCase(QChar ch) Q_DECL_NOTHROW +static inline QChar foldCase(QChar ch) noexcept { return QChar(foldCase(ch.unicode())); } @@ -1577,7 +1577,7 @@ static inline QChar foldCase(QChar ch) Q_DECL_NOTHROW Returns the case folded equivalent of the UCS-4-encoded character specified by \a ucs4. For most Unicode characters this is the same as toLower(). */ -uint QChar::toCaseFolded(uint ucs4) Q_DECL_NOTHROW +uint QChar::toCaseFolded(uint ucs4) noexcept { if (ucs4 > LastValidCodePoint) return ucs4; diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 8590b91ba3..73344ecf52 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -50,14 +50,27 @@ class QString; struct QLatin1Char { public: - Q_DECL_CONSTEXPR inline explicit QLatin1Char(char c) Q_DECL_NOTHROW : ch(c) {} - Q_DECL_CONSTEXPR inline char toLatin1() const Q_DECL_NOTHROW { return ch; } - Q_DECL_CONSTEXPR inline ushort unicode() const Q_DECL_NOTHROW { return ushort(uchar(ch)); } + Q_DECL_CONSTEXPR inline explicit QLatin1Char(char c) noexcept : ch(c) {} + Q_DECL_CONSTEXPR inline char toLatin1() const noexcept { return ch; } + Q_DECL_CONSTEXPR inline ushort unicode() const noexcept { return ushort(uchar(ch)); } private: char ch; }; +Q_DECL_CONSTEXPR inline bool operator==(char lhs, QLatin1Char rhs) noexcept { return lhs == rhs.toLatin1(); } +Q_DECL_CONSTEXPR inline bool operator!=(char lhs, QLatin1Char rhs) noexcept { return lhs != rhs.toLatin1(); } +Q_DECL_CONSTEXPR inline bool operator<=(char lhs, QLatin1Char rhs) noexcept { return lhs <= rhs.toLatin1(); } +Q_DECL_CONSTEXPR inline bool operator>=(char lhs, QLatin1Char rhs) noexcept { return lhs >= rhs.toLatin1(); } +Q_DECL_CONSTEXPR inline bool operator< (char lhs, QLatin1Char rhs) noexcept { return lhs < rhs.toLatin1(); } +Q_DECL_CONSTEXPR inline bool operator> (char lhs, QLatin1Char rhs) noexcept { return lhs > rhs.toLatin1(); } + +Q_DECL_CONSTEXPR inline bool operator==(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() == rhs; } +Q_DECL_CONSTEXPR inline bool operator!=(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() != rhs; } +Q_DECL_CONSTEXPR inline bool operator<=(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() <= rhs; } +Q_DECL_CONSTEXPR inline bool operator>=(QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() >= rhs; } +Q_DECL_CONSTEXPR inline bool operator< (QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() < rhs; } +Q_DECL_CONSTEXPR inline bool operator> (QLatin1Char lhs, char rhs) noexcept { return lhs.toLatin1() > rhs; } class Q_CORE_EXPORT QChar { public: @@ -78,30 +91,30 @@ public: LastValidCodePoint = 0x10ffff }; - Q_DECL_CONSTEXPR QChar() Q_DECL_NOTHROW : ucs(0) {} - Q_DECL_CONSTEXPR QChar(ushort rc) Q_DECL_NOTHROW : ucs(rc) {} // implicit - Q_DECL_CONSTEXPR QChar(uchar c, uchar r) Q_DECL_NOTHROW : ucs(ushort((r << 8) | c)) {} - Q_DECL_CONSTEXPR QChar(short rc) Q_DECL_NOTHROW : ucs(ushort(rc)) {} // implicit - Q_DECL_CONSTEXPR QChar(uint rc) Q_DECL_NOTHROW : ucs(ushort(rc & 0xffff)) {} - Q_DECL_CONSTEXPR QChar(int rc) Q_DECL_NOTHROW : ucs(ushort(rc & 0xffff)) {} - Q_DECL_CONSTEXPR QChar(SpecialCharacter s) Q_DECL_NOTHROW : ucs(ushort(s)) {} // implicit - Q_DECL_CONSTEXPR QChar(QLatin1Char ch) Q_DECL_NOTHROW : ucs(ch.unicode()) {} // implicit + Q_DECL_CONSTEXPR QChar() noexcept : ucs(0) {} + Q_DECL_CONSTEXPR QChar(ushort rc) noexcept : ucs(rc) {} // implicit + Q_DECL_CONSTEXPR QChar(uchar c, uchar r) noexcept : ucs(ushort((r << 8) | c)) {} + Q_DECL_CONSTEXPR QChar(short rc) noexcept : ucs(ushort(rc)) {} // implicit + Q_DECL_CONSTEXPR QChar(uint rc) noexcept : ucs(ushort(rc & 0xffff)) {} + Q_DECL_CONSTEXPR QChar(int rc) noexcept : ucs(ushort(rc & 0xffff)) {} + Q_DECL_CONSTEXPR QChar(SpecialCharacter s) noexcept : ucs(ushort(s)) {} // implicit + Q_DECL_CONSTEXPR QChar(QLatin1Char ch) noexcept : ucs(ch.unicode()) {} // implicit #if defined(Q_COMPILER_UNICODE_STRINGS) - Q_DECL_CONSTEXPR QChar(char16_t ch) Q_DECL_NOTHROW : ucs(ushort(ch)) {} // implicit + Q_DECL_CONSTEXPR QChar(char16_t ch) noexcept : ucs(ushort(ch)) {} // implicit #endif #if defined(Q_OS_WIN) Q_STATIC_ASSERT(sizeof(wchar_t) == sizeof(ushort)); #endif #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) # if !defined(_WCHAR_T_DEFINED) || defined(_NATIVE_WCHAR_T_DEFINED) - Q_DECL_CONSTEXPR QChar(wchar_t ch) Q_DECL_NOTHROW : ucs(ushort(ch)) {} // implicit + Q_DECL_CONSTEXPR QChar(wchar_t ch) noexcept : ucs(ushort(ch)) {} // implicit # endif #endif #ifndef QT_NO_CAST_FROM_ASCII - QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(char c) Q_DECL_NOTHROW : ucs(uchar(c)) { } + QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(char c) noexcept : ucs(uchar(c)) { } #ifndef QT_RESTRICTED_CAST_FROM_ASCII - QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(uchar c) Q_DECL_NOTHROW : ucs(c) { } + QT_ASCII_CAST_WARN Q_DECL_CONSTEXPR explicit QChar(uchar c) noexcept : ucs(c) { } #endif #endif // Unicode information @@ -411,11 +424,11 @@ public: }; // ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO - inline Category category() const Q_DECL_NOTHROW { return QChar::category(ucs); } - inline Direction direction() const Q_DECL_NOTHROW { return QChar::direction(ucs); } - inline JoiningType joiningType() const Q_DECL_NOTHROW { return QChar::joiningType(ucs); } + inline Category category() const noexcept { return QChar::category(ucs); } + inline Direction direction() const noexcept { return QChar::direction(ucs); } + inline JoiningType joiningType() const noexcept { return QChar::joiningType(ucs); } #if QT_DEPRECATED_SINCE(5, 3) - QT_DEPRECATED inline Joining joining() const Q_DECL_NOTHROW + QT_DEPRECATED inline Joining joining() const noexcept { switch (QChar::joiningType(ucs)) { case QChar::Joining_Causing: return QChar::Center; @@ -428,198 +441,198 @@ public: } } #endif - inline unsigned char combiningClass() const Q_DECL_NOTHROW { return QChar::combiningClass(ucs); } + inline unsigned char combiningClass() const noexcept { return QChar::combiningClass(ucs); } - inline QChar mirroredChar() const Q_DECL_NOTHROW { return QChar::mirroredChar(ucs); } - inline bool hasMirrored() const Q_DECL_NOTHROW { return QChar::hasMirrored(ucs); } + inline QChar mirroredChar() const noexcept { return QChar::mirroredChar(ucs); } + inline bool hasMirrored() const noexcept { return QChar::hasMirrored(ucs); } QString decomposition() const; - inline Decomposition decompositionTag() const Q_DECL_NOTHROW { return QChar::decompositionTag(ucs); } + inline Decomposition decompositionTag() const noexcept { return QChar::decompositionTag(ucs); } - inline int digitValue() const Q_DECL_NOTHROW { return QChar::digitValue(ucs); } - inline QChar toLower() const Q_DECL_NOTHROW { return QChar::toLower(ucs); } - inline QChar toUpper() const Q_DECL_NOTHROW { return QChar::toUpper(ucs); } - inline QChar toTitleCase() const Q_DECL_NOTHROW { return QChar::toTitleCase(ucs); } - inline QChar toCaseFolded() const Q_DECL_NOTHROW { return QChar::toCaseFolded(ucs); } + inline int digitValue() const noexcept { return QChar::digitValue(ucs); } + inline QChar toLower() const noexcept { return QChar::toLower(ucs); } + inline QChar toUpper() const noexcept { return QChar::toUpper(ucs); } + inline QChar toTitleCase() const noexcept { return QChar::toTitleCase(ucs); } + inline QChar toCaseFolded() const noexcept { return QChar::toCaseFolded(ucs); } - inline Script script() const Q_DECL_NOTHROW { return QChar::script(ucs); } + inline Script script() const noexcept { return QChar::script(ucs); } - inline UnicodeVersion unicodeVersion() const Q_DECL_NOTHROW { return QChar::unicodeVersion(ucs); } + inline UnicodeVersion unicodeVersion() const noexcept { return QChar::unicodeVersion(ucs); } #if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED Q_DECL_CONSTEXPR inline char toAscii() const Q_DECL_NOTHROW { return toLatin1(); } + QT_DEPRECATED Q_DECL_CONSTEXPR inline char toAscii() const noexcept { return toLatin1(); } #endif - Q_DECL_CONSTEXPR inline char toLatin1() const Q_DECL_NOTHROW { return ucs > 0xff ? '\0' : char(ucs); } - Q_DECL_CONSTEXPR inline ushort unicode() const Q_DECL_NOTHROW { return ucs; } - Q_DECL_RELAXED_CONSTEXPR inline ushort &unicode() Q_DECL_NOTHROW { return ucs; } + Q_DECL_CONSTEXPR inline char toLatin1() const noexcept { return ucs > 0xff ? '\0' : char(ucs); } + Q_DECL_CONSTEXPR inline ushort unicode() const noexcept { return ucs; } + Q_DECL_RELAXED_CONSTEXPR inline ushort &unicode() noexcept { return ucs; } #if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED static Q_DECL_CONSTEXPR inline QChar fromAscii(char c) Q_DECL_NOTHROW + QT_DEPRECATED static Q_DECL_CONSTEXPR inline QChar fromAscii(char c) noexcept { return fromLatin1(c); } #endif - static Q_DECL_CONSTEXPR inline QChar fromLatin1(char c) Q_DECL_NOTHROW { return QChar(ushort(uchar(c))); } - - Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW { return ucs == 0; } - - inline bool isPrint() const Q_DECL_NOTHROW { return QChar::isPrint(ucs); } - Q_DECL_CONSTEXPR inline bool isSpace() const Q_DECL_NOTHROW { return QChar::isSpace(ucs); } - inline bool isMark() const Q_DECL_NOTHROW { return QChar::isMark(ucs); } - inline bool isPunct() const Q_DECL_NOTHROW { return QChar::isPunct(ucs); } - inline bool isSymbol() const Q_DECL_NOTHROW { return QChar::isSymbol(ucs); } - Q_DECL_CONSTEXPR inline bool isLetter() const Q_DECL_NOTHROW { return QChar::isLetter(ucs); } - Q_DECL_CONSTEXPR inline bool isNumber() const Q_DECL_NOTHROW { return QChar::isNumber(ucs); } - Q_DECL_CONSTEXPR inline bool isLetterOrNumber() const Q_DECL_NOTHROW { return QChar::isLetterOrNumber(ucs); } - Q_DECL_CONSTEXPR inline bool isDigit() const Q_DECL_NOTHROW { return QChar::isDigit(ucs); } - Q_DECL_CONSTEXPR inline bool isLower() const Q_DECL_NOTHROW { return QChar::isLower(ucs); } - Q_DECL_CONSTEXPR inline bool isUpper() const Q_DECL_NOTHROW { return QChar::isUpper(ucs); } - Q_DECL_CONSTEXPR inline bool isTitleCase() const Q_DECL_NOTHROW { return QChar::isTitleCase(ucs); } - - Q_DECL_CONSTEXPR inline bool isNonCharacter() const Q_DECL_NOTHROW { return QChar::isNonCharacter(ucs); } - Q_DECL_CONSTEXPR inline bool isHighSurrogate() const Q_DECL_NOTHROW { return QChar::isHighSurrogate(ucs); } - Q_DECL_CONSTEXPR inline bool isLowSurrogate() const Q_DECL_NOTHROW { return QChar::isLowSurrogate(ucs); } - Q_DECL_CONSTEXPR inline bool isSurrogate() const Q_DECL_NOTHROW { return QChar::isSurrogate(ucs); } - - Q_DECL_CONSTEXPR inline uchar cell() const Q_DECL_NOTHROW { return uchar(ucs & 0xff); } - Q_DECL_CONSTEXPR inline uchar row() const Q_DECL_NOTHROW { return uchar((ucs>>8)&0xff); } - Q_DECL_RELAXED_CONSTEXPR inline void setCell(uchar acell) Q_DECL_NOTHROW { ucs = ushort((ucs & 0xff00) + acell); } - Q_DECL_RELAXED_CONSTEXPR inline void setRow(uchar arow) Q_DECL_NOTHROW { ucs = ushort((ushort(arow)<<8) + (ucs&0xff)); } - - static Q_DECL_CONSTEXPR inline bool isNonCharacter(uint ucs4) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline QChar fromLatin1(char c) noexcept { return QChar(ushort(uchar(c))); } + + Q_DECL_CONSTEXPR inline bool isNull() const noexcept { return ucs == 0; } + + inline bool isPrint() const noexcept { return QChar::isPrint(ucs); } + Q_DECL_CONSTEXPR inline bool isSpace() const noexcept { return QChar::isSpace(ucs); } + inline bool isMark() const noexcept { return QChar::isMark(ucs); } + inline bool isPunct() const noexcept { return QChar::isPunct(ucs); } + inline bool isSymbol() const noexcept { return QChar::isSymbol(ucs); } + Q_DECL_CONSTEXPR inline bool isLetter() const noexcept { return QChar::isLetter(ucs); } + Q_DECL_CONSTEXPR inline bool isNumber() const noexcept { return QChar::isNumber(ucs); } + Q_DECL_CONSTEXPR inline bool isLetterOrNumber() const noexcept { return QChar::isLetterOrNumber(ucs); } + Q_DECL_CONSTEXPR inline bool isDigit() const noexcept { return QChar::isDigit(ucs); } + Q_DECL_CONSTEXPR inline bool isLower() const noexcept { return QChar::isLower(ucs); } + Q_DECL_CONSTEXPR inline bool isUpper() const noexcept { return QChar::isUpper(ucs); } + Q_DECL_CONSTEXPR inline bool isTitleCase() const noexcept { return QChar::isTitleCase(ucs); } + + Q_DECL_CONSTEXPR inline bool isNonCharacter() const noexcept { return QChar::isNonCharacter(ucs); } + Q_DECL_CONSTEXPR inline bool isHighSurrogate() const noexcept { return QChar::isHighSurrogate(ucs); } + Q_DECL_CONSTEXPR inline bool isLowSurrogate() const noexcept { return QChar::isLowSurrogate(ucs); } + Q_DECL_CONSTEXPR inline bool isSurrogate() const noexcept { return QChar::isSurrogate(ucs); } + + Q_DECL_CONSTEXPR inline uchar cell() const noexcept { return uchar(ucs & 0xff); } + Q_DECL_CONSTEXPR inline uchar row() const noexcept { return uchar((ucs>>8)&0xff); } + Q_DECL_RELAXED_CONSTEXPR inline void setCell(uchar acell) noexcept { ucs = ushort((ucs & 0xff00) + acell); } + Q_DECL_RELAXED_CONSTEXPR inline void setRow(uchar arow) noexcept { ucs = ushort((ushort(arow)<<8) + (ucs&0xff)); } + + static Q_DECL_CONSTEXPR inline bool isNonCharacter(uint ucs4) noexcept { return ucs4 >= 0xfdd0 && (ucs4 <= 0xfdef || (ucs4 & 0xfffe) == 0xfffe); } - static Q_DECL_CONSTEXPR inline bool isHighSurrogate(uint ucs4) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline bool isHighSurrogate(uint ucs4) noexcept { return ((ucs4 & 0xfffffc00) == 0xd800); } - static Q_DECL_CONSTEXPR inline bool isLowSurrogate(uint ucs4) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline bool isLowSurrogate(uint ucs4) noexcept { return ((ucs4 & 0xfffffc00) == 0xdc00); } - static Q_DECL_CONSTEXPR inline bool isSurrogate(uint ucs4) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline bool isSurrogate(uint ucs4) noexcept { return (ucs4 - 0xd800u < 2048u); } - static Q_DECL_CONSTEXPR inline bool requiresSurrogates(uint ucs4) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline bool requiresSurrogates(uint ucs4) noexcept { return (ucs4 >= 0x10000); } - static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(ushort high, ushort low) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(ushort high, ushort low) noexcept { return (uint(high)<<10) + low - 0x35fdc00; } - static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(QChar high, QChar low) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline uint surrogateToUcs4(QChar high, QChar low) noexcept { return surrogateToUcs4(high.ucs, low.ucs); } - static Q_DECL_CONSTEXPR inline ushort highSurrogate(uint ucs4) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline ushort highSurrogate(uint ucs4) noexcept { return ushort((ucs4>>10) + 0xd7c0); } - static Q_DECL_CONSTEXPR inline ushort lowSurrogate(uint ucs4) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR inline ushort lowSurrogate(uint ucs4) noexcept { return ushort(ucs4%0x400 + 0xdc00); } - static Category QT_FASTCALL category(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static Direction QT_FASTCALL direction(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static JoiningType QT_FASTCALL joiningType(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static Category QT_FASTCALL category(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static Direction QT_FASTCALL direction(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static JoiningType QT_FASTCALL joiningType(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; #if QT_DEPRECATED_SINCE(5, 3) - QT_DEPRECATED static Joining QT_FASTCALL joining(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + QT_DEPRECATED static Joining QT_FASTCALL joining(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; #endif - static unsigned char QT_FASTCALL combiningClass(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static unsigned char QT_FASTCALL combiningClass(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; - static uint QT_FASTCALL mirroredChar(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static bool QT_FASTCALL hasMirrored(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static uint QT_FASTCALL mirroredChar(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static bool QT_FASTCALL hasMirrored(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; static QString QT_FASTCALL decomposition(uint ucs4); - static Decomposition QT_FASTCALL decompositionTag(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static Decomposition QT_FASTCALL decompositionTag(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; - static int QT_FASTCALL digitValue(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static uint QT_FASTCALL toLower(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static uint QT_FASTCALL toUpper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static uint QT_FASTCALL toTitleCase(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static uint QT_FASTCALL toCaseFolded(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static int QT_FASTCALL digitValue(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static uint QT_FASTCALL toLower(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static uint QT_FASTCALL toUpper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static uint QT_FASTCALL toTitleCase(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static uint QT_FASTCALL toCaseFolded(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; - static Script QT_FASTCALL script(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static Script QT_FASTCALL script(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; - static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; - static UnicodeVersion QT_FASTCALL currentUnicodeVersion() Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static UnicodeVersion QT_FASTCALL currentUnicodeVersion() noexcept Q_DECL_CONST_FUNCTION; - static bool QT_FASTCALL isPrint(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static Q_DECL_CONSTEXPR inline bool isSpace(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static bool QT_FASTCALL isPrint(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static Q_DECL_CONSTEXPR inline bool isSpace(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { // note that [0x09..0x0d] + 0x85 are exceptional Cc-s and must be handled explicitly return ucs4 == 0x20 || (ucs4 <= 0x0d && ucs4 >= 0x09) || (ucs4 > 127 && (ucs4 == 0x85 || ucs4 == 0xa0 || QChar::isSpace_helper(ucs4))); } - static bool QT_FASTCALL isMark(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static bool QT_FASTCALL isPunct(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static bool QT_FASTCALL isSymbol(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static Q_DECL_CONSTEXPR inline bool isLetter(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static bool QT_FASTCALL isMark(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static bool QT_FASTCALL isPunct(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static bool QT_FASTCALL isSymbol(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static Q_DECL_CONSTEXPR inline bool isLetter(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { return (ucs4 >= 'A' && ucs4 <= 'z' && (ucs4 >= 'a' || ucs4 <= 'Z')) || (ucs4 > 127 && QChar::isLetter_helper(ucs4)); } - static Q_DECL_CONSTEXPR inline bool isNumber(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static Q_DECL_CONSTEXPR inline bool isNumber(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { return (ucs4 <= '9' && ucs4 >= '0') || (ucs4 > 127 && QChar::isNumber_helper(ucs4)); } - static Q_DECL_CONSTEXPR inline bool isLetterOrNumber(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static Q_DECL_CONSTEXPR inline bool isLetterOrNumber(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { return (ucs4 >= 'A' && ucs4 <= 'z' && (ucs4 >= 'a' || ucs4 <= 'Z')) || (ucs4 >= '0' && ucs4 <= '9') || (ucs4 > 127 && QChar::isLetterOrNumber_helper(ucs4)); } - static Q_DECL_CONSTEXPR inline bool isDigit(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static Q_DECL_CONSTEXPR inline bool isDigit(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { return (ucs4 <= '9' && ucs4 >= '0') || (ucs4 > 127 && QChar::category(ucs4) == Number_DecimalDigit); } - static Q_DECL_CONSTEXPR inline bool isLower(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static Q_DECL_CONSTEXPR inline bool isLower(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { return (ucs4 <= 'z' && ucs4 >= 'a') || (ucs4 > 127 && QChar::category(ucs4) == Letter_Lowercase); } - static Q_DECL_CONSTEXPR inline bool isUpper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static Q_DECL_CONSTEXPR inline bool isUpper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { return (ucs4 <= 'Z' && ucs4 >= 'A') || (ucs4 > 127 && QChar::category(ucs4) == Letter_Uppercase); } - static Q_DECL_CONSTEXPR inline bool isTitleCase(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION + static Q_DECL_CONSTEXPR inline bool isTitleCase(uint ucs4) noexcept Q_DECL_CONST_FUNCTION { return ucs4 > 127 && QChar::category(ucs4) == Letter_Titlecase; } private: - static bool QT_FASTCALL isSpace_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static bool QT_FASTCALL isLetter_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static bool QT_FASTCALL isNumber_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; - static bool QT_FASTCALL isLetterOrNumber_helper(uint ucs4) Q_DECL_NOTHROW Q_DECL_CONST_FUNCTION; + static bool QT_FASTCALL isSpace_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static bool QT_FASTCALL isLetter_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static bool QT_FASTCALL isNumber_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; + static bool QT_FASTCALL isLetterOrNumber_helper(uint ucs4) noexcept Q_DECL_CONST_FUNCTION; #ifdef QT_NO_CAST_FROM_ASCII - QChar(char c) Q_DECL_NOTHROW; - QChar(uchar c) Q_DECL_NOTHROW; + QChar(char c) noexcept; + QChar(uchar c) noexcept; #endif - friend Q_DECL_CONSTEXPR bool operator==(QChar, QChar) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR bool operator< (QChar, QChar) Q_DECL_NOTHROW; + friend Q_DECL_CONSTEXPR bool operator==(QChar, QChar) noexcept; + friend Q_DECL_CONSTEXPR bool operator< (QChar, QChar) noexcept; ushort ucs; }; Q_DECLARE_TYPEINFO(QChar, Q_MOVABLE_TYPE); -Q_DECL_CONSTEXPR inline bool operator==(QChar c1, QChar c2) Q_DECL_NOTHROW { return c1.ucs == c2.ucs; } -Q_DECL_CONSTEXPR inline bool operator< (QChar c1, QChar c2) Q_DECL_NOTHROW { return c1.ucs < c2.ucs; } +Q_DECL_CONSTEXPR inline bool operator==(QChar c1, QChar c2) noexcept { return c1.ucs == c2.ucs; } +Q_DECL_CONSTEXPR inline bool operator< (QChar c1, QChar c2) noexcept { return c1.ucs < c2.ucs; } -Q_DECL_CONSTEXPR inline bool operator!=(QChar c1, QChar c2) Q_DECL_NOTHROW { return !operator==(c1, c2); } -Q_DECL_CONSTEXPR inline bool operator>=(QChar c1, QChar c2) Q_DECL_NOTHROW { return !operator< (c1, c2); } -Q_DECL_CONSTEXPR inline bool operator> (QChar c1, QChar c2) Q_DECL_NOTHROW { return operator< (c2, c1); } -Q_DECL_CONSTEXPR inline bool operator<=(QChar c1, QChar c2) Q_DECL_NOTHROW { return !operator< (c2, c1); } +Q_DECL_CONSTEXPR inline bool operator!=(QChar c1, QChar c2) noexcept { return !operator==(c1, c2); } +Q_DECL_CONSTEXPR inline bool operator>=(QChar c1, QChar c2) noexcept { return !operator< (c1, c2); } +Q_DECL_CONSTEXPR inline bool operator> (QChar c1, QChar c2) noexcept { return operator< (c2, c1); } +Q_DECL_CONSTEXPR inline bool operator<=(QChar c1, QChar c2) noexcept { return !operator< (c2, c1); } -Q_DECL_CONSTEXPR inline bool operator==(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return lhs.isNull(); } -Q_DECL_CONSTEXPR inline bool operator< (QChar, std::nullptr_t) Q_DECL_NOTHROW { return false; } -Q_DECL_CONSTEXPR inline bool operator==(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return rhs.isNull(); } -Q_DECL_CONSTEXPR inline bool operator< (std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !rhs.isNull(); } +Q_DECL_CONSTEXPR inline bool operator==(QChar lhs, std::nullptr_t) noexcept { return lhs.isNull(); } +Q_DECL_CONSTEXPR inline bool operator< (QChar, std::nullptr_t) noexcept { return false; } +Q_DECL_CONSTEXPR inline bool operator==(std::nullptr_t, QChar rhs) noexcept { return rhs.isNull(); } +Q_DECL_CONSTEXPR inline bool operator< (std::nullptr_t, QChar rhs) noexcept { return !rhs.isNull(); } -Q_DECL_CONSTEXPR inline bool operator!=(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return !operator==(lhs, nullptr); } -Q_DECL_CONSTEXPR inline bool operator>=(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return !operator< (lhs, nullptr); } -Q_DECL_CONSTEXPR inline bool operator> (QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return operator< (nullptr, lhs); } -Q_DECL_CONSTEXPR inline bool operator<=(QChar lhs, std::nullptr_t) Q_DECL_NOTHROW { return !operator< (nullptr, lhs); } +Q_DECL_CONSTEXPR inline bool operator!=(QChar lhs, std::nullptr_t) noexcept { return !operator==(lhs, nullptr); } +Q_DECL_CONSTEXPR inline bool operator>=(QChar lhs, std::nullptr_t) noexcept { return !operator< (lhs, nullptr); } +Q_DECL_CONSTEXPR inline bool operator> (QChar lhs, std::nullptr_t) noexcept { return operator< (nullptr, lhs); } +Q_DECL_CONSTEXPR inline bool operator<=(QChar lhs, std::nullptr_t) noexcept { return !operator< (nullptr, lhs); } -Q_DECL_CONSTEXPR inline bool operator!=(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !operator==(nullptr, rhs); } -Q_DECL_CONSTEXPR inline bool operator>=(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !operator< (nullptr, rhs); } -Q_DECL_CONSTEXPR inline bool operator> (std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return operator< (rhs, nullptr); } -Q_DECL_CONSTEXPR inline bool operator<=(std::nullptr_t, QChar rhs) Q_DECL_NOTHROW { return !operator< (rhs, nullptr); } +Q_DECL_CONSTEXPR inline bool operator!=(std::nullptr_t, QChar rhs) noexcept { return !operator==(nullptr, rhs); } +Q_DECL_CONSTEXPR inline bool operator>=(std::nullptr_t, QChar rhs) noexcept { return !operator< (nullptr, rhs); } +Q_DECL_CONSTEXPR inline bool operator> (std::nullptr_t, QChar rhs) noexcept { return operator< (rhs, nullptr); } +Q_DECL_CONSTEXPR inline bool operator<=(std::nullptr_t, QChar rhs) noexcept { return !operator< (rhs, nullptr); } #ifndef QT_NO_DATASTREAM Q_CORE_EXPORT QDataStream &operator<<(QDataStream &, QChar); diff --git a/src/corelib/tools/qcollator.cpp b/src/corelib/tools/qcollator.cpp index 76dcf35833..958216bde8 100644 --- a/src/corelib/tools/qcollator.cpp +++ b/src/corelib/tools/qcollator.cpp @@ -46,7 +46,6 @@ QT_BEGIN_NAMESPACE - /*! \class QCollator \inmodule QtCore @@ -59,20 +58,32 @@ QT_BEGIN_NAMESPACE \ingroup string-processing \ingroup shared - QCollator is initialized with a QLocale and an optional collation strategy. It tries to - initialize the collator with the specified values. The collator can then be used to compare - and sort strings in a locale dependent fashion. + QCollator is initialized with a QLocale and an optional collation strategy. + It tries to initialize the collator with the specified values. The collator + can then be used to compare and sort strings in a locale dependent fashion. - A QCollator object can be used together with template based sorting algorithms such as std::sort - to sort a list of QStrings. + A QCollator object can be used together with template based sorting + algorithms such as std::sort to sort a list of QStrings. - In addition to the locale and collation strategy, several optional flags can be set that influence - the result of the collation. + In addition to the locale and collation strategy, several optional flags can + be set that influence the result of the collation. */ /*! - Constructs a QCollator from \a locale. If \a locale is not specified - the system's default locale is used. + \since 5.13 + + Constructs a QCollator using the system's default collation locale. + + \sa setLocale(), QLocale::collation() +*/ +QCollator::QCollator() + : d(new QCollatorPrivate(QLocale::system().collation())) +{ + d->init(); +} + +/*! + Constructs a QCollator from \a locale. \sa setLocale() */ @@ -128,9 +139,9 @@ QCollator &QCollator::operator=(const QCollator &other) Move constructor. Moves from \a other into this collator. - Note that a moved-from QCollator can only be destroyed or assigned - to. The effect of calling other functions than the destructor or - one of the assignment operators is undefined. + Note that a moved-from QCollator can only be destroyed or assigned to. + The effect of calling other functions than the destructor or one of the + assignment operators is undefined. */ /*! @@ -138,9 +149,9 @@ QCollator &QCollator::operator=(const QCollator &other) Move-assigns from \a other to this collator. - Note that a moved-from QCollator can only be destroyed or assigned - to. The effect of calling other functions than the destructor or - one of the assignment operators is undefined. + Note that a moved-from QCollator can only be destroyed or assigned to. + The effect of calling other functions than the destructor or one of the + assignment operators is undefined. */ /*! @@ -155,7 +166,7 @@ QCollator &QCollator::operator=(const QCollator &other) */ void QCollator::detach() { - if (d->ref.load() != 1) { + if (d->ref.loadRelaxed() != 1) { QCollatorPrivate *x = new QCollatorPrivate(d->locale); if (!d->ref.deref()) delete d; @@ -218,7 +229,8 @@ Qt::CaseSensitivity QCollator::caseSensitivity() const Enables numeric sorting mode when \a on is set to true. - This will enable proper sorting of numeric digits, so that e.g. 100 sorts after 99. + This will enable proper sorting of numeric digits, so that e.g. 100 sorts + after 99. By default this mode is off. @@ -248,11 +260,13 @@ bool QCollator::numericMode() const /*! \fn void QCollator::setIgnorePunctuation(bool on) - If \a on is set to true, punctuation characters and symbols are ignored when determining sort order. + If \a on is set to true, punctuation characters and symbols are ignored when + determining sort order. The default is locale dependent. - \note This method is not currently supported if Qt is configured to not use ICU on Linux. + \note This method is not currently supported if Qt is configured to not use + ICU on Linux. \sa ignorePunctuation() */ @@ -268,7 +282,8 @@ void QCollator::setIgnorePunctuation(bool on) /*! \fn bool QCollator::ignorePunctuation() const - Returns \c true if punctuation characters and symbols are ignored when determining sort order. + Returns \c true if punctuation characters and symbols are ignored when + determining sort order. \sa setIgnorePunctuation() */ @@ -278,35 +293,66 @@ bool QCollator::ignorePunctuation() const } /*! - \fn int QCollator::compare(const QString &s1, const QString &s2) const + \since 5.13 + \fn bool QCollator::operator()(QStringView s1, QStringView s2) const + \internal +*/ - Compares \a s1 with \a s2. Returns an integer less than, equal to, or greater than zero - depending on whether \a s1 is smaller, equal or larger than \a s2. - */ +/*! + \since 5.13 + \fn int QCollator::compare(QStringView s1, QStringView s2) const + + Compares \a s1 with \a s2. + Returns an integer less than, equal to, or greater than zero depending on + whether \a s1 sorts before, with or after \a s2. +*/ +#if QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QCollator::operator()(const QString &s1, const QString &s2) const \internal */ /*! - \fn int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const \overload - Compares \a s1 with \a s2. Returns an integer less than, equal to, or greater than zero - depending on whether \a s1 is smaller, equal or larger than \a s2. + Compares \a s1 with \a s2. + + Returns an integer less than, equal to, or greater than zero depending on + whether \a s1 sorts before, with or after \a s2. +*/ +int QCollator::compare(const QString &s1, const QString &s2) const +{ + return compare(QStringView(s1), QStringView(s2)); +} + +/*! + \overload + + Compares \a s1 with \a s2. + + Returns an integer less than, equal to, or greater than zero depending on + whether \a s1 sorts before, with or after \a s2. */ +int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const +{ + return compare(QStringView(s1), QStringView(s2)); +} /*! - \fn int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const \overload - Compares \a s1 with \a s2. \a len1 and \a len2 specify the length of the - QChar arrays pointer to by \a s1 and \a s2. + Compares \a s1 with \a s2. \a len1 and \a len2 specify the lengths of the + QChar arrays pointed to by \a s1 and \a s2. - Returns an integer less than, equal to, or greater than zero - depending on whether \a s1 is smaller, equal or larger than \a s2. + Returns an integer less than, equal to, or greater than zero depending on + whether \a s1 sorts before, with or after \a s2. */ +int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const +{ + return compare(QStringView(s1, len1), QStringView(s2, len2)); +} +#endif // QT_STRINGVIEW_LEVEL < 2 /*! \fn QCollatorSortKey QCollator::sortKey(const QString &string) const @@ -314,9 +360,9 @@ bool QCollator::ignorePunctuation() const Returns a sortKey for \a string. Creating the sort key is usually somewhat slower, than using the compare() - methods directly. But if the string is compared repeatedly (e.g. when sorting - a whole list of strings), it's usually faster to create the sort keys for each - string and then sort using the keys. + methods directly. But if the string is compared repeatedly (e.g. when + sorting a whole list of strings), it's usually faster to create the sort + keys for each string and then sort using the keys. \note Not supported with the C (a.k.a. POSIX) locale on Darwin. */ @@ -328,8 +374,8 @@ bool QCollator::ignorePunctuation() const \since 5.2 - The QCollatorSortKey class is always created by QCollator::sortKey() - and is used for fast strings collation, for example when collating many strings. + The QCollatorSortKey class is always created by QCollator::sortKey() and is + used for fast strings collation, for example when collating many strings. \reentrant \ingroup i18n @@ -398,9 +444,11 @@ QCollatorSortKey& QCollatorSortKey::operator=(const QCollatorSortKey &other) /*! \fn int QCollatorSortKey::compare(const QCollatorSortKey &otherKey) const - Compares the key to \a otherKey. Returns a negative value if the key - is less than \a otherKey, 0 if the key is equal to \a otherKey or a - positive value if the key is greater than \a otherKey. + Compares this key to \a otherKey. + + Returns a negative value if the key is less than \a otherKey, 0 if the key + is equal to \a otherKey or a positive value if the key is greater than \a + otherKey. \sa operator<() */ diff --git a/src/corelib/tools/qcollator.h b/src/corelib/tools/qcollator.h index 6fa199cb0f..6bb5038371 100644 --- a/src/corelib/tools/qcollator.h +++ b/src/corelib/tools/qcollator.h @@ -57,11 +57,9 @@ public: QCollatorSortKey(const QCollatorSortKey &other); ~QCollatorSortKey(); QCollatorSortKey &operator=(const QCollatorSortKey &other); -#ifdef Q_COMPILER_RVALUE_REFS - inline QCollatorSortKey &operator=(QCollatorSortKey &&other) Q_DECL_NOTHROW + inline QCollatorSortKey &operator=(QCollatorSortKey &&other) noexcept { swap(other); return *this; } -#endif - void swap(QCollatorSortKey &other) Q_DECL_NOTHROW + void swap(QCollatorSortKey &other) noexcept { d.swap(other.d); } int compare(const QCollatorSortKey &key) const; @@ -83,18 +81,17 @@ inline bool operator<(const QCollatorSortKey &lhs, const QCollatorSortKey &rhs) class Q_CORE_EXPORT QCollator { public: - explicit QCollator(const QLocale &locale = QLocale()); + QCollator(); + explicit QCollator(const QLocale &locale); QCollator(const QCollator &); ~QCollator(); QCollator &operator=(const QCollator &); -#ifdef Q_COMPILER_RVALUE_REFS - QCollator(QCollator &&other) Q_DECL_NOTHROW + QCollator(QCollator &&other) noexcept : d(other.d) { other.d = nullptr; } - QCollator &operator=(QCollator &&other) Q_DECL_NOTHROW + QCollator &operator=(QCollator &&other) noexcept { swap(other); return *this; } -#endif - void swap(QCollator &other) Q_DECL_NOTHROW + void swap(QCollator &other) noexcept { qSwap(d, other.d); } void setLocale(const QLocale &locale); @@ -109,12 +106,18 @@ public: void setIgnorePunctuation(bool on); bool ignorePunctuation() const; +#if QT_STRINGVIEW_LEVEL < 2 int compare(const QString &s1, const QString &s2) const; int compare(const QStringRef &s1, const QStringRef &s2) const; int compare(const QChar *s1, int len1, const QChar *s2, int len2) const; bool operator()(const QString &s1, const QString &s2) const { return compare(s1, s2) < 0; } +#endif + int compare(QStringView s1, QStringView s2) const; + + bool operator()(QStringView s1, QStringView s2) const + { return compare(s1, s2) < 0; } QCollatorSortKey sortKey(const QString &string) const; diff --git a/src/corelib/tools/qcollator_icu.cpp b/src/corelib/tools/qcollator_icu.cpp index ab45b9a1a1..8acda45070 100644 --- a/src/corelib/tools/qcollator_icu.cpp +++ b/src/corelib/tools/qcollator_icu.cpp @@ -78,7 +78,8 @@ void QCollatorPrivate::init() // and does case sensitive comparison. // UCOL_QUATERNARY is used as default in a few languages such as Japanese to take care of some // additional differences in those languages. - UColAttributeValue val = (caseSensitivity == Qt::CaseSensitive) ? UCOL_DEFAULT_STRENGTH : UCOL_SECONDARY; + UColAttributeValue val = (caseSensitivity == Qt::CaseSensitive) + ? UCOL_DEFAULT_STRENGTH : UCOL_SECONDARY; status = U_ZERO_ERROR; ucol_setAttribute(collator, UCOL_STRENGTH, val, &status); @@ -91,7 +92,8 @@ void QCollatorPrivate::init() qWarning("ucol_setAttribute: numeric collation failed: %d", status); status = U_ZERO_ERROR; - ucol_setAttribute(collator, UCOL_ALTERNATE_HANDLING, ignorePunctuation ? UCOL_SHIFTED : UCOL_NON_IGNORABLE, &status); + ucol_setAttribute(collator, UCOL_ALTERNATE_HANDLING, + ignorePunctuation ? UCOL_SHIFTED : UCOL_NON_IGNORABLE, &status); if (U_FAILURE(status)) qWarning("ucol_setAttribute: Alternate handling failed: %d", status); @@ -105,37 +107,20 @@ void QCollatorPrivate::cleanup() collator = nullptr; } -int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const +int QCollator::compare(QStringView s1, QStringView s2) const { if (d->dirty) d->init(); - if (d->collator) - return ucol_strcoll(d->collator, (const UChar *)s1, len1, (const UChar *)s2, len2); - - return QString::compare_helper(s1, len1, s2, len2, d->caseSensitivity); -} - -int QCollator::compare(const QString &s1, const QString &s2) const -{ - if (d->dirty) - d->init(); - - if (d->collator) - return compare(s1.constData(), s1.size(), s2.constData(), s2.size()); - - return QString::compare(s1, s2, d->caseSensitivity); -} - -int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const -{ - if (d->dirty) - d->init(); - - if (d->collator) - return compare(s1.constData(), s1.size(), s2.constData(), s2.size()); + if (d->collator) { + return ucol_strcoll(d->collator, + reinterpret_cast<const UChar *>(s1.data()), s1.size(), + reinterpret_cast<const UChar *>(s2.data()), s2.size()); + } - return QStringRef::compare(s1, s2, d->caseSensitivity); + return QString::compare_helper(s1.data(), s1.size(), + s2.data(), s2.size(), + d->caseSensitivity); } QCollatorSortKey QCollator::sortKey(const QString &string) const diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/tools/qcollator_macx.cpp index 42e67e0c12..071d7c048f 100644 --- a/src/corelib/tools/qcollator_macx.cpp +++ b/src/corelib/tools/qcollator_macx.cpp @@ -65,12 +65,12 @@ void QCollatorPrivate::init() return; LocaleRef localeRef; - int rc = LocaleRefFromLocaleString(QLocalePrivate::get(locale)->bcp47Name().constData(), &localeRef); - if (rc != 0) - qWarning("couldn't initialize the locale"); + OSStatus status = + LocaleRefFromLocaleString(QLocalePrivate::get(locale)->bcp47Name().constData(), &localeRef); + if (status != 0) + qWarning("Couldn't initialize the locale (%d)", int(status)); UInt32 options = 0; - if (caseSensitivity == Qt::CaseInsensitive) options |= kUCCollateCaseInsensitiveMask; if (numericMode) @@ -78,14 +78,9 @@ void QCollatorPrivate::init() if (!ignorePunctuation) options |= kUCCollatePunctuationSignificantMask; - OSStatus status = UCCreateCollator( - localeRef, - 0, - options, - &collator - ); + status = UCCreateCollator(localeRef, 0, options, &collator); if (status != 0) - qWarning("Couldn't initialize the collator"); + qWarning("Couldn't initialize the collator (%d)", int(status)); dirty = false; } @@ -97,18 +92,18 @@ void QCollatorPrivate::cleanup() collator = 0; } -int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const +int QCollator::compare(QStringView s1, QStringView s2) const { if (d->dirty) d->init(); if (!d->collator) - return QStringView(s1, len1).compare(QStringView(s2, len2), caseSensitivity()); + return s1.compare(s2, caseSensitivity()); SInt32 result; Boolean equivalent; UCCompareText(d->collator, - reinterpret_cast<const UniChar *>(s1), len1, - reinterpret_cast<const UniChar *>(s2), len2, + reinterpret_cast<const UniChar *>(s1.data()), s1.size(), + reinterpret_cast<const UniChar *>(s2.data()), s2.size(), &equivalent, &result); if (equivalent) @@ -116,16 +111,6 @@ int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) con return result < 0 ? -1 : 1; } -int QCollator::compare(const QString &str1, const QString &str2) const -{ - return compare(str1.constData(), str1.size(), str2.constData(), str2.size()); -} - -int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const -{ - return compare(s1.constData(), s1.size(), s2.constData(), s2.size()); -} - QCollatorSortKey QCollator::sortKey(const QString &string) const { if (d->dirty) @@ -139,13 +124,14 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const //Documentation recommends having it 5 times as big as the input QVector<UCCollationValue> ret(string.size() * 5); ItemCount actualSize; - int status = UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()), string.count(), - ret.size(), &actualSize, ret.data()); + int status = UCGetCollationKey(d->collator, + reinterpret_cast<const UniChar *>(string.constData()), + string.count(), ret.size(), &actualSize, ret.data()); - ret.resize(actualSize+1); + ret.resize(actualSize + 1); if (status == kUCOutputBufferTooSmall) { - UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()), string.count(), - ret.size(), &actualSize, ret.data()); + UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()), + string.count(), ret.size(), &actualSize, ret.data()); } ret[actualSize] = 0; return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret))); diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index 361c3fb987..fc2d434a8d 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -122,7 +122,7 @@ public: void cleanup(); private: - Q_DISABLE_COPY(QCollatorPrivate) + Q_DISABLE_COPY_MOVE(QCollatorPrivate) }; class QCollatorSortKeyPrivate : public QSharedData @@ -139,7 +139,7 @@ public: CollatorKeyType m_key; private: - Q_DISABLE_COPY(QCollatorSortKeyPrivate) + Q_DISABLE_COPY_MOVE(QCollatorSortKeyPrivate) }; diff --git a/src/corelib/tools/qcollator_posix.cpp b/src/corelib/tools/qcollator_posix.cpp index 81f97a02e1..9cbc539ebe 100644 --- a/src/corelib/tools/qcollator_posix.cpp +++ b/src/corelib/tools/qcollator_posix.cpp @@ -65,7 +65,7 @@ void QCollatorPrivate::cleanup() { } -static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, const QString &string) +static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, QStringView string) { ret.resize(string.length()); int len = string.toWCharArray(ret.data()); @@ -73,12 +73,7 @@ static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, const QString &str ret[len] = 0; } -int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const -{ - return compare(QString::fromRawData(s1, len1), QString::fromRawData(s2, len2)); -} - -int QCollator::compare(const QString &s1, const QString &s2) const +int QCollator::compare(QStringView s1, QStringView s2) const { if (d->isC()) return s1.compare(s2, caseSensitivity()); @@ -91,11 +86,6 @@ int QCollator::compare(const QString &s1, const QString &s2) const return std::wcscoll(array1.constData(), array2.constData()); } -int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const -{ - return compare(s1.toString(), s2.toString()); -} - QCollatorSortKey QCollator::sortKey(const QString &string) const { if (d->dirty) diff --git a/src/corelib/tools/qcollator_win.cpp b/src/corelib/tools/qcollator_win.cpp index 10cfdaa264..9d81de882f 100644 --- a/src/corelib/tools/qcollator_win.cpp +++ b/src/corelib/tools/qcollator_win.cpp @@ -87,30 +87,30 @@ void QCollatorPrivate::cleanup() { } - -int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const +int QCollator::compare(QStringView s1, QStringView s2) const { if (d->isC()) - return QString::compare_helper(s1, len1, s2, len2, d->caseSensitivity); + return s1.compare(s2, d->caseSensitivity); if (d->dirty) d->init(); //* from Windows documentation * - // Returns one of the following values if successful. To maintain the C runtime convention of - // comparing strings, the value 2 can be subtracted from a nonzero return value. Then, the - // meaning of <0, ==0, and >0 is consistent with the C runtime. + // Returns one of the following values if successful. To maintain the C + // runtime convention of comparing strings, the value 2 can be subtracted + // from a nonzero return value. Then, the meaning of <0, ==0, and >0 is + // consistent with the C runtime. // [...] The function returns 0 if it does not succeed. // https://docs.microsoft.com/en-us/windows/desktop/api/stringapiset/nf-stringapiset-comparestringex#return-value #ifndef USE_COMPARESTRINGEX const int ret = CompareString(d->localeID, d->collator, - reinterpret_cast<const wchar_t*>(s1), len1, - reinterpret_cast<const wchar_t*>(s2), len2); + reinterpret_cast<const wchar_t *>(s1.data()), s1.size(), + reinterpret_cast<const wchar_t *>(s2.data()), s2.size()); #else const int ret = CompareStringEx(LPCWSTR(d->localeName.utf16()), d->collator, - reinterpret_cast<LPCWSTR>(s1), len1, - reinterpret_cast<LPCWSTR>(s2), len2, + reinterpret_cast<LPCWSTR>(s1.data()), s1.size(), + reinterpret_cast<LPCWSTR>(s2.data()), s2.size(), nullptr, nullptr, 0); #endif if (Q_LIKELY(ret)) @@ -132,16 +132,6 @@ int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) con return 0; } -int QCollator::compare(const QString &str1, const QString &str2) const -{ - return compare(str1.constData(), str1.size(), str2.constData(), str2.size()); -} - -int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const -{ - return compare(s1.constData(), s1.size(), s2.constData(), s2.size()); -} - QCollatorSortKey QCollator::sortKey(const QString &string) const { if (d->dirty) @@ -170,7 +160,9 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const NULL, NULL, 0); #endif if (finalSize == 0) { - qWarning() << "there were problems when generating the ::sortKey by LCMapStringW with error:" << GetLastError(); + qWarning() + << "there were problems when generating the ::sortKey by LCMapStringW with error:" + << GetLastError(); } return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret))); } diff --git a/src/corelib/tools/qcommandlineoption.cpp b/src/corelib/tools/qcommandlineoption.cpp index c2b86014ba..aff684fad2 100644 --- a/src/corelib/tools/qcommandlineoption.cpp +++ b/src/corelib/tools/qcommandlineoption.cpp @@ -254,7 +254,7 @@ namespace { typedef QString argument_type; Q_NEVER_INLINE - result_type operator()(const QString &name) const Q_DECL_NOEXCEPT + result_type operator()(const QString &name) const noexcept { if (Q_UNLIKELY(name.isEmpty())) return warn("be empty"); @@ -271,7 +271,7 @@ namespace { } Q_NEVER_INLINE - static bool warn(const char *what) Q_DECL_NOEXCEPT + static bool warn(const char *what) noexcept { qWarning("QCommandLineOption: Option names cannot %s", what); return true; diff --git a/src/corelib/tools/qcommandlineoption.h b/src/corelib/tools/qcommandlineoption.h index 276be042de..e2ca64acef 100644 --- a/src/corelib/tools/qcommandlineoption.h +++ b/src/corelib/tools/qcommandlineoption.h @@ -71,11 +71,9 @@ public: ~QCommandLineOption(); QCommandLineOption &operator=(const QCommandLineOption &other); -#ifdef Q_COMPILER_RVALUE_REFS - QCommandLineOption &operator=(QCommandLineOption &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QCommandLineOption &operator=(QCommandLineOption &&other) noexcept { swap(other); return *this; } - void swap(QCommandLineOption &other) Q_DECL_NOTHROW + void swap(QCommandLineOption &other) noexcept { qSwap(d, other.d); } QStringList names() const; diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index 279d6565da..48501f5271 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -41,6 +41,7 @@ #include "qcommandlineparser.h" #include <qcoreapplication.h> +#include <private/qcoreapplication_p.h> #include <qhash.h> #include <qvector.h> #include <qdebug.h> @@ -70,11 +71,12 @@ public: bool parse(const QStringList &args); void checkParsed(const char *method); QStringList aliases(const QString &name) const; - QString helpText() const; + QString helpText(bool includeQtOptions) const; bool registerFoundOption(const QString &optionName); bool parseOptionValue(const QString &optionName, const QString &argument, QStringList::const_iterator *argumentIterator, QStringList::const_iterator argsEnd); + Q_NORETURN void showHelp(int exitCode, bool includeQtOptions); //! Error text set when parse() returns false QString errorText; @@ -130,7 +132,7 @@ QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const { const NameHash_t::const_iterator it = nameHash.constFind(optionName); if (it == nameHash.cend()) { - qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName)); + qWarning("QCommandLineParser: option not defined: \"%ls\"", qUtf16Printable(optionName)); return QStringList(); } return commandLineOptionList.at(*it).names(); @@ -362,8 +364,10 @@ bool QCommandLineParser::addOption(const QCommandLineOption &option) if (!optionNames.isEmpty()) { for (const QString &name : optionNames) { - if (d->nameHash.contains(name)) + if (d->nameHash.contains(name)) { + qWarning() << "QCommandLineParser: already having an option named" << name; return false; + } } d->commandLineOptionList.append(option); @@ -417,7 +421,9 @@ QCommandLineOption QCommandLineParser::addVersionOption() /*! Adds the help option (\c{-h}, \c{--help} and \c{-?} on Windows) - This option is handled automatically by QCommandLineParser. + as well as an option \c{--help-all} to include Qt-specific options in the output. + + These options are handled automatically by QCommandLineParser. Remember to use setApplicationDescription to set the application description, which will be displayed when this option is used. @@ -434,8 +440,10 @@ QCommandLineOption QCommandLineParser::addHelpOption() << QStringLiteral("?") #endif << QStringLiteral("h") - << QStringLiteral("help"), tr("Displays this help.")); + << QStringLiteral("help"), tr("Displays help on commandline options.")); addOption(opt); + QCommandLineOption optHelpAll(QStringLiteral("help-all"), tr("Displays help including Qt specific options.")); + addOption(optHelpAll); d->builtinHelpOption = true; return opt; } @@ -552,9 +560,9 @@ static void showParserMessage(const QString &message, MessageType type) { #if defined(Q_OS_WINRT) if (type == UsageMessage) - qInfo(qPrintable(message)); + qInfo("%ls", qUtf16Printable(message)); else - qCritical(qPrintable(message)); + qCritical("%ls", qUtf16Printable(message)); return; #elif defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) if (displayMessageBox()) { @@ -579,7 +587,8 @@ static void showParserMessage(const QString &message, MessageType type) In addition to parsing the options (like parse()), this function also handles the builtin options and handles errors. - The builtin options are \c{--version} if addVersionOption was called and \c{--help} if addHelpOption was called. + The builtin options are \c{--version} if addVersionOption was called and + \c{--help} / \c{--help-all} if addHelpOption was called. When invoking one of these options, or when an error happens (for instance an unknown option was passed), the current process will then stop, using the exit() function. @@ -589,7 +598,7 @@ static void showParserMessage(const QString &message, MessageType type) void QCommandLineParser::process(const QStringList &arguments) { if (!d->parse(arguments)) { - showParserMessage(errorText() + QLatin1Char('\n'), ErrorMessage); + showParserMessage(QCoreApplication::applicationName() + QLatin1String(": ") + errorText() + QLatin1Char('\n'), ErrorMessage); qt_call_post_routines(); ::exit(EXIT_FAILURE); } @@ -598,7 +607,10 @@ void QCommandLineParser::process(const QStringList &arguments) showVersion(); if (d->builtinHelpOption && isSet(QStringLiteral("help"))) - showHelp(EXIT_SUCCESS); + d->showHelp(EXIT_SUCCESS, false); + + if (d->builtinHelpOption && isSet(QStringLiteral("help-all"))) + d->showHelp(EXIT_SUCCESS, true); } /*! @@ -886,7 +898,7 @@ QStringList QCommandLineParser::values(const QString &optionName) const return values; } - qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName)); + qWarning("QCommandLineParser: option not defined: \"%ls\"", qUtf16Printable(optionName)); return QStringList(); } @@ -1031,7 +1043,12 @@ Q_NORETURN void QCommandLineParser::showVersion() */ Q_NORETURN void QCommandLineParser::showHelp(int exitCode) { - showParserMessage(d->helpText(), UsageMessage); + d->showHelp(exitCode, false); +} + +Q_NORETURN void QCommandLineParserPrivate::showHelp(int exitCode, bool includeQtOptions) +{ + showParserMessage(helpText(includeQtOptions), UsageMessage); qt_call_post_routines(); ::exit(exitCode); } @@ -1043,7 +1060,7 @@ Q_NORETURN void QCommandLineParser::showHelp(int exitCode) */ QString QCommandLineParser::helpText() const { - return d->helpText(); + return d->helpText(false); } static QString wrapText(const QString &names, int longestOptionNameString, const QString &description) @@ -1101,13 +1118,16 @@ static QString wrapText(const QString &names, int longestOptionNameString, const return text; } -QString QCommandLineParserPrivate::helpText() const +QString QCommandLineParserPrivate::helpText(bool includeQtOptions) const { const QLatin1Char nl('\n'); QString text; QString usage; usage += QCoreApplication::instance()->arguments().constFirst(); // executable name - if (!commandLineOptionList.isEmpty()) + QList<QCommandLineOption> options = commandLineOptionList; + if (includeQtOptions) + QCoreApplication::instance()->d_func()->addQtOptions(&options); + if (!options.isEmpty()) usage += QLatin1Char(' ') + QCommandLineParser::tr("[options]"); for (const PositionalArgumentDefinition &arg : positionalArgumentDefinitions) usage += QLatin1Char(' ') + arg.syntax; @@ -1115,12 +1135,12 @@ QString QCommandLineParserPrivate::helpText() const if (!description.isEmpty()) text += description + nl; text += nl; - if (!commandLineOptionList.isEmpty()) + if (!options.isEmpty()) text += QCommandLineParser::tr("Options:") + nl; QStringList optionNameList; - optionNameList.reserve(commandLineOptionList.size()); + optionNameList.reserve(options.size()); int longestOptionNameString = 0; - for (const QCommandLineOption &option : commandLineOptionList) { + for (const QCommandLineOption &option : qAsConst(options)) { if (option.flags() & QCommandLineOption::HiddenFromHelp) continue; const QStringList optionNames = option.names(); @@ -1139,14 +1159,14 @@ QString QCommandLineParserPrivate::helpText() const } ++longestOptionNameString; auto optionNameIterator = optionNameList.cbegin(); - for (const QCommandLineOption &option : commandLineOptionList) { + for (const QCommandLineOption &option : qAsConst(options)) { if (option.flags() & QCommandLineOption::HiddenFromHelp) continue; text += wrapText(*optionNameIterator, longestOptionNameString, option.description()); ++optionNameIterator; } if (!positionalArgumentDefinitions.isEmpty()) { - if (!commandLineOptionList.isEmpty()) + if (!options.isEmpty()) text += nl; text += QCommandLineParser::tr("Arguments:") + nl; for (const PositionalArgumentDefinition &arg : positionalArgumentDefinitions) diff --git a/src/corelib/tools/qcontainertools_impl.h b/src/corelib/tools/qcontainertools_impl.h new file mode 100644 index 0000000000..86a16eb32b --- /dev/null +++ b/src/corelib/tools/qcontainertools_impl.h @@ -0,0 +1,136 @@ +/**************************************************************************** +** +** Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> +** Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + +#ifndef QCONTAINERTOOLS_IMPL_H +#define QCONTAINERTOOLS_IMPL_H + +#include <QtCore/qglobal.h> +#include <iterator> + +#ifndef Q_QDOC + +QT_BEGIN_NAMESPACE + +namespace QtPrivate +{ +template <typename Iterator> +using IfIsInputIterator = typename std::enable_if< + std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::input_iterator_tag>::value, + bool>::type; + +template <typename Iterator> +using IfIsForwardIterator = typename std::enable_if< + std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::forward_iterator_tag>::value, + bool>::type; + +template <typename Iterator> +using IfIsNotForwardIterator = typename std::enable_if< + !std::is_convertible<typename std::iterator_traits<Iterator>::iterator_category, std::forward_iterator_tag>::value, + bool>::type; + +template <typename Container, + typename InputIterator, + IfIsNotForwardIterator<InputIterator> = true> +void reserveIfForwardIterator(Container *, InputIterator, InputIterator) +{ +} + +template <typename Container, + typename ForwardIterator, + IfIsForwardIterator<ForwardIterator> = true> +void reserveIfForwardIterator(Container *c, ForwardIterator f, ForwardIterator l) +{ + c->reserve(static_cast<typename Container::size_type>(std::distance(f, l))); +} + +// for detecting expression validity +template <typename ... T> +using void_t = void; + +template <typename Iterator, typename = void_t<>> +struct AssociativeIteratorHasKeyAndValue : std::false_type +{ +}; + +template <typename Iterator> +struct AssociativeIteratorHasKeyAndValue< + Iterator, + void_t<decltype(std::declval<Iterator &>().key()), + decltype(std::declval<Iterator &>().value())> + > + : std::true_type +{ +}; + +template <typename Iterator, typename = void_t<>, typename = void_t<>> +struct AssociativeIteratorHasFirstAndSecond : std::false_type +{ +}; + +template <typename Iterator> +struct AssociativeIteratorHasFirstAndSecond< + Iterator, + void_t<decltype(std::declval<Iterator &>()->first), + decltype(std::declval<Iterator &>()->second)> + > + : std::true_type +{ +}; + +template <typename Iterator> +using IfAssociativeIteratorHasKeyAndValue = + typename std::enable_if<AssociativeIteratorHasKeyAndValue<Iterator>::value, bool>::type; + +template <typename Iterator> +using IfAssociativeIteratorHasFirstAndSecond = + typename std::enable_if<AssociativeIteratorHasFirstAndSecond<Iterator>::value, bool>::type; + +} // namespace QtPrivate + +QT_END_NAMESPACE + +#endif // Q_QDOC + +#endif // QCONTAINERTOOLS_IMPL_H diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index fdb9c6d19a..7b74b4f526 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -100,18 +100,16 @@ public: inline ~QContiguousCache() { if (!d) return; if (!d->ref.deref()) freeData(p); } - inline void detach() { if (d->ref.load() != 1) detach_helper(); } - inline bool isDetached() const { return d->ref.load() == 1; } + inline void detach() { if (d->ref.loadRelaxed() != 1) detach_helper(); } + inline bool isDetached() const { return d->ref.loadRelaxed() == 1; } #if !defined(QT_NO_UNSHARABLE_CONTAINERS) inline void setSharable(bool sharable) { if (!sharable) detach(); d->sharable = sharable; } #endif QContiguousCache<T> &operator=(const QContiguousCache<T> &other); -#ifdef Q_COMPILER_RVALUE_REFS - inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other) + inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other) noexcept { qSwap(d, other.d); return *this; } -#endif - inline void swap(QContiguousCache<T> &other) { qSwap(d, other.d); } + inline void swap(QContiguousCache<T> &other) noexcept { qSwap(d, other.d); } bool operator==(const QContiguousCache<T> &other) const; inline bool operator!=(const QContiguousCache<T> &other) const { return !(*this == other); } @@ -178,7 +176,7 @@ void QContiguousCache<T>::detach_helper() union { QContiguousCacheData *d; QContiguousCacheTypedData<T> *p; } x; x.d = allocateData(d->alloc); - x.d->ref.store(1); + x.d->ref.storeRelaxed(1); x.d->count = d->count; x.d->start = d->start; x.d->offset = d->offset; @@ -217,7 +215,7 @@ void QContiguousCache<T>::setCapacity(int asize) detach(); union { QContiguousCacheData *d; QContiguousCacheTypedData<T> *p; } x; x.d = allocateData(asize); - x.d->ref.store(1); + x.d->ref.storeRelaxed(1); x.d->alloc = asize; x.d->count = qMin(d->count, asize); x.d->offset = d->offset + d->count - x.d->count; @@ -253,7 +251,7 @@ void QContiguousCache<T>::setCapacity(int asize) template <typename T> void QContiguousCache<T>::clear() { - if (d->ref.load() == 1) { + if (d->ref.loadRelaxed() == 1) { if (QTypeInfo<T>::isComplex) { int oldcount = d->count; T * i = p->array + d->start; @@ -269,7 +267,7 @@ void QContiguousCache<T>::clear() } else { union { QContiguousCacheData *d; QContiguousCacheTypedData<T> *p; } x; x.d = allocateData(d->alloc); - x.d->ref.store(1); + x.d->ref.storeRelaxed(1); x.d->alloc = d->alloc; x.d->count = x.d->start = x.d->offset = 0; x.d->sharable = true; @@ -289,7 +287,7 @@ QContiguousCache<T>::QContiguousCache(int cap) { Q_ASSERT(cap >= 0); d = allocateData(cap); - d->ref.store(1); + d->ref.storeRelaxed(1); d->alloc = cap; d->count = d->start = d->offset = 0; d->sharable = true; diff --git a/src/corelib/tools/qcryptographichash.cpp b/src/corelib/tools/qcryptographichash.cpp index 3c79bb797d..ee7657789c 100644 --- a/src/corelib/tools/qcryptographichash.cpp +++ b/src/corelib/tools/qcryptographichash.cpp @@ -58,6 +58,10 @@ typedef unsigned char BitSequence; typedef unsigned long long DataLength; typedef enum { SUCCESS = 0, FAIL = 1, BAD_HASHLEN = 2 } HashReturn; +#ifdef Q_OS_RTEMS +# undef ALIGN +#endif + #include "../../3rdparty/sha3/KeccakSponge.c" typedef spongeState hashState; diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index f82048db0f..9169b5c7f1 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -339,6 +339,23 @@ struct TCBPoint { }; Q_DECLARE_TYPEINFO(TCBPoint, Q_PRIMITIVE_TYPE); +QDataStream &operator<<(QDataStream &stream, const TCBPoint &point) +{ + stream << point._point + << point._t + << point._c + << point._b; + return stream; +} + +QDataStream &operator>>(QDataStream &stream, TCBPoint &point) +{ + stream >> point._point + >> point._t + >> point._c + >> point._b; + return stream; +} typedef QVector<TCBPoint> TCBPoints; @@ -363,6 +380,34 @@ public: }; +QDataStream &operator<<(QDataStream &stream, QEasingCurveFunction *func) +{ + if (func) { + stream << func->_p; + stream << func->_a; + stream << func->_o; + if (stream.version() > QDataStream::Qt_5_12) { + stream << func->_bezierCurves; + stream << func->_tcbPoints; + } + } + return stream; +} + +QDataStream &operator>>(QDataStream &stream, QEasingCurveFunction *func) +{ + if (func) { + stream >> func->_p; + stream >> func->_a; + stream >> func->_o; + if (stream.version() > QDataStream::Qt_5_12) { + stream >> func->_bezierCurves; + stream >> func->_tcbPoints; + } + } + return stream; +} + static QEasingCurve::EasingFunction curveToFunc(QEasingCurve::Type curve); qreal QEasingCurveFunction::value(qreal t) @@ -1480,9 +1525,7 @@ QDataStream &operator<<(QDataStream &stream, const QEasingCurve &easing) bool hasConfig = easing.d_ptr->config; stream << hasConfig; if (hasConfig) { - stream << easing.d_ptr->config->_p; - stream << easing.d_ptr->config->_a; - stream << easing.d_ptr->config->_o; + stream << easing.d_ptr->config; } return stream; } @@ -1515,9 +1558,7 @@ QDataStream &operator>>(QDataStream &stream, QEasingCurve &easing) easing.d_ptr->config = nullptr; if (hasConfig) { QEasingCurveFunction *config = curveToFunctionObject(type); - stream >> config->_p; - stream >> config->_a; - stream >> config->_o; + stream >> config; easing.d_ptr->config = config; } return stream; diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h index 74bde5825a..725ddd5dcc 100644 --- a/src/corelib/tools/qeasingcurve.h +++ b/src/corelib/tools/qeasingcurve.h @@ -80,13 +80,11 @@ public: QEasingCurve &operator=(const QEasingCurve &other) { if ( this != &other ) { QEasingCurve copy(other); swap(copy); } return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - QEasingCurve(QEasingCurve &&other) Q_DECL_NOTHROW : d_ptr(other.d_ptr) { other.d_ptr = nullptr; } - QEasingCurve &operator=(QEasingCurve &&other) Q_DECL_NOTHROW + QEasingCurve(QEasingCurve &&other) noexcept : d_ptr(other.d_ptr) { other.d_ptr = nullptr; } + QEasingCurve &operator=(QEasingCurve &&other) noexcept { qSwap(d_ptr, other.d_ptr); return *this; } -#endif - void swap(QEasingCurve &other) Q_DECL_NOTHROW { qSwap(d_ptr, other.d_ptr); } + void swap(QEasingCurve &other) noexcept { qSwap(d_ptr, other.d_ptr); } bool operator==(const QEasingCurve &other) const; inline bool operator!=(const QEasingCurve &other) const diff --git a/src/corelib/tools/qfreelist_p.h b/src/corelib/tools/qfreelist_p.h index 2f98cf5cc1..dcaf5688dc 100644 --- a/src/corelib/tools/qfreelist_p.h +++ b/src/corelib/tools/qfreelist_p.h @@ -171,7 +171,7 @@ class QFreeList // qDebug("QFreeList: allocating %d elements (%ld bytes) with offset %d", size, size * sizeof(ElementType), offset); ElementType *v = new ElementType[size]; for (int i = 0; i < size; ++i) - v[i].next.store(offset + i + 1); + v[i].next.storeRelaxed(offset + i + 1); return v; } @@ -187,7 +187,7 @@ class QFreeList QAtomicInt _next; // QFreeList is not copyable - Q_DISABLE_COPY(QFreeList) + Q_DISABLE_COPY_MOVE(QFreeList) public: Q_DECL_CONSTEXPR inline QFreeList(); @@ -218,21 +218,21 @@ template <typename T, typename ConstantsType> inline QFreeList<T, ConstantsType>::~QFreeList() { for (int i = 0; i < ConstantsType::BlockCount; ++i) - delete [] _v[i].load(); + delete [] _v[i].loadRelaxed(); } template <typename T, typename ConstantsType> inline typename QFreeList<T, ConstantsType>::ConstReferenceType QFreeList<T, ConstantsType>::at(int x) const { const int block = blockfor(x); - return (_v[block].load())[x].t(); + return (_v[block].loadRelaxed())[x].t(); } template <typename T, typename ConstantsType> inline typename QFreeList<T, ConstantsType>::ReferenceType QFreeList<T, ConstantsType>::operator[](int x) { const int block = blockfor(x); - return (_v[block].load())[x].t(); + return (_v[block].loadRelaxed())[x].t(); } template <typename T, typename ConstantsType> @@ -249,15 +249,15 @@ inline int QFreeList<T, ConstantsType>::next() if (!v) { v = allocate((id & ConstantsType::IndexMask) - at, ConstantsType::Sizes[block]); - if (!_v[block].testAndSetRelease(0, v)) { + if (!_v[block].testAndSetRelease(nullptr, v)) { // race with another thread lost delete [] v; v = _v[block].loadAcquire(); - Q_ASSERT(v != 0); + Q_ASSERT(v != nullptr); } } - newid = v[at].next.load() | (id & ~ConstantsType::IndexMask); + newid = v[at].next.loadRelaxed() | (id & ~ConstantsType::IndexMask); } while (!_next.testAndSetRelease(id, newid)); // qDebug("QFreeList::next(): returning %d (_next now %d, serial %d)", // id & ConstantsType::IndexMask, @@ -271,12 +271,12 @@ inline void QFreeList<T, ConstantsType>::release(int id) { int at = id & ConstantsType::IndexMask; const int block = blockfor(at); - ElementType *v = _v[block].load(); + ElementType *v = _v[block].loadRelaxed(); int x, newid; do { x = _next.loadAcquire(); - v[at].next.store(x & ConstantsType::IndexMask); + v[at].next.storeRelaxed(x & ConstantsType::IndexMask); newid = incrementserial(x, id); } while (!_next.testAndSetRelease(x, newid)); diff --git a/src/corelib/tools/qhash.cpp b/src/corelib/tools/qhash.cpp index 32e9a4269c..a53d6db997 100644 --- a/src/corelib/tools/qhash.cpp +++ b/src/corelib/tools/qhash.cpp @@ -197,7 +197,7 @@ static uint crc32(...) } #endif -static inline uint hash(const uchar *p, size_t len, uint seed) Q_DECL_NOTHROW +static inline uint hash(const uchar *p, size_t len, uint seed) noexcept { uint h = seed; @@ -210,12 +210,12 @@ static inline uint hash(const uchar *p, size_t len, uint seed) Q_DECL_NOTHROW return h; } -uint qHashBits(const void *p, size_t len, uint seed) Q_DECL_NOTHROW +uint qHashBits(const void *p, size_t len, uint seed) noexcept { return hash(static_cast<const uchar*>(p), int(len), seed); } -static inline uint hash(const QChar *p, size_t len, uint seed) Q_DECL_NOTHROW +static inline uint hash(const QChar *p, size_t len, uint seed) noexcept { uint h = seed; @@ -228,29 +228,29 @@ static inline uint hash(const QChar *p, size_t len, uint seed) Q_DECL_NOTHROW return h; } -uint qHash(const QByteArray &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QByteArray &key, uint seed) noexcept { return hash(reinterpret_cast<const uchar *>(key.constData()), size_t(key.size()), seed); } #if QT_STRINGVIEW_LEVEL < 2 -uint qHash(const QString &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QString &key, uint seed) noexcept { return hash(key.unicode(), size_t(key.size()), seed); } -uint qHash(const QStringRef &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QStringRef &key, uint seed) noexcept { return hash(key.unicode(), size_t(key.size()), seed); } #endif -uint qHash(QStringView key, uint seed) Q_DECL_NOTHROW +uint qHash(QStringView key, uint seed) noexcept { return hash(key.data(), key.size(), seed); } -uint qHash(const QBitArray &bitArray, uint seed) Q_DECL_NOTHROW +uint qHash(const QBitArray &bitArray, uint seed) noexcept { int m = bitArray.d.size() - 1; uint result = hash(reinterpret_cast<const uchar *>(bitArray.d.constData()), @@ -264,7 +264,7 @@ uint qHash(const QBitArray &bitArray, uint seed) Q_DECL_NOTHROW return result; } -uint qHash(QLatin1String key, uint seed) Q_DECL_NOTHROW +uint qHash(QLatin1String key, uint seed) noexcept { return hash(reinterpret_cast<const uchar *>(key.data()), size_t(key.size()), seed); } @@ -321,7 +321,7 @@ static QBasicAtomicInt qt_qhash_seed = Q_BASIC_ATOMIC_INITIALIZER(-1); */ static void qt_initialize_qhash_seed() { - if (qt_qhash_seed.load() == -1) { + if (qt_qhash_seed.loadRelaxed() == -1) { int x(qt_create_qhash_seed() & INT_MAX); qt_qhash_seed.testAndSetRelaxed(-1, x); } @@ -340,7 +340,7 @@ static void qt_initialize_qhash_seed() int qGlobalQHashSeed() { qt_initialize_qhash_seed(); - return qt_qhash_seed.load(); + return qt_qhash_seed.loadRelaxed(); } /*! \relates QHash @@ -372,14 +372,14 @@ void qSetGlobalQHashSeed(int newSeed) return; if (newSeed == -1) { int x(qt_create_qhash_seed() & INT_MAX); - qt_qhash_seed.store(x); + qt_qhash_seed.storeRelaxed(x); } else { if (newSeed) { // can't use qWarning here (reentrancy) fprintf(stderr, "qSetGlobalQHashSeed: forced seed value is not 0, cannot guarantee that the " "hashing functions will produce a stable value."); } - qt_qhash_seed.store(newSeed & INT_MAX); + qt_qhash_seed.storeRelaxed(newSeed & INT_MAX); } } @@ -398,7 +398,7 @@ void qSetGlobalQHashSeed(int newSeed) This function can hash discontiguous memory by invoking it on each chunk, passing the previous's result in the next call's \a chained argument. */ -uint qt_hash(QStringView key, uint chained) Q_DECL_NOTHROW +uint qt_hash(QStringView key, uint chained) noexcept { auto n = key.size(); auto p = key.utf16(); @@ -471,7 +471,7 @@ static int countBits(int hint) const int MinNumBits = 4; const QHashData QHashData::shared_null = { - 0, 0, Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, MinNumBits, 0, 0, 0, true, false, 0 + nullptr, nullptr, Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, MinNumBits, 0, 0, 0, true, false, 0 }; void *QHashData::allocateNode(int nodeAlign) @@ -501,15 +501,15 @@ QHashData *QHashData::detach_helper(void (*node_duplicate)(Node *, void *), if (this == &shared_null) qt_initialize_qhash_seed(); // may throw d = new QHashData; - d->fakeNext = 0; - d->buckets = 0; + d->fakeNext = nullptr; + d->buckets = nullptr; d->ref.initializeOwned(); d->size = size; d->nodeSize = nodeSize; d->userNumBits = userNumBits; d->numBits = numBits; d->numBuckets = numBuckets; - d->seed = (this == &shared_null) ? uint(qt_qhash_seed.load()) : seed; + d->seed = (this == &shared_null) ? uint(qt_qhash_seed.loadRelaxed()) : seed; d->sharable = true; d->strictAlignment = nodeAlign > 8; d->reserved = 0; @@ -709,7 +709,7 @@ void QHashData::dump() } n = n->next; } - qDebug("%s", qPrintable(line)); + qDebug("%ls", qUtf16Printable(line)); } } } @@ -938,7 +938,7 @@ void QHashData::checkSanity() Returns the hash value for the \a key, using \a seed to seed the calculation. */ -uint qHash(float key, uint seed) Q_DECL_NOTHROW +uint qHash(float key, uint seed) noexcept { return key != 0.0f ? hash(reinterpret_cast<const uchar *>(&key), sizeof(key), seed) : seed ; } @@ -948,7 +948,7 @@ uint qHash(float key, uint seed) Q_DECL_NOTHROW Returns the hash value for the \a key, using \a seed to seed the calculation. */ -uint qHash(double key, uint seed) Q_DECL_NOTHROW +uint qHash(double key, uint seed) noexcept { return key != 0.0 ? hash(reinterpret_cast<const uchar *>(&key), sizeof(key), seed) : seed ; } @@ -959,7 +959,7 @@ uint qHash(double key, uint seed) Q_DECL_NOTHROW Returns the hash value for the \a key, using \a seed to seed the calculation. */ -uint qHash(long double key, uint seed) Q_DECL_NOTHROW +uint qHash(long double key, uint seed) noexcept { return key != 0.0L ? hash(reinterpret_cast<const uchar *>(&key), sizeof(key), seed) : seed ; } @@ -1251,6 +1251,17 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW compiled in C++11 mode. */ +/*! \fn template <class Key, class T> template <class InputIterator> QHash<Key, T>::QHash(InputIterator begin, InputIterator end) + \since 5.14 + + Constructs a hash with a copy of each of the elements in the iterator range + [\a begin, \a end). Either the elements iterated by the range must be + objects with \c{first} and \c{second} data members (like \c{QPair}, + \c{std::pair}, etc.) convertible to \c Key and to \c T respectively; or the + iterators must have \c{key()} and \c{value()} member functions, returning a + key convertible to \c Key and a value convertible to \c T respectively. +*/ + /*! \fn template <class Key, class T> QHash<Key, T>::QHash(const QHash &other) Constructs a copy of \a other. @@ -2586,6 +2597,17 @@ uint qHash(long double key, uint seed) Q_DECL_NOTHROW \sa operator=() */ +/*! \fn template <class Key, class T> template <class InputIterator> QMultiHash::QMultiHash(InputIterator begin, InputIterator end) + \since 5.14 + + Constructs a multi-hash with a copy of each of the elements in the iterator range + [\a begin, \a end). Either the elements iterated by the range must be + objects with \c{first} and \c{second} data members (like \c{QPair}, + \c{std::pair}, etc.) convertible to \c Key and to \c T respectively; or the + iterators must have \c{key()} and \c{value()} member functions, returning a + key convertible to \c Key and a value convertible to \c T respectively. +*/ + /*! \fn template <class Key, class T> QMultiHash<Key, T>::iterator QMultiHash<Key, T>::replace(const Key &key, const T &value) Inserts a new item with the \a key and a value of \a value. diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index a586ca5671..4b4cb2d5f0 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -46,12 +46,10 @@ #include <QtCore/qlist.h> #include <QtCore/qrefcount.h> #include <QtCore/qhashfunctions.h> - -#ifdef Q_COMPILER_INITIALIZER_LISTS -#include <initializer_list> -#endif +#include <QtCore/qcontainertools_impl.h> #include <algorithm> +#include <initializer_list> #if defined(Q_CC_MSVC) #pragma warning( push ) @@ -240,8 +238,7 @@ class QHash static inline int alignOfNode() { return qMax<int>(sizeof(void*), Q_ALIGNOF(Node)); } public: - inline QHash() Q_DECL_NOTHROW : d(const_cast<QHashData *>(&QHashData::shared_null)) { } -#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QHash() noexcept : d(const_cast<QHashData *>(&QHashData::shared_null)) { } inline QHash(std::initializer_list<std::pair<Key,T> > list) : d(const_cast<QHashData *>(&QHashData::shared_null)) { @@ -249,17 +246,36 @@ public: for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it) insert(it->first, it->second); } -#endif QHash(const QHash &other) : d(other.d) { d->ref.ref(); if (!d->sharable) detach(); } ~QHash() { if (!d->ref.deref()) freeData(d); } QHash &operator=(const QHash &other); -#ifdef Q_COMPILER_RVALUE_REFS - QHash(QHash &&other) Q_DECL_NOTHROW : d(other.d) { other.d = const_cast<QHashData *>(&QHashData::shared_null); } - QHash &operator=(QHash &&other) Q_DECL_NOTHROW + QHash(QHash &&other) noexcept : d(other.d) { other.d = const_cast<QHashData *>(&QHashData::shared_null); } + QHash &operator=(QHash &&other) noexcept { QHash moved(std::move(other)); swap(moved); return *this; } +#ifdef Q_QDOC + template <typename InputIterator> + QHash(InputIterator f, InputIterator l); +#else + template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasKeyAndValue<InputIterator> = true> + QHash(InputIterator f, InputIterator l) + : QHash() + { + QtPrivate::reserveIfForwardIterator(this, f, l); + for (; f != l; ++f) + insert(f.key(), f.value()); + } + + template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasFirstAndSecond<InputIterator> = true> + QHash(InputIterator f, InputIterator l) + : QHash() + { + QtPrivate::reserveIfForwardIterator(this, f, l); + for (; f != l; ++f) + insert(f->first, f->second); + } #endif - void swap(QHash &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QHash &other) noexcept { qSwap(d, other.d); } bool operator==(const QHash &other) const; bool operator!=(const QHash &other) const { return !(*this == other); } @@ -473,7 +489,7 @@ public: inline const_key_value_iterator constKeyValueEnd() const { return const_key_value_iterator(end()); } QPair<iterator, iterator> equal_range(const Key &key); - QPair<const_iterator, const_iterator> equal_range(const Key &key) const Q_DECL_NOTHROW; + QPair<const_iterator, const_iterator> equal_range(const Key &key) const noexcept; iterator erase(iterator it) { return erase(const_iterator(it.i)); } iterator erase(const_iterator it); @@ -512,11 +528,11 @@ private: static void duplicateNode(QHashData::Node *originalNode, void *newNode); - bool isValidIterator(const iterator &it) const Q_DECL_NOTHROW + bool isValidIterator(const iterator &it) const noexcept { return isValidNode(it.i); } - bool isValidIterator(const const_iterator &it) const Q_DECL_NOTHROW + bool isValidIterator(const const_iterator &it) const noexcept { return isValidNode(it.i); } - bool isValidNode(QHashData::Node *node) const Q_DECL_NOTHROW + bool isValidNode(QHashData::Node *node) const noexcept { #if defined(QT_DEBUG) && !defined(Q_HASH_NO_ITERATOR_DEBUG) while (node->next) @@ -993,7 +1009,7 @@ QPair<typename QHash<Key, T>::iterator, typename QHash<Key, T>::iterator> QHash< } template <class Key, class T> -QPair<typename QHash<Key, T>::const_iterator, typename QHash<Key, T>::const_iterator> QHash<Key, T>::equal_range(const Key &akey) const Q_DECL_NOTHROW +QPair<typename QHash<Key, T>::const_iterator, typename QHash<Key, T>::const_iterator> QHash<Key, T>::equal_range(const Key &akey) const noexcept { Node *node = *findNode(akey); const_iterator firstIt = const_iterator(node); @@ -1020,23 +1036,39 @@ template <class Key, class T> class QMultiHash : public QHash<Key, T> { public: - QMultiHash() Q_DECL_NOTHROW {} -#ifdef Q_COMPILER_INITIALIZER_LISTS + QMultiHash() noexcept {} inline QMultiHash(std::initializer_list<std::pair<Key,T> > list) { this->reserve(int(list.size())); for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it) insert(it->first, it->second); } +#ifdef Q_QDOC + template <typename InputIterator> + QMultiHash(InputIterator f, InputIterator l); +#else + template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasKeyAndValue<InputIterator> = true> + QMultiHash(InputIterator f, InputIterator l) + { + QtPrivate::reserveIfForwardIterator(this, f, l); + for (; f != l; ++f) + insert(f.key(), f.value()); + } + + template <typename InputIterator, QtPrivate::IfAssociativeIteratorHasFirstAndSecond<InputIterator> = true> + QMultiHash(InputIterator f, InputIterator l) + { + QtPrivate::reserveIfForwardIterator(this, f, l); + for (; f != l; ++f) + insert(f->first, f->second); + } #endif // compiler-generated copy/move ctors/assignment operators are fine! // compiler-generated destructor is fine! QMultiHash(const QHash<Key, T> &other) : QHash<Key, T>(other) {} -#ifdef Q_COMPILER_RVALUE_REFS - QMultiHash(QHash<Key, T> &&other) Q_DECL_NOTHROW : QHash<Key, T>(std::move(other)) {} -#endif - void swap(QMultiHash &other) Q_DECL_NOTHROW { QHash<Key, T>::swap(other); } // prevent QMultiHash<->QHash swaps + QMultiHash(QHash<Key, T> &&other) noexcept : QHash<Key, T>(std::move(other)) {} + void swap(QMultiHash &other) noexcept { QHash<Key, T>::swap(other); } // prevent QMultiHash<->QHash swaps inline typename QHash<Key, T>::iterator replace(const Key &key, const T &value) { return QHash<Key, T>::insert(key, value); } @@ -1130,7 +1162,7 @@ Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR(Hash) template <class Key, class T> uint qHash(const QHash<Key, T> &key, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>()))) + noexcept(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>()))) { QtPrivate::QHashCombineCommutative hash; for (auto it = key.begin(), end = key.end(); it != end; ++it) { @@ -1143,7 +1175,7 @@ uint qHash(const QHash<Key, T> &key, uint seed = 0) template <class Key, class T> inline uint qHash(const QMultiHash<Key, T> &key, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>()))) + noexcept(noexcept(qHash(std::declval<Key&>())) && noexcept(qHash(std::declval<T&>()))) { const QHash<Key, T> &key2 = key; return qHash(key2, seed); diff --git a/src/corelib/tools/qhashfunctions.h b/src/corelib/tools/qhashfunctions.h index d013c26d66..2ff3464912 100644 --- a/src/corelib/tools/qhashfunctions.h +++ b/src/corelib/tools/qhashfunctions.h @@ -45,6 +45,7 @@ #include <QtCore/qpair.h> #include <numeric> // for std::accumulate +#include <functional> // for std::hash #if 0 #pragma qt_class(QHashFunctions) @@ -67,54 +68,54 @@ class QLatin1String; Q_CORE_EXPORT int qGlobalQHashSeed(); Q_CORE_EXPORT void qSetGlobalQHashSeed(int newSeed); -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHashBits(const void *p, size_t size, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHashBits(const void *p, size_t size, uint seed = 0) noexcept; -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(char key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uchar key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(signed char key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ushort key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(short key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uint key, uint seed = 0) Q_DECL_NOTHROW { return key ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(int key, uint seed = 0) Q_DECL_NOTHROW { return uint(key) ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ulong key, uint seed = 0) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(char key, uint seed = 0) noexcept { return uint(key) ^ seed; } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uchar key, uint seed = 0) noexcept { return uint(key) ^ seed; } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(signed char key, uint seed = 0) noexcept { return uint(key) ^ seed; } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ushort key, uint seed = 0) noexcept { return uint(key) ^ seed; } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(short key, uint seed = 0) noexcept { return uint(key) ^ seed; } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(uint key, uint seed = 0) noexcept { return key ^ seed; } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(int key, uint seed = 0) noexcept { return uint(key) ^ seed; } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(ulong key, uint seed = 0) noexcept { return (sizeof(ulong) > sizeof(uint)) ? (uint(((key >> (8 * sizeof(uint) - 1)) ^ key) & (~0U)) ^ seed) : (uint(key & (~0U)) ^ seed); } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(long key, uint seed = 0) Q_DECL_NOTHROW { return qHash(ulong(key), seed); } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(quint64 key, uint seed = 0) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(long key, uint seed = 0) noexcept { return qHash(ulong(key), seed); } +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(quint64 key, uint seed = 0) noexcept { return uint(((key >> (8 * sizeof(uint) - 1)) ^ key) & (~0U)) ^ seed; } -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(qint64 key, uint seed = 0) Q_DECL_NOTHROW { return qHash(quint64(key), seed); } -Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(float key, uint seed = 0) Q_DECL_NOTHROW; -Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(double key, uint seed = 0) Q_DECL_NOTHROW; +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(qint64 key, uint seed = 0) noexcept { return qHash(quint64(key), seed); } +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(float key, uint seed = 0) noexcept; +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(double key, uint seed = 0) noexcept; #if !defined(Q_OS_DARWIN) || defined(Q_CLANG_QDOC) -Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(long double key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT Q_DECL_CONST_FUNCTION uint qHash(long double key, uint seed = 0) noexcept; #endif -Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(const QChar key, uint seed = 0) Q_DECL_NOTHROW { return qHash(key.unicode(), seed); } -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QByteArray &key, uint seed = 0) Q_DECL_NOTHROW; +Q_DECL_CONST_FUNCTION Q_DECL_CONSTEXPR inline uint qHash(const QChar key, uint seed = 0) noexcept { return qHash(key.unicode(), seed); } +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QByteArray &key, uint seed = 0) noexcept; #if QT_STRINGVIEW_LEVEL < 2 -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QString &key, uint seed = 0) Q_DECL_NOTHROW; -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QStringRef &key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QString &key, uint seed = 0) noexcept; +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QStringRef &key, uint seed = 0) noexcept; #endif -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QStringView key, uint seed = 0) Q_DECL_NOTHROW; -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QBitArray &key, uint seed = 0) Q_DECL_NOTHROW; -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QLatin1String key, uint seed = 0) Q_DECL_NOTHROW; -Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qt_hash(QStringView key, uint chained = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QStringView key, uint seed = 0) noexcept; +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(const QBitArray &key, uint seed = 0) noexcept; +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qHash(QLatin1String key, uint seed = 0) noexcept; +Q_CORE_EXPORT Q_DECL_PURE_FUNCTION uint qt_hash(QStringView key, uint chained = 0) noexcept; -Q_DECL_CONST_FUNCTION inline uint qHash(std::nullptr_t, uint seed = 0) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION inline uint qHash(std::nullptr_t, uint seed = 0) noexcept { return qHash(reinterpret_cast<quintptr>(nullptr), seed); } -template <class T> inline uint qHash(const T *key, uint seed = 0) Q_DECL_NOTHROW +template <class T> inline uint qHash(const T *key, uint seed = 0) noexcept { return qHash(reinterpret_cast<quintptr>(key), seed); } template<typename T> inline uint qHash(const T &t, uint seed) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t))) + noexcept(noexcept(qHash(t))) { return qHash(t) ^ seed; } namespace QtPrivate { @@ -122,7 +123,7 @@ namespace QtPrivate { struct QHashCombine { typedef uint result_type; template <typename T> - Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t))) + Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const noexcept(noexcept(qHash(t))) // combiner taken from N3876 / boost::hash_combine { return seed ^ (qHash(t) + 0x9e3779b9 + (seed << 6) + (seed >> 2)) ; } }; @@ -135,7 +136,7 @@ struct QHashCombineCommutative { // QHash). Therefore, provide a commutative combiner, too. typedef uint result_type; template <typename T> - Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(t))) + Q_DECL_CONSTEXPR result_type operator()(uint seed, const T &t) const noexcept(noexcept(qHash(t))) { return seed + qHash(t); } // don't use xor! }; @@ -143,20 +144,20 @@ struct QHashCombineCommutative { template <typename InputIterator> inline uint qHashRange(InputIterator first, InputIterator last, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(*first))) // assume iterator operations don't throw + noexcept(noexcept(qHash(*first))) // assume iterator operations don't throw { return std::accumulate(first, last, seed, QtPrivate::QHashCombine()); } template <typename InputIterator> inline uint qHashRangeCommutative(InputIterator first, InputIterator last, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(*first))) // assume iterator operations don't throw + noexcept(noexcept(qHash(*first))) // assume iterator operations don't throw { return std::accumulate(first, last, seed, QtPrivate::QHashCombineCommutative()); } template <typename T1, typename T2> inline uint qHash(const QPair<T1, T2> &key, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed))) + noexcept(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed))) { uint h1 = qHash(key.first, seed); uint h2 = qHash(key.second, seed); @@ -164,7 +165,7 @@ template <typename T1, typename T2> inline uint qHash(const QPair<T1, T2> &key, } template <typename T1, typename T2> inline uint qHash(const std::pair<T1, T2> &key, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed))) + noexcept(noexcept(qHash(key.first, seed)) && noexcept(qHash(key.second, seed))) { QtPrivate::QHashCombine hash; seed = hash(seed, key.first); @@ -172,6 +173,41 @@ template <typename T1, typename T2> inline uint qHash(const std::pair<T1, T2> &k return seed; } +#define QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH(Class, Arguments) \ + QT_BEGIN_INCLUDE_NAMESPACE \ + namespace std { \ + template <> \ + struct hash< QT_PREPEND_NAMESPACE(Class) > { \ + using argument_type = QT_PREPEND_NAMESPACE(Class); \ + using result_type = size_t; \ + size_t operator()(Arguments s) const \ + noexcept(noexcept(QT_PREPEND_NAMESPACE(qHash)(s))) \ + { \ + /* this seeds qHash with the result of */ \ + /* std::hash applied to an int, to reap */ \ + /* any protection against predictable hash */ \ + /* values the std implementation may provide */ \ + return QT_PREPEND_NAMESPACE(qHash)(s, \ + QT_PREPEND_NAMESPACE(qHash)( \ + std::hash<int>{}(0))); \ + } \ + }; \ + } \ + QT_END_INCLUDE_NAMESPACE \ + /*end*/ + +#define QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(Class) \ + QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH(Class, const argument_type &) +#define QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(Class) \ + QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH(Class, argument_type) + +QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QString) +QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QStringRef) +QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QStringView) +QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_VALUE(QLatin1String) +QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QByteArray) +QT_SPECIALIZE_STD_HASH_TO_CALL_QHASH_BY_CREF(QBitArray) + QT_END_NAMESPACE #if defined(Q_CC_MSVC) diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h index 586d26cbad..82212c3eb5 100644 --- a/src/corelib/tools/qiterator.h +++ b/src/corelib/tools/qiterator.h @@ -190,15 +190,15 @@ public: typedef const value_type &reference; QKeyValueIterator() = default; - Q_DECL_CONSTEXPR explicit QKeyValueIterator(Iterator o) Q_DECL_NOEXCEPT_EXPR(std::is_nothrow_move_constructible<Iterator>::value) + Q_DECL_CONSTEXPR explicit QKeyValueIterator(Iterator o) noexcept(std::is_nothrow_move_constructible<Iterator>::value) : i(std::move(o)) {} std::pair<Key, T> operator*() const { return std::pair<Key, T>(i.key(), i.value()); } - friend bool operator==(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i == rhs.i; } - friend bool operator!=(QKeyValueIterator lhs, QKeyValueIterator rhs) Q_DECL_NOEXCEPT { return lhs.i != rhs.i; } + friend bool operator==(QKeyValueIterator lhs, QKeyValueIterator rhs) noexcept { return lhs.i == rhs.i; } + friend bool operator!=(QKeyValueIterator lhs, QKeyValueIterator rhs) noexcept { return lhs.i != rhs.i; } inline QKeyValueIterator &operator++() { ++i; return *this; } inline QKeyValueIterator operator++(int) { return QKeyValueIterator(i++);} diff --git a/src/corelib/tools/qline.cpp b/src/corelib/tools/qline.cpp index 949f63ea15..3afd23d76b 100644 --- a/src/corelib/tools/qline.cpp +++ b/src/corelib/tools/qline.cpp @@ -347,7 +347,7 @@ QDataStream &operator>>(QDataStream &stream, QLine &line) function to determine whether the QLineF represents a valid line or a null line. - The intersect() function determines the IntersectType for this + The intersects() function determines the IntersectionType for this line and a given line, while the angleTo() function returns the angle between the lines. In addition, the unitVector() function returns a line that has the same starting point as this line, but @@ -370,6 +370,11 @@ QDataStream &operator>>(QDataStream &stream, QLine &line) /*! \enum QLineF::IntersectType + \obsolete Use QLineF::IntersectionType instead +*/ + +/*! + \enum QLineF::IntersectionType Describes the intersection between two lines. @@ -657,8 +662,10 @@ QLineF QLineF::unitVector() const return f; } +#if QT_DEPRECATED_SINCE(5, 14) /*! \fn QLineF::IntersectType QLineF::intersect(const QLineF &line, QPointF *intersectionPoint) const + \obsolete Use intersects() instead Returns a value indicating whether or not \e this line intersects with the given \a line. @@ -670,6 +677,23 @@ QLineF QLineF::unitVector() const QLineF::IntersectType QLineF::intersect(const QLineF &l, QPointF *intersectionPoint) const { + return intersects(l, intersectionPoint); +} +#endif + +/*! + \fn QLineF::IntersectionType QLineF::intersects(const QLineF &line, QPointF *intersectionPoint) const + \since 5.14 + + Returns a value indicating whether or not \e this line intersects + with the given \a line. + + The actual intersection point is extracted to \a intersectionPoint + (if the pointer is valid). If the lines are parallel, the + intersection point is undefined. +*/ +QLineF::IntersectionType QLineF::intersects(const QLineF &l, QPointF *intersectionPoint) const +{ // ipmlementation is based on Graphics Gems III's "Faster Line Segment Intersection" const QPointF a = pt2 - pt1; const QPointF b = l.pt1 - l.pt2; @@ -805,6 +829,7 @@ qreal QLineF::angleTo(const QLineF &l) const return delta_normalized; } +#if QT_DEPRECATED_SINCE(5, 14) /*! \fn qreal QLineF::angle(const QLineF &line) const @@ -837,6 +862,7 @@ qreal QLineF::angle(const QLineF &l) const if (cos_line >= -1.0 && cos_line <= 1.0) rad = qAcos( cos_line ); return rad * 360 / M_2PI; } +#endif #ifndef QT_NO_DEBUG_STREAM diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index 6361c1af9f..c96d624afd 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -215,6 +215,7 @@ class Q_CORE_EXPORT QLineF { public: enum IntersectType { NoIntersection, BoundedIntersection, UnboundedIntersection }; + using IntersectionType = IntersectType; Q_DECL_CONSTEXPR inline QLineF(); Q_DECL_CONSTEXPR inline QLineF(const QPointF &pt1, const QPointF &pt2); @@ -248,10 +249,14 @@ public: Q_REQUIRED_RESULT QLineF unitVector() const; Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QLineF normalVector() const; - // ### Qt 6: rename intersects() or intersection() and rename IntersectType IntersectionType - IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const; + IntersectionType intersects(const QLineF &l, QPointF *intersectionPoint) const; +#if QT_DEPRECATED_SINCE(5, 14) + QT_DEPRECATED_VERSION_X(5, 14, "Use intersects() instead") + IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const; + QT_DEPRECATED_X("Use angleTo() instead, take care that the return value is between 0 and 360 degree.") qreal angle(const QLineF &l) const; +#endif Q_DECL_CONSTEXPR inline QPointF pointAt(qreal t) const; inline void translate(const QPointF &p); diff --git a/src/corelib/tools/qlinkedlist.cpp b/src/corelib/tools/qlinkedlist.cpp index d9d93862e5..c0450f5cd8 100644 --- a/src/corelib/tools/qlinkedlist.cpp +++ b/src/corelib/tools/qlinkedlist.cpp @@ -153,6 +153,14 @@ const QLinkedListData QLinkedListData::shared_null = { initializer lists. */ +/*! \fn template <class T> template<typename InputIterator> QLinkedList<T>::QLinkedList(InputIterator first, InputIterator last) + \since 5.14 + + Constructs a list with the contents in the iterator range [\a first, \a last). + + The value type of \c InputIterator must be convertible to \c T. +*/ + /*! \fn template <class T> QLinkedList<T>::~QLinkedList() Destroys the list. References to the values in the list, and all diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 1e6d4df474..d4e5bca0ed 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -42,16 +42,15 @@ #include <QtCore/qiterator.h> #include <QtCore/qrefcount.h> +#include <QtCore/qcontainertools_impl.h> +#include <QtCore/qdatastream.h> +#include <QtCore/qtypeinfo.h> +#include <algorithm> +#include <initializer_list> #include <iterator> #include <list> -#include <algorithm> - -#if defined(Q_COMPILER_INITIALIZER_LISTS) -# include <initializer_list> -#endif - QT_BEGIN_NAMESPACE @@ -80,24 +79,23 @@ class QLinkedList union { QLinkedListData *d; QLinkedListNode<T> *e; }; public: - inline QLinkedList() Q_DECL_NOTHROW : d(const_cast<QLinkedListData *>(&QLinkedListData::shared_null)) { } + inline QLinkedList() noexcept : d(const_cast<QLinkedListData *>(&QLinkedListData::shared_null)) { } inline QLinkedList(const QLinkedList<T> &l) : d(l.d) { d->ref.ref(); if (!d->sharable) detach(); } -#if defined(Q_COMPILER_INITIALIZER_LISTS) inline QLinkedList(std::initializer_list<T> list) - : d(const_cast<QLinkedListData *>(&QLinkedListData::shared_null)) + : QLinkedList(list.begin(), list.end()) {} + template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> + inline QLinkedList(InputIterator first, InputIterator last) + : QLinkedList() { - std::copy(list.begin(), list.end(), std::back_inserter(*this)); + std::copy(first, last, std::back_inserter(*this)); } -#endif ~QLinkedList(); QLinkedList<T> &operator=(const QLinkedList<T> &); -#ifdef Q_COMPILER_RVALUE_REFS - QLinkedList(QLinkedList<T> &&other) Q_DECL_NOTHROW + QLinkedList(QLinkedList<T> &&other) noexcept : d(other.d) { other.d = const_cast<QLinkedListData *>(&QLinkedListData::shared_null); } - QLinkedList<T> &operator=(QLinkedList<T> &&other) Q_DECL_NOTHROW + QLinkedList<T> &operator=(QLinkedList<T> &&other) noexcept { QLinkedList moved(std::move(other)); swap(moved); return *this; } -#endif - inline void swap(QLinkedList<T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + inline void swap(QLinkedList<T> &other) noexcept { qSwap(d, other.d); } bool operator==(const QLinkedList<T> &l) const; inline bool operator!=(const QLinkedList<T> &l) const { return !(*this == l); } @@ -137,10 +135,10 @@ public: inline iterator() : i(nullptr) {} inline iterator(Node *n) : i(n) {} #if QT_VERSION < QT_VERSION_CHECK(6,0,0) - iterator(const iterator &other) Q_DECL_NOTHROW : i(other.i) {} - iterator &operator=(const iterator &other) Q_DECL_NOTHROW { i = other.i; return *this; } - iterator(iterator &&other) Q_DECL_NOTHROW : i(other.i) {} - iterator &operator=(iterator &&other) Q_DECL_NOTHROW { return *this = other; } + iterator(const iterator &other) noexcept : i(other.i) {} + iterator &operator=(const iterator &other) noexcept { i = other.i; return *this; } + iterator(iterator &&other) noexcept : i(other.i) {} + iterator &operator=(iterator &&other) noexcept { return *this = other; } #endif inline T &operator*() const { return i->t; } inline T *operator->() const { return &i->t; } @@ -176,10 +174,10 @@ public: inline const_iterator(Node *n) : i(n) {} inline const_iterator(iterator ci) : i(ci.i){} #if QT_VERSION < QT_VERSION_CHECK(6,0,0) - const_iterator(const const_iterator &other) Q_DECL_NOTHROW : i(other.i) {} - const_iterator &operator=(const const_iterator &other) Q_DECL_NOTHROW { i = other.i; return *this; } - const_iterator(const_iterator &&other) Q_DECL_NOTHROW : i(other.i) {} - const_iterator &operator=(const_iterator &&other) Q_DECL_NOTHROW { return *this = other; } + const_iterator(const const_iterator &other) noexcept : i(other.i) {} + const_iterator &operator=(const const_iterator &other) noexcept { i = other.i; return *this; } + const_iterator(const_iterator &&other) noexcept : i(other.i) {} + const_iterator &operator=(const_iterator &&other) noexcept { return *this = other; } #endif inline const T &operator*() const { return i->t; } inline const T *operator->() const { return &i->t; } @@ -203,20 +201,20 @@ public: typedef std::reverse_iterator<const_iterator> const_reverse_iterator; inline iterator begin() { detach(); return e->n; } - inline const_iterator begin() const Q_DECL_NOTHROW { return e->n; } - inline const_iterator cbegin() const Q_DECL_NOTHROW { return e->n; } - inline const_iterator constBegin() const Q_DECL_NOTHROW { return e->n; } + inline const_iterator begin() const noexcept { return e->n; } + inline const_iterator cbegin() const noexcept { return e->n; } + inline const_iterator constBegin() const noexcept { return e->n; } inline iterator end() { detach(); return e; } - inline const_iterator end() const Q_DECL_NOTHROW { return e; } - inline const_iterator cend() const Q_DECL_NOTHROW { return e; } - inline const_iterator constEnd() const Q_DECL_NOTHROW { return e; } + inline const_iterator end() const noexcept { return e; } + inline const_iterator cend() const noexcept { return e; } + inline const_iterator constEnd() const noexcept { return e; } reverse_iterator rbegin() { return reverse_iterator(end()); } reverse_iterator rend() { return reverse_iterator(begin()); } - const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } - const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } + const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); } + const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); } iterator insert(iterator before, const T &t); iterator erase(iterator pos); @@ -270,6 +268,8 @@ private: iterator detach_helper2(iterator); void freeData(QLinkedListData*); }; +template <typename T> +Q_DECLARE_TYPEINFO_BODY(QLinkedList<T>, Q_MOVABLE_TYPE|Q_RELOCATABLE_TYPE); template <typename T> inline QLinkedList<T>::~QLinkedList() @@ -340,7 +340,7 @@ void QLinkedList<T>::freeData(QLinkedListData *x) { Node *y = reinterpret_cast<Node*>(x); Node *i = y->n; - Q_ASSERT(x->ref.atomic.load() == 0); + Q_ASSERT(x->ref.atomic.loadRelaxed() == 0); while (i != y) { Node *n = i; i = i->n; @@ -565,6 +565,20 @@ QLinkedList<T> QLinkedList<T>::operator+(const QLinkedList<T> &l) const Q_DECLARE_SEQUENTIAL_ITERATOR(LinkedList) Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(LinkedList) +#ifndef QT_NO_DATASTREAM +template <typename T> +inline QDataStream &operator>>(QDataStream &s, QLinkedList<T> &l) +{ + return QtPrivate::readListBasedContainer(s, l); +} + +template <typename T> +inline QDataStream &operator<<(QDataStream &s, const QLinkedList<T> &l) +{ + return QtPrivate::writeSequentialContainer(s, l); +} +#endif + QT_END_NAMESPACE #endif // QLINKEDLIST_H diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 17aba8035b..dfebd57e34 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -48,6 +48,23 @@ QT_BEGIN_NAMESPACE /* + ### Qt 5: + ### This needs to be removed for next releases of Qt. It is a workaround for vc++ because + ### Qt exports QPolygon and QPolygonF that inherit QVector<QPoint> and + ### QVector<QPointF> respectively. +*/ + +#if defined(Q_CC_MSVC) && defined(QT_BUILD_CORE_LIB) +QT_BEGIN_INCLUDE_NAMESPACE +#include <QtCore/qpoint.h> +QT_END_INCLUDE_NAMESPACE + +template class Q_CORE_EXPORT QVector<QPointF>; +template class Q_CORE_EXPORT QVector<QPoint>; +#endif + + +/* QList as an array-list combines the easy-of-use of a random access interface with fast list operations and the low memory management overhead of an array. Accessing elements by index, @@ -58,7 +75,7 @@ QT_BEGIN_NAMESPACE the number of elements in the list. */ -const QListData::Data QListData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, { 0 } }; +const QListData::Data QListData::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, { nullptr } }; /*! * Detaches the QListData by allocating new memory for a list which will be bigger @@ -528,6 +545,14 @@ void **QListData::erase(void **xi) \since 5.2 */ +/*! \fn template <class T> template<typename InputIterator> QList<T>::QList(InputIterator first, InputIterator last) + \since 5.14 + + Constructs a QList with the contents in the iterator range [\a first, \a last). + + The value type of \c InputIterator must be convertible to \c T. +*/ + /*! \fn template <class T> QList<T> QList<T>::mid(int pos, int length) const @@ -948,6 +973,14 @@ void **QListData::erase(void **xi) /*! \fn template <class T> void QList<T>::swap(int i, int j) + \obsolete Use swapItemsAt() + + \sa move(), swapItemsAt() +*/ + +/*! \fn template <class T> void QList<T>::swapItemsAt(int i, int j) + \since 5.13 + Exchange the item at index position \a i with the item at index position \a j. This function assumes that both \a i and \a j are at least 0 but less than size(). To avoid failure, test that both diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 49ccbc9c9f..70bbc11ad2 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -45,12 +45,14 @@ #include <QtCore/qrefcount.h> #include <QtCore/qarraydata.h> #include <QtCore/qhashfunctions.h> +#include <QtCore/qvector.h> +#include <QtCore/qcontainertools_impl.h> -#include <iterator> -#include <list> #include <algorithm> -#ifdef Q_COMPILER_INITIALIZER_LISTS #include <initializer_list> +#include <iterator> +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) +#include <list> #endif #include <stdlib.h> @@ -72,7 +74,7 @@ template <typename T> class QSet; template <typename T> struct QListSpecialMethods { protected: - ~QListSpecialMethods() {} + ~QListSpecialMethods() = default; }; template <> struct QListSpecialMethods<QByteArray>; template <> struct QListSpecialMethods<QString>; @@ -110,13 +112,18 @@ struct Q_CORE_EXPORT QListData { void remove(int i); void remove(int i, int n); void move(int from, int to); - inline int size() const Q_DECL_NOTHROW { return d->end - d->begin; } - inline bool isEmpty() const Q_DECL_NOTHROW { return d->end == d->begin; } - inline void **at(int i) const Q_DECL_NOTHROW { return d->array + d->begin + i; } - inline void **begin() const Q_DECL_NOTHROW { return d->array + d->begin; } - inline void **end() const Q_DECL_NOTHROW { return d->array + d->end; } + inline int size() const noexcept { return d->end - d->begin; } + inline bool isEmpty() const noexcept { return d->end == d->begin; } + inline void **at(int i) const noexcept { return d->array + d->begin + i; } + inline void **begin() const noexcept { return d->array + d->begin; } + inline void **end() const noexcept { return d->array + d->end; } }; +namespace QtPrivate { + template <typename V, typename U> int indexOf(const QList<V> &list, const U &u, int from); + template <typename V, typename U> int lastIndexOf(const QList<V> &list, const U &u, int from); +} + template <typename T> class QList #ifndef Q_QDOC @@ -135,6 +142,8 @@ public: QListData::InlineWithPaddingLayout >::type>::type {}; private: + template <typename V, typename U> friend int QtPrivate::indexOf(const QList<V> &list, const U &u, int from); + template <typename V, typename U> friend int QtPrivate::lastIndexOf(const QList<V> &list, const U &u, int from); struct Node { void *v; #if defined(Q_CC_BOR) Q_INLINE_TEMPLATE T &t(); @@ -148,26 +157,23 @@ private: union { QListData p; QListData::Data *d; }; public: - inline QList() Q_DECL_NOTHROW : d(const_cast<QListData::Data *>(&QListData::shared_null)) { } + inline QList() noexcept : d(const_cast<QListData::Data *>(&QListData::shared_null)) { } QList(const QList<T> &l); ~QList(); QList<T> &operator=(const QList<T> &l); -#ifdef Q_COMPILER_RVALUE_REFS - inline QList(QList<T> &&other) Q_DECL_NOTHROW + inline QList(QList<T> &&other) noexcept : d(other.d) { other.d = const_cast<QListData::Data *>(&QListData::shared_null); } - inline QList &operator=(QList<T> &&other) Q_DECL_NOTHROW + inline QList &operator=(QList<T> &&other) noexcept { QList moved(std::move(other)); swap(moved); return *this; } -#endif - inline void swap(QList<T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); } -#ifdef Q_COMPILER_INITIALIZER_LISTS + inline void swap(QList<T> &other) noexcept { qSwap(d, other.d); } inline QList(std::initializer_list<T> args) - : d(const_cast<QListData::Data *>(&QListData::shared_null)) - { reserve(int(args.size())); std::copy(args.begin(), args.end(), std::back_inserter(*this)); } -#endif + : QList(args.begin(), args.end()) {} + template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> + QList(InputIterator first, InputIterator last); bool operator==(const QList<T> &l) const; inline bool operator!=(const QList<T> &l) const { return !(*this == l); } - inline int size() const Q_DECL_NOTHROW { return p.size(); } + inline int size() const noexcept { return p.size(); } inline void detach() { if (d->ref.isShared()) detach_helper(); } @@ -190,9 +196,9 @@ public: d->ref.setSharable(sharable); } #endif - inline bool isSharedWith(const QList<T> &other) const Q_DECL_NOTHROW { return d == other.d; } + inline bool isSharedWith(const QList<T> &other) const noexcept { return d == other.d; } - inline bool isEmpty() const Q_DECL_NOTHROW { return p.isEmpty(); } + inline bool isEmpty() const noexcept { return p.isEmpty(); } void clear(); @@ -213,7 +219,11 @@ public: T takeFirst(); T takeLast(); void move(int from, int to); - void swap(int i, int j); + void swapItemsAt(int i, int j); +#if QT_DEPRECATED_SINCE(5, 13) && QT_VERSION < QT_VERSION_CHECK(6,0,0) + QT_DEPRECATED_X("Use QList<T>::swapItemsAt()") + void swap(int i, int j) { swapItemsAt(i, j); } +#endif int indexOf(const T &t, int from = 0) const; int lastIndexOf(const T &t, int from = -1) const; bool contains(const T &t) const; @@ -231,34 +241,36 @@ public: typedef T *pointer; typedef T &reference; - inline iterator() Q_DECL_NOTHROW : i(nullptr) {} - inline iterator(Node *n) Q_DECL_NOTHROW : i(n) {} + inline iterator() noexcept : i(nullptr) {} + inline iterator(Node *n) noexcept : i(n) {} #if QT_VERSION < QT_VERSION_CHECK(6,0,0) // can't remove it in Qt 5, since doing so would make the type trivial, // which changes the way it's passed to functions by value. - inline iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i){} + inline iterator(const iterator &o) noexcept : i(o.i){} + inline iterator &operator=(const iterator &o) noexcept + { i = o.i; return *this; } #endif inline T &operator*() const { return i->t(); } inline T *operator->() const { return &i->t(); } inline T &operator[](difference_type j) const { return i[j].t(); } - inline bool operator==(const iterator &o) const Q_DECL_NOTHROW { return i == o.i; } - inline bool operator!=(const iterator &o) const Q_DECL_NOTHROW { return i != o.i; } - inline bool operator<(const iterator& other) const Q_DECL_NOTHROW { return i < other.i; } - inline bool operator<=(const iterator& other) const Q_DECL_NOTHROW { return i <= other.i; } - inline bool operator>(const iterator& other) const Q_DECL_NOTHROW { return i > other.i; } - inline bool operator>=(const iterator& other) const Q_DECL_NOTHROW { return i >= other.i; } + inline bool operator==(const iterator &o) const noexcept { return i == o.i; } + inline bool operator!=(const iterator &o) const noexcept { return i != o.i; } + inline bool operator<(const iterator& other) const noexcept { return i < other.i; } + inline bool operator<=(const iterator& other) const noexcept { return i <= other.i; } + inline bool operator>(const iterator& other) const noexcept { return i > other.i; } + inline bool operator>=(const iterator& other) const noexcept { return i >= other.i; } #ifndef QT_STRICT_ITERATORS - inline bool operator==(const const_iterator &o) const Q_DECL_NOTHROW + inline bool operator==(const const_iterator &o) const noexcept { return i == o.i; } - inline bool operator!=(const const_iterator &o) const Q_DECL_NOTHROW + inline bool operator!=(const const_iterator &o) const noexcept { return i != o.i; } - inline bool operator<(const const_iterator& other) const Q_DECL_NOTHROW + inline bool operator<(const const_iterator& other) const noexcept { return i < other.i; } - inline bool operator<=(const const_iterator& other) const Q_DECL_NOTHROW + inline bool operator<=(const const_iterator& other) const noexcept { return i <= other.i; } - inline bool operator>(const const_iterator& other) const Q_DECL_NOTHROW + inline bool operator>(const const_iterator& other) const noexcept { return i > other.i; } - inline bool operator>=(const const_iterator& other) const Q_DECL_NOTHROW + inline bool operator>=(const const_iterator& other) const noexcept { return i >= other.i; } #endif inline iterator &operator++() { ++i; return *this; } @@ -284,27 +296,29 @@ public: typedef const T *pointer; typedef const T &reference; - inline const_iterator() Q_DECL_NOTHROW : i(nullptr) {} - inline const_iterator(Node *n) Q_DECL_NOTHROW : i(n) {} + inline const_iterator() noexcept : i(nullptr) {} + inline const_iterator(Node *n) noexcept : i(n) {} #if QT_VERSION < QT_VERSION_CHECK(6,0,0) // can't remove it in Qt 5, since doing so would make the type trivial, // which changes the way it's passed to functions by value. - inline const_iterator(const const_iterator &o) Q_DECL_NOTHROW : i(o.i) {} + inline const_iterator(const const_iterator &o) noexcept : i(o.i) {} + inline const_iterator &operator=(const const_iterator &o) noexcept + { i = o.i; return *this; } #endif #ifdef QT_STRICT_ITERATORS - inline explicit const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {} + inline explicit const_iterator(const iterator &o) noexcept : i(o.i) {} #else - inline const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {} + inline const_iterator(const iterator &o) noexcept : i(o.i) {} #endif inline const T &operator*() const { return i->t(); } inline const T *operator->() const { return &i->t(); } inline const T &operator[](difference_type j) const { return i[j].t(); } - inline bool operator==(const const_iterator &o) const Q_DECL_NOTHROW { return i == o.i; } - inline bool operator!=(const const_iterator &o) const Q_DECL_NOTHROW { return i != o.i; } - inline bool operator<(const const_iterator& other) const Q_DECL_NOTHROW { return i < other.i; } - inline bool operator<=(const const_iterator& other) const Q_DECL_NOTHROW { return i <= other.i; } - inline bool operator>(const const_iterator& other) const Q_DECL_NOTHROW { return i > other.i; } - inline bool operator>=(const const_iterator& other) const Q_DECL_NOTHROW { return i >= other.i; } + inline bool operator==(const const_iterator &o) const noexcept { return i == o.i; } + inline bool operator!=(const const_iterator &o) const noexcept { return i != o.i; } + inline bool operator<(const const_iterator& other) const noexcept { return i < other.i; } + inline bool operator<=(const const_iterator& other) const noexcept { return i <= other.i; } + inline bool operator>(const const_iterator& other) const noexcept { return i > other.i; } + inline bool operator>=(const const_iterator& other) const noexcept { return i >= other.i; } inline const_iterator &operator++() { ++i; return *this; } inline const_iterator operator++(int) { Node *n = i; ++i; return n; } inline const_iterator &operator--() { i--; return *this; } @@ -322,19 +336,19 @@ public: typedef std::reverse_iterator<iterator> reverse_iterator; typedef std::reverse_iterator<const_iterator> const_reverse_iterator; inline iterator begin() { detach(); return reinterpret_cast<Node *>(p.begin()); } - inline const_iterator begin() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.begin()); } - inline const_iterator cbegin() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.begin()); } - inline const_iterator constBegin() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.begin()); } + inline const_iterator begin() const noexcept { return reinterpret_cast<Node *>(p.begin()); } + inline const_iterator cbegin() const noexcept { return reinterpret_cast<Node *>(p.begin()); } + inline const_iterator constBegin() const noexcept { return reinterpret_cast<Node *>(p.begin()); } inline iterator end() { detach(); return reinterpret_cast<Node *>(p.end()); } - inline const_iterator end() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.end()); } - inline const_iterator cend() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.end()); } - inline const_iterator constEnd() const Q_DECL_NOTHROW { return reinterpret_cast<Node *>(p.end()); } + inline const_iterator end() const noexcept { return reinterpret_cast<Node *>(p.end()); } + inline const_iterator cend() const noexcept { return reinterpret_cast<Node *>(p.end()); } + inline const_iterator constEnd() const noexcept { return reinterpret_cast<Node *>(p.end()); } reverse_iterator rbegin() { return reverse_iterator(end()); } reverse_iterator rend() { return reverse_iterator(begin()); } - const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } - const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } + const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); } + const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); } iterator insert(iterator before, const T &t); iterator erase(iterator pos); iterator erase(iterator first, iterator last); @@ -389,16 +403,22 @@ public: inline QList<T> &operator<<(const QList<T> &l) { *this += l; return *this; } + static QList<T> fromVector(const QVector<T> &vector); QVector<T> toVector() const; - QSet<T> toSet() const; - static QList<T> fromVector(const QVector<T> &vector); +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + Q_DECL_DEPRECATED_X("Use QList<T>(set.begin(), set.end()) instead.") static QList<T> fromSet(const QSet<T> &set); + Q_DECL_DEPRECATED_X("Use QSet<T>(list.begin(), list.end()) instead.") + QSet<T> toSet() const; + Q_DECL_DEPRECATED_X("Use QList<T>(list.begin(), list.end()) instead.") static inline QList<T> fromStdList(const std::list<T> &list) - { QList<T> tmp; std::copy(list.begin(), list.end(), std::back_inserter(tmp)); return tmp; } + { return QList<T>(list.begin(), list.end()); } + Q_DECL_DEPRECATED_X("Use std::list<T>(list.begin(), list.end()) instead.") inline std::list<T> toStdList() const - { std::list<T> tmp; std::copy(constBegin(), constEnd(), std::back_inserter(tmp)); return tmp; } + { return std::list<T>(begin(), end()); } +#endif private: Node *detach_helper_grow(int i, int n); @@ -411,7 +431,7 @@ private: void node_copy(Node *from, Node *to, Node *src); void node_destruct(Node *from, Node *to); - bool isValidIterator(const iterator &i) const Q_DECL_NOTHROW + bool isValidIterator(const iterator &i) const noexcept { const std::less<const Node *> less = {}; return !less(i.i, cbegin().i) && !less(cend().i, i.i); @@ -514,7 +534,7 @@ inline typename QList<T>::iterator QList<T>::insert(iterator before, const T &t) Q_ASSERT_X(isValidIterator(before), "QList::insert", "The specified iterator argument 'before' is invalid"); int iBefore = int(before.i - reinterpret_cast<Node *>(p.begin())); - Node *n = 0; + Node *n = nullptr; if (d->ref.isShared()) n = detach_helper_grow(iBefore, 1); else @@ -689,12 +709,12 @@ inline void QList<T>::replace(int i, const T &t) } template <typename T> -inline void QList<T>::swap(int i, int j) +inline void QList<T>::swapItemsAt(int i, int j) { Q_ASSERT_X(i >= 0 && i < p.size() && j >= 0 && j < p.size(), "QList<T>::swap", "index out of range"); detach(); - std::swap(d->array[d->begin + i], d->array[d->begin + j]); + qSwap(d->array[d->begin + i], d->array[d->begin + j]); } template <typename T> @@ -831,6 +851,15 @@ Q_OUTOFLINE_TEMPLATE QList<T>::~QList() } template <typename T> +template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator>> +QList<T>::QList(InputIterator first, InputIterator last) + : QList() +{ + QtPrivate::reserveIfForwardIterator(this, first, last); + std::copy(first, last, std::back_inserter(*this)); +} + +template <typename T> Q_OUTOFLINE_TEMPLATE bool QList<T>::operator==(const QList<T> &l) const { if (d == l.d) @@ -970,35 +999,57 @@ inline void QList<T>::append(const QList<T> &t) template <typename T> Q_OUTOFLINE_TEMPLATE int QList<T>::indexOf(const T &t, int from) const { + return QtPrivate::indexOf<T, T>(*this, t, from); +} + +namespace QtPrivate +{ +template <typename T, typename U> +int indexOf(const QList<T> &list, const U &u, int from) +{ + typedef typename QList<T>::Node Node; + if (from < 0) - from = qMax(from + p.size(), 0); - if (from < p.size()) { - Node *n = reinterpret_cast<Node *>(p.at(from -1)); - Node *e = reinterpret_cast<Node *>(p.end()); + from = qMax(from + list.p.size(), 0); + if (from < list.p.size()) { + Node *n = reinterpret_cast<Node *>(list.p.at(from -1)); + Node *e = reinterpret_cast<Node *>(list.p.end()); while (++n != e) - if (n->t() == t) - return int(n - reinterpret_cast<Node *>(p.begin())); + if (n->t() == u) + return int(n - reinterpret_cast<Node *>(list.p.begin())); } return -1; } +} template <typename T> Q_OUTOFLINE_TEMPLATE int QList<T>::lastIndexOf(const T &t, int from) const { + return QtPrivate::lastIndexOf<T, T>(*this, t, from); +} + +namespace QtPrivate +{ +template <typename T, typename U> +int lastIndexOf(const QList<T> &list, const U &u, int from) +{ + typedef typename QList<T>::Node Node; + if (from < 0) - from += p.size(); - else if (from >= p.size()) - from = p.size()-1; + from += list.p.size(); + else if (from >= list.p.size()) + from = list.p.size()-1; if (from >= 0) { - Node *b = reinterpret_cast<Node *>(p.begin()); - Node *n = reinterpret_cast<Node *>(p.at(from + 1)); + Node *b = reinterpret_cast<Node *>(list.p.begin()); + Node *n = reinterpret_cast<Node *>(list.p.at(from + 1)); while (n-- != b) { - if (n->t() == t) + if (n->t() == u) return n - b; } } return -1; } +} template <typename T> Q_OUTOFLINE_TEMPLATE bool QList<T>::contains(const T &t) const @@ -1051,19 +1102,43 @@ inline int QList<T>::count_impl(const T &t, QListData::ArrayCompatibleLayout) co t)); } +template <typename T> +Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const +{ + return QVector<T>(begin(), end()); +} + +template <typename T> +QList<T> QList<T>::fromVector(const QVector<T> &vector) +{ + return vector.toList(); +} + +template <typename T> +Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const +{ + return QList<T>(begin(), end()); +} + +template <typename T> +QVector<T> QVector<T>::fromList(const QList<T> &list) +{ + return list.toVector(); +} + Q_DECLARE_SEQUENTIAL_ITERATOR(List) Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(List) template <typename T> uint qHash(const QList<T> &key, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHashRange(key.cbegin(), key.cend(), seed))) + noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed))) { return qHashRange(key.cbegin(), key.cend(), seed); } template <typename T> bool operator<(const QList<T> &lhs, const QList<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(), + noexcept(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end()))) { return std::lexicographical_compare(lhs.begin(), lhs.end(), @@ -1072,21 +1147,21 @@ bool operator<(const QList<T> &lhs, const QList<T> &rhs) template <typename T> inline bool operator>(const QList<T> &lhs, const QList<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return rhs < lhs; } template <typename T> inline bool operator<=(const QList<T> &lhs, const QList<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return !(lhs > rhs); } template <typename T> inline bool operator>=(const QList<T> &lhs, const QList<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return !(lhs < rhs); } diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 506b32a257..939f8eb34d 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -55,7 +55,7 @@ #include "qlocale_p.h" #include "qlocale_tools_p.h" #if QT_CONFIG(datetimeparser) -#include "qdatetimeparser_p.h" +#include "private/qdatetimeparser_p.h" #endif #include "qnamespace.h" #include "qdatetime.h" @@ -94,7 +94,7 @@ QT_BEGIN_INCLUDE_NAMESPACE #include "qlocale_data_p.h" QT_END_INCLUDE_NAMESPACE -QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) Q_DECL_NOTHROW +QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) noexcept { const auto len = code.size(); if (len != 2 && len != 3) @@ -138,7 +138,7 @@ QLocale::Language QLocalePrivate::codeToLanguage(QStringView code) Q_DECL_NOTHRO return QLocale::C; } -QLocale::Script QLocalePrivate::codeToScript(QStringView code) Q_DECL_NOTHROW +QLocale::Script QLocalePrivate::codeToScript(QStringView code) noexcept { const auto len = code.size(); if (len != 4) @@ -158,7 +158,7 @@ QLocale::Script QLocalePrivate::codeToScript(QStringView code) Q_DECL_NOTHROW return QLocale::AnyScript; } -QLocale::Country QLocalePrivate::codeToCountry(QStringView code) Q_DECL_NOTHROW +QLocale::Country QLocalePrivate::codeToCountry(QStringView code) noexcept { const auto len = code.size(); if (len != 2 && len != 3) @@ -301,9 +301,9 @@ QByteArray QLocaleId::name(char separator) const const unsigned char *lang = language_code_list + 3 * language_id; const unsigned char *script = - (script_id != QLocale::AnyScript ? script_code_list + 4 * script_id : 0); + (script_id != QLocale::AnyScript ? script_code_list + 4 * script_id : nullptr); const unsigned char *country = - (country_id != QLocale::AnyCountry ? country_code_list + 3 * country_id : 0); + (country_id != QLocale::AnyCountry ? country_code_list + 3 * country_id : nullptr); char len = (lang[2] != 0 ? 3 : 2) + (script ? 4+1 : 0) + (country ? (country[2] != 0 ? 3 : 2)+1 : 0); QByteArray name(len, Qt::Uninitialized); char *uc = name.data(); @@ -373,7 +373,7 @@ static const QLocaleData *findLocaleDataById(const QLocaleId &localeId) } while (data->m_language_id && data->m_language_id == localeId.language_id); } - return 0; + return nullptr; } const QLocaleData *QLocaleData::findLocaleData(QLocale::Language language, QLocale::Script script, QLocale::Country country) @@ -604,7 +604,7 @@ int qt_repeatCount(QStringView s) return int(j); } -static const QLocaleData *default_data = 0; +static const QLocaleData *default_data = nullptr; static QLocale::NumberOptions default_number_options = QLocale::DefaultNumberOptions; static const QLocaleData *const c_data = locale_data; @@ -620,13 +620,18 @@ static QLocalePrivate *c_private() */ /*! - Constructs a QSystemLocale object. The constructor will automatically - install this object as the system locale and remove any earlier installed - system locales. + Constructs a QSystemLocale object. + + The constructor will automatically install this object as the system locale, + if there's not one active. It also resets the flag that'll prompt + QLocale::system() to re-initialize its data, so that instantiating a + QSystemLocale transiently (doesn't install the transient as system locale if + there was one already and) triggers an update to the system locale's data. */ QSystemLocale::QSystemLocale() { - _systemLocale = this; + if (!_systemLocale) + _systemLocale = this; globalLocaleData.m_language_id = 0; } @@ -656,15 +661,17 @@ static const QSystemLocale *systemLocale() return QSystemLocale_globalSystemLocale(); } -void QLocalePrivate::updateSystemPrivate() +static void updateSystemPrivate() { - // this function is NOT thread-safe! + // This function is NOT thread-safe! + // It *should not* be called by anything but systemData() const QSystemLocale *sys_locale = systemLocale(); // tell the object that the system locale has changed. sys_locale->query(QSystemLocale::LocaleChanged, QVariant()); - globalLocaleData = *sys_locale->fallbackUiLocale().d->m_data; + // Populate global with fallback as basis: + globalLocaleData = *sys_locale->fallbackUiLocaleData(); QVariant res = sys_locale->query(QSystemLocale::LanguageId, QVariant()); if (!res.isNull()) { @@ -715,7 +722,7 @@ static const QLocaleData *systemData() static QBasicMutex systemDataMutex; systemDataMutex.lock(); if (globalLocaleData.m_language_id == 0) - QLocalePrivate::updateSystemPrivate(); + updateSystemPrivate(); systemDataMutex.unlock(); } @@ -975,7 +982,7 @@ bool QLocale::operator!=(const QLocale &other) const Returns the hash value for \a key, using \a seed to seed the calculation. */ -uint qHash(const QLocale &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QLocale &key, uint seed) noexcept { QtPrivate::QHashCombine hash; seed = hash(seed, key.d->m_data); @@ -1180,9 +1187,7 @@ static qulonglong toIntegral_helper(const QLocaleData *d, QStringView str, bool template <typename T> static inline T toIntegral_helper(const QLocalePrivate *d, QStringView str, bool *ok) { - // ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type - const bool isUnsigned = T(0) < T(-1); - typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64; + using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type; // we select the right overload by the last, unused parameter Int64 val = toIntegral_helper(d->m_data, str, ok, d->m_numberOptions, Int64()); @@ -1260,7 +1265,7 @@ QString QLocale::scriptToString(QLocale::Script script) If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1278,7 +1283,7 @@ short QLocale::toShort(const QString &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1296,7 +1301,7 @@ ushort QLocale::toUShort(const QString &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1314,7 +1319,7 @@ int QLocale::toInt(const QString &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1328,11 +1333,53 @@ uint QLocale::toUInt(const QString &s, bool *ok) const } /*! + Returns the long int represented by the localized string \a s. + + If the conversion fails the function returns 0. + + If \a ok is not \nullptr, failure is reported by setting *\a{ok} + to \c false, and success by setting *\a{ok} to \c true. + + This function ignores leading and trailing whitespace. + + \sa toInt(), toULong(), toDouble(), toString() + + \since 5.13 + */ + + +long QLocale::toLong(const QString &s, bool *ok) const +{ + return toIntegral_helper<long>(d, s, ok); +} + +/*! + Returns the unsigned long int represented by the localized + string \a s. + + If the conversion fails the function returns 0. + + If \a ok is not \nullptr, failure is reported by setting *\a{ok} + to \c false, and success by setting *\a{ok} to \c true. + + This function ignores leading and trailing whitespace. + + \sa toLong(), toInt(), toDouble(), toString() + + \since 5.13 +*/ + +ulong QLocale::toULong(const QString &s, bool *ok) const +{ + return toIntegral_helper<ulong>(d, s, ok); +} + +/*! Returns the long long int represented by the localized string \a s. If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1352,7 +1399,7 @@ qlonglong QLocale::toLongLong(const QString &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1371,7 +1418,7 @@ qulonglong QLocale::toULongLong(const QString &s, bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for any other reason (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function does not fall back to the 'C' locale if the string @@ -1393,7 +1440,7 @@ float QLocale::toFloat(const QString &s, bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for any other reason (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function does not fall back to the 'C' locale if the string @@ -1419,7 +1466,7 @@ double QLocale::toDouble(const QString &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1439,7 +1486,7 @@ short QLocale::toShort(const QStringRef &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1459,7 +1506,7 @@ ushort QLocale::toUShort(const QStringRef &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1479,7 +1526,7 @@ int QLocale::toInt(const QStringRef &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1495,11 +1542,53 @@ uint QLocale::toUInt(const QStringRef &s, bool *ok) const } /*! + Returns the long int represented by the localized string \a s. + + If the conversion fails the function returns 0. + + If \a ok is not \nullptr, failure is reported by setting *\a{ok} + to \c false, and success by setting *\a{ok} to \c true. + + This function ignores leading and trailing whitespace. + + \sa toInt(), toULong(), toDouble(), toString() + + \since 5.13 + */ + + +long QLocale::toLong(const QStringRef &s, bool *ok) const +{ + return toIntegral_helper<long>(d, s, ok); +} + +/*! + Returns the unsigned long int represented by the localized + string \a s. + + If the conversion fails the function returns 0. + + If \a ok is not \nullptr, failure is reported by setting *\a{ok} + to \c false, and success by setting *\a{ok} to \c true. + + This function ignores leading and trailing whitespace. + + \sa toLong(), toInt(), toDouble(), toString() + + \since 5.13 + */ + +ulong QLocale::toULong(const QStringRef &s, bool *ok) const +{ + return toIntegral_helper<ulong>(d, s, ok); +} + +/*! Returns the long long int represented by the localized string \a s. If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1521,7 +1610,7 @@ qlonglong QLocale::toLongLong(const QStringRef &s, bool *ok) const If the conversion fails the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1542,7 +1631,7 @@ qulonglong QLocale::toULongLong(const QStringRef &s, bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for any other reason (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function does not fall back to the 'C' locale if the string @@ -1566,7 +1655,7 @@ float QLocale::toFloat(const QStringRef &s, bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for any other reason (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function does not fall back to the 'C' locale if the string @@ -1595,7 +1684,7 @@ double QLocale::toDouble(const QStringRef &s, bool *ok) const If the conversion fails, the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1615,7 +1704,7 @@ short QLocale::toShort(QStringView s, bool *ok) const If the conversion fails, the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1635,7 +1724,7 @@ ushort QLocale::toUShort(QStringView s, bool *ok) const If the conversion fails, the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1655,7 +1744,7 @@ int QLocale::toInt(QStringView s, bool *ok) const If the conversion fails, the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1671,11 +1760,53 @@ uint QLocale::toUInt(QStringView s, bool *ok) const } /*! + Returns the long int represented by the localized string \a s. + + If the conversion fails the function returns 0. + + If \a ok is not \nullptr, failure is reported by setting *\a{ok} + to \c false, and success by setting *\a{ok} to \c true. + + This function ignores leading and trailing whitespace. + + \sa toInt(), toULong(), toDouble(), toString() + + \since 5.13 + */ + + +long QLocale::toLong(QStringView s, bool *ok) const +{ + return toIntegral_helper<long>(d, s, ok); +} + +/*! + Returns the unsigned long int represented by the localized + string \a s. + + If the conversion fails the function returns 0. + + If \a ok is not \nullptr, failure is reported by setting *\a{ok} + to \c false, and success by setting *\a{ok} to \c true. + + This function ignores leading and trailing whitespace. + + \sa toLong(), toInt(), toDouble(), toString() + + \since 5.13 + */ + +ulong QLocale::toULong(QStringView s, bool *ok) const +{ + return toIntegral_helper<ulong>(d, s, ok); +} + +/*! Returns the long long int represented by the localized string \a s. If the conversion fails, the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1697,7 +1828,7 @@ qlonglong QLocale::toLongLong(QStringView s, bool *ok) const If the conversion fails, the function returns 0. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1718,7 +1849,7 @@ qulonglong QLocale::toULongLong(QStringView s, bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for any other reason (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. This function ignores leading and trailing whitespace. @@ -1739,7 +1870,7 @@ float QLocale::toFloat(QStringView s, bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for any other reason (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. Unlike QString::toDouble(), this function does not fall back to @@ -2376,7 +2507,6 @@ QString QLocale::toString(double i, char f, int prec) const QLocale QLocale::system() { - // this function is NOT thread-safe! QT_PREPEND_NAMESPACE(systemData)(); // trigger updating of the system data if necessary if (systemLocalePrivate.isDestroyed()) return QLocale(QLocale::C); @@ -3902,6 +4032,19 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci \sa formattedDataSize() */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +/*! + \obsolete + + Use the const version instead. +*/ +QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats format) +{ + const auto *that = this; + return that->formattedDataSize(bytes, precision, format); +} +#endif + /*! \since 5.10 @@ -3918,7 +4061,7 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci whereas \c DataSizeSIFormat uses the older SI quantifiers k, M, etc., and \c DataSizeTraditionalFormat abuses them. */ -QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats format) +QString QLocale::formattedDataSize(qint64 bytes, int precision, DataSizeFormats format) const { int power, base = 1000; if (!bytes) { @@ -4000,6 +4143,29 @@ QStringList QLocale::uiLanguages() const } /*! + \since 5.13 + + Returns the locale to use for collation. + + The result is usually this locale; however, the system locale (which is + commonly the default locale) will return the system collation locale. + The result is suitable for passing to QCollator's constructor. + + \sa QCollator +*/ +QLocale QLocale::collation() const +{ +#ifndef QT_NO_SYSTEMLOCALE + if (d->m_data == systemData()) { + QString res = systemLocale()->query(QSystemLocale::Collation, QVariant()).toString(); + if (!res.isEmpty()) + return QLocale(res); + } +#endif + return *this; +} + +/*! \since 4.8 Returns a native name of the language for the locale. For example diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index f3afb8c406..09de830ca3 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -59,7 +59,7 @@ class QTextStreamPrivate; class QLocalePrivate; -Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed = 0) noexcept; class Q_CORE_EXPORT QLocale { @@ -436,6 +436,13 @@ public: Cantonese = 357, Osage = 358, Tangut = 359, + Ido = 360, + Lojban = 361, + Sicilian = 362, + SouthernKurdish = 363, + WesternBalochi = 364, + Cebuano = 365, + Erzya = 366, Afan = Oromo, Bhutani = Dzongkha, @@ -452,7 +459,7 @@ public: Twi = Akan, Uigur = Uighur, - LastLanguage = Tangut + LastLanguage = Erzya }; enum Script { @@ -934,13 +941,11 @@ public: QLocale(Language language, Country country = AnyCountry); QLocale(Language language, Script script, Country country); QLocale(const QLocale &other); -#ifdef Q_COMPILER_RVALUE_REFS - QLocale &operator=(QLocale &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif + QLocale &operator=(QLocale &&other) noexcept { swap(other); return *this; } QLocale &operator=(const QLocale &other); ~QLocale(); - void swap(QLocale &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + void swap(QLocale &other) noexcept { qSwap(d, other.d); } Language language() const; Script script() const; @@ -956,6 +961,8 @@ public: ushort toUShort(const QString &s, bool *ok = nullptr) const; int toInt(const QString &s, bool *ok = nullptr) const; uint toUInt(const QString &s, bool *ok = nullptr) const; + long toLong(const QString &s, bool *ok = nullptr) const; + ulong toULong(const QString &s, bool *ok = nullptr) const; qlonglong toLongLong(const QString &s, bool *ok = nullptr) const; qulonglong toULongLong(const QString &s, bool *ok = nullptr) const; float toFloat(const QString &s, bool *ok = nullptr) const; @@ -965,6 +972,8 @@ public: ushort toUShort(const QStringRef &s, bool *ok = nullptr) const; int toInt(const QStringRef &s, bool *ok = nullptr) const; uint toUInt(const QStringRef &s, bool *ok = nullptr) const; + long toLong(const QStringRef &s, bool *ok = nullptr) const; + ulong toULong(const QStringRef &s, bool *ok = nullptr) const; qlonglong toLongLong(const QStringRef &s, bool *ok = nullptr) const; qulonglong toULongLong(const QStringRef &s, bool *ok = nullptr) const; float toFloat(const QStringRef &s, bool *ok = nullptr) const; @@ -975,6 +984,8 @@ public: ushort toUShort(QStringView s, bool *ok = nullptr) const; int toInt(QStringView s, bool *ok = nullptr) const; uint toUInt(QStringView s, bool *ok = nullptr) const; + long toLong(QStringView s, bool *ok = nullptr) const; + ulong toULong(QStringView s, bool *ok = nullptr) const; qlonglong toLongLong(QStringView s, bool *ok = nullptr) const; qulonglong toULongLong(QStringView s, bool *ok = nullptr) const; float toFloat(QStringView s, bool *ok = nullptr) const; @@ -982,6 +993,8 @@ public: QString toString(qlonglong i) const; QString toString(qulonglong i) const; + inline QString toString(long i) const; + inline QString toString(ulong i) const; inline QString toString(short i) const; inline QString toString(ushort i) const; inline QString toString(int i) const; @@ -1035,7 +1048,7 @@ public: QString pmText() const; MeasurementSystem measurementSystem() const; - + QLocale collation() const; Qt::LayoutDirection textDirection() const; QString toUpper(const QString &str) const; @@ -1061,7 +1074,10 @@ public: { return toCurrencyString(double(i), symbol, precision); } #endif +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QString formattedDataSize(qint64 bytes, int precision = 2, DataSizeFormats format = DataSizeIecFormat); +#endif + QString formattedDataSize(qint64 bytes, int precision = 2, DataSizeFormats format = DataSizeIecFormat) const; QStringList uiLanguages() const; @@ -1091,13 +1107,18 @@ public: private: QLocale(QLocalePrivate &dd); friend class QLocalePrivate; - friend Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed) Q_DECL_NOTHROW; + friend class QSystemLocale; + friend Q_CORE_EXPORT uint qHash(const QLocale &key, uint seed) noexcept; QSharedDataPointer<QLocalePrivate> d; }; Q_DECLARE_SHARED(QLocale) Q_DECLARE_OPERATORS_FOR_FLAGS(QLocale::NumberOptions) +inline QString QLocale::toString(long i) const + { return toString(qlonglong(i)); } +inline QString QLocale::toString(ulong i) const + { return toString(qulonglong(i)); } inline QString QLocale::toString(short i) const { return toString(qlonglong(i)); } inline QString QLocale::toString(ushort i) const diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc index afc9bb6e21..426cb9dbeb 100644 --- a/src/corelib/tools/qlocale.qdoc +++ b/src/corelib/tools/qlocale.qdoc @@ -105,42 +105,81 @@ \value AnyLanguage \value C A simplified English locale; see QLocale::c() + \value Abkhazian - \value Oromo \value Afan Obsolete, please use Oromo \value Afar \value Afrikaans + \value Aghem + \value Ahom Since Qt 5.7 + \value Akan + \value Akkadian Since Qt 5.1 \value Akoose Since Qt 5.3 \value Albanian + \value AmericanSignLanguage Since Qt 5.7 \value Amharic + \value AncientEgyptian Since Qt 5.1 + \value AncientGreek Since Qt 5.1 + \value AncientNorthArabian Since Qt 5.5 \value Arabic + \value Aragonese Since Qt 5.1 + \value Aramaic Since Qt 5.1 + \value ArdhamagadhiPrakrit Since Qt 5.7 \value Armenian \value Assamese + \value Asturian + \value Asu + \value Atsam \value Avaric + \value Avestan \value Aymara \value Azerbaijani + \value Bafia + \value Balinese Since Qt 5.1 + \value Bambara + \value Bamun Since Qt 5.1 + \value Basaa \value Bashkir \value Basque + \value Bassa Since Qt 5.5 + \value BatakToba Since Qt 5.1 + \value Belarusian + \value Bemba + \value Bena \value Bengali - \value Dzongkha + \value Bhojpuri Since Qt 5.7 \value Bhutani Obsolete, please use Dzongkha \value Bihari \value Bislama - \value Bosnian + \value Blin \value Bodo + \value Bosnian \value Breton + \value Buginese Since Qt 5.1 + \value Buhid Since Qt 5.1 \value Bulgarian \value Burmese - \value Belarusian \value Byelorussian Obsolete, please use Belarusian - \value Khmer \value Cambodian Obsolete, please use Khmer + \value Cantonese Since Qt 5.7 + \value Carian Since Qt 5.1 \value Catalan + \value Cebuano Since Qt 5.14 + \value CentralKurdish Since Qt 5.5 + \value CentralMoroccoTamazight + \value Chakma Since Qt 5.1 \value Chamorro \value Chechen + \value Cherokee + \value Chewa Obsolete, please use Nyanja + \value Chiga \value Chinese \value Church \value Chuvash + \value ClassicalMandaic Since Qt 5.1 + \value Colognian + \value CongoSwahili + \value Coptic Since Qt 5.1 \value Cornish \value Corsican \value Cree @@ -148,33 +187,59 @@ \value Czech \value Danish \value Divehi + \value Dogri Since Qt 5.1 + \value Duala \value Dutch + \value Dzongkha + \value EasternCham Since Qt 5.1 + \value EasternKayah Since Qt 5.1 + \value Embu \value English + \value Erzya Since Qt 5.14 \value Esperanto \value Estonian + \value Etruscan Since Qt 5.1 + \value Ewe + \value Ewondo \value Faroese \value Fijian + \value Filipino \value Finnish \value French - \value WesternFrisian same as Frisian \value Frisian same as WesternFrisian + \value Friulian + \value Fulah + \value Ga \value Gaelic \value Galician + \value Ganda + \value Geez \value Georgian \value German + \value Gothic Since Qt 5.1 \value Greek \value Greenlandic \value Guarani \value Gujarati + \value Gusii \value Haitian + \value Hanunoo Since Qt 5.1 \value Hausa + \value Hawaiian \value Hebrew \value Herero + \value HieroglyphicLuwian Since Qt 5.7 \value Hindi \value HiriMotu + \value HmongNjua Since Qt 5.5 + \value Ho Since Qt 5.5 \value Hungarian \value Icelandic + \value Ido Since Qt 5.12 + \value Igbo + \value InariSami Since Qt 5.5 \value Indonesian + \value Ingush Since Qt 5.1 \value Interlingua \value Interlingue \value Inuktitut @@ -183,306 +248,244 @@ \value Italian \value Japanese \value Javanese + \value Jju + \value JolaFonyi + \value Kabuverdianu + \value Kabyle + \value Kako + \value Kalenjin + \value Kamba \value Kannada \value Kanuri \value Kashmiri \value Kazakh + \value Kenyang Since Qt 5.5 + \value Khmer + \value Kiche Since Qt 5.5 + \value Kikuyu \value Kinyarwanda \value Kirghiz \value Komi \value Kongo + \value Konkani \value Korean + \value Koro + \value KoyraboroSenni + \value KoyraChiini + \value Kpelle \value Kurdish - \value Rundi \value Kurundi Obsolete, please use Rundi \value Kwanyama + \value Kwasio \value Lakota Since Qt 5.3 + \value Langi \value Lao + \value LargeFloweryMiao Since Qt 5.1 \value Latin \value Latvian + \value Lepcha Since Qt 5.1 + \value Lezghian Since Qt 5.5 \value Limburgish + \value Limbu Since Qt 5.1 + \value LinearA Since Qt 5.5 \value Lingala + \value Lisu Since Qt 5.1 + \value LiteraryChinese Since Qt 5.7 \value Lithuanian + \value Lojban Since Qt 5.12 + \value LowerSorbian Since Qt 5.5 + \value LowGerman \value LubaKatanga + \value LuleSami Since Qt 5.5 + \value Luo + \value Lu Since Qt 5.1 \value Luxembourgish - \value Marshallese + \value Luyia + \value Lycian Since Qt 5.1 + \value Lydian Since Qt 5.1 \value Macedonian + \value Machame + \value Maithili Since Qt 5.5 + \value MakhuwaMeetto + \value Makonde \value Malagasy \value Malay \value Malayalam \value Maltese + \value Mandingo Since Qt 5.1 + \value ManichaeanMiddlePersian Since Qt 5.5 + \value Manipuri Since Qt 5.1 \value Manx \value Maori + \value Mapuche Since Qt 5.5 \value Marathi + \value Marshallese + \value Masai + \value Mazanderani Since Qt 5.7 + \value Mende Since Qt 5.5 + \value Meroitic Since Qt 5.1 + \value Meru + \value Meta + \value Mohawk Since Qt 5.5 \value Moldavian Obsolete, please use Romanian \value Mongolian + \value Mono Since Qt 5.5 + \value Morisyen + \value Mru Since Qt 5.7 + \value Mundang + \value Nama \value NauruLanguage \value Navaho \value Ndonga \value Nepali - \value Norwegian same as NorwegianBokmal + \value Newari Since Qt 5.7 + \value Ngiemboon + \value Ngomba + \value Nko Since Qt 5.5 + \value NorthernLuri Since Qt 5.7 + \value NorthernSami + \value NorthernSotho + \value NorthernThai Since Qt 5.1 + \value NorthNdebele \value NorwegianBokmal same as Norwegian \value NorwegianNynorsk + \value Norwegian same as NorwegianBokmal + \value Nuer + \value Nyanja + \value Nyankole \value Occitan \value Ojibwa + \value OldIrish Since Qt 5.1 + \value OldNorse Since Qt 5.1 + \value OldPersian Since Qt 5.1 + \value OldTurkish Since Qt 5.1 \value Oriya + \value Oromo + \value Osage Since Qt 5.7 \value Ossetic + \value Pahlavi Since Qt 5.1 + \value Palauan Since Qt 5.7 \value Pali + \value Papiamento Since Qt 5.7 + \value Parthian Since Qt 5.1 \value Pashto \value Persian + \value Phoenician Since Qt 5.1 \value Polish \value Portuguese + \value PrakritLanguage Since Qt 5.1 + \value Prussian Since Qt 5.5 \value Punjabi \value Quechua - \value Romansh + \value Rejang Since Qt 5.1 \value RhaetoRomance Obsolete, please use Romansh \value Romanian + \value Romansh + \value Rombo + \value Rundi \value Russian + \value Rwa + \value Sabaean Since Qt 5.1 + \value Saho + \value Sakha + \value Samaritan Since Qt 5.1 + \value Samburu \value Samoan \value Sango + \value Sangu \value Sanskrit + \value Santali Since Qt 5.1 + \value Saraiki Since Qt 5.7 \value Sardinian + \value Saurashtra Since Qt 5.1 + \value Sena \value Serbian \value SerboCroatian Obsolete, please use Serbian - \value SouthernSotho - \value Tswana + \value Shambala \value Shona + \value SichuanYi + \value Sicilian Since Qt 5.12 + \value Sidamo \value Sindhi \value Sinhala - \value Swati + \value SkoltSami Since Qt 5.5 \value Slovak \value Slovenian + \value Soga \value Somali + \value Sora Since Qt 5.1 + \value SouthernKurdish Since Qt 5.12 + \value SouthernSami Since Qt 5.5 + \value SouthernSotho + \value SouthNdebele \value Spanish \value StandardMoroccanTamazight Since Qt 5.3 \value Sundanese \value Swahili + \value Swati \value Swedish + \value SwissGerman + \value Sylheti Since Qt 5.1 + \value Syriac + \value Tachelhit \value Tagalog Obsolete, please use Filipino + \value Tagbanwa Since Qt 5.1 \value Tahitian + \value TaiDam Since Qt 5.1 + \value TaiNua Since Qt 5.1 + \value Taita \value Tajik \value Tamil + \value Tangut Since Qt 5.7 + \value Taroko + \value Tasawaq \value Tatar + \value TedimChin Since Qt 5.5 \value Telugu + \value Teso \value Thai \value Tibetan + \value Tigre \value Tigrinya + \value TokelauLanguage Since Qt 5.7 + \value TokPisin Since Qt 5.7 \value Tongan \value Tsonga + \value Tswana \value Turkish \value Turkmen + \value TuvaluLanguage Since Qt 5.7 \value Twi Obsolete, please use Akan + \value Tyap + \value Ugaritic Since Qt 5.1 \value Uighur \value Uigur Obsolete, please use Uighur \value Ukrainian + \value UncodedLanguages Since Qt 5.7 + \value UpperSorbian Since Qt 5.5 \value Urdu \value Uzbek + \value Vai + \value Venda \value Vietnamese \value Volapuk + \value Vunjo + \value Walamo \value Walloon + \value Walser + \value Warlpiri Since Qt 5.5 \value Welsh + \value WesternBalochi Since Qt 5.12 + \value WesternFrisian same as Frisian \value Wolof \value Xhosa + \value Yangben \value Yiddish \value Yoruba + \value Zarma \value Zhuang \value Zulu - \value Bosnian - \value Divehi - \value Manx - \value Cornish - \value Akan - \value Konkani - \value Ga - \value Igbo - \value Kamba - \value Syriac - \value Blin - \value Geez - \value Koro - \value Sidamo - \value Atsam - \value Tigre - \value Jju - \value Friulian - \value Venda - \value Ewe - \value Walamo - \value Hawaiian - \value Tyap - \value Nyanja - \value Chewa Obsolete, please use Nyanja - \value Filipino - \value SwissGerman - \value SichuanYi - \value Kpelle - \value LowGerman - \value SouthNdebele - \value NorthernSotho - \value NorthernSami - \value Taroko - \value Gusii - \value Taita - \value Fulah - \value Kikuyu - \value Samburu - \value Sena - \value NorthNdebele - \value Rombo - \value Tachelhit - \value Kabyle - \value Nyankole - \value Bena - \value Vunjo - \value Bambara - \value Embu - \value Cherokee - \value Morisyen - \value Makonde - \value Langi - \value Ganda - \value Bemba - \value Kabuverdianu - \value Meru - \value Kalenjin - \value Nama - \value Machame - \value Colognian - \value Masai - \value Soga - \value Luyia - \value Asu - \value Teso - \value Saho - \value KoyraChiini - \value Rwa - \value Luo - \value Chiga - \value CentralMoroccoTamazight - \value KoyraboroSenni - \value Shambala - \value Aghem - \value Basaa - \value Zarma - \value Duala - \value JolaFonyi - \value Ewondo - \value Bafia - \value MakhuwaMeetto - \value Mundang - \value Kwasio - \value Nuer - \value Sakha - \value Sangu - \value CongoSwahili - \value Tasawaq - \value Vai - \value Walser - \value Yangben - \value Avestan - \value Asturian - \value Ngomba - \value Kako - \value Meta - \value Ngiemboon - \value Aragonese - \value Akkadian - \value AncientEgyptian - \value AncientGreek - \value Aramaic - \value Balinese - \value Bamun - \value BatakToba - \value Buginese - \value Buhid - \value Carian - \value Chakma - \value ClassicalMandaic - \value Coptic - \value Dogri - \value EasternCham - \value EasternKayah - \value Etruscan - \value Gothic - \value Hanunoo - \value Ingush - \value LargeFloweryMiao - \value Lepcha - \value Limbu - \value Lisu - \value Lu - \value Lycian - \value Lydian - \value Mandingo - \value Manipuri - \value Meroitic - \value NorthernThai - \value OldIrish - \value OldNorse - \value OldPersian - \value OldTurkish - \value Pahlavi - \value Parthian - \value Phoenician - \value PrakritLanguage - \value Rejang - \value Sabaean - \value Samaritan - \value Santali - \value Saurashtra - \value Sora - \value Sylheti - \value Tagbanwa - \value TaiDam - \value TaiNua - \value Ugaritic - \value Mapuche Since Qt 5.5 - \value CentralKurdish Since Qt 5.5 - \value LowerSorbian Since Qt 5.5 - \value UpperSorbian Since Qt 5.5 - \value Kenyang Since Qt 5.5 - \value Mohawk Since Qt 5.5 - \value Nko Since Qt 5.5 - \value Prussian Since Qt 5.5 - \value Kiche Since Qt 5.5 - \value SouthernSami Since Qt 5.5 - \value LuleSami Since Qt 5.5 - \value InariSami Since Qt 5.5 - \value SkoltSami Since Qt 5.5 - \value Warlpiri Since Qt 5.5 - \value ManichaeanMiddlePersian Since Qt 5.5 - \value Mende Since Qt 5.5 - \value AncientNorthArabian Since Qt 5.5 - \value LinearA Since Qt 5.5 - \value HmongNjua Since Qt 5.5 - \value Ho Since Qt 5.5 - \value Lezghian Since Qt 5.5 - \value Bassa Since Qt 5.5 - \value Mono Since Qt 5.5 - \value TedimChin Since Qt 5.5 - \value Maithili Since Qt 5.5 - \value LowerSorbian Since Qt 5.5 - \value UpperSorbian Since Qt 5.5 - \value Ahom Since Qt 5.7 - \value AmericanSignLanguage Since Qt 5.7 - \value ArdhamagadhiPrakrit Since Qt 5.7 - \value Bhojpuri Since Qt 5.7 - \value Cantonese Since Qt 5.7 - \value HieroglyphicLuwian Since Qt 5.7 - \value LiteraryChinese Since Qt 5.7 - \value Mazanderani Since Qt 5.7 - \value Mru Since Qt 5.7 - \value Newari Since Qt 5.7 - \value NorthernLuri Since Qt 5.7 - \value Osage Since Qt 5.7 - \value Palauan Since Qt 5.7 - \value Papiamento Since Qt 5.7 - \value Saraiki Since Qt 5.7 - \value Tangut Since Qt 5.7 - \value TokelauLanguage Since Qt 5.7 - \value TokPisin Since Qt 5.7 - \value TuvaluLanguage Since Qt 5.7 - \value UncodedLanguages Since Qt 5.7 + \omitvalue LastLanguage \sa language(), languageToString() @@ -494,7 +497,9 @@ This enumerated type is used to specify a country. \value AnyCountry + \value Afghanistan + \value AlandIslands \value Albania \value Algeria \value AmericanSamoa @@ -506,6 +511,7 @@ \value Argentina \value Armenia \value Aruba + \value AscensionIsland \value Australia \value Austria \value Azerbaijan @@ -520,11 +526,13 @@ \value Bermuda \value Bhutan \value Bolivia + \value Bonaire \value BosniaAndHerzegowina \value Botswana \value BouvetIsland \value Brazil \value BritishIndianOceanTerritory + \value BritishVirginIslands \value Brunei \value Bulgaria \value BurkinaFaso @@ -536,6 +544,7 @@ \value CapeVerde \value CaymanIslands \value CentralAfricanRepublic + \value CeutaAndMelilla \value Chad \value Chile \value China @@ -544,18 +553,19 @@ \value CocosIslands \value Colombia \value Comoros - \value CongoKinshasa \value CongoBrazzaville - \value DemocraticRepublicOfCongo Obsolete, please use CongoKinshasa - \value PeoplesRepublicOfCongo Obsolete, please use CongoBrazzaville + \value CongoKinshasa \value CookIslands \value CostaRica - \value IvoryCoast \value Croatia \value Cuba + \value CuraSao \value Cyprus \value CzechRepublic + \value DemocraticRepublicOfCongo Obsolete, please use CongoKinshasa + \value DemocraticRepublicOfKorea Obsolete, please use NorthKorea \value Denmark + \value DiegoGarcia \value Djibouti \value Dominica \value DominicanRepublic @@ -604,19 +614,18 @@ \value Iran \value Iraq \value Ireland + \value IsleOfMan \value Israel \value Italy + \value IvoryCoast \value Jamaica \value Japan + \value Jersey \value Jordan \value Kazakhstan \value Kenya \value Kiribati - \value NorthKorea - \value SouthKorea - \value DemocraticRepublicOfKorea Obsolete, please use NorthKorea - \value RepublicOfKorea Obsolete, please use SouthKorea - \value Kosovo + \value Kosovo Since Qt 5.2 \value Kuwait \value Kyrgyzstan \value Laos @@ -648,6 +657,7 @@ \value Moldova \value Monaco \value Mongolia + \value Montenegro \value Montserrat \value Morocco \value Mozambique @@ -664,6 +674,7 @@ \value Niue \value NorfolkIsland \value NorthernMarianaIslands + \value NorthKorea \value Norway \value Oman \value OutlyingOceania Since Qt 5.7 @@ -673,6 +684,7 @@ \value Panama \value PapuaNewGuinea \value Paraguay + \value PeoplesRepublicOfCongo Obsolete, please use CongoBrazzaville \value Peru \value Philippines \value Pitcairn @@ -680,32 +692,39 @@ \value Portugal \value PuertoRico \value Qatar + \value RepublicOfKorea Obsolete, please use SouthKorea \value Reunion \value Romania - \value Russia same as RussianFederation \value RussianFederation same as Russia + \value Russia same as RussianFederation \value Rwanda + \value SaintBarthelemy + \value SaintHelena \value SaintKittsAndNevis \value SaintLucia + \value SaintMartin + \value SaintPierreAndMiquelon \value SaintVincentAndTheGrenadines \value Samoa \value SanMarino \value SaoTomeAndPrincipe \value SaudiArabia \value Senegal + \value Serbia \value Seychelles \value SierraLeone \value Singapore + \value SintMaarten \value Slovakia \value Slovenia \value SolomonIslands \value Somalia \value SouthAfrica \value SouthGeorgiaAndTheSouthSandwichIslands + \value SouthKorea + \value SouthSudan \value Spain \value SriLanka - \value SaintHelena - \value SaintPierreAndMiquelon \value Sudan \value Suriname \value SvalbardAndJanMayenIslands @@ -723,6 +742,7 @@ \value Tokelau Obsolete, please use TokelauCountry \value Tonga \value TrinidadAndTobago + \value TristanDaCunha \value Tunisia \value Turkey \value Turkmenistan @@ -735,35 +755,20 @@ \value UnitedKingdom \value UnitedStates \value UnitedStatesMinorOutlyingIslands + \value UnitedStatesVirginIslands \value Uruguay \value Uzbekistan \value Vanuatu \value VaticanCityState \value Venezuela \value Vietnam - \value BritishVirginIslands - \value UnitedStatesVirginIslands \value WallisAndFutunaIslands \value WesternSahara \value World Since Qt 5.12 \value Yemen \value Zambia \value Zimbabwe - \value Montenegro - \value Serbia - \value SaintBarthelemy - \value SaintMartin - \value AscensionIsland - \value AlandIslands - \value DiegoGarcia - \value CeutaAndMelilla - \value IsleOfMan - \value Jersey - \value TristanDaCunha - \value SouthSudan - \value CuraSao - \value Bonaire - \value SintMaarten + \omitvalue LastCountry \sa country(), countryToString() @@ -775,135 +780,136 @@ This enumerated type is used to specify a script. \value AnyScript + \value AdlamScript Since Qt 5.7 \value AhomScript Since Qt 5.7 \value AnatolianHieroglyphsScript Since Qt 5.7 \value ArabicScript \value ArmenianScript - \value AvestanScript - \value BalineseScript - \value BamumScript + \value AvestanScript Since Qt 5.1 + \value BalineseScript Since Qt 5.1 + \value BamumScript Since Qt 5.1 \value BassaVahScript Since Qt 5.5 - \value BatakScript + \value BatakScript Since Qt 5.1 \value BengaliScript \value BhaiksukiScript Since Qt 5.7 - \value BopomofoScript - \value BrahmiScript - \value BrailleScript - \value BugineseScript - \value BuhidScript - \value CanadianAboriginalScript - \value CarianScript + \value BopomofoScript Since Qt 5.1 + \value BrahmiScript Since Qt 5.1 + \value BrailleScript Since Qt 5.1 + \value BugineseScript Since Qt 5.1 + \value BuhidScript Since Qt 5.1 + \value CanadianAboriginalScript Since Qt 5.1 + \value CarianScript Since Qt 5.1 \value CaucasianAlbanianScript Since Qt 5.5 - \value ChakmaScript - \value ChamScript + \value ChakmaScript Since Qt 5.1 + \value ChamScript Since Qt 5.1 \value CherokeeScript - \value CopticScript - \value CypriotScript + \value CopticScript Since Qt 5.1 + \value CuneiformScript Since Qt 5.1 + \value CypriotScript Since Qt 5.1 \value CyrillicScript - \value DeseretScript + \value DeseretScript Since Qt 5.1 \value DevanagariScript \value DuployanScript Since Qt 5.5 - \value EgyptianHieroglyphsScript + \value EgyptianHieroglyphsScript Since Qt 5.1 \value ElbasanScript Since Qt 5.5 \value EthiopicScript - \value FraserScript + \value FraserScript Since Qt 5.1 \value GeorgianScript - \value GlagoliticScript - \value GothicScript + \value GlagoliticScript Since Qt 5.1 + \value GothicScript Since Qt 5.1 \value GranthaScript Since Qt 5.5 \value GreekScript \value GujaratiScript \value GurmukhiScript - \value HanScript - \value HangulScript - \value HanunooScript + \value HangulScript Since Qt 5.1 + \value HanScript Since Qt 5.1 + \value HanunooScript Since Qt 5.1 \value HanWithBopomofoScript Since Qt 5.7 \value HatranScript Since Qt 5.7 \value HebrewScript - \value HiraganaScript - \value ImperialAramaicScript - \value InscriptionalPahlaviScript - \value InscriptionalParthianScript + \value HiraganaScript Since Qt 5.1 + \value ImperialAramaicScript Since Qt 5.1 + \value InscriptionalPahlaviScript Since Qt 5.1 + \value InscriptionalParthianScript Since Qt 5.1 \value JamoScript Since Qt 5.7 \value JapaneseScript - \value JavaneseScript - \value KaithiScript + \value JavaneseScript Since Qt 5.1 + \value KaithiScript Since Qt 5.1 \value KannadaScript - \value KatakanaScript - \value KayahLiScript - \value KharoshthiScript - \value KhmerScript + \value KatakanaScript Since Qt 5.1 + \value KayahLiScript Since Qt 5.1 + \value KharoshthiScript Since Qt 5.1 + \value KhmerScript Since Qt 5.1 \value KhojkiScript Since Qt 5.5 \value KhudawadiScript Since Qt 5.5 \value KoreanScript - \value LannaScript + \value LannaScript Since Qt 5.1 \value LaoScript \value LatinScript - \value LepchaScript - \value LimbuScript + \value LepchaScript Since Qt 5.1 + \value LimbuScript Since Qt 5.1 \value LinearAScript Since Qt 5.5 - \value LinearBScript - \value LycianScript - \value LydianScript + \value LinearBScript Since Qt 5.1 + \value LycianScript Since Qt 5.1 + \value LydianScript Since Qt 5.1 \value MahajaniScript Since Qt 5.5 \value MalayalamScript - \value MandaeanScript + \value MandaeanScript Since Qt 5.1 \value ManichaeanScript Since Qt 5.5 \value MarchenScript Since Qt 5.7 - \value MeiteiMayekScript + \value MeiteiMayekScript Since Qt 5.1 \value MendeKikakuiScript Since Qt 5.5 - \value MeroiticScript - \value MeroiticCursiveScript + \value MeroiticCursiveScript Since Qt 5.1 + \value MeroiticScript Since Qt 5.1 \value ModiScript Since Qt 5.5 \value MongolianScript \value MroScript Since Qt 5.5 \value MultaniScript Since Qt 5.7 \value MyanmarScript \value NabataeanScript Since Qt 5.5 - \value NkoScript \value NewaScript Since Qt 5.7 - \value NewTaiLueScript - \value OghamScript - \value OlChikiScript - \value OldItalicScript + \value NewTaiLueScript Since Qt 5.1 + \value NkoScript Since Qt 5.1 + \value OghamScript Since Qt 5.1 + \value OlChikiScript Since Qt 5.1 \value OldHungarianScript Since Qt 5.7 + \value OldItalicScript Since Qt 5.1 \value OldNorthArabianScript Since Qt 5.5 \value OldPermicScript Since Qt 5.5 - \value OldPersianScript - \value OldSouthArabianScript + \value OldPersianScript Since Qt 5.1 + \value OldSouthArabianScript Since Qt 5.1 \value OriyaScript - \value OrkhonScript + \value OrkhonScript Since Qt 5.1 \value OsageScript Since Qt 5.7 - \value OsmanyaScript + \value OsmanyaScript Since Qt 5.1 \value PahawhHmongScript Since Qt 5.5 \value PalmyreneScript Since Qt 5.5 \value PauCinHauScript Since Qt 5.5 - \value PhagsPaScript - \value PhoenicianScript - \value PollardPhoneticScript + \value PhagsPaScript Since Qt 5.1 + \value PhoenicianScript Since Qt 5.1 + \value PollardPhoneticScript Since Qt 5.1 \value PsalterPahlaviScript Since Qt 5.5 - \value RejangScript - \value RunicScript - \value SamaritanScript - \value SaurashtraScript - \value SharadaScript - \value ShavianScript + \value RejangScript Since Qt 5.1 + \value RunicScript Since Qt 5.1 + \value SamaritanScript Since Qt 5.1 + \value SaurashtraScript Since Qt 5.1 + \value SharadaScript Since Qt 5.1 + \value ShavianScript Since Qt 5.1 \value SiddhamScript Since Qt 5.5 \value SignWritingScript Since Qt 5.7 - \value SimplifiedHanScript same as SimplifiedChineseScript \value SimplifiedChineseScript same as SimplifiedHanScript + \value SimplifiedHanScript same as SimplifiedChineseScript \value SinhalaScript - \value SoraSompengScript - \value CuneiformScript - \value SundaneseScript - \value SylotiNagriScript + \value SoraSompengScript Since Qt 5.1 + \value SundaneseScript Since Qt 5.1 + \value SylotiNagriScript Since Qt 5.1 \value SyriacScript - \value TagalogScript - \value TagbanwaScript - \value TaiLeScript - \value TaiVietScript - \value TakriScript + \value TagalogScript Since Qt 5.1 + \value TagbanwaScript Since Qt 5.1 + \value TaiLeScript Since Qt 5.1 + \value TaiVietScript Since Qt 5.1 + \value TakriScript Since Qt 5.1 \value TamilScript \value TangutScript Since Qt 5.7 \value TeluguScript @@ -912,12 +918,13 @@ \value TibetanScript \value TifinaghScript \value TirhutaScript Since Qt 5.5 - \value TraditionalHanScript same as TraditionalChineseScript \value TraditionalChineseScript same as TraditionalHanScript - \value UgariticScript + \value TraditionalHanScript same as TraditionalChineseScript + \value UgariticScript Since Qt 5.1 \value VaiScript \value VarangKshitiScript Since Qt 5.5 \value YiScript + \omitvalue LastScript \sa script(), scriptToString(), languageToString() @@ -1158,6 +1165,30 @@ currency string. */ +/*! +\fn QString QLocale::toString(long i) const + +\overload + +\sa toLong() +*/ + +/*! +\fn QString QLocale::toString(ulong i) const + +\overload + +\sa toULong() +*/ + +/*! +\fn QString QLocale::toString(ushort i) const + +\overload + +\sa toUShort() +*/ + /*! \fn QString QLocale::toString(short i) const diff --git a/src/corelib/tools/qlocale_data_p.h b/src/corelib/tools/qlocale_data_p.h index 09e4e70d6b..2c351a3fb1 100644 --- a/src/corelib/tools/qlocale_data_p.h +++ b/src/corelib/tools/qlocale_data_p.h @@ -77,14 +77,14 @@ static const int ImperialMeasurementSystemsCount = // GENERATED PART STARTS HERE /* - This part of the file was generated on 2019-05-02 from the + This part of the file was generated on 2019-05-09 from the Common Locale Data Repository v35.1 http://www.unicode.org/cldr/ Do not edit this section: instead regenerate it using cldr2qlocalexml.py and qlocalexml2cpp.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. + edited) CLDR data; see qtbase/util/locale_database/. */ static const QLocaleId likely_subtags[] = { @@ -122,6 +122,7 @@ static const QLocaleId likely_subtags[] = { { 195, 0, 0 }, { 195, 7, 239 }, // bem -> bem_Latn_ZM { 186, 0, 0 }, { 186, 7, 210 }, // bez -> bez_Latn_TZ { 20, 0, 0 }, { 20, 2, 33 }, // bg -> bg_Cyrl_BG + { 364, 0, 0 }, { 364, 1, 163 }, // bgn -> bgn_Arab_PK { 343, 0, 0 }, { 343, 13, 100 }, // bho -> bho_Deva_IN { 18, 0, 0 }, { 18, 7, 229 }, // bi -> bi_Latn_VU { 270, 0, 0 }, { 270, 7, 170 }, // bku -> bku_Latn_PH @@ -140,6 +141,7 @@ static const QLocaleId likely_subtags[] = { { 156, 0, 0 }, { 156, 7, 157 }, // cch -> cch_Latn_NG { 272, 0, 0 }, { 272, 46, 18 }, // ccp -> ccp_Cakm_BD { 218, 0, 0 }, { 218, 2, 178 }, // ce -> ce_Cyrl_RU + { 365, 0, 0 }, { 365, 7, 170 }, // ceb -> ceb_Latn_PH { 211, 0, 0 }, { 211, 7, 221 }, // cgg -> cgg_Latn_UG { 217, 0, 0 }, { 217, 7, 89 }, // ch -> ch_Latn_GU { 190, 0, 0 }, { 190, 12, 225 }, // chr -> chr_Cher_US @@ -224,10 +226,12 @@ static const QLocaleId likely_subtags[] = { { 168, 0, 0 }, { 168, 34, 44 }, // ii -> ii_Yiii_CN { 56, 0, 0 }, { 56, 7, 225 }, // ik -> ik_Latn_US { 281, 0, 0 }, { 281, 2, 178 }, // inh -> inh_Cyrl_RU + { 360, 0, 0 }, { 360, 7, 260 }, // io -> io_Latn_001 { 51, 0, 0 }, { 51, 7, 99 }, // is -> is_Latn_IS { 58, 0, 0 }, { 58, 7, 106 }, // it -> it_Latn_IT { 55, 0, 0 }, { 55, 44, 38 }, // iu -> iu_Cans_CA { 59, 0, 0 }, { 59, 19, 108 }, // ja -> ja_Jpan_JP + { 361, 0, 0 }, { 361, 7, 260 }, // jbo -> jbo_Latn_001 { 257, 0, 0 }, { 257, 7, 37 }, // jgo -> jgo_Latn_CM { 200, 0, 0 }, { 200, 7, 210 }, // jmc -> jmc_Latn_TZ { 60, 0, 0 }, { 60, 7, 101 }, // jv -> jv_Latn_ID @@ -324,6 +328,7 @@ static const QLocaleId likely_subtags[] = { { 78, 0, 0 }, { 78, 7, 133 }, // mt -> mt_Latn_MT { 245, 0, 0 }, { 245, 7, 37 }, // mua -> mua_Latn_CM { 21, 0, 0 }, { 21, 25, 147 }, // my -> my_Mymr_MM + { 366, 0, 0 }, { 366, 2, 178 }, // myv -> myv_Cyrl_RU { 273, 0, 0 }, { 273, 71, 102 }, // myz -> myz_Mand_IR { 346, 0, 0 }, { 346, 1, 102 }, // mzn -> mzn_Arab_IR { 83, 0, 0 }, { 83, 7, 149 }, // na -> na_Latn_NR @@ -385,10 +390,12 @@ static const QLocaleId likely_subtags[] = { { 305, 0, 0 }, { 305, 90, 100 }, // saz -> saz_Saur_IN { 249, 0, 0 }, { 249, 7, 210 }, // sbp -> sbp_Latn_TZ { 115, 0, 0 }, { 115, 7, 106 }, // sc -> sc_Latn_IT + { 362, 0, 0 }, { 362, 7, 106 }, // scn -> scn_Latn_IT { 105, 0, 0 }, { 105, 1, 163 }, // sd -> sd_Arab_PK { 105, 13, 0 }, { 105, 13, 100 }, // sd_Deva -> sd_Deva_IN { 105, 111, 0 }, { 105, 111, 100 }, // sd_Khoj -> sd_Khoj_IN { 105, 125, 0 }, { 105, 125, 100 }, // sd_Sind -> sd_Sind_IN + { 363, 0, 0 }, { 363, 1, 102 }, // sdh -> sdh_Arab_IR { 173, 0, 0 }, { 173, 7, 161 }, // se -> se_Latn_NO { 180, 0, 0 }, { 180, 7, 146 }, // seh -> seh_Latn_MZ { 213, 0, 0 }, { 213, 7, 132 }, // ses -> ses_Latn_ML @@ -1252,6 +1259,13 @@ static const quint16 locale_index[] = { 576, // Cantonese 0, // Osage 0, // Tangut + 578, // Ido + 579, // Lojban + 580, // Sicilian + 581, // Southern Kurdish + 582, // Western Balochi + 583, // Cebuano + 584, // Erzya 0 // trailing 0 }; @@ -1835,6 +1849,13 @@ static const QLocaleData locale_data[] = { { 349, 1, 103, 1643, 1644, 1563, 1642, 1776, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 18,7 , 25,12 , 39288,77 , 39288,77 , 158,27 , 39288,77 , 39288,77 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {73,81,68}, 44,5 , 0,7 , 8,5 , 4,0 , 5913,11 , 0,0 , 0, 0, 6, 5, 6 }, // Northern Luri/Arabic/Iraq { 357, 6, 97, 46, 44, 59, 37, 48, 45, 43, 101, 12300, 12301, 12302, 12303, 170,5 , 170,5 , 1027,5 , 1027,5 , 394,8 , 423,14 , 198,6 , 215,13 , 4423,39 , 4423,39 , 158,27 , 4423,39 , 4423,39 , 158,27 , 1953,28 , 1953,28 , 1981,14 , 1953,28 , 1953,28 , 1981,14 , 58,2 , 55,2 , 45,4 , 5,17 , 22,23 , {72,75,68}, 166,3 , 17468,11 , 4,4 , 4,0 , 5924,2 , 5926,14 , 2, 1, 7, 6, 7 }, // Cantonese/Traditional Han/Hong Kong { 357, 5, 44, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 170,5 , 170,5 , 1027,5 , 1027,5 , 394,8 , 402,13 , 198,6 , 204,11 , 4423,39 , 4462,38 , 158,27 , 4423,39 , 4462,38 , 158,27 , 1932,21 , 1953,28 , 1981,14 , 1932,21 , 1953,28 , 1981,14 , 58,2 , 55,2 , 45,4 , 5,17 , 22,23 , {67,78,89}, 133,1 , 3122,13 , 4,4 , 4,0 , 5940,2 , 5942,7 , 2, 1, 7, 6, 7 }, // Cantonese/Simplified Han/China + { 360, 7, 260, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {0,0,0}, 0,0 , 2586,0 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Ido/Latin/World + { 361, 7, 260, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {0,0,0}, 0,0 , 2586,0 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Lojban/Latin/World + { 362, 7, 106, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {69,85,82}, 14,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Sicilian/Latin/Italy + { 363, 1, 102, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {73,82,82}, 0,0 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 0, 0, 6, 5, 5 }, // Southern Kurdish/Arabic/Iran + { 364, 1, 163, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {80,75,82}, 175,2 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 0, 7, 6, 7 }, // Western Balochi/Arabic/Pakistan + { 365, 7, 170, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 897,9 , 906,8 , 547,6 , 35,18 , 18,7 , 25,12 , 39365,46 , 39411,88 , 39499,24 , 39365,46 , 39411,88 , 39499,24 , 21469,25 , 21494,56 , 21550,14 , 21469,25 , 21494,56 , 21550,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {80,72,80}, 178,1 , 0,7 , 4,4 , 4,0 , 5949,7 , 4701,9 , 2, 1, 7, 6, 7 }, // Cebuano/Latin/Philippines + { 366, 2, 178, 46, 44, 59, 37, 48, 45, 43, 101, 8220, 8221, 8216, 8217, 0,6 , 0,6 , 0,6 , 0,6 , 53,10 , 63,17 , 37,5 , 8,10 , 368,48 , 368,48 , 158,27 , 368,48 , 368,48 , 158,27 , 0,28 , 0,28 , 85,14 , 0,28 , 0,28 , 85,14 , 0,2 , 0,2 , 45,4 , 5,17 , 22,23 , {82,85,66}, 123,1 , 0,7 , 8,5 , 4,0 , 0,0 , 0,0 , 2, 1, 1, 6, 7 }, // Erzya/Cyrillic/Russia { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, {0,0,0}, 0,0, 0,0, 0,0, 0,0, 0,0, 0,0, 0, 0, 0, 0, 0 } // trailing 0s }; @@ -3991,7 +4012,15 @@ static const ushort months_data[] = { 0x6d5, 0x3b, 0x645, 0x627, 0x631, 0x633, 0x3b, 0x622, 0x6a4, 0x631, 0x6cc, 0x644, 0x3b, 0x645, 0x626, 0x6cc, 0x3b, 0x62c, 0x648, 0x659, 0x623, 0x646, 0x3b, 0x62c, 0x648, 0x659, 0x644, 0x627, 0x3b, 0x622, 0x6af, 0x648, 0x633, 0x62a, 0x3b, 0x633, 0x626, 0x67e, 0x62a, 0x627, 0x645, 0x631, 0x3b, 0x626, 0x648, 0x6a9, 0x62a, 0x648, 0x6a4, 0x631, 0x3b, 0x646, 0x648, 0x6a4, 0x627, 0x645, 0x631, 0x3b, 0x62f, 0x626, -0x633, 0x627, 0x645, 0x631, 0x3b +0x633, 0x627, 0x645, 0x631, 0x3b, 0x45, 0x6e, 0x3b, 0x50, 0x65, 0x62, 0x3b, 0x4d, 0x61, 0x72, 0x3b, 0x41, 0x70, 0x72, 0x3b, +0x4d, 0x61, 0x79, 0x3b, 0x48, 0x75, 0x6e, 0x3b, 0x48, 0x75, 0x6c, 0x3b, 0x41, 0x67, 0x3b, 0x53, 0x65, 0x74, 0x3b, 0x4f, +0x6b, 0x74, 0x3b, 0x4e, 0x6f, 0x62, 0x3b, 0x44, 0x69, 0x73, 0x3b, 0x45, 0x6e, 0x65, 0x72, 0x6f, 0x3b, 0x50, 0x65, 0x62, +0x72, 0x65, 0x72, 0x6f, 0x3b, 0x4d, 0x61, 0x72, 0x73, 0x6f, 0x3b, 0x41, 0x70, 0x72, 0x69, 0x6c, 0x3b, 0x4d, 0x61, 0x79, +0x6f, 0x3b, 0x48, 0x75, 0x6e, 0x79, 0x6f, 0x3b, 0x48, 0x75, 0x6c, 0x79, 0x6f, 0x3b, 0x41, 0x67, 0x6f, 0x73, 0x74, 0x6f, +0x3b, 0x53, 0x65, 0x74, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x4f, 0x6b, 0x74, 0x75, 0x62, 0x72, 0x65, 0x3b, 0x4e, +0x6f, 0x62, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x44, 0x69, 0x73, 0x79, 0x65, 0x6d, 0x62, 0x72, 0x65, 0x3b, 0x45, +0x3b, 0x50, 0x3b, 0x4d, 0x3b, 0x41, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, 0x48, 0x3b, 0x41, 0x3b, 0x53, 0x3b, 0x4f, 0x3b, 0x4e, +0x3b, 0x44, 0x3b }; static const ushort days_data[] = { @@ -5068,7 +5097,12 @@ static const ushort days_data[] = { 0x72, 0x67, 0xe2, 0x3b, 0x6d, 0x61, 0x6a, 0x65, 0x62, 0x61, 0x61, 0x72, 0x67, 0xe2, 0x3b, 0x6b, 0x6f, 0x73, 0x6b, 0x6f, 0x68, 0x6f, 0x3b, 0x74, 0x75, 0x6f, 0x72, 0xe2, 0x73, 0x74, 0x75, 0x76, 0x3b, 0x76, 0xe1, 0x73, 0x74, 0x75, 0x70, 0x70, 0x65, 0x65, 0x69, 0x76, 0x69, 0x3b, 0x6c, 0xe1, 0x76, 0x75, 0x72, 0x64, 0x75, 0x76, 0x3b, 0x70, 0x3b, 0x56, 0x3b, 0x4d, -0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56, 0x3b, 0x4c, 0x3b +0x3b, 0x4b, 0x3b, 0x54, 0x3b, 0x56, 0x3b, 0x4c, 0x3b, 0x44, 0x6f, 0x6d, 0x3b, 0x4c, 0x75, 0x6e, 0x3b, 0x4d, 0x61, 0x72, +0x3b, 0x4d, 0x6b, 0x73, 0x3b, 0x48, 0x75, 0x3b, 0x42, 0x69, 0x3b, 0x53, 0x61, 0x3b, 0x44, 0x6f, 0x6d, 0x69, 0x6e, 0x67, +0x6f, 0x3b, 0x4c, 0x75, 0x6e, 0x65, 0x73, 0x3b, 0x4d, 0x61, 0x72, 0x74, 0x65, 0x73, 0x3b, 0x4d, 0x69, 0x79, 0x65, 0x72, +0x6b, 0x75, 0x6c, 0x65, 0x73, 0x3b, 0x48, 0x75, 0x77, 0x65, 0x62, 0x65, 0x73, 0x3b, 0x42, 0x69, 0x79, 0x65, 0x72, 0x6e, +0x65, 0x73, 0x3b, 0x53, 0x61, 0x62, 0x61, 0x64, 0x6f, 0x3b, 0x44, 0x3b, 0x4c, 0x3b, 0x4d, 0x3b, 0x4d, 0x3b, 0x48, 0x3b, +0x42, 0x3b, 0x53, 0x3b }; static const ushort byte_unit_data[] = { @@ -6431,7 +6465,7 @@ static const ushort endonyms_data[] = { 0x73, 0x6b, 0x61, 0x6e, 0x73, 0x77, 0x12b, 0x74, 0x61, 0x69, 0x61, 0x6e, 0x61, 0x72, 0xe2, 0x161, 0x6b, 0x69, 0x65, 0x6c, 0xe2, 0x53, 0x75, 0x6f, 0x6d, 0xe2, 0x645, 0x627, 0x632, 0x631, 0x648, 0x646, 0x6cc, 0x644, 0x6ca, 0x631, 0x6cc, 0x20, 0x634, 0x648, 0x645, 0x627, 0x644, 0x6cc, 0x7cb5, 0x8a9e, 0x4e2d, 0x83ef, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x570b, 0x9999, 0x6e2f, 0x7279, 0x5225, 0x884c, 0x653f, 0x5340, -0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x56fd +0x7ca4, 0x8bed, 0x4e2d, 0x534e, 0x4eba, 0x6c11, 0x5171, 0x548c, 0x56fd, 0x43, 0x65, 0x62, 0x75, 0x61, 0x6e, 0x6f }; static const char language_name_list[] = @@ -6795,6 +6829,13 @@ static const char language_name_list[] = "Cantonese\0" "Osage\0" "Tangut\0" +"Ido\0" +"Lojban\0" +"Sicilian\0" +"Southern Kurdish\0" +"Western Balochi\0" +"Cebuano\0" +"Erzya\0" ; static const quint16 language_name_index[] = { @@ -7158,6 +7199,13 @@ static const quint16 language_name_index[] = { 3050, // Cantonese 3060, // Osage 3066, // Tangut + 3073, // Ido + 3077, // Lojban + 3084, // Sicilian + 3093, // Southern Kurdish + 3110, // Western Balochi + 3126, // Cebuano + 3134, // Erzya }; static const char script_name_list[] = @@ -8341,6 +8389,13 @@ static const unsigned char language_code_list[] = "yue" // Cantonese "osa" // Osage "txg" // Tangut +"io\0" // Ido +"jbo" // Lojban +"scn" // Sicilian +"sdh" // Southern Kurdish +"bgn" // Western Balochi +"ceb" // Cebuano +"myv" // Erzya ; static const unsigned char script_code_list[] = diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index 574cb0714c..9719278426 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -44,10 +44,8 @@ #include "qdatetime.h" #ifdef Q_OS_DARWIN -#include "qtimezone.h" #include "private/qcore_mac_p.h" #include <CoreFoundation/CoreFoundation.h> -QT_REQUIRE_CONFIG(timezone); #endif QT_BEGIN_NAMESPACE @@ -147,7 +145,7 @@ static QString macTimeToString(const QTime &time, bool short_format) // Mac uses the Unicode CLDR format codes // http://www.unicode.org/reports/tr35/tr35-dates.html#Date_Field_Symbol_Table -// See also qtbase/util/local_database/dateconverter.py +// See also qtbase/util/locale_database/dateconverter.py // Makes the assumption that input formats are always well formed and consecutive letters // never exceed the maximum for the format code. static QString macToQtFormat(QStringView sys_fmt) @@ -491,8 +489,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const } else if (typeId == CFStringGetTypeID()) { result = QStringList(QString::fromCFString(languages.as<CFStringRef>())); } else { - qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%s\"; please report to http://bugreports.qt.io", - qPrintable(QString::fromCFString(CFCopyTypeIDDescription(typeId)))); + qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%ls\"; please report to http://bugreports.qt.io", + qUtf16Printable(QString::fromCFString(CFCopyTypeIDDescription(typeId)))); } return QVariant(result); } diff --git a/src/corelib/tools/qlocale_p.h b/src/corelib/tools/qlocale_p.h index 7487c9128c..1e3da35a02 100644 --- a/src/corelib/tools/qlocale_p.h +++ b/src/corelib/tools/qlocale_p.h @@ -66,6 +66,7 @@ QT_BEGIN_NAMESPACE #ifndef QT_NO_SYSTEMLOCALE +struct QLocaleData; class Q_CORE_EXPORT QSystemLocale { public: @@ -112,6 +113,7 @@ public: Weekdays, // QList<Qt::DayOfWeek> CurrencySymbol, // QString in: CurrencyToStringArgument CurrencyToString, // QString in: qlonglong, qulonglong or double + Collation, // QString UILanguages, // QStringList StringToStandardQuotation, // QString in: QStringRef to quote StringToAlternateQuotation, // QString in: QStringRef to quote @@ -126,6 +128,7 @@ public: virtual QVariant query(QueryType type, QVariant in) const; virtual QLocale fallbackUiLocale() const; + inline const QLocaleData *fallbackUiLocaleData() const; private: QSystemLocale(bool); friend class QSystemLocaleSingleton; @@ -247,14 +250,14 @@ public: if (qIsInf(d)) return float(d); if (std::fabs(d) > std::numeric_limits<float>::max()) { - if (ok != 0) + if (ok) *ok = false; const float huge = std::numeric_limits<float>::infinity(); return d < 0 ? -huge : huge; } if (d != 0 && float(d) == 0) { // Values that underflow double already failed. Match them: - if (ok != 0) + if (ok) *ok = false; return 0; } @@ -334,7 +337,7 @@ public: { QLocalePrivate *retval = new QLocalePrivate; retval->m_data = data; - retval->ref.store(0); + retval->ref.storeRelaxed(0); retval->m_numberOptions = numberOptions; return retval; } @@ -356,23 +359,21 @@ public: QByteArray bcp47Name(char separator = '-') const; - inline QLatin1String languageCode() const { return QLocalePrivate::languageToCode(QLocale::Language(m_data->m_language_id)); } - inline QLatin1String scriptCode() const { return QLocalePrivate::scriptToCode(QLocale::Script(m_data->m_script_id)); } - inline QLatin1String countryCode() const { return QLocalePrivate::countryToCode(QLocale::Country(m_data->m_country_id)); } + inline QLatin1String languageCode() const { return languageToCode(QLocale::Language(m_data->m_language_id)); } + inline QLatin1String scriptCode() const { return scriptToCode(QLocale::Script(m_data->m_script_id)); } + inline QLatin1String countryCode() const { return countryToCode(QLocale::Country(m_data->m_country_id)); } static QLatin1String languageToCode(QLocale::Language language); static QLatin1String scriptToCode(QLocale::Script script); static QLatin1String countryToCode(QLocale::Country country); - static QLocale::Language codeToLanguage(QStringView code) Q_DECL_NOTHROW; - static QLocale::Script codeToScript(QStringView code) Q_DECL_NOTHROW; - static QLocale::Country codeToCountry(QStringView code) Q_DECL_NOTHROW; + static QLocale::Language codeToLanguage(QStringView code) noexcept; + static QLocale::Script codeToScript(QStringView code) noexcept; + static QLocale::Country codeToCountry(QStringView code) noexcept; static void getLangAndCountry(const QString &name, QLocale::Language &lang, QLocale::Script &script, QLocale::Country &cntry); QLocale::MeasurementSystem measurementSystem() const; - static void updateSystemPrivate(); - QString dateTimeToString(QStringView format, const QDateTime &datetime, const QDate &dateOnly, const QTime &timeOnly, const QLocale *q) const; @@ -382,6 +383,10 @@ public: QLocale::NumberOptions m_numberOptions; }; +#ifndef QT_NO_SYSTEMLOCALE +const QLocaleData *QSystemLocale::fallbackUiLocaleData() const { return fallbackUiLocale().d->m_data; } +#endif + template <> inline QLocalePrivate *QSharedDataPointer<QLocalePrivate>::clone() { diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp index 53258bec3e..db8c8cd12f 100644 --- a/src/corelib/tools/qlocale_tools.cpp +++ b/src/corelib/tools/qlocale_tools.cpp @@ -398,7 +398,7 @@ qstrtoull(const char * nptr, const char **endptr, int base, bool *ok) *ok = true; errno = 0; - char *endptr2 = 0; + char *endptr2 = nullptr; unsigned long long result = qt_strtoull(nptr, &endptr2, base); if (endptr) *endptr = endptr2; @@ -415,7 +415,7 @@ qstrtoll(const char * nptr, const char **endptr, int base, bool *ok) { *ok = true; errno = 0; - char *endptr2 = 0; + char *endptr2 = nullptr; long long result = qt_strtoll(nptr, &endptr2, base); if (endptr) *endptr = endptr2; diff --git a/src/corelib/tools/qlocale_unix.cpp b/src/corelib/tools/qlocale_unix.cpp index f202082213..ff4274d932 100644 --- a/src/corelib/tools/qlocale_unix.cpp +++ b/src/corelib/tools/qlocale_unix.cpp @@ -69,6 +69,7 @@ struct QSystemLocaleData QLocale lc_messages; QByteArray lc_messages_var; QByteArray lc_measurement_var; + QByteArray lc_collate_var; QStringList uiLanguages; }; @@ -82,6 +83,7 @@ void QSystemLocaleData::readEnvironment() QByteArray monetary = all.isEmpty() ? qgetenv("LC_MONETARY") : all; lc_messages_var = all.isEmpty() ? qgetenv("LC_MESSAGES") : all; lc_measurement_var = all.isEmpty() ? qgetenv("LC_MEASUREMENT") : all; + lc_collate_var = all.isEmpty() ? qgetenv("LC_COLLATE") : all; QByteArray lang = qgetenv("LANG"); if (lang.isEmpty()) lang = QByteArray("C"); @@ -95,6 +97,8 @@ void QSystemLocaleData::readEnvironment() lc_messages_var = lang; if (lc_measurement_var.isEmpty()) lc_measurement_var = lang; + if (lc_collate_var.isEmpty()) + lc_collate_var = lang; lc_numeric = QLocale(QString::fromLatin1(numeric)); lc_time = QLocale(QString::fromLatin1(time)); lc_monetary = QLocale(QString::fromLatin1(monetary)); @@ -247,13 +251,15 @@ QVariant QSystemLocale::query(QueryType type, QVariant in) const return QString(); } case MeasurementSystem: { - const QString meas_locale = QString::fromLatin1(d->lc_measurement_var.constData(), d->lc_measurement_var.size()); + const QString meas_locale = QString::fromLatin1(d->lc_measurement_var); if (meas_locale.compare(QLatin1String("Metric"), Qt::CaseInsensitive) == 0) return QLocale::MetricSystem; if (meas_locale.compare(QLatin1String("Other"), Qt::CaseInsensitive) == 0) return QLocale::MetricSystem; return QVariant((int)QLocale(meas_locale).measurementSystem()); } + case Collation: + return QString::fromLatin1(d->lc_collate_var); case UILanguages: { if (!d->uiLanguages.isEmpty()) return d->uiLanguages; diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp index ebc4430046..dc904ad02d 100644 --- a/src/corelib/tools/qlocale_win.cpp +++ b/src/corelib/tools/qlocale_win.cpp @@ -120,6 +120,7 @@ struct QSystemLocalePrivate QVariant toString(const QTime &, QLocale::FormatType); QVariant toString(const QDateTime &, QLocale::FormatType); QVariant measurementSystem(); + QVariant collation(); QVariant amText(); QVariant pmText(); QVariant firstDayOfWeek(); @@ -455,6 +456,11 @@ QVariant QSystemLocalePrivate::measurementSystem() return QLocale::MetricSystem; } +QVariant QSystemLocalePrivate::collation() +{ + return getLocaleInfo(LOCALE_SSORTLOCALE); +} + QVariant QSystemLocalePrivate::amText() { wchar_t output[15]; // maximum length including terminating zero character for Win2003+ @@ -808,6 +814,8 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const return QVariant(QLocale::AnyScript); case MeasurementSystem: return d->measurementSystem(); + case Collation: + return d->collation(); case AMText: return d->amText(); case PMText: diff --git a/src/corelib/tools/qmakearray_p.h b/src/corelib/tools/qmakearray_p.h index ae4d7f07c6..71441c2c27 100644 --- a/src/corelib/tools/qmakearray_p.h +++ b/src/corelib/tools/qmakearray_p.h @@ -111,10 +111,10 @@ struct QuickSortFilter<Predicate, QuickSortData<Head, Tail...>> using TailFilteredData = typename QuickSortFilter< Predicate, QuickSortData<Tail...>>::Type; - using Type = typename QConditional< + using Type = typename std::conditional< Predicate<Head>::value, decltype(quickSortConcat(QuickSortData<Head> {}, TailFilteredData{})), - TailFilteredData>::Type; + TailFilteredData>::type; }; template <template <typename> class Predicate> diff --git a/src/corelib/tools/qmap.cpp b/src/corelib/tools/qmap.cpp index 5f7275c5f8..a0ec372f9a 100644 --- a/src/corelib/tools/qmap.cpp +++ b/src/corelib/tools/qmap.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, 0, 0 }, 0 }; +const QMapDataBase QMapDataBase::shared_null = { Q_REFCOUNT_INITIALIZE_STATIC, 0, { 0, nullptr, nullptr }, nullptr }; const QMapNodeBase *QMapNodeBase::nextNode() const { @@ -92,7 +92,7 @@ void QMapDataBase::rotateLeft(QMapNodeBase *x) QMapNodeBase *&root = header.left; QMapNodeBase *y = x->right; x->right = y->left; - if (y->left != 0) + if (y->left != nullptr) y->left->setParent(x); y->setParent(x->parent()); if (x == root) @@ -111,7 +111,7 @@ void QMapDataBase::rotateRight(QMapNodeBase *x) QMapNodeBase *&root = header.left; QMapNodeBase *y = x->left; x->left = y->right; - if (y->right != 0) + if (y->right != nullptr) y->right->setParent(x); y->setParent(x->parent()); if (x == root) @@ -173,7 +173,7 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z) QMapNodeBase *y = z; QMapNodeBase *x; QMapNodeBase *x_parent; - if (y->left == 0) { + if (y->left == nullptr) { x = y->right; if (y == mostLeftNode) { if (x) @@ -182,11 +182,11 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z) mostLeftNode = y->parent(); } } else { - if (y->right == 0) { + if (y->right == nullptr) { x = y->left; } else { y = y->right; - while (y->left != 0) + while (y->left != nullptr) y = y->left; x = y->right; } @@ -228,7 +228,7 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z) z->parent()->right = x; } if (y->color() != QMapNodeBase::Red) { - while (x != root && (x == 0 || x->color() == QMapNodeBase::Black)) { + while (x != root && (x == nullptr || x->color() == QMapNodeBase::Black)) { if (x == x_parent->left) { QMapNodeBase *w = x_parent->right; if (w->color() == QMapNodeBase::Red) { @@ -237,13 +237,13 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z) rotateLeft(x_parent); w = x_parent->right; } - if ((w->left == 0 || w->left->color() == QMapNodeBase::Black) && - (w->right == 0 || w->right->color() == QMapNodeBase::Black)) { + if ((w->left == nullptr || w->left->color() == QMapNodeBase::Black) && + (w->right == nullptr || w->right->color() == QMapNodeBase::Black)) { w->setColor(QMapNodeBase::Red); x = x_parent; x_parent = x_parent->parent(); } else { - if (w->right == 0 || w->right->color() == QMapNodeBase::Black) { + if (w->right == nullptr || w->right->color() == QMapNodeBase::Black) { if (w->left) w->left->setColor(QMapNodeBase::Black); w->setColor(QMapNodeBase::Red); @@ -265,13 +265,13 @@ void QMapDataBase::freeNodeAndRebalance(QMapNodeBase *z) rotateRight(x_parent); w = x_parent->left; } - if ((w->right == 0 || w->right->color() == QMapNodeBase::Black) && - (w->left == 0 || w->left->color() == QMapNodeBase::Black)) { + if ((w->right == nullptr || w->right->color() == QMapNodeBase::Black) && + (w->left == nullptr|| w->left->color() == QMapNodeBase::Black)) { w->setColor(QMapNodeBase::Red); x = x_parent; x_parent = x_parent->parent(); } else { - if (w->left == 0 || w->left->color() == QMapNodeBase::Black) { + if (w->left == nullptr || w->left->color() == QMapNodeBase::Black) { if (w->right) w->right->setColor(QMapNodeBase::Black); w->setColor(QMapNodeBase::Red); @@ -363,8 +363,8 @@ QMapDataBase *QMapDataBase::createData() d->size = 0; d->header.p = 0; - d->header.left = 0; - d->header.right = 0; + d->header.left = nullptr; + d->header.right = nullptr; d->mostLeftNode = &(d->header); return d; diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index 1cf9299e26..18c681581f 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -49,13 +49,10 @@ #include <QtCore/qdebug.h> #endif -#include <map> -#include <new> #include <functional> - -#ifdef Q_COMPILER_INITIALIZER_LISTS #include <initializer_list> -#endif +#include <map> +#include <new> QT_BEGIN_NAMESPACE @@ -100,10 +97,10 @@ struct Q_CORE_EXPORT QMapNodeBase template <typename T> static typename std::enable_if<QTypeInfo<T>::isComplex>::type - callDestructorIfNecessary(T &t) Q_DECL_NOTHROW { Q_UNUSED(t); t.~T(); } // Q_UNUSED: silence MSVC unused 't' warning + callDestructorIfNecessary(T &t) noexcept { Q_UNUSED(t); t.~T(); } // Q_UNUSED: silence MSVC unused 't' warning template <typename T> static typename std::enable_if<!QTypeInfo<T>::isComplex>::type - callDestructorIfNecessary(T &) Q_DECL_NOTHROW {} + callDestructorIfNecessary(T &) noexcept {} }; template <class Key, class T> @@ -142,7 +139,7 @@ private: rightNode()->destroySubTree(); } - QMapNode() Q_DECL_EQ_DELETE; + QMapNode() = delete; Q_DISABLE_COPY(QMapNode) }; @@ -325,32 +322,28 @@ class QMap QMapData<Key, T> *d; public: - inline QMap() Q_DECL_NOTHROW : d(static_cast<QMapData<Key, T> *>(const_cast<QMapDataBase *>(&QMapDataBase::shared_null))) { } -#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QMap() noexcept : d(static_cast<QMapData<Key, T> *>(const_cast<QMapDataBase *>(&QMapDataBase::shared_null))) { } inline QMap(std::initializer_list<std::pair<Key,T> > list) : d(static_cast<QMapData<Key, T> *>(const_cast<QMapDataBase *>(&QMapDataBase::shared_null))) { for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it) insert(it->first, it->second); } -#endif QMap(const QMap<Key, T> &other); inline ~QMap() { if (!d->ref.deref()) d->destroy(); } QMap<Key, T> &operator=(const QMap<Key, T> &other); -#ifdef Q_COMPILER_RVALUE_REFS - inline QMap(QMap<Key, T> &&other) Q_DECL_NOTHROW + inline QMap(QMap<Key, T> &&other) noexcept : d(other.d) { other.d = static_cast<QMapData<Key, T> *>( const_cast<QMapDataBase *>(&QMapDataBase::shared_null)); } - inline QMap<Key, T> &operator=(QMap<Key, T> &&other) Q_DECL_NOTHROW + inline QMap<Key, T> &operator=(QMap<Key, T> &&other) noexcept { QMap moved(std::move(other)); swap(moved); return *this; } -#endif - inline void swap(QMap<Key, T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + inline void swap(QMap<Key, T> &other) noexcept { qSwap(d, other.d); } explicit QMap(const typename std::map<Key, T> &other); std::map<Key, T> toStdMap() const; @@ -1187,19 +1180,15 @@ template <class Key, class T> class QMultiMap : public QMap<Key, T> { public: - QMultiMap() Q_DECL_NOTHROW {} -#ifdef Q_COMPILER_INITIALIZER_LISTS + QMultiMap() noexcept {} inline QMultiMap(std::initializer_list<std::pair<Key,T> > list) { for (typename std::initializer_list<std::pair<Key,T> >::const_iterator it = list.begin(); it != list.end(); ++it) insert(it->first, it->second); } -#endif QMultiMap(const QMap<Key, T> &other) : QMap<Key, T>(other) {} -#ifdef Q_COMPILER_RVALUE_REFS - QMultiMap(QMap<Key, T> &&other) Q_DECL_NOTHROW : QMap<Key, T>(std::move(other)) {} -#endif - void swap(QMultiMap<Key, T> &other) Q_DECL_NOTHROW { QMap<Key, T>::swap(other); } + QMultiMap(QMap<Key, T> &&other) noexcept : QMap<Key, T>(std::move(other)) {} + void swap(QMultiMap<Key, T> &other) noexcept { QMap<Key, T>::swap(other); } inline typename QMap<Key, T>::iterator replace(const Key &key, const T &value) { return QMap<Key, T>::insert(key, value); } diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h index 0c73235d26..447037daaa 100644 --- a/src/corelib/tools/qmargins.h +++ b/src/corelib/tools/qmargins.h @@ -51,28 +51,28 @@ QT_BEGIN_NAMESPACE class QMargins { public: - Q_DECL_CONSTEXPR QMargins() Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QMargins(int left, int top, int right, int bottom) Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR int left() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR int top() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR int right() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR int bottom() const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR void setLeft(int left) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR void setTop(int top) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR void setRight(int right) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR void setBottom(int bottom) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(const QMargins &margins) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(const QMargins &margins) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(int) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(int) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(int) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QMargins() noexcept; + Q_DECL_CONSTEXPR QMargins(int left, int top, int right, int bottom) noexcept; + + Q_DECL_CONSTEXPR bool isNull() const noexcept; + + Q_DECL_CONSTEXPR int left() const noexcept; + Q_DECL_CONSTEXPR int top() const noexcept; + Q_DECL_CONSTEXPR int right() const noexcept; + Q_DECL_CONSTEXPR int bottom() const noexcept; + + Q_DECL_RELAXED_CONSTEXPR void setLeft(int left) noexcept; + Q_DECL_RELAXED_CONSTEXPR void setTop(int top) noexcept; + Q_DECL_RELAXED_CONSTEXPR void setRight(int right) noexcept; + Q_DECL_RELAXED_CONSTEXPR void setBottom(int bottom) noexcept; + + Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(const QMargins &margins) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(const QMargins &margins) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMargins &operator+=(int) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMargins &operator-=(int) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(int) noexcept; Q_DECL_RELAXED_CONSTEXPR QMargins &operator/=(int); - Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(qreal) Q_DECL_NOTHROW; + Q_DECL_RELAXED_CONSTEXPR QMargins &operator*=(qreal) noexcept; Q_DECL_RELAXED_CONSTEXPR QMargins &operator/=(qreal); private: @@ -81,8 +81,8 @@ private: int m_right; int m_bottom; - friend Q_DECL_CONSTEXPR inline bool operator==(const QMargins &, const QMargins &) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &, const QMargins &) Q_DECL_NOTHROW; + friend Q_DECL_CONSTEXPR inline bool operator==(const QMargins &, const QMargins &) noexcept; + friend Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &, const QMargins &) noexcept; }; Q_DECLARE_TYPEINFO(QMargins, Q_MOVABLE_TYPE); @@ -99,40 +99,40 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QMargins &); QMargins inline functions *****************************************************************************/ -Q_DECL_CONSTEXPR inline QMargins::QMargins() Q_DECL_NOTHROW : m_left(0), m_top(0), m_right(0), m_bottom(0) {} +Q_DECL_CONSTEXPR inline QMargins::QMargins() noexcept : m_left(0), m_top(0), m_right(0), m_bottom(0) {} -Q_DECL_CONSTEXPR inline QMargins::QMargins(int aleft, int atop, int aright, int abottom) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins::QMargins(int aleft, int atop, int aright, int abottom) noexcept : m_left(aleft), m_top(atop), m_right(aright), m_bottom(abottom) {} -Q_DECL_CONSTEXPR inline bool QMargins::isNull() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QMargins::isNull() const noexcept { return m_left==0 && m_top==0 && m_right==0 && m_bottom==0; } -Q_DECL_CONSTEXPR inline int QMargins::left() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QMargins::left() const noexcept { return m_left; } -Q_DECL_CONSTEXPR inline int QMargins::top() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QMargins::top() const noexcept { return m_top; } -Q_DECL_CONSTEXPR inline int QMargins::right() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QMargins::right() const noexcept { return m_right; } -Q_DECL_CONSTEXPR inline int QMargins::bottom() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QMargins::bottom() const noexcept { return m_bottom; } -Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setLeft(int aleft) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setLeft(int aleft) noexcept { m_left = aleft; } -Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setTop(int atop) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setTop(int atop) noexcept { m_top = atop; } -Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setRight(int aright) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setRight(int aright) noexcept { m_right = aright; } -Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setBottom(int abottom) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMargins::setBottom(int abottom) noexcept { m_bottom = abottom; } -Q_DECL_CONSTEXPR inline bool operator==(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator==(const QMargins &m1, const QMargins &m2) noexcept { return m1.m_left == m2.m_left && @@ -141,7 +141,7 @@ Q_DECL_CONSTEXPR inline bool operator==(const QMargins &m1, const QMargins &m2) m1.m_bottom == m2.m_bottom; } -Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2) noexcept { return m1.m_left != m2.m_left || @@ -150,55 +150,55 @@ Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2) m1.m_bottom != m2.m_bottom; } -Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &m1, const QMargins &m2) noexcept { return QMargins(m1.left() + m2.left(), m1.top() + m2.top(), m1.right() + m2.right(), m1.bottom() + m2.bottom()); } -Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &m1, const QMargins &m2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &m1, const QMargins &m2) noexcept { return QMargins(m1.left() - m2.left(), m1.top() - m2.top(), m1.right() - m2.right(), m1.bottom() - m2.bottom()); } -Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &lhs, int rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &lhs, int rhs) noexcept { return QMargins(lhs.left() + rhs, lhs.top() + rhs, lhs.right() + rhs, lhs.bottom() + rhs); } -Q_DECL_CONSTEXPR inline QMargins operator+(int lhs, const QMargins &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator+(int lhs, const QMargins &rhs) noexcept { return QMargins(rhs.left() + lhs, rhs.top() + lhs, rhs.right() + lhs, rhs.bottom() + lhs); } -Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &lhs, int rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &lhs, int rhs) noexcept { return QMargins(lhs.left() - rhs, lhs.top() - rhs, lhs.right() - rhs, lhs.bottom() - rhs); } -Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, int factor) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, int factor) noexcept { return QMargins(margins.left() * factor, margins.top() * factor, margins.right() * factor, margins.bottom() * factor); } -Q_DECL_CONSTEXPR inline QMargins operator*(int factor, const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator*(int factor, const QMargins &margins) noexcept { return QMargins(margins.left() * factor, margins.top() * factor, margins.right() * factor, margins.bottom() * factor); } -Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, qreal factor) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, qreal factor) noexcept { return QMargins(qRound(margins.left() * factor), qRound(margins.top() * factor), qRound(margins.right() * factor), qRound(margins.bottom() * factor)); } -Q_DECL_CONSTEXPR inline QMargins operator*(qreal factor, const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator*(qreal factor, const QMargins &margins) noexcept { return QMargins(qRound(margins.left() * factor), qRound(margins.top() * factor), qRound(margins.right() * factor), qRound(margins.bottom() * factor)); @@ -216,17 +216,17 @@ Q_DECL_CONSTEXPR inline QMargins operator/(const QMargins &margins, qreal diviso qRound(margins.right() / divisor), qRound(margins.bottom() / divisor)); } -Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(const QMargins &margins) noexcept { return *this = *this + margins; } -Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(const QMargins &margins) noexcept { return *this = *this - margins; } -Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(int margin) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(int margin) noexcept { m_left += margin; m_top += margin; @@ -235,7 +235,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator+=(int margin) Q_DEC return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(int margin) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(int margin) noexcept { m_left -= margin; m_top -= margin; @@ -244,7 +244,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator-=(int margin) Q_DEC return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(int factor) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(int factor) noexcept { return *this = *this * factor; } @@ -254,7 +254,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator/=(int divisor) return *this = *this / divisor; } -Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(qreal factor) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator*=(qreal factor) noexcept { return *this = *this * factor; } @@ -264,12 +264,12 @@ Q_DECL_RELAXED_CONSTEXPR inline QMargins &QMargins::operator/=(qreal divisor) return *this = *this / divisor; } -Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &margins) noexcept { return margins; } -Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &margins) noexcept { return QMargins(-margins.left(), -margins.top(), -margins.right(), -margins.bottom()); } @@ -285,30 +285,30 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QMargins &); class QMarginsF { public: - Q_DECL_CONSTEXPR QMarginsF() Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QMarginsF(qreal left, qreal top, qreal right, qreal bottom) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QMarginsF(const QMargins &margins) Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR qreal left() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR qreal top() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR qreal right() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR qreal bottom() const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR void setLeft(qreal left) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR void setTop(qreal top) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR void setRight(qreal right) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR void setBottom(qreal bottom) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(const QMarginsF &margins) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(const QMarginsF &margins) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(qreal addend) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(qreal subtrahend) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator*=(qreal factor) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QMarginsF() noexcept; + Q_DECL_CONSTEXPR QMarginsF(qreal left, qreal top, qreal right, qreal bottom) noexcept; + Q_DECL_CONSTEXPR QMarginsF(const QMargins &margins) noexcept; + + Q_DECL_CONSTEXPR bool isNull() const noexcept; + + Q_DECL_CONSTEXPR qreal left() const noexcept; + Q_DECL_CONSTEXPR qreal top() const noexcept; + Q_DECL_CONSTEXPR qreal right() const noexcept; + Q_DECL_CONSTEXPR qreal bottom() const noexcept; + + Q_DECL_RELAXED_CONSTEXPR void setLeft(qreal left) noexcept; + Q_DECL_RELAXED_CONSTEXPR void setTop(qreal top) noexcept; + Q_DECL_RELAXED_CONSTEXPR void setRight(qreal right) noexcept; + Q_DECL_RELAXED_CONSTEXPR void setBottom(qreal bottom) noexcept; + + Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(const QMarginsF &margins) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(const QMarginsF &margins) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator+=(qreal addend) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator-=(qreal subtrahend) noexcept; + Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator*=(qreal factor) noexcept; Q_DECL_RELAXED_CONSTEXPR QMarginsF &operator/=(qreal divisor); - Q_DECL_CONSTEXPR inline QMargins toMargins() const Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR inline QMargins toMargins() const noexcept; private: qreal m_left; @@ -332,44 +332,44 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QMarginsF &); QMarginsF inline functions *****************************************************************************/ -Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF() Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF() noexcept : m_left(0), m_top(0), m_right(0), m_bottom(0) {} -Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(qreal aleft, qreal atop, qreal aright, qreal abottom) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(qreal aleft, qreal atop, qreal aright, qreal abottom) noexcept : m_left(aleft), m_top(atop), m_right(aright), m_bottom(abottom) {} -Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF::QMarginsF(const QMargins &margins) noexcept : m_left(margins.left()), m_top(margins.top()), m_right(margins.right()), m_bottom(margins.bottom()) {} -Q_DECL_CONSTEXPR inline bool QMarginsF::isNull() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QMarginsF::isNull() const noexcept { return qFuzzyIsNull(m_left) && qFuzzyIsNull(m_top) && qFuzzyIsNull(m_right) && qFuzzyIsNull(m_bottom); } -Q_DECL_CONSTEXPR inline qreal QMarginsF::left() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QMarginsF::left() const noexcept { return m_left; } -Q_DECL_CONSTEXPR inline qreal QMarginsF::top() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QMarginsF::top() const noexcept { return m_top; } -Q_DECL_CONSTEXPR inline qreal QMarginsF::right() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QMarginsF::right() const noexcept { return m_right; } -Q_DECL_CONSTEXPR inline qreal QMarginsF::bottom() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QMarginsF::bottom() const noexcept { return m_bottom; } -Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setLeft(qreal aleft) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setLeft(qreal aleft) noexcept { m_left = aleft; } -Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setTop(qreal atop) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setTop(qreal atop) noexcept { m_top = atop; } -Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setRight(qreal aright) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setRight(qreal aright) noexcept { m_right = aright; } -Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setBottom(qreal abottom) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QMarginsF::setBottom(qreal abottom) noexcept { m_bottom = abottom; } -Q_DECL_CONSTEXPR inline bool operator==(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator==(const QMarginsF &lhs, const QMarginsF &rhs) noexcept { return qFuzzyCompare(lhs.left(), rhs.left()) && qFuzzyCompare(lhs.top(), rhs.top()) @@ -377,48 +377,48 @@ Q_DECL_CONSTEXPR inline bool operator==(const QMarginsF &lhs, const QMarginsF &r && qFuzzyCompare(lhs.bottom(), rhs.bottom()); } -Q_DECL_CONSTEXPR inline bool operator!=(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator!=(const QMarginsF &lhs, const QMarginsF &rhs) noexcept { return !operator==(lhs, rhs); } -Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, const QMarginsF &rhs) noexcept { return QMarginsF(lhs.left() + rhs.left(), lhs.top() + rhs.top(), lhs.right() + rhs.right(), lhs.bottom() + rhs.bottom()); } -Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, const QMarginsF &rhs) noexcept { return QMarginsF(lhs.left() - rhs.left(), lhs.top() - rhs.top(), lhs.right() - rhs.right(), lhs.bottom() - rhs.bottom()); } -Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, qreal rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &lhs, qreal rhs) noexcept { return QMarginsF(lhs.left() + rhs, lhs.top() + rhs, lhs.right() + rhs, lhs.bottom() + rhs); } -Q_DECL_CONSTEXPR inline QMarginsF operator+(qreal lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator+(qreal lhs, const QMarginsF &rhs) noexcept { return QMarginsF(rhs.left() + lhs, rhs.top() + lhs, rhs.right() + lhs, rhs.bottom() + lhs); } -Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, qreal rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &lhs, qreal rhs) noexcept { return QMarginsF(lhs.left() - rhs, lhs.top() - rhs, lhs.right() - rhs, lhs.bottom() - rhs); } -Q_DECL_CONSTEXPR inline QMarginsF operator*(const QMarginsF &lhs, qreal rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator*(const QMarginsF &lhs, qreal rhs) noexcept { return QMarginsF(lhs.left() * rhs, lhs.top() * rhs, lhs.right() * rhs, lhs.bottom() * rhs); } -Q_DECL_CONSTEXPR inline QMarginsF operator*(qreal lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator*(qreal lhs, const QMarginsF &rhs) noexcept { return QMarginsF(rhs.left() * lhs, rhs.top() * lhs, rhs.right() * lhs, rhs.bottom() * lhs); @@ -430,17 +430,17 @@ Q_DECL_CONSTEXPR inline QMarginsF operator/(const QMarginsF &lhs, qreal divisor) lhs.right() / divisor, lhs.bottom() / divisor); } -Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(const QMarginsF &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(const QMarginsF &margins) noexcept { return *this = *this + margins; } -Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(const QMarginsF &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(const QMarginsF &margins) noexcept { return *this = *this - margins; } -Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(qreal addend) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(qreal addend) noexcept { m_left += addend; m_top += addend; @@ -449,7 +449,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator+=(qreal addend) Q return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(qreal subtrahend) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(qreal subtrahend) noexcept { m_left -= subtrahend; m_top -= subtrahend; @@ -458,7 +458,7 @@ Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator-=(qreal subtrahen return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator*=(qreal factor) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator*=(qreal factor) noexcept { return *this = *this * factor; } @@ -468,17 +468,17 @@ Q_DECL_RELAXED_CONSTEXPR inline QMarginsF &QMarginsF::operator/=(qreal divisor) return *this = *this / divisor; } -Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator+(const QMarginsF &margins) noexcept { return margins; } -Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMarginsF operator-(const QMarginsF &margins) noexcept { return QMarginsF(-margins.left(), -margins.top(), -margins.right(), -margins.bottom()); } -Q_DECL_CONSTEXPR inline QMargins QMarginsF::toMargins() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QMargins QMarginsF::toMargins() const noexcept { return QMargins(qRound(m_left), qRound(m_top), qRound(m_right), qRound(m_bottom)); } diff --git a/src/corelib/tools/qoffsetstringarray_p.h b/src/corelib/tools/qoffsetstringarray_p.h new file mode 100644 index 0000000000..4dd9e9603b --- /dev/null +++ b/src/corelib/tools/qoffsetstringarray_p.h @@ -0,0 +1,198 @@ +/**************************************************************************** +** +** Copyright (C) 2018 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QOFFSETSTRINGARRAY_P_H +#define QOFFSETSTRINGARRAY_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include "private/qglobal_p.h" + +#include <tuple> +#include <array> + +QT_BEGIN_NAMESPACE + +namespace QtPrivate { +template<int N, int O, int I, int ... Idx> +struct OffsetSequenceHelper : OffsetSequenceHelper<N - 1, O + I, Idx..., O> { }; + +template<int Last, int I, int S, int ... Idx> +struct OffsetSequenceHelper<1, Last, I, S, Idx...> : IndexesList<Last + I, Idx..., Last> +{ + static const constexpr auto Length = Last + I; + using Type = typename std::conditional< + Last <= std::numeric_limits<quint8>::max(), + quint8, + typename std::conditional< + Last <= std::numeric_limits<quint16>::max(), + quint16, + int>::type + >::type; +}; + +template<int ... Idx> +struct OffsetSequence : OffsetSequenceHelper<sizeof ... (Idx), 0, Idx..., 0> { }; + +template<int N> +struct StaticString +{ + const char data[N]; +}; + + +template<> +struct StaticString<0> +{ + static constexpr int size() noexcept + { + return 0; + } +}; + +template<typename, typename> +struct StaticStringBuilder; + +template<int ... I1, int ... I2> +struct StaticStringBuilder<IndexesList<I1...>, IndexesList<I2...>> +{ + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4100) // The formal parameter is not referenced in the body of the function. + // The unreferenced parameter is ignored. + // It happens when 'rs' is StaticString<0> + template<int N1, int N2> + static constexpr StaticString<N1 + N2> concatenate( + const char (&ls)[N1], const StaticString<N2> &rs) noexcept + { + return StaticString<N1 + N2>{{ls[I1]..., rs.data[I2]...}}; + } +QT_WARNING_POP +}; + +template<int Sum> +constexpr StaticString<0> staticString() noexcept +{ + return StaticString<0>{}; +} + +QT_WARNING_PUSH +QT_WARNING_DISABLE_MSVC(4503) +template<int Sum, int I, int ... Ix> +constexpr StaticString<Sum> staticString(const char (&s)[I], const char (&...sx)[Ix]) noexcept +{ + return StaticStringBuilder< + makeIndexSequence<I>, + makeIndexSequence<Sum - I>>::concatenate(s, staticString<Sum - I>(sx...)); +} +QT_WARNING_POP +} // namespace QtPrivate + +template<typename T, int SizeString, int SizeOffsets> +class QOffsetStringArray +{ +public: + using Type = T; + + template<int ... Ox> + constexpr QOffsetStringArray(const QtPrivate::StaticString<SizeString> &str, + QtPrivate::IndexesList<SizeString, Ox...>) noexcept + : m_string(str), + m_offsets{Ox...} + { } + + constexpr inline const char *operator[](const int index) const noexcept + { + return m_string.data + m_offsets[qBound(int(0), index, SizeOffsets - 1)]; + } + + constexpr inline const char *at(const int index) const noexcept + { + return m_string.data + m_offsets[index]; + } + + constexpr inline const char *str() const { return m_string.data; } + constexpr inline const T *offsets() const { return m_offsets; } + constexpr inline int count() const { return SizeOffsets; }; + + static constexpr const auto sizeString = SizeString; + static constexpr const auto sizeOffsets = SizeOffsets; + +private: + QtPrivate::StaticString<SizeString> m_string; + const T m_offsets[SizeOffsets]; +}; + +template<typename T, int N, int ... Ox> +constexpr QOffsetStringArray<T, N, sizeof ... (Ox)> qOffsetStringArray( + const QtPrivate::StaticString<N> &string, + QtPrivate::IndexesList<N, Ox...> offsets) noexcept +{ + return QOffsetStringArray<T, N, sizeof ... (Ox)>( + string, + offsets); +} + +template<int ... Nx> +struct QOffsetStringArrayRet +{ + using Offsets = QtPrivate::OffsetSequence<Nx...>; + using Type = QOffsetStringArray<typename Offsets::Type, Offsets::Length, sizeof ... (Nx)>; +}; + +template<int ... Nx> +constexpr auto qOffsetStringArray(const char (&...strings)[Nx]) noexcept -> typename QOffsetStringArrayRet<Nx...>::Type +{ + using Offsets = QtPrivate::OffsetSequence<Nx...>; + return qOffsetStringArray<typename Offsets::Type>( + QtPrivate::staticString<Offsets::Length>(strings...), Offsets{}); +} + +QT_END_NAMESPACE + +#endif // QOFFSETSTRINGARRAY_P_H diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 94977fc826..9ebf88bc8f 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -52,41 +52,39 @@ struct QPair typedef T2 second_type; Q_DECL_CONSTEXPR QPair() - Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_default_constructible<T1>::value && + noexcept((std::is_nothrow_default_constructible<T1>::value && std::is_nothrow_default_constructible<T2>::value)) : first(), second() {} Q_DECL_CONSTEXPR QPair(const T1 &t1, const T2 &t2) - Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_copy_constructible<T1>::value && + noexcept((std::is_nothrow_copy_constructible<T1>::value && std::is_nothrow_copy_constructible<T2>::value)) : first(t1), second(t2) {} // compiler-generated copy/move ctor/assignment operators are fine! template <typename TT1, typename TT2> Q_DECL_CONSTEXPR QPair(const QPair<TT1, TT2> &p) - Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_constructible<T1, TT1&>::value && + noexcept((std::is_nothrow_constructible<T1, TT1&>::value && std::is_nothrow_constructible<T2, TT2&>::value)) : first(p.first), second(p.second) {} template <typename TT1, typename TT2> Q_DECL_RELAXED_CONSTEXPR QPair &operator=(const QPair<TT1, TT2> &p) - Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_assignable<T1, TT1&>::value && + noexcept((std::is_nothrow_assignable<T1, TT1&>::value && std::is_nothrow_assignable<T2, TT2&>::value)) { first = p.first; second = p.second; return *this; } -#ifdef Q_COMPILER_RVALUE_REFS template <typename TT1, typename TT2> Q_DECL_CONSTEXPR QPair(QPair<TT1, TT2> &&p) - Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_constructible<T1, TT1>::value && + noexcept((std::is_nothrow_constructible<T1, TT1>::value && std::is_nothrow_constructible<T2, TT2>::value)) // can't use std::move here as it's not constexpr in C++11: : first(static_cast<TT1 &&>(p.first)), second(static_cast<TT2 &&>(p.second)) {} template <typename TT1, typename TT2> Q_DECL_RELAXED_CONSTEXPR QPair &operator=(QPair<TT1, TT2> &&p) - Q_DECL_NOEXCEPT_EXPR((std::is_nothrow_assignable<T1, TT1>::value && + noexcept((std::is_nothrow_assignable<T1, TT1>::value && std::is_nothrow_assignable<T2, TT2>::value)) { first = std::move(p.first); second = std::move(p.second); return *this; } -#endif Q_DECL_RELAXED_CONSTEXPR void swap(QPair &other) - Q_DECL_NOEXCEPT_EXPR(noexcept(qSwap(other.first, other.first)) && noexcept(qSwap(other.second, other.second))) + noexcept(noexcept(qSwap(other.first, other.first)) && noexcept(qSwap(other.second, other.second))) { // use qSwap() to pick up ADL swaps automatically: qSwap(first, other.first); @@ -97,8 +95,13 @@ struct QPair T2 second; }; +#if defined(__cpp_deduction_guides) && __cpp_deduction_guides >= 201606 +template<class T1, class T2> +QPair(T1, T2) -> QPair<T1, T2>; +#endif + template <typename T1, typename T2> -void swap(QPair<T1, T2> &lhs, QPair<T1, T2> &rhs) Q_DECL_NOEXCEPT_EXPR(noexcept(lhs.swap(rhs))) +void swap(QPair<T1, T2> &lhs, QPair<T1, T2> &rhs) noexcept(noexcept(lhs.swap(rhs))) { lhs.swap(rhs); } // mark QPair<T1,T2> as complex/movable/primitive depending on the @@ -108,45 +111,45 @@ class QTypeInfo<QPair<T1, T2> > : public QTypeInfoMerger<QPair<T1, T2>, T1, T2> template <class T1, class T2> Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator==(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2) - Q_DECL_NOEXCEPT_EXPR(noexcept(p1.first == p2.first && p1.second == p2.second)) + noexcept(noexcept(p1.first == p2.first && p1.second == p2.second)) { return p1.first == p2.first && p1.second == p2.second; } template <class T1, class T2> Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator!=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2) - Q_DECL_NOEXCEPT_EXPR(noexcept(!(p1 == p2))) + noexcept(noexcept(!(p1 == p2))) { return !(p1 == p2); } template <class T1, class T2> Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator<(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2) - Q_DECL_NOEXCEPT_EXPR(noexcept(p1.first < p2.first || (!(p2.first < p1.first) && p1.second < p2.second))) + noexcept(noexcept(p1.first < p2.first || (!(p2.first < p1.first) && p1.second < p2.second))) { return p1.first < p2.first || (!(p2.first < p1.first) && p1.second < p2.second); } template <class T1, class T2> Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator>(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2) - Q_DECL_NOEXCEPT_EXPR(noexcept(p2 < p1)) + noexcept(noexcept(p2 < p1)) { return p2 < p1; } template <class T1, class T2> Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator<=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2) - Q_DECL_NOEXCEPT_EXPR(noexcept(!(p2 < p1))) + noexcept(noexcept(!(p2 < p1))) { return !(p2 < p1); } template <class T1, class T2> Q_DECL_CONSTEXPR Q_INLINE_TEMPLATE bool operator>=(const QPair<T1, T2> &p1, const QPair<T1, T2> &p2) - Q_DECL_NOEXCEPT_EXPR(noexcept(!(p1 < p2))) + noexcept(noexcept(!(p1 < p2))) { return !(p1 < p2); } template <class T1, class T2> Q_DECL_CONSTEXPR Q_OUTOFLINE_TEMPLATE QPair<T1, T2> qMakePair(const T1 &x, const T2 &y) - Q_DECL_NOEXCEPT_EXPR(noexcept(QPair<T1, T2>(x, y))) + noexcept(noexcept(QPair<T1, T2>(x, y))) { return QPair<T1, T2>(x, y); } diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index d7323f7707..34df673b93 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -94,7 +94,7 @@ public: friend Q_DECL_CONSTEXPR inline const QPoint operator/(const QPoint &, qreal); #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT CGPoint toCGPoint() const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT CGPoint toCGPoint() const noexcept; #endif private: @@ -256,8 +256,8 @@ public: Q_DECL_CONSTEXPR QPoint toPoint() const; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT static QPointF fromCGPoint(CGPoint point) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT CGPoint toCGPoint() const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT static QPointF fromCGPoint(CGPoint point) noexcept; + Q_REQUIRED_RESULT CGPoint toCGPoint() const noexcept; #endif private: diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h index b55f210577..d5a60ada56 100644 --- a/src/corelib/tools/qqueue.h +++ b/src/corelib/tools/qqueue.h @@ -50,11 +50,11 @@ class QQueue : public QList<T> { public: // compiler-generated special member functions are fine! - inline void swap(QQueue<T> &other) Q_DECL_NOTHROW { QList<T>::swap(other); } // prevent QList<->QQueue swaps + inline void swap(QQueue<T> &other) noexcept { QList<T>::swap(other); } // prevent QList<->QQueue swaps #ifndef Q_QDOC // bring in QList::swap(int, int). We cannot say using QList<T>::swap, // because we don't want to make swap(QList&) available. - inline void swap(int i, int j) { QList<T>::swap(i, j); } + Q_DECL_DEPRECATED inline void swap(int i, int j) { QList<T>::swapItemsAt(i, j); } #endif inline void enqueue(const T &t) { QList<T>::append(t); } inline T dequeue() { return QList<T>::takeFirst(); } diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp index 6e51deebea..d622f92530 100644 --- a/src/corelib/tools/qrect.cpp +++ b/src/corelib/tools/qrect.cpp @@ -300,7 +300,7 @@ QT_BEGIN_NAMESPACE \sa isValid(), isEmpty() */ -QRect QRect::normalized() const Q_DECL_NOTHROW +QRect QRect::normalized() const noexcept { QRect r; if (x2 < x1 - 1) { // swap bad x values @@ -820,7 +820,7 @@ QRect QRect::normalized() const Q_DECL_NOTHROW \sa intersects() */ -bool QRect::contains(const QPoint &p, bool proper) const Q_DECL_NOTHROW +bool QRect::contains(const QPoint &p, bool proper) const noexcept { int l, r; if (x2 < x1 - 1) { @@ -884,7 +884,7 @@ bool QRect::contains(const QPoint &p, bool proper) const Q_DECL_NOTHROW rectangle (not on the edge). */ -bool QRect::contains(const QRect &r, bool proper) const Q_DECL_NOTHROW +bool QRect::contains(const QRect &r, bool proper) const noexcept { if (isNull() || r.isNull()) return false; @@ -962,7 +962,7 @@ bool QRect::contains(const QRect &r, bool proper) const Q_DECL_NOTHROW \sa operator|=(), united() */ -QRect QRect::operator|(const QRect &r) const Q_DECL_NOTHROW +QRect QRect::operator|(const QRect &r) const noexcept { if (isNull()) return r; @@ -1033,7 +1033,7 @@ QRect QRect::operator|(const QRect &r) const Q_DECL_NOTHROW \sa operator&=(), intersected() */ -QRect QRect::operator&(const QRect &r) const Q_DECL_NOTHROW +QRect QRect::operator&(const QRect &r) const noexcept { if (isNull() || r.isNull()) return QRect(); @@ -1112,7 +1112,7 @@ QRect QRect::operator&(const QRect &r) const Q_DECL_NOTHROW \sa contains() */ -bool QRect::intersects(const QRect &r) const Q_DECL_NOTHROW +bool QRect::intersects(const QRect &r) const noexcept { if (isNull() || r.isNull()) return false; @@ -1540,7 +1540,7 @@ QDebug operator<<(QDebug dbg, const QRect &r) \sa isValid(), isEmpty() */ -QRectF QRectF::normalized() const Q_DECL_NOTHROW +QRectF QRectF::normalized() const noexcept { QRectF r = *this; if (r.w < 0) { @@ -1964,7 +1964,7 @@ QRectF QRectF::normalized() const Q_DECL_NOTHROW \sa intersects() */ -bool QRectF::contains(const QPointF &p) const Q_DECL_NOTHROW +bool QRectF::contains(const QPointF &p) const noexcept { qreal l = xp; qreal r = xp; @@ -2010,7 +2010,7 @@ bool QRectF::contains(const QPointF &p) const Q_DECL_NOTHROW otherwise returns \c false. */ -bool QRectF::contains(const QRectF &r) const Q_DECL_NOTHROW +bool QRectF::contains(const QRectF &r) const noexcept { qreal l1 = xp; qreal r1 = xp; @@ -2148,7 +2148,7 @@ bool QRectF::contains(const QRectF &r) const Q_DECL_NOTHROW \sa united(), operator|=() */ -QRectF QRectF::operator|(const QRectF &r) const Q_DECL_NOTHROW +QRectF QRectF::operator|(const QRectF &r) const noexcept { if (isNull()) return r; @@ -2217,7 +2217,7 @@ QRectF QRectF::operator|(const QRectF &r) const Q_DECL_NOTHROW \sa operator&=(), intersected() */ -QRectF QRectF::operator&(const QRectF &r) const Q_DECL_NOTHROW +QRectF QRectF::operator&(const QRectF &r) const noexcept { qreal l1 = xp; qreal r1 = xp; @@ -2302,7 +2302,7 @@ QRectF QRectF::operator&(const QRectF &r) const Q_DECL_NOTHROW \sa contains() */ -bool QRectF::intersects(const QRectF &r) const Q_DECL_NOTHROW +bool QRectF::intersects(const QRectF &r) const noexcept { qreal l1 = xp; qreal r1 = xp; @@ -2369,7 +2369,7 @@ bool QRectF::intersects(const QRectF &r) const Q_DECL_NOTHROW \sa toRect() */ -QRect QRectF::toAlignedRect() const Q_DECL_NOTHROW +QRect QRectF::toAlignedRect() const noexcept { int xmin = int(qFloor(xp)); int xmax = int(qCeil(xp + w)); diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 3b40055b5a..7aa2312f38 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -57,104 +57,104 @@ QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QRect { public: - Q_DECL_CONSTEXPR QRect() Q_DECL_NOTHROW : x1(0), y1(0), x2(-1), y2(-1) {} - Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QPoint &bottomright) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QSize &size) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QRect(int left, int top, int width, int height) Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline int left() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline int top() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline int right() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline int bottom() const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QRect normalized() const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline int x() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline int y() const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setLeft(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setTop(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setRight(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setBottom(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setX(int x) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setY(int y) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPoint &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPoint &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPoint &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPoint &p) Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline QPoint topLeft() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline QPoint bottomRight() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline QPoint topRight() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline QPoint bottomLeft() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline QPoint center() const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTop(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveRight(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(int pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPoint &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPoint &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPoint &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPoint &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPoint &p) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void translate(int dx, int dy) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPoint &p) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(int dx, int dy) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(const QPoint &p) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect transposed() const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void moveTo(int x, int t) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPoint &p) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void setRect(int x, int y, int w, int h) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QRect() noexcept : x1(0), y1(0), x2(-1), y2(-1) {} + Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QPoint &bottomright) noexcept; + Q_DECL_CONSTEXPR QRect(const QPoint &topleft, const QSize &size) noexcept; + Q_DECL_CONSTEXPR QRect(int left, int top, int width, int height) noexcept; + + Q_DECL_CONSTEXPR inline bool isNull() const noexcept; + Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept; + Q_DECL_CONSTEXPR inline bool isValid() const noexcept; + + Q_DECL_CONSTEXPR inline int left() const noexcept; + Q_DECL_CONSTEXPR inline int top() const noexcept; + Q_DECL_CONSTEXPR inline int right() const noexcept; + Q_DECL_CONSTEXPR inline int bottom() const noexcept; + Q_REQUIRED_RESULT QRect normalized() const noexcept; + + Q_DECL_CONSTEXPR inline int x() const noexcept; + Q_DECL_CONSTEXPR inline int y() const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setLeft(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setTop(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setRight(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setBottom(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setX(int x) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setY(int y) noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPoint &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPoint &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPoint &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPoint &p) noexcept; + + Q_DECL_CONSTEXPR inline QPoint topLeft() const noexcept; + Q_DECL_CONSTEXPR inline QPoint bottomRight() const noexcept; + Q_DECL_CONSTEXPR inline QPoint topRight() const noexcept; + Q_DECL_CONSTEXPR inline QPoint bottomLeft() const noexcept; + Q_DECL_CONSTEXPR inline QPoint center() const noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTop(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveRight(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(int pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPoint &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPoint &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPoint &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPoint &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPoint &p) noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void translate(int dx, int dy) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPoint &p) noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(int dx, int dy) const noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect translated(const QPoint &p) const noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect transposed() const noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void moveTo(int x, int t) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPoint &p) noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void setRect(int x, int y, int w, int h) noexcept; Q_DECL_RELAXED_CONSTEXPR inline void getRect(int *x, int *y, int *w, int *h) const; - Q_DECL_RELAXED_CONSTEXPR inline void setCoords(int x1, int y1, int x2, int y2) Q_DECL_NOTHROW; + Q_DECL_RELAXED_CONSTEXPR inline void setCoords(int x1, int y1, int x2, int y2) noexcept; Q_DECL_RELAXED_CONSTEXPR inline void getCoords(int *x1, int *y1, int *x2, int *y2) const; - Q_DECL_RELAXED_CONSTEXPR inline void adjust(int x1, int y1, int x2, int y2) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect adjusted(int x1, int y1, int x2, int y2) const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline QSize size() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline int width() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline int height() const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSize &s) Q_DECL_NOTHROW; - - QRect operator|(const QRect &r) const Q_DECL_NOTHROW; - QRect operator&(const QRect &r) const Q_DECL_NOTHROW; - inline QRect& operator|=(const QRect &r) Q_DECL_NOTHROW; - inline QRect& operator&=(const QRect &r) Q_DECL_NOTHROW; - - bool contains(const QRect &r, bool proper = false) const Q_DECL_NOTHROW; - bool contains(const QPoint &p, bool proper=false) const Q_DECL_NOTHROW; - inline bool contains(int x, int y) const Q_DECL_NOTHROW; - inline bool contains(int x, int y, bool proper) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT inline QRect united(const QRect &other) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT inline QRect intersected(const QRect &other) const Q_DECL_NOTHROW; - bool intersects(const QRect &r) const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline QRect marginsAdded(const QMargins &margins) const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline QRect marginsRemoved(const QMargins &margins) const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QRect &operator+=(const QMargins &margins) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QRect &operator-=(const QMargins &margins) Q_DECL_NOTHROW; + Q_DECL_RELAXED_CONSTEXPR inline void adjust(int x1, int y1, int x2, int y2) noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect adjusted(int x1, int y1, int x2, int y2) const noexcept; + + Q_DECL_CONSTEXPR inline QSize size() const noexcept; + Q_DECL_CONSTEXPR inline int width() const noexcept; + Q_DECL_CONSTEXPR inline int height() const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSize &s) noexcept; + + QRect operator|(const QRect &r) const noexcept; + QRect operator&(const QRect &r) const noexcept; + inline QRect& operator|=(const QRect &r) noexcept; + inline QRect& operator&=(const QRect &r) noexcept; + + bool contains(const QRect &r, bool proper = false) const noexcept; + bool contains(const QPoint &p, bool proper=false) const noexcept; + inline bool contains(int x, int y) const noexcept; + inline bool contains(int x, int y, bool proper) const noexcept; + Q_REQUIRED_RESULT inline QRect united(const QRect &other) const noexcept; + Q_REQUIRED_RESULT inline QRect intersected(const QRect &other) const noexcept; + bool intersects(const QRect &r) const noexcept; + + Q_DECL_CONSTEXPR inline QRect marginsAdded(const QMargins &margins) const noexcept; + Q_DECL_CONSTEXPR inline QRect marginsRemoved(const QMargins &margins) const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QRect &operator+=(const QMargins &margins) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QRect &operator-=(const QMargins &margins) noexcept; #if QT_DEPRECATED_SINCE(5, 0) - Q_REQUIRED_RESULT QT_DEPRECATED QRect unite(const QRect &r) const Q_DECL_NOTHROW { return united(r); } - Q_REQUIRED_RESULT QT_DEPRECATED QRect intersect(const QRect &r) const Q_DECL_NOTHROW { return intersected(r); } + Q_REQUIRED_RESULT QT_DEPRECATED QRect unite(const QRect &r) const noexcept { return united(r); } + Q_REQUIRED_RESULT QT_DEPRECATED QRect intersect(const QRect &r) const noexcept { return intersected(r); } #endif - friend Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) Q_DECL_NOTHROW; + friend Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) noexcept; + friend Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) noexcept; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT CGRect toCGRect() const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT CGRect toCGRect() const noexcept; #endif private: @@ -165,8 +165,8 @@ private: }; Q_DECLARE_TYPEINFO(QRect, Q_MOVABLE_TYPE); -Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) Q_DECL_NOTHROW; -Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) Q_DECL_NOTHROW; +Q_DECL_CONSTEXPR inline bool operator==(const QRect &, const QRect &) noexcept; +Q_DECL_CONSTEXPR inline bool operator!=(const QRect &, const QRect &) noexcept; /***************************************************************************** @@ -181,97 +181,97 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QRect &); QRect inline member functions *****************************************************************************/ -Q_DECL_CONSTEXPR inline QRect::QRect(int aleft, int atop, int awidth, int aheight) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect::QRect(int aleft, int atop, int awidth, int aheight) noexcept : x1(aleft), y1(atop), x2(aleft + awidth - 1), y2(atop + aheight - 1) {} -Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QPoint &abottomRight) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QPoint &abottomRight) noexcept : x1(atopLeft.x()), y1(atopLeft.y()), x2(abottomRight.x()), y2(abottomRight.y()) {} -Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QSize &asize) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect::QRect(const QPoint &atopLeft, const QSize &asize) noexcept : x1(atopLeft.x()), y1(atopLeft.y()), x2(atopLeft.x()+asize.width() - 1), y2(atopLeft.y()+asize.height() - 1) {} -Q_DECL_CONSTEXPR inline bool QRect::isNull() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QRect::isNull() const noexcept { return x2 == x1 - 1 && y2 == y1 - 1; } -Q_DECL_CONSTEXPR inline bool QRect::isEmpty() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QRect::isEmpty() const noexcept { return x1 > x2 || y1 > y2; } -Q_DECL_CONSTEXPR inline bool QRect::isValid() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QRect::isValid() const noexcept { return x1 <= x2 && y1 <= y2; } -Q_DECL_CONSTEXPR inline int QRect::left() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::left() const noexcept { return x1; } -Q_DECL_CONSTEXPR inline int QRect::top() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::top() const noexcept { return y1; } -Q_DECL_CONSTEXPR inline int QRect::right() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::right() const noexcept { return x2; } -Q_DECL_CONSTEXPR inline int QRect::bottom() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::bottom() const noexcept { return y2; } -Q_DECL_CONSTEXPR inline int QRect::x() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::x() const noexcept { return x1; } -Q_DECL_CONSTEXPR inline int QRect::y() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::y() const noexcept { return y1; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setLeft(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setLeft(int pos) noexcept { x1 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTop(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTop(int pos) noexcept { y1 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRight(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRight(int pos) noexcept { x2 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottom(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottom(int pos) noexcept { y2 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopLeft(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopLeft(const QPoint &p) noexcept { x1 = p.x(); y1 = p.y(); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomRight(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomRight(const QPoint &p) noexcept { x2 = p.x(); y2 = p.y(); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopRight(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setTopRight(const QPoint &p) noexcept { x2 = p.x(); y1 = p.y(); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomLeft(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setBottomLeft(const QPoint &p) noexcept { x1 = p.x(); y2 = p.y(); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setX(int ax) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setX(int ax) noexcept { x1 = ax; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setY(int ay) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setY(int ay) noexcept { y1 = ay; } -Q_DECL_CONSTEXPR inline QPoint QRect::topLeft() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QPoint QRect::topLeft() const noexcept { return QPoint(x1, y1); } -Q_DECL_CONSTEXPR inline QPoint QRect::bottomRight() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QPoint QRect::bottomRight() const noexcept { return QPoint(x2, y2); } -Q_DECL_CONSTEXPR inline QPoint QRect::topRight() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QPoint QRect::topRight() const noexcept { return QPoint(x2, y1); } -Q_DECL_CONSTEXPR inline QPoint QRect::bottomLeft() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QPoint QRect::bottomLeft() const noexcept { return QPoint(x1, y2); } -Q_DECL_CONSTEXPR inline QPoint QRect::center() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QPoint QRect::center() const noexcept { return QPoint(int((qint64(x1)+x2)/2), int((qint64(y1)+y2)/2)); } // cast avoids overflow on addition -Q_DECL_CONSTEXPR inline int QRect::width() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::width() const noexcept { return x2 - x1 + 1; } -Q_DECL_CONSTEXPR inline int QRect::height() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QRect::height() const noexcept { return y2 - y1 + 1; } -Q_DECL_CONSTEXPR inline QSize QRect::size() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSize QRect::size() const noexcept { return QSize(width(), height()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(int dx, int dy) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(int dx, int dy) noexcept { x1 += dx; y1 += dy; @@ -279,7 +279,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(int dx, int dy) Q_DECL_NOT y2 += dy; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(const QPoint &p) noexcept { x1 += p.x(); y1 += p.y(); @@ -287,16 +287,16 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::translate(const QPoint &p) Q_DECL_NO y2 += p.y(); } -Q_DECL_CONSTEXPR inline QRect QRect::translated(int dx, int dy) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect QRect::translated(int dx, int dy) const noexcept { return QRect(QPoint(x1 + dx, y1 + dy), QPoint(x2 + dx, y2 + dy)); } -Q_DECL_CONSTEXPR inline QRect QRect::translated(const QPoint &p) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect QRect::translated(const QPoint &p) const noexcept { return QRect(QPoint(x1 + p.x(), y1 + p.y()), QPoint(x2 + p.x(), y2 + p.y())); } -Q_DECL_CONSTEXPR inline QRect QRect::transposed() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect QRect::transposed() const noexcept { return QRect(topLeft(), size().transposed()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(int ax, int ay) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(int ax, int ay) noexcept { x2 += ax - x1; y2 += ay - y1; @@ -304,7 +304,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(int ax, int ay) Q_DECL_NOTHRO y1 = ay; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(const QPoint &p) noexcept { x2 += p.x() - x1; y2 += p.y() - y1; @@ -312,49 +312,49 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTo(const QPoint &p) Q_DECL_NOTHR y1 = p.y(); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveLeft(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveLeft(int pos) noexcept { x2 += (pos - x1); x1 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTop(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTop(int pos) noexcept { y2 += (pos - y1); y1 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveRight(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveRight(int pos) noexcept { x1 += (pos - x2); x2 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottom(int pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottom(int pos) noexcept { y1 += (pos - y2); y2 = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopLeft(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopLeft(const QPoint &p) noexcept { moveLeft(p.x()); moveTop(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomRight(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomRight(const QPoint &p) noexcept { moveRight(p.x()); moveBottom(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopRight(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveTopRight(const QPoint &p) noexcept { moveRight(p.x()); moveTop(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomLeft(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveBottomLeft(const QPoint &p) noexcept { moveLeft(p.x()); moveBottom(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveCenter(const QPoint &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::moveCenter(const QPoint &p) noexcept { int w = x2 - x1; int h = y2 - y1; @@ -372,7 +372,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::getRect(int *ax, int *ay, int *aw, i *ah = y2 - y1 + 1; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRect(int ax, int ay, int aw, int ah) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setRect(int ax, int ay, int aw, int ah) noexcept { x1 = ax; y1 = ay; @@ -388,7 +388,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::getCoords(int *xp1, int *yp1, int *x *yp2 = y2; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setCoords(int xp1, int yp1, int xp2, int yp2) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setCoords(int xp1, int yp1, int xp2, int yp2) noexcept { x1 = xp1; y1 = yp1; @@ -396,10 +396,10 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::setCoords(int xp1, int yp1, int xp2, y2 = yp2; } -Q_DECL_CONSTEXPR inline QRect QRect::adjusted(int xp1, int yp1, int xp2, int yp2) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect QRect::adjusted(int xp1, int yp1, int xp2, int yp2) const noexcept { return QRect(QPoint(x1 + xp1, y1 + yp1), QPoint(x2 + xp2, y2 + yp2)); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::adjust(int dx1, int dy1, int dx2, int dy2) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::adjust(int dx1, int dy1, int dx2, int dy2) noexcept { x1 += dx1; y1 += dy1; @@ -407,97 +407,97 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRect::adjust(int dx1, int dy1, int dx2, in y2 += dy2; } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setWidth(int w) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setWidth(int w) noexcept { x2 = (x1 + w - 1); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setHeight(int h) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setHeight(int h) noexcept { y2 = (y1 + h - 1); } -Q_DECL_RELAXED_CONSTEXPR inline void QRect::setSize(const QSize &s) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRect::setSize(const QSize &s) noexcept { x2 = (s.width() + x1 - 1); y2 = (s.height() + y1 - 1); } -inline bool QRect::contains(int ax, int ay, bool aproper) const Q_DECL_NOTHROW +inline bool QRect::contains(int ax, int ay, bool aproper) const noexcept { return contains(QPoint(ax, ay), aproper); } -inline bool QRect::contains(int ax, int ay) const Q_DECL_NOTHROW +inline bool QRect::contains(int ax, int ay) const noexcept { return contains(QPoint(ax, ay), false); } -inline QRect& QRect::operator|=(const QRect &r) Q_DECL_NOTHROW +inline QRect& QRect::operator|=(const QRect &r) noexcept { *this = *this | r; return *this; } -inline QRect& QRect::operator&=(const QRect &r) Q_DECL_NOTHROW +inline QRect& QRect::operator&=(const QRect &r) noexcept { *this = *this & r; return *this; } -inline QRect QRect::intersected(const QRect &other) const Q_DECL_NOTHROW +inline QRect QRect::intersected(const QRect &other) const noexcept { return *this & other; } -inline QRect QRect::united(const QRect &r) const Q_DECL_NOTHROW +inline QRect QRect::united(const QRect &r) const noexcept { return *this | r; } -Q_DECL_CONSTEXPR inline bool operator==(const QRect &r1, const QRect &r2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator==(const QRect &r1, const QRect &r2) noexcept { return r1.x1==r2.x1 && r1.x2==r2.x2 && r1.y1==r2.y1 && r1.y2==r2.y2; } -Q_DECL_CONSTEXPR inline bool operator!=(const QRect &r1, const QRect &r2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator!=(const QRect &r1, const QRect &r2) noexcept { return r1.x1!=r2.x1 || r1.x2!=r2.x2 || r1.y1!=r2.y1 || r1.y2!=r2.y2; } -Q_DECL_CONSTEXPR inline QRect operator+(const QRect &rectangle, const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect operator+(const QRect &rectangle, const QMargins &margins) noexcept { return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()), QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom())); } -Q_DECL_CONSTEXPR inline QRect operator+(const QMargins &margins, const QRect &rectangle) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect operator+(const QMargins &margins, const QRect &rectangle) noexcept { return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()), QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom())); } -Q_DECL_CONSTEXPR inline QRect operator-(const QRect &lhs, const QMargins &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect operator-(const QRect &lhs, const QMargins &rhs) noexcept { return QRect(QPoint(lhs.left() + rhs.left(), lhs.top() + rhs.top()), QPoint(lhs.right() - rhs.right(), lhs.bottom() - rhs.bottom())); } -Q_DECL_CONSTEXPR inline QRect QRect::marginsAdded(const QMargins &margins) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect QRect::marginsAdded(const QMargins &margins) const noexcept { return QRect(QPoint(x1 - margins.left(), y1 - margins.top()), QPoint(x2 + margins.right(), y2 + margins.bottom())); } -Q_DECL_CONSTEXPR inline QRect QRect::marginsRemoved(const QMargins &margins) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect QRect::marginsRemoved(const QMargins &margins) const noexcept { return QRect(QPoint(x1 + margins.left(), y1 + margins.top()), QPoint(x2 - margins.right(), y2 - margins.bottom())); } -Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator+=(const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator+=(const QMargins &margins) noexcept { *this = marginsAdded(margins); return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator-=(const QMargins &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QRect &QRect::operator-=(const QMargins &margins) noexcept { *this = marginsRemoved(margins); return *this; @@ -511,110 +511,110 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QRect &); class Q_CORE_EXPORT QRectF { public: - Q_DECL_CONSTEXPR QRectF() Q_DECL_NOTHROW : xp(0.), yp(0.), w(0.), h(0.) {} - Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QSizeF &size) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QPointF &bottomRight) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QRectF(qreal left, qreal top, qreal width, qreal height) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QRectF(const QRect &rect) Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QRectF normalized() const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline qreal left() const Q_DECL_NOTHROW { return xp; } - Q_DECL_CONSTEXPR inline qreal top() const Q_DECL_NOTHROW { return yp; } - Q_DECL_CONSTEXPR inline qreal right() const Q_DECL_NOTHROW { return xp + w; } - Q_DECL_CONSTEXPR inline qreal bottom() const Q_DECL_NOTHROW { return yp + h; } - - Q_DECL_CONSTEXPR inline qreal x() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline qreal y() const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setLeft(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setTop(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setRight(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setBottom(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setX(qreal pos) Q_DECL_NOTHROW { setLeft(pos); } - Q_DECL_RELAXED_CONSTEXPR inline void setY(qreal pos) Q_DECL_NOTHROW { setTop(pos); } - - Q_DECL_CONSTEXPR inline QPointF topLeft() const Q_DECL_NOTHROW { return QPointF(xp, yp); } - Q_DECL_CONSTEXPR inline QPointF bottomRight() const Q_DECL_NOTHROW { return QPointF(xp+w, yp+h); } - Q_DECL_CONSTEXPR inline QPointF topRight() const Q_DECL_NOTHROW { return QPointF(xp+w, yp); } - Q_DECL_CONSTEXPR inline QPointF bottomLeft() const Q_DECL_NOTHROW { return QPointF(xp, yp+h); } - Q_DECL_CONSTEXPR inline QPointF center() const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPointF &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPointF &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPointF &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPointF &p) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTop(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveRight(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(qreal pos) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPointF &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPointF &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPointF &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPointF &p) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPointF &p) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void translate(qreal dx, qreal dy) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPointF &p) Q_DECL_NOTHROW; - - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(qreal dx, qreal dy) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(const QPointF &p) const Q_DECL_NOTHROW; - - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF transposed() const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void moveTo(qreal x, qreal y) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPointF &p) Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline void setRect(qreal x, qreal y, qreal w, qreal h) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QRectF() noexcept : xp(0.), yp(0.), w(0.), h(0.) {} + Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QSizeF &size) noexcept; + Q_DECL_CONSTEXPR QRectF(const QPointF &topleft, const QPointF &bottomRight) noexcept; + Q_DECL_CONSTEXPR QRectF(qreal left, qreal top, qreal width, qreal height) noexcept; + Q_DECL_CONSTEXPR QRectF(const QRect &rect) noexcept; + + Q_DECL_CONSTEXPR inline bool isNull() const noexcept; + Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept; + Q_DECL_CONSTEXPR inline bool isValid() const noexcept; + Q_REQUIRED_RESULT QRectF normalized() const noexcept; + + Q_DECL_CONSTEXPR inline qreal left() const noexcept { return xp; } + Q_DECL_CONSTEXPR inline qreal top() const noexcept { return yp; } + Q_DECL_CONSTEXPR inline qreal right() const noexcept { return xp + w; } + Q_DECL_CONSTEXPR inline qreal bottom() const noexcept { return yp + h; } + + Q_DECL_CONSTEXPR inline qreal x() const noexcept; + Q_DECL_CONSTEXPR inline qreal y() const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setLeft(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setTop(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setRight(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setBottom(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setX(qreal pos) noexcept { setLeft(pos); } + Q_DECL_RELAXED_CONSTEXPR inline void setY(qreal pos) noexcept { setTop(pos); } + + Q_DECL_CONSTEXPR inline QPointF topLeft() const noexcept { return QPointF(xp, yp); } + Q_DECL_CONSTEXPR inline QPointF bottomRight() const noexcept { return QPointF(xp+w, yp+h); } + Q_DECL_CONSTEXPR inline QPointF topRight() const noexcept { return QPointF(xp+w, yp); } + Q_DECL_CONSTEXPR inline QPointF bottomLeft() const noexcept { return QPointF(xp, yp+h); } + Q_DECL_CONSTEXPR inline QPointF center() const noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void setTopLeft(const QPointF &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setBottomRight(const QPointF &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setTopRight(const QPointF &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setBottomLeft(const QPointF &p) noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void moveLeft(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTop(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveRight(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveBottom(qreal pos) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTopLeft(const QPointF &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveBottomRight(const QPointF &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTopRight(const QPointF &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveBottomLeft(const QPointF &p) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveCenter(const QPointF &p) noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void translate(qreal dx, qreal dy) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void translate(const QPointF &p) noexcept; + + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(qreal dx, qreal dy) const noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF translated(const QPointF &p) const noexcept; + + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF transposed() const noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void moveTo(qreal x, qreal y) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void moveTo(const QPointF &p) noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline void setRect(qreal x, qreal y, qreal w, qreal h) noexcept; Q_DECL_RELAXED_CONSTEXPR inline void getRect(qreal *x, qreal *y, qreal *w, qreal *h) const; - Q_DECL_RELAXED_CONSTEXPR inline void setCoords(qreal x1, qreal y1, qreal x2, qreal y2) Q_DECL_NOTHROW; + Q_DECL_RELAXED_CONSTEXPR inline void setCoords(qreal x1, qreal y1, qreal x2, qreal y2) noexcept; Q_DECL_RELAXED_CONSTEXPR inline void getCoords(qreal *x1, qreal *y1, qreal *x2, qreal *y2) const; - Q_DECL_RELAXED_CONSTEXPR inline void adjust(qreal x1, qreal y1, qreal x2, qreal y2) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF adjusted(qreal x1, qreal y1, qreal x2, qreal y2) const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline QSizeF size() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline qreal width() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline qreal height() const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSizeF &s) Q_DECL_NOTHROW; - - QRectF operator|(const QRectF &r) const Q_DECL_NOTHROW; - QRectF operator&(const QRectF &r) const Q_DECL_NOTHROW; - inline QRectF& operator|=(const QRectF &r) Q_DECL_NOTHROW; - inline QRectF& operator&=(const QRectF &r) Q_DECL_NOTHROW; - - bool contains(const QRectF &r) const Q_DECL_NOTHROW; - bool contains(const QPointF &p) const Q_DECL_NOTHROW; - inline bool contains(qreal x, qreal y) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT inline QRectF united(const QRectF &other) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT inline QRectF intersected(const QRectF &other) const Q_DECL_NOTHROW; - bool intersects(const QRectF &r) const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline QRectF marginsAdded(const QMarginsF &margins) const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline QRectF marginsRemoved(const QMarginsF &margins) const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator+=(const QMarginsF &margins) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator-=(const QMarginsF &margins) Q_DECL_NOTHROW; + Q_DECL_RELAXED_CONSTEXPR inline void adjust(qreal x1, qreal y1, qreal x2, qreal y2) noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRectF adjusted(qreal x1, qreal y1, qreal x2, qreal y2) const noexcept; + + Q_DECL_CONSTEXPR inline QSizeF size() const noexcept; + Q_DECL_CONSTEXPR inline qreal width() const noexcept; + Q_DECL_CONSTEXPR inline qreal height() const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setSize(const QSizeF &s) noexcept; + + QRectF operator|(const QRectF &r) const noexcept; + QRectF operator&(const QRectF &r) const noexcept; + inline QRectF& operator|=(const QRectF &r) noexcept; + inline QRectF& operator&=(const QRectF &r) noexcept; + + bool contains(const QRectF &r) const noexcept; + bool contains(const QPointF &p) const noexcept; + inline bool contains(qreal x, qreal y) const noexcept; + Q_REQUIRED_RESULT inline QRectF united(const QRectF &other) const noexcept; + Q_REQUIRED_RESULT inline QRectF intersected(const QRectF &other) const noexcept; + bool intersects(const QRectF &r) const noexcept; + + Q_DECL_CONSTEXPR inline QRectF marginsAdded(const QMarginsF &margins) const noexcept; + Q_DECL_CONSTEXPR inline QRectF marginsRemoved(const QMarginsF &margins) const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator+=(const QMarginsF &margins) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QRectF &operator-=(const QMarginsF &margins) noexcept; #if QT_DEPRECATED_SINCE(5, 0) - Q_REQUIRED_RESULT QT_DEPRECATED QRectF unite(const QRectF &r) const Q_DECL_NOTHROW { return united(r); } - Q_REQUIRED_RESULT QT_DEPRECATED QRectF intersect(const QRectF &r) const Q_DECL_NOTHROW { return intersected(r); } + Q_REQUIRED_RESULT QT_DEPRECATED QRectF unite(const QRectF &r) const noexcept { return united(r); } + Q_REQUIRED_RESULT QT_DEPRECATED QRectF intersect(const QRectF &r) const noexcept { return intersected(r); } #endif - friend Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) Q_DECL_NOTHROW; + friend Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) noexcept; + friend Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) noexcept; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect toRect() const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QRect toAlignedRect() const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QRect toRect() const noexcept; + Q_REQUIRED_RESULT QRect toAlignedRect() const noexcept; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT static QRectF fromCGRect(CGRect rect) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT CGRect toCGRect() const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT static QRectF fromCGRect(CGRect rect) noexcept; + Q_REQUIRED_RESULT CGRect toCGRect() const noexcept; #endif private: @@ -625,8 +625,8 @@ private: }; Q_DECLARE_TYPEINFO(QRectF, Q_MOVABLE_TYPE); -Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) Q_DECL_NOTHROW; -Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) Q_DECL_NOTHROW; +Q_DECL_CONSTEXPR inline bool operator==(const QRectF &, const QRectF &) noexcept; +Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &, const QRectF &) noexcept; /***************************************************************************** @@ -641,23 +641,23 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QRectF &); QRectF inline member functions *****************************************************************************/ -Q_DECL_CONSTEXPR inline QRectF::QRectF(qreal aleft, qreal atop, qreal awidth, qreal aheight) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF::QRectF(qreal aleft, qreal atop, qreal awidth, qreal aheight) noexcept : xp(aleft), yp(atop), w(awidth), h(aheight) { } -Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QSizeF &asize) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QSizeF &asize) noexcept : xp(atopLeft.x()), yp(atopLeft.y()), w(asize.width()), h(asize.height()) { } -Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QPointF &abottomRight) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF::QRectF(const QPointF &atopLeft, const QPointF &abottomRight) noexcept : xp(atopLeft.x()), yp(atopLeft.y()), w(abottomRight.x() - atopLeft.x()), h(abottomRight.y() - atopLeft.y()) { } -Q_DECL_CONSTEXPR inline QRectF::QRectF(const QRect &r) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF::QRectF(const QRect &r) noexcept : xp(r.x()), yp(r.y()), w(r.width()), h(r.height()) { } @@ -666,117 +666,117 @@ QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wfloat-equal") QT_WARNING_DISABLE_GCC("-Wfloat-equal") -Q_DECL_CONSTEXPR inline bool QRectF::isNull() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QRectF::isNull() const noexcept { return w == 0. && h == 0.; } -Q_DECL_CONSTEXPR inline bool QRectF::isEmpty() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QRectF::isEmpty() const noexcept { return w <= 0. || h <= 0.; } QT_WARNING_POP -Q_DECL_CONSTEXPR inline bool QRectF::isValid() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QRectF::isValid() const noexcept { return w > 0. && h > 0.; } -Q_DECL_CONSTEXPR inline qreal QRectF::x() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QRectF::x() const noexcept { return xp; } -Q_DECL_CONSTEXPR inline qreal QRectF::y() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QRectF::y() const noexcept { return yp; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setLeft(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setLeft(qreal pos) noexcept { qreal diff = pos - xp; xp += diff; w -= diff; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRight(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRight(qreal pos) noexcept { w = pos - xp; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTop(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTop(qreal pos) noexcept { qreal diff = pos - yp; yp += diff; h -= diff; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottom(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottom(qreal pos) noexcept { h = pos - yp; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopLeft(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopLeft(const QPointF &p) noexcept { setLeft(p.x()); setTop(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopRight(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setTopRight(const QPointF &p) noexcept { setRight(p.x()); setTop(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomLeft(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomLeft(const QPointF &p) noexcept { setLeft(p.x()); setBottom(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomRight(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setBottomRight(const QPointF &p) noexcept { setRight(p.x()); setBottom(p.y()); } -Q_DECL_CONSTEXPR inline QPointF QRectF::center() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QPointF QRectF::center() const noexcept { return QPointF(xp + w/2, yp + h/2); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveLeft(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveLeft(qreal pos) noexcept { xp = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTop(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTop(qreal pos) noexcept { yp = pos; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveRight(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveRight(qreal pos) noexcept { xp = pos - w; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottom(qreal pos) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottom(qreal pos) noexcept { yp = pos - h; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopLeft(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopLeft(const QPointF &p) noexcept { moveLeft(p.x()); moveTop(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopRight(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTopRight(const QPointF &p) noexcept { moveRight(p.x()); moveTop(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomLeft(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomLeft(const QPointF &p) noexcept { moveLeft(p.x()); moveBottom(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomRight(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveBottomRight(const QPointF &p) noexcept { moveRight(p.x()); moveBottom(p.y()); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveCenter(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveCenter(const QPointF &p) noexcept { xp = p.x() - w/2; yp = p.y() - h/2; } -Q_DECL_CONSTEXPR inline qreal QRectF::width() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QRectF::width() const noexcept { return w; } -Q_DECL_CONSTEXPR inline qreal QRectF::height() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QRectF::height() const noexcept { return h; } -Q_DECL_CONSTEXPR inline QSizeF QRectF::size() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSizeF QRectF::size() const noexcept { return QSizeF(w, h); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(qreal dx, qreal dy) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(qreal dx, qreal dy) noexcept { xp += dx; yp += dy; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::translate(const QPointF &p) noexcept { xp += p.x(); yp += p.y(); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(qreal ax, qreal ay) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(qreal ax, qreal ay) noexcept { xp = ax; yp = ay; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(const QPointF &p) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::moveTo(const QPointF &p) noexcept { xp = p.x(); yp = p.y(); } -Q_DECL_CONSTEXPR inline QRectF QRectF::translated(qreal dx, qreal dy) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF QRectF::translated(qreal dx, qreal dy) const noexcept { return QRectF(xp + dx, yp + dy, w, h); } -Q_DECL_CONSTEXPR inline QRectF QRectF::translated(const QPointF &p) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF QRectF::translated(const QPointF &p) const noexcept { return QRectF(xp + p.x(), yp + p.y(), w, h); } -Q_DECL_CONSTEXPR inline QRectF QRectF::transposed() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF QRectF::transposed() const noexcept { return QRectF(topLeft(), size().transposed()); } Q_DECL_RELAXED_CONSTEXPR inline void QRectF::getRect(qreal *ax, qreal *ay, qreal *aaw, qreal *aah) const @@ -787,7 +787,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRectF::getRect(qreal *ax, qreal *ay, qreal *aah = this->h; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRect(qreal ax, qreal ay, qreal aaw, qreal aah) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setRect(qreal ax, qreal ay, qreal aaw, qreal aah) noexcept { this->xp = ax; this->yp = ay; @@ -803,7 +803,7 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRectF::getCoords(qreal *xp1, qreal *yp1, q *yp2 = yp + h; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setCoords(qreal xp1, qreal yp1, qreal xp2, qreal yp2) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setCoords(qreal xp1, qreal yp1, qreal xp2, qreal yp2) noexcept { xp = xp1; yp = yp1; @@ -811,105 +811,105 @@ Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setCoords(qreal xp1, qreal yp1, qre h = yp2 - yp1; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::adjust(qreal xp1, qreal yp1, qreal xp2, qreal yp2) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::adjust(qreal xp1, qreal yp1, qreal xp2, qreal yp2) noexcept { xp += xp1; yp += yp1; w += xp2 - xp1; h += yp2 - yp1; } -Q_DECL_CONSTEXPR inline QRectF QRectF::adjusted(qreal xp1, qreal yp1, qreal xp2, qreal yp2) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF QRectF::adjusted(qreal xp1, qreal yp1, qreal xp2, qreal yp2) const noexcept { return QRectF(xp + xp1, yp + yp1, w + xp2 - xp1, h + yp2 - yp1); } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setWidth(qreal aw) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setWidth(qreal aw) noexcept { this->w = aw; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setHeight(qreal ah) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setHeight(qreal ah) noexcept { this->h = ah; } -Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setSize(const QSizeF &s) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QRectF::setSize(const QSizeF &s) noexcept { w = s.width(); h = s.height(); } -inline bool QRectF::contains(qreal ax, qreal ay) const Q_DECL_NOTHROW +inline bool QRectF::contains(qreal ax, qreal ay) const noexcept { return contains(QPointF(ax, ay)); } -inline QRectF& QRectF::operator|=(const QRectF &r) Q_DECL_NOTHROW +inline QRectF& QRectF::operator|=(const QRectF &r) noexcept { *this = *this | r; return *this; } -inline QRectF& QRectF::operator&=(const QRectF &r) Q_DECL_NOTHROW +inline QRectF& QRectF::operator&=(const QRectF &r) noexcept { *this = *this & r; return *this; } -inline QRectF QRectF::intersected(const QRectF &r) const Q_DECL_NOTHROW +inline QRectF QRectF::intersected(const QRectF &r) const noexcept { return *this & r; } -inline QRectF QRectF::united(const QRectF &r) const Q_DECL_NOTHROW +inline QRectF QRectF::united(const QRectF &r) const noexcept { return *this | r; } -Q_DECL_CONSTEXPR inline bool operator==(const QRectF &r1, const QRectF &r2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator==(const QRectF &r1, const QRectF &r2) noexcept { return qFuzzyCompare(r1.xp, r2.xp) && qFuzzyCompare(r1.yp, r2.yp) && qFuzzyCompare(r1.w, r2.w) && qFuzzyCompare(r1.h, r2.h); } -Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &r1, const QRectF &r2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator!=(const QRectF &r1, const QRectF &r2) noexcept { return !qFuzzyCompare(r1.xp, r2.xp) || !qFuzzyCompare(r1.yp, r2.yp) || !qFuzzyCompare(r1.w, r2.w) || !qFuzzyCompare(r1.h, r2.h); } -Q_DECL_CONSTEXPR inline QRect QRectF::toRect() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRect QRectF::toRect() const noexcept { return QRect(QPoint(qRound(xp), qRound(yp)), QPoint(qRound(xp + w) - 1, qRound(yp + h) - 1)); } -Q_DECL_CONSTEXPR inline QRectF operator+(const QRectF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF operator+(const QRectF &lhs, const QMarginsF &rhs) noexcept { return QRectF(QPointF(lhs.left() - rhs.left(), lhs.top() - rhs.top()), QSizeF(lhs.width() + rhs.left() + rhs.right(), lhs.height() + rhs.top() + rhs.bottom())); } -Q_DECL_CONSTEXPR inline QRectF operator+(const QMarginsF &lhs, const QRectF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF operator+(const QMarginsF &lhs, const QRectF &rhs) noexcept { return QRectF(QPointF(rhs.left() - lhs.left(), rhs.top() - lhs.top()), QSizeF(rhs.width() + lhs.left() + lhs.right(), rhs.height() + lhs.top() + lhs.bottom())); } -Q_DECL_CONSTEXPR inline QRectF operator-(const QRectF &lhs, const QMarginsF &rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF operator-(const QRectF &lhs, const QMarginsF &rhs) noexcept { return QRectF(QPointF(lhs.left() + rhs.left(), lhs.top() + rhs.top()), QSizeF(lhs.width() - rhs.left() - rhs.right(), lhs.height() - rhs.top() - rhs.bottom())); } -Q_DECL_CONSTEXPR inline QRectF QRectF::marginsAdded(const QMarginsF &margins) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF QRectF::marginsAdded(const QMarginsF &margins) const noexcept { return QRectF(QPointF(xp - margins.left(), yp - margins.top()), QSizeF(w + margins.left() + margins.right(), h + margins.top() + margins.bottom())); } -Q_DECL_CONSTEXPR inline QRectF QRectF::marginsRemoved(const QMarginsF &margins) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QRectF QRectF::marginsRemoved(const QMarginsF &margins) const noexcept { return QRectF(QPointF(xp + margins.left(), yp + margins.top()), QSizeF(w - margins.left() - margins.right(), h - margins.top() - margins.bottom())); } -Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator+=(const QMarginsF &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator+=(const QMarginsF &margins) noexcept { *this = marginsAdded(margins); return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator-=(const QMarginsF &margins) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QRectF &QRectF::operator-=(const QMarginsF &margins) noexcept { *this = marginsRemoved(margins); return *this; diff --git a/src/corelib/tools/qrefcount.h b/src/corelib/tools/qrefcount.h index 9586c3a79a..2e5388ad9a 100644 --- a/src/corelib/tools/qrefcount.h +++ b/src/corelib/tools/qrefcount.h @@ -51,8 +51,8 @@ namespace QtPrivate class RefCount { public: - inline bool ref() Q_DECL_NOTHROW { - int count = atomic.load(); + inline bool ref() noexcept { + int count = atomic.loadRelaxed(); #if !defined(QT_NO_UNSHARABLE_CONTAINERS) if (count == 0) // !isSharable return false; @@ -62,8 +62,8 @@ public: return true; } - inline bool deref() Q_DECL_NOTHROW { - int count = atomic.load(); + inline bool deref() noexcept { + int count = atomic.loadRelaxed(); #if !defined(QT_NO_UNSHARABLE_CONTAINERS) if (count == 0) // !isSharable return false; @@ -74,7 +74,7 @@ public: } #if !defined(QT_NO_UNSHARABLE_CONTAINERS) - bool setSharable(bool sharable) Q_DECL_NOTHROW + bool setSharable(bool sharable) noexcept { Q_ASSERT(!isShared()); if (sharable) @@ -83,27 +83,27 @@ public: return atomic.testAndSetRelaxed(1, 0); } - bool isSharable() const Q_DECL_NOTHROW + bool isSharable() const noexcept { // Sharable === Shared ownership. - return atomic.load() != 0; + return atomic.loadRelaxed() != 0; } #endif - bool isStatic() const Q_DECL_NOTHROW + bool isStatic() const noexcept { // Persistent object, never deleted - return atomic.load() == -1; + return atomic.loadRelaxed() == -1; } - bool isShared() const Q_DECL_NOTHROW + bool isShared() const noexcept { - int count = atomic.load(); + int count = atomic.loadRelaxed(); return (count != 1) && (count != 0); } - void initializeOwned() Q_DECL_NOTHROW { atomic.store(1); } - void initializeUnsharable() Q_DECL_NOTHROW { atomic.store(0); } + void initializeOwned() noexcept { atomic.storeRelaxed(1); } + void initializeUnsharable() noexcept { atomic.storeRelaxed(0); } QBasicAtomicInt atomic; }; diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index ef24c952eb..128df84053 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -58,9 +58,6 @@ QT_BEGIN_NAMESPACE -int qFindString(const QChar *haystack, int haystackLen, int from, - const QChar *needle, int needleLen, Qt::CaseSensitivity cs); - // error strings for the regexp parser #define RXERR_OK QT_TRANSLATE_NOOP("QRegExp", "no error occurred") #define RXERR_DISABLED QT_TRANSLATE_NOOP("QRegExp", "disabled feature used") @@ -893,7 +890,7 @@ static bool operator==(const QRegExpEngineKey &key1, const QRegExpEngineKey &key && key1.cs == key2.cs; } -static uint qHash(const QRegExpEngineKey &key, uint seed = 0) Q_DECL_NOTHROW +static uint qHash(const QRegExpEngineKey &key, uint seed = 0) noexcept { QtPrivate::QHashCombine hash; seed = hash(seed, key.pattern); @@ -940,10 +937,10 @@ struct QRegExpMatchState const QRegExpEngine *eng; - inline QRegExpMatchState() : bigArray(0), captured(0) {} + inline QRegExpMatchState() : bigArray(nullptr), captured(nullptr) {} inline ~QRegExpMatchState() { free(bigArray); } - void drain() { free(bigArray); bigArray = 0; captured = 0; } // to save memory + void drain() { free(bigArray); bigArray = nullptr; captured = nullptr; } // to save memory void prepareForMatch(QRegExpEngine *eng); void match(const QChar *str, int len, int pos, bool minimal, bool oneTest, int caretIndex); @@ -1423,14 +1420,15 @@ void QRegExpMatchState::match(const QChar *str0, int len0, int pos0, #ifndef QT_NO_REGEXP_OPTIM if (eng->trivial && !oneTest) { - pos = qFindString(str0, len0, pos0, eng->goodStr.unicode(), eng->goodStr.length(), eng->cs); + // ### Qt6: qsize + pos = int(QtPrivate::findString(QStringView(str0, len0), pos0, QStringView(eng->goodStr.unicode(), eng->goodStr.length()), eng->cs)); matchLen = eng->goodStr.length(); matched = (pos != -1); } else #endif { in = str0; - if (in == 0) + if (in == nullptr) in = &char_null; pos = pos0; caretPos = caretIndex; @@ -1709,7 +1707,7 @@ void QRegExpEngine::dump() const void QRegExpEngine::setup() { - ref.store(1); + ref.storeRelaxed(1); #ifndef QT_NO_REGEXP_CAPTURE f.resize(32); nf = 0; @@ -2912,7 +2910,7 @@ int QRegExpEngine::getEscape() #ifndef QT_NO_REGEXP_ESCAPE if ((prevCh & ~0xff) == 0) { const char *p = strchr(tab, prevCh); - if (p != 0) + if (p != nullptr) return Tok_Char | backTab[p - tab]; } #endif @@ -3532,7 +3530,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len) #endif box.cat(middleBox); box.cat(rightBox); - yyCharClass.reset(0); + yyCharClass.reset(); #ifndef QT_NO_REGEXP_CAPTURE for (int i = 0; i < nf; ++i) { @@ -3610,7 +3608,7 @@ int QRegExpEngine::parse(const QChar *pattern, int len) void QRegExpEngine::parseAtom(Box *box) { #ifndef QT_NO_REGEXP_LOOKAHEAD - QRegExpEngine *eng = 0; + QRegExpEngine *eng = nullptr; bool neg; int len; #endif @@ -3807,9 +3805,9 @@ struct QRegExpPrivate QRegExpMatchState matchState; inline QRegExpPrivate() - : eng(0), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { } + : eng(nullptr), engineKey(QString(), QRegExp::RegExp, Qt::CaseSensitive), minimal(false) { } inline QRegExpPrivate(const QRegExpEngineKey &key) - : eng(0), engineKey(key), minimal(false) {} + : eng(nullptr), engineKey(key), minimal(false) {} }; #if !defined(QT_NO_REGEXP_OPTIM) @@ -3888,9 +3886,9 @@ static void prepareEngineForMatch(QRegExpPrivate *priv, const QString &str) static void invalidateEngine(QRegExpPrivate *priv) { - if (priv->eng != 0) { + if (priv->eng) { derefEngine(priv->eng, priv->engineKey); - priv->eng = 0; + priv->eng = nullptr; priv->matchState.drain(); } } @@ -4048,7 +4046,7 @@ bool QRegExp::operator==(const QRegExp &rx) const Returns the hash value for \a key, using \a seed to seed the calculation. */ -uint qHash(const QRegExp &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QRegExp &key, uint seed) noexcept { QtPrivate::QHashCombine hash; seed = hash(seed, key.priv->engineKey); diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index b3fa242168..8f6de24c74 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -53,7 +53,7 @@ struct QRegExpPrivate; class QStringList; class QRegExp; -Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed = 0) noexcept; class Q_CORE_EXPORT QRegExp { @@ -73,10 +73,8 @@ public: QRegExp(const QRegExp &rx); ~QRegExp(); QRegExp &operator=(const QRegExp &rx); -#ifdef Q_COMPILER_RVALUE_REFS - QRegExp &operator=(QRegExp &&other) Q_DECL_NOTHROW { swap(other); return *this; } -#endif - void swap(QRegExp &other) Q_DECL_NOTHROW { qSwap(priv, other.priv); } + QRegExp &operator=(QRegExp &&other) noexcept { swap(other); return *this; } + void swap(QRegExp &other) noexcept { qSwap(priv, other.priv); } bool operator==(const QRegExp &rx) const; inline bool operator!=(const QRegExp &rx) const { return !operator==(rx); } @@ -112,7 +110,7 @@ public: static QString escape(const QString &str); - friend Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed) Q_DECL_NOTHROW; + friend Q_CORE_EXPORT uint qHash(const QRegExp &key, uint seed) noexcept; private: QRegExpPrivate *priv; diff --git a/src/corelib/tools/qregularexpression.cpp b/src/corelib/tools/qregularexpression.cpp index bdaa2d3243..17acd476b2 100644 --- a/src/corelib/tools/qregularexpression.cpp +++ b/src/corelib/tools/qregularexpression.cpp @@ -460,34 +460,13 @@ QT_BEGIN_NAMESPACE \row \li \c{"[a-z]+\\d+"} \li \b true \li \b true \endtable - Exact matching is not reflected in QRegularExpression. If you want to be - sure that the subject string matches the regular expression exactly, you can wrap the - pattern between a couple of anchoring expressions. Simply - putting the pattern between the \c{^} and the \c{$} anchors is enough - in most cases: + Exact matching is not reflected in QRegularExpression. If you want + to be sure that the subject string matches the regular expression + exactly, you can wrap the pattern using the anchoredPattern() + function: \snippet code/src_corelib_tools_qregularexpression.cpp 24 - However, remember that the \c{$} anchor not only matches at the end of the - string, but also at a newline character right before the end of the string; - that is, the previous pattern matches against the string "this pattern must - match exactly\\n". Also, the behaviour of both the \c{^} and the \c{$} - anchors changes if the MultiLineOption is set either explicitly (as a - pattern option) or implicitly (as a directive inside the pattern string). - - Therefore, in the most general case, you should wrap the pattern between - the \c{\A} and the \c{\z} anchors: - - \snippet code/src_corelib_tools_qregularexpression.cpp 25 - - Note the usage of the non-capturing group in order to preserve the meaning - of the branch operator inside the pattern. - - The QRegularExpression::anchoredPattern() helper method does exactly that for - you. - - \sa anchoredPattern - \section3 Porting from QRegExp's Partial Matching When using QRegExp::exactMatch(), if an exact match was not found, one @@ -1048,8 +1027,8 @@ void QRegularExpressionPrivate::getPatternInfo() unsigned int hasJOptionChanged; pcre2_pattern_info_16(compiledPattern, PCRE2_INFO_JCHANGED, &hasJOptionChanged); if (Q_UNLIKELY(hasJOptionChanged)) { - qWarning("QRegularExpressionPrivate::getPatternInfo(): the pattern '%s'\n is using the (?J) option; duplicate capturing group names are not supported by Qt", - qPrintable(pattern)); + qWarning("QRegularExpressionPrivate::getPatternInfo(): the pattern '%ls'\n is using the (?J) option; duplicate capturing group names are not supported by Qt", + qUtf16Printable(pattern)); } } @@ -1810,7 +1789,7 @@ bool QRegularExpression::operator==(const QRegularExpression &re) const Returns the hash value for \a key, using \a seed to seed the calculation. */ -uint qHash(const QRegularExpression &key, uint seed) Q_DECL_NOTHROW +uint qHash(const QRegularExpression &key, uint seed) noexcept { QtPrivate::QHashCombine hash; seed = hash(seed, key.d->pattern); diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/tools/qregularexpression.h index f9e7029550..f799a38ae4 100644 --- a/src/corelib/tools/qregularexpression.h +++ b/src/corelib/tools/qregularexpression.h @@ -59,7 +59,7 @@ class QRegularExpressionMatchIterator; struct QRegularExpressionPrivate; class QRegularExpression; -Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed = 0) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed = 0) noexcept; class Q_CORE_EXPORT QRegularExpression { @@ -86,13 +86,10 @@ public: QRegularExpression(const QRegularExpression &re); ~QRegularExpression(); QRegularExpression &operator=(const QRegularExpression &re); - -#ifdef Q_COMPILER_RVALUE_REFS - QRegularExpression &operator=(QRegularExpression &&re) Q_DECL_NOTHROW + QRegularExpression &operator=(QRegularExpression &&re) noexcept { d.swap(re.d); return *this; } -#endif - void swap(QRegularExpression &other) Q_DECL_NOTHROW { d.swap(other.d); } + void swap(QRegularExpression &other) noexcept { d.swap(other.d); } QString pattern() const; void setPattern(const QString &pattern); @@ -157,7 +154,7 @@ private: friend class QRegularExpressionMatch; friend struct QRegularExpressionMatchPrivate; friend class QRegularExpressionMatchIterator; - friend Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed) Q_DECL_NOTHROW; + friend Q_CORE_EXPORT uint qHash(const QRegularExpression &key, uint seed) noexcept; QRegularExpression(QRegularExpressionPrivate &dd); QExplicitlySharedDataPointer<QRegularExpressionPrivate> d; @@ -186,12 +183,9 @@ public: ~QRegularExpressionMatch(); QRegularExpressionMatch(const QRegularExpressionMatch &match); QRegularExpressionMatch &operator=(const QRegularExpressionMatch &match); - -#ifdef Q_COMPILER_RVALUE_REFS - QRegularExpressionMatch &operator=(QRegularExpressionMatch &&match) Q_DECL_NOTHROW + QRegularExpressionMatch &operator=(QRegularExpressionMatch &&match) noexcept { d.swap(match.d); return *this; } -#endif - void swap(QRegularExpressionMatch &other) Q_DECL_NOTHROW { d.swap(other.d); } + void swap(QRegularExpressionMatch &other) noexcept { d.swap(other.d); } QRegularExpression regularExpression() const; QRegularExpression::MatchType matchType() const; @@ -257,11 +251,9 @@ public: ~QRegularExpressionMatchIterator(); QRegularExpressionMatchIterator(const QRegularExpressionMatchIterator &iterator); QRegularExpressionMatchIterator &operator=(const QRegularExpressionMatchIterator &iterator); -#ifdef Q_COMPILER_RVALUE_REFS - QRegularExpressionMatchIterator &operator=(QRegularExpressionMatchIterator &&iterator) Q_DECL_NOTHROW + QRegularExpressionMatchIterator &operator=(QRegularExpressionMatchIterator &&iterator) noexcept { d.swap(iterator.d); return *this; } -#endif - void swap(QRegularExpressionMatchIterator &other) Q_DECL_NOTHROW { d.swap(other.d); } + void swap(QRegularExpressionMatchIterator &other) noexcept { d.swap(other.d); } bool isValid() const; diff --git a/src/corelib/tools/qringbuffer.cpp b/src/corelib/tools/qringbuffer.cpp index 59650ed2f7..311058a776 100644 --- a/src/corelib/tools/qringbuffer.cpp +++ b/src/corelib/tools/qringbuffer.cpp @@ -59,7 +59,7 @@ void QRingChunk::detach() const int chunkSize = size(); QByteArray x(chunkSize, Qt::Uninitialized); ::memcpy(x.data(), chunk.constData() + headOffset, chunkSize); - chunk = qMove(x); + chunk = std::move(x); headOffset = 0; tailOffset = chunkSize; } @@ -105,7 +105,7 @@ const char *QRingBuffer::readPointerAtPosition(qint64 pos, qint64 &length) const } length = 0; - return 0; + return nullptr; } void QRingBuffer::free(qint64 bytes) diff --git a/src/corelib/tools/qringbuffer_p.h b/src/corelib/tools/qringbuffer_p.h index 76ab4a5b62..838cb31697 100644 --- a/src/corelib/tools/qringbuffer_p.h +++ b/src/corelib/tools/qringbuffer_p.h @@ -65,11 +65,11 @@ class QRingChunk { public: // initialization and cleanup - inline QRingChunk() Q_DECL_NOTHROW : + inline QRingChunk() noexcept : headOffset(0), tailOffset(0) { } - inline QRingChunk(const QRingChunk &other) Q_DECL_NOTHROW : + inline QRingChunk(const QRingChunk &other) noexcept : chunk(other.chunk), headOffset(other.headOffset), tailOffset(other.tailOffset) { } @@ -77,30 +77,30 @@ public: chunk(alloc, Qt::Uninitialized), headOffset(0), tailOffset(0) { } - explicit inline QRingChunk(const QByteArray &qba) Q_DECL_NOTHROW : + explicit inline QRingChunk(const QByteArray &qba) noexcept : chunk(qba), headOffset(0), tailOffset(qba.size()) { } - inline QRingChunk &operator=(const QRingChunk &other) Q_DECL_NOTHROW + inline QRingChunk &operator=(const QRingChunk &other) noexcept { chunk = other.chunk; headOffset = other.headOffset; tailOffset = other.tailOffset; return *this; } - inline QRingChunk(QRingChunk &&other) Q_DECL_NOTHROW : + inline QRingChunk(QRingChunk &&other) noexcept : chunk(other.chunk), headOffset(other.headOffset), tailOffset(other.tailOffset) { other.headOffset = other.tailOffset = 0; } - inline QRingChunk &operator=(QRingChunk &&other) Q_DECL_NOTHROW + inline QRingChunk &operator=(QRingChunk &&other) noexcept { swap(other); return *this; } - inline void swap(QRingChunk &other) Q_DECL_NOTHROW + inline void swap(QRingChunk &other) noexcept { chunk.swap(other.chunk); qSwap(headOffset, other.headOffset); diff --git a/src/corelib/tools/qscopedpointer.cpp b/src/corelib/tools/qscopedpointer.cpp index 769a18f9e0..eb08bdba62 100644 --- a/src/corelib/tools/qscopedpointer.cpp +++ b/src/corelib/tools/qscopedpointer.cpp @@ -157,7 +157,7 @@ QT_BEGIN_NAMESPACE Provides access to the scoped pointer's object. - If the contained pointer is \c null, behavior is undefined. + If the contained pointer is \nullptr, behavior is undefined. \sa isNull() */ @@ -166,7 +166,7 @@ QT_BEGIN_NAMESPACE Provides access to the scoped pointer's object. - If the contained pointer is \c null, behavior is undefined. + If the contained pointer is \nullptr, behavior is undefined. \sa isNull() */ @@ -174,8 +174,8 @@ QT_BEGIN_NAMESPACE /*! \fn template <typename T, typename Cleanup> QScopedPointer<T, Cleanup>::operator bool() const - Returns \c true if this object is not \c null. This function is suitable - for use in \tt if-constructs, like: + Returns \c true if the contained pointer is not \nullptr. + This function is suitable for use in \tt if-constructs, like: \snippet code/src_corelib_tools_qscopedpointer.cpp 3 @@ -185,18 +185,14 @@ QT_BEGIN_NAMESPACE /*! \fn template <typename T, typename Cleanup> bool operator==(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) - Equality operator. Returns \c true if the scoped pointers - \a lhs and \a rhs are pointing to the same object. - Otherwise returns \c false. + Returns \c true if \a ptr1 and \a ptr2 refer to the same pointer. */ /*! \fn template <typename T, typename Cleanup> bool operator!=(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) - Inequality operator. Returns \c true if the scoped pointers - \a lhs and \a rhs are \e not pointing to the same object. - Otherwise returns \c false. + Returns \c true if \a lhs and \a rhs refer to distinct pointers. */ /*! @@ -204,7 +200,7 @@ QT_BEGIN_NAMESPACE \relates QScopedPointer \since 5.8 - Returns \c true if the scoped pointer \a lhs is a null pointer. + Returns \c true if \a lhs refers to \nullptr. \sa QScopedPointer::isNull() */ @@ -214,7 +210,7 @@ QT_BEGIN_NAMESPACE \relates QScopedPointer \since 5.8 - Returns \c true if the scoped pointer \a rhs is a null pointer. + Returns \c true if \a rhs refers to \nullptr. \sa QScopedPointer::isNull() */ @@ -224,8 +220,7 @@ QT_BEGIN_NAMESPACE \relates QScopedPointer \since 5.8 - Returns \c true if the scoped pointer \a lhs is a valid (i.e. a non-null) - pointer. + Returns \c true if \a lhs refers to a valid (i.e. non-null) pointer. \sa QScopedPointer::isNull() */ @@ -235,8 +230,7 @@ QT_BEGIN_NAMESPACE \relates QScopedPointer \since 5.8 - Returns \c true if the scoped pointer \a rhs is a valid (i.e. a non-null) - pointer. + Returns \c true if \a rhs refers to a valid (i.e. non-null) pointer. \sa QScopedPointer::isNull() */ @@ -244,7 +238,7 @@ QT_BEGIN_NAMESPACE /*! \fn template <typename T, typename Cleanup> bool QScopedPointer<T, Cleanup>::isNull() const - Returns \c true if this object is holding a pointer that is \c null. + Returns \c true if this object refers to \nullptr. */ /*! @@ -262,15 +256,14 @@ QT_BEGIN_NAMESPACE \fn template <typename T, typename Cleanup> T *QScopedPointer<T, Cleanup>::take() Returns the value of the pointer referenced by this object. The pointer of this - QScopedPointer object will be reset to \c null. + QScopedPointer object will be reset to \nullptr. Callers of this function take ownership of the pointer. */ /*! \fn template <typename T, typename Cleanup> bool QScopedPointer<T, Cleanup>::operator!() const - Returns \c true if the pointer referenced by this object is \c null, otherwise - returns \c false. + Returns \c true if this object refers to \nullptr. \sa isNull() */ @@ -325,7 +318,7 @@ QT_BEGIN_NAMESPACE Provides access to entry \a i of the scoped pointer's array of objects. - If the contained pointer is \c null, behavior is undefined. + If the contained pointer is \nullptr, behavior is undefined. \sa isNull() */ @@ -336,7 +329,7 @@ QT_BEGIN_NAMESPACE Provides access to entry \a i of the scoped pointer's array of objects. - If the contained pointer is \c null, behavior is undefined. + If the contained pointer is \nullptr behavior is undefined. \sa isNull() */ diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index 2a4083466b..af0c0ed336 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -97,7 +97,7 @@ class QScopedPointer { typedef T *QScopedPointer:: *RestrictedBool; public: - explicit QScopedPointer(T *p = nullptr) Q_DECL_NOTHROW : d(p) + explicit QScopedPointer(T *p = nullptr) noexcept : d(p) { } @@ -113,12 +113,12 @@ public: return *d; } - T *operator->() const Q_DECL_NOTHROW + T *operator->() const noexcept { return d; } - bool operator!() const Q_DECL_NOTHROW + bool operator!() const noexcept { return !d; } @@ -129,28 +129,28 @@ public: return isNull() ? nullptr : &QScopedPointer::d; } #else - operator RestrictedBool() const Q_DECL_NOTHROW + operator RestrictedBool() const noexcept { return isNull() ? nullptr : &QScopedPointer::d; } #endif - T *data() const Q_DECL_NOTHROW + T *data() const noexcept { return d; } - T *get() const Q_DECL_NOTHROW + T *get() const noexcept { return d; } - bool isNull() const Q_DECL_NOTHROW + bool isNull() const noexcept { return !d; } - void reset(T *other = nullptr) Q_DECL_NOEXCEPT_EXPR(noexcept(Cleanup::cleanup(std::declval<T *>()))) + void reset(T *other = nullptr) noexcept(noexcept(Cleanup::cleanup(std::declval<T *>()))) { if (d == other) return; @@ -159,14 +159,14 @@ public: Cleanup::cleanup(oldD); } - T *take() Q_DECL_NOTHROW + T *take() noexcept { T *oldD = d; d = nullptr; return oldD; } - void swap(QScopedPointer<T, Cleanup> &other) Q_DECL_NOTHROW + void swap(QScopedPointer<T, Cleanup> &other) noexcept { qSwap(d, other.d); } @@ -181,43 +181,43 @@ private: }; template <class T, class Cleanup> -inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW +inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) noexcept { return lhs.data() == rhs.data(); } template <class T, class Cleanup> -inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW +inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, const QScopedPointer<T, Cleanup> &rhs) noexcept { return lhs.data() != rhs.data(); } template <class T, class Cleanup> -inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) Q_DECL_NOTHROW +inline bool operator==(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) noexcept { return lhs.isNull(); } template <class T, class Cleanup> -inline bool operator==(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW +inline bool operator==(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) noexcept { return rhs.isNull(); } template <class T, class Cleanup> -inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) Q_DECL_NOTHROW +inline bool operator!=(const QScopedPointer<T, Cleanup> &lhs, std::nullptr_t) noexcept { return !lhs.isNull(); } template <class T, class Cleanup> -inline bool operator!=(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW +inline bool operator!=(std::nullptr_t, const QScopedPointer<T, Cleanup> &rhs) noexcept { return !rhs.isNull(); } template <class T, class Cleanup> -inline void swap(QScopedPointer<T, Cleanup> &p1, QScopedPointer<T, Cleanup> &p2) Q_DECL_NOTHROW +inline void swap(QScopedPointer<T, Cleanup> &p1, QScopedPointer<T, Cleanup> &p2) noexcept { p1.swap(p2); } template <typename T, typename Cleanup = QScopedPointerArrayDeleter<T> > @@ -244,7 +244,7 @@ public: return this->d[i]; } - void swap(QScopedArrayPointer &other) Q_DECL_NOTHROW // prevent QScopedPointer <->QScopedArrayPointer swaps + void swap(QScopedArrayPointer &other) noexcept // prevent QScopedPointer <->QScopedArrayPointer swaps { QScopedPointer<T, Cleanup>::swap(other); } private: @@ -263,7 +263,7 @@ private: }; template <typename T, typename Cleanup> -inline void swap(QScopedArrayPointer<T, Cleanup> &lhs, QScopedArrayPointer<T, Cleanup> &rhs) Q_DECL_NOTHROW +inline void swap(QScopedArrayPointer<T, Cleanup> &lhs, QScopedArrayPointer<T, Cleanup> &rhs) noexcept { lhs.swap(rhs); } QT_END_NAMESPACE diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h index 5f76269388..f904b8dfcb 100644 --- a/src/corelib/tools/qscopedvaluerollback.h +++ b/src/corelib/tools/qscopedvaluerollback.h @@ -48,20 +48,20 @@ template <typename T> class QScopedValueRollback { public: - explicit QScopedValueRollback(T &var) : - varRef(var), oldValue(var) + explicit QScopedValueRollback(T &var) + : varRef(var), oldValue(var) { } - explicit QScopedValueRollback(T &var, T value) : - varRef(var), oldValue(var) + explicit QScopedValueRollback(T &var, T value) + : varRef(var), oldValue(std::move(var)) { - varRef = qMove(value); + varRef = std::move(value); } ~QScopedValueRollback() { - varRef = qMove(oldValue); + varRef = std::move(oldValue); } void commit() @@ -70,7 +70,7 @@ public: } private: - T& varRef; + T &varRef; T oldValue; Q_DISABLE_COPY(QScopedValueRollback) diff --git a/src/corelib/tools/qscopeguard.h b/src/corelib/tools/qscopeguard.h index 31100fcabb..45c3f93da4 100644 --- a/src/corelib/tools/qscopeguard.h +++ b/src/corelib/tools/qscopeguard.h @@ -50,14 +50,19 @@ template <typename F> class QScopeGuard; template <typename F> QScopeGuard<F> qScopeGuard(F f); template <typename F> -class QScopeGuard +class +#if QT_HAS_CPP_ATTRIBUTE(nodiscard) +// Q_REQUIRED_RESULT can be defined as __warn_unused_result__ or as [[nodiscard]] +// but the 1st one has some limitations for example can be placed only on functions. +Q_REQUIRED_RESULT +#endif +QScopeGuard { public: - QScopeGuard(QScopeGuard &&other) Q_DECL_NOEXCEPT + QScopeGuard(QScopeGuard &&other) noexcept : m_func(std::move(other.m_func)) - , m_invoke(other.m_invoke) + , m_invoke(qExchange(other.m_invoke, false)) { - other.dismiss(); } ~QScopeGuard() @@ -66,13 +71,13 @@ public: m_func(); } - void dismiss() Q_DECL_NOEXCEPT + void dismiss() noexcept { m_invoke = false; } private: - explicit QScopeGuard(F f) Q_DECL_NOEXCEPT + explicit QScopeGuard(F &&f) noexcept : m_func(std::move(f)) { } @@ -86,6 +91,9 @@ private: template <typename F> +#if QT_HAS_CPP_ATTRIBUTE(nodiscard) +Q_REQUIRED_RESULT +#endif QScopeGuard<F> qScopeGuard(F f) { return QScopeGuard<F>(std::move(f)); diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h index 6640c8486d..83e574bf1c 100644 --- a/src/corelib/tools/qset.h +++ b/src/corelib/tools/qset.h @@ -41,10 +41,9 @@ #define QSET_H #include <QtCore/qhash.h> -#ifdef Q_COMPILER_INITIALIZER_LISTS -#include <initializer_list> -#endif +#include <QtCore/qcontainertools_impl.h> +#include <initializer_list> #include <iterator> QT_BEGIN_NAMESPACE @@ -56,19 +55,21 @@ class QSet typedef QHash<T, QHashDummyValue> Hash; public: - inline QSet() Q_DECL_NOTHROW {} -#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QSet() noexcept {} inline QSet(std::initializer_list<T> list) + : QSet(list.begin(), list.end()) {} + template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> + inline QSet(InputIterator first, InputIterator last) { - reserve(int(list.size())); - for (typename std::initializer_list<T>::const_iterator it = list.begin(); it != list.end(); ++it) - insert(*it); + QtPrivate::reserveIfForwardIterator(this, first, last); + for (; first != last; ++first) + insert(*first); } -#endif + // compiler-generated copy/move ctor/assignment operators are fine! // compiler-generated destructor is fine! - inline void swap(QSet<T> &other) Q_DECL_NOTHROW { q_hash.swap(other.q_hash); } + inline void swap(QSet<T> &other) noexcept { q_hash.swap(other.q_hash); } inline bool operator==(const QSet<T> &other) const { return q_hash == other.q_hash; } @@ -176,20 +177,20 @@ public: typedef std::reverse_iterator<const_iterator> const_reverse_iterator; inline iterator begin() { return q_hash.begin(); } - inline const_iterator begin() const Q_DECL_NOTHROW { return q_hash.begin(); } - inline const_iterator cbegin() const Q_DECL_NOTHROW { return q_hash.begin(); } - inline const_iterator constBegin() const Q_DECL_NOTHROW { return q_hash.constBegin(); } + inline const_iterator begin() const noexcept { return q_hash.begin(); } + inline const_iterator cbegin() const noexcept { return q_hash.begin(); } + inline const_iterator constBegin() const noexcept { return q_hash.constBegin(); } inline iterator end() { return q_hash.end(); } - inline const_iterator end() const Q_DECL_NOTHROW { return q_hash.end(); } - inline const_iterator cend() const Q_DECL_NOTHROW { return q_hash.end(); } - inline const_iterator constEnd() const Q_DECL_NOTHROW { return q_hash.constEnd(); } + inline const_iterator end() const noexcept { return q_hash.end(); } + inline const_iterator cend() const noexcept { return q_hash.end(); } + inline const_iterator constEnd() const noexcept { return q_hash.constEnd(); } reverse_iterator rbegin() { return reverse_iterator(end()); } reverse_iterator rend() { return reverse_iterator(begin()); } - const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } - const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } + const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); } + const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); } iterator erase(iterator i) { return erase(m2c(i)); } @@ -244,22 +245,25 @@ public: inline QSet<T> operator-(const QSet<T> &other) const { QSet<T> result = *this; result -= other; return result; } - QList<T> toList() const; - inline QList<T> values() const { return toList(); } - + QList<T> values() const; +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + Q_DECL_DEPRECATED_X("Use values() instead.") + QList<T> toList() const { return values(); } + Q_DECL_DEPRECATED_X("Use QSet<T>(list.begin(), list.end()) instead.") static QSet<T> fromList(const QList<T> &list); +#endif private: Hash q_hash; - static const_iterator m2c(iterator it) Q_DECL_NOTHROW + static const_iterator m2c(iterator it) noexcept { return const_iterator(typename Hash::const_iterator(it.i.i)); } bool isValidIterator(const iterator &i) const { return q_hash.isValidIterator(reinterpret_cast<const typename Hash::iterator&>(i)); } - bool isValidIterator(const const_iterator &i) const Q_DECL_NOTHROW + bool isValidIterator(const const_iterator &i) const noexcept { return q_hash.isValidIterator(reinterpret_cast<const typename Hash::const_iterator&>(i)); } @@ -267,7 +271,7 @@ private: template <typename T> uint qHash(const QSet<T> &key, uint seed = 0) -Q_DECL_NOEXCEPT_EXPR(noexcept(qHashRangeCommutative(key.begin(), key.end(), seed))) +noexcept(noexcept(qHashRangeCommutative(key.begin(), key.end(), seed))) { return qHashRangeCommutative(key.begin(), key.end(), seed); } @@ -367,7 +371,7 @@ Q_INLINE_TEMPLATE bool QSet<T>::contains(const QSet<T> &other) const } template <typename T> -Q_OUTOFLINE_TEMPLATE QList<T> QSet<T>::toList() const +Q_OUTOFLINE_TEMPLATE QList<T> QSet<T>::values() const { QList<T> result; result.reserve(size()); @@ -379,6 +383,7 @@ Q_OUTOFLINE_TEMPLATE QList<T> QSet<T>::toList() const return result; } +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) template <typename T> Q_OUTOFLINE_TEMPLATE QSet<T> QList<T>::toSet() const { @@ -400,6 +405,7 @@ QList<T> QList<T>::fromSet(const QSet<T> &set) { return set.toList(); } +#endif Q_DECLARE_SEQUENTIAL_ITERATOR(Set) diff --git a/src/corelib/tools/qset.qdoc b/src/corelib/tools/qset.qdoc index 48863f2399..2e7a5a29ce 100644 --- a/src/corelib/tools/qset.qdoc +++ b/src/corelib/tools/qset.qdoc @@ -113,6 +113,17 @@ compiled in C++11 mode. */ +/*! \fn template <class T> template<typename InputIterator> QSet<T>::QSet(InputIterator first, InputIterator last) + \since 5.14 + + Constructs a set with the contents in the iterator range [\a first, \a last). + + The value type of \c InputIterator must be convertible to \c T. + + \note If the range [\a first, \a last) contains duplicate elements, + the first one is retained. +*/ + /*! \fn template <class T> void QSet<T>::swap(QSet<T> &other) diff --git a/src/corelib/tools/qshareddata.cpp b/src/corelib/tools/qshareddata.cpp index c334f71fa0..2748f9d95f 100644 --- a/src/corelib/tools/qshareddata.cpp +++ b/src/corelib/tools/qshareddata.cpp @@ -321,7 +321,7 @@ QT_BEGIN_NAMESPACE */ /*! \fn template <class T> QSharedDataPointer<T>::QSharedDataPointer() - Constructs a QSharedDataPointer initialized with a null \e{d pointer}. + Constructs a QSharedDataPointer initialized with \nullptr as \e{d pointer}. */ /*! @@ -368,7 +368,7 @@ QT_BEGIN_NAMESPACE */ /*! \fn template <class T> bool QSharedDataPointer<T>::operator!() const - Returns \c true if the \e{d pointer} of \e this is null. + Returns \c true if the \e{d pointer} of \e this is \nullptr. */ /*! \fn template <class T> void QSharedDataPointer<T>::detach() @@ -494,8 +494,8 @@ QT_BEGIN_NAMESPACE */ /*! \fn template <class T> QExplicitlySharedDataPointer<T>::QExplicitlySharedDataPointer() - Constructs a QExplicitlySharedDataPointer initialized with a null - \e{d pointer}. + Constructs a QExplicitlySharedDataPointer initialized with \nullptr + as \e{d pointer}. */ /*! \fn template <class T> QExplicitlySharedDataPointer<T>::~QExplicitlySharedDataPointer() @@ -573,8 +573,8 @@ QT_BEGIN_NAMESPACE */ /*! \fn template <class T> void QExplicitlySharedDataPointer<T>::reset() - Resets \e this to be null. i.e., this function sets the - \e{d pointer} of \e this to 0, but first it decrements + Resets \e this to be null - i.e., this function sets the + \e{d pointer} of \e this to \nullptr, but first it decrements the reference count of the shared data object and deletes the shared data object if the reference count became 0. */ @@ -582,8 +582,8 @@ QT_BEGIN_NAMESPACE /*! \fn template <class T> T *QExplicitlySharedDataPointer<T>::take() \since 5.12 - Returns a pointer to the shared object, and resets \e this to be null. - That is, this function sets the \e{d pointer} of \e this to \c nullptr. + Returns a pointer to the shared object, and resets \e this to be \nullptr. + That is, this function sets the \e{d pointer} of \e this to \nullptr. */ /*! \fn template <class T> QExplicitlySharedDataPointer<T>::operator bool () const @@ -591,7 +591,7 @@ QT_BEGIN_NAMESPACE */ /*! \fn template <class T> bool QExplicitlySharedDataPointer<T>::operator!() const - Returns \c true if the \e{d pointer} of \e this is null. + Returns \c true if the \e{d pointer} of \e this is \nullptr. */ /*! \fn template <class T> void QExplicitlySharedDataPointer<T>::detach() diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index 6930cb96a5..ab54c76720 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -52,17 +52,21 @@ QT_BEGIN_NAMESPACE template <class T> class QSharedDataPointer; -class Q_CORE_EXPORT QSharedData +class +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +Q_CORE_EXPORT +#endif +QSharedData { public: mutable QAtomicInt ref; - inline QSharedData() : ref(0) { } - inline QSharedData(const QSharedData &) : ref(0) { } + inline QSharedData() noexcept : ref(0) { } + inline QSharedData(const QSharedData &) noexcept : ref(0) { } -private: // using the assignment operator would lead to corruption in the ref-counting - QSharedData &operator=(const QSharedData &); + QSharedData &operator=(const QSharedData &) = delete; + ~QSharedData() = default; }; template <class T> class QSharedDataPointer @@ -71,7 +75,7 @@ public: typedef T Type; typedef T *pointer; - inline void detach() { if (d && d->ref.load() != 1) detach_helper(); } + inline void detach() { if (d && d->ref.loadRelaxed() != 1) detach_helper(); } inline T &operator*() { detach(); return *d; } inline const T &operator*() const { return *d; } inline T *operator->() { detach(); return d; } @@ -88,7 +92,7 @@ public: inline QSharedDataPointer() { d = nullptr; } inline ~QSharedDataPointer() { if (d && !d->ref.deref()) delete d; } - explicit QSharedDataPointer(T *data) Q_DECL_NOTHROW; + explicit QSharedDataPointer(T *data) noexcept; inline QSharedDataPointer(const QSharedDataPointer<T> &o) : d(o.d) { if (d) d->ref.ref(); } inline QSharedDataPointer<T> & operator=(const QSharedDataPointer<T> &o) { if (o.d != d) { @@ -112,19 +116,17 @@ public: } return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - QSharedDataPointer(QSharedDataPointer &&o) Q_DECL_NOTHROW : d(o.d) { o.d = nullptr; } - inline QSharedDataPointer<T> &operator=(QSharedDataPointer<T> &&other) Q_DECL_NOTHROW + QSharedDataPointer(QSharedDataPointer &&o) noexcept : d(o.d) { o.d = nullptr; } + inline QSharedDataPointer<T> &operator=(QSharedDataPointer<T> &&other) noexcept { QSharedDataPointer moved(std::move(other)); swap(moved); return *this; } -#endif inline bool operator!() const { return !d; } - inline void swap(QSharedDataPointer &other) Q_DECL_NOTHROW + inline void swap(QSharedDataPointer &other) noexcept { qSwap(d, other.d); } protected: @@ -161,7 +163,7 @@ public: inline const T *constData() const { return d; } inline T *take() { T *x = d; d = nullptr; return x; } - inline void detach() { if (d && d->ref.load() != 1) detach_helper(); } + inline void detach() { if (d && d->ref.loadRelaxed() != 1) detach_helper(); } inline void reset() { @@ -181,7 +183,7 @@ public: inline QExplicitlySharedDataPointer() { d = nullptr; } inline ~QExplicitlySharedDataPointer() { if (d && !d->ref.deref()) delete d; } - explicit QExplicitlySharedDataPointer(T *data) Q_DECL_NOTHROW; + explicit QExplicitlySharedDataPointer(T *data) noexcept; inline QExplicitlySharedDataPointer(const QExplicitlySharedDataPointer<T> &o) : d(o.d) { if (d) d->ref.ref(); } template<class X> @@ -218,19 +220,17 @@ public: } return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - inline QExplicitlySharedDataPointer(QExplicitlySharedDataPointer &&o) Q_DECL_NOTHROW : d(o.d) { o.d = nullptr; } - inline QExplicitlySharedDataPointer<T> &operator=(QExplicitlySharedDataPointer<T> &&other) Q_DECL_NOTHROW + inline QExplicitlySharedDataPointer(QExplicitlySharedDataPointer &&o) noexcept : d(o.d) { o.d = nullptr; } + inline QExplicitlySharedDataPointer<T> &operator=(QExplicitlySharedDataPointer<T> &&other) noexcept { QExplicitlySharedDataPointer moved(std::move(other)); swap(moved); return *this; } -#endif inline bool operator!() const { return !d; } - inline void swap(QExplicitlySharedDataPointer &other) Q_DECL_NOTHROW + inline void swap(QExplicitlySharedDataPointer &other) noexcept { qSwap(d, other.d); } protected: @@ -243,7 +243,7 @@ private: }; template <class T> -Q_INLINE_TEMPLATE QSharedDataPointer<T>::QSharedDataPointer(T *adata) Q_DECL_NOTHROW +Q_INLINE_TEMPLATE QSharedDataPointer<T>::QSharedDataPointer(T *adata) noexcept : d(adata) { if (d) d->ref.ref(); } @@ -280,7 +280,7 @@ Q_OUTOFLINE_TEMPLATE void QExplicitlySharedDataPointer<T>::detach_helper() } template <class T> -Q_INLINE_TEMPLATE QExplicitlySharedDataPointer<T>::QExplicitlySharedDataPointer(T *adata) Q_DECL_NOTHROW +Q_INLINE_TEMPLATE QExplicitlySharedDataPointer<T>::QExplicitlySharedDataPointer(T *adata) noexcept : d(adata) { if (d) d->ref.ref(); } @@ -317,12 +317,12 @@ namespace std { QT_BEGIN_NAMESPACE template <class T> -Q_INLINE_TEMPLATE uint qHash(const QSharedDataPointer<T> &ptr, uint seed = 0) Q_DECL_NOTHROW +Q_INLINE_TEMPLATE uint qHash(const QSharedDataPointer<T> &ptr, uint seed = 0) noexcept { return qHash(ptr.data(), seed); } template <class T> -Q_INLINE_TEMPLATE uint qHash(const QExplicitlySharedDataPointer<T> &ptr, uint seed = 0) Q_DECL_NOTHROW +Q_INLINE_TEMPLATE uint qHash(const QExplicitlySharedDataPointer<T> &ptr, uint seed = 0) noexcept { return qHash(ptr.data(), seed); } diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index b755941b73..f185d2f23f 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -343,12 +343,6 @@ if you obtain a non-null object, you may use the pointer. See QWeakPointer::toStrongRef() for an example. - QWeakPointer also provides the QWeakPointer::data() method that returns - the tracked pointer without ensuring that it remains valid. This function - is provided if you can guarantee by external means that the object will - not get deleted (or if you only need the pointer value) and the cost of - creating a QSharedPointer using toStrongRef() is too high. - \omit \section1 QWeakPointer internals @@ -384,7 +378,7 @@ You can inherit this class when you need to create a QSharedPointer from any instance of a class; for instance, from within the object itself. The key point is that the technique of - just returning QSharedPointer<T>(this) can not be used, because + just returning QSharedPointer<T>(this) cannot be used, because this winds up creating multiple distinct QSharedPointer objects with separate reference counts. For this reason you must never create more than one QSharedPointer from the same raw pointer. @@ -406,7 +400,8 @@ /*! \fn template <class T> QSharedPointer<T>::QSharedPointer() - Creates a QSharedPointer that points to null (0). + Creates a QSharedPointer that is null (the object is holding + a reference to \nullptr). */ /*! @@ -552,6 +547,7 @@ Provides access to the shared pointer's members. + If the contained pointer is \nullptr, behavior is undefined. \sa isNull() */ @@ -560,21 +556,21 @@ Provides access to the shared pointer's members. + If the contained pointer is \nullptr, behavior is undefined. \sa isNull() */ /*! \fn template <class T> bool QSharedPointer<T>::isNull() const - Returns \c true if this object is holding a reference to a null - pointer. + Returns \c true if this object refers to \nullptr. */ /*! \fn template <class T> QSharedPointer<T>::operator bool() const - Returns \c true if this object is not null. This function is suitable - for use in \tt if-constructs, like: + Returns \c true if the contained pointer is not \nullptr. + This function is suitable for use in \tt if-constructs, like: \snippet code/src_corelib_tools_qsharedpointer.cpp 4 @@ -584,8 +580,8 @@ /*! \fn template <class T> bool QSharedPointer<T>::operator !() const - Returns \c true if this object is null. This function is suitable - for use in \tt if-constructs, like: + Returns \c true if this object refers to \nullptr. + This function is suitable for use in \tt if-constructs, like: \snippet code/src_corelib_tools_qsharedpointer.cpp 5 @@ -808,11 +804,10 @@ /*! \fn template <class T> bool QWeakPointer<T>::isNull() const - Returns \c true if this object is holding a reference to a null - pointer. + Returns \c true if this object refers to \nullptr. Note that, due to the nature of weak references, the pointer that - QWeakPointer references can become null at any moment, so + QWeakPointer references can become \nullptr at any moment, so the value returned from this function can change from false to true from one call to the next. */ @@ -820,13 +815,13 @@ /*! \fn template <class T> QWeakPointer<T>::operator bool() const - Returns \c true if this object is not null. This function is suitable - for use in \tt if-constructs, like: + Returns \c true if the contained pointer is not \nullptr. + This function is suitable for use in \tt if-constructs, like: \snippet code/src_corelib_tools_qsharedpointer.cpp 8 Note that, due to the nature of weak references, the pointer that - QWeakPointer references can become null at any moment, so + QWeakPointer references can become \nullptr at any moment, so the value returned from this function can change from true to false from one call to the next. @@ -836,13 +831,13 @@ /*! \fn template <class T> bool QWeakPointer<T>::operator !() const - Returns \c true if this object is null. This function is suitable - for use in \tt if-constructs, like: + Returns \c true if this object refers to \nullptr. + This function is suitable for use in \tt if-constructs, like: \snippet code/src_corelib_tools_qsharedpointer.cpp 9 Note that, due to the nature of weak references, the pointer that - QWeakPointer references can become null at any moment, so + QWeakPointer references can become \nullptr at any moment, so the value returned from this function can change from false to true from one call to the next. @@ -852,6 +847,7 @@ /*! \fn template <class T> T *QWeakPointer<T>::data() const \since 4.6 + \obsolete Use toStrongRef() instead, and data() on the returned QSharedPointer. Returns the value of the pointer being tracked by this QWeakPointer, \b without ensuring that it cannot get deleted. To have that guarantee, @@ -923,7 +919,7 @@ If \c this (that is, the subclass instance invoking this method) is being managed by a QSharedPointer, returns a shared pointer instance pointing to - \c this; otherwise returns a QSharedPointer holding a null pointer. + \c this; otherwise returns a null QSharedPointer. */ /*! @@ -938,8 +934,7 @@ \fn template <class T> template <class X> bool operator==(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) \relates QSharedPointer - Returns \c true if the pointer referenced by \a ptr1 is the - same pointer as that referenced by \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to the same pointer. If \a ptr2's template parameter is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -952,8 +947,7 @@ \fn template <class T> template <class X> bool operator!=(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) \relates QSharedPointer - Returns \c true if the pointer referenced by \a ptr1 is not the - same pointer as that referenced by \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to distinct pointers. If \a ptr2's template parameter is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -966,8 +960,7 @@ \fn template <class T> template <class X> bool operator==(const QSharedPointer<T> &ptr1, const X *ptr2) \relates QSharedPointer - Returns \c true if the pointer referenced by \a ptr1 is the - same pointer as \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to the same pointer. If \a ptr2's type is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -980,8 +973,7 @@ \fn template <class T> template <class X> bool operator!=(const QSharedPointer<T> &ptr1, const X *ptr2) \relates QSharedPointer - Returns \c true if the pointer referenced by \a ptr1 is not the - same pointer as \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to distinct pointers. If \a ptr2's type is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -1022,8 +1014,7 @@ \fn template <class T> template <class X> bool operator==(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) \relates QWeakPointer - Returns \c true if the pointer referenced by \a ptr1 is the - same pointer as that referenced by \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to the same pointer. If \a ptr2's template parameter is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -1036,8 +1027,7 @@ \fn template <class T> template <class X> bool operator!=(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) \relates QWeakPointer - Returns \c true if the pointer referenced by \a ptr1 is not the - same pointer as that referenced by \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to distinct pointers. If \a ptr2's template parameter is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -1050,8 +1040,7 @@ \fn template <class T> template <class X> bool operator==(const QWeakPointer<T> &ptr1, const QSharedPointer<X> &ptr2) \relates QWeakPointer - Returns \c true if the pointer referenced by \a ptr1 is the - same pointer as that referenced by \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to the same pointer. If \a ptr2's template parameter is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -1065,7 +1054,7 @@ \relates QSharedPointer \since 5.8 - Returns \c true if the pointer referenced by \a lhs is a null pointer. + Returns \c true if \a lhs refers to \nullptr. \sa QSharedPointer::isNull() */ @@ -1075,7 +1064,7 @@ \relates QSharedPointer \since 5.8 - Returns \c true if the pointer referenced by \a rhs is a null pointer. + Returns \c true if \a rhs refers to \nullptr. \sa QSharedPointer::isNull() */ @@ -1085,8 +1074,7 @@ \relates QSharedPointer \since 5.8 - Returns \c true if the pointer referenced by \a lhs is a valid (i.e. - non-null) pointer. + Returns \c true if \a lhs refers to a valid (i.e. non-null) pointer. \sa QSharedPointer::isNull() */ @@ -1096,8 +1084,7 @@ \relates QSharedPointer \since 5.8 - Returns \c true if the pointer referenced by \a rhs is a valid (i.e. - non-null) pointer. + Returns \c true if \a rhs refers to a valid (i.e. non-null) pointer. \sa QSharedPointer::isNull() */ @@ -1107,7 +1094,7 @@ \relates QWeakPointer \since 5.8 - Returns \c true if the pointer referenced by \a lhs is a null pointer. + Returns \c true if \a lhs refers to \nullptr. \sa QWeakPointer::isNull() */ @@ -1117,7 +1104,7 @@ \relates QWeakPointer \since 5.8 - Returns \c true if the pointer referenced by \a rhs is a null pointer. + Returns \c true if \a rhs refers to \nullptr. \sa QWeakPointer::isNull() */ @@ -1127,8 +1114,7 @@ \relates QWeakPointer \since 5.8 - Returns \c true if the pointer referenced by \a lhs is a valid (i.e. - non-null) pointer. + Returns \c true if \a lhs refers to a valid (i.e. non-null) pointer. \sa QWeakPointer::isNull() */ @@ -1138,8 +1124,7 @@ \relates QWeakPointer \since 5.8 - Returns \c true if the pointer referenced by \a rhs is a valid (i.e. - non-null) pointer. + Returns \c true if \a rhs refers to a valid (i.e. non-null) pointer. \sa QWeakPointer::isNull() */ @@ -1148,8 +1133,7 @@ \fn template <class T> template <class X> bool operator!=(const QWeakPointer<T> &ptr1, const QSharedPointer<X> &ptr2) \relates QWeakPointer - Returns \c true if the pointer referenced by \a ptr1 is not the - same pointer as that referenced by \a ptr2. + Returns \c true if \a ptr1 and \a ptr2 refer to distinct pointers. If \a ptr2's template parameter is different from \a ptr1's, QSharedPointer will attempt to perform an automatic \tt static_cast @@ -1282,6 +1266,57 @@ */ /*! + \fn template <class X, class T> std::shared_ptr<X> qSharedPointerObjectCast(const std::shared_ptr<T> &src) + \relates QSharedPointer + \since 5.14 + + Returns a shared pointer to the pointer held by \a src, using a + \l qobject_cast() to type \tt X to obtain an internal pointer of the + appropriate type. If the \tt qobject_cast fails, the object + returned will be null. + + Note that \tt X must have the same cv-qualifiers (\tt const and + \tt volatile) that \tt T has, or the code will fail to + compile. Use const_pointer_cast to cast away the constness. +*/ + +/*! + \fn template <class X, class T> std::shared_ptr<X> qobject_pointer_cast(const std::shared_ptr<T> &src) + \relates QSharedPointer + \since 5.14 + + Same as qSharedPointerObjectCast(). This function is provided for STL + compatibility. +*/ + +/*! + \fn template <class X, class T> std::shared_ptr<X> qSharedPointerObjectCast(std::shared_ptr<T> &&src) + \relates QSharedPointer + \since 5.14 + + Returns a shared pointer to the pointer held by \a src, using a + \l qobject_cast() to type \tt X to obtain an internal pointer of the + appropriate type. + + If the \tt qobject_cast succeeds, the function will return a valid shared + pointer, and \a src is reset to null. If the \tt qobject_cast fails, the + object returned will be null, and \a src will not be modified. + + Note that \tt X must have the same cv-qualifiers (\tt const and + \tt volatile) that \tt T has, or the code will fail to + compile. Use const_pointer_cast to cast away the constness. +*/ + +/*! + \fn template <class X, class T> std::shared_ptr<X> qobject_pointer_cast(std::shared_ptr<T> &&src) + \relates QSharedPointer + \since 5.14 + + Same as qSharedPointerObjectCast(). This function is provided for STL + compatibility. +*/ + +/*! \fn template <class X> template <class T> QSharedPointer<X> qSharedPointerObjectCast(const QWeakPointer<T> &src) \relates QSharedPointer \relates QWeakPointer @@ -1345,7 +1380,7 @@ void QtSharedPointer::ExternalRefCountData::setQObjectShared(const QObject *, bo */ void QtSharedPointer::ExternalRefCountData::checkQObjectShared(const QObject *) { - if (strongref.load() < 0) + if (strongref.loadRelaxed() < 0) qWarning("QSharedPointer: cannot create a QSharedPointer from a QObject-tracking QWeakPointer"); } @@ -1355,7 +1390,7 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge QObjectPrivate *d = QObjectPrivate::get(const_cast<QObject *>(obj)); Q_ASSERT_X(!d->wasDeleted, "QWeakPointer", "Detected QWeakPointer creation in a QObject being deleted"); - ExternalRefCountData *that = d->sharedRefcount.load(); + ExternalRefCountData *that = d->sharedRefcount.loadRelaxed(); if (that) { that->weakref.ref(); return that; @@ -1363,8 +1398,8 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge // we can create the refcount data because it doesn't exist ExternalRefCountData *x = new ExternalRefCountData(Qt::Uninitialized); - x->strongref.store(-1); - x->weakref.store(2); // the QWeakPointer that called us plus the QObject itself + x->strongref.storeRelaxed(-1); + x->weakref.storeRelaxed(2); // the QWeakPointer that called us plus the QObject itself ExternalRefCountData *ret; if (d->sharedRefcount.testAndSetOrdered(nullptr, x, ret)) { // ought to be release+acquire; this is acq_rel+acquire @@ -1372,7 +1407,7 @@ QtSharedPointer::ExternalRefCountData *QtSharedPointer::ExternalRefCountData::ge } else { // ~ExternalRefCountData has a Q_ASSERT, so we use this trick to // only execute this if Q_ASSERTs are enabled - Q_ASSERT((x->weakref.store(0), true)); + Q_ASSERT((x->weakref.storeRelaxed(0), true)); delete x; ret->weakref.ref(); } diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h index a2c5f990fc..5d47369687 100644 --- a/src/corelib/tools/qsharedpointer.h +++ b/src/corelib/tools/qsharedpointer.h @@ -48,6 +48,8 @@ # include <QtCore/qsharedpointer_impl.h> #else +#include <memory> // for std::shared_ptr + QT_BEGIN_NAMESPACE @@ -167,6 +169,10 @@ template <class X, class T> QSharedPointer<X> qSharedPointerConstCast(const QSha template <class X, class T> QSharedPointer<X> qSharedPointerConstCast(const QWeakPointer<T> &src); template <class X, class T> QSharedPointer<X> qSharedPointerObjectCast(const QSharedPointer<T> &src); template <class X, class T> QSharedPointer<X> qSharedPointerObjectCast(const QWeakPointer<T> &src); +template <typename X, class T> std::shared_ptr<X> qobject_pointer_cast(const std::shared_ptr<T> &src); +template <typename X, class T> std::shared_ptr<X> qobject_pointer_cast(std::shared_ptr<T> &&src); +template <typename X, class T> std::shared_ptr<X> qSharedPointerObjectCast(const std::shared_ptr<T> &src); +template <typename X, class T> std::shared_ptr<X> qSharedPointerObjectCast(std::shared_ptr<T> &&src); template <class X, class T> QWeakPointer<X> qWeakPointerCast(const QWeakPointer<T> &src); diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index bccf8c5740..198cc58c38 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -67,6 +67,8 @@ QT_END_NAMESPACE #endif #include <QtCore/qhashfunctions.h> +#include <memory> + QT_BEGIN_NAMESPACE @@ -105,6 +107,10 @@ template <class X, class T> QSharedPointer<X> qSharedPointerObjectCast(const QSharedPointer<T> &ptr); #endif +namespace QtPrivate { +struct EnableInternalData; +} + namespace QtSharedPointer { template <class T> class ExternalRefCount; @@ -148,11 +154,11 @@ namespace QtSharedPointer { inline ExternalRefCountData(DestroyerFn d) : destroyer(d) { - strongref.store(1); - weakref.store(1); + strongref.storeRelaxed(1); + weakref.storeRelaxed(1); } inline ExternalRefCountData(Qt::Initialization) { } - ~ExternalRefCountData() { Q_ASSERT(!weakref.load()); Q_ASSERT(strongref.load() <= 0); } + ~ExternalRefCountData() { Q_ASSERT(!weakref.loadRelaxed()); Q_ASSERT(strongref.loadRelaxed() <= 0); } void destroy() { destroyer(this); } @@ -233,8 +239,8 @@ namespace QtSharedPointer { } private: // prevent construction - ExternalRefCountWithCustomDeleter() Q_DECL_EQ_DELETE; - ~ExternalRefCountWithCustomDeleter() Q_DECL_EQ_DELETE; + ExternalRefCountWithCustomDeleter() = delete; + ~ExternalRefCountWithCustomDeleter() = delete; Q_DISABLE_COPY(ExternalRefCountWithCustomDeleter) }; @@ -278,8 +284,8 @@ namespace QtSharedPointer { private: // prevent construction - ExternalRefCountWithContiguousData() Q_DECL_EQ_DELETE; - ~ExternalRefCountWithContiguousData() Q_DECL_EQ_DELETE; + ExternalRefCountWithContiguousData() = delete; + ~ExternalRefCountWithContiguousData() = delete; Q_DISABLE_COPY(ExternalRefCountWithContiguousData) }; @@ -303,18 +309,18 @@ public: typedef const value_type &const_reference; typedef qptrdiff difference_type; - T *data() const Q_DECL_NOTHROW { return value; } - T *get() const Q_DECL_NOTHROW { return value; } - bool isNull() const Q_DECL_NOTHROW { return !data(); } - operator RestrictedBool() const Q_DECL_NOTHROW { return isNull() ? nullptr : &QSharedPointer::value; } - bool operator !() const Q_DECL_NOTHROW { return isNull(); } + T *data() const noexcept { return value; } + T *get() const noexcept { return value; } + bool isNull() const noexcept { return !data(); } + operator RestrictedBool() const noexcept { return isNull() ? nullptr : &QSharedPointer::value; } + bool operator !() const noexcept { return isNull(); } T &operator*() const { return *data(); } - T *operator->() const Q_DECL_NOTHROW { return data(); } + T *operator->() const noexcept { return data(); } - Q_DECL_CONSTEXPR QSharedPointer() Q_DECL_NOTHROW : value(nullptr), d(nullptr) { } + Q_DECL_CONSTEXPR QSharedPointer() noexcept : value(nullptr), d(nullptr) { } ~QSharedPointer() { deref(); } - Q_DECL_CONSTEXPR QSharedPointer(std::nullptr_t) Q_DECL_NOTHROW : value(nullptr), d(nullptr) { } + Q_DECL_CONSTEXPR QSharedPointer(std::nullptr_t) noexcept : value(nullptr), d(nullptr) { } template <class X> inline explicit QSharedPointer(X *ptr) : value(ptr) // noexcept @@ -327,22 +333,21 @@ public: template <typename Deleter> QSharedPointer(std::nullptr_t, Deleter) : value(nullptr), d(nullptr) { } - QSharedPointer(const QSharedPointer &other) Q_DECL_NOTHROW : value(other.value), d(other.d) + QSharedPointer(const QSharedPointer &other) noexcept : value(other.value), d(other.d) { if (d) ref(); } - QSharedPointer &operator=(const QSharedPointer &other) Q_DECL_NOTHROW + QSharedPointer &operator=(const QSharedPointer &other) noexcept { QSharedPointer copy(other); swap(copy); return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - QSharedPointer(QSharedPointer &&other) Q_DECL_NOTHROW + QSharedPointer(QSharedPointer &&other) noexcept : value(other.value), d(other.d) { other.d = nullptr; other.value = nullptr; } - QSharedPointer &operator=(QSharedPointer &&other) Q_DECL_NOTHROW + QSharedPointer &operator=(QSharedPointer &&other) noexcept { QSharedPointer moved(std::move(other)); swap(moved); @@ -350,7 +355,7 @@ public: } template <class X> - QSharedPointer(QSharedPointer<X> &&other) Q_DECL_NOTHROW + QSharedPointer(QSharedPointer<X> &&other) noexcept : value(other.value), d(other.d) { other.d = nullptr; @@ -358,17 +363,15 @@ public: } template <class X> - QSharedPointer &operator=(QSharedPointer<X> &&other) Q_DECL_NOTHROW + QSharedPointer &operator=(QSharedPointer<X> &&other) noexcept { QSharedPointer moved(std::move(other)); swap(moved); return *this; } -#endif - template <class X> - QSharedPointer(const QSharedPointer<X> &other) Q_DECL_NOTHROW : value(other.value), d(other.d) + QSharedPointer(const QSharedPointer<X> &other) noexcept : value(other.value), d(other.d) { if (d) ref(); } template <class X> @@ -387,7 +390,7 @@ public: inline QSharedPointer<T> &operator=(const QWeakPointer<X> &other) { internalSet(other.d, other.value); return *this; } - inline void swap(QSharedPointer &other) + inline void swap(QSharedPointer &other) noexcept { this->internalSwap(other); } inline void reset() { clear(); } @@ -456,9 +459,9 @@ public: private: explicit QSharedPointer(Qt::Initialization) {} - void deref() Q_DECL_NOTHROW + void deref() noexcept { deref(d); } - static void deref(Data *dd) Q_DECL_NOTHROW + static void deref(Data *dd) noexcept { if (!dd) return; if (!dd->strongref.deref()) { @@ -499,7 +502,7 @@ private: enableSharedFromThis(ptr); } - void internalSwap(QSharedPointer &other) Q_DECL_NOTHROW + void internalSwap(QSharedPointer &other) noexcept { qSwap(d, other.d); qSwap(this->value, other.value); @@ -512,19 +515,19 @@ public: template <class X> friend class QWeakPointer; template <class X, class Y> friend QSharedPointer<X> QtSharedPointer::copyAndSetPointer(X * ptr, const QSharedPointer<Y> &src); #endif - void ref() const Q_DECL_NOTHROW { d->weakref.ref(); d->strongref.ref(); } + void ref() const noexcept { d->weakref.ref(); d->strongref.ref(); } inline void internalSet(Data *o, T *actual) { if (o) { // increase the strongref, but never up from zero // or less (-1 is used by QWeakPointer on untracked QObject) - int tmp = o->strongref.load(); + int tmp = o->strongref.loadRelaxed(); while (tmp > 0) { // try to increment from "tmp" to "tmp + 1" if (o->strongref.testAndSetRelaxed(tmp, tmp + 1)) break; // succeeded - tmp = o->strongref.load(); // failed, try again + tmp = o->strongref.loadRelaxed(); // failed, try again } if (tmp > 0) { @@ -537,7 +540,7 @@ public: qSwap(d, o); qSwap(this->value, actual); - if (!d || d->strongref.load() == 0) + if (!d || d->strongref.loadRelaxed() == 0) this->value = nullptr; // dereference saved data @@ -563,12 +566,16 @@ public: typedef const value_type &const_reference; typedef qptrdiff difference_type; - bool isNull() const Q_DECL_NOTHROW { return d == nullptr || d->strongref.load() == 0 || value == nullptr; } - operator RestrictedBool() const Q_DECL_NOTHROW { return isNull() ? nullptr : &QWeakPointer::value; } - bool operator !() const Q_DECL_NOTHROW { return isNull(); } - T *data() const Q_DECL_NOTHROW { return d == nullptr || d->strongref.load() == 0 ? nullptr : value; } + bool isNull() const noexcept { return d == nullptr || d->strongref.loadRelaxed() == 0 || value == nullptr; } + operator RestrictedBool() const noexcept { return isNull() ? nullptr : &QWeakPointer::value; } + bool operator !() const noexcept { return isNull(); } - inline QWeakPointer() Q_DECL_NOTHROW : d(nullptr), value(nullptr) { } +#if QT_DEPRECATED_SINCE(5, 14) + QT_DEPRECATED_X("Use toStrongRef() instead, and data() on the returned QSharedPointer") + T *data() const noexcept { return internalData(); } +#endif + + inline QWeakPointer() noexcept : d(nullptr), value(nullptr) { } inline ~QWeakPointer() { if (d && !d->weakref.deref()) delete d; } #ifndef QT_NO_QOBJECT @@ -586,26 +593,24 @@ public: { return *this = QWeakPointer(ptr); } #endif - QWeakPointer(const QWeakPointer &other) Q_DECL_NOTHROW : d(other.d), value(other.value) + QWeakPointer(const QWeakPointer &other) noexcept : d(other.d), value(other.value) { if (d) d->weakref.ref(); } -#ifdef Q_COMPILER_RVALUE_REFS - QWeakPointer(QWeakPointer &&other) Q_DECL_NOTHROW + QWeakPointer(QWeakPointer &&other) noexcept : d(other.d), value(other.value) { other.d = nullptr; other.value = nullptr; } - QWeakPointer &operator=(QWeakPointer &&other) Q_DECL_NOTHROW + QWeakPointer &operator=(QWeakPointer &&other) noexcept { QWeakPointer moved(std::move(other)); swap(moved); return *this; } -#endif - QWeakPointer &operator=(const QWeakPointer &other) Q_DECL_NOTHROW + QWeakPointer &operator=(const QWeakPointer &other) noexcept { QWeakPointer copy(other); swap(copy); return *this; } - void swap(QWeakPointer &other) Q_DECL_NOTHROW + void swap(QWeakPointer &other) noexcept { qSwap(this->d, other.d); qSwap(this->value, other.value); @@ -633,11 +638,11 @@ public: } template <class X> - bool operator==(const QWeakPointer<X> &o) const Q_DECL_NOTHROW + bool operator==(const QWeakPointer<X> &o) const noexcept { return d == o.d && value == static_cast<const T *>(o.value); } template <class X> - bool operator!=(const QWeakPointer<X> &o) const Q_DECL_NOTHROW + bool operator!=(const QWeakPointer<X> &o) const noexcept { return !(*this == o); } template <class X> @@ -653,11 +658,11 @@ public: } template <class X> - bool operator==(const QSharedPointer<X> &o) const Q_DECL_NOTHROW + bool operator==(const QSharedPointer<X> &o) const noexcept { return d == o.d; } template <class X> - bool operator!=(const QSharedPointer<X> &o) const Q_DECL_NOTHROW + bool operator!=(const QSharedPointer<X> &o) const noexcept { return !(*this == o); } inline void clear() { *this = QWeakPointer(); } @@ -671,7 +676,7 @@ public: #endif private: - + friend struct QtPrivate::EnableInternalData; #if defined(Q_NO_TEMPLATE_FRIENDS) public: #else @@ -700,19 +705,33 @@ public: value = actual; } + // ### Qt 6: remove users of this API; no one should ever access + // a weak pointer's data but the weak pointer itself + inline T *internalData() const noexcept + { + return d == nullptr || d->strongref.loadRelaxed() == 0 ? nullptr : value; + } + Data *d; T *value; }; +namespace QtPrivate { +struct EnableInternalData { + template <typename T> + static T *internalData(const QWeakPointer<T> &p) noexcept { return p.internalData(); } +}; +// hack to delay name lookup to instantiation time by making +// EnableInternalData a dependent name: +template <typename T> +struct EnableInternalDataWrap : EnableInternalData {}; +} + template <class T> class QEnableSharedFromThis { protected: -#ifdef Q_COMPILER_DEFAULT_MEMBERS QEnableSharedFromThis() = default; -#else - Q_DECL_CONSTEXPR QEnableSharedFromThis() {} -#endif QEnableSharedFromThis(const QEnableSharedFromThis &) {} QEnableSharedFromThis &operator=(const QEnableSharedFromThis &) { return *this; } @@ -739,92 +758,92 @@ public: // operator== and operator!= // template <class T, class X> -bool operator==(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW +bool operator==(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) noexcept { return ptr1.data() == ptr2.data(); } template <class T, class X> -bool operator!=(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW +bool operator!=(const QSharedPointer<T> &ptr1, const QSharedPointer<X> &ptr2) noexcept { return ptr1.data() != ptr2.data(); } template <class T, class X> -bool operator==(const QSharedPointer<T> &ptr1, const X *ptr2) Q_DECL_NOTHROW +bool operator==(const QSharedPointer<T> &ptr1, const X *ptr2) noexcept { return ptr1.data() == ptr2; } template <class T, class X> -bool operator==(const T *ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW +bool operator==(const T *ptr1, const QSharedPointer<X> &ptr2) noexcept { return ptr1 == ptr2.data(); } template <class T, class X> -bool operator!=(const QSharedPointer<T> &ptr1, const X *ptr2) Q_DECL_NOTHROW +bool operator!=(const QSharedPointer<T> &ptr1, const X *ptr2) noexcept { return !(ptr1 == ptr2); } template <class T, class X> -bool operator!=(const T *ptr1, const QSharedPointer<X> &ptr2) Q_DECL_NOTHROW +bool operator!=(const T *ptr1, const QSharedPointer<X> &ptr2) noexcept { return !(ptr2 == ptr1); } template <class T, class X> -bool operator==(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) Q_DECL_NOTHROW +bool operator==(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) noexcept { return ptr2 == ptr1; } template <class T, class X> -bool operator!=(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) Q_DECL_NOTHROW +bool operator!=(const QSharedPointer<T> &ptr1, const QWeakPointer<X> &ptr2) noexcept { return ptr2 != ptr1; } template<class T> -inline bool operator==(const QSharedPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW +inline bool operator==(const QSharedPointer<T> &lhs, std::nullptr_t) noexcept { return lhs.isNull(); } template<class T> -inline bool operator!=(const QSharedPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW +inline bool operator!=(const QSharedPointer<T> &lhs, std::nullptr_t) noexcept { return !lhs.isNull(); } template<class T> -inline bool operator==(std::nullptr_t, const QSharedPointer<T> &rhs) Q_DECL_NOTHROW +inline bool operator==(std::nullptr_t, const QSharedPointer<T> &rhs) noexcept { return rhs.isNull(); } template<class T> -inline bool operator!=(std::nullptr_t, const QSharedPointer<T> &rhs) Q_DECL_NOTHROW +inline bool operator!=(std::nullptr_t, const QSharedPointer<T> &rhs) noexcept { return !rhs.isNull(); } template<class T> -inline bool operator==(const QWeakPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW +inline bool operator==(const QWeakPointer<T> &lhs, std::nullptr_t) noexcept { return lhs.isNull(); } template<class T> -inline bool operator!=(const QWeakPointer<T> &lhs, std::nullptr_t) Q_DECL_NOTHROW +inline bool operator!=(const QWeakPointer<T> &lhs, std::nullptr_t) noexcept { return !lhs.isNull(); } template<class T> -inline bool operator==(std::nullptr_t, const QWeakPointer<T> &rhs) Q_DECL_NOTHROW +inline bool operator==(std::nullptr_t, const QWeakPointer<T> &rhs) noexcept { return rhs.isNull(); } template<class T> -inline bool operator!=(std::nullptr_t, const QWeakPointer<T> &rhs) Q_DECL_NOTHROW +inline bool operator!=(std::nullptr_t, const QWeakPointer<T> &rhs) noexcept { return !rhs.isNull(); } @@ -887,18 +906,12 @@ Q_INLINE_TEMPLATE QWeakPointer<T> QSharedPointer<T>::toWeakRef() const } template <class T> -inline void qSwap(QSharedPointer<T> &p1, QSharedPointer<T> &p2) -{ - p1.swap(p2); -} +inline void swap(QSharedPointer<T> &p1, QSharedPointer<T> &p2) noexcept +{ p1.swap(p2); } -QT_END_NAMESPACE -namespace std { - template <class T> - inline void swap(QT_PREPEND_NAMESPACE(QSharedPointer)<T> &p1, QT_PREPEND_NAMESPACE(QSharedPointer)<T> &p2) - { p1.swap(p2); } -} -QT_BEGIN_NAMESPACE +template <class T> +inline void swap(QWeakPointer<T> &p1, QWeakPointer<T> &p2) noexcept +{ p1.swap(p2); } namespace QtSharedPointer { // helper functions: @@ -983,11 +996,13 @@ qobject_cast(const QWeakPointer<T> &src) return qSharedPointerObjectCast<typename QtSharedPointer::RemovePointer<X>::Type, T>(src); } +/// ### Qt 6: make this use toStrongRef() (once support for storing +/// non-managed QObjects in QWeakPointer is removed) template<typename T> QWeakPointer<typename std::enable_if<QtPrivate::IsPointerToTypeDerivedFromQObject<T*>::Value, T>::type> qWeakPointerFromVariant(const QVariant &variant) { - return QWeakPointer<T>(qobject_cast<T*>(QtSharedPointer::weakPointerFromVariant_internal(variant).data())); + return QWeakPointer<T>(qobject_cast<T*>(QtPrivate::EnableInternalData::internalData(QtSharedPointer::weakPointerFromVariant_internal(variant)))); } template<typename T> QSharedPointer<typename std::enable_if<QtPrivate::IsPointerToTypeDerivedFromQObject<T*>::Value, T>::type> @@ -996,6 +1011,46 @@ qSharedPointerFromVariant(const QVariant &variant) return qSharedPointerObjectCast<T>(QtSharedPointer::sharedPointerFromVariant_internal(variant)); } +// std::shared_ptr helpers + +template <typename X, class T> +std::shared_ptr<X> qobject_pointer_cast(const std::shared_ptr<T> &src) +{ + using element_type = typename std::shared_ptr<X>::element_type; + return std::shared_ptr<X>(src, qobject_cast<element_type *>(src.get())); +} + +template <typename X, class T> +std::shared_ptr<X> qobject_pointer_cast(std::shared_ptr<T> &&src) +{ + using element_type = typename std::shared_ptr<X>::element_type; + auto castResult = qobject_cast<element_type *>(src.get()); + if (castResult) { + auto result = std::shared_ptr<X>(std::move(src), castResult); +#if __cplusplus <= 201703L + // C++2a's move aliasing constructor will leave src empty. + // Before C++2a we don't really know if the compiler has support for it. + // The move aliasing constructor is the resolution for LWG2996, + // which does not impose a feature-testing macro. So: clear src. + src.reset(); +#endif + return result; + } + return std::shared_ptr<X>(); +} + +template <typename X, class T> +std::shared_ptr<X> qSharedPointerObjectCast(const std::shared_ptr<T> &src) +{ + return qobject_pointer_cast<X>(src); +} + +template <typename X, class T> +std::shared_ptr<X> qSharedPointerObjectCast(std::shared_ptr<T> &&src) +{ + return qobject_pointer_cast<X>(std::move(src)); +} + #endif template<typename T> Q_DECLARE_TYPEINFO_BODY(QWeakPointer<T>, Q_MOVABLE_TYPE); diff --git a/src/corelib/tools/qsimd.cpp b/src/corelib/tools/qsimd.cpp index e44307f28d..ecf1822e42 100644 --- a/src/corelib/tools/qsimd.cpp +++ b/src/corelib/tools/qsimd.cpp @@ -533,7 +533,7 @@ Q_CORE_EXPORT QBasicAtomicInteger<quint64> qt_cpu_features[1] = { Q_BASIC_ATOMIC Q_CORE_EXPORT QBasicAtomicInteger<unsigned> qt_cpu_features[2] = { Q_BASIC_ATOMIC_INITIALIZER(0), Q_BASIC_ATOMIC_INITIALIZER(0) }; #endif -void qDetectCpuFeatures() +quint64 qDetectCpuFeatures() { quint64 f = detectProcessorFeatures(); QByteArray disable = qgetenv("QT_NO_CPU_FEATURE"); @@ -563,10 +563,11 @@ void qDetectCpuFeatures() features_string + features_indices[qCountTrailingZeroBits(missing)]); } - qt_cpu_features[0].store(f | quint32(QSimdInitialized)); + qt_cpu_features[0].storeRelaxed(f | quint32(QSimdInitialized)); #ifndef Q_ATOMIC_INT64_IS_SUPPORTED - qt_cpu_features[1].store(f >> 32); + qt_cpu_features[1].storeRelaxed(f >> 32); #endif + return f; } void qDumpCPUFeatures() diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 9f1321df94..db2f546651 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -344,20 +344,16 @@ extern Q_CORE_EXPORT QBasicAtomicInteger<quint64> qt_cpu_features[1]; #else extern Q_CORE_EXPORT QBasicAtomicInteger<unsigned> qt_cpu_features[2]; #endif -Q_CORE_EXPORT void qDetectCpuFeatures(); +Q_CORE_EXPORT quint64 qDetectCpuFeatures(); static inline quint64 qCpuFeatures() { - quint64 features = qt_cpu_features[0].load(); + quint64 features = qt_cpu_features[0].loadRelaxed(); #ifndef Q_ATOMIC_INT64_IS_SUPPORTED - features |= quint64(qt_cpu_features[1].load()) << 32; + features |= quint64(qt_cpu_features[1].loadRelaxed()) << 32; #endif if (Q_UNLIKELY(features == 0)) { - qDetectCpuFeatures(); - features = qt_cpu_features[0].load(); -#ifndef Q_ATOMIC_INT64_IS_SUPPORTED - features |= quint64(qt_cpu_features[1].load()) << 32; -#endif + features = qDetectCpuFeatures(); Q_ASSUME(features != 0); } return features; diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp index 3e97947ad2..fe508ad459 100644 --- a/src/corelib/tools/qsize.cpp +++ b/src/corelib/tools/qsize.cpp @@ -163,7 +163,7 @@ QT_BEGIN_NAMESPACE \sa setWidth(), setHeight(), transposed() */ -void QSize::transpose() Q_DECL_NOTHROW +void QSize::transpose() noexcept { qSwap(wd, ht); } @@ -222,7 +222,7 @@ void QSize::transpose() Q_DECL_NOTHROW Return a size scaled to a rectangle with the given size \a s, according to the specified \a mode. */ -QSize QSize::scaled(const QSize &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW +QSize QSize::scaled(const QSize &s, Qt::AspectRatioMode mode) const noexcept { if (mode == Qt::IgnoreAspectRatio || wd == 0 || ht == 0) { return s; @@ -594,7 +594,7 @@ QDebug operator<<(QDebug dbg, const QSize &s) \sa setWidth(), setHeight(), transposed() */ -void QSizeF::transpose() Q_DECL_NOTHROW +void QSizeF::transpose() noexcept { qSwap(wd, ht); } @@ -653,7 +653,7 @@ void QSizeF::transpose() Q_DECL_NOTHROW Returns a size scaled to a rectangle with the given size \a s, according to the specified \a mode. */ -QSizeF QSizeF::scaled(const QSizeF &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW +QSizeF QSizeF::scaled(const QSizeF &s, Qt::AspectRatioMode mode) const noexcept { if (mode == Qt::IgnoreAspectRatio || qIsNull(wd) || qIsNull(ht)) { return s; diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h index bb29dca7c4..4114609856 100644 --- a/src/corelib/tools/qsize.h +++ b/src/corelib/tools/qsize.h @@ -52,46 +52,46 @@ QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QSize { public: - Q_DECL_CONSTEXPR QSize() Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QSize(int w, int h) Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline bool isNull() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline int width() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline int height() const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) Q_DECL_NOTHROW; - void transpose() Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize transposed() const Q_DECL_NOTHROW; - - inline void scale(int w, int h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW; - inline void scale(const QSize &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QSize scaled(int w, int h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QSize scaled(const QSize &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW; - - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize expandedTo(const QSize &) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize boundedTo(const QSize &) const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline int &rwidth() Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline int &rheight() Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline QSize &operator+=(const QSize &) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QSize &operator-=(const QSize &) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QSize &operator*=(qreal c) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QSize() noexcept; + Q_DECL_CONSTEXPR QSize(int w, int h) noexcept; + + Q_DECL_CONSTEXPR inline bool isNull() const noexcept; + Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept; + Q_DECL_CONSTEXPR inline bool isValid() const noexcept; + + Q_DECL_CONSTEXPR inline int width() const noexcept; + Q_DECL_CONSTEXPR inline int height() const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setWidth(int w) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setHeight(int h) noexcept; + void transpose() noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize transposed() const noexcept; + + inline void scale(int w, int h, Qt::AspectRatioMode mode) noexcept; + inline void scale(const QSize &s, Qt::AspectRatioMode mode) noexcept; + Q_REQUIRED_RESULT QSize scaled(int w, int h, Qt::AspectRatioMode mode) const noexcept; + Q_REQUIRED_RESULT QSize scaled(const QSize &s, Qt::AspectRatioMode mode) const noexcept; + + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize expandedTo(const QSize &) const noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSize boundedTo(const QSize &) const noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline int &rwidth() noexcept; + Q_DECL_RELAXED_CONSTEXPR inline int &rheight() noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline QSize &operator+=(const QSize &) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QSize &operator-=(const QSize &) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QSize &operator*=(qreal c) noexcept; inline QSize &operator/=(qreal c); - friend inline Q_DECL_CONSTEXPR bool operator==(const QSize &, const QSize &) Q_DECL_NOTHROW; - friend inline Q_DECL_CONSTEXPR bool operator!=(const QSize &, const QSize &) Q_DECL_NOTHROW; - friend inline Q_DECL_CONSTEXPR const QSize operator+(const QSize &, const QSize &) Q_DECL_NOTHROW; - friend inline Q_DECL_CONSTEXPR const QSize operator-(const QSize &, const QSize &) Q_DECL_NOTHROW; - friend inline Q_DECL_CONSTEXPR const QSize operator*(const QSize &, qreal) Q_DECL_NOTHROW; - friend inline Q_DECL_CONSTEXPR const QSize operator*(qreal, const QSize &) Q_DECL_NOTHROW; + friend inline Q_DECL_CONSTEXPR bool operator==(const QSize &, const QSize &) noexcept; + friend inline Q_DECL_CONSTEXPR bool operator!=(const QSize &, const QSize &) noexcept; + friend inline Q_DECL_CONSTEXPR const QSize operator+(const QSize &, const QSize &) noexcept; + friend inline Q_DECL_CONSTEXPR const QSize operator-(const QSize &, const QSize &) noexcept; + friend inline Q_DECL_CONSTEXPR const QSize operator*(const QSize &, qreal) noexcept; + friend inline Q_DECL_CONSTEXPR const QSize operator*(qreal, const QSize &) noexcept; friend inline const QSize operator/(const QSize &, qreal); #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT CGSize toCGSize() const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT CGSize toCGSize() const noexcept; #endif private: @@ -114,74 +114,74 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QSize &); QSize inline functions *****************************************************************************/ -Q_DECL_CONSTEXPR inline QSize::QSize() Q_DECL_NOTHROW : wd(-1), ht(-1) {} +Q_DECL_CONSTEXPR inline QSize::QSize() noexcept : wd(-1), ht(-1) {} -Q_DECL_CONSTEXPR inline QSize::QSize(int w, int h) Q_DECL_NOTHROW : wd(w), ht(h) {} +Q_DECL_CONSTEXPR inline QSize::QSize(int w, int h) noexcept : wd(w), ht(h) {} -Q_DECL_CONSTEXPR inline bool QSize::isNull() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QSize::isNull() const noexcept { return wd==0 && ht==0; } -Q_DECL_CONSTEXPR inline bool QSize::isEmpty() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QSize::isEmpty() const noexcept { return wd<1 || ht<1; } -Q_DECL_CONSTEXPR inline bool QSize::isValid() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QSize::isValid() const noexcept { return wd>=0 && ht>=0; } -Q_DECL_CONSTEXPR inline int QSize::width() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QSize::width() const noexcept { return wd; } -Q_DECL_CONSTEXPR inline int QSize::height() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int QSize::height() const noexcept { return ht; } -Q_DECL_RELAXED_CONSTEXPR inline void QSize::setWidth(int w) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QSize::setWidth(int w) noexcept { wd = w; } -Q_DECL_RELAXED_CONSTEXPR inline void QSize::setHeight(int h) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QSize::setHeight(int h) noexcept { ht = h; } -Q_DECL_CONSTEXPR inline QSize QSize::transposed() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSize QSize::transposed() const noexcept { return QSize(ht, wd); } -inline void QSize::scale(int w, int h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW +inline void QSize::scale(int w, int h, Qt::AspectRatioMode mode) noexcept { scale(QSize(w, h), mode); } -inline void QSize::scale(const QSize &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW +inline void QSize::scale(const QSize &s, Qt::AspectRatioMode mode) noexcept { *this = scaled(s, mode); } -inline QSize QSize::scaled(int w, int h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW +inline QSize QSize::scaled(int w, int h, Qt::AspectRatioMode mode) const noexcept { return scaled(QSize(w, h), mode); } -Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rwidth() Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rwidth() noexcept { return wd; } -Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rheight() Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline int &QSize::rheight() noexcept { return ht; } -Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator+=(const QSize &s) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator+=(const QSize &s) noexcept { wd+=s.wd; ht+=s.ht; return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator-=(const QSize &s) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator-=(const QSize &s) noexcept { wd-=s.wd; ht-=s.ht; return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator*=(qreal c) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QSize &QSize::operator*=(qreal c) noexcept { wd = qRound(wd*c); ht = qRound(ht*c); return *this; } -Q_DECL_CONSTEXPR inline bool operator==(const QSize &s1, const QSize &s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator==(const QSize &s1, const QSize &s2) noexcept { return s1.wd == s2.wd && s1.ht == s2.ht; } -Q_DECL_CONSTEXPR inline bool operator!=(const QSize &s1, const QSize &s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator!=(const QSize &s1, const QSize &s2) noexcept { return s1.wd != s2.wd || s1.ht != s2.ht; } -Q_DECL_CONSTEXPR inline const QSize operator+(const QSize & s1, const QSize & s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSize operator+(const QSize & s1, const QSize & s2) noexcept { return QSize(s1.wd+s2.wd, s1.ht+s2.ht); } -Q_DECL_CONSTEXPR inline const QSize operator-(const QSize &s1, const QSize &s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSize operator-(const QSize &s1, const QSize &s2) noexcept { return QSize(s1.wd-s2.wd, s1.ht-s2.ht); } -Q_DECL_CONSTEXPR inline const QSize operator*(const QSize &s, qreal c) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSize operator*(const QSize &s, qreal c) noexcept { return QSize(qRound(s.wd*c), qRound(s.ht*c)); } -Q_DECL_CONSTEXPR inline const QSize operator*(qreal c, const QSize &s) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSize operator*(qreal c, const QSize &s) noexcept { return QSize(qRound(s.wd*c), qRound(s.ht*c)); } inline QSize &QSize::operator/=(qreal c) @@ -197,12 +197,12 @@ inline const QSize operator/(const QSize &s, qreal c) return QSize(qRound(s.wd/c), qRound(s.ht/c)); } -Q_DECL_CONSTEXPR inline QSize QSize::expandedTo(const QSize & otherSize) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSize QSize::expandedTo(const QSize & otherSize) const noexcept { return QSize(qMax(wd,otherSize.wd), qMax(ht,otherSize.ht)); } -Q_DECL_CONSTEXPR inline QSize QSize::boundedTo(const QSize & otherSize) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSize QSize::boundedTo(const QSize & otherSize) const noexcept { return QSize(qMin(wd,otherSize.wd), qMin(ht,otherSize.ht)); } @@ -215,50 +215,50 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QSize &); class Q_CORE_EXPORT QSizeF { public: - Q_DECL_CONSTEXPR QSizeF() Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QSizeF(const QSize &sz) Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR QSizeF(qreal w, qreal h) Q_DECL_NOTHROW; - - inline bool isNull() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isEmpty() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline bool isValid() const Q_DECL_NOTHROW; - - Q_DECL_CONSTEXPR inline qreal width() const Q_DECL_NOTHROW; - Q_DECL_CONSTEXPR inline qreal height() const Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) Q_DECL_NOTHROW; - void transpose() Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF transposed() const Q_DECL_NOTHROW; - - inline void scale(qreal w, qreal h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW; - inline void scale(const QSizeF &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QSizeF scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT QSizeF scaled(const QSizeF &s, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW; - - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF expandedTo(const QSizeF &) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF boundedTo(const QSizeF &) const Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline qreal &rwidth() Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline qreal &rheight() Q_DECL_NOTHROW; - - Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator+=(const QSizeF &) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator-=(const QSizeF &) Q_DECL_NOTHROW; - Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator*=(qreal c) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QSizeF() noexcept; + Q_DECL_CONSTEXPR QSizeF(const QSize &sz) noexcept; + Q_DECL_CONSTEXPR QSizeF(qreal w, qreal h) noexcept; + + inline bool isNull() const noexcept; + Q_DECL_CONSTEXPR inline bool isEmpty() const noexcept; + Q_DECL_CONSTEXPR inline bool isValid() const noexcept; + + Q_DECL_CONSTEXPR inline qreal width() const noexcept; + Q_DECL_CONSTEXPR inline qreal height() const noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setWidth(qreal w) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline void setHeight(qreal h) noexcept; + void transpose() noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF transposed() const noexcept; + + inline void scale(qreal w, qreal h, Qt::AspectRatioMode mode) noexcept; + inline void scale(const QSizeF &s, Qt::AspectRatioMode mode) noexcept; + Q_REQUIRED_RESULT QSizeF scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const noexcept; + Q_REQUIRED_RESULT QSizeF scaled(const QSizeF &s, Qt::AspectRatioMode mode) const noexcept; + + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF expandedTo(const QSizeF &) const noexcept; + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR inline QSizeF boundedTo(const QSizeF &) const noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline qreal &rwidth() noexcept; + Q_DECL_RELAXED_CONSTEXPR inline qreal &rheight() noexcept; + + Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator+=(const QSizeF &) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator-=(const QSizeF &) noexcept; + Q_DECL_RELAXED_CONSTEXPR inline QSizeF &operator*=(qreal c) noexcept; inline QSizeF &operator/=(qreal c); - friend Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &, const QSizeF &) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &, qreal) Q_DECL_NOTHROW; - friend Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal, const QSizeF &) Q_DECL_NOTHROW; + friend Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &, const QSizeF &) noexcept; + friend Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &, const QSizeF &) noexcept; + friend Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF &, const QSizeF &) noexcept; + friend Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &, const QSizeF &) noexcept; + friend Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &, qreal) noexcept; + friend Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal, const QSizeF &) noexcept; friend inline const QSizeF operator/(const QSizeF &, qreal); - Q_DECL_CONSTEXPR inline QSize toSize() const Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR inline QSize toSize() const noexcept; #if defined(Q_OS_DARWIN) || defined(Q_QDOC) - Q_REQUIRED_RESULT static QSizeF fromCGSize(CGSize size) Q_DECL_NOTHROW; - Q_REQUIRED_RESULT CGSize toCGSize() const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT static QSizeF fromCGSize(CGSize size) noexcept; + Q_REQUIRED_RESULT CGSize toCGSize() const noexcept; #endif private: @@ -282,76 +282,76 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QSizeF &); QSizeF inline functions *****************************************************************************/ -Q_DECL_CONSTEXPR inline QSizeF::QSizeF() Q_DECL_NOTHROW : wd(-1.), ht(-1.) {} +Q_DECL_CONSTEXPR inline QSizeF::QSizeF() noexcept : wd(-1.), ht(-1.) {} -Q_DECL_CONSTEXPR inline QSizeF::QSizeF(const QSize &sz) Q_DECL_NOTHROW : wd(sz.width()), ht(sz.height()) {} +Q_DECL_CONSTEXPR inline QSizeF::QSizeF(const QSize &sz) noexcept : wd(sz.width()), ht(sz.height()) {} -Q_DECL_CONSTEXPR inline QSizeF::QSizeF(qreal w, qreal h) Q_DECL_NOTHROW : wd(w), ht(h) {} +Q_DECL_CONSTEXPR inline QSizeF::QSizeF(qreal w, qreal h) noexcept : wd(w), ht(h) {} -inline bool QSizeF::isNull() const Q_DECL_NOTHROW +inline bool QSizeF::isNull() const noexcept { return qIsNull(wd) && qIsNull(ht); } -Q_DECL_CONSTEXPR inline bool QSizeF::isEmpty() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QSizeF::isEmpty() const noexcept { return wd <= 0. || ht <= 0.; } -Q_DECL_CONSTEXPR inline bool QSizeF::isValid() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool QSizeF::isValid() const noexcept { return wd >= 0. && ht >= 0.; } -Q_DECL_CONSTEXPR inline qreal QSizeF::width() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QSizeF::width() const noexcept { return wd; } -Q_DECL_CONSTEXPR inline qreal QSizeF::height() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline qreal QSizeF::height() const noexcept { return ht; } -Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setWidth(qreal w) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setWidth(qreal w) noexcept { wd = w; } -Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setHeight(qreal h) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline void QSizeF::setHeight(qreal h) noexcept { ht = h; } -Q_DECL_CONSTEXPR inline QSizeF QSizeF::transposed() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSizeF QSizeF::transposed() const noexcept { return QSizeF(ht, wd); } -inline void QSizeF::scale(qreal w, qreal h, Qt::AspectRatioMode mode) Q_DECL_NOTHROW +inline void QSizeF::scale(qreal w, qreal h, Qt::AspectRatioMode mode) noexcept { scale(QSizeF(w, h), mode); } -inline void QSizeF::scale(const QSizeF &s, Qt::AspectRatioMode mode) Q_DECL_NOTHROW +inline void QSizeF::scale(const QSizeF &s, Qt::AspectRatioMode mode) noexcept { *this = scaled(s, mode); } -inline QSizeF QSizeF::scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const Q_DECL_NOTHROW +inline QSizeF QSizeF::scaled(qreal w, qreal h, Qt::AspectRatioMode mode) const noexcept { return scaled(QSizeF(w, h), mode); } -Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rwidth() Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rwidth() noexcept { return wd; } -Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rheight() Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline qreal &QSizeF::rheight() noexcept { return ht; } -Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator+=(const QSizeF &s) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator+=(const QSizeF &s) noexcept { wd += s.wd; ht += s.ht; return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator-=(const QSizeF &s) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator-=(const QSizeF &s) noexcept { wd -= s.wd; ht -= s.ht; return *this; } -Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator*=(qreal c) Q_DECL_NOTHROW +Q_DECL_RELAXED_CONSTEXPR inline QSizeF &QSizeF::operator*=(qreal c) noexcept { wd *= c; ht *= c; return *this; } -Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &s1, const QSizeF &s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator==(const QSizeF &s1, const QSizeF &s2) noexcept { return qFuzzyCompare(s1.wd, s2.wd) && qFuzzyCompare(s1.ht, s2.ht); } -Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &s1, const QSizeF &s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline bool operator!=(const QSizeF &s1, const QSizeF &s2) noexcept { return !qFuzzyCompare(s1.wd, s2.wd) || !qFuzzyCompare(s1.ht, s2.ht); } -Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF & s1, const QSizeF & s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSizeF operator+(const QSizeF & s1, const QSizeF & s2) noexcept { return QSizeF(s1.wd+s2.wd, s1.ht+s2.ht); } -Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &s1, const QSizeF &s2) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSizeF operator-(const QSizeF &s1, const QSizeF &s2) noexcept { return QSizeF(s1.wd-s2.wd, s1.ht-s2.ht); } -Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &s, qreal c) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSizeF operator*(const QSizeF &s, qreal c) noexcept { return QSizeF(s.wd*c, s.ht*c); } -Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal c, const QSizeF &s) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline const QSizeF operator*(qreal c, const QSizeF &s) noexcept { return QSizeF(s.wd*c, s.ht*c); } inline QSizeF &QSizeF::operator/=(qreal c) @@ -367,17 +367,17 @@ inline const QSizeF operator/(const QSizeF &s, qreal c) return QSizeF(s.wd/c, s.ht/c); } -Q_DECL_CONSTEXPR inline QSizeF QSizeF::expandedTo(const QSizeF & otherSize) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSizeF QSizeF::expandedTo(const QSizeF & otherSize) const noexcept { return QSizeF(qMax(wd,otherSize.wd), qMax(ht,otherSize.ht)); } -Q_DECL_CONSTEXPR inline QSizeF QSizeF::boundedTo(const QSizeF & otherSize) const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSizeF QSizeF::boundedTo(const QSizeF & otherSize) const noexcept { return QSizeF(qMin(wd,otherSize.wd), qMin(ht,otherSize.ht)); } -Q_DECL_CONSTEXPR inline QSize QSizeF::toSize() const Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline QSize QSizeF::toSize() const noexcept { return QSize(qRound(wd), qRound(ht)); } diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h index bf04935b50..e59212aa2a 100644 --- a/src/corelib/tools/qstack.h +++ b/src/corelib/tools/qstack.h @@ -50,7 +50,7 @@ class QStack : public QVector<T> { public: // compiler-generated special member functions are fine! - inline void swap(QStack<T> &other) Q_DECL_NOTHROW { QVector<T>::swap(other); } // prevent QVector<->QStack swaps + inline void swap(QStack<T> &other) noexcept { QVector<T>::swap(other); } // prevent QVector<->QStack swaps inline void push(const T &t) { QVector<T>::append(t); } T pop(); T &top(); diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 4852d20082..f9a9fcfe91 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -2,6 +2,7 @@ ** ** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2018 Intel Corporation. +** Copyright (C) 2019 Mail.ru Group. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -120,7 +121,7 @@ QT_BEGIN_NAMESPACE * Whenever multiple alternatives are equivalent or near so, we prefer the one * using instructions from SSE2, since SSE2 is guaranteed to be enabled for all * 64-bit builds and we enable it for 32-bit builds by default. Use of higher - * SSE versions should be done when there's a clear performance benefit and + * SSE versions should be done when there is a clear performance benefit and * requires fallback code to SSE2, if it exists. * * Performance measurement in the past shows that most strings are short in @@ -142,19 +143,13 @@ extern "C" void qt_toLatin1_mips_dsp_asm(uchar *dst, const ushort *src, int leng #endif // internal -int qFindString(const QChar *haystack, int haystackLen, int from, - const QChar *needle, int needleLen, Qt::CaseSensitivity cs); -int qFindStringBoyerMoore(const QChar *haystack, int haystackLen, int from, - const QChar *needle, int needleLen, Qt::CaseSensitivity cs); -static inline int qt_last_index_of(const QChar *haystack, int haystackLen, QChar needle, - int from, Qt::CaseSensitivity cs); -static inline int qt_string_count(const QChar *haystack, int haystackLen, - const QChar *needle, int needleLen, - Qt::CaseSensitivity cs); -static inline int qt_string_count(const QChar *haystack, int haystackLen, - QChar needle, Qt::CaseSensitivity cs); -static inline int qt_find_latin1_string(const QChar *hay, int size, QLatin1String needle, - int from, Qt::CaseSensitivity cs); +qsizetype qFindStringBoyerMoore(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs); +static inline qsizetype qFindChar(QStringView str, QChar ch, qsizetype from, Qt::CaseSensitivity cs) noexcept; +template <typename Haystack> +static inline qsizetype qLastIndexOf(Haystack haystack, QChar needle, qsizetype from, Qt::CaseSensitivity cs) noexcept; +static inline qsizetype qt_string_count(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs); +static inline qsizetype qt_string_count(QStringView haystack, QChar needle, Qt::CaseSensitivity cs); + static inline bool qt_starts_with(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs); static inline bool qt_starts_with(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs); static inline bool qt_starts_with(QStringView haystack, QChar needle, Qt::CaseSensitivity cs); @@ -162,7 +157,7 @@ static inline bool qt_ends_with(QStringView haystack, QStringView needle, Qt::Ca static inline bool qt_ends_with(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs); static inline bool qt_ends_with(QStringView haystack, QChar needle, Qt::CaseSensitivity cs); -qsizetype QtPrivate::qustrlen(const ushort *str) Q_DECL_NOTHROW +qsizetype QtPrivate::qustrlen(const ushort *str) noexcept { qsizetype result = 0; @@ -208,7 +203,7 @@ qsizetype QtPrivate::qustrlen(const ushort *str) Q_DECL_NOTHROW return result; } -#if defined(Q_COMPILER_LAMBDA) && !defined(__OPTIMIZE_SIZE__) +#if !defined(__OPTIMIZE_SIZE__) namespace { template <uint MaxCount> struct UnrollTailLoop { @@ -460,7 +455,7 @@ static Q_ALWAYS_INLINE __m128i mm_load8_zero_extend(const void *ptr) // Note: ptr on output may be off by one and point to a preceding US-ASCII // character. Usually harmless. -bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW +bool qt_is_ascii(const char *&ptr, const char *end) noexcept { #if defined(__SSE2__) // Testing for the high bit can be done efficiently with just PMOVMSKB @@ -520,7 +515,7 @@ bool qt_is_ascii(const char *&ptr, const char *end) Q_DECL_NOTHROW return true; } -bool QtPrivate::isAscii(QLatin1String s) Q_DECL_NOTHROW +bool QtPrivate::isAscii(QLatin1String s) noexcept { const char *ptr = s.begin(); const char *end = s.end(); @@ -547,7 +542,7 @@ static bool isAscii(const QChar *&ptr, const QChar *end) return true; } -bool QtPrivate::isAscii(QStringView s) Q_DECL_NOTHROW +bool QtPrivate::isAscii(QStringView s) noexcept { const QChar *ptr = s.begin(); const QChar *end = s.end(); @@ -555,7 +550,7 @@ bool QtPrivate::isAscii(QStringView s) Q_DECL_NOTHROW return isAscii(ptr, end); } -bool QtPrivate::isLatin1(QStringView s) Q_DECL_NOTHROW +bool QtPrivate::isLatin1(QStringView s) noexcept { const QChar *ptr = s.begin(); const QChar *end = s.end(); @@ -595,7 +590,7 @@ bool QtPrivate::isLatin1(QStringView s) Q_DECL_NOTHROW } // conversion between Latin 1 and UTF-16 -void qt_from_latin1(ushort *dst, const char *str, size_t size) Q_DECL_NOTHROW +void qt_from_latin1(ushort *dst, const char *str, size_t size) noexcept { /* SIMD: * Unpacking with SSE has been shown to improve performance on recent CPUs @@ -638,7 +633,7 @@ void qt_from_latin1(ushort *dst, const char *str, size_t size) Q_DECL_NOTHROW size = size % 8; dst += offset; str += offset; -# if defined(Q_COMPILER_LAMBDA) && !defined(__OPTIMIZE_SIZE__) +# if !defined(__OPTIMIZE_SIZE__) return UnrollTailLoop<7>::exec(int(size), [=](int i) { dst[i] = (uchar)str[i]; }); # endif #endif @@ -833,9 +828,9 @@ static int ucstricmp(const QChar *a, const QChar *ae, const QChar *b, const QCha uint alast = 0; uint blast = 0; while (a < e) { -// qDebug() << hex << alast << blast; -// qDebug() << hex << "*a=" << *a << "alast=" << alast << "folded=" << foldCase (*a, alast); -// qDebug() << hex << "*b=" << *b << "blast=" << blast << "folded=" << foldCase (*b, blast); +// qDebug() << Qt::hex << alast << blast; +// qDebug() << Qt::hex << "*a=" << *a << "alast=" << alast << "folded=" << foldCase (*a, alast); +// qDebug() << Qt::hex << "*b=" << *b << "blast=" << blast << "folded=" << foldCase (*b, blast); int diff = foldCase(a->unicode(), alast) - foldCase(b->unicode(), blast); if ((diff)) return diff; @@ -1152,7 +1147,7 @@ static int ucstrncmp(const QChar *a, const uchar *c, size_t l) } template <typename Number> -Q_DECL_CONSTEXPR int lencmp(Number lhs, Number rhs) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR int lencmp(Number lhs, Number rhs) noexcept { return lhs == rhs ? 0 : lhs > rhs ? 1 : @@ -1176,7 +1171,7 @@ static int ucstrcmp(const QChar *a, size_t alen, const char *b, size_t blen) return cmp ? cmp : lencmp(alen, blen); } -static int qt_compare_strings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +static int qt_compare_strings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept { if (cs == Qt::CaseSensitive) return ucstrcmp(lhs.begin(), lhs.size(), rhs.begin(), rhs.size()); @@ -1184,7 +1179,7 @@ static int qt_compare_strings(QStringView lhs, QStringView rhs, Qt::CaseSensitiv return ucstricmp(lhs.begin(), lhs.end(), rhs.begin(), rhs.end()); } -static int qt_compare_strings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +static int qt_compare_strings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept { if (cs == Qt::CaseSensitive) return ucstrcmp(lhs.begin(), lhs.size(), rhs.begin(), rhs.size()); @@ -1192,12 +1187,12 @@ static int qt_compare_strings(QStringView lhs, QLatin1String rhs, Qt::CaseSensit return ucstricmp(lhs.begin(), lhs.end(), rhs.begin(), rhs.end()); } -static int qt_compare_strings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +static int qt_compare_strings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept { return -qt_compare_strings(rhs, lhs, cs); } -static int qt_compare_strings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +static int qt_compare_strings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept { if (cs == Qt::CaseInsensitive) return qstrnicmp(lhs.data(), lhs.size(), rhs.data(), rhs.size()); @@ -1222,7 +1217,7 @@ static int qt_compare_strings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSens of the characters and is very fast, but is not what a human would expect. Consider sorting user-visible strings with QString::localeAwareCompare(). */ -int QtPrivate::compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +int QtPrivate::compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept { return qt_compare_strings(lhs, rhs, cs); } @@ -1242,7 +1237,7 @@ int QtPrivate::compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitiv of the characters and is very fast, but is not what a human would expect. Consider sorting user-visible strings with QString::localeAwareCompare(). */ -int QtPrivate::compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +int QtPrivate::compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept { return qt_compare_strings(lhs, rhs, cs); } @@ -1262,7 +1257,7 @@ int QtPrivate::compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensit of the characters and is very fast, but is not what a human would expect. Consider sorting user-visible strings with QString::localeAwareCompare(). */ -int QtPrivate::compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +int QtPrivate::compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs) noexcept { return qt_compare_strings(lhs, rhs, cs); } @@ -1282,47 +1277,14 @@ int QtPrivate::compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensit of the characters and is very fast, but is not what a human would expect. Consider sorting user-visible strings with QString::localeAwareCompare(). */ -int QtPrivate::compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +int QtPrivate::compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs) noexcept { return qt_compare_strings(lhs, rhs, cs); } -/*! - \internal - - Returns the index position of the first occurrence of the - character \a ch in the string given by \a str and \a len, - searching forward from index - position \a from. Returns -1 if \a ch could not be found. -*/ -static int findChar(const QChar *str, int len, QChar ch, int from, - Qt::CaseSensitivity cs) -{ - const ushort *s = (const ushort *)str; - ushort c = ch.unicode(); - if (from < 0) - from = qMax(from + len, 0); - if (from < len) { - const ushort *n = s + from; - const ushort *e = s + len; - if (cs == Qt::CaseSensitive) { - n = QtPrivate::qustrchr(QStringView(n, e), c); - if (n != e) - return n - s; - } else { - c = foldCase(c); - --n; - while (++n != e) - if (foldCase(*n) == c) - return n - s; - } - } - return -1; -} - #define REHASH(a) \ - if (sl_minus_1 < sizeof(uint) * CHAR_BIT) \ - hashHaystack -= uint(a) << sl_minus_1; \ + if (sl_minus_1 < sizeof(std::size_t) * CHAR_BIT) \ + hashHaystack -= std::size_t(a) << sl_minus_1; \ hashHaystack <<= 1 inline bool qIsUpper(char ch) @@ -1472,7 +1434,7 @@ const QString::Null QString::null = { }; In all of the QString functions that take \c{const char *} parameters, the \c{const char *} is interpreted as a classic C-style '\\0'-terminated string encoded in UTF-8. It is legal for - the \c{const char *} parameter to be 0. + the \c{const char *} parameter to be \nullptr. You can also provide string data as an array of \l{QChar}s: @@ -1556,7 +1518,7 @@ const QString::Null QString::null = { }; functions. The former searches forward starting from a given index position, the latter searches backward. Both return the index position of the character or substring if they find it; otherwise, - they return -1. For example, here's a typical loop that finds all + they return -1. For example, here is a typical loop that finds all occurrences of a particular substring: \snippet qstring/main.cpp 6 @@ -1685,10 +1647,9 @@ const QString::Null QString::null = { }; \snippet qstring/main.cpp 8 All functions except isNull() treat null strings the same as empty - strings. For example, toUtf8().constData() returns a pointer to a - '\\0' character for a null string (\e not a null pointer), and - QString() compares equal to QString(""). We recommend that you - always use the isEmpty() function and avoid isNull(). + strings. For example, toUtf8().constData() returns a valid pointer + (\e not nullptr) to a '\\0' character for a null string. We + recommend that you always use the isEmpty() function and avoid isNull(). \section1 Argument Formats @@ -2045,7 +2006,7 @@ const QString::Null QString::null = { }; the size of wchar. If wchar is 4 bytes, the \a string is interpreted as UCS-4, if wchar is 2 bytes it is interpreted as UTF-16. - If \a size is -1 (default), the \a string has to be 0 terminated. + If \a size is -1 (default), the \a string has to be \\0'-terminated. \sa fromUtf16(), fromLatin1(), fromLocal8Bit(), fromUtf8(), fromUcs4(), fromStdWString() */ @@ -2090,7 +2051,7 @@ int QString::toUcs4_helper(const ushort *uc, int length, uint *out) \note This function does not append a null character to the array. - \sa utf16(), toUcs4(), toLatin1(), toUtf8(), toLocal8Bit(), toStdWString() + \sa utf16(), toUcs4(), toLatin1(), toUtf8(), toLocal8Bit(), toStdWString(), QStringView::toWCharArray() */ /*! \fn QString::QString(const QString &other) @@ -2111,7 +2072,7 @@ int QString::toUcs4_helper(const ushort *uc, int length, uint *out) If \a unicode is 0, a null string is constructed. - If \a size is negative, \a unicode is assumed to point to a nul-terminated + If \a size is negative, \a unicode is assumed to point to a \\0'-terminated array and its length is determined dynamically. The terminating nul-character is not considered part of the string. @@ -2411,7 +2372,7 @@ void QString::expand(int i) string. */ -QString &QString::operator=(const QString &other) Q_DECL_NOTHROW +QString &QString::operator=(const QString &other) noexcept { other.d->ref.ref(); if (!d->ref.deref()) @@ -3084,7 +3045,7 @@ void QString::replace_helper(uint *indices, int nIndices, int blen, const QChar { // Copy after if it lies inside our own d->data() area (which we could // possibly invalidate via a realloc or modify by replacement). - QChar *afterBuffer = 0; + QChar *afterBuffer = nullptr; if (pointsIntoRange(after, d->data(), d->size)) // Use copy in place of vulnerable original: after = afterBuffer = textCopy(after, alen); @@ -3169,7 +3130,7 @@ QString &QString::replace(const QChar *before, int blen, return *this; QStringMatcher matcher(before, blen, cs); - QChar *beforeBuffer = 0, *afterBuffer = 0; + QChar *beforeBuffer = nullptr, *afterBuffer = nullptr; int index = 0; while (1) { @@ -3397,7 +3358,7 @@ QString &QString::replace(QChar c, QLatin1String after, Qt::CaseSensitivity cs) expect. Consider sorting user-interface strings with localeAwareCompare(). */ -bool operator==(const QString &s1, const QString &s2) Q_DECL_NOTHROW +bool operator==(const QString &s1, const QString &s2) noexcept { if (s1.d->size != s2.d->size) return false; @@ -3410,7 +3371,7 @@ bool operator==(const QString &s1, const QString &s2) Q_DECL_NOTHROW Returns \c true if this string is equal to \a other; otherwise returns \c false. */ -bool QString::operator==(QLatin1String other) const Q_DECL_NOTHROW +bool QString::operator==(QLatin1String other) const noexcept { if (d->size != other.size()) return false; @@ -3462,7 +3423,7 @@ bool QString::operator==(QLatin1String other) const Q_DECL_NOTHROW expect. Consider sorting user-interface strings using the QString::localeAwareCompare() function. */ -bool operator<(const QString &s1, const QString &s2) Q_DECL_NOTHROW +bool operator<(const QString &s1, const QString &s2) noexcept { return qt_compare_strings(s1, s2, Qt::CaseSensitive) < 0; } @@ -3473,7 +3434,7 @@ bool operator<(const QString &s1, const QString &s2) Q_DECL_NOTHROW Returns \c true if this string is lexically less than the parameter string called \a other; otherwise returns \c false. */ -bool QString::operator<(QLatin1String other) const Q_DECL_NOTHROW +bool QString::operator<(QLatin1String other) const noexcept { return qt_compare_strings(*this, other, Qt::CaseSensitive) < 0; } @@ -3582,7 +3543,7 @@ bool QString::operator<(QLatin1String other) const Q_DECL_NOTHROW Returns \c true if this string is lexically greater than the parameter string \a other; otherwise returns \c false. */ -bool QString::operator>(QLatin1String other) const Q_DECL_NOTHROW +bool QString::operator>(QLatin1String other) const noexcept { return qt_compare_strings(*this, other, Qt::CaseSensitive) > 0; } @@ -3720,6 +3681,7 @@ bool QString::operator>(QLatin1String other) const Q_DECL_NOTHROW \sa QT_NO_CAST_FROM_ASCII */ +#if QT_STRINGVIEW_LEVEL < 2 /*! Returns the index position of the first occurrence of the string \a str in this string, searching forward from index position \a @@ -3739,8 +3701,28 @@ bool QString::operator>(QLatin1String other) const Q_DECL_NOTHROW */ int QString::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) const { - return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs); + // ### Qt6: qsize + return int(QtPrivate::findString(QStringView(unicode(), length()), from, QStringView(str.unicode(), str.length()), cs)); } +#endif // QT_STRINGVIEW_LEVEL < 2 + +/*! + \fn int QString::indexOf(QStringView str, int from, Qt::CaseSensitivity cs) const + \since 5.14 + \overload indexOf() + + Returns the index position of the first occurrence of the string view \a str + in this string, searching forward from index position \a from. + Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + If \a from is -1, the search starts at the last character; if it is + -2, at the next to last character and so on. + + \sa QStringView::indexOf(), lastIndexOf(), contains(), count() +*/ /*! \since 4.5 @@ -3763,85 +3745,8 @@ int QString::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) const int QString::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const { - return qt_find_latin1_string(unicode(), size(), str, from, cs); -} - -int qFindString( - const QChar *haystack0, int haystackLen, int from, - const QChar *needle0, int needleLen, Qt::CaseSensitivity cs) -{ - const int l = haystackLen; - const int sl = needleLen; - if (from < 0) - from += l; - if (uint(sl + from) > (uint)l) - return -1; - if (!sl) - return from; - if (!l) - return -1; - - if (sl == 1) - return findChar(haystack0, haystackLen, needle0[0], from, cs); - - /* - We use the Boyer-Moore algorithm in cases where the overhead - for the skip table should pay off, otherwise we use a simple - hash function. - */ - if (l > 500 && sl > 5) - return qFindStringBoyerMoore(haystack0, haystackLen, from, - needle0, needleLen, cs); - - auto sv = [sl](const ushort *v) { return QStringView(v, sl); }; - /* - We use some hashing for efficiency's sake. Instead of - comparing strings, we compare the hash value of str with that - of a part of this QString. Only if that matches, we call - qt_string_compare(). - */ - const ushort *needle = (const ushort *)needle0; - const ushort *haystack = (const ushort *)haystack0 + from; - const ushort *end = (const ushort *)haystack0 + (l-sl); - const uint sl_minus_1 = sl - 1; - uint hashNeedle = 0, hashHaystack = 0; - int idx; - - if (cs == Qt::CaseSensitive) { - for (idx = 0; idx < sl; ++idx) { - hashNeedle = ((hashNeedle<<1) + needle[idx]); - hashHaystack = ((hashHaystack<<1) + haystack[idx]); - } - hashHaystack -= haystack[sl_minus_1]; - - while (haystack <= end) { - hashHaystack += haystack[sl_minus_1]; - if (hashHaystack == hashNeedle - && qt_compare_strings(sv(needle), sv(haystack), Qt::CaseSensitive) == 0) - return haystack - (const ushort *)haystack0; - - REHASH(*haystack); - ++haystack; - } - } else { - const ushort *haystack_start = (const ushort *)haystack0; - for (idx = 0; idx < sl; ++idx) { - hashNeedle = (hashNeedle<<1) + foldCase(needle + idx, needle); - hashHaystack = (hashHaystack<<1) + foldCase(haystack + idx, haystack_start); - } - hashHaystack -= foldCase(haystack + sl_minus_1, haystack_start); - - while (haystack <= end) { - hashHaystack += foldCase(haystack + sl_minus_1, haystack_start); - if (hashHaystack == hashNeedle - && qt_compare_strings(sv(needle), sv(haystack), Qt::CaseInsensitive) == 0) - return haystack - (const ushort *)haystack0; - - REHASH(foldCase(haystack, haystack_start)); - ++haystack; - } - } - return -1; + // ### Qt6: qsize + return int(QtPrivate::findString(QStringView(unicode(), size()), from, str, cs)); } /*! @@ -3853,9 +3758,11 @@ int qFindString( */ int QString::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const { - return findChar(unicode(), length(), ch, from, cs); + // ### Qt6: qsize + return int(qFindChar(QStringView(unicode(), length()), ch, from, cs)); } +#if QT_STRINGVIEW_LEVEL < 2 /*! \since 4.8 @@ -3870,74 +3777,8 @@ int QString::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const */ int QString::indexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const { - return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs); -} - -static int lastIndexOfHelper(const ushort *haystack, int from, const ushort *needle, int sl, Qt::CaseSensitivity cs) -{ - /* - See indexOf() for explanations. - */ - - auto sv = [sl](const ushort *v) { return QStringView(v, sl); }; - - const ushort *end = haystack; - haystack += from; - const uint sl_minus_1 = sl - 1; - const ushort *n = needle+sl_minus_1; - const ushort *h = haystack+sl_minus_1; - uint hashNeedle = 0, hashHaystack = 0; - int idx; - - if (cs == Qt::CaseSensitive) { - for (idx = 0; idx < sl; ++idx) { - hashNeedle = ((hashNeedle<<1) + *(n-idx)); - hashHaystack = ((hashHaystack<<1) + *(h-idx)); - } - hashHaystack -= *haystack; - - while (haystack >= end) { - hashHaystack += *haystack; - if (hashHaystack == hashNeedle - && qt_compare_strings(sv(needle), sv(haystack), Qt::CaseSensitive) == 0) - return haystack - end; - --haystack; - REHASH(haystack[sl]); - } - } else { - for (idx = 0; idx < sl; ++idx) { - hashNeedle = ((hashNeedle<<1) + foldCase(n-idx, needle)); - hashHaystack = ((hashHaystack<<1) + foldCase(h-idx, end)); - } - hashHaystack -= foldCase(haystack, end); - - while (haystack >= end) { - hashHaystack += foldCase(haystack, end); - if (hashHaystack == hashNeedle - && qt_compare_strings(sv(haystack), sv(needle), Qt::CaseInsensitive) == 0) - return haystack - end; - --haystack; - REHASH(foldCase(haystack + sl, end)); - } - } - return -1; -} - -static inline int lastIndexOfHelper( - const QStringRef &haystack, int from, const QStringRef &needle, Qt::CaseSensitivity cs) -{ - return lastIndexOfHelper(reinterpret_cast<const ushort*>(haystack.unicode()), from, - reinterpret_cast<const ushort*>(needle.unicode()), needle.size(), cs); -} - -static inline int lastIndexOfHelper( - const QStringRef &haystack, int from, QLatin1String needle, Qt::CaseSensitivity cs) -{ - const int size = needle.size(); - QVarLengthArray<ushort> s(size); - qt_from_latin1(s.data(), needle.latin1(), size); - return lastIndexOfHelper(reinterpret_cast<const ushort*>(haystack.unicode()), from, - s.data(), size, cs); + // ### Qt6: qsize + return int(QtPrivate::findString(QStringView(unicode(), length()), from, QStringView(str.unicode(), str.length()), cs)); } /*! @@ -3958,9 +3799,12 @@ static inline int lastIndexOfHelper( */ int QString::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) const { - return QStringRef(this).lastIndexOf(QStringRef(&str), from, cs); + // ### Qt6: qsize + return int(QtPrivate::lastIndexOf(*this, from, str, cs)); } +#endif // QT_STRINGVIEW_LEVEL < 2 + /*! \since 4.5 \overload lastIndexOf() @@ -3982,7 +3826,8 @@ int QString::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) c */ int QString::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const { - return QStringRef(this).lastIndexOf(str, from, cs); + // ### Qt6: qsize + return int(QtPrivate::lastIndexOf(*this, from, str, cs)); } /*! @@ -3993,9 +3838,11 @@ int QString::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) co */ int QString::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const { - return qt_last_index_of(unicode(), size(), ch, from, cs); + // ### Qt6: qsize + return int(qLastIndexOf(*this, ch, from, cs)); } +#if QT_STRINGVIEW_LEVEL < 2 /*! \since 4.8 \overload lastIndexOf() @@ -4013,8 +3860,27 @@ int QString::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const */ int QString::lastIndexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const { - return QStringRef(this).lastIndexOf(str, from, cs); + // ### Qt6: qsize + return int(QtPrivate::lastIndexOf(*this, from, str, cs)); } +#endif // QT_STRINGVIEW_LEVEL < 2 + +/*! + \fn int QString::lastIndexOf(QStringView str, int from, Qt::CaseSensitivity cs) const + \since 5.14 + \overload lastIndexOf() + + Returns the index position of the last occurrence of the string view \a + str in this string, searching backward from index position \a + from. If \a from is -1 (default), the search starts at the last + character; if \a from is -2, at the next to last character and so + on. Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + \sa indexOf(), contains(), count() +*/ #if !(defined(QT_NO_REGEXP) && !QT_CONFIG(regularexpression)) @@ -4326,7 +4192,8 @@ QString &QString::replace(const QRegularExpression &re, const QString &after) int QString::count(const QString &str, Qt::CaseSensitivity cs) const { - return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs); + // ### Qt6: qsize + return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs)); } /*! @@ -4342,8 +4209,9 @@ int QString::count(const QString &str, Qt::CaseSensitivity cs) const int QString::count(QChar ch, Qt::CaseSensitivity cs) const { - return qt_string_count(unicode(), size(), ch, cs); - } + // ### Qt6: qsize + return int(qt_string_count(QStringView(unicode(), size()), ch, cs)); +} /*! \since 4.8 @@ -4358,10 +4226,11 @@ int QString::count(QChar ch, Qt::CaseSensitivity cs) const */ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const { - return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs); + // ### Qt6: qsize + return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs)); } - +#if QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QString::contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Returns \c true if this string contains an occurrence of the string @@ -4375,6 +4244,7 @@ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const \sa indexOf(), count() */ +#endif // QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QString::contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 5.3 @@ -4393,6 +4263,7 @@ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const character \a ch; otherwise returns \c false. */ +#if QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QString::contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 4.8 @@ -4404,6 +4275,20 @@ int QString::count(const QStringRef &str, Qt::CaseSensitivity cs) const \sa indexOf(), count() */ +#endif // QT_STRINGVIEW_LEVEL < 2 + +/*! \fn bool QString::contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \since 5.14 + \overload contains() + + Returns \c true if this string contains an occurrence of the string view + \a str; otherwise returns \c false. + + If \a cs is Qt::CaseSensitive (default), the search is + case sensitive; otherwise the search is case insensitive. + + \sa indexOf(), count() +*/ /*! \fn bool QString::contains(const QRegExp &rx) const @@ -4553,7 +4438,7 @@ int QString::indexOf(const QRegularExpression& re, int from) const expression \a re in the string, searching forward from index position \a from. Returns -1 if \a re didn't match anywhere. - If the match is successful and \a rmatch is not a null pointer, it also + If the match is successful and \a rmatch is not \nullptr, it also writes the results of the match into the QRegularExpressionMatch object pointed to by \a rmatch. @@ -4572,7 +4457,7 @@ int QString::indexOf(const QRegularExpression &re, int from, QRegularExpressionM if (match.hasMatch()) { const int ret = match.capturedStart(); if (rmatch) - *rmatch = qMove(match); + *rmatch = std::move(match); return ret; } @@ -4604,7 +4489,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from) const expression \a re in the string, which starts before the index position \a from. Returns -1 if \a re didn't match anywhere. - If the match is successful and \a rmatch is not a null pointer, it also + If the match is successful and \a rmatch is not \nullptr, it also writes the results of the match into the QRegularExpressionMatch object pointed to by \a rmatch. @@ -4628,7 +4513,7 @@ int QString::lastIndexOf(const QRegularExpression &re, int from, QRegularExpress if (start < endpos) { lastIndex = start; if (rmatch) - *rmatch = qMove(match); + *rmatch = std::move(match); } else { break; } @@ -4655,14 +4540,14 @@ bool QString::contains(const QRegularExpression &re) const Returns \c true if the regular expression \a re matches somewhere in this string; otherwise returns \c false. - If the match is successful and \a match is not a null pointer, it also + If the match is successful and \a rmatch is not \nullptr, it also writes the results of the match into the QRegularExpressionMatch object - pointed to by \a match. + pointed to by \a rmatch. \sa QRegularExpression::match() */ -bool QString::contains(const QRegularExpression &re, QRegularExpressionMatch *match) const +bool QString::contains(const QRegularExpression &re, QRegularExpressionMatch *rmatch) const { if (!re.isValid()) { qWarning("QString::contains: invalid QRegularExpression object"); @@ -4670,8 +4555,8 @@ bool QString::contains(const QRegularExpression &re, QRegularExpressionMatch *ma } QRegularExpressionMatch m = re.match(*this); bool hasMatch = m.hasMatch(); - if (hasMatch && match) - *match = qMove(m); + if (hasMatch && rmatch) + *rmatch = std::move(m); return hasMatch; } @@ -4831,7 +4716,7 @@ QString QString::section(const QString &sep, int start, int end, SectionFlags fl class qt_section_chunk { public: qt_section_chunk() {} - qt_section_chunk(int l, QStringRef s) : length(l), string(qMove(s)) {} + qt_section_chunk(int l, QStringRef s) : length(l), string(std::move(s)) {} int length; QStringRef string; }; @@ -5452,7 +5337,7 @@ static QVector<uint> qt_convert_to_ucs4(QStringView string); this string is replaced by the Unicode's replacement character (QChar::ReplacementCharacter, which corresponds to \c{U+FFFD}). - The returned vector is not NUL terminated. + The returned vector is not \\0'-terminated. \sa fromUtf8(), toUtf8(), toLatin1(), toLocal8Bit(), QTextCodec, fromUcs4(), toWCharArray() */ @@ -5484,7 +5369,7 @@ static QVector<uint> qt_convert_to_ucs4(QStringView string) this string is replaced by the Unicode's replacement character (QChar::ReplacementCharacter, which corresponds to \c{U+FFFD}). - The returned vector is not NUL terminated. + The returned vector is not \\0'-terminated. \sa QString::toUcs4(), QStringView::toUcs4(), QtPrivate::convertToLatin1(), QtPrivate::convertToLocal8Bit(), QtPrivate::convertToUtf8() @@ -5642,8 +5527,7 @@ QString QString::fromUtf8_helper(const char *str, int size) Returns a QString initialized with the first \a size characters of the Unicode string \a unicode (ISO-10646-UTF-16 encoded). - If \a size is -1 (default), \a unicode must be terminated - with a 0. + If \a size is -1 (default), \a unicode must be \\0'-terminated. This function checks for a Byte Order Mark (BOM). If it is missing, host byte order is assumed. @@ -5664,7 +5548,7 @@ QString QString::fromUtf16(const ushort *unicode, int size) while (unicode[size] != 0) ++size; } - return QUtf16::convertToUnicode((const char *)unicode, size*2, 0); + return QUtf16::convertToUnicode((const char *)unicode, size*2, nullptr); } /*! @@ -5674,8 +5558,7 @@ QString QString::fromUtf16(const ushort *unicode, int size) Returns a QString initialized with the first \a size characters of the Unicode string \a str (ISO-10646-UTF-16 encoded). - If \a size is -1 (default), \a str must be terminated - with a 0. + If \a size is -1 (default), \a str must be \\0'-terminated. This function checks for a Byte Order Mark (BOM). If it is missing, host byte order is assumed. @@ -5695,8 +5578,7 @@ QString QString::fromUtf16(const ushort *unicode, int size) Returns a QString initialized with the first \a size characters of the Unicode string \a str (ISO-10646-UCS-4 encoded). - If \a size is -1 (default), \a str must be terminated - with a 0. + If \a size is -1 (default), \a str must be \\0'-terminated. \sa toUcs4(), fromUtf16(), utf16(), setUtf16(), fromWCharArray(), fromStdU32String() */ @@ -5707,8 +5589,7 @@ QString QString::fromUtf16(const ushort *unicode, int size) Returns a QString initialized with the first \a size characters of the Unicode string \a unicode (ISO-10646-UCS-4 encoded). - If \a size is -1 (default), \a unicode must be terminated - with a 0. + If \a size is -1 (default), \a unicode must be \\0'-terminated. \sa toUcs4(), fromUtf16(), utf16(), setUtf16(), fromWCharArray(), fromStdU32String() */ @@ -5721,7 +5602,7 @@ QString QString::fromUcs4(const uint *unicode, int size) while (unicode[size] != 0) ++size; } - return QUtf32::convertToUnicode((const char *)unicode, size*4, 0); + return QUtf32::convertToUnicode((const char *)unicode, size*4, nullptr); } @@ -5786,7 +5667,7 @@ QString QString::simplified_helper(QString &str) namespace { template <typename StringView> - StringView qt_trimmed(StringView s) Q_DECL_NOTHROW + StringView qt_trimmed(StringView s) noexcept { auto begin = s.begin(); auto end = s.end(); @@ -5810,12 +5691,12 @@ namespace { \sa QString::trimmed(), QStringView::trimmed(), QLatin1String::trimmed() */ -QStringView QtPrivate::trimmed(QStringView s) Q_DECL_NOTHROW +QStringView QtPrivate::trimmed(QStringView s) noexcept { return qt_trimmed(s); } -QLatin1String QtPrivate::trimmed(QLatin1String s) Q_DECL_NOTHROW +QLatin1String QtPrivate::trimmed(QLatin1String s) noexcept { return qt_trimmed(s); } @@ -5874,6 +5755,15 @@ QString QString::trimmed_helper(QString &str) were a QChar &. If you assign to it, the assignment will apply to the character in the QString from which you got the reference. + \note Before Qt 5.14 it was possible to use this operator to access + a character at an out-of-bounds position in the string, and + then assign to such a position, causing the string to be + automatically resized. Furthermore, assigning a value to the + returned QCharRef would cause a detach of the string, even if the + string has been copied in the meanwhile (and the QCharRef kept + alive while the copy was taken). These behaviors are deprecated, + and will be changed in a future version of Qt. + \sa at() */ @@ -6353,7 +6243,7 @@ QString& QString::fill(QChar ch, int size) Same as compare(*this, \a other, \a cs). */ -int QString::compare(const QString &other, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +int QString::compare(const QString &other, Qt::CaseSensitivity cs) const noexcept { return qt_compare_strings(*this, other, cs); } @@ -6364,7 +6254,7 @@ int QString::compare(const QString &other, Qt::CaseSensitivity cs) const Q_DECL_ \since 4.5 */ int QString::compare_helper(const QChar *data1, int length1, const QChar *data2, int length2, - Qt::CaseSensitivity cs) Q_DECL_NOTHROW + Qt::CaseSensitivity cs) noexcept { Q_ASSERT(length1 >= 0); Q_ASSERT(length2 >= 0); @@ -6379,7 +6269,7 @@ int QString::compare_helper(const QChar *data1, int length1, const QChar *data2, Same as compare(*this, \a other, \a cs). */ -int QString::compare(QLatin1String other, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +int QString::compare(QLatin1String other, Qt::CaseSensitivity cs) const noexcept { return qt_compare_strings(*this, other, cs); } @@ -6425,7 +6315,7 @@ int QString::compare_helper(const QChar *data1, int length1, const char *data2, \since 4.5 */ int QString::compare_helper(const QChar *data1, int length1, QLatin1String s2, - Qt::CaseSensitivity cs) Q_DECL_NOTHROW + Qt::CaseSensitivity cs) noexcept { Q_ASSERT(length1 >= 0); Q_ASSERT(data1 || length1 == 0); @@ -6718,7 +6608,7 @@ namespace QUnicodeTables { this function requires to be a valid, empty string) and \c{s} contains the only copy of the string, without reallocation (thus, \a it is still valid). - There's one pathological case left: when the in-place conversion needs to + There is one pathological case left: when the in-place conversion needs to reallocate memory to grow the buffer. In that case, we need to adjust the \a it pointer. */ @@ -6727,7 +6617,7 @@ Q_NEVER_INLINE static QString detachAndConvertCase(T &str, QStringIterator it) { Q_ASSERT(!str.isEmpty()); - QString s = qMove(str); // will copy if T is const QString + QString s = std::move(str); // will copy if T is const QString QChar *pp = s.begin() + it.index(); // will detach if necessary do { @@ -6785,7 +6675,7 @@ static QString convertCase(T &str) return detachAndConvertCase<Traits>(str, it); } } - return qMove(str); + return std::move(str); } } // namespace QUnicodeTables @@ -6839,6 +6729,7 @@ QString QString::toUpper_helper(QString &str) return QUnicodeTables::convertCase<QUnicodeTables::UppercaseTraits>(str); } +#if QT_DEPRECATED_SINCE(5, 14) /*! \obsolete @@ -6852,6 +6743,7 @@ QString &QString::sprintf(const char *cformat, ...) va_end(ap); return *this; } +#endif // ### Qt 6: Consider whether this function shouldn't be removed See task 202871. /*! @@ -6876,7 +6768,7 @@ QString &QString::sprintf(const char *cformat, ...) \warning We do not recommend using QString::asprintf() in new Qt code. Instead, consider using QTextStream or arg(), both of which support Unicode strings seamlessly and are type-safe. - Here's an example that uses QTextStream: + Here is an example that uses QTextStream: \snippet qstring/main.cpp 64 @@ -6897,6 +6789,7 @@ QString QString::asprintf(const char *cformat, ...) return s; } +#if QT_DEPRECATED_SINCE(5, 14) /*! \obsolete @@ -6906,6 +6799,7 @@ QString &QString::vsprintf(const char *cformat, va_list ap) { return *this = vasprintf(cformat, ap); } +#endif static void append_utf8(QString &qs, const char *cs, int len) { @@ -6915,7 +6809,7 @@ static void append_utf8(QString &qs, const char *cs, int len) qs.resize(newEnd - qs.constData()); } -static uint parse_flag_characters(const char * &c) Q_DECL_NOTHROW +static uint parse_flag_characters(const char * &c) noexcept { uint flags = QLocaleData::ZeroPadExponent; while (true) { @@ -6952,7 +6846,7 @@ static int parse_field_width(const char * &c) enum LengthMod { lm_none, lm_hh, lm_h, lm_l, lm_ll, lm_L, lm_j, lm_z, lm_t }; -static inline bool can_consume(const char * &c, char ch) Q_DECL_NOTHROW +static inline bool can_consume(const char * &c, char ch) noexcept { if (*c == ch) { ++c; @@ -6961,7 +6855,7 @@ static inline bool can_consume(const char * &c, char ch) Q_DECL_NOTHROW return false; } -static LengthMod parse_length_modifier(const char * &c) Q_DECL_NOTHROW +static LengthMod parse_length_modifier(const char * &c) noexcept { switch (*c++) { case 'h': return can_consume(c, 'h') ? lm_hh : lm_h; @@ -7237,7 +7131,7 @@ QString QString::vasprintf(const char *cformat, va_list ap) base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7279,7 +7173,7 @@ qlonglong QString::toIntegral_helper(const QChar *data, int len, bool *ok, int b base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7323,7 +7217,7 @@ qulonglong QString::toIntegral_helper(const QChar *data, uint len, bool *ok, int base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7354,7 +7248,7 @@ long QString::toLong(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7384,7 +7278,7 @@ ulong QString::toULong(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7413,7 +7307,7 @@ int QString::toInt(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7442,7 +7336,7 @@ uint QString::toUInt(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7471,7 +7365,7 @@ short QString::toShort(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -7502,7 +7396,7 @@ ushort QString::toUShort(bool *ok, int base) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for other reasons (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \snippet qstring/main.cpp 66 @@ -7541,7 +7435,7 @@ double QString::toDouble(bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for other reasons (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. \warning The QString content may only contain valid numerical characters @@ -7786,10 +7680,10 @@ static ResultList splitString(const StringSource &source, const QChar *sep, QString::SplitBehavior behavior, Qt::CaseSensitivity cs, const int separatorSize) { ResultList list; - int start = 0; - int end; - int extra = 0; - while ((end = qFindString(source.constData(), source.size(), start + extra, sep, separatorSize, cs)) != -1) { + typename StringSource::size_type start = 0; + typename StringSource::size_type end; + typename StringSource::size_type extra = 0; + while ((end = QtPrivate::findString(QStringView(source.constData(), source.size()), start + extra, QStringView(sep, separatorSize), cs)) != -1) { if (start != end || behavior == QString::KeepEmptyParts) list.append(source.mid(start, end - start)); start = end + separatorSize; @@ -7843,7 +7737,7 @@ QStringList QString::split(const QString &sep, SplitBehavior behavior, Qt::CaseS the result. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \since 5.4 \sa QStringRef split() @@ -7877,7 +7771,7 @@ QVector<QStringRef> QString::splitRef(QChar sep, SplitBehavior behavior, Qt::Cas the result. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \since 5.4 */ @@ -7926,17 +7820,17 @@ static ResultList splitString(const QString &source, MidMethod mid, const QRegEx does not match anywhere in the string, split() returns a single-element list containing this string. - Here's an example where we extract the words in a sentence + Here is an example where we extract the words in a sentence using one or more whitespace characters as the separator: \snippet qstring/main.cpp 59 - Here's a similar example, but this time we use any sequence of + Here is a similar example, but this time we use any sequence of non-word characters as the separator: \snippet qstring/main.cpp 60 - Here's a third example where we use a zero-length assertion, + Here is a third example where we use a zero-length assertion, \b{\\b} (word boundary), to split the string into an alternating sequence of non-word and word tokens: @@ -7959,7 +7853,7 @@ QStringList QString::split(const QRegExp &rx, SplitBehavior behavior) const single-element vector containing this string reference. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \sa QStringRef split() */ @@ -8008,17 +7902,17 @@ static ResultList splitString(const QString &source, MidMethod mid, const QRegul does not match anywhere in the string, split() returns a single-element list containing this string. - Here's an example where we extract the words in a sentence + Here is an example where we extract the words in a sentence using one or more whitespace characters as the separator: \snippet qstring/main.cpp 90 - Here's a similar example, but this time we use any sequence of + Here is a similar example, but this time we use any sequence of non-word characters as the separator: \snippet qstring/main.cpp 91 - Here's a third example where we use a zero-length assertion, + Here is a third example where we use a zero-length assertion, \b{\\b} (word boundary), to split the string into an alternating sequence of non-word and word tokens: @@ -8041,7 +7935,7 @@ QStringList QString::split(const QRegularExpression &re, SplitBehavior behavior) single-element vector containing this string reference. \note All references are valid as long this string is alive. Destroying this - string will cause all references be dangling pointers. + string will cause all references to be dangling pointers. \sa split() QStringRef */ @@ -8123,7 +8017,7 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar:: version = QChar::currentUnicodeVersion(); } else if (int(version) <= NormalizationCorrectionsVersionMax) { const QString &s = *data; - QChar *d = 0; + QChar *d = nullptr; for (int i = 0; i < NumNormalizationCorrections; ++i) { const NormalizationCorrection &n = uc_normalization_corrections[i]; if (n.version > version) { @@ -8860,19 +8754,23 @@ QString QString::arg(double a, int fieldWidth, char fmt, int prec, QChar fillCha return replaceArgEscapes(*this, d, fieldWidth, arg, locale_arg, fillChar); } -static int getEscape(const QChar *uc, int *pos, int len, int maxNumber = 999) +static inline ushort to_unicode(const QChar c) { return c.unicode(); } +static inline ushort to_unicode(const char c) { return QLatin1Char{c}.unicode(); } + +template <typename Char> +static int getEscape(const Char *uc, qsizetype *pos, qsizetype len, int maxNumber = 999) { int i = *pos; ++i; if (i < len && uc[i] == QLatin1Char('L')) ++i; if (i < len) { - int escape = uc[i].unicode() - '0'; + int escape = to_unicode(uc[i]) - '0'; if (uint(escape) >= 10U) return -1; ++i; while (i < len) { - int digit = uc[i].unicode() - '0'; + int digit = to_unicode(uc[i]) - '0'; if (uint(digit) >= 10U) break; escape = (escape * 10) + digit; @@ -8923,18 +8821,23 @@ static int getEscape(const QChar *uc, int *pos, int len, int maxNumber = 999) namespace { struct Part { - Part() : stringRef(), number(0) {} - Part(const QString &s, int pos, int len, int num = -1) Q_DECL_NOTHROW - : stringRef(&s, pos, len), number(num) {} + Part() = default; // for QVarLengthArray; do not use + Q_DECL_CONSTEXPR Part(QStringView s, int num = -1) + : tag{QtPrivate::ArgBase::U16}, number{num}, data{s.utf16()}, size{s.size()} {} + Q_DECL_CONSTEXPR Part(QLatin1String s, int num = -1) + : tag{QtPrivate::ArgBase::L1}, number{num}, data{s.data()}, size{s.size()} {} + + void reset(QStringView s) noexcept { *this = {s, number}; } + void reset(QLatin1String s) noexcept { *this = {s, number}; } - QStringRef stringRef; + QtPrivate::ArgBase::Tag tag; int number; + const void *data; + qsizetype size; }; } // unnamed namespace -template <> -class QTypeInfo<Part> : public QTypeInfoMerger<Part, QStringRef, int> {}; // Q_DECLARE_METATYPE - +Q_DECLARE_TYPEINFO(Part, Q_PRIMITIVE_TYPE); namespace { @@ -8943,24 +8846,25 @@ enum { ExpectedParts = 32 }; typedef QVarLengthArray<Part, ExpectedParts> ParseResult; typedef QVarLengthArray<int, ExpectedParts/2> ArgIndexToPlaceholderMap; -static ParseResult parseMultiArgFormatString(const QString &s) +template <typename StringView> +static ParseResult parseMultiArgFormatString(StringView s) { ParseResult result; - const QChar *uc = s.constData(); - const int len = s.size(); - const int end = len - 1; - int i = 0; - int last = 0; + const auto uc = s.data(); + const auto len = s.size(); + const auto end = len - 1; + qsizetype i = 0; + qsizetype last = 0; while (i < end) { if (uc[i] == QLatin1Char('%')) { - int percent = i; + qsizetype percent = i; int number = getEscape(uc, &i, len); if (number != -1) { if (last != percent) - result.push_back(Part(s, last, percent - last)); // literal text (incl. failed placeholders) - result.push_back(Part(s, percent, i - percent, number)); // parsed placeholder + result.push_back(Part{s.mid(last, percent - last)}); // literal text (incl. failed placeholders) + result.push_back(Part{s.mid(percent, i - percent), number}); // parsed placeholder last = i; continue; } @@ -8969,7 +8873,7 @@ static ParseResult parseMultiArgFormatString(const QString &s) } if (last < len) - result.push_back(Part(s, last, len - last)); // trailing literal text + result.push_back(Part{s.mid(last, len - last)}); // trailing literal text return result; } @@ -8978,9 +8882,9 @@ static ArgIndexToPlaceholderMap makeArgIndexToPlaceholderMap(const ParseResult & { ArgIndexToPlaceholderMap result; - for (ParseResult::const_iterator it = parts.begin(), end = parts.end(); it != end; ++it) { - if (it->number >= 0) - result.push_back(it->number); + for (Part part : parts) { + if (part.number >= 0) + result.push_back(part.number); } std::sort(result.begin(), result.end()); @@ -8990,54 +8894,107 @@ static ArgIndexToPlaceholderMap makeArgIndexToPlaceholderMap(const ParseResult & return result; } -static int resolveStringRefsAndReturnTotalSize(ParseResult &parts, const ArgIndexToPlaceholderMap &argIndexToPlaceholderMap, const QString *args[]) +static qsizetype resolveStringRefsAndReturnTotalSize(ParseResult &parts, const ArgIndexToPlaceholderMap &argIndexToPlaceholderMap, const QtPrivate::ArgBase *args[]) { - int totalSize = 0; - for (ParseResult::iterator pit = parts.begin(), end = parts.end(); pit != end; ++pit) { - if (pit->number != -1) { - const ArgIndexToPlaceholderMap::const_iterator ait - = std::find(argIndexToPlaceholderMap.begin(), argIndexToPlaceholderMap.end(), pit->number); - if (ait != argIndexToPlaceholderMap.end()) - pit->stringRef = QStringRef(args[ait - argIndexToPlaceholderMap.begin()]); + using namespace QtPrivate; + qsizetype totalSize = 0; + for (Part &part : parts) { + if (part.number != -1) { + const auto it = std::find(argIndexToPlaceholderMap.begin(), argIndexToPlaceholderMap.end(), part.number); + if (it != argIndexToPlaceholderMap.end()) { + const auto &arg = *args[it - argIndexToPlaceholderMap.begin()]; + switch (arg.tag) { + case ArgBase::L1: + part.reset(static_cast<const QLatin1StringArg&>(arg).string); + break; + case ArgBase::U8: + Q_UNREACHABLE(); // waiting for QUtf8String... + break; + case ArgBase::U16: + part.reset(static_cast<const QStringViewArg&>(arg).string); + break; + } + } } - totalSize += pit->stringRef.size(); + totalSize += part.size; } return totalSize; } } // unnamed namespace +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QString QString::multiArg(int numArgs, const QString **args) const { + QVarLengthArray<QtPrivate::QStringViewArg, 9> sva; + sva.reserve(numArgs); + QVarLengthArray<const QtPrivate::ArgBase *, 9> pointers; + pointers.reserve(numArgs); + for (int i = 0; i < numArgs; ++i) { + sva.push_back(QtPrivate::qStringLikeToArg(*args[i])); + pointers.push_back(&sva.back()); + } + return QtPrivate::argToQString(qToStringViewIgnoringNull(*this), static_cast<size_t>(numArgs), pointers.data()); +} +#endif + +Q_ALWAYS_INLINE QString to_string(QLatin1String s) noexcept { return s; } +Q_ALWAYS_INLINE QString to_string(QStringView s) noexcept { return s.toString(); } + +template <typename StringView> +static QString argToQStringImpl(StringView pattern, size_t numArgs, const QtPrivate::ArgBase **args) +{ // Step 1-2 above - ParseResult parts = parseMultiArgFormatString(*this); + ParseResult parts = parseMultiArgFormatString(pattern); // 3-4 ArgIndexToPlaceholderMap argIndexToPlaceholderMap = makeArgIndexToPlaceholderMap(parts); - if (argIndexToPlaceholderMap.size() > numArgs) // 3a - argIndexToPlaceholderMap.resize(numArgs); - else if (argIndexToPlaceholderMap.size() < numArgs) // 3b - qWarning("QString::arg: %d argument(s) missing in %s", - numArgs - argIndexToPlaceholderMap.size(), toLocal8Bit().data()); + if (static_cast<size_t>(argIndexToPlaceholderMap.size()) > numArgs) // 3a + argIndexToPlaceholderMap.resize(int(numArgs)); + else if (Q_UNLIKELY(static_cast<size_t>(argIndexToPlaceholderMap.size()) < numArgs)) // 3b + qWarning("QString::arg: %d argument(s) missing in %ls", + int(numArgs - argIndexToPlaceholderMap.size()), qUtf16Printable(to_string(pattern))); // 5 - const int totalSize = resolveStringRefsAndReturnTotalSize(parts, argIndexToPlaceholderMap, args); + const qsizetype totalSize = resolveStringRefsAndReturnTotalSize(parts, argIndexToPlaceholderMap, args); // 6: QString result(totalSize, Qt::Uninitialized); - QChar *out = result.data(); - - for (ParseResult::const_iterator it = parts.begin(), end = parts.end(); it != end; ++it) { - if (const int sz = it->stringRef.size()) { - memcpy(out, it->stringRef.constData(), sz * sizeof(QChar)); - out += sz; + auto out = const_cast<QChar*>(result.constData()); + + for (Part part : parts) { + switch (part.tag) { + case QtPrivate::ArgBase::L1: + if (part.size) { + qt_from_latin1(reinterpret_cast<ushort*>(out), + reinterpret_cast<const char*>(part.data), part.size); + } + break; + case QtPrivate::ArgBase::U8: + Q_UNREACHABLE(); // waiting for QUtf8String + break; + case QtPrivate::ArgBase::U16: + if (part.size) + memcpy(out, part.data, part.size * sizeof(QChar)); + break; } + out += part.size; } return result; } +QString QtPrivate::argToQString(QStringView pattern, size_t n, const ArgBase **args) +{ + return argToQStringImpl(pattern, n, args); +} + +QString QtPrivate::argToQString(QLatin1String pattern, size_t n, const ArgBase **args) +{ + return argToQStringImpl(pattern, n, args); +} + /*! \fn bool QString::isSimpleText() const \internal @@ -9178,7 +9135,7 @@ bool QString::isRightToLeft() const to create a deep copy of the data, ensuring that the raw data isn't modified. - Here's an example of how we can use a QRegularExpression on raw data in + Here is an example of how we can use a QRegularExpression on raw data in memory without requiring to copy the data into a QString: \snippet qstring/main.cpp 22 @@ -9446,11 +9403,11 @@ QString &QString::setRawData(const QChar *unicode, int size) The range \c{[first,last)} must remain valid for the lifetime of this Latin-1 string object. - Passing \c nullptr as \a first is safe if \a last is \c nullptr, + Passing \nullptr as \a first is safe if \a last is \nullptr, too, and results in a null Latin-1 string. The behavior is undefined if \a last precedes \a first, \a first - is \c nullptr and \a last is not, or if \c{last - first > + is \nullptr and \a last is not, or if \c{last - first > INT_MAX}. */ @@ -9591,6 +9548,58 @@ QString &QString::setRawData(const QChar *unicode, int size) */ /*! + \fn int QLatin1String::indexOf(QStringView str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \fn int QLatin1String::indexOf(QLatin1String l1, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \fn int QLatin1String::indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \since 5.14 + + Returns the index position of the first occurrence of the string-view \a str, + Latin-1 string \a l1, or character \a ch, respectively, in this Latin-1 string, + searching forward from index position \a from. Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + If \a from is -1, the search starts at the last character; if it is + -2, at the next to last character and so on. + + \sa QString::indexOf() +*/ + +/*! + \fn bool QLatin1String::contains(QStringView str, Qt::CaseSensitivity cs) const + \fn bool QLatin1String::contains(QLatin1String l1, Qt::CaseSensitivity cs) const + \fn bool QLatin1String::contains(QChar c, Qt::CaseSensitivity cs) const + \since 5.14 + + Returns \c true if this Latin-1 string contains an occurrence of the string-view + \a str, Latin-1 string \a l1, or character \a ch; otherwise returns \c false. + + If \a cs is Qt::CaseSensitive (the default), the search is + case-sensitive; otherwise the search is case-insensitive. + + \sa indexOf(), QStringView::contains(), QStringView::indexOf(), QString::indexOf() +*/ + +/*! + \fn int QLatin1String::lastIndexOf(QStringView str, int from, Qt::CaseSensitivity cs) const + \fn int QLatin1String::lastIndexOf(QLatin1String l1, int from, Qt::CaseSensitivity cs) const + \fn int QLatin1String::lastIndexOf(QChar c, int from, Qt::CaseSensitivity cs) const + \since 5.14 + + Returns the index position of the last occurrence of the string-view \a str, + Latin-1 string \a l1, or character \a ch, respectively, in this Latin-1 string, + searching backward from index position \a from. If \a from is -1 (default), + the search starts at the last character; if \a from is -2, at the next to last + character and so on. Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + \sa indexOf(), QStringView::lastIndexOf(), QStringView::indexOf(), QString::indexOf() +*/ + +/*! \fn QLatin1String::const_iterator QLatin1String::begin() const \since 5.10 @@ -10337,8 +10346,8 @@ ownership of it, no memory is freed when instances are destroyed. /*! \fn bool QStringRef::isNull() const - Returns \c true if string() returns a null pointer or a pointer to a - null string; otherwise returns \c true. + Returns \c true if this string reference does not reference a string or if + the string it references is null (i.e. QString::isNull() is true). \sa size() */ @@ -10358,7 +10367,7 @@ ownership of it, no memory is freed when instances are destroyed. Returns a Unicode representation of the string reference. Since the data stems directly from the referenced string, it is not - null-terminated unless the string reference includes the string's + \\0'-terminated unless the string reference includes the string's null terminator. \sa string() @@ -10493,7 +10502,7 @@ QString QStringRef::toString() const { Returns \c true if string reference \a s1 is lexically equal to string reference \a s2; otherwise returns \c false. */ -bool operator==(const QStringRef &s1,const QStringRef &s2) Q_DECL_NOTHROW +bool operator==(const QStringRef &s1,const QStringRef &s2) noexcept { return s1.size() == s2.size() && qt_compare_strings(s1, s2, Qt::CaseSensitive) == 0; } @@ -10503,7 +10512,7 @@ bool operator==(const QStringRef &s1,const QStringRef &s2) Q_DECL_NOTHROW Returns \c true if string \a s1 is lexically equal to string reference \a s2; otherwise returns \c false. */ -bool operator==(const QString &s1,const QStringRef &s2) Q_DECL_NOTHROW +bool operator==(const QString &s1,const QStringRef &s2) noexcept { return s1.size() == s2.size() && qt_compare_strings(s1, s2, Qt::CaseSensitive) == 0; } @@ -10513,7 +10522,7 @@ bool operator==(const QString &s1,const QStringRef &s2) Q_DECL_NOTHROW Returns \c true if string \a s1 is lexically equal to string reference \a s2; otherwise returns \c false. */ -bool operator==(QLatin1String s1, const QStringRef &s2) Q_DECL_NOTHROW +bool operator==(QLatin1String s1, const QStringRef &s2) noexcept { if (s1.size() != s2.size()) return false; @@ -10532,7 +10541,7 @@ bool operator==(QLatin1String s1, const QStringRef &s2) Q_DECL_NOTHROW expect. Consider sorting user-interface strings using the QString::localeAwareCompare() function. */ -bool operator<(const QStringRef &s1,const QStringRef &s2) Q_DECL_NOTHROW +bool operator<(const QStringRef &s1,const QStringRef &s2) noexcept { return qt_compare_strings(s1, s2, Qt::CaseSensitive) < 0; } @@ -11145,6 +11154,7 @@ QStringRef QString::midRef(int position, int n) const \sa QString::chop(), truncate() */ +#if QT_STRINGVIEW_LEVEL < 2 /*! \since 4.8 @@ -11162,8 +11172,28 @@ QStringRef QString::midRef(int position, int n) const */ int QStringRef::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) const { - return qFindString(unicode(), length(), from, str.unicode(), str.length(), cs); + // ### Qt6: qsize + return int(QtPrivate::findString(QStringView(unicode(), length()), from, QStringView(str.unicode(), str.length()), cs)); } +#endif // QT_STRINGVIEW_LEVEL < 2 + +/*! + \fn int QStringRef::indexOf(QStringView str, int from, Qt::CaseSensitivity cs) const + \since 5.14 + \overload indexOf() + + Returns the index position of the first occurrence of the string view \a str + in this string reference, searching forward from index position \a from. + Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + If \a from is -1, the search starts at the last character; if it is + -2, at the next to last character and so on. + + \sa QString::indexOf(), QStringView::indexOf(), lastIndexOf(), contains(), count() +*/ /*! \since 4.8 @@ -11177,7 +11207,8 @@ int QStringRef::indexOf(const QString &str, int from, Qt::CaseSensitivity cs) co */ int QStringRef::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const { - return findChar(unicode(), length(), ch, from, cs); + // ### Qt6: qsize + return int(qFindChar(QStringView(unicode(), length()), ch, from, cs)); } /*! @@ -11197,9 +11228,11 @@ int QStringRef::indexOf(QChar ch, int from, Qt::CaseSensitivity cs) const */ int QStringRef::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const { - return qt_find_latin1_string(unicode(), size(), str, from, cs); + // ### Qt6: qsize + return int(QtPrivate::findString(QStringView(unicode(), size()), from, str, cs)); } +#if QT_STRINGVIEW_LEVEL < 2 /*! \since 4.8 @@ -11216,8 +11249,10 @@ int QStringRef::indexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) con */ int QStringRef::indexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const { - return qFindString(unicode(), size(), from, str.unicode(), str.size(), cs); + // ### Qt6: qsize + return int(QtPrivate::findString(QStringView(unicode(), size()), from, QStringView(str.unicode(), str.size()), cs)); } +#endif // QT_STRINGVIEW_LEVEL < 2 /*! \since 4.8 @@ -11235,7 +11270,8 @@ int QStringRef::indexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) */ int QStringRef::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs) const { - return lastIndexOf(QStringRef(&str), from, cs); + // ### Qt6: qsize + return int(QtPrivate::lastIndexOf(*this, from, str, cs)); } /*! @@ -11249,28 +11285,8 @@ int QStringRef::lastIndexOf(const QString &str, int from, Qt::CaseSensitivity cs */ int QStringRef::lastIndexOf(QChar ch, int from, Qt::CaseSensitivity cs) const { - return qt_last_index_of(unicode(), size(), ch, from, cs); -} - -template<typename T> -static int last_index_of_impl(const QStringRef &haystack, int from, const T &needle, Qt::CaseSensitivity cs) -{ - const int sl = needle.size(); - if (sl == 1) - return haystack.lastIndexOf(needle.at(0), from, cs); - - const int l = haystack.size(); - if (from < 0) - from += l; - int delta = l - sl; - if (from == l && sl == 0) - return from; - if (uint(from) >= uint(l) || delta < 0) - return -1; - if (from > delta) - from = delta; - - return lastIndexOfHelper(haystack, from, needle, cs); + // ### Qt6: qsize + return int(qLastIndexOf(*this, ch, from, cs)); } /*! @@ -11290,7 +11306,8 @@ static int last_index_of_impl(const QStringRef &haystack, int from, const T &nee */ int QStringRef::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) const { - return last_index_of_impl(*this, from, str, cs); + // ### Qt6: qsize + return int(QtPrivate::lastIndexOf(*this, from, str, cs)); } /*! @@ -11310,10 +11327,28 @@ int QStringRef::lastIndexOf(QLatin1String str, int from, Qt::CaseSensitivity cs) */ int QStringRef::lastIndexOf(const QStringRef &str, int from, Qt::CaseSensitivity cs) const { - return last_index_of_impl(*this, from, str, cs); + // ### Qt6: qsize + return int(QtPrivate::lastIndexOf(*this, from, str, cs)); } /*! + \fn int QStringRef::lastIndexOf(QStringView str, int from, Qt::CaseSensitivity cs) const + \since 5.14 + \overload lastIndexOf() + + Returns the index position of the last occurrence of the string view \a + str in this string, searching backward from index position \a + from. If \a from is -1 (default), the search starts at the last + character; if \a from is -2, at the next to last character and so + on. Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + \sa indexOf(), contains(), count() +*/ + +/*! \since 4.8 Returns the number of (potentially overlapping) occurrences of the string \a str in this string reference. @@ -11325,7 +11360,8 @@ int QStringRef::lastIndexOf(const QStringRef &str, int from, Qt::CaseSensitivity */ int QStringRef::count(const QString &str, Qt::CaseSensitivity cs) const { - return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs); + // ### Qt6: qsize + return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs)); } /*! @@ -11342,7 +11378,8 @@ int QStringRef::count(const QString &str, Qt::CaseSensitivity cs) const */ int QStringRef::count(QChar ch, Qt::CaseSensitivity cs) const { - return qt_string_count(unicode(), size(), ch, cs); + // ### Qt6: qsize + return int(qt_string_count(QStringView(unicode(), size()), ch, cs)); } /*! @@ -11359,7 +11396,8 @@ int QStringRef::count(QChar ch, Qt::CaseSensitivity cs) const */ int QStringRef::count(const QStringRef &str, Qt::CaseSensitivity cs) const { - return qt_string_count(unicode(), size(), str.unicode(), str.size(), cs); + // ### Qt6: qsize + return int(qt_string_count(QStringView(unicode(), size()), QStringView(str.unicode(), str.size()), cs)); } /*! @@ -11544,7 +11582,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const return qt_ends_with(*this, str, cs); } - +#if QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QStringRef::contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \since 4.8 @@ -11556,6 +11594,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const \sa indexOf(), count() */ +#endif // QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QStringRef::contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const @@ -11570,6 +11609,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const */ +#if QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QStringRef::contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const \overload contains() \since 4.8 @@ -11582,6 +11622,7 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const \sa indexOf(), count() */ +#endif // QT_STRINGVIEW_LEVEL < 2 /*! \fn bool QStringRef::contains(QLatin1String str, Qt::CaseSensitivity cs) const \since 4.8 @@ -11596,57 +11637,41 @@ bool QStringRef::endsWith(const QStringRef &str, Qt::CaseSensitivity cs) const \sa indexOf(), count() */ -static inline int qt_last_index_of(const QChar *haystack, int haystackLen, QChar needle, - int from, Qt::CaseSensitivity cs) -{ - ushort c = needle.unicode(); - if (from < 0) - from += haystackLen; - if (uint(from) >= uint(haystackLen)) - return -1; - if (from >= 0) { - const ushort *b = reinterpret_cast<const ushort*>(haystack); - const ushort *n = b + from; - if (cs == Qt::CaseSensitive) { - for (; n >= b; --n) - if (*n == c) - return n - b; - } else { - c = foldCase(c); - for (; n >= b; --n) - if (foldCase(*n) == c) - return n - b; - } - } - return -1; +/*! \fn bool QStringRef::contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \since 5.14 + \overload contains() + Returns \c true if this string reference contains an occurrence of + the string view \a str; otherwise returns \c false. -} + If \a cs is Qt::CaseSensitive (default), the search is + case sensitive; otherwise the search is case insensitive. -static inline int qt_string_count(const QChar *haystack, int haystackLen, - const QChar *needle, int needleLen, - Qt::CaseSensitivity cs) + \sa indexOf(), count() +*/ + +static inline qsizetype qt_string_count(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) { - int num = 0; - int i = -1; - if (haystackLen > 500 && needleLen > 5) { - QStringMatcher matcher(needle, needleLen, cs); - while ((i = matcher.indexIn(haystack, haystackLen, i + 1)) != -1) + qsizetype num = 0; + qsizetype i = -1; + if (haystack.size() > 500 && needle.size() > 5) { + QStringMatcher matcher(needle, cs); + while ((i = matcher.indexIn(haystack, i + 1)) != -1) ++num; } else { - while ((i = qFindString(haystack, haystackLen, i + 1, needle, needleLen, cs)) != -1) + while ((i = QtPrivate::findString(haystack, i + 1, needle, cs)) != -1) ++num; } return num; } -static inline int qt_string_count(const QChar *unicode, int size, QChar ch, +static inline qsizetype qt_string_count(QStringView haystack, QChar ch, Qt::CaseSensitivity cs) { ushort c = ch.unicode(); - int num = 0; - const ushort *b = reinterpret_cast<const ushort*>(unicode); - const ushort *i = b + size; + qsizetype num = 0; + const ushort *b = reinterpret_cast<const ushort*>(haystack.data()); + const ushort *i = b + haystack.size(); if (cs == Qt::CaseSensitive) { while (i != b) if (*--i == c) @@ -11660,24 +11685,8 @@ static inline int qt_string_count(const QChar *unicode, int size, QChar ch, return num; } -static inline int qt_find_latin1_string(const QChar *haystack, int size, - QLatin1String needle, - int from, Qt::CaseSensitivity cs) -{ - if (size < needle.size()) - return -1; - - const char *latin1 = needle.latin1(); - int len = needle.size(); - QVarLengthArray<ushort> s(len); - qt_from_latin1(s.data(), latin1, len); - - return qFindString(haystack, size, from, - reinterpret_cast<const QChar*>(s.constData()), len, cs); -} - template <typename Haystack, typename Needle> -bool qt_starts_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool qt_starts_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) noexcept { if (haystack.isNull()) return needle.isNull(); // historical behavior, consider changing in ### Qt 6. @@ -11729,28 +11738,28 @@ static inline bool qt_starts_with(QStringView haystack, QChar needle, Qt::CaseSe \sa QtPrivate::endsWith(), QString::endsWith(), QStringView::endsWith(), QLatin1String::endsWith() */ -bool QtPrivate::startsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::startsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept { return qt_starts_with_impl(haystack, needle, cs); } -bool QtPrivate::startsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::startsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept { return qt_starts_with_impl(haystack, needle, cs); } -bool QtPrivate::startsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::startsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept { return qt_starts_with_impl(haystack, needle, cs); } -bool QtPrivate::startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept { return qt_starts_with_impl(haystack, needle, cs); } template <typename Haystack, typename Needle> -bool qt_ends_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool qt_ends_with_impl(Haystack haystack, Needle needle, Qt::CaseSensitivity cs) noexcept { if (haystack.isNull()) return needle.isNull(); // historical behavior, consider changing in ### Qt 6. @@ -11802,26 +11811,310 @@ static inline bool qt_ends_with(QStringView haystack, QChar needle, Qt::CaseSens \sa QtPrivate::startsWith(), QString::endsWith(), QStringView::endsWith(), QLatin1String::endsWith() */ -bool QtPrivate::endsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::endsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept { return qt_ends_with_impl(haystack, needle, cs); } -bool QtPrivate::endsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::endsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept { return qt_ends_with_impl(haystack, needle, cs); } -bool QtPrivate::endsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::endsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs) noexcept { return qt_ends_with_impl(haystack, needle, cs); } -bool QtPrivate::endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +bool QtPrivate::endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs) noexcept { return qt_ends_with_impl(haystack, needle, cs); } +namespace { +template <typename Pointer> +uint foldCaseHelper(Pointer ch, Pointer start) = delete; + +template <> +uint foldCaseHelper<const QChar*>(const QChar* ch, const QChar* start) +{ + return foldCase(reinterpret_cast<const ushort*>(ch), reinterpret_cast<const ushort*>(start)); +} + +template <> +uint foldCaseHelper<const char*>(const char* ch, const char*) +{ + return foldCase(ushort(uchar(*ch))); +} + +template <typename T> +ushort valueTypeToUtf16(T t) = delete; + +template <> +ushort valueTypeToUtf16<QChar>(QChar t) +{ + return t.unicode(); +} + +template <> +ushort valueTypeToUtf16<char>(char t) +{ + return ushort(uchar(t)); +} +} + +/*! + \internal + + Returns the index position of the first occurrence of the + character \a ch in the string given by \a str and \a len, + searching forward from index + position \a from. Returns -1 if \a ch could not be found. +*/ + +static inline qsizetype qFindChar(QStringView str, QChar ch, qsizetype from, Qt::CaseSensitivity cs) noexcept +{ + if (from < 0) + from = qMax(from + str.size(), qsizetype(0)); + if (from < str.size()) { + const ushort *s = (const ushort *)str.data(); + ushort c = ch.unicode(); + const ushort *n = s + from; + const ushort *e = s + str.size(); + if (cs == Qt::CaseSensitive) { + n = QtPrivate::qustrchr(QStringView(n, e), c); + if (n != e) + return n - s; + } else { + c = foldCase(c); + --n; + while (++n != e) + if (foldCase(*n) == c) + return n - s; + } + } + return -1; +} + +qsizetype QtPrivate::findString(QStringView haystack0, qsizetype from, QStringView needle0, Qt::CaseSensitivity cs) noexcept +{ + const qsizetype l = haystack0.size(); + const qsizetype sl = needle0.size(); + if (from < 0) + from += l; + if (std::size_t(sl + from) > std::size_t(l)) + return -1; + if (!sl) + return from; + if (!l) + return -1; + + if (sl == 1) + return qFindChar(haystack0, needle0[0], from, cs); + + /* + We use the Boyer-Moore algorithm in cases where the overhead + for the skip table should pay off, otherwise we use a simple + hash function. + */ + if (l > 500 && sl > 5) + return qFindStringBoyerMoore(haystack0, from, needle0, cs); + + auto sv = [sl](const ushort *v) { return QStringView(v, sl); }; + /* + We use some hashing for efficiency's sake. Instead of + comparing strings, we compare the hash value of str with that + of a part of this QString. Only if that matches, we call + qt_string_compare(). + */ + const ushort *needle = (const ushort *)needle0.data(); + const ushort *haystack = (const ushort *)(haystack0.data()) + from; + const ushort *end = (const ushort *)(haystack0.data()) + (l - sl); + const std::size_t sl_minus_1 = sl - 1; + std::size_t hashNeedle = 0, hashHaystack = 0; + qsizetype idx; + + if (cs == Qt::CaseSensitive) { + for (idx = 0; idx < sl; ++idx) { + hashNeedle = ((hashNeedle<<1) + needle[idx]); + hashHaystack = ((hashHaystack<<1) + haystack[idx]); + } + hashHaystack -= haystack[sl_minus_1]; + + while (haystack <= end) { + hashHaystack += haystack[sl_minus_1]; + if (hashHaystack == hashNeedle + && qt_compare_strings(needle0, sv(haystack), Qt::CaseSensitive) == 0) + return haystack - (const ushort *)haystack0.data(); + + REHASH(*haystack); + ++haystack; + } + } else { + const ushort *haystack_start = (const ushort *)haystack0.data(); + for (idx = 0; idx < sl; ++idx) { + hashNeedle = (hashNeedle<<1) + foldCase(needle + idx, needle); + hashHaystack = (hashHaystack<<1) + foldCase(haystack + idx, haystack_start); + } + hashHaystack -= foldCase(haystack + sl_minus_1, haystack_start); + + while (haystack <= end) { + hashHaystack += foldCase(haystack + sl_minus_1, haystack_start); + if (hashHaystack == hashNeedle + && qt_compare_strings(needle0, sv(haystack), Qt::CaseInsensitive) == 0) + return haystack - (const ushort *)haystack0.data(); + + REHASH(foldCase(haystack, haystack_start)); + ++haystack; + } + } + return -1; +} + +template <typename Haystack> +static inline qsizetype qLastIndexOf(Haystack haystack, QChar needle, + qsizetype from, Qt::CaseSensitivity cs) noexcept +{ + if (from < 0) + from += haystack.size(); + if (std::size_t(from) >= std::size_t(haystack.size())) + return -1; + if (from >= 0) { + ushort c = needle.unicode(); + const auto b = haystack.data(); + auto n = b + from; + if (cs == Qt::CaseSensitive) { + for (; n >= b; --n) + if (valueTypeToUtf16(*n) == c) + return n - b; + } else { + c = foldCase(c); + for (; n >= b; --n) + if (foldCase(valueTypeToUtf16(*n)) == c) + return n - b; + } + } + return -1; +} + +template<typename Haystack, typename Needle> +static qsizetype qLastIndexOf(Haystack haystack0, qsizetype from, + Needle needle0, Qt::CaseSensitivity cs) noexcept +{ + const qsizetype sl = needle0.size(); + if (sl == 1) + return qLastIndexOf(haystack0, needle0.front(), from, cs); + + const qsizetype l = haystack0.size(); + if (from < 0) + from += l; + if (from == l && sl == 0) + return from; + const qsizetype delta = l - sl; + if (std::size_t(from) >= std::size_t(l) || delta < 0) + return -1; + if (from > delta) + from = delta; + + auto sv = [sl](const typename Haystack::value_type *v) { return Haystack(v, sl); }; + + auto haystack = haystack0.data(); + const auto needle = needle0.data(); + const auto *end = haystack; + haystack += from; + const std::size_t sl_minus_1 = sl - 1; + const auto *n = needle + sl_minus_1; + const auto *h = haystack + sl_minus_1; + std::size_t hashNeedle = 0, hashHaystack = 0; + qsizetype idx; + + if (cs == Qt::CaseSensitive) { + for (idx = 0; idx < sl; ++idx) { + hashNeedle = (hashNeedle << 1) + valueTypeToUtf16(*(n - idx)); + hashHaystack = (hashHaystack << 1) + valueTypeToUtf16(*(h - idx)); + } + hashHaystack -= valueTypeToUtf16(*haystack); + + while (haystack >= end) { + hashHaystack += valueTypeToUtf16(*haystack); + if (hashHaystack == hashNeedle + && qt_compare_strings(needle0, sv(haystack), Qt::CaseSensitive) == 0) + return haystack - end; + --haystack; + REHASH(valueTypeToUtf16(haystack[sl])); + } + } else { + for (idx = 0; idx < sl; ++idx) { + hashNeedle = (hashNeedle << 1) + foldCaseHelper(n - idx, needle); + hashHaystack = (hashHaystack << 1) + foldCaseHelper(h - idx, end); + } + hashHaystack -= foldCaseHelper(haystack, end); + + while (haystack >= end) { + hashHaystack += foldCaseHelper(haystack, end); + if (hashHaystack == hashNeedle + && qt_compare_strings(sv(haystack), needle0, Qt::CaseInsensitive) == 0) + return haystack - end; + --haystack; + REHASH(foldCaseHelper(haystack + sl, end)); + } + } + return -1; +} + +qsizetype QtPrivate::findString(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept +{ + if (haystack.size() < needle.size()) + return -1; + + QVarLengthArray<ushort> s(needle.size()); + qt_from_latin1(s.data(), needle.latin1(), needle.size()); + return QtPrivate::findString(haystack, from, QStringView(reinterpret_cast<const QChar*>(s.constData()), s.size()), cs); +} + +qsizetype QtPrivate::findString(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs) noexcept +{ + if (haystack.size() < needle.size()) + return -1; + + QVarLengthArray<ushort> s(haystack.size()); + qt_from_latin1(s.data(), haystack.latin1(), haystack.size()); + return QtPrivate::findString(QStringView(reinterpret_cast<const QChar*>(s.constData()), s.size()), from, needle, cs); +} + +qsizetype QtPrivate::findString(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept +{ + if (haystack.size() < needle.size()) + return -1; + + QVarLengthArray<ushort> h(haystack.size()); + qt_from_latin1(h.data(), haystack.latin1(), haystack.size()); + QVarLengthArray<ushort> n(needle.size()); + qt_from_latin1(n.data(), needle.latin1(), needle.size()); + return QtPrivate::findString(QStringView(reinterpret_cast<const QChar*>(h.constData()), h.size()), from, + QStringView(reinterpret_cast<const QChar*>(n.constData()), n.size()), cs); +} + +qsizetype QtPrivate::lastIndexOf(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs) noexcept +{ + return qLastIndexOf(haystack, from, needle, cs); +} + +qsizetype QtPrivate::lastIndexOf(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept +{ + return qLastIndexOf(haystack, from, needle, cs); +} + +qsizetype QtPrivate::lastIndexOf(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs) noexcept +{ + return qLastIndexOf(haystack, from, needle, cs); +} + +qsizetype QtPrivate::lastIndexOf(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs) noexcept +{ + return qLastIndexOf(haystack, from, needle, cs); +} + /*! \since 4.8 @@ -11900,7 +12193,7 @@ QByteArray QStringRef::toUtf8() const this string is replaced by the Unicode's replacement character (QChar::ReplacementCharacter, which corresponds to \c{U+FFFD}). - The returned vector is not NUL terminated. + The returned vector is not \\0'-terminated. \sa toUtf8(), toLatin1(), toLocal8Bit(), QTextCodec */ @@ -11939,7 +12232,7 @@ QStringRef QStringRef::trimmed() const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -11964,7 +12257,7 @@ qint64 QStringRef::toLongLong(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -11991,7 +12284,7 @@ quint64 QStringRef::toULongLong(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -12018,7 +12311,7 @@ long QStringRef::toLong(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -12044,7 +12337,7 @@ ulong QStringRef::toULong(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -12069,7 +12362,7 @@ int QStringRef::toInt(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -12094,7 +12387,7 @@ uint QStringRef::toUInt(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -12119,7 +12412,7 @@ short QStringRef::toShort(bool *ok, int base) const base, which is 10 by default and must be between 2 and 36, or 0. Returns 0 if the conversion fails. - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. If \a base is 0, the C language convention is used: If the string @@ -12146,7 +12439,7 @@ ushort QStringRef::toUShort(bool *ok, int base) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for other reasons (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. The string conversion will always happen in the 'C' locale. For locale @@ -12172,7 +12465,7 @@ double QStringRef::toDouble(bool *ok) const Returns an infinity if the conversion overflows or 0.0 if the conversion fails for other reasons (e.g. underflow). - If \a ok is not \c nullptr, failure is reported by setting *\a{ok} + If \a ok is not \nullptr, failure is reported by setting *\a{ok} to \c false, and success by setting *\a{ok} to \c true. The string conversion will always happen in the 'C' locale. For locale @@ -12274,7 +12567,7 @@ QString QString::toHtmlEscaped() const /*! \internal */ -void QAbstractConcatenable::appendLatin1To(const char *a, int len, QChar *out) Q_DECL_NOTHROW +void QAbstractConcatenable::appendLatin1To(const char *a, int len, QChar *out) noexcept { qt_from_latin1(reinterpret_cast<ushort *>(out), a, uint(len)); } diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 6be3dcdbe1..b56b37edf3 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -2,6 +2,7 @@ ** ** Copyright (C) 2016 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. +** Copyright (C) 2019 Mail.ru Group. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -91,19 +92,22 @@ template <typename T> class QVector; class QLatin1String { public: - Q_DECL_CONSTEXPR inline QLatin1String() Q_DECL_NOTHROW : m_size(0), m_data(nullptr) {} - Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s) Q_DECL_NOTHROW : m_size(s ? int(strlen(s)) : 0), m_data(s) {} + Q_DECL_CONSTEXPR inline QLatin1String() noexcept : m_size(0), m_data(nullptr) {} + Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s) noexcept : m_size(s ? int(strlen(s)) : 0), m_data(s) {} Q_DECL_CONSTEXPR explicit QLatin1String(const char *f, const char *l) : QLatin1String(f, int(l - f)) {} - Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int sz) Q_DECL_NOTHROW : m_size(sz), m_data(s) {} - inline explicit QLatin1String(const QByteArray &s) Q_DECL_NOTHROW : m_size(int(qstrnlen(s.constData(), s.size()))), m_data(s.constData()) {} + Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int sz) noexcept : m_size(sz), m_data(s) {} + inline explicit QLatin1String(const QByteArray &s) noexcept : m_size(int(qstrnlen(s.constData(), s.size()))), m_data(s.constData()) {} - Q_DECL_CONSTEXPR const char *latin1() const Q_DECL_NOTHROW { return m_data; } - Q_DECL_CONSTEXPR int size() const Q_DECL_NOTHROW { return m_size; } - Q_DECL_CONSTEXPR const char *data() const Q_DECL_NOTHROW { return m_data; } + Q_DECL_CONSTEXPR const char *latin1() const noexcept { return m_data; } + Q_DECL_CONSTEXPR int size() const noexcept { return m_size; } + Q_DECL_CONSTEXPR const char *data() const noexcept { return m_data; } - Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW { return !data(); } - Q_DECL_CONSTEXPR bool isEmpty() const Q_DECL_NOTHROW { return !size(); } + Q_DECL_CONSTEXPR bool isNull() const noexcept { return !data(); } + Q_DECL_CONSTEXPR bool isEmpty() const noexcept { return !size(); } + + template <typename...Args> + Q_REQUIRED_RESULT inline QString arg(Args &&...args) const; Q_DECL_CONSTEXPR QLatin1Char at(int i) const { return Q_ASSERT(i >= 0), Q_ASSERT(i < size()), QLatin1Char(m_data[i]); } @@ -112,24 +116,45 @@ public: Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QLatin1Char front() const { return at(0); } Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QLatin1Char back() const { return at(size() - 1); } - Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::startsWith(*this, s, cs); } - Q_REQUIRED_RESULT bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::startsWith(*this, s, cs); } - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool startsWith(QChar c) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool startsWith(QChar c) const noexcept { return !isEmpty() && front() == c; } - Q_REQUIRED_RESULT inline bool startsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline bool startsWith(QChar c, Qt::CaseSensitivity cs) const noexcept { return QtPrivate::startsWith(*this, QStringView(&c, 1), cs); } - Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::endsWith(*this, s, cs); } - Q_REQUIRED_RESULT bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::endsWith(*this, s, cs); } - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool endsWith(QChar c) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool endsWith(QChar c) const noexcept { return !isEmpty() && back() == c; } - Q_REQUIRED_RESULT inline bool endsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline bool endsWith(QChar c, Qt::CaseSensitivity cs) const noexcept { return QtPrivate::endsWith(*this, QStringView(&c, 1), cs); } + Q_REQUIRED_RESULT int indexOf(QStringView s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsize + Q_REQUIRED_RESULT int indexOf(QLatin1String s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsize + Q_REQUIRED_RESULT inline int indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::findString(*this, from, QStringView(&c, 1), cs)); } // ### Qt6: qsize + + Q_REQUIRED_RESULT bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return indexOf(s, 0, cs) != -1; } + Q_REQUIRED_RESULT bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return indexOf(s, 0, cs) != -1; } + Q_REQUIRED_RESULT inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return indexOf(QStringView(&c, 1), 0, cs) != -1; } + + Q_REQUIRED_RESULT int lastIndexOf(QStringView s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsize + Q_REQUIRED_RESULT int lastIndexOf(QLatin1String s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsize + Q_REQUIRED_RESULT inline int lastIndexOf(QChar c, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::lastIndexOf(*this, from, QStringView(&c, 1), cs)); } // ### Qt6: qsize + using value_type = const char; using reference = value_type&; using const_reference = reference; @@ -138,18 +163,18 @@ public: using difference_type = int; // violates Container concept requirements using size_type = int; // violates Container concept requirements - Q_DECL_CONSTEXPR const_iterator begin() const Q_DECL_NOTHROW { return data(); } - Q_DECL_CONSTEXPR const_iterator cbegin() const Q_DECL_NOTHROW { return data(); } - Q_DECL_CONSTEXPR const_iterator end() const Q_DECL_NOTHROW { return data() + size(); } - Q_DECL_CONSTEXPR const_iterator cend() const Q_DECL_NOTHROW { return data() + size(); } + Q_DECL_CONSTEXPR const_iterator begin() const noexcept { return data(); } + Q_DECL_CONSTEXPR const_iterator cbegin() const noexcept { return data(); } + Q_DECL_CONSTEXPR const_iterator end() const noexcept { return data() + size(); } + Q_DECL_CONSTEXPR const_iterator cend() const noexcept { return data() + size(); } using reverse_iterator = std::reverse_iterator<iterator>; using const_reverse_iterator = reverse_iterator; - const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } - const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } + const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); } + const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); } Q_DECL_CONSTEXPR QLatin1String mid(int pos) const { return Q_ASSERT(pos >= 0), Q_ASSERT(pos <= size()), QLatin1String(m_data + pos, m_size - pos); } @@ -167,14 +192,14 @@ public: Q_DECL_RELAXED_CONSTEXPR void truncate(int n) { Q_ASSERT(n >= 0); Q_ASSERT(n <= size()); m_size = n; } - Q_REQUIRED_RESULT QLatin1String trimmed() const Q_DECL_NOTHROW { return QtPrivate::trimmed(*this); } + Q_REQUIRED_RESULT QLatin1String trimmed() const noexcept { return QtPrivate::trimmed(*this); } - inline bool operator==(const QString &s) const Q_DECL_NOTHROW; - inline bool operator!=(const QString &s) const Q_DECL_NOTHROW; - inline bool operator>(const QString &s) const Q_DECL_NOTHROW; - inline bool operator<(const QString &s) const Q_DECL_NOTHROW; - inline bool operator>=(const QString &s) const Q_DECL_NOTHROW; - inline bool operator<=(const QString &s) const Q_DECL_NOTHROW; + inline bool operator==(const QString &s) const noexcept; + inline bool operator!=(const QString &s) const noexcept; + inline bool operator>(const QString &s) const noexcept; + inline bool operator<(const QString &s) const noexcept; + inline bool operator>=(const QString &s) const noexcept; + inline bool operator<=(const QString &s) const noexcept; #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) inline QT_ASCII_CAST_WARN bool operator==(const char *s) const; @@ -199,43 +224,49 @@ private: Q_DECLARE_TYPEINFO(QLatin1String, Q_MOVABLE_TYPE); // Qt 4.x compatibility -typedef QLatin1String QLatin1Literal; +#if QT_DEPRECATED_SINCE(5, 14) +QT_DEPRECATED_X("Use QLatin1String") typedef QLatin1String QLatin1Literal; +#endif // // QLatin1String inline implementations // -inline bool QtPrivate::isLatin1(QLatin1String) Q_DECL_NOTHROW +inline bool QtPrivate::isLatin1(QLatin1String) noexcept { return true; } // // QStringView members that require QLatin1String: // -bool QStringView::startsWith(QLatin1String s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +bool QStringView::startsWith(QLatin1String s, Qt::CaseSensitivity cs) const noexcept { return QtPrivate::startsWith(*this, s, cs); } -bool QStringView::endsWith(QLatin1String s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +bool QStringView::endsWith(QLatin1String s, Qt::CaseSensitivity cs) const noexcept { return QtPrivate::endsWith(*this, s, cs); } +qsizetype QStringView::indexOf(QLatin1String s, qsizetype from, Qt::CaseSensitivity cs) const noexcept +{ return QtPrivate::findString(*this, from, s, cs); } +bool QStringView::contains(QLatin1String s, Qt::CaseSensitivity cs) const noexcept +{ return indexOf(s, 0, cs) != qsizetype(-1); } +qsizetype QStringView::lastIndexOf(QLatin1String s, qsizetype from, Qt::CaseSensitivity cs) const noexcept +{ return QtPrivate::lastIndexOf(*this, from, s, cs); } class Q_CORE_EXPORT QString { public: typedef QStringData Data; - inline QString() Q_DECL_NOTHROW; + inline QString() noexcept; explicit QString(const QChar *unicode, int size = -1); QString(QChar c); QString(int size, QChar c); inline QString(QLatin1String latin1); - inline QString(const QString &) Q_DECL_NOTHROW; + inline QString(const QString &) noexcept; inline ~QString(); QString &operator=(QChar c); - QString &operator=(const QString &) Q_DECL_NOTHROW; + QString &operator=(const QString &) noexcept; QString &operator=(QLatin1String latin1); -#ifdef Q_COMPILER_RVALUE_REFS - inline QString(QString && other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); } - inline QString &operator=(QString &&other) Q_DECL_NOTHROW + inline QString(QString && other) noexcept : d(other.d) { other.d = Data::sharedNull(); } + inline QString &operator=(QString &&other) noexcept { qSwap(d, other.d); return *this; } -#endif - inline void swap(QString &other) Q_DECL_NOTHROW { qSwap(d, other.d); } + inline void swap(QString &other) noexcept { qSwap(d, other.d); } inline int size() const { return d->size; } inline int count() const { return d->size; } inline int length() const; @@ -263,9 +294,9 @@ public: inline const QChar at(int i) const; const QChar operator[](int i) const; - QCharRef operator[](int i); + Q_REQUIRED_RESULT QCharRef operator[](int i); const QChar operator[](uint i) const; - QCharRef operator[](uint i); + Q_REQUIRED_RESULT QCharRef operator[](uint i); Q_REQUIRED_RESULT inline QChar front() const { return at(0); } Q_REQUIRED_RESULT inline QCharRef front(); @@ -320,24 +351,40 @@ public: const QString &a4, const QString &a5, const QString &a6, const QString &a7, const QString &a8, const QString &a9) const; +#if QT_DEPRECATED_SINCE(5, 14) + QT_DEPRECATED_X("Use vasprintf(), arg() or QTextStream instead") QString &vsprintf(const char *format, va_list ap) Q_ATTRIBUTE_FORMAT_PRINTF(2, 0); + QT_DEPRECATED_X("Use asprintf(), arg() or QTextStream instead") QString &sprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(2, 3); +#endif static QString vasprintf(const char *format, va_list ap) Q_ATTRIBUTE_FORMAT_PRINTF(1, 0); static QString asprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(1, 2); int indexOf(QChar c, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - int indexOf(const QString &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int indexOf(QLatin1String s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#if QT_STRINGVIEW_LEVEL < 2 + int indexOf(const QString &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int indexOf(const QStringRef &s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#endif + Q_REQUIRED_RESULT int indexOf(QStringView s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsize int lastIndexOf(QChar c, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - int lastIndexOf(const QString &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(QLatin1String s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#if QT_STRINGVIEW_LEVEL < 2 + int lastIndexOf(const QString &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(const QStringRef &s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#endif + + Q_REQUIRED_RESULT int lastIndexOf(QStringView s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsize inline bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#if QT_STRINGVIEW_LEVEL < 2 inline bool contains(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; inline bool contains(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#endif + inline bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -359,7 +406,7 @@ public: int lastIndexOf(const QRegularExpression &re, int from = -1) const; int lastIndexOf(const QRegularExpression &re, int from, QRegularExpressionMatch *rmatch) const; // ### Qt 6: merge overloads bool contains(const QRegularExpression &re) const; - bool contains(const QRegularExpression &re, QRegularExpressionMatch *match) const; // ### Qt 6: merge overloads + bool contains(const QRegularExpression &re, QRegularExpressionMatch *rmatch) const; // ### Qt 6: merge overloads int count(const QRegularExpression &re) const; #endif @@ -395,7 +442,7 @@ public: bool startsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool startsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; #endif - Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::startsWith(*this, s, cs); } bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool startsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -404,7 +451,7 @@ public: bool endsWith(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool endsWith(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; #endif - Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::endsWith(*this, s, cs); } bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool endsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -529,6 +576,30 @@ public: Q_REQUIRED_RESULT QStringList split(const QRegularExpression &sep, SplitBehavior behavior = KeepEmptyParts) const; Q_REQUIRED_RESULT QVector<QStringRef> splitRef(const QRegularExpression &sep, SplitBehavior behavior = KeepEmptyParts) const; #endif + +private: + static Q_DECL_CONSTEXPR SplitBehavior _sb(Qt::SplitBehavior sb) Q_DECL_NOTHROW + { return sb & Qt::SkipEmptyParts ? SkipEmptyParts : KeepEmptyParts; } +public: + + Q_REQUIRED_RESULT inline QStringList split(const QString &sep, Qt::SplitBehavior behavior, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(const QString &sep, Qt::SplitBehavior behavior, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + Q_REQUIRED_RESULT inline QStringList split(QChar sep, Qt::SplitBehavior behavior, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(QChar sep, Qt::SplitBehavior behavior, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#ifndef QT_NO_REGEXP + Q_REQUIRED_RESULT inline QStringList split(const QRegExp &sep, Qt::SplitBehavior behavior) const; + Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(const QRegExp &sep, Qt::SplitBehavior behavior) const; +#endif +#ifndef QT_NO_REGULAREXPRESSION + Q_REQUIRED_RESULT inline QStringList split(const QRegularExpression &sep, Qt::SplitBehavior behavior) const; + Q_REQUIRED_RESULT inline QVector<QStringRef> splitRef(const QRegularExpression &sep, Qt::SplitBehavior behavior) const; +#endif + + enum NormalizationForm { NormalizationForm_D, NormalizationForm_C, @@ -609,25 +680,25 @@ public: inline QString &setUtf16(const ushort *utf16, int size); #if QT_STRINGVIEW_LEVEL < 2 - int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; - inline int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; + int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + inline int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; #endif - int compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; - inline int compare(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; + int compare(QLatin1String other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + inline int compare(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; static inline int compare(const QString &s1, const QString &s2, - Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW + Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept { return s1.compare(s2, cs); } static inline int compare(const QString &s1, QLatin1String s2, - Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW + Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept { return s1.compare(s2, cs); } static inline int compare(QLatin1String s1, const QString &s2, - Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW + Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept { return -s2.compare(s1, cs); } static int compare(const QString &s1, const QStringRef &s2, - Qt::CaseSensitivity = Qt::CaseSensitive) Q_DECL_NOTHROW; + Qt::CaseSensitivity = Qt::CaseSensitive) noexcept; int localeAwareCompare(const QString& s) const; static int localeAwareCompare(const QString& s1, const QString& s2) @@ -667,19 +738,19 @@ public: static QString number(qulonglong, int base=10); static QString number(double, char f='g', int prec=6); - friend Q_CORE_EXPORT bool operator==(const QString &s1, const QString &s2) Q_DECL_NOTHROW; - friend Q_CORE_EXPORT bool operator<(const QString &s1, const QString &s2) Q_DECL_NOTHROW; - friend inline bool operator>(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return s2 < s1; } - friend inline bool operator!=(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return !(s1 == s2); } - friend inline bool operator<=(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return !(s1 > s2); } - friend inline bool operator>=(const QString &s1, const QString &s2) Q_DECL_NOTHROW { return !(s1 < s2); } + friend Q_CORE_EXPORT bool operator==(const QString &s1, const QString &s2) noexcept; + friend Q_CORE_EXPORT bool operator<(const QString &s1, const QString &s2) noexcept; + friend inline bool operator>(const QString &s1, const QString &s2) noexcept { return s2 < s1; } + friend inline bool operator!=(const QString &s1, const QString &s2) noexcept { return !(s1 == s2); } + friend inline bool operator<=(const QString &s1, const QString &s2) noexcept { return !(s1 > s2); } + friend inline bool operator>=(const QString &s1, const QString &s2) noexcept { return !(s1 < s2); } - bool operator==(QLatin1String s) const Q_DECL_NOTHROW; - bool operator<(QLatin1String s) const Q_DECL_NOTHROW; - bool operator>(QLatin1String s) const Q_DECL_NOTHROW; - inline bool operator!=(QLatin1String s) const Q_DECL_NOTHROW { return !operator==(s); } - inline bool operator<=(QLatin1String s) const Q_DECL_NOTHROW { return !operator>(s); } - inline bool operator>=(QLatin1String s) const Q_DECL_NOTHROW { return !operator<(s); } + bool operator==(QLatin1String s) const noexcept; + bool operator<(QLatin1String s) const noexcept; + bool operator>(QLatin1String s) const noexcept; + inline bool operator!=(QLatin1String s) const noexcept { return !operator==(s); } + inline bool operator<=(QLatin1String s) const noexcept { return !operator>(s); } + inline bool operator>=(QLatin1String s) const noexcept { return !operator<(s); } // ASCII compatibility #if defined(QT_RESTRICTED_CAST_FROM_ASCII) @@ -840,30 +911,30 @@ private: Data *d; - friend inline bool operator==(QChar, const QString &) Q_DECL_NOTHROW; - friend inline bool operator< (QChar, const QString &) Q_DECL_NOTHROW; - friend inline bool operator> (QChar, const QString &) Q_DECL_NOTHROW; - friend inline bool operator==(QChar, const QStringRef &) Q_DECL_NOTHROW; - friend inline bool operator< (QChar, const QStringRef &) Q_DECL_NOTHROW; - friend inline bool operator> (QChar, const QStringRef &) Q_DECL_NOTHROW; - friend inline bool operator==(QChar, QLatin1String) Q_DECL_NOTHROW; - friend inline bool operator< (QChar, QLatin1String) Q_DECL_NOTHROW; - friend inline bool operator> (QChar, QLatin1String) Q_DECL_NOTHROW; + friend inline bool operator==(QChar, const QString &) noexcept; + friend inline bool operator< (QChar, const QString &) noexcept; + friend inline bool operator> (QChar, const QString &) noexcept; + friend inline bool operator==(QChar, const QStringRef &) noexcept; + friend inline bool operator< (QChar, const QStringRef &) noexcept; + friend inline bool operator> (QChar, const QStringRef &) noexcept; + friend inline bool operator==(QChar, QLatin1String) noexcept; + friend inline bool operator< (QChar, QLatin1String) noexcept; + friend inline bool operator> (QChar, QLatin1String) noexcept; void reallocData(uint alloc, bool grow = false); #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void expand(int i); -#endif QString multiArg(int numArgs, const QString **args) const; +#endif static int compare_helper(const QChar *data1, int length1, const QChar *data2, int length2, - Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; + Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; static int compare_helper(const QChar *data1, int length1, const char *data2, int length2, Qt::CaseSensitivity cs = Qt::CaseSensitive); static int compare_helper(const QChar *data1, int length1, QLatin1String s2, - Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; + Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; static int localeAwareCompare_helper(const QChar *data1, int length1, const QChar *data2, int length2); static QString toLower_helper(const QString &str); @@ -899,10 +970,8 @@ private: template <typename T> static T toIntegral_helper(const QChar *data, int len, bool *ok, int base) { - // ### Qt6: use std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type - const bool isUnsigned = T(0) < T(-1); - typedef typename QtPrivate::QConditional<isUnsigned, qulonglong, qlonglong>::Type Int64; - typedef typename QtPrivate::QConditional<isUnsigned, uint, int>::Type Int32; + using Int64 = typename std::conditional<std::is_unsigned<T>::value, qulonglong, qlonglong>::type; + using Int32 = typename std::conditional<std::is_unsigned<T>::value, uint, int>::type; // we select the right overload by casting size() to int or uint Int64 val = toIntegral_helper(data, Int32(len), ok, base); @@ -954,7 +1023,7 @@ inline bool QString::isDetached() const { return !d->ref.isShared(); } inline void QString::clear() { if (!isNull()) *this = QString(); } -inline QString::QString(const QString &other) Q_DECL_NOTHROW : d(other.d) +inline QString::QString(const QString &other) noexcept : d(other.d) { Q_ASSERT(&other != this); d->ref.ref(); } inline int QString::capacity() const { return d->alloc ? d->alloc - 1 : 0; } @@ -985,30 +1054,30 @@ inline QString QString::arg(short a, int fieldWidth, int base, QChar fillChar) c inline QString QString::arg(ushort a, int fieldWidth, int base, QChar fillChar) const { return arg(qulonglong(a), fieldWidth, base, fillChar); } inline QString QString::arg(const QString &a1, const QString &a2) const -{ const QString *args[2] = { &a1, &a2 }; return multiArg(2, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2); } inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3) const -{ const QString *args[3] = { &a1, &a2, &a3 }; return multiArg(3, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3); } inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3, const QString &a4) const -{ const QString *args[4] = { &a1, &a2, &a3, &a4 }; return multiArg(4, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4); } inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3, const QString &a4, const QString &a5) const -{ const QString *args[5] = { &a1, &a2, &a3, &a4, &a5 }; return multiArg(5, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5); } inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3, const QString &a4, const QString &a5, const QString &a6) const -{ const QString *args[6] = { &a1, &a2, &a3, &a4, &a5, &a6 }; return multiArg(6, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6); } inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3, const QString &a4, const QString &a5, const QString &a6, const QString &a7) const -{ const QString *args[7] = { &a1, &a2, &a3, &a4, &a5, &a6, &a7 }; return multiArg(7, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6, a7); } inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3, const QString &a4, const QString &a5, const QString &a6, const QString &a7, const QString &a8) const -{ const QString *args[8] = { &a1, &a2, &a3, &a4, &a5, &a6, &a7, &a8 }; return multiArg(8, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6, a7, a8); } inline QString QString::arg(const QString &a1, const QString &a2, const QString &a3, const QString &a4, const QString &a5, const QString &a6, const QString &a7, const QString &a8, const QString &a9) const -{ const QString *args[9] = { &a1, &a2, &a3, &a4, &a5, &a6, &a7, &a8, &a9 }; return multiArg(9, args); } +{ return qToStringViewIgnoringNull(*this).arg(a1, a2, a3, a4, a5, a6, a7, a8, a9); } inline QString QString::section(QChar asep, int astart, int aend, SectionFlags aflags) const { return section(QString(asep), astart, aend, aflags); } @@ -1019,12 +1088,7 @@ QT_WARNING_DISABLE_INTEL(111) // "statement is unreachable" inline int QString::toWCharArray(wchar_t *array) const { - if (sizeof(wchar_t) == sizeof(QChar)) { - memcpy(array, d->data(), sizeof(QChar) * size()); - return size(); - } else { - return toUcs4_helper(d->data(), size(), reinterpret_cast<uint *>(array)); - } + return QStringView(*this).toWCharArray(array); } QT_WARNING_POP @@ -1035,8 +1099,11 @@ inline QString QString::fromWCharArray(const wchar_t *string, int size) : fromUcs4(reinterpret_cast<const uint *>(string), size); } - -class Q_CORE_EXPORT QCharRef { +class +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) +Q_CORE_EXPORT +#endif +QCharRef { QString &s; int i; inline QCharRef(QString &str, int idx) @@ -1048,10 +1115,33 @@ public: // all this is not documented: We just say "like QChar" and let it be. inline operator QChar() const - { return i < s.d->size ? s.d->data()[i] : 0; } + { + using namespace QtPrivate::DeprecatedRefClassBehavior; + if (Q_LIKELY(i < s.d->size)) + return s.d->data()[i]; +#ifdef QT_DEBUG + warn(WarningType::OutOfRange, EmittingClass::QCharRef); +#endif + return 0; + } inline QCharRef &operator=(QChar c) - { if (i >= s.d->size) s.resize(i + 1, QLatin1Char(' ')); else s.detach(); - s.d->data()[i] = c.unicode(); return *this; } + { + using namespace QtPrivate::DeprecatedRefClassBehavior; + if (Q_UNLIKELY(i >= s.d->size)) { +#ifdef QT_DEBUG + warn(WarningType::OutOfRange, EmittingClass::QCharRef); +#endif + s.resize(i + 1, QLatin1Char(' ')); + } else { +#ifdef QT_DEBUG + if (Q_UNLIKELY(!s.isDetached())) + warn(WarningType::DelayedDetach, EmittingClass::QCharRef); +#endif + s.detach(); + } + s.d->data()[i] = c.unicode(); + return *this; + } // An operator= for each QChar cast constructors #ifndef QT_NO_CAST_FROM_ASCII @@ -1131,7 +1221,7 @@ inline void QCharRef::setRow(uchar arow) { QChar(*this).setRow(arow); } inline void QCharRef::setCell(uchar acell) { QChar(*this).setCell(acell); } -inline QString::QString() Q_DECL_NOTHROW : d(Data::sharedNull()) {} +inline QString::QString() noexcept : d(Data::sharedNull()) {} inline QString::~QString() { if (!d->ref.deref()) Data::deallocate(d); } inline void QString::reserve(int asize) @@ -1160,9 +1250,9 @@ inline void QString::squeeze() inline QString &QString::setUtf16(const ushort *autf16, int asize) { return setUnicode(reinterpret_cast<const QChar *>(autf16), asize); } inline QCharRef QString::operator[](int i) -{ Q_ASSERT(i >= 0); return QCharRef(*this, i); } +{ Q_ASSERT(i >= 0); detach(); return QCharRef(*this, i); } inline QCharRef QString::operator[](uint i) -{ return QCharRef(*this, i); } +{ detach(); return QCharRef(*this, i); } inline QCharRef QString::front() { return operator[](0); } inline QCharRef QString::back() { return operator[](size() - 1); } inline QString::iterator QString::begin() @@ -1181,14 +1271,18 @@ inline QString::const_iterator QString::cend() const { return reinterpret_cast<const QChar*>(d->data() + d->size); } inline QString::const_iterator QString::constEnd() const { return reinterpret_cast<const QChar*>(d->data() + d->size); } +#if QT_STRINGVIEW_LEVEL < 2 inline bool QString::contains(const QString &s, Qt::CaseSensitivity cs) const { return indexOf(s, 0, cs) != -1; } inline bool QString::contains(const QStringRef &s, Qt::CaseSensitivity cs) const { return indexOf(s, 0, cs) != -1; } +#endif inline bool QString::contains(QLatin1String s, Qt::CaseSensitivity cs) const { return indexOf(s, 0, cs) != -1; } inline bool QString::contains(QChar c, Qt::CaseSensitivity cs) const { return indexOf(c, 0, cs) != -1; } +inline bool QString::contains(QStringView s, Qt::CaseSensitivity cs) const noexcept +{ return indexOf(s, 0, cs) != -1; } #if QT_DEPRECATED_SINCE(5, 9) inline bool operator==(QString::Null, QString::Null) { return true; } @@ -1203,34 +1297,34 @@ QT_DEPRECATED_X("use !QString::isNull()") inline bool operator!=(const QString &s, QString::Null) { return !s.isNull(); } #endif -inline bool operator==(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW +inline bool operator==(QLatin1String s1, QLatin1String s2) noexcept { return s1.size() == s2.size() && (!s1.size() || !memcmp(s1.latin1(), s2.latin1(), s1.size())); } -inline bool operator!=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW +inline bool operator!=(QLatin1String s1, QLatin1String s2) noexcept { return !operator==(s1, s2); } -inline bool operator<(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW +inline bool operator<(QLatin1String s1, QLatin1String s2) noexcept { const int len = qMin(s1.size(), s2.size()); const int r = len ? memcmp(s1.latin1(), s2.latin1(), len) : 0; return r < 0 || (r == 0 && s1.size() < s2.size()); } -inline bool operator>(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW +inline bool operator>(QLatin1String s1, QLatin1String s2) noexcept { return operator<(s2, s1); } -inline bool operator<=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW +inline bool operator<=(QLatin1String s1, QLatin1String s2) noexcept { return !operator>(s1, s2); } -inline bool operator>=(QLatin1String s1, QLatin1String s2) Q_DECL_NOTHROW +inline bool operator>=(QLatin1String s1, QLatin1String s2) noexcept { return !operator<(s1, s2); } -inline bool QLatin1String::operator==(const QString &s) const Q_DECL_NOTHROW +inline bool QLatin1String::operator==(const QString &s) const noexcept { return s == *this; } -inline bool QLatin1String::operator!=(const QString &s) const Q_DECL_NOTHROW +inline bool QLatin1String::operator!=(const QString &s) const noexcept { return s != *this; } -inline bool QLatin1String::operator>(const QString &s) const Q_DECL_NOTHROW +inline bool QLatin1String::operator>(const QString &s) const noexcept { return s < *this; } -inline bool QLatin1String::operator<(const QString &s) const Q_DECL_NOTHROW +inline bool QLatin1String::operator<(const QString &s) const noexcept { return s > *this; } -inline bool QLatin1String::operator>=(const QString &s) const Q_DECL_NOTHROW +inline bool QLatin1String::operator>=(const QString &s) const noexcept { return s <= *this; } -inline bool QLatin1String::operator<=(const QString &s) const Q_DECL_NOTHROW +inline bool QLatin1String::operator<=(const QString &s) const noexcept { return s >= *this; } #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) @@ -1378,14 +1472,12 @@ inline std::wstring QString::toStdWString() const { std::wstring str; str.resize(length()); - -#ifdef Q_CC_MSVC - // VS2005 crashes if the string is empty - if (!length()) - return str; +#if __cplusplus >= 201703L + str.resize(toWCharArray(str.data())); +#else + if (length()) + str.resize(toWCharArray(&str.front())); #endif - - str.resize(toWCharArray(&(*str.begin()))); return str; } @@ -1439,14 +1531,12 @@ public: #if QT_VERSION < QT_VERSION_CHECK(6,0,0) // ### Qt 6: remove all of these, the implicit ones are fine - QStringRef(const QStringRef &other) Q_DECL_NOTHROW + QStringRef(const QStringRef &other) noexcept :m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {} -#ifdef Q_COMPILER_RVALUE_REFS - QStringRef(QStringRef &&other) Q_DECL_NOTHROW : m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {} - QStringRef &operator=(QStringRef &&other) Q_DECL_NOTHROW { return *this = other; } -#endif - QStringRef &operator=(const QStringRef &other) Q_DECL_NOTHROW + QStringRef(QStringRef &&other) noexcept : m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {} + QStringRef &operator=(QStringRef &&other) noexcept { return *this = other; } + QStringRef &operator=(const QStringRef &other) noexcept { m_string = other.m_string; m_position = other.m_position; m_size = other.m_size; return *this; @@ -1460,19 +1550,30 @@ public: inline int count() const { return m_size; } inline int length() const { return m_size; } +#if QT_STRINGVIEW_LEVEL < 2 int indexOf(const QString &str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + int indexOf(const QStringRef &str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#endif + Q_REQUIRED_RESULT int indexOf(QStringView s, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::findString(*this, from, s, cs)); } // ### Qt6: qsize int indexOf(QChar ch, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int indexOf(QLatin1String str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - int indexOf(const QStringRef &str, int from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#if QT_STRINGVIEW_LEVEL < 2 + int lastIndexOf(const QStringRef &str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(const QString &str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#endif int lastIndexOf(QChar ch, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int lastIndexOf(QLatin1String str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - int lastIndexOf(const QStringRef &str, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + Q_REQUIRED_RESULT int lastIndexOf(QStringView s, int from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return int(QtPrivate::lastIndexOf(*this, from, s, cs)); } // ### Qt6: qsize +#if QT_STRINGVIEW_LEVEL < 2 inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; +#endif inline bool contains(QChar ch, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; inline bool contains(QLatin1String str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; - inline bool contains(const QStringRef &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + inline bool contains(QStringView str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; int count(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; int count(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -1483,14 +1584,19 @@ public: Q_REQUIRED_RESULT QVector<QStringRef> split(QChar sep, QString::SplitBehavior behavior = QString::KeepEmptyParts, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + Q_REQUIRED_RESULT inline QVector<QStringRef> split(const QString &sep, Qt::SplitBehavior behavior, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + Q_REQUIRED_RESULT inline QVector<QStringRef> split(QChar sep, Qt::SplitBehavior behavior, + Qt::CaseSensitivity cs = Qt::CaseSensitive) const; + Q_REQUIRED_RESULT QStringRef left(int n) const; Q_REQUIRED_RESULT QStringRef right(int n) const; Q_REQUIRED_RESULT QStringRef mid(int pos, int n = -1) const; Q_REQUIRED_RESULT QStringRef chopped(int n) const { Q_ASSERT(n >= 0); Q_ASSERT(n <= size()); return left(size() - n); } - void truncate(int pos) Q_DECL_NOTHROW { m_size = qBound(0, pos, m_size); } - void chop(int n) Q_DECL_NOTHROW + void truncate(int pos) noexcept { m_size = qBound(0, pos, m_size); } + void chop(int n) noexcept { if (n >= m_size) m_size = 0; @@ -1500,7 +1606,7 @@ public: bool isRightToLeft() const; - Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::startsWith(*this, s, cs); } bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool startsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -1509,7 +1615,7 @@ public: bool startsWith(const QStringRef &c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; #endif - Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::endsWith(*this, s, cs); } bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; bool endsWith(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -1572,19 +1678,19 @@ public: inline QT_ASCII_CAST_WARN bool operator>=(const char *s) const; #endif - int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; - int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; - int compare(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; + int compare(const QString &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + int compare(const QStringRef &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + int compare(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) int compare(const QByteArray &s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const { return QString::compare_helper(unicode(), size(), s.data(), qstrnlen(s.data(), s.size()), cs); } #endif static int compare(const QStringRef &s1, const QString &s2, - Qt::CaseSensitivity = Qt::CaseSensitive) Q_DECL_NOTHROW; + Qt::CaseSensitivity = Qt::CaseSensitive) noexcept; static int compare(const QStringRef &s1, const QStringRef &s2, - Qt::CaseSensitivity = Qt::CaseSensitive) Q_DECL_NOTHROW; + Qt::CaseSensitivity = Qt::CaseSensitive) noexcept; static int compare(const QStringRef &s1, QLatin1String s2, - Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; + Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; int localeAwareCompare(const QString &s) const; int localeAwareCompare(const QStringRef &s) const; @@ -1615,162 +1721,162 @@ inline QStringRef::QStringRef(const QString *aString) :m_string(aString), m_position(0), m_size(aString?aString->size() : 0){} // QStringRef <> QStringRef -Q_CORE_EXPORT bool operator==(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW; -inline bool operator!=(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW +Q_CORE_EXPORT bool operator==(const QStringRef &s1, const QStringRef &s2) noexcept; +inline bool operator!=(const QStringRef &s1, const QStringRef &s2) noexcept { return !(s1 == s2); } -Q_CORE_EXPORT bool operator<(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW; -inline bool operator>(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW +Q_CORE_EXPORT bool operator<(const QStringRef &s1, const QStringRef &s2) noexcept; +inline bool operator>(const QStringRef &s1, const QStringRef &s2) noexcept { return s2 < s1; } -inline bool operator<=(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW +inline bool operator<=(const QStringRef &s1, const QStringRef &s2) noexcept { return !(s1 > s2); } -inline bool operator>=(const QStringRef &s1, const QStringRef &s2) Q_DECL_NOTHROW +inline bool operator>=(const QStringRef &s1, const QStringRef &s2) noexcept { return !(s1 < s2); } // QString <> QStringRef -Q_CORE_EXPORT bool operator==(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW; -inline bool operator!=(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) != 0; } -inline bool operator< (const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) < 0; } -inline bool operator> (const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) > 0; } -inline bool operator<=(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) <= 0; } -inline bool operator>=(const QString &lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return lhs.compare(rhs) >= 0; } - -inline bool operator==(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs == lhs; } -inline bool operator!=(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs != lhs; } -inline bool operator< (const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs > lhs; } -inline bool operator> (const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs < lhs; } -inline bool operator<=(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs >= lhs; } -inline bool operator>=(const QStringRef &lhs, const QString &rhs) Q_DECL_NOTHROW { return rhs <= lhs; } +Q_CORE_EXPORT bool operator==(const QString &lhs, const QStringRef &rhs) noexcept; +inline bool operator!=(const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) != 0; } +inline bool operator< (const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) < 0; } +inline bool operator> (const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) > 0; } +inline bool operator<=(const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) <= 0; } +inline bool operator>=(const QString &lhs, const QStringRef &rhs) noexcept { return lhs.compare(rhs) >= 0; } + +inline bool operator==(const QStringRef &lhs, const QString &rhs) noexcept { return rhs == lhs; } +inline bool operator!=(const QStringRef &lhs, const QString &rhs) noexcept { return rhs != lhs; } +inline bool operator< (const QStringRef &lhs, const QString &rhs) noexcept { return rhs > lhs; } +inline bool operator> (const QStringRef &lhs, const QString &rhs) noexcept { return rhs < lhs; } +inline bool operator<=(const QStringRef &lhs, const QString &rhs) noexcept { return rhs >= lhs; } +inline bool operator>=(const QStringRef &lhs, const QString &rhs) noexcept { return rhs <= lhs; } #if QT_STRINGVIEW_LEVEL < 2 -inline int QString::compare(const QStringRef &s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +inline int QString::compare(const QStringRef &s, Qt::CaseSensitivity cs) const noexcept { return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); } #endif -inline int QString::compare(QStringView s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +inline int QString::compare(QStringView s, Qt::CaseSensitivity cs) const noexcept { return -s.compare(*this, cs); } -inline int QString::compare(const QString &s1, const QStringRef &s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +inline int QString::compare(const QString &s1, const QStringRef &s2, Qt::CaseSensitivity cs) noexcept { return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); } -inline int QStringRef::compare(const QString &s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +inline int QStringRef::compare(const QString &s, Qt::CaseSensitivity cs) const noexcept { return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); } -inline int QStringRef::compare(const QStringRef &s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +inline int QStringRef::compare(const QStringRef &s, Qt::CaseSensitivity cs) const noexcept { return QString::compare_helper(constData(), length(), s.constData(), s.length(), cs); } -inline int QStringRef::compare(QLatin1String s, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW +inline int QStringRef::compare(QLatin1String s, Qt::CaseSensitivity cs) const noexcept { return QString::compare_helper(constData(), length(), s, cs); } -inline int QStringRef::compare(const QStringRef &s1, const QString &s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +inline int QStringRef::compare(const QStringRef &s1, const QString &s2, Qt::CaseSensitivity cs) noexcept { return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); } -inline int QStringRef::compare(const QStringRef &s1, const QStringRef &s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +inline int QStringRef::compare(const QStringRef &s1, const QStringRef &s2, Qt::CaseSensitivity cs) noexcept { return QString::compare_helper(s1.constData(), s1.length(), s2.constData(), s2.length(), cs); } -inline int QStringRef::compare(const QStringRef &s1, QLatin1String s2, Qt::CaseSensitivity cs) Q_DECL_NOTHROW +inline int QStringRef::compare(const QStringRef &s1, QLatin1String s2, Qt::CaseSensitivity cs) noexcept { return QString::compare_helper(s1.constData(), s1.length(), s2, cs); } // QLatin1String <> QStringRef -Q_CORE_EXPORT bool operator==(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW; -inline bool operator!=(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) != 0; } -inline bool operator< (QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) > 0; } -inline bool operator> (QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) < 0; } -inline bool operator<=(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) >= 0; } -inline bool operator>=(QLatin1String lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return rhs.compare(lhs) <= 0; } - -inline bool operator==(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs == lhs; } -inline bool operator!=(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs != lhs; } -inline bool operator< (const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs > lhs; } -inline bool operator> (const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs < lhs; } -inline bool operator<=(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs >= lhs; } -inline bool operator>=(const QStringRef &lhs, QLatin1String rhs) Q_DECL_NOTHROW { return rhs <= lhs; } +Q_CORE_EXPORT bool operator==(QLatin1String lhs, const QStringRef &rhs) noexcept; +inline bool operator!=(QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) != 0; } +inline bool operator< (QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) > 0; } +inline bool operator> (QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) < 0; } +inline bool operator<=(QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) >= 0; } +inline bool operator>=(QLatin1String lhs, const QStringRef &rhs) noexcept { return rhs.compare(lhs) <= 0; } + +inline bool operator==(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs == lhs; } +inline bool operator!=(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs != lhs; } +inline bool operator< (const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs > lhs; } +inline bool operator> (const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs < lhs; } +inline bool operator<=(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs >= lhs; } +inline bool operator>=(const QStringRef &lhs, QLatin1String rhs) noexcept { return rhs <= lhs; } // QChar <> QString -inline bool operator==(QChar lhs, const QString &rhs) Q_DECL_NOTHROW +inline bool operator==(QChar lhs, const QString &rhs) noexcept { return rhs.size() == 1 && lhs == rhs.front(); } -inline bool operator< (QChar lhs, const QString &rhs) Q_DECL_NOTHROW +inline bool operator< (QChar lhs, const QString &rhs) noexcept { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) < 0; } -inline bool operator> (QChar lhs, const QString &rhs) Q_DECL_NOTHROW +inline bool operator> (QChar lhs, const QString &rhs) noexcept { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) > 0; } -inline bool operator!=(QChar lhs, const QString &rhs) Q_DECL_NOTHROW { return !(lhs == rhs); } -inline bool operator<=(QChar lhs, const QString &rhs) Q_DECL_NOTHROW { return !(lhs > rhs); } -inline bool operator>=(QChar lhs, const QString &rhs) Q_DECL_NOTHROW { return !(lhs < rhs); } +inline bool operator!=(QChar lhs, const QString &rhs) noexcept { return !(lhs == rhs); } +inline bool operator<=(QChar lhs, const QString &rhs) noexcept { return !(lhs > rhs); } +inline bool operator>=(QChar lhs, const QString &rhs) noexcept { return !(lhs < rhs); } -inline bool operator==(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return rhs == lhs; } -inline bool operator!=(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs == lhs); } -inline bool operator< (const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return rhs > lhs; } -inline bool operator> (const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return rhs < lhs; } -inline bool operator<=(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs < lhs); } -inline bool operator>=(const QString &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs > lhs); } +inline bool operator==(const QString &lhs, QChar rhs) noexcept { return rhs == lhs; } +inline bool operator!=(const QString &lhs, QChar rhs) noexcept { return !(rhs == lhs); } +inline bool operator< (const QString &lhs, QChar rhs) noexcept { return rhs > lhs; } +inline bool operator> (const QString &lhs, QChar rhs) noexcept { return rhs < lhs; } +inline bool operator<=(const QString &lhs, QChar rhs) noexcept { return !(rhs < lhs); } +inline bool operator>=(const QString &lhs, QChar rhs) noexcept { return !(rhs > lhs); } // QChar <> QStringRef -inline bool operator==(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW +inline bool operator==(QChar lhs, const QStringRef &rhs) noexcept { return rhs.size() == 1 && lhs == rhs.front(); } -inline bool operator< (QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW +inline bool operator< (QChar lhs, const QStringRef &rhs) noexcept { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) < 0; } -inline bool operator> (QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW +inline bool operator> (QChar lhs, const QStringRef &rhs) noexcept { return QString::compare_helper(&lhs, 1, rhs.data(), rhs.size()) > 0; } -inline bool operator!=(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return !(lhs == rhs); } -inline bool operator<=(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return !(lhs > rhs); } -inline bool operator>=(QChar lhs, const QStringRef &rhs) Q_DECL_NOTHROW { return !(lhs < rhs); } +inline bool operator!=(QChar lhs, const QStringRef &rhs) noexcept { return !(lhs == rhs); } +inline bool operator<=(QChar lhs, const QStringRef &rhs) noexcept { return !(lhs > rhs); } +inline bool operator>=(QChar lhs, const QStringRef &rhs) noexcept { return !(lhs < rhs); } -inline bool operator==(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return rhs == lhs; } -inline bool operator!=(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs == lhs); } -inline bool operator< (const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return rhs > lhs; } -inline bool operator> (const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return rhs < lhs; } -inline bool operator<=(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs < lhs); } -inline bool operator>=(const QStringRef &lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs > lhs); } +inline bool operator==(const QStringRef &lhs, QChar rhs) noexcept { return rhs == lhs; } +inline bool operator!=(const QStringRef &lhs, QChar rhs) noexcept { return !(rhs == lhs); } +inline bool operator< (const QStringRef &lhs, QChar rhs) noexcept { return rhs > lhs; } +inline bool operator> (const QStringRef &lhs, QChar rhs) noexcept { return rhs < lhs; } +inline bool operator<=(const QStringRef &lhs, QChar rhs) noexcept { return !(rhs < lhs); } +inline bool operator>=(const QStringRef &lhs, QChar rhs) noexcept { return !(rhs > lhs); } // QChar <> QLatin1String -inline bool operator==(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW +inline bool operator==(QChar lhs, QLatin1String rhs) noexcept { return rhs.size() == 1 && lhs == rhs.front(); } -inline bool operator< (QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW +inline bool operator< (QChar lhs, QLatin1String rhs) noexcept { return QString::compare_helper(&lhs, 1, rhs) < 0; } -inline bool operator> (QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW +inline bool operator> (QChar lhs, QLatin1String rhs) noexcept { return QString::compare_helper(&lhs, 1, rhs) > 0; } -inline bool operator!=(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs == rhs); } -inline bool operator<=(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs > rhs); } -inline bool operator>=(QChar lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs < rhs); } +inline bool operator!=(QChar lhs, QLatin1String rhs) noexcept { return !(lhs == rhs); } +inline bool operator<=(QChar lhs, QLatin1String rhs) noexcept { return !(lhs > rhs); } +inline bool operator>=(QChar lhs, QLatin1String rhs) noexcept { return !(lhs < rhs); } -inline bool operator==(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return rhs == lhs; } -inline bool operator!=(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs == lhs); } -inline bool operator< (QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return rhs > lhs; } -inline bool operator> (QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return rhs < lhs; } -inline bool operator<=(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs < lhs); } -inline bool operator>=(QLatin1String lhs, QChar rhs) Q_DECL_NOTHROW { return !(rhs > lhs); } +inline bool operator==(QLatin1String lhs, QChar rhs) noexcept { return rhs == lhs; } +inline bool operator!=(QLatin1String lhs, QChar rhs) noexcept { return !(rhs == lhs); } +inline bool operator< (QLatin1String lhs, QChar rhs) noexcept { return rhs > lhs; } +inline bool operator> (QLatin1String lhs, QChar rhs) noexcept { return rhs < lhs; } +inline bool operator<=(QLatin1String lhs, QChar rhs) noexcept { return !(rhs < lhs); } +inline bool operator>=(QLatin1String lhs, QChar rhs) noexcept { return !(rhs > lhs); } // QStringView <> QStringView -inline bool operator==(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; } -inline bool operator!=(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return !(lhs == rhs); } -inline bool operator< (QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) < 0; } -inline bool operator<=(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <= 0; } -inline bool operator> (QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) > 0; } -inline bool operator>=(QStringView lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >= 0; } +inline bool operator==(QStringView lhs, QStringView rhs) noexcept { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; } +inline bool operator!=(QStringView lhs, QStringView rhs) noexcept { return !(lhs == rhs); } +inline bool operator< (QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) < 0; } +inline bool operator<=(QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <= 0; } +inline bool operator> (QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) > 0; } +inline bool operator>=(QStringView lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >= 0; } // QStringView <> QChar -inline bool operator==(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs == QStringView(&rhs, 1); } -inline bool operator!=(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs != QStringView(&rhs, 1); } -inline bool operator< (QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs < QStringView(&rhs, 1); } -inline bool operator<=(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs <= QStringView(&rhs, 1); } -inline bool operator> (QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs > QStringView(&rhs, 1); } -inline bool operator>=(QStringView lhs, QChar rhs) Q_DECL_NOTHROW { return lhs >= QStringView(&rhs, 1); } - -inline bool operator==(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) == rhs; } -inline bool operator!=(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) != rhs; } -inline bool operator< (QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) < rhs; } -inline bool operator<=(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) <= rhs; } -inline bool operator> (QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) > rhs; } -inline bool operator>=(QChar lhs, QStringView rhs) Q_DECL_NOTHROW { return QStringView(&lhs, 1) >= rhs; } +inline bool operator==(QStringView lhs, QChar rhs) noexcept { return lhs == QStringView(&rhs, 1); } +inline bool operator!=(QStringView lhs, QChar rhs) noexcept { return lhs != QStringView(&rhs, 1); } +inline bool operator< (QStringView lhs, QChar rhs) noexcept { return lhs < QStringView(&rhs, 1); } +inline bool operator<=(QStringView lhs, QChar rhs) noexcept { return lhs <= QStringView(&rhs, 1); } +inline bool operator> (QStringView lhs, QChar rhs) noexcept { return lhs > QStringView(&rhs, 1); } +inline bool operator>=(QStringView lhs, QChar rhs) noexcept { return lhs >= QStringView(&rhs, 1); } + +inline bool operator==(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) == rhs; } +inline bool operator!=(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) != rhs; } +inline bool operator< (QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) < rhs; } +inline bool operator<=(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) <= rhs; } +inline bool operator> (QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) > rhs; } +inline bool operator>=(QChar lhs, QStringView rhs) noexcept { return QStringView(&lhs, 1) >= rhs; } // QStringView <> QLatin1String -inline bool operator==(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; } -inline bool operator!=(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return !(lhs == rhs); } -inline bool operator< (QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) < 0; } -inline bool operator<=(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <= 0; } -inline bool operator> (QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) > 0; } -inline bool operator>=(QStringView lhs, QLatin1String rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >= 0; } - -inline bool operator==(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; } -inline bool operator!=(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return !(lhs == rhs); } -inline bool operator< (QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) < 0; } -inline bool operator<=(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) <= 0; } -inline bool operator> (QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) > 0; } -inline bool operator>=(QLatin1String lhs, QStringView rhs) Q_DECL_NOTHROW { return QtPrivate::compareStrings(lhs, rhs) >= 0; } +inline bool operator==(QStringView lhs, QLatin1String rhs) noexcept { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; } +inline bool operator!=(QStringView lhs, QLatin1String rhs) noexcept { return !(lhs == rhs); } +inline bool operator< (QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) < 0; } +inline bool operator<=(QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <= 0; } +inline bool operator> (QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) > 0; } +inline bool operator>=(QStringView lhs, QLatin1String rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >= 0; } + +inline bool operator==(QLatin1String lhs, QStringView rhs) noexcept { return lhs.size() == rhs.size() && QtPrivate::compareStrings(lhs, rhs) == 0; } +inline bool operator!=(QLatin1String lhs, QStringView rhs) noexcept { return !(lhs == rhs); } +inline bool operator< (QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) < 0; } +inline bool operator<=(QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) <= 0; } +inline bool operator> (QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) > 0; } +inline bool operator>=(QLatin1String lhs, QStringView rhs) noexcept { return QtPrivate::compareStrings(lhs, rhs) >= 0; } #if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII) // QStringRef <> QByteArray @@ -1829,13 +1935,17 @@ inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QString &s inline int QStringRef::localeAwareCompare(const QStringRef &s1, const QStringRef &s2) { return QString::localeAwareCompare_helper(s1.constData(), s1.length(), s2.constData(), s2.length()); } +#if QT_STRINGVIEW_LEVEL < 2 inline bool QStringRef::contains(const QString &s, Qt::CaseSensitivity cs) const { return indexOf(s, 0, cs) != -1; } +inline bool QStringRef::contains(const QStringRef &s, Qt::CaseSensitivity cs) const +{ return indexOf(s, 0, cs) != -1; } +#endif inline bool QStringRef::contains(QLatin1String s, Qt::CaseSensitivity cs) const { return indexOf(s, 0, cs) != -1; } inline bool QStringRef::contains(QChar c, Qt::CaseSensitivity cs) const { return indexOf(c, 0, cs) != -1; } -inline bool QStringRef::contains(const QStringRef &s, Qt::CaseSensitivity cs) const +inline bool QStringRef::contains(QStringView s, Qt::CaseSensitivity cs) const noexcept { return indexOf(s, 0, cs) != -1; } inline QString &QString::insert(int i, const QStringRef &s) @@ -1872,6 +1982,58 @@ inline const QString &asString(const QString &s) { return s; } inline QString &&asString(QString &&s) { return std::move(s); } } +// +// QStringView::arg() implementation +// + +namespace QtPrivate { + +struct ArgBase { + enum Tag : uchar { L1, U8, U16 } tag; +}; + +struct QStringViewArg : ArgBase { + QStringView string; + QStringViewArg() = default; + Q_DECL_CONSTEXPR explicit QStringViewArg(QStringView v) noexcept : ArgBase{U16}, string{v} {} +}; + +struct QLatin1StringArg : ArgBase { + QLatin1String string; + QLatin1StringArg() = default; + Q_DECL_CONSTEXPR explicit QLatin1StringArg(QLatin1String v) noexcept : ArgBase{L1}, string{v} {} +}; + +Q_REQUIRED_RESULT Q_CORE_EXPORT QString argToQString(QStringView pattern, size_t n, const ArgBase **args); +Q_REQUIRED_RESULT Q_CORE_EXPORT QString argToQString(QLatin1String pattern, size_t n, const ArgBase **args); + +template <typename StringView, typename...Args> +Q_REQUIRED_RESULT Q_ALWAYS_INLINE QString argToQStringDispatch(StringView pattern, const Args &...args) +{ + const ArgBase *argBases[] = {&args..., /* avoid zero-sized array */ nullptr}; + return QtPrivate::argToQString(pattern, sizeof...(Args), argBases); +} + +Q_DECL_CONSTEXPR inline QStringViewArg qStringLikeToArg(QStringView s) noexcept { return QStringViewArg{s}; } + inline QStringViewArg qStringLikeToArg(const QChar &c) noexcept { return QStringViewArg{QStringView{&c, 1}}; } +Q_DECL_CONSTEXPR inline QLatin1StringArg qStringLikeToArg(QLatin1String s) noexcept { return QLatin1StringArg{s}; } + +} // namespace QtPrivate + +template <typename...Args> +Q_ALWAYS_INLINE +QString QStringView::arg(Args &&...args) const +{ + return QtPrivate::argToQStringDispatch(*this, QtPrivate::qStringLikeToArg(args)...); +} + +template <typename...Args> +Q_ALWAYS_INLINE +QString QLatin1String::arg(Args &&...args) const +{ + return QtPrivate::argToQStringDispatch(*this, QtPrivate::qStringLikeToArg(args)...); +} + QT_END_NAMESPACE #if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER) diff --git a/src/corelib/tools/qstringalgorithms.h b/src/corelib/tools/qstringalgorithms.h index cc0eda71f3..2b480b1e4c 100644 --- a/src/corelib/tools/qstringalgorithms.h +++ b/src/corelib/tools/qstringalgorithms.h @@ -51,31 +51,42 @@ QT_BEGIN_NAMESPACE class QByteArray; class QLatin1String; class QStringView; +class QChar; template <typename T> class QVector; namespace QtPrivate { -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype qustrlen(const ushort *str) Q_DECL_NOTHROW; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype qustrlen(const ushort *str) noexcept; Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION const ushort *qustrchr(QStringView str, ushort ch) noexcept; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView lhs, QStringView rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QStringView lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QStringView rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION int compareStrings(QLatin1String lhs, QLatin1String rhs, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool startsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) Q_DECL_NOTHROW; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QStringView haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION bool endsWith(QLatin1String haystack, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QStringView trimmed(QStringView s) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QLatin1String trimmed(QLatin1String s) Q_DECL_NOTHROW; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype findString(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; + +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QStringView haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QStringView haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QLatin1String haystack, qsizetype from, QStringView needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION qsizetype lastIndexOf(QLatin1String haystack, qsizetype from, QLatin1String needle, Qt::CaseSensitivity cs = Qt::CaseSensitive) noexcept; + +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QStringView trimmed(QStringView s) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT Q_DECL_PURE_FUNCTION QLatin1String trimmed(QLatin1String s) noexcept; Q_REQUIRED_RESULT Q_CORE_EXPORT QByteArray convertToLatin1(QStringView str); Q_REQUIRED_RESULT Q_CORE_EXPORT QByteArray convertToUtf8(QStringView str); @@ -83,10 +94,10 @@ Q_REQUIRED_RESULT Q_CORE_EXPORT QByteArray convertToLocal8Bit(QStringView str); Q_REQUIRED_RESULT Q_CORE_EXPORT QVector<uint> convertToUcs4(QStringView str); Q_REQUIRED_RESULT Q_CORE_EXPORT bool isRightToLeft(QStringView string); -Q_REQUIRED_RESULT Q_CORE_EXPORT bool isAscii(QLatin1String s) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT Q_CORE_EXPORT bool isAscii(QStringView s) Q_DECL_NOTHROW; -Q_REQUIRED_RESULT bool isLatin1(QLatin1String s) Q_DECL_NOTHROW; // in qstring.h -Q_REQUIRED_RESULT Q_CORE_EXPORT bool isLatin1(QStringView s) Q_DECL_NOTHROW; +Q_REQUIRED_RESULT Q_CORE_EXPORT bool isAscii(QLatin1String s) noexcept; +Q_REQUIRED_RESULT Q_CORE_EXPORT bool isAscii(QStringView s) noexcept; +Q_REQUIRED_RESULT bool isLatin1(QLatin1String s) noexcept; // in qstring.h +Q_REQUIRED_RESULT Q_CORE_EXPORT bool isLatin1(QStringView s) noexcept; } // namespace QtPRivate diff --git a/src/corelib/tools/qstringalgorithms_p.h b/src/corelib/tools/qstringalgorithms_p.h index 4bcf697f78..64d9f2e676 100644 --- a/src/corelib/tools/qstringalgorithms_p.h +++ b/src/corelib/tools/qstringalgorithms_p.h @@ -77,7 +77,7 @@ template <typename StringType> struct QStringAlgorithms if (begin != data) memmove(data, begin, (end - begin) * sizeof(Char)); str.resize(end - begin); - return qMove(str); + return std::move(str); } static inline StringType trimmed_helper_inplace(const NakedStringType &, const Char *, const Char *) @@ -118,7 +118,7 @@ template <typename StringType> struct QStringAlgorithms const Char *end = str.cend(); NakedStringType result = isConst || !str.isDetached() ? StringType(str.size(), Qt::Uninitialized) : - qMove(str); + std::move(str); Char *dst = const_cast<Char *>(result.cbegin()); Char *ptr = dst; diff --git a/src/corelib/tools/qstringbuilder.cpp b/src/corelib/tools/qstringbuilder.cpp index 8afc83819b..cf443ec369 100644 --- a/src/corelib/tools/qstringbuilder.cpp +++ b/src/corelib/tools/qstringbuilder.cpp @@ -124,7 +124,7 @@ QT_BEGIN_NAMESPACE /*! \internal */ -void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out) Q_DECL_NOTHROW +void QAbstractConcatenable::convertFromAscii(const char *a, int len, QChar *&out) noexcept { if (Q_UNLIKELY(len == -1)) { if (!a) diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index 1d96d70637..b3cf2f695e 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -58,12 +58,12 @@ QT_BEGIN_NAMESPACE struct Q_CORE_EXPORT QAbstractConcatenable { protected: - static void convertFromAscii(const char *a, int len, QChar *&out) Q_DECL_NOTHROW; - static inline void convertFromAscii(char a, QChar *&out) Q_DECL_NOTHROW + static void convertFromAscii(const char *a, int len, QChar *&out) noexcept; + static inline void convertFromAscii(char a, QChar *&out) noexcept { *out++ = QLatin1Char(a); } - static void appendLatin1To(const char *a, int len, QChar *out) Q_DECL_NOTHROW; + static void appendLatin1To(const char *a, int len, QChar *out) noexcept; }; template <typename T> struct QConcatenable {}; @@ -150,7 +150,7 @@ class QStringBuilder <QString, QString> : public QStringBuilderBase<QStringBuild const QString &b; private: - QStringBuilder &operator=(const QStringBuilder &) Q_DECL_EQ_DELETE; + QStringBuilder &operator=(const QStringBuilder &) = delete; }; template <> @@ -167,7 +167,7 @@ class QStringBuilder <QByteArray, QByteArray> : public QStringBuilderBase<QStrin const QByteArray &b; private: - QStringBuilder &operator=(const QStringBuilder &) Q_DECL_EQ_DELETE; + QStringBuilder &operator=(const QStringBuilder &) = delete; }; diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index cf150c2a1b..f6da7b1428 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include <qstringlist.h> +#include <qregexp.h> #include <qset.h> #if QT_CONFIG(regularexpression) # include <qregularexpression.h> @@ -376,6 +377,56 @@ bool QtPrivate::QStringList_contains(const QStringList *that, QLatin1String str, return stringList_contains(*that, str, cs); } +/*! + \fn bool QStringList::indexOf(QStringView str, int from) const + \overload + \since 5.13 + + Returns the index position of the first occurrence of \a str in + the list, searching forward from index position \a from. Returns + -1 if no item matched. + + \sa lastIndexOf(), contains() + */ + +/*! + \fn bool QStringList::indexOf(QLatin1String str, int from) const + \overload + \since 5.13 + + Returns the index position of the first occurrence of \a str in + the list, searching forward from index position \a from. Returns + -1 if no item matched. + + \sa lastIndexOf(), contains() + */ + +/*! + \fn bool QStringList::lastIndexOf(QStringView str, int from) const + \overload + \since 5.13 + + Returns the index position of the last occurrence of \a str in + the list, searching backward from index position \a from. If \a + from is -1 (the default), the search starts at the last item. + Returns -1 if no item matched. + + \sa indexOf(), contains() + */ + +/*! + \fn bool QStringList::lastIndexOf(QLatin1String str, int from) const + \overload + \since 5.13 + + Returns the index position of the last occurrence of \a str in + the list, searching backward from index position \a from. If \a + from is -1 (the default), the search starts at the last item. + Returns -1 if no item matched. + + \sa indexOf(), contains() + */ + #ifndef QT_NO_REGEXP /*! \fn QStringList QStringList::filter(const QRegExp &rx) const @@ -780,7 +831,7 @@ int QtPrivate::QStringList_removeDuplicates(QStringList *that) continue; ++setSize; if (j != i) - that->swap(i, j); + that->swapItemsAt(i, j); ++j; } if (n != j) @@ -797,5 +848,12 @@ int QtPrivate::QStringList_removeDuplicates(QStringList *that) lists. */ + /*! \fn template<typename InputIterator> QStringList::QStringList(InputIterator first, InputIterator last) + \since 5.14 + + Constructs a QStringList with the contents in the iterator range [\a first, \a last). + + The value type of \c InputIterator must be convertible to \c QString. + */ QT_END_NAMESPACE diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 10cbad04d6..3bb657069b 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -44,6 +44,7 @@ #define QSTRINGLIST_H #include <QtCore/qalgorithms.h> +#include <QtCore/qcontainertools_impl.h> #include <QtCore/qregexp.h> #include <QtCore/qstring.h> #include <QtCore/qstringmatcher.h> @@ -66,7 +67,7 @@ template <> struct QListSpecialMethods<QString> { #ifndef Q_QDOC protected: - ~QListSpecialMethods() {} + ~QListSpecialMethods() = default; #endif public: inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive); @@ -100,22 +101,19 @@ class QStringList : public QList<QString> { #endif public: - inline QStringList() Q_DECL_NOTHROW { } + inline QStringList() noexcept { } inline explicit QStringList(const QString &i) { append(i); } inline QStringList(const QList<QString> &l) : QList<QString>(l) { } -#ifdef Q_COMPILER_RVALUE_REFS - inline QStringList(QList<QString> &&l) Q_DECL_NOTHROW : QList<QString>(std::move(l)) { } -#endif -#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QStringList(QList<QString> &&l) noexcept : QList<QString>(std::move(l)) { } inline QStringList(std::initializer_list<QString> args) : QList<QString>(args) { } -#endif + template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> + inline QStringList(InputIterator first, InputIterator last) + : QList<QString>(first, last) { } QStringList &operator=(const QList<QString> &other) { QList<QString>::operator=(other); return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - QStringList &operator=(QList<QString> &&other) Q_DECL_NOTHROW + QStringList &operator=(QList<QString> &&other) noexcept { QList<QString>::operator=(std::move(other)); return *this; } -#endif #if QT_STRINGVIEW_LEVEL < 2 inline bool contains(const QString &str, Qt::CaseSensitivity cs = Qt::CaseSensitive) const; @@ -132,6 +130,12 @@ public: inline QStringList &operator<<(const QList<QString> &l) { *this += l; return *this; } + inline int indexOf(QStringView str, int from = 0) const; + inline int indexOf(QLatin1String str, int from = 0) const; + + inline int lastIndexOf(QStringView str, int from = -1) const; + inline int lastIndexOf(QLatin1String str, int from = -1) const; + #ifndef QT_NO_REGEXP inline int indexOf(const QRegExp &rx, int from = 0) const; inline int lastIndexOf(const QRegExp &rx, int from = -1) const; @@ -249,6 +253,26 @@ inline QStringList operator+(const QList<QString> &one, const QStringList &other return n; } +inline int QStringList::indexOf(QStringView string, int from) const +{ + return QtPrivate::indexOf<QString, QStringView>(*this, string, from); +} + +inline int QStringList::indexOf(QLatin1String string, int from) const +{ + return QtPrivate::indexOf<QString, QLatin1String>(*this, string, from); +} + +inline int QStringList::lastIndexOf(QStringView string, int from) const +{ + return QtPrivate::lastIndexOf<QString, QStringView>(*this, string, from); +} + +inline int QStringList::lastIndexOf(QLatin1String string, int from) const +{ + return QtPrivate::lastIndexOf<QString, QLatin1String>(*this, string, from); +} + #ifndef QT_NO_REGEXP inline QStringList &QListSpecialMethods<QString>::replaceInStrings(const QRegExp &rx, const QString &after) { @@ -306,6 +330,23 @@ inline int QStringList::lastIndexOf(const QRegularExpression &rx, int from) cons #endif // QT_CONFIG(regularexpression) #endif // Q_QDOC +// +// QString inline functions: +// + +QStringList QString::split(const QString &sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const +{ return split(sep, _sb(behavior), cs); } +QStringList QString::split(QChar sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const +{ return split(sep, _sb(behavior), cs); } +#ifndef QT_NO_REGEXP +QStringList QString::split(const QRegExp &sep, Qt::SplitBehavior behavior) const +{ return split(sep, _sb(behavior)); } +#endif +#if QT_CONFIG(regularexpression) +QStringList QString::split(const QRegularExpression &sep, Qt::SplitBehavior behavior) const +{ return split(sep, _sb(behavior)); } +#endif + QT_END_NAMESPACE #endif // QSTRINGLIST_H diff --git a/src/corelib/tools/qstringliteral.h b/src/corelib/tools/qstringliteral.h index 64296b89fc..603f19c0b4 100644 --- a/src/corelib/tools/qstringliteral.h +++ b/src/corelib/tools/qstringliteral.h @@ -63,7 +63,7 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2, #define QT_UNICODE_LITERAL(str) u"" str #define QStringLiteral(str) \ - ([]() Q_DECL_NOEXCEPT -> QString { \ + ([]() noexcept -> QString { \ enum { Size = sizeof(QT_UNICODE_LITERAL(str))/2 - 1 }; \ static const QStaticStringData<Size> qstring_literal = { \ Q_STATIC_STRING_DATA_HEADER_INITIALIZER(Size), \ diff --git a/src/corelib/tools/qstringmatcher.cpp b/src/corelib/tools/qstringmatcher.cpp index 67d3f0ebc8..167a467480 100644 --- a/src/corelib/tools/qstringmatcher.cpp +++ b/src/corelib/tools/qstringmatcher.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 Mail.ru Group. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -41,43 +42,43 @@ QT_BEGIN_NAMESPACE -static void bm_init_skiptable(const ushort *uc, int len, uchar *skiptable, Qt::CaseSensitivity cs) +static void bm_init_skiptable(const ushort *uc, qsizetype len, uchar *skiptable, Qt::CaseSensitivity cs) { - int l = qMin(len, 255); - memset(skiptable, l, 256*sizeof(uchar)); + int l = int(qMin(len, qsizetype(255))); + memset(skiptable, l, 256 * sizeof(uchar)); uc += len - l; if (cs == Qt::CaseSensitive) { while (l--) { skiptable[*uc & 0xff] = l; - uc++; + ++uc; } } else { const ushort *start = uc; while (l--) { skiptable[foldCase(uc, start) & 0xff] = l; - uc++; + ++uc; } } } -static inline int bm_find(const ushort *uc, uint l, int index, const ushort *puc, uint pl, +static inline qsizetype bm_find(const ushort *uc, qsizetype l, qsizetype index, const ushort *puc, qsizetype pl, const uchar *skiptable, Qt::CaseSensitivity cs) { if (pl == 0) - return index > (int)l ? -1 : index; - const uint pl_minus_one = pl - 1; + return index > l ? -1 : index; + const qsizetype pl_minus_one = pl - 1; const ushort *current = uc + index + pl_minus_one; const ushort *end = uc + l; if (cs == Qt::CaseSensitive) { while (current < end) { - uint skip = skiptable[*current & 0xff]; + qsizetype skip = skiptable[*current & 0xff]; if (!skip) { // possible match while (skip < pl) { if (*(current - skip) != puc[pl_minus_one-skip]) break; - skip++; + ++skip; } if (skip > pl_minus_one) // we have a match return (current - uc) - pl_minus_one; @@ -95,13 +96,13 @@ static inline int bm_find(const ushort *uc, uint l, int index, const ushort *puc } } else { while (current < end) { - uint skip = skiptable[foldCase(current, uc) & 0xff]; + qsizetype skip = skiptable[foldCase(current, uc) & 0xff]; if (!skip) { // possible match while (skip < pl) { if (foldCase(current - skip, uc) != foldCase(puc + pl_minus_one - skip, puc)) break; - skip++; + ++skip; } if (skip > pl_minus_one) // we have a match return (current - uc) - pl_minus_one; @@ -148,7 +149,7 @@ static inline int bm_find(const ushort *uc, uint l, int index, const ushort *puc Call setPattern() to give it a pattern to match. */ QStringMatcher::QStringMatcher() - : d_ptr(0), q_cs(Qt::CaseSensitive) + : d_ptr(nullptr), q_cs(Qt::CaseSensitive) { memset(q_data, 0, sizeof(q_data)); } @@ -160,7 +161,7 @@ QStringMatcher::QStringMatcher() Call indexIn() to perform a search. */ QStringMatcher::QStringMatcher(const QString &pattern, Qt::CaseSensitivity cs) - : d_ptr(0), q_pattern(pattern), q_cs(cs) + : d_ptr(nullptr), q_pattern(pattern), q_cs(cs) { p.uc = pattern.unicode(); p.len = pattern.size(); @@ -175,18 +176,31 @@ QStringMatcher::QStringMatcher(const QString &pattern, Qt::CaseSensitivity cs) by \a uc with the given \a length and case sensitivity specified by \a cs. */ QStringMatcher::QStringMatcher(const QChar *uc, int len, Qt::CaseSensitivity cs) - : d_ptr(0), q_cs(cs) + : QStringMatcher(QStringView(uc, len), cs) { - p.uc = uc; - p.len = len; - bm_init_skiptable((const ushort *)p.uc, len, p.q_skiptable, cs); } /*! + \fn QStringMatcher::QStringMatcher(QStringView pattern, Qt::CaseSensitivity cs = Qt::CaseSensitive) + \since 5.14 + + Constructs a string matcher that will search for \a pattern, with + case sensitivity \a cs. + + Call indexIn() to perform a search. +*/ +QStringMatcher::QStringMatcher(QStringView str, Qt::CaseSensitivity cs) + : d_ptr(nullptr), q_cs(cs) +{ + p.uc = str.data(); + p.len = int(str.size()); + bm_init_skiptable((const ushort *)p.uc, p.len, p.q_skiptable, cs); +} +/*! Copies the \a other string matcher to this string matcher. */ QStringMatcher::QStringMatcher(const QStringMatcher &other) - : d_ptr(0) + : d_ptr(nullptr) { operator=(other); } @@ -267,11 +281,7 @@ void QStringMatcher::setCaseSensitivity(Qt::CaseSensitivity cs) */ int QStringMatcher::indexIn(const QString &str, int from) const { - if (from < 0) - from = 0; - return bm_find((const ushort *)str.unicode(), str.size(), from, - (const ushort *)p.uc, p.len, - p.q_skiptable, q_cs); + return int(indexIn(QStringView(str), from)); } /*! @@ -288,9 +298,25 @@ int QStringMatcher::indexIn(const QString &str, int from) const */ int QStringMatcher::indexIn(const QChar *str, int length, int from) const { + return int(indexIn(QStringView(str, length), from)); +} + +/*! + \since 5.14 + + Searches the string \a str from character position \a from + (default 0, i.e. from the first character), for the string + pattern() that was set in the constructor or in the most recent + call to setPattern(). Returns the position where the pattern() + matched in \a str, or -1 if no match was found. + + \sa setPattern(), setCaseSensitivity() +*/ +qsizetype QStringMatcher::indexIn(QStringView str, qsizetype from) const +{ if (from < 0) from = 0; - return bm_find((const ushort *)str, length, from, + return bm_find((const ushort *)str.data(), str.size(), from, (const ushort *)p.uc, p.len, p.q_skiptable, q_cs); } @@ -307,16 +333,16 @@ int QStringMatcher::indexIn(const QChar *str, int length, int from) const \internal */ -int qFindStringBoyerMoore( - const QChar *haystack, int haystackLen, int haystackOffset, - const QChar *needle, int needleLen, Qt::CaseSensitivity cs) +qsizetype qFindStringBoyerMoore( + QStringView haystack, qsizetype haystackOffset, + QStringView needle, Qt::CaseSensitivity cs) { uchar skiptable[256]; - bm_init_skiptable((const ushort *)needle, needleLen, skiptable, cs); + bm_init_skiptable((const ushort *)needle.data(), needle.size(), skiptable, cs); if (haystackOffset < 0) haystackOffset = 0; - return bm_find((const ushort *)haystack, haystackLen, haystackOffset, - (const ushort *)needle, needleLen, skiptable, cs); + return bm_find((const ushort *)haystack.data(), haystack.size(), haystackOffset, + (const ushort *)needle.data(), needle.size(), skiptable, cs); } QT_END_NAMESPACE diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 549bff9f29..6de4353930 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 Mail.ru Group. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -41,6 +42,7 @@ #define QSTRINGMATCHER_H #include <QtCore/qstring.h> +#include <QtCore/qstringview.h> QT_BEGIN_NAMESPACE @@ -55,6 +57,8 @@ public: Qt::CaseSensitivity cs = Qt::CaseSensitive); QStringMatcher(const QChar *uc, int len, Qt::CaseSensitivity cs = Qt::CaseSensitive); + QStringMatcher(QStringView pattern, + Qt::CaseSensitivity cs = Qt::CaseSensitive); QStringMatcher(const QStringMatcher &other); ~QStringMatcher(); @@ -65,6 +69,7 @@ public: int indexIn(const QString &str, int from = 0) const; int indexIn(const QChar *str, int length, int from = 0) const; + qsizetype indexIn(QStringView str, qsizetype from = 0) const; QString pattern() const; inline Qt::CaseSensitivity caseSensitivity() const { return q_cs; } diff --git a/src/corelib/tools/qstringview.cpp b/src/corelib/tools/qstringview.cpp index a7d9426fa6..cc852dd042 100644 --- a/src/corelib/tools/qstringview.cpp +++ b/src/corelib/tools/qstringview.cpp @@ -38,6 +38,7 @@ ****************************************************************************/ #include "qstringview.h" +#include "qstring.h" QT_BEGIN_NAMESPACE @@ -232,9 +233,9 @@ QT_BEGIN_NAMESPACE The range \c{[str,len)} must remain valid for the lifetime of this string view object. - Passing \c nullptr as \a str is safe if \a len is 0, too, and results in a null string view. + Passing \nullptr as \a str is safe if \a len is 0, too, and results in a null string view. - The behavior is undefined if \a len is negative or, when positive, if \a str is \c nullptr. + The behavior is undefined if \a len is negative or, when positive, if \a str is \nullptr. This constructor only participates in overload resolution if \c Char is a compatible character type. The compatible character types are: \c QChar, \c ushort, \c char16_t and @@ -249,11 +250,11 @@ QT_BEGIN_NAMESPACE The range \c{[first,last)} must remain valid for the lifetime of this string view object. - Passing \c nullptr as \a first is safe if \a last is nullptr, too, + Passing \c \nullptr as \a first is safe if \a last is \nullptr, too, and results in a null string view. The behavior is undefined if \a last precedes \a first, or \a first - is \c nullptr and \a last is not. + is \nullptr and \a last is not. This constructor only participates in overload resolution if \c Char is a compatible character type. The compatible character types @@ -269,7 +270,7 @@ QT_BEGIN_NAMESPACE \a str must remain valid for the lifetime of this string view object. - Passing \c nullptr as \a str is safe and results in a null string view. + Passing \nullptr as \a str is safe and results in a null string view. This constructor only participates in overload resolution if \a str is not an array and if \c Char is a compatible character @@ -332,7 +333,7 @@ QT_BEGIN_NAMESPACE The string view will be empty if and only if \c{str.empty()}. It is unspecified whether this constructor can result in a null string view (\c{str.data()} would - have to return \c nullptr for this). + have to return \nullptr for this). \sa isNull(), isEmpty() */ @@ -529,6 +530,24 @@ QT_BEGIN_NAMESPACE */ /*! + \fn QString QStringView::arg(Args &&...args) const + \fn QString QLatin1String::arg(Args &&...args) const + \since 5.14 + + Replaces occurrences of \c{%N} in this string with the corresponding + argument from \a args. The arguments are not positional: the first of + the \a args replaces the \c{%N} with the lowest \c{N} (all of them), the + second of the \a args the \c{%N} with the next-lowest \c{N} etc. + + \c Args can consist of anything that implicitly converts to QStringView + or QLatin1String. + + In addition, the following types are also supported: QChar, QLatin1Char. + + \sa QString::arg() +*/ + +/*! \fn QChar QStringView::front() const Returns the first character in the string. Same as first(). @@ -720,6 +739,58 @@ QT_BEGIN_NAMESPACE */ /*! + \fn qsizetype QStringView::indexOf(QStringView str, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \fn qsizetype QStringView::indexOf(QLatin1String l1, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \fn qsizetype QStringView::indexOf(QChar c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const + \since 5.14 + + Returns the index position of the first occurrence of the string-view \a str, + Latin-1 string \a l1, or character \a ch, respectively, in this string-view, + searching forward from index position \a from. Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + If \a from is -1, the search starts at the last character; if it is + -2, at the next to last character and so on. + + \sa QString::indexOf() +*/ + +/*! + \fn bool QStringView::contains(QStringView str, Qt::CaseSensitivity cs) const + \fn bool QStringView::contains(QLatin1String l1, Qt::CaseSensitivity cs) const + \fn bool QStringView::contains(QChar c, Qt::CaseSensitivity cs) const + \since 5.14 + + Returns \c true if this string-view contains an occurrence of the string-view + \a str, Latin-1 string \a l1, or character \a ch; otherwise returns \c false. + + If \a cs is Qt::CaseSensitive (the default), the search is + case-sensitive; otherwise the search is case-insensitive. + + \sa indexOf() +*/ + +/*! + \fn qsizetype QStringView::lastIndexOf(QStringView str, qsizetype from, Qt::CaseSensitivity cs) const + \fn qsizetype QStringView::lastIndexOf(QLatin1String l1, qsizetype from, Qt::CaseSensitivity cs) const + \fn qsizetype QStringView::lastIndexOf(QChar c, qsizetype from, Qt::CaseSensitivity cs) const + \since 5.14 + + Returns the index position of the last occurrence of the string-view \a str, + Latin-1 string \a l1, or character \a ch, respectively, in this string-view, + searching backward from index position \a from. If \a from is -1 (default), + the search starts at the last character; if \a from is -2, at the next to last + character and so on. Returns -1 if \a str is not found. + + If \a cs is Qt::CaseSensitive (default), the search is case + sensitive; otherwise the search is case insensitive. + + \sa QString::lastIndexOf() +*/ + +/*! \fn QByteArray QStringView::toLatin1() const Returns a Latin-1 representation of the string as a QByteArray. @@ -794,4 +865,34 @@ QT_BEGIN_NAMESPACE \sa QString::isRightToLeft() */ +/*! + \since 5.14 + + Transcribes this string into the given \a array. + + Caller is responsible for ensuring \a array is large enough to hold the + \c wchar_t encoding of this string (allocating the array with the same length + as the string is always sufficient). The array is encoded in UTF-16 on + platforms where \c wchar_t is 2 bytes wide (e.g. Windows); otherwise (Unix + systems), \c wchar_t is assumed to be 4 bytes wide and the data is written + in UCS-4. + + \note This function writes no null terminator to the end of \a array. + + Returns the number of \c wchar_t entries written to \a array. + + \sa QString::toWCharArray() +*/ + +int QStringView::toWCharArray(wchar_t *array) const +{ + if (sizeof(wchar_t) == sizeof(QChar)) { + memcpy(array, data(), sizeof(QChar) * size()); + return size(); + } else { + return QString::toUcs4_helper(reinterpret_cast<const ushort *>(data()), int(size()), + reinterpret_cast<uint *>(array)); + } +} + QT_END_NAMESPACE diff --git a/src/corelib/tools/qstringview.h b/src/corelib/tools/qstringview.h index 2e95c2b218..b84b2995b9 100644 --- a/src/corelib/tools/qstringview.h +++ b/src/corelib/tools/qstringview.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2017 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Marc Mutz <marc.mutz@kdab.com> +** Copyright (C) 2019 Mail.ru Group. ** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -139,13 +140,13 @@ private: using if_compatible_qstring_like = typename std::enable_if<std::is_same<T, QString>::value || std::is_same<T, QStringRef>::value, bool>::type; template <typename Char, size_t N> - static Q_DECL_CONSTEXPR qsizetype lengthHelperArray(const Char (&)[N]) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR qsizetype lengthHelperArray(const Char (&)[N]) noexcept { return qsizetype(N - 1); } template <typename Char> - static qsizetype lengthHelperPointer(const Char *str) Q_DECL_NOTHROW + static qsizetype lengthHelperPointer(const Char *str) noexcept { #if defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) if (__builtin_constant_p(*str)) { @@ -157,21 +158,21 @@ private: #endif return QtPrivate::qustrlen(reinterpret_cast<const ushort *>(str)); } - static qsizetype lengthHelperPointer(const QChar *str) Q_DECL_NOTHROW + static qsizetype lengthHelperPointer(const QChar *str) noexcept { return QtPrivate::qustrlen(reinterpret_cast<const ushort *>(str)); } template <typename Char> - static const storage_type *castHelper(const Char *str) Q_DECL_NOTHROW + static const storage_type *castHelper(const Char *str) noexcept { return reinterpret_cast<const storage_type*>(str); } - static Q_DECL_CONSTEXPR const storage_type *castHelper(const storage_type *str) Q_DECL_NOTHROW + static Q_DECL_CONSTEXPR const storage_type *castHelper(const storage_type *str) noexcept { return str; } public: - Q_DECL_CONSTEXPR QStringView() Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QStringView() noexcept : m_size(0), m_data(nullptr) {} - Q_DECL_CONSTEXPR QStringView(std::nullptr_t) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QStringView(std::nullptr_t) noexcept : QStringView() {} template <typename Char, if_compatible_char<Char> = true> @@ -185,38 +186,38 @@ public: #ifdef Q_CLANG_QDOC template <typename Char, size_t N> - Q_DECL_CONSTEXPR QStringView(const Char (&array)[N]) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QStringView(const Char (&array)[N]) noexcept; template <typename Char> - Q_DECL_CONSTEXPR QStringView(const Char *str) Q_DECL_NOTHROW; + Q_DECL_CONSTEXPR QStringView(const Char *str) noexcept; #else template <typename Array, if_compatible_array<Array> = true> - Q_DECL_CONSTEXPR QStringView(const Array &str) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QStringView(const Array &str) noexcept : QStringView(str, lengthHelperArray(str)) {} template <typename Pointer, if_compatible_pointer<Pointer> = true> - Q_DECL_CONSTEXPR QStringView(const Pointer &str) Q_DECL_NOTHROW + Q_DECL_CONSTEXPR QStringView(const Pointer &str) noexcept : QStringView(str, str ? lengthHelperPointer(str) : 0) {} #endif #ifdef Q_CLANG_QDOC - QStringView(const QString &str) Q_DECL_NOTHROW; - QStringView(const QStringRef &str) Q_DECL_NOTHROW; + QStringView(const QString &str) noexcept; + QStringView(const QStringRef &str) noexcept; #else template <typename String, if_compatible_qstring_like<String> = true> - QStringView(const String &str) Q_DECL_NOTHROW + QStringView(const String &str) noexcept : QStringView(str.isNull() ? nullptr : str.data(), qsizetype(str.size())) {} #endif template <typename StdBasicString, if_compatible_string<StdBasicString> = true> - QStringView(const StdBasicString &str) Q_DECL_NOTHROW + QStringView(const StdBasicString &str) noexcept : QStringView(str.data(), qsizetype(str.size())) {} Q_REQUIRED_RESULT inline QString toString() const; // defined in qstring.h - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR qsizetype size() const Q_DECL_NOTHROW { return m_size; } - Q_REQUIRED_RESULT const_pointer data() const Q_DECL_NOTHROW { return reinterpret_cast<const_pointer>(m_data); } - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR const storage_type *utf16() const Q_DECL_NOTHROW { return m_data; } + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR qsizetype size() const noexcept { return m_size; } + Q_REQUIRED_RESULT const_pointer data() const noexcept { return reinterpret_cast<const_pointer>(m_data); } + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR const storage_type *utf16() const noexcept { return m_data; } Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar operator[](qsizetype n) const { return Q_ASSERT(n >= 0), Q_ASSERT(n < size()), QChar(m_data[n]); } @@ -225,6 +226,9 @@ public: // QString API // + template <typename...Args> + Q_REQUIRED_RESULT inline QString arg(Args &&...args) const; // defined in qstring.h + Q_REQUIRED_RESULT QByteArray toLatin1() const { return QtPrivate::convertToLatin1(*this); } Q_REQUIRED_RESULT QByteArray toUtf8() const { return QtPrivate::convertToUtf8(*this); } Q_REQUIRED_RESULT QByteArray toLocal8Bit() const { return QtPrivate::convertToLocal8Bit(*this); } @@ -248,51 +252,71 @@ public: Q_DECL_RELAXED_CONSTEXPR void chop(qsizetype n) { Q_ASSERT(n >= 0); Q_ASSERT(n <= size()); m_size -= n; } - Q_REQUIRED_RESULT QStringView trimmed() const Q_DECL_NOTHROW { return QtPrivate::trimmed(*this); } + Q_REQUIRED_RESULT QStringView trimmed() const noexcept { return QtPrivate::trimmed(*this); } - Q_REQUIRED_RESULT int compare(QStringView other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT int compare(QStringView other, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::compareStrings(*this, other, cs); } - Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool startsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::startsWith(*this, s, cs); } - Q_REQUIRED_RESULT inline bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT bool startsWith(QChar c) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline bool startsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + Q_REQUIRED_RESULT bool startsWith(QChar c) const noexcept { return !empty() && front() == c; } - Q_REQUIRED_RESULT bool startsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool startsWith(QChar c, Qt::CaseSensitivity cs) const noexcept { return QtPrivate::startsWith(*this, QStringView(&c, 1), cs); } - Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool endsWith(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept { return QtPrivate::endsWith(*this, s, cs); } - Q_REQUIRED_RESULT inline bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const Q_DECL_NOTHROW; - Q_REQUIRED_RESULT bool endsWith(QChar c) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline bool endsWith(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + Q_REQUIRED_RESULT bool endsWith(QChar c) const noexcept { return !empty() && back() == c; } - Q_REQUIRED_RESULT bool endsWith(QChar c, Qt::CaseSensitivity cs) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT bool endsWith(QChar c, Qt::CaseSensitivity cs) const noexcept { return QtPrivate::endsWith(*this, QStringView(&c, 1), cs); } - Q_REQUIRED_RESULT bool isRightToLeft() const Q_DECL_NOTHROW + Q_REQUIRED_RESULT qsizetype indexOf(QChar c, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::findString(*this, from, QStringView(&c, 1), cs); } + Q_REQUIRED_RESULT qsizetype indexOf(QStringView s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::findString(*this, from, s, cs); } + Q_REQUIRED_RESULT inline qsizetype indexOf(QLatin1String s, qsizetype from = 0, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + + Q_REQUIRED_RESULT bool contains(QChar c, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return indexOf(QStringView(&c, 1), 0, cs) != qsizetype(-1); } + Q_REQUIRED_RESULT bool contains(QStringView s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return indexOf(s, 0, cs) != qsizetype(-1); } + Q_REQUIRED_RESULT inline bool contains(QLatin1String s, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + + Q_REQUIRED_RESULT qsizetype lastIndexOf(QChar c, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::lastIndexOf(*this, from, QStringView(&c, 1), cs); } + Q_REQUIRED_RESULT qsizetype lastIndexOf(QStringView s, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept + { return QtPrivate::lastIndexOf(*this, from, s, cs); } + Q_REQUIRED_RESULT inline qsizetype lastIndexOf(QLatin1String s, qsizetype from = -1, Qt::CaseSensitivity cs = Qt::CaseSensitive) const noexcept; + + Q_REQUIRED_RESULT bool isRightToLeft() const noexcept { return QtPrivate::isRightToLeft(*this); } + Q_REQUIRED_RESULT Q_CORE_EXPORT int toWCharArray(wchar_t *array) const; + // // STL compatibility API: // - Q_REQUIRED_RESULT const_iterator begin() const Q_DECL_NOTHROW { return data(); } - Q_REQUIRED_RESULT const_iterator end() const Q_DECL_NOTHROW { return data() + size(); } - Q_REQUIRED_RESULT const_iterator cbegin() const Q_DECL_NOTHROW { return begin(); } - Q_REQUIRED_RESULT const_iterator cend() const Q_DECL_NOTHROW { return end(); } - Q_REQUIRED_RESULT const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - Q_REQUIRED_RESULT const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } - Q_REQUIRED_RESULT const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return rbegin(); } - Q_REQUIRED_RESULT const_reverse_iterator crend() const Q_DECL_NOTHROW { return rend(); } - - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool empty() const Q_DECL_NOTHROW { return size() == 0; } + Q_REQUIRED_RESULT const_iterator begin() const noexcept { return data(); } + Q_REQUIRED_RESULT const_iterator end() const noexcept { return data() + size(); } + Q_REQUIRED_RESULT const_iterator cbegin() const noexcept { return begin(); } + Q_REQUIRED_RESULT const_iterator cend() const noexcept { return end(); } + Q_REQUIRED_RESULT const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); } + Q_REQUIRED_RESULT const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); } + Q_REQUIRED_RESULT const_reverse_iterator crbegin() const noexcept { return rbegin(); } + Q_REQUIRED_RESULT const_reverse_iterator crend() const noexcept { return rend(); } + + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool empty() const noexcept { return size() == 0; } Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar front() const { return Q_ASSERT(!empty()), QChar(m_data[0]); } Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar back() const { return Q_ASSERT(!empty()), QChar(m_data[m_size - 1]); } // // Qt compatibility API: // - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isNull() const Q_DECL_NOTHROW { return !m_data; } - Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isEmpty() const Q_DECL_NOTHROW { return empty(); } + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isNull() const noexcept { return !m_data; } + Q_REQUIRED_RESULT Q_DECL_CONSTEXPR bool isEmpty() const noexcept { return empty(); } Q_REQUIRED_RESULT Q_DECL_CONSTEXPR int length() const /* not nothrow! */ { return Q_ASSERT(int(size()) == size()), int(size()); } Q_REQUIRED_RESULT Q_DECL_CONSTEXPR QChar first() const { return front(); } @@ -306,7 +330,7 @@ Q_DECLARE_TYPEINFO(QStringView, Q_PRIMITIVE_TYPE); template <typename QStringLike, typename std::enable_if< std::is_same<QStringLike, QString>::value || std::is_same<QStringLike, QStringRef>::value, bool>::type = true> -inline QStringView qToStringViewIgnoringNull(const QStringLike &s) Q_DECL_NOTHROW +inline QStringView qToStringViewIgnoringNull(const QStringLike &s) noexcept { return QStringView(s.data(), s.size()); } QT_END_NAMESPACE diff --git a/src/corelib/tools/qt_attribution.json b/src/corelib/tools/qt_attribution.json index 912da3f22c..f91742d421 100644 --- a/src/corelib/tools/qt_attribution.json +++ b/src/corelib/tools/qt_attribution.json @@ -22,7 +22,7 @@ "Name": "Unicode Common Locale Data Repository (CLDR)", "QDocModule": "qtcore", "QtUsage": "Used in Qt Core (QTimeZone, QLocale).", - "Files": "For update, see qtbase/util/local_database/cldr2qlocalexml.py", + "Files": "For update, see qtbase/util/locale_database/cldr2qlocalexml.py", "Files": "qlocale_data_p.h qtimezoneprivate_data_p.h", "Description": "The Unicode CLDR provides key building blocks for software to support the diff --git a/src/corelib/tools/qtimezoneprivate_data_p.h b/src/corelib/tools/qtimezoneprivate_data_p.h deleted file mode 100644 index 69b9417f19..0000000000 --- a/src/corelib/tools/qtimezoneprivate_data_p.h +++ /dev/null @@ -1,1154 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 John Layt <jlayt@kde.org> -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtCore module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef QTIMEZONEPRIVATE_DATA_P_H -#define QTIMEZONEPRIVATE_DATA_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of internal files. This header file may change from version to version -// without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/private/qglobal_p.h> - -QT_BEGIN_NAMESPACE - -/* - Windows Zone ID support, included in default base class build so can be used on all platforms, - e.g. an app running on Linux may need to communicate with a Windows Outlook server. These - tables can also be used to look-up Region Codes and UTC Offsets on platforms that don't directly - support them., e.g. Mac does not support availableTimeZones() filtering by region or offset. - - Another data table is provided for generic UTC+00:00 format time zones to be used as a - fall-back if no system time zones are available (QT_NO_SYSTEMLOCALE is set) or for QDateTimes - with a QT:Spec of OffsetFromUTC - - These tables are automatically adapted from the CLDR supplemental/windowsZones.xml data file - using a script in qtbase/util/local_database. Please do not edit this data directly. In the - future if ICU is made a hard dependency then the ICU resource can be used directly and this - table removed -*/ - -struct QZoneData { - quint16 windowsIdKey; // Windows ID Key - quint16 country; // Country of IANA ID's, AnyCountry means No Country - quint16 ianaIdIndex; // All IANA ID's for the Windows ID and Country, space separated -}; - -struct QWindowsData { - quint16 windowsIdKey; // Windows ID Key - quint16 windowsIdIndex; // Windows ID Literal - quint16 ianaIdIndex; // Default IANA ID for the Windows ID - qint32 offsetFromUtc; // Standard Time Offset from UTC, used for quick look-ups -}; - -struct QUtcData { - quint16 ianaIdIndex; // IANA ID's - qint32 offsetFromUtc; // Offset form UTC is seconds -}; - -/* - COPYRIGHT AND PERMISSION NOTICE - - Copyright © 1991-2012 Unicode, Inc. All rights reserved. Distributed under - the Terms of Use in http://www.unicode.org/copyright.html. - - Permission is hereby granted, free of charge, to any person obtaining a - copy of the Unicode data files and any associated documentation (the "Data - Files") or Unicode software and any associated documentation (the "Software") - to deal in the Data Files or Software without restriction, including without - limitation the rights to use, copy, modify, merge, publish, distribute, and/or - sell copies of the Data Files or Software, and to permit persons to whom the - Data Files or Software are furnished to do so, provided that (a) the above - copyright notice(s) and this permission notice appear with all copies of the - Data Files or Software, (b) both the above copyright notice(s) and this - permission notice appear in associated documentation, and (c) there is clear - notice in each modified Data File or in the Software as well as in the - documentation associated with the Data File(s) or Software that the data or - software has been modified. -*/ - -// GENERATED PART STARTS HERE - -/* - This part of the file was generated on 2017-05-23 from the - Common Locale Data Repository v29 supplemental/windowsZones.xml file $Revision: 12348 $ - - http://www.unicode.org/cldr/ - - Do not edit this code: run cldr2qtimezone.py on updated (or - edited) CLDR data; see qtbase/util/local_database/. -*/ - -// Windows ID Key, Country Enum, IANA ID Index -static const QZoneData zoneDataTable[] = { - { 22, 57, 0 }, // Central Europe Standard Time / CzechRepublic - { 69, 139, 14 }, // Pacific Standard Time / Mexico - { 53, 188, 51 }, // Mauritius Standard Time / Seychelles - { 50, 122, 63 }, // Libya Standard Time / Libya - { 79, 38, 78 }, // SA Western Standard Time / Canada - { 83, 35, 99 }, // South Africa Standard Time / Burundi - { 102, 205, 116 }, // W. Europe Standard Time / Sweden - { 89, 213, 133 }, // Tonga Standard Time / Tokelau - { 77, 76, 149 }, // SA Eastern Standard Time / FrenchGuiana - { 79, 215, 165 }, // SA Western Standard Time / TrinidadAndTobago - { 69, 38, 187 }, // Pacific Standard Time / Canada - { 97, 0, 239 }, // UTC+12 / AnyCountry - { 19, 65, 250 }, // Central America Standard Time / ElSalvador - { 82, 101, 270 }, // Singapore Standard Time / Indonesia - { 37, 248, 284 }, // FLE Standard Time / AlandIslands - { 16, 0, 301 }, // Cape Verde Standard Time / AnyCountry - { 97, 220, 311 }, // UTC+12 / Tuvalu - { 79, 182, 328 }, // SA Western Standard Time / SaintVincentAndTheGrenadines - { 83, 179, 347 }, // South Africa Standard Time / Rwanda - { 102, 125, 361 }, // W. Europe Standard Time / Luxembourg - { 41, 34, 379 }, // Greenwich Standard Time / BurkinaFaso - { 20, 116, 398 }, // Central Asia Standard Time / Kyrgyzstan - { 101, 216, 411 }, // W. Central Africa Standard Time / Tunisia - { 101, 79, 424 }, // W. Central Africa Standard Time / Gabon - { 19, 96, 442 }, // Central America Standard Time / Honduras - { 81, 36, 462 }, // SE Asia Standard Time / Cambodia - { 82, 170, 478 }, // Singapore Standard Time / Philippines - { 101, 41, 490 }, // W. Central Africa Standard Time / CentralAfricanRepublic - { 5, 103, 504 }, // Arabic Standard Time / Iraq - { 72, 21, 517 }, // Romance Standard Time / Belgium - { 74, 178, 533 }, // Russia Time Zone 10 / Russia - { 20, 44, 552 }, // Central Asia Standard Time / China - { 3, 17, 564 }, // Arab Standard Time / Bahrain - { 88, 62, 577 }, // Tokyo Standard Time / EastTimor - { 37, 68, 587 }, // FLE Standard Time / Estonia - { 41, 136, 602 }, // Greenwich Standard Time / Mauritania - { 83, 49, 620 }, // South Africa Standard Time / CongoKinshasa - { 72, 74, 638 }, // Romance Standard Time / France - { 35, 178, 651 }, // Ekaterinburg Standard Time / Russia - { 32, 16, 670 }, // Eastern Standard Time / Bahamas - { 94, 30, 685 }, // UTC-02 / Brazil - { 12, 30, 701 }, // Bahia Standard Time / Brazil - { 82, 0, 715 }, // Singapore Standard Time / AnyCountry - { 29, 201, 725 }, // E. Africa Standard Time / Sudan - { 24, 229, 741 }, // Central Pacific Standard Time / Vanuatu - { 55, 227, 755 }, // Montevideo Standard Time / Uruguay - { 79, 233, 774 }, // SA Western Standard Time / BritishVirginIslands - { 29, 221, 790 }, // E. Africa Standard Time / Uganda - { 101, 6, 805 }, // W. Central Africa Standard Time / Angola - { 68, 141, 819 }, // E. Europe Standard Time / Moldova - { 51, 112, 835 }, // Line Islands Standard Time / Kiribati - { 89, 0, 854 }, // Tonga Standard Time / AnyCountry - { 79, 61, 865 }, // SA Western Standard Time / DominicanRepublic - { 39, 75, 887 }, // GMT Standard Time / Guernsey - { 37, 222, 903 }, // FLE Standard Time / Ukraine - { 83, 28, 949 }, // South Africa Standard Time / Botswana - { 82, 130, 965 }, // Singapore Standard Time / Malaysia - { 95, 4, 996 }, // UTC-11 / AmericanSamoa - { 41, 189, 1014 }, // Greenwich Standard Time / SierraLeone - { 29, 194, 1030 }, // E. Africa Standard Time / Somalia - { 94, 196, 1047 }, // UTC-02 / SouthGeorgiaAndTheSouthSandwichIslands - { 96, 0, 1070 }, // UTC / AnyCountry - { 101, 37, 1078 }, // W. Central Africa Standard Time / Cameroon - { 13, 25, 1092 }, // Bangladesh Standard Time / Bhutan - { 102, 151, 1105 }, // W. Europe Standard Time / Netherlands - { 37, 118, 1122 }, // FLE Standard Time / Latvia - { 29, 48, 1134 }, // E. Africa Standard Time / Comoros - { 60, 178, 1148 }, // N. Central Asia Standard Time / Russia - { 81, 117, 1175 }, // SE Asia Standard Time / Laos - { 22, 242, 1190 }, // Central Europe Standard Time / Montenegro - { 37, 33, 1207 }, // FLE Standard Time / Bulgaria - { 11, 173, 1220 }, // Azores Standard Time / Portugal - { 97, 149, 1236 }, // UTC+12 / Nauru - { 83, 146, 1250 }, // South Africa Standard Time / Mozambique - { 102, 82, 1264 }, // W. Europe Standard Time / Germany - { 79, 255, 1294 }, // SA Western Standard Time / Bonaire - { 24, 153, 1313 }, // Central Pacific Standard Time / NewCaledonia - { 45, 102, 1328 }, // Iran Standard Time / Iran - { 13, 18, 1340 }, // Bangladesh Standard Time / Bangladesh - { 69, 225, 1351 }, // Pacific Standard Time / UnitedStates - { 102, 142, 1371 }, // W. Europe Standard Time / Monaco - { 29, 128, 1385 }, // E. Africa Standard Time / Madagascar - { 65, 178, 1405 }, // North Asia East Standard Time / Russia - { 20, 8, 1418 }, // Central Asia Standard Time / Antarctica - { 22, 2, 1436 }, // Central Europe Standard Time / Albania - { 79, 87, 1450 }, // SA Western Standard Time / Grenada - { 81, 0, 1466 }, // SE Asia Standard Time / AnyCountry - { 39, 173, 1476 }, // GMT Standard Time / Portugal - { 103, 228, 1507 }, // West Asia Standard Time / Uzbekistan - { 58, 139, 1536 }, // Mountain Standard Time / Mexico - { 83, 129, 1552 }, // South Africa Standard Time / Malawi - { 78, 107, 1568 }, // SA Pacific Standard Time / Jamaica - { 41, 91, 1584 }, // Greenwich Standard Time / Guinea - { 101, 49, 1599 }, // W. Central Africa Standard Time / CongoKinshasa - { 43, 226, 1615 }, // Hawaiian Standard Time / UnitedStatesMinorOutlyingIslands - { 77, 8, 1632 }, // SA Eastern Standard Time / Antarctica - { 97, 235, 1651 }, // UTC+12 / WallisAndFutunaIslands - { 81, 232, 1666 }, // SE Asia Standard Time / Vietnam - { 34, 64, 1678 }, // Egypt Standard Time / Egypt - { 102, 106, 1691 }, // W. Europe Standard Time / Italy - { 79, 256, 1703 }, // SA Western Standard Time / SintMaarten - { 59, 147, 1725 }, // Myanmar Standard Time / Myanmar - { 78, 166, 1738 }, // SA Pacific Standard Time / Panama - { 56, 236, 1753 }, // Morocco Standard Time / WesternSahara - { 24, 193, 1769 }, // Central Pacific Standard Time / SolomonIslands - { 48, 178, 1789 }, // Kaliningrad Standard Time / Russia - { 47, 109, 1808 }, // Jordan Standard Time / Jordan - { 42, 177, 1819 }, // GTB Standard Time / Romania - { 41, 92, 1836 }, // Greenwich Standard Time / GuineaBissau - { 102, 184, 1850 }, // W. Europe Standard Time / SanMarino - { 103, 209, 1868 }, // West Asia Standard Time / Tajikistan - { 75, 178, 1882 }, // Russia Time Zone 11 / Russia - { 101, 157, 1909 }, // W. Central Africa Standard Time / Nigeria - { 79, 152, 1922 }, // SA Western Standard Time / CuraSao - { 57, 139, 1938 }, // Mountain Standard Time (Mexico) / Mexico - { 4, 162, 1973 }, // Arabian Standard Time / Oman - { 78, 169, 1985 }, // SA Pacific Standard Time / Peru - { 102, 206, 1998 }, // W. Europe Standard Time / Switzerland - { 41, 99, 2012 }, // Greenwich Standard Time / Iceland - { 33, 139, 2031 }, // Eastern Standard Time (Mexico) / Mexico - { 58, 225, 2046 }, // Mountain Standard Time / UnitedStates - { 100, 8, 2075 }, // W. Australia Standard Time / Antarctica - { 79, 30, 2092 }, // SA Western Standard Time / Brazil - { 101, 23, 2145 }, // W. Central Africa Standard Time / Benin - { 78, 43, 2163 }, // SA Pacific Standard Time / Chile - { 104, 0, 2178 }, // West Pacific Standard Time / AnyCountry - { 79, 181, 2189 }, // SA Western Standard Time / SaintLucia - { 27, 126, 2206 }, // China Standard Time / Macau - { 101, 66, 2217 }, // W. Central Africa Standard Time / EquatorialGuinea - { 43, 51, 2231 }, // Hawaiian Standard Time / CookIslands - { 41, 80, 2249 }, // Greenwich Standard Time / Gambia - { 51, 0, 2263 }, // Line Islands Standard Time / AnyCountry - { 52, 178, 2274 }, // Magadan Standard Time / Russia - { 22, 191, 2287 }, // Central Europe Standard Time / Slovakia - { 102, 5, 2305 }, // W. Europe Standard Time / Andorra - { 81, 211, 2320 }, // SE Asia Standard Time / Thailand - { 103, 0, 2333 }, // West Asia Standard Time / AnyCountry - { 24, 167, 2343 }, // Central Pacific Standard Time / PapuaNewGuinea - { 102, 230, 2364 }, // W. Europe Standard Time / VaticanCityState - { 58, 38, 2379 }, // Mountain Standard Time / Canada - { 77, 202, 2453 }, // SA Eastern Standard Time / Suriname - { 9, 13, 2472 }, // AUS Eastern Standard Time / Australia - { 29, 210, 2509 }, // E. Africa Standard Time / Tanzania - { 58, 0, 2530 }, // Mountain Standard Time / AnyCountry - { 83, 120, 2538 }, // South Africa Standard Time / Lesotho - { 97, 134, 2552 }, // UTC+12 / MarshallIslands - { 29, 111, 2585 }, // E. Africa Standard Time / Kenya - { 103, 218, 2600 }, // West Asia Standard Time / Turkmenistan - { 27, 97, 2614 }, // China Standard Time / HongKong - { 29, 0, 2629 }, // E. Africa Standard Time / AnyCountry - { 19, 22, 2639 }, // Central America Standard Time / Belize - { 31, 30, 2654 }, // E. South America Standard Time / Brazil - { 72, 197, 2672 }, // Romance Standard Time / Spain - { 81, 101, 2699 }, // SE Asia Standard Time / Indonesia - { 88, 0, 2727 }, // Tokyo Standard Time / AnyCountry - { 2, 225, 2737 }, // Alaskan Standard Time / UnitedStates - { 72, 58, 2832 }, // Romance Standard Time / Denmark - { 63, 8, 2850 }, // New Zealand Standard Time / Antarctica - { 3, 175, 2869 }, // Arab Standard Time / Qatar - { 79, 245, 2880 }, // SA Western Standard Time / Saint Martin - { 79, 19, 2896 }, // SA Western Standard Time / Barbados - { 97, 226, 2913 }, // UTC+12 / UnitedStatesMinorOutlyingIslands - { 37, 73, 2926 }, // FLE Standard Time / Finland - { 29, 138, 2942 }, // E. Africa Standard Time / Mayotte - { 39, 71, 2957 }, // GMT Standard Time / FaroeIslands - { 78, 38, 2973 }, // SA Pacific Standard Time / Canada - { 43, 0, 2995 }, // Hawaiian Standard Time / AnyCountry - { 23, 27, 3006 }, // Central European Standard Time / BosniaAndHerzegowina - { 38, 81, 3022 }, // Georgian Standard Time / Georgia - { 95, 0, 3035 }, // UTC-11 / AnyCountry - { 24, 13, 3046 }, // Central Pacific Standard Time / Australia - { 104, 167, 3067 }, // West Pacific Standard Time / PapuaNewGuinea - { 71, 168, 3088 }, // Paraguay Standard Time / Paraguay - { 43, 77, 3105 }, // Hawaiian Standard Time / FrenchPolynesia - { 41, 212, 3120 }, // Greenwich Standard Time / Togo - { 39, 197, 3132 }, // GMT Standard Time / Spain - { 83, 195, 3148 }, // South Africa Standard Time / SouthAfrica - { 18, 13, 3168 }, // Cen. Australia Standard Time / Australia - { 104, 160, 3209 }, // West Pacific Standard Time / NorthernMarianaIslands - { 77, 70, 3224 }, // SA Eastern Standard Time / FalklandIslands - { 42, 56, 3241 }, // GTB Standard Time / Cyprus - { 4, 223, 3254 }, // Arabian Standard Time / UnitedArabEmirates - { 103, 78, 3265 }, // West Asia Standard Time / FrenchSouthernTerritories - { 101, 42, 3282 }, // W. Central Africa Standard Time / Chad - { 23, 127, 3298 }, // Central European Standard Time / Macedonia - { 3, 237, 3312 }, // Arab Standard Time / Yemen - { 80, 183, 3322 }, // Samoa Standard Time / Samoa - { 43, 225, 3335 }, // Hawaiian Standard Time / UnitedStates - { 28, 0, 3352 }, // Dateline Standard Time / AnyCountry - { 93, 139, 3363 }, // US Mountain Standard Time / Mexico - { 64, 38, 3382 }, // Newfoundland Standard Time / Canada - { 63, 154, 3399 }, // New Zealand Standard Time / NewZealand - { 76, 178, 3416 }, // Russian Standard Time / Russia - { 82, 190, 3465 }, // Singapore Standard Time / Singapore - { 1, 1, 3480 }, // Afghanistan Standard Time / Afghanistan - { 102, 133, 3491 }, // W. Europe Standard Time / Malta - { 79, 12, 3504 }, // SA Western Standard Time / Aruba - { 25, 139, 3518 }, // Central Standard Time (Mexico) / Mexico - { 39, 251, 3594 }, // GMT Standard Time / IsleOfMan - { 102, 123, 3613 }, // W. Europe Standard Time / Liechtenstein - { 77, 30, 3626 }, // SA Eastern Standard Time / Brazil - { 49, 114, 3723 }, // Korea Standard Time / SouthKorea - { 79, 88, 3734 }, // SA Western Standard Time / Guadeloupe - { 94, 0, 3753 }, // UTC-02 / AnyCountry - { 59, 46, 3763 }, // Myanmar Standard Time / CocosIslands - { 102, 203, 3776 }, // W. Europe Standard Time / SvalbardAndJanMayenIslands - { 29, 69, 3796 }, // E. Africa Standard Time / Ethiopia - { 73, 178, 3815 }, // Russia Time Zone 3 / Russia - { 83, 240, 3829 }, // South Africa Standard Time / Zimbabwe - { 100, 13, 3843 }, // W. Australia Standard Time / Australia - { 101, 0, 3859 }, // W. Central Africa Standard Time / AnyCountry - { 32, 55, 3869 }, // Eastern Standard Time / Cuba - { 56, 145, 3884 }, // Morocco Standard Time / Morocco - { 17, 11, 3902 }, // Caucasus Standard Time / Armenia - { 7, 24, 3915 }, // Atlantic Standard Time / Bermuda - { 86, 208, 3932 }, // Taipei Standard Time / Taiwan - { 20, 0, 3944 }, // Central Asia Standard Time / AnyCountry - { 40, 86, 3954 }, // Greenland Standard Time / Greenland - { 23, 172, 3970 }, // Central European Standard Time / Poland - { 89, 214, 3984 }, // Tonga Standard Time / Tonga - { 20, 110, 4002 }, // Central Asia Standard Time / Kazakhstan - { 81, 8, 4029 }, // SE Asia Standard Time / Antarctica - { 54, 119, 4046 }, // Middle East Standard Time / Lebanon - { 19, 90, 4058 }, // Central America Standard Time / Guatemala - { 70, 163, 4076 }, // Pakistan Standard Time / Pakistan - { 41, 83, 4089 }, // Greenwich Standard Time / Ghana - { 79, 174, 4102 }, // SA Western Standard Time / PuertoRico - { 79, 26, 4122 }, // SA Western Standard Time / Bolivia - { 32, 225, 4137 }, // Eastern Standard Time / UnitedStates - { 85, 207, 4294 }, // Syria Standard Time / Syria - { 97, 112, 4308 }, // UTC+12 / Kiribati - { 79, 0, 4323 }, // SA Western Standard Time / AnyCountry - { 78, 47, 4333 }, // SA Pacific Standard Time / Colombia - { 16, 39, 4348 }, // Cape Verde Standard Time / CapeVerde - { 8, 13, 4368 }, // AUS Central Standard Time / Australia - { 106, 113, 4385 }, // North Korea Standard Time / NorthKorea - { 10, 15, 4400 }, // Azerbaijan Standard Time / Azerbaijan - { 102, 84, 4410 }, // W. Europe Standard Time / Gibraltar - { 46, 105, 4427 }, // Israel Standard Time / Israel - { 22, 192, 4442 }, // Central Europe Standard Time / Slovenia - { 24, 159, 4459 }, // Central Pacific Standard Time / NorfolkIsland - { 82, 32, 4475 }, // Singapore Standard Time / Brunei - { 101, 50, 4487 }, // W. Central Africa Standard Time / CongoBrazzaville - { 62, 150, 4506 }, // Nepal Standard Time / Nepal - { 44, 100, 4520 }, // India Standard Time / India - { 79, 9, 4534 }, // SA Western Standard Time / AntiguaAndBarbuda - { 39, 252, 4550 }, // GMT Standard Time / Jersey - { 79, 144, 4564 }, // SA Western Standard Time / Montserrat - { 93, 0, 4583 }, // US Mountain Standard Time / AnyCountry - { 79, 93, 4593 }, // SA Western Standard Time / Guyana - { 41, 187, 4608 }, // Greenwich Standard Time / Senegal - { 102, 161, 4621 }, // W. Europe Standard Time / Norway - { 42, 85, 4633 }, // GTB Standard Time / Greece - { 3, 115, 4647 }, // Arab Standard Time / Kuwait - { 24, 140, 4659 }, // Central Pacific Standard Time / Micronesia - { 19, 52, 4689 }, // Central America Standard Time / CostaRica - { 79, 60, 4708 }, // SA Western Standard Time / Dominica - { 83, 204, 4725 }, // South Africa Standard Time / Swaziland - { 79, 135, 4740 }, // SA Western Standard Time / Martinique - { 53, 176, 4759 }, // Mauritius Standard Time / Reunion - { 19, 0, 4774 }, // Central America Standard Time / AnyCountry - { 90, 217, 4784 }, // Turkey Standard Time / Turkey - { 66, 178, 4800 }, // North Asia Standard Time / Russia - { 41, 53, 4835 }, // Greenwich Standard Time / IvoryCoast - { 78, 30, 4850 }, // SA Pacific Standard Time / Brazil - { 26, 0, 4886 }, // Central Standard Time / AnyCountry - { 93, 225, 4894 }, // US Mountain Standard Time / UnitedStates - { 15, 38, 4910 }, // Canada Central Standard Time / Canada - { 78, 0, 4947 }, // SA Pacific Standard Time / AnyCountry - { 103, 8, 4957 }, // West Asia Standard Time / Antarctica - { 103, 131, 4975 }, // West Asia Standard Time / Maldives - { 22, 243, 4991 }, // Central Europe Standard Time / Serbia - { 29, 67, 5007 }, // E. Africa Standard Time / Eritrea - { 93, 38, 5021 }, // US Mountain Standard Time / Canada - { 22, 98, 5078 }, // Central Europe Standard Time / Hungary - { 61, 148, 5094 }, // Namibia Standard Time / Namibia - { 88, 101, 5110 }, // Tokyo Standard Time / Indonesia - { 30, 13, 5124 }, // E. Australia Standard Time / Australia - { 4, 0, 5162 }, // Arabian Standard Time / AnyCountry - { 98, 231, 5172 }, // Venezuela Standard Time / Venezuela - { 29, 8, 5188 }, // E. Africa Standard Time / Antarctica - { 23, 54, 5205 }, // Central European Standard Time / Croatia - { 6, 10, 5219 }, // Argentina Standard Time / Argentina - { 67, 8, 5492 }, // Pacific SA Standard Time / Antarctica - { 32, 38, 5510 }, // Eastern Standard Time / Canada - { 41, 132, 5615 }, // Greenwich Standard Time / Mali - { 3, 186, 5629 }, // Arab Standard Time / SaudiArabia - { 104, 140, 5641 }, // West Pacific Standard Time / Micronesia - { 88, 108, 5654 }, // Tokyo Standard Time / Japan - { 89, 112, 5665 }, // Tonga Standard Time / Kiribati - { 39, 224, 5683 }, // GMT Standard Time / UnitedKingdom - { 92, 225, 5697 }, // US Eastern Standard Time / UnitedStates - { 84, 198, 5764 }, // Sri Lanka Standard Time / SriLanka - { 26, 38, 5777 }, // Central Standard Time / Canada - { 29, 59, 5852 }, // E. Africa Standard Time / Djibouti - { 7, 38, 5868 }, // Atlantic Standard Time / Canada - { 41, 185, 5936 }, // Greenwich Standard Time / SaoTomeAndPrincipe - { 79, 234, 5952 }, // SA Western Standard Time / UnitedStatesVirginIslands - { 83, 239, 5970 }, // South Africa Standard Time / Zambia - { 32, 94, 5984 }, // Eastern Standard Time / Haiti - { 101, 156, 6007 }, // W. Central Africa Standard Time / Niger - { 77, 0, 6021 }, // SA Eastern Standard Time / AnyCountry - { 101, 3, 6031 }, // W. Central Africa Standard Time / Algeria - { 78, 63, 6046 }, // SA Pacific Standard Time / Ecuador - { 20, 31, 6064 }, // Central Asia Standard Time / BritishIndianOceanTerritory - { 27, 44, 6078 }, // China Standard Time / China - { 21, 30, 6092 }, // Central Brazilian Standard Time / Brazil - { 95, 226, 6128 }, // UTC-11 / UnitedStatesMinorOutlyingIslands - { 32, 0, 6143 }, // Eastern Standard Time / AnyCountry - { 81, 45, 6151 }, // SE Asia Standard Time / ChristmasIsland - { 19, 63, 6168 }, // Central America Standard Time / Ecuador - { 79, 7, 6186 }, // SA Western Standard Time / Anguilla - { 78, 40, 6203 }, // SA Pacific Standard Time / CaymanIslands - { 79, 180, 6218 }, // SA Western Standard Time / SaintKittsAndNevis - { 67, 43, 6235 }, // Pacific SA Standard Time / Chile - { 88, 164, 6252 }, // Tokyo Standard Time / Palau - { 105, 178, 6266 }, // Yakutsk Standard Time / Russia - { 37, 124, 6304 }, // FLE Standard Time / Lithuania - { 41, 121, 6319 }, // Greenwich Standard Time / Liberia - { 104, 89, 6335 }, // West Pacific Standard Time / Guam - { 96, 86, 6348 }, // UTC / Greenland - { 36, 72, 6369 }, // Fiji Standard Time / Fiji - { 19, 155, 6382 }, // Central America Standard Time / Nicaragua - { 11, 86, 6398 }, // Azores Standard Time / Greenland - { 79, 244, 6419 }, // SA Western Standard Time / Saint Barthelemy - { 69, 0, 6441 }, // Pacific Standard Time / AnyCountry - { 79, 219, 6449 }, // SA Western Standard Time / TurksAndCaicosIslands - { 103, 110, 6468 }, // West Asia Standard Time / Kazakhstan - { 26, 225, 6501 }, // Central Standard Time / UnitedStates - { 26, 139, 6669 }, // Central Standard Time / Mexico - { 7, 86, 6687 }, // Atlantic Standard Time / Greenland - { 24, 0, 6701 }, // Central Pacific Standard Time / AnyCountry - { 41, 199, 6712 }, // Greenwich Standard Time / SaintHelena - { 95, 158, 6731 }, // UTC-11 / Niue - { 53, 137, 6744 }, // Mauritius Standard Time / Mauritius - { 91, 143, 6761 }, // Ulaanbaatar Standard Time / Mongolia - { 83, 0, 6794 }, // South Africa Standard Time / AnyCountry - { 14, 20, 6804 }, // Belarus Standard Time / Belarus - { 29, 254, 6817 }, // E. Africa Standard Time / SouthSudan - { 87, 13, 6829 }, // Tasmania Standard Time / Australia - { 99, 178, 6863 }, // Vladivostok Standard Time / Russia - { 104, 8, 6908 }, // West Pacific Standard Time / Antarctica - { 39, 104, 6934 }, // GMT Standard Time / Ireland - { 102, 14, 6948 }, // W. Europe Standard Time / Austria - { 0, 0, 0 } // Trailing zeroes -}; - -// Windows ID Key, Windows ID Index, IANA ID Index, UTC Offset -static const QWindowsData windowsDataTable[] = { - { 1, 0, 3480, 16200 }, // Afghanistan Standard Time - { 2, 26, 6962,-32400 }, // Alaskan Standard Time - { 3, 48, 5629, 10800 }, // Arab Standard Time - { 4, 67, 3254, 14400 }, // Arabian Standard Time - { 5, 89, 504, 10800 }, // Arabic Standard Time - { 6, 110, 6980,-10800 }, // Argentina Standard Time - { 7, 134, 7001,-14400 }, // Atlantic Standard Time - { 8, 157, 4368, 34200 }, // AUS Central Standard Time - { 9, 183, 7017, 36000 }, // AUS Eastern Standard Time - { 10, 209, 4400, 14400 }, // Azerbaijan Standard Time - { 11, 234, 1220, -3600 }, // Azores Standard Time - { 12, 255, 701,-10800 }, // Bahia Standard Time - { 13, 275, 1340, 21600 }, // Bangladesh Standard Time - { 14, 300, 6804, 10800 }, // Belarus Standard Time - { 15, 322, 7034,-21600 }, // Canada Central Standard Time - { 16, 351, 4348, -3600 }, // Cape Verde Standard Time - { 17, 376, 3902, 14400 }, // Caucasus Standard Time - { 18, 399, 7049, 34200 }, // Cen. Australia Standard Time - { 19, 428, 4058,-21600 }, // Central America Standard Time - { 20, 458, 7068, 21600 }, // Central Asia Standard Time - { 21, 485, 7080,-14400 }, // Central Brazilian Standard Time - { 22, 517, 5078, 3600 }, // Central Europe Standard Time - { 23, 546, 3970, 3600 }, // Central European Standard Time - { 24, 577, 1769, 39600 }, // Central Pacific Standard Time - { 25, 607, 7095,-21600 }, // Central Standard Time (Mexico) - { 26, 638, 7115,-21600 }, // Central Standard Time - { 27, 660, 6078, 28800 }, // China Standard Time - { 28, 680, 3352,-43200 }, // Dateline Standard Time - { 29, 703, 2585, 10800 }, // E. Africa Standard Time - { 30, 727, 7131, 36000 }, // E. Australia Standard Time - { 31, 754, 2654,-10800 }, // E. South America Standard Time - { 32, 785, 7150,-18000 }, // Eastern Standard Time - { 33, 807, 2031,-18000 }, // Eastern Standard Time (Mexico) - { 34, 838, 1678, 7200 }, // Egypt Standard Time - { 35, 858, 651, 18000 }, // Ekaterinburg Standard Time - { 36, 885, 6369, 43200 }, // Fiji Standard Time - { 37, 904, 7167, 7200 }, // FLE Standard Time - { 38, 922, 3022, 14400 }, // Georgian Standard Time - { 39, 945, 5683, 0 }, // GMT Standard Time - { 40, 963, 3954,-10800 }, // Greenland Standard Time - { 41, 987, 2012, 0 }, // Greenwich Standard Time - { 42, 1011, 1819, 7200 }, // GTB Standard Time - { 43, 1029, 3335,-36000 }, // Hawaiian Standard Time - { 44, 1052, 4520, 19800 }, // India Standard Time - { 45, 1072, 1328, 12600 }, // Iran Standard Time - { 46, 1091, 4427, 7200 }, // Israel Standard Time - { 47, 1112, 1808, 7200 }, // Jordan Standard Time - { 48, 1133, 1789, 7200 }, // Kaliningrad Standard Time - { 49, 1159, 3723, 32400 }, // Korea Standard Time - { 50, 1179, 63, 7200 }, // Libya Standard Time - { 51, 1199, 835, 50400 }, // Line Islands Standard Time - { 52, 1226, 2274, 36000 }, // Magadan Standard Time - { 53, 1248, 6744, 14400 }, // Mauritius Standard Time - { 54, 1272, 4046, 7200 }, // Middle East Standard Time - { 55, 1298, 755,-10800 }, // Montevideo Standard Time - { 56, 1323, 3884, 0 }, // Morocco Standard Time - { 57, 1345, 7179,-25200 }, // Mountain Standard Time (Mexico) - { 58, 1377, 7197,-25200 }, // Mountain Standard Time - { 59, 1400, 1725, 23400 }, // Myanmar Standard Time - { 60, 1422, 7212, 21600 }, // N. Central Asia Standard Time - { 61, 1452, 5094, 3600 }, // Namibia Standard Time - { 62, 1474, 4506, 20700 }, // Nepal Standard Time - { 63, 1494, 3399, 43200 }, // New Zealand Standard Time - { 64, 1520, 3382,-12600 }, // Newfoundland Standard Time - { 65, 1547, 1405, 28800 }, // North Asia East Standard Time - { 66, 1577, 7229, 25200 }, // North Asia Standard Time - { 67, 1602, 6235,-10800 }, // Pacific SA Standard Time - { 68, 1627, 819, 7200 }, // E. Europe Standard Time - { 69, 1651, 1351,-28800 }, // Pacific Standard Time - { 70, 1673, 4076, 18000 }, // Pakistan Standard Time - { 71, 1696, 3088,-14400 }, // Paraguay Standard Time - { 72, 1719, 638, 3600 }, // Romance Standard Time - { 73, 1741, 3815, 14400 }, // Russia Time Zone 3 - { 74, 1760, 533, 39600 }, // Russia Time Zone 10 - { 75, 1780, 7246, 43200 }, // Russia Time Zone 11 - { 76, 1800, 7261, 10800 }, // Russian Standard Time - { 77, 1822, 149,-10800 }, // SA Eastern Standard Time - { 78, 1847, 4333,-18000 }, // SA Pacific Standard Time - { 79, 1872, 4122,-14400 }, // SA Western Standard Time - { 80, 1897, 3322, 46800 }, // Samoa Standard Time - { 81, 1917, 2320, 25200 }, // SE Asia Standard Time - { 82, 1939, 3465, 28800 }, // Singapore Standard Time - { 83, 1963, 3148, 7200 }, // South Africa Standard Time - { 84, 1990, 5764, 19800 }, // Sri Lanka Standard Time - { 85, 2014, 4294, 7200 }, // Syria Standard Time - { 86, 2034, 3932, 28800 }, // Taipei Standard Time - { 87, 2055, 7275, 36000 }, // Tasmania Standard Time - { 88, 2078, 5654, 32400 }, // Tokyo Standard Time - { 89, 2098, 3984, 46800 }, // Tonga Standard Time - { 90, 2118, 4784, 7200 }, // Turkey Standard Time - { 91, 2139, 7292, 28800 }, // Ulaanbaatar Standard Time - { 92, 2165, 7309,-18000 }, // US Eastern Standard Time - { 93, 2190, 4894,-25200 }, // US Mountain Standard Time - { 94, 2216, 3753, -7200 }, // UTC-02 - { 95, 2223, 3035,-39600 }, // UTC-11 - { 96, 2230, 1070, 0 }, // UTC - { 97, 2234, 239, 43200 }, // UTC+12 - { 98, 2241, 5172,-16200 }, // Venezuela Standard Time - { 99, 2265, 7330, 36000 }, // Vladivostok Standard Time - { 100, 2291, 3843, 28800 }, // W. Australia Standard Time - { 101, 2318, 1909, 3600 }, // W. Central Africa Standard Time - { 102, 2350, 7347, 3600 }, // W. Europe Standard Time - { 103, 2374, 7361, 18000 }, // West Asia Standard Time - { 104, 2398, 3067, 36000 }, // West Pacific Standard Time - { 105, 2425, 7375, 32400 }, // Yakutsk Standard Time - { 106, 2447, 4385, 30600 }, // North Korea Standard Time - { 0, 0, 0, 0 } // Trailing zeroes -}; - -// IANA ID Index, UTC Offset -static const QUtcData utcDataTable[] = { - { 7388, 0 }, // UTC - { 7392,-50400 }, // UTC-14:00 - { 7402,-46800 }, // UTC-13:00 - { 7412,-43200 }, // UTC-12:00 - { 7422,-39600 }, // UTC-11:00 - { 7432,-36000 }, // UTC-10:00 - { 7442,-32400 }, // UTC-09:00 - { 7452,-28800 }, // UTC-08:00 - { 7462,-25200 }, // UTC-07:00 - { 7472,-21600 }, // UTC-06:00 - { 7482,-18000 }, // UTC-05:00 - { 7492,-16200 }, // UTC-04:30 - { 7502,-14400 }, // UTC-04:00 - { 7512,-12600 }, // UTC-03:30 - { 7522,-10800 }, // UTC-03:00 - { 7532, -7200 }, // UTC-02:00 - { 7542, -3600 }, // UTC-01:00 - { 7552, 0 }, // UTC-00:00 - { 7562, 0 }, // UTC+00:00 - { 7572, 3600 }, // UTC+01:00 - { 7582, 7200 }, // UTC+02:00 - { 7592, 10800 }, // UTC+03:00 - { 7602, 12600 }, // UTC+03:30 - { 7612, 14400 }, // UTC+04:00 - { 7622, 16200 }, // UTC+04:30 - { 7632, 18000 }, // UTC+05:00 - { 7642, 19800 }, // UTC+05:30 - { 7652, 20700 }, // UTC+05:45 - { 7662, 21600 }, // UTC+06:00 - { 7672, 23400 }, // UTC+06:30 - { 7682, 25200 }, // UTC+07:00 - { 7692, 28800 }, // UTC+08:00 - { 7702, 32400 }, // UTC+09:00 - { 7712, 34200 }, // UTC+09:30 - { 7722, 36000 }, // UTC+10:00 - { 7732, 39600 }, // UTC+11:00 - { 7742, 43200 }, // UTC+12:00 - { 7752, 46800 }, // UTC+13:00 - { 7762, 50400 }, // UTC+14:00 - { 7772, 30600 }, // UTC+08:30 - { 0, 0 } // Trailing zeroes -}; - -static const char windowsIdData[] = { -0x41, 0x66, 0x67, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x74, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, -0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x6c, 0x61, 0x73, 0x6b, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, -0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, -0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x61, 0x62, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, -0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, -0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x55, 0x53, -0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, -0x6d, 0x65, 0x0, 0x41, 0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, -0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x65, 0x72, 0x62, 0x61, 0x69, 0x6a, 0x61, 0x6e, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73, -0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x68, 0x69, 0x61, -0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x42, 0x61, 0x6e, 0x67, 0x6c, -0x61, 0x64, 0x65, 0x73, 0x68, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, -0x42, 0x65, 0x6c, 0x61, 0x72, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, -0x65, 0x0, 0x43, 0x61, 0x6e, 0x61, 0x64, 0x61, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, -0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x70, 0x65, 0x20, 0x56, 0x65, 0x72, 0x64, -0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x61, 0x75, 0x63, -0x61, 0x73, 0x75, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, -0x65, 0x6e, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, -0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, -0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x42, 0x72, 0x61, 0x7a, 0x69, 0x6c, 0x69, -0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, -0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, -0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, -0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, -0x74, 0x72, 0x61, 0x6c, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, -0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x43, 0x65, -0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, -0x43, 0x68, 0x69, 0x6e, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, -0x44, 0x61, 0x74, 0x65, 0x6c, 0x69, 0x6e, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, -0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x53, 0x6f, 0x75, -0x74, 0x68, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, -0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x45, 0x67, -0x79, 0x70, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x6b, -0x61, 0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x46, 0x69, 0x6a, 0x69, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, -0x69, 0x6d, 0x65, 0x0, 0x46, 0x4c, 0x45, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, -0x65, 0x0, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x4d, 0x54, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, -0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x72, 0x65, 0x65, 0x6e, 0x77, 0x69, 0x63, 0x68, 0x20, 0x53, 0x74, 0x61, -0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x47, 0x54, 0x42, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, -0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x48, 0x61, 0x77, 0x61, 0x69, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, -0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x20, 0x53, 0x74, -0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x72, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, -0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x49, 0x73, 0x72, 0x61, 0x65, 0x6c, 0x20, 0x53, 0x74, -0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4a, 0x6f, 0x72, 0x64, 0x61, 0x6e, 0x20, 0x53, -0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4b, 0x61, 0x6c, 0x69, 0x6e, 0x69, 0x6e, -0x67, 0x72, 0x61, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4b, -0x6f, 0x72, 0x65, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4c, -0x69, 0x62, 0x79, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4c, -0x69, 0x6e, 0x65, 0x20, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, -0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x67, 0x61, 0x64, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, -0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, 0x20, 0x53, 0x74, -0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x69, 0x64, 0x64, 0x6c, 0x65, 0x20, 0x45, -0x61, 0x73, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x6f, -0x6e, 0x74, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, -0x6d, 0x65, 0x0, 0x4d, 0x6f, 0x72, 0x6f, 0x63, 0x63, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, -0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x28, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x29, 0x0, 0x4d, 0x6f, 0x75, -0x6e, 0x74, 0x61, 0x69, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, -0x4d, 0x79, 0x61, 0x6e, 0x6d, 0x61, 0x72, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, -0x65, 0x0, 0x4e, 0x2e, 0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, -0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x61, 0x6d, 0x69, 0x62, 0x69, 0x61, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x70, 0x61, 0x6c, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x65, 0x77, 0x20, 0x5a, 0x65, -0x61, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, -0x4e, 0x65, 0x77, 0x66, 0x6f, 0x75, 0x6e, 0x64, 0x6c, 0x61, 0x6e, 0x64, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x45, 0x61, -0x73, 0x74, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, -0x74, 0x68, 0x20, 0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, -0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x41, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x45, 0x2e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, 0x53, 0x74, 0x61, -0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, -0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x6b, 0x69, 0x73, 0x74, 0x61, -0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x50, 0x61, 0x72, 0x61, -0x67, 0x75, 0x61, 0x79, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x52, -0x6f, 0x6d, 0x61, 0x6e, 0x63, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, -0x0, 0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x33, 0x0, -0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x30, 0x0, -0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x20, 0x5a, 0x6f, 0x6e, 0x65, 0x20, 0x31, 0x31, 0x0, -0x52, 0x75, 0x73, 0x73, 0x69, 0x61, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, -0x65, 0x0, 0x53, 0x41, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, -0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x41, 0x20, 0x57, 0x65, 0x73, 0x74, 0x65, -0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x61, 0x6d, -0x6f, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x45, 0x20, -0x41, 0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, -0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, -0x6d, 0x65, 0x0, 0x53, 0x6f, 0x75, 0x74, 0x68, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, -0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x72, 0x69, 0x20, 0x4c, 0x61, 0x6e, 0x6b, 0x61, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x53, 0x79, 0x72, 0x69, 0x61, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x61, 0x69, 0x70, 0x65, 0x69, -0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x61, 0x73, 0x6d, 0x61, -0x6e, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, -0x6b, 0x79, 0x6f, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x6f, -0x6e, 0x67, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x54, 0x75, -0x72, 0x6b, 0x65, 0x79, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, -0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, -0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x53, 0x20, 0x4d, 0x6f, 0x75, 0x6e, 0x74, 0x61, 0x69, -0x6e, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x55, 0x54, 0x43, 0x2d, -0x30, 0x32, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x31, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x32, -0x0, 0x56, 0x65, 0x6e, 0x65, 0x7a, 0x75, 0x65, 0x6c, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x20, 0x53, 0x74, 0x61, -0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, -0x6c, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, -0x20, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, -0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x2e, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x20, -0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, 0x73, 0x74, 0x20, 0x41, -0x73, 0x69, 0x61, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x57, 0x65, -0x73, 0x74, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, -0x54, 0x69, 0x6d, 0x65, 0x0, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, -0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x20, 0x4b, 0x6f, 0x72, 0x65, 0x61, 0x20, 0x53, -0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x20, 0x54, 0x69, 0x6d, 0x65, 0x0 -}; - -static const char ianaIdData[] = { -0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x72, 0x61, 0x67, 0x75, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x54, 0x69, 0x6a, 0x75, 0x61, 0x6e, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, -0x6e, 0x74, 0x61, 0x5f, 0x49, 0x73, 0x61, 0x62, 0x65, 0x6c, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, -0x68, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x72, 0x69, 0x70, 0x6f, 0x6c, 0x69, 0x0, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6c, 0x61, 0x6e, 0x63, 0x2d, 0x53, 0x61, 0x62, 0x6c, 0x6f, 0x6e, 0x0, 0x41, -0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x6a, 0x75, 0x6d, 0x62, 0x75, 0x72, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, -0x70, 0x65, 0x2f, 0x53, 0x74, 0x6f, 0x63, 0x6b, 0x68, 0x6f, 0x6c, 0x6d, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, -0x2f, 0x46, 0x61, 0x6b, 0x61, 0x6f, 0x66, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x79, -0x65, 0x6e, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f, 0x6f, 0x66, -0x5f, 0x53, 0x70, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x56, 0x61, 0x6e, 0x63, 0x6f, -0x75, 0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x20, -0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x68, 0x69, 0x74, 0x65, 0x68, 0x6f, 0x72, 0x73, 0x65, 0x0, 0x45, -0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x32, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x6c, -0x5f, 0x53, 0x61, 0x6c, 0x76, 0x61, 0x64, 0x6f, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x61, 0x6b, 0x61, 0x73, -0x73, 0x61, 0x72, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x65, 0x68, 0x61, 0x6d, 0x6e, -0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x31, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x46, -0x75, 0x6e, 0x61, 0x66, 0x75, 0x74, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x56, -0x69, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x67, 0x61, 0x6c, 0x69, -0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x75, 0x78, 0x65, 0x6d, 0x62, 0x6f, 0x75, 0x72, 0x67, 0x0, 0x41, -0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4f, 0x75, 0x61, 0x67, 0x61, 0x64, 0x6f, 0x75, 0x67, 0x6f, 0x75, 0x0, 0x41, 0x73, -0x69, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x68, 0x6b, 0x65, 0x6b, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x75, -0x6e, 0x69, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x62, 0x72, 0x65, 0x76, 0x69, 0x6c, 0x6c, -0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x65, 0x67, 0x75, 0x63, 0x69, 0x67, 0x61, 0x6c, 0x70, -0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x68, 0x6e, 0x6f, 0x6d, 0x5f, 0x50, 0x65, 0x6e, 0x68, 0x0, 0x41, 0x73, -0x69, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x69, 0x6c, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x6e, -0x67, 0x75, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x67, 0x68, 0x64, 0x61, 0x64, 0x0, 0x45, 0x75, 0x72, -0x6f, 0x70, 0x65, 0x2f, 0x42, 0x72, 0x75, 0x73, 0x73, 0x65, 0x6c, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x72, -0x65, 0x64, 0x6e, 0x65, 0x6b, 0x6f, 0x6c, 0x79, 0x6d, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x72, 0x75, -0x6d, 0x71, 0x69, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x72, 0x61, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69, -0x61, 0x2f, 0x44, 0x69, 0x6c, 0x69, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x54, 0x61, 0x6c, 0x6c, 0x69, 0x6e, -0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x75, 0x61, 0x6b, 0x63, 0x68, 0x6f, 0x74, 0x74, 0x0, -0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x62, 0x75, 0x6d, 0x62, 0x61, 0x73, 0x68, 0x69, 0x0, 0x45, 0x75, -0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x61, 0x72, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x65, 0x6b, 0x61, -0x74, 0x65, 0x72, 0x69, 0x6e, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x61, -0x73, 0x73, 0x61, 0x75, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x6f, 0x6e, 0x68, 0x61, -0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, -0x4d, 0x54, 0x2d, 0x38, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x68, 0x61, 0x72, 0x74, 0x6f, 0x75, 0x6d, -0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x66, 0x61, 0x74, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x76, 0x69, 0x64, 0x65, 0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x54, 0x6f, 0x72, 0x74, 0x6f, 0x6c, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x61, 0x6d, -0x70, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x61, 0x6e, 0x64, 0x61, 0x0, 0x45, -0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x43, 0x68, 0x69, 0x73, 0x69, 0x6e, 0x61, 0x75, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, -0x69, 0x63, 0x2f, 0x4b, 0x69, 0x72, 0x69, 0x74, 0x69, 0x6d, 0x61, 0x74, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, -0x54, 0x2d, 0x31, 0x33, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x6f, 0x5f, 0x44, -0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47, 0x75, 0x65, 0x72, 0x6e, 0x73, -0x65, 0x79, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, -0x65, 0x2f, 0x55, 0x7a, 0x68, 0x67, 0x6f, 0x72, 0x6f, 0x64, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61, -0x70, 0x6f, 0x72, 0x6f, 0x7a, 0x68, 0x79, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x61, 0x62, 0x6f, -0x72, 0x6f, 0x6e, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x61, 0x6c, 0x61, 0x5f, 0x4c, 0x75, 0x6d, 0x70, -0x75, 0x72, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x63, 0x68, 0x69, 0x6e, 0x67, 0x0, 0x50, 0x61, 0x63, 0x69, -0x66, 0x69, 0x63, 0x2f, 0x50, 0x61, 0x67, 0x6f, 0x5f, 0x50, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, -0x2f, 0x46, 0x72, 0x65, 0x65, 0x74, 0x6f, 0x77, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x67, -0x61, 0x64, 0x69, 0x73, 0x68, 0x75, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x53, 0x6f, 0x75, 0x74, -0x68, 0x5f, 0x47, 0x65, 0x6f, 0x72, 0x67, 0x69, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x0, 0x41, 0x66, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x6f, 0x75, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x68, 0x69, -0x6d, 0x70, 0x68, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6d, 0x73, 0x74, 0x65, 0x72, 0x64, 0x61, -0x6d, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x52, 0x69, 0x67, 0x61, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, -0x2f, 0x43, 0x6f, 0x6d, 0x6f, 0x72, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f, 0x73, 0x69, 0x62, -0x69, 0x72, 0x73, 0x6b, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x6d, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, -0x56, 0x69, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6e, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x50, 0x6f, 0x64, -0x67, 0x6f, 0x72, 0x69, 0x63, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6f, 0x66, 0x69, 0x61, 0x0, -0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x41, 0x7a, 0x6f, 0x72, 0x65, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69, -0x66, 0x69, 0x63, 0x2f, 0x4e, 0x61, 0x75, 0x72, 0x75, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x70, -0x75, 0x74, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65, 0x72, 0x6c, 0x69, 0x6e, 0x20, 0x45, 0x75, -0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x73, 0x69, 0x6e, 0x67, 0x65, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x4b, 0x72, 0x61, 0x6c, 0x65, 0x6e, 0x64, 0x69, 0x6a, 0x6b, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, -0x2f, 0x4e, 0x6f, 0x75, 0x6d, 0x65, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x65, 0x68, 0x72, 0x61, 0x6e, 0x0, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x68, 0x61, 0x6b, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, -0x6f, 0x73, 0x5f, 0x41, 0x6e, 0x67, 0x65, 0x6c, 0x65, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, -0x6e, 0x61, 0x63, 0x6f, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x41, 0x6e, 0x74, 0x61, 0x6e, 0x61, 0x6e, 0x61, -0x72, 0x69, 0x76, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x49, 0x72, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x0, 0x41, 0x6e, -0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x56, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, -0x70, 0x65, 0x2f, 0x54, 0x69, 0x72, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72, -0x65, 0x6e, 0x61, 0x64, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x37, 0x0, 0x45, 0x75, 0x72, 0x6f, -0x70, 0x65, 0x2f, 0x4c, 0x69, 0x73, 0x62, 0x6f, 0x6e, 0x20, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x4d, -0x61, 0x64, 0x65, 0x69, 0x72, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e, 0x74, -0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x6b, 0x61, 0x6e, 0x64, 0x0, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x4f, 0x6a, 0x69, 0x6e, 0x61, 0x67, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, -0x6c, 0x61, 0x6e, 0x74, 0x79, 0x72, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x61, 0x6d, 0x61, -0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x6e, 0x61, 0x6b, 0x72, 0x79, 0x0, 0x41, -0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x69, 0x6e, 0x73, 0x68, 0x61, 0x73, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, -0x69, 0x63, 0x2f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x74, 0x6f, 0x6e, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, -0x63, 0x61, 0x2f, 0x52, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x57, -0x61, 0x6c, 0x6c, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x69, 0x67, 0x6f, 0x6e, 0x0, 0x41, 0x66, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x69, 0x72, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x52, 0x6f, -0x6d, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x77, 0x65, 0x72, 0x5f, 0x50, 0x72, 0x69, -0x6e, 0x63, 0x65, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x52, 0x61, 0x6e, 0x67, 0x6f, 0x6f, 0x6e, 0x0, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e, 0x61, 0x6d, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, -0x45, 0x6c, 0x5f, 0x41, 0x61, 0x69, 0x75, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x75, 0x61, -0x64, 0x61, 0x6c, 0x63, 0x61, 0x6e, 0x61, 0x6c, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x61, 0x6c, 0x69, -0x6e, 0x69, 0x6e, 0x67, 0x72, 0x61, 0x64, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6d, 0x6d, 0x61, 0x6e, 0x0, 0x45, -0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x63, 0x68, 0x61, 0x72, 0x65, 0x73, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x42, 0x69, 0x73, 0x73, 0x61, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x6e, -0x5f, 0x4d, 0x61, 0x72, 0x69, 0x6e, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, 0x75, 0x73, 0x68, 0x61, 0x6e, 0x62, -0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x73, 0x69, -0x61, 0x2f, 0x41, 0x6e, 0x61, 0x64, 0x79, 0x72, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x61, 0x67, 0x6f, -0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x61, 0x63, 0x61, 0x6f, 0x0, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x7a, 0x61, 0x74, 0x6c, 0x61, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x75, -0x73, 0x63, 0x61, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x69, 0x6d, 0x61, 0x0, 0x45, 0x75, -0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x75, 0x72, 0x69, 0x63, 0x68, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, -0x2f, 0x52, 0x65, 0x79, 0x6b, 0x6a, 0x61, 0x76, 0x69, 0x6b, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, -0x61, 0x6e, 0x63, 0x75, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e, 0x76, 0x65, 0x72, -0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x69, 0x73, 0x65, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, -0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, -0x4d, 0x61, 0x6e, 0x61, 0x75, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x6f, 0x61, 0x5f, 0x56, -0x69, 0x73, 0x74, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x6f, 0x5f, 0x56, -0x65, 0x6c, 0x68, 0x6f, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x6f, 0x2d, 0x4e, 0x6f, -0x76, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x61, 0x73, 0x74, 0x65, 0x72, 0x0, 0x45, 0x74, -0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x30, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, -0x4c, 0x75, 0x63, 0x69, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x61, 0x75, 0x0, 0x41, 0x66, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6c, 0x61, 0x62, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x52, -0x61, 0x72, 0x6f, 0x74, 0x6f, 0x6e, 0x67, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x6a, -0x75, 0x6c, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x34, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4d, -0x61, 0x67, 0x61, 0x64, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x72, 0x61, 0x74, 0x69, 0x73, -0x6c, 0x61, 0x76, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x41, 0x6e, 0x64, 0x6f, 0x72, 0x72, 0x61, 0x0, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6e, 0x67, 0x6b, 0x6f, 0x6b, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, -0x2d, 0x35, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x42, 0x6f, 0x75, 0x67, 0x61, 0x69, 0x6e, 0x76, 0x69, -0x6c, 0x6c, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x61, 0x74, 0x69, 0x63, 0x61, 0x6e, 0x0, 0x41, -0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x64, 0x6d, 0x6f, 0x6e, 0x74, 0x6f, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x62, 0x72, 0x69, 0x64, 0x67, 0x65, 0x5f, 0x42, 0x61, 0x79, 0x20, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x75, 0x76, 0x69, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, -0x2f, 0x59, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6b, 0x6e, 0x69, 0x66, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, -0x2f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x61, 0x72, 0x69, 0x62, 0x6f, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, -0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4d, -0x65, 0x6c, 0x62, 0x6f, 0x75, 0x72, 0x6e, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x72, 0x5f, -0x65, 0x73, 0x5f, 0x53, 0x61, 0x6c, 0x61, 0x61, 0x6d, 0x0, 0x4d, 0x53, 0x54, 0x37, 0x4d, 0x44, 0x54, 0x0, 0x41, 0x66, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x73, 0x65, 0x72, 0x75, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, -0x4d, 0x61, 0x6a, 0x75, 0x72, 0x6f, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4b, 0x77, 0x61, 0x6a, 0x61, -0x6c, 0x65, 0x69, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x61, 0x69, 0x72, 0x6f, 0x62, 0x69, 0x0, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x73, 0x68, 0x67, 0x61, 0x62, 0x61, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x48, -0x6f, 0x6e, 0x67, 0x5f, 0x4b, 0x6f, 0x6e, 0x67, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x33, 0x0, 0x41, -0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x65, 0x6c, 0x69, 0x7a, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x53, 0x61, 0x6f, 0x5f, 0x50, 0x61, 0x75, 0x6c, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, -0x61, 0x64, 0x72, 0x69, 0x64, 0x20, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x65, 0x75, 0x74, 0x61, 0x0, 0x41, -0x73, 0x69, 0x61, 0x2f, 0x4a, 0x61, 0x6b, 0x61, 0x72, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x6f, 0x6e, -0x74, 0x69, 0x61, 0x6e, 0x61, 0x6b, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x39, 0x0, 0x41, 0x6d, 0x65, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x4a, 0x75, 0x6e, 0x65, 0x61, 0x75, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, -0x74, 0x6c, 0x61, 0x6b, 0x61, 0x74, 0x6c, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x6d, -0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x69, 0x74, 0x6b, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x61, 0x74, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x43, -0x6f, 0x70, 0x65, 0x6e, 0x68, 0x61, 0x67, 0x65, 0x6e, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, -0x2f, 0x4d, 0x63, 0x4d, 0x75, 0x72, 0x64, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, 0x61, 0x74, 0x61, 0x72, 0x0, -0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x69, 0x67, 0x6f, 0x74, 0x0, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x72, 0x62, 0x61, 0x64, 0x6f, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, -0x2f, 0x57, 0x61, 0x6b, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x48, 0x65, 0x6c, 0x73, 0x69, 0x6e, 0x6b, -0x69, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x79, 0x6f, 0x74, 0x74, 0x65, 0x0, 0x41, 0x74, 0x6c, -0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x46, 0x61, 0x65, 0x72, 0x6f, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, -0x2f, 0x43, 0x6f, 0x72, 0x61, 0x6c, 0x5f, 0x48, 0x61, 0x72, 0x62, 0x6f, 0x75, 0x72, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, -0x4d, 0x54, 0x2b, 0x31, 0x30, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x61, 0x72, 0x61, 0x6a, 0x65, 0x76, -0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x62, 0x69, 0x6c, 0x69, 0x73, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, -0x4d, 0x54, 0x2b, 0x31, 0x31, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x63, -0x71, 0x75, 0x61, 0x72, 0x69, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x5f, -0x4d, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x75, 0x6e, -0x63, 0x69, 0x6f, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x61, 0x68, 0x69, 0x74, 0x69, 0x0, -0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x6d, 0x65, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, -0x2f, 0x43, 0x61, 0x6e, 0x61, 0x72, 0x79, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x6f, 0x68, 0x61, 0x6e, -0x6e, 0x65, 0x73, 0x62, 0x75, 0x72, 0x67, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x41, 0x64, -0x65, 0x6c, 0x61, 0x69, 0x64, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42, 0x72, 0x6f, -0x6b, 0x65, 0x6e, 0x5f, 0x48, 0x69, 0x6c, 0x6c, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x53, 0x61, 0x69, -0x70, 0x61, 0x6e, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x53, 0x74, 0x61, 0x6e, 0x6c, 0x65, 0x79, -0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x69, 0x63, 0x6f, 0x73, 0x69, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, -0x75, 0x62, 0x61, 0x69, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4b, 0x65, 0x72, 0x67, 0x75, 0x65, 0x6c, 0x65, -0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x64, 0x6a, 0x61, 0x6d, 0x65, 0x6e, 0x61, 0x0, 0x45, 0x75, -0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x6b, 0x6f, 0x70, 0x6a, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x64, 0x65, -0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x41, 0x70, 0x69, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, -0x69, 0x63, 0x2f, 0x48, 0x6f, 0x6e, 0x6f, 0x6c, 0x75, 0x6c, 0x75, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, -0x31, 0x32, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x65, 0x72, 0x6d, 0x6f, 0x73, 0x69, 0x6c, 0x6c, -0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4a, 0x6f, 0x68, 0x6e, 0x73, 0x0, 0x50, -0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x41, 0x75, 0x63, 0x6b, 0x6c, 0x61, 0x6e, 0x64, 0x0, 0x45, 0x75, 0x72, 0x6f, -0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x53, 0x69, 0x6d, -0x66, 0x65, 0x72, 0x6f, 0x70, 0x6f, 0x6c, 0x20, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x6f, 0x6c, 0x67, 0x6f, -0x67, 0x72, 0x61, 0x64, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x69, 0x6e, 0x67, 0x61, 0x70, 0x6f, 0x72, 0x65, 0x0, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x62, 0x75, 0x6c, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x61, -0x6c, 0x74, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x75, 0x62, 0x61, 0x0, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x20, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x61, 0x68, 0x69, 0x61, 0x5f, 0x42, 0x61, 0x6e, 0x64, 0x65, 0x72, 0x61, 0x73, -0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x72, 0x69, 0x64, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x65, 0x72, 0x72, 0x65, 0x79, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, -0x2f, 0x49, 0x73, 0x6c, 0x65, 0x5f, 0x6f, 0x66, 0x5f, 0x4d, 0x61, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, -0x56, 0x61, 0x64, 0x75, 0x7a, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72, 0x74, 0x61, 0x6c, -0x65, 0x7a, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x61, 0x67, 0x75, 0x61, 0x69, 0x6e, -0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x65, 0x6c, 0x65, 0x6d, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x63, 0x65, 0x69, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, -0x65, 0x63, 0x69, 0x66, 0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x61, 0x72, -0x65, 0x6d, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x65, 0x6f, 0x75, 0x6c, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x47, 0x75, 0x61, 0x64, 0x65, 0x6c, 0x6f, 0x75, 0x70, 0x65, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, -0x2b, 0x32, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x6f, 0x63, 0x6f, 0x73, 0x0, 0x41, 0x72, 0x63, 0x74, -0x69, 0x63, 0x2f, 0x4c, 0x6f, 0x6e, 0x67, 0x79, 0x65, 0x61, 0x72, 0x62, 0x79, 0x65, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x41, 0x64, 0x64, 0x69, 0x73, 0x5f, 0x41, 0x62, 0x61, 0x62, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, -0x65, 0x2f, 0x53, 0x61, 0x6d, 0x61, 0x72, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x72, 0x61, -0x72, 0x65, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x50, 0x65, 0x72, 0x74, 0x68, 0x0, 0x45, -0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x76, -0x61, 0x6e, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x73, 0x61, 0x62, 0x6c, 0x61, 0x6e, 0x63, -0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x65, 0x72, 0x65, 0x76, 0x61, 0x6e, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, -0x74, 0x69, 0x63, 0x2f, 0x42, 0x65, 0x72, 0x6d, 0x75, 0x64, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x69, -0x70, 0x65, 0x69, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x36, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x47, 0x6f, 0x64, 0x74, 0x68, 0x61, 0x62, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x57, 0x61, 0x72, -0x73, 0x61, 0x77, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x6f, 0x6e, 0x67, 0x61, 0x74, 0x61, 0x70, -0x75, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x51, -0x79, 0x7a, 0x79, 0x6c, 0x6f, 0x72, 0x64, 0x61, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, -0x44, 0x61, 0x76, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x65, 0x69, 0x72, 0x75, 0x74, 0x0, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x74, 0x65, 0x6d, 0x61, 0x6c, 0x61, 0x0, 0x41, 0x73, 0x69, 0x61, -0x2f, 0x4b, 0x61, 0x72, 0x61, 0x63, 0x68, 0x69, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x63, 0x63, 0x72, -0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x75, 0x65, 0x72, 0x74, 0x6f, 0x5f, 0x52, 0x69, 0x63, -0x6f, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x61, 0x5f, 0x50, 0x61, 0x7a, 0x0, 0x41, 0x6d, 0x65, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, 0x77, 0x5f, 0x59, 0x6f, 0x72, 0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x44, 0x65, 0x74, 0x72, 0x6f, 0x69, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, -0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x50, 0x65, 0x74, 0x65, 0x72, 0x73, 0x62, 0x75, 0x72, 0x67, 0x20, 0x41, 0x6d, 0x65, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x69, 0x6e, 0x63, 0x65, 0x6e, 0x6e, -0x65, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x57, -0x69, 0x6e, 0x61, 0x6d, 0x61, 0x63, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4b, 0x65, 0x6e, 0x74, 0x75, -0x63, 0x6b, 0x79, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x69, 0x63, 0x65, 0x6c, 0x6c, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x4c, 0x6f, 0x75, 0x69, 0x73, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x44, -0x61, 0x6d, 0x61, 0x73, 0x63, 0x75, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x61, 0x72, 0x61, -0x77, 0x61, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x34, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, -0x2f, 0x42, 0x6f, 0x67, 0x6f, 0x74, 0x61, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, 0x2f, 0x43, 0x61, 0x70, -0x65, 0x5f, 0x56, 0x65, 0x72, 0x64, 0x65, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x44, 0x61, -0x72, 0x77, 0x69, 0x6e, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x50, 0x79, 0x6f, 0x6e, 0x67, 0x79, 0x61, 0x6e, 0x67, 0x0, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x42, 0x61, 0x6b, 0x75, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x47, 0x69, 0x62, -0x72, 0x61, 0x6c, 0x74, 0x61, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4a, 0x65, 0x72, 0x75, 0x73, 0x61, 0x6c, 0x65, -0x6d, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x6a, 0x75, 0x62, 0x6c, 0x6a, 0x61, 0x6e, 0x61, 0x0, 0x50, -0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, 0x6f, 0x72, 0x66, 0x6f, 0x6c, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, -0x42, 0x72, 0x75, 0x6e, 0x65, 0x69, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x72, 0x61, 0x7a, 0x7a, 0x61, -0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x74, 0x6d, 0x61, 0x6e, 0x64, 0x75, 0x0, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x74, 0x74, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x41, 0x6e, 0x74, 0x69, 0x67, 0x75, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4a, 0x65, 0x72, -0x73, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x73, 0x65, 0x72, 0x72, -0x61, 0x74, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x37, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, -0x2f, 0x47, 0x75, 0x79, 0x61, 0x6e, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x6b, 0x61, 0x72, -0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4f, 0x73, 0x6c, 0x6f, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, -0x41, 0x74, 0x68, 0x65, 0x6e, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x75, 0x77, 0x61, 0x69, 0x74, 0x0, 0x50, -0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x50, 0x6f, 0x6e, 0x61, 0x70, 0x65, 0x20, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, -0x63, 0x2f, 0x4b, 0x6f, 0x73, 0x72, 0x61, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x73, -0x74, 0x61, 0x5f, 0x52, 0x69, 0x63, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x6f, 0x6d, 0x69, -0x6e, 0x69, 0x63, 0x61, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x62, 0x61, 0x62, 0x61, 0x6e, 0x65, 0x0, -0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x74, 0x69, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x0, 0x49, -0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x52, 0x65, 0x75, 0x6e, 0x69, 0x6f, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, -0x54, 0x2b, 0x36, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x49, 0x73, 0x74, 0x61, 0x6e, 0x62, 0x75, 0x6c, 0x0, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e, 0x6f, 0x79, 0x61, 0x72, 0x73, 0x6b, 0x20, 0x41, 0x73, 0x69, -0x61, 0x2f, 0x4e, 0x6f, 0x76, 0x6f, 0x6b, 0x75, 0x7a, 0x6e, 0x65, 0x74, 0x73, 0x6b, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x41, 0x62, 0x69, 0x64, 0x6a, 0x61, 0x6e, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x69, -0x6f, 0x5f, 0x42, 0x72, 0x61, 0x6e, 0x63, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x45, 0x69, 0x72, -0x75, 0x6e, 0x65, 0x70, 0x65, 0x0, 0x43, 0x53, 0x54, 0x36, 0x43, 0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x50, 0x68, 0x6f, 0x65, 0x6e, 0x69, 0x78, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x52, 0x65, -0x67, 0x69, 0x6e, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x77, 0x69, 0x66, 0x74, 0x5f, 0x43, -0x75, 0x72, 0x72, 0x65, 0x6e, 0x74, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x35, 0x0, 0x41, 0x6e, 0x74, -0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, -0x6e, 0x2f, 0x4d, 0x61, 0x6c, 0x64, 0x69, 0x76, 0x65, 0x73, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65, -0x6c, 0x67, 0x72, 0x61, 0x64, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x73, 0x6d, 0x65, 0x72, 0x61, -0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x77, 0x73, 0x6f, 0x6e, 0x5f, 0x43, 0x72, 0x65, 0x65, -0x6b, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x72, 0x65, 0x73, 0x74, 0x6f, 0x6e, 0x20, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x46, 0x6f, 0x72, 0x74, 0x5f, 0x4e, 0x65, 0x6c, 0x73, 0x6f, 0x6e, 0x0, 0x45, 0x75, -0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x75, 0x64, 0x61, 0x70, 0x65, 0x73, 0x74, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, -0x2f, 0x57, 0x69, 0x6e, 0x64, 0x68, 0x6f, 0x65, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4a, 0x61, 0x79, 0x61, 0x70, -0x75, 0x72, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x42, 0x72, 0x69, 0x73, 0x62, 0x61, -0x6e, 0x65, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x4c, 0x69, 0x6e, 0x64, 0x65, 0x6d, 0x61, -0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x34, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, -0x43, 0x61, 0x72, 0x61, 0x63, 0x61, 0x73, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x53, -0x79, 0x6f, 0x77, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x5a, 0x61, 0x67, 0x72, 0x65, 0x62, 0x0, 0x41, -0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73, 0x5f, 0x41, 0x69, 0x72, 0x65, 0x73, 0x20, -0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x4c, 0x61, -0x5f, 0x52, 0x69, 0x6f, 0x6a, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, -0x74, 0x69, 0x6e, 0x61, 0x2f, 0x52, 0x69, 0x6f, 0x5f, 0x47, 0x61, 0x6c, 0x6c, 0x65, 0x67, 0x6f, 0x73, 0x20, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6c, 0x74, -0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, -0x53, 0x61, 0x6e, 0x5f, 0x4a, 0x75, 0x61, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, -0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x5f, 0x4c, 0x75, 0x69, 0x73, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, 0x54, 0x75, 0x63, 0x75, 0x6d, 0x61, -0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x72, 0x67, 0x65, 0x6e, 0x74, 0x69, 0x6e, 0x61, 0x2f, -0x55, 0x73, 0x68, 0x75, 0x61, 0x69, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x74, 0x61, -0x6d, 0x61, 0x72, 0x63, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x6f, 0x72, 0x64, 0x6f, 0x62, -0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4a, 0x75, 0x6a, 0x75, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x64, 0x6f, 0x7a, 0x61, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, -0x63, 0x61, 0x2f, 0x50, 0x61, 0x6c, 0x6d, 0x65, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x6f, -0x72, 0x6f, 0x6e, 0x74, 0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x71, 0x61, 0x6c, 0x75, 0x69, -0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x74, 0x72, 0x65, 0x61, 0x6c, 0x20, 0x41, -0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x70, 0x69, 0x67, 0x6f, 0x6e, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x50, 0x61, 0x6e, 0x67, 0x6e, 0x69, 0x72, 0x74, 0x75, 0x6e, 0x67, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x54, 0x68, 0x75, 0x6e, 0x64, 0x65, 0x72, 0x5f, 0x42, 0x61, 0x79, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x42, 0x61, 0x6d, 0x61, 0x6b, 0x6f, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x52, 0x69, 0x79, 0x61, 0x64, 0x68, -0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x54, 0x72, 0x75, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, -0x6f, 0x6b, 0x79, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x45, 0x6e, 0x64, 0x65, 0x72, 0x62, 0x75, -0x72, 0x79, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4c, 0x6f, 0x6e, 0x64, 0x6f, 0x6e, 0x0, 0x41, 0x6d, 0x65, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x20, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x4d, 0x61, 0x72, 0x65, 0x6e, 0x67, -0x6f, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x56, 0x65, -0x76, 0x61, 0x79, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x43, 0x6f, 0x6c, 0x6f, 0x6d, 0x62, 0x6f, 0x0, 0x41, 0x6d, 0x65, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x57, 0x69, 0x6e, 0x6e, 0x69, 0x70, 0x65, 0x67, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x52, 0x61, 0x69, 0x6e, 0x79, 0x5f, 0x52, 0x69, 0x76, 0x65, 0x72, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x5f, 0x49, 0x6e, 0x6c, 0x65, 0x74, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x52, 0x65, 0x73, 0x6f, 0x6c, 0x75, 0x74, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, -0x6a, 0x69, 0x62, 0x6f, 0x75, 0x74, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69, -0x66, 0x61, 0x78, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6c, 0x61, 0x63, 0x65, 0x5f, 0x42, 0x61, -0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x6f, 0x6f, 0x73, 0x65, 0x5f, 0x42, 0x61, 0x79, 0x20, -0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x63, 0x74, 0x6f, 0x6e, 0x0, 0x41, 0x66, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x53, 0x61, 0x6f, 0x5f, 0x54, 0x6f, 0x6d, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, -0x53, 0x74, 0x5f, 0x54, 0x68, 0x6f, 0x6d, 0x61, 0x73, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4c, 0x75, 0x73, -0x61, 0x6b, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x50, 0x6f, 0x72, 0x74, 0x2d, 0x61, 0x75, 0x2d, -0x50, 0x72, 0x69, 0x6e, 0x63, 0x65, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x69, 0x61, 0x6d, 0x65, 0x79, -0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2b, 0x33, 0x0, 0x41, 0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6c, -0x67, 0x69, 0x65, 0x72, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x75, 0x61, 0x79, 0x61, 0x71, -0x75, 0x69, 0x6c, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x68, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x73, -0x69, 0x61, 0x2f, 0x53, 0x68, 0x61, 0x6e, 0x67, 0x68, 0x61, 0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, -0x43, 0x75, 0x69, 0x61, 0x62, 0x61, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x6d, 0x70, 0x6f, -0x5f, 0x47, 0x72, 0x61, 0x6e, 0x64, 0x65, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4d, 0x69, 0x64, 0x77, -0x61, 0x79, 0x0, 0x45, 0x53, 0x54, 0x35, 0x45, 0x44, 0x54, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x43, 0x68, -0x72, 0x69, 0x73, 0x74, 0x6d, 0x61, 0x73, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x47, 0x61, 0x6c, 0x61, -0x70, 0x61, 0x67, 0x6f, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x67, 0x75, 0x69, 0x6c, -0x6c, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x61, 0x79, 0x6d, 0x61, 0x6e, 0x0, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x4b, 0x69, 0x74, 0x74, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x53, 0x61, 0x6e, 0x74, 0x69, 0x61, 0x67, 0x6f, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, -0x50, 0x61, 0x6c, 0x61, 0x75, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x20, 0x41, -0x73, 0x69, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x74, 0x61, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x68, 0x61, 0x6e, 0x64, -0x79, 0x67, 0x61, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x6c, 0x6e, 0x69, 0x75, 0x73, 0x0, 0x41, -0x66, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x6f, 0x6e, 0x72, 0x6f, 0x76, 0x69, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, -0x69, 0x63, 0x2f, 0x47, 0x75, 0x61, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x61, 0x6e, 0x6d, -0x61, 0x72, 0x6b, 0x73, 0x68, 0x61, 0x76, 0x6e, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x46, 0x69, 0x6a, -0x69, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x75, 0x61, 0x0, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x73, 0x62, 0x79, 0x73, 0x75, 0x6e, 0x64, 0x0, 0x41, -0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x53, 0x74, 0x5f, 0x42, 0x61, 0x72, 0x74, 0x68, 0x65, 0x6c, 0x65, 0x6d, 0x79, -0x0, 0x50, 0x53, 0x54, 0x38, 0x50, 0x44, 0x54, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x47, 0x72, 0x61, -0x6e, 0x64, 0x5f, 0x54, 0x75, 0x72, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4f, 0x72, 0x61, 0x6c, 0x20, 0x41, 0x73, -0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x61, 0x75, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x71, 0x74, 0x6f, 0x62, 0x65, -0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x20, 0x41, 0x6d, 0x65, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x4b, 0x6e, 0x6f, 0x78, 0x20, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x61, 0x2f, 0x54, 0x65, 0x6c, 0x6c, 0x5f, 0x43, -0x69, 0x74, 0x79, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x65, 0x6e, 0x6f, 0x6d, 0x69, 0x6e, 0x65, -0x65, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, -0x74, 0x61, 0x2f, 0x42, 0x65, 0x75, 0x6c, 0x61, 0x68, 0x20, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, -0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x43, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x20, 0x41, 0x6d, -0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x6f, 0x72, 0x74, 0x68, 0x5f, 0x44, 0x61, 0x6b, 0x6f, 0x74, 0x61, 0x2f, 0x4e, -0x65, 0x77, 0x5f, 0x53, 0x61, 0x6c, 0x65, 0x6d, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4d, 0x61, 0x74, -0x61, 0x6d, 0x6f, 0x72, 0x6f, 0x73, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x54, 0x68, 0x75, 0x6c, 0x65, -0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, 0x54, 0x2d, 0x31, 0x31, 0x0, 0x41, 0x74, 0x6c, 0x61, 0x6e, 0x74, 0x69, 0x63, -0x2f, 0x53, 0x74, 0x5f, 0x48, 0x65, 0x6c, 0x65, 0x6e, 0x61, 0x0, 0x50, 0x61, 0x63, 0x69, 0x66, 0x69, 0x63, 0x2f, 0x4e, -0x69, 0x75, 0x65, 0x0, 0x49, 0x6e, 0x64, 0x69, 0x61, 0x6e, 0x2f, 0x4d, 0x61, 0x75, 0x72, 0x69, 0x74, 0x69, 0x75, 0x73, -0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61, 0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x20, 0x41, 0x73, -0x69, 0x61, 0x2f, 0x43, 0x68, 0x6f, 0x69, 0x62, 0x61, 0x6c, 0x73, 0x61, 0x6e, 0x0, 0x45, 0x74, 0x63, 0x2f, 0x47, 0x4d, -0x54, 0x2d, 0x32, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x69, 0x6e, 0x73, 0x6b, 0x0, 0x41, 0x66, 0x72, -0x69, 0x63, 0x61, 0x2f, 0x4a, 0x75, 0x62, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x48, -0x6f, 0x62, 0x61, 0x72, 0x74, 0x20, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x43, 0x75, 0x72, 0x72, -0x69, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x6c, 0x61, 0x64, 0x69, 0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x20, -0x41, 0x73, 0x69, 0x61, 0x2f, 0x53, 0x61, 0x6b, 0x68, 0x61, 0x6c, 0x69, 0x6e, 0x20, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, -0x73, 0x74, 0x2d, 0x4e, 0x65, 0x72, 0x61, 0x0, 0x41, 0x6e, 0x74, 0x61, 0x72, 0x63, 0x74, 0x69, 0x63, 0x61, 0x2f, 0x44, -0x75, 0x6d, 0x6f, 0x6e, 0x74, 0x44, 0x55, 0x72, 0x76, 0x69, 0x6c, 0x6c, 0x65, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, -0x2f, 0x44, 0x75, 0x62, 0x6c, 0x69, 0x6e, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x56, 0x69, 0x65, 0x6e, 0x6e, -0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x41, 0x6e, 0x63, 0x68, 0x6f, 0x72, 0x61, 0x67, 0x65, 0x0, -0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x42, 0x75, 0x65, 0x6e, 0x6f, 0x73, 0x5f, 0x41, 0x69, 0x72, 0x65, 0x73, -0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x48, 0x61, 0x6c, 0x69, 0x66, 0x61, 0x78, 0x0, 0x41, 0x75, 0x73, -0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x53, 0x79, 0x64, 0x6e, 0x65, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, -0x61, 0x2f, 0x52, 0x65, 0x67, 0x69, 0x6e, 0x61, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, 0x2f, 0x41, -0x64, 0x65, 0x6c, 0x61, 0x69, 0x64, 0x65, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x41, 0x6c, 0x6d, 0x61, 0x74, 0x79, 0x0, -0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x75, 0x69, 0x61, 0x62, 0x61, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x4d, 0x65, 0x78, 0x69, 0x63, 0x6f, 0x5f, 0x43, 0x69, 0x74, 0x79, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, -0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x63, 0x61, 0x67, 0x6f, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, 0x61, 0x6c, 0x69, 0x61, -0x2f, 0x42, 0x72, 0x69, 0x73, 0x62, 0x61, 0x6e, 0x65, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x4e, 0x65, -0x77, 0x5f, 0x59, 0x6f, 0x72, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4b, 0x69, 0x65, 0x76, 0x0, 0x41, -0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x43, 0x68, 0x69, 0x68, 0x75, 0x61, 0x68, 0x75, 0x61, 0x0, 0x41, 0x6d, 0x65, -0x72, 0x69, 0x63, 0x61, 0x2f, 0x44, 0x65, 0x6e, 0x76, 0x65, 0x72, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4e, 0x6f, 0x76, -0x6f, 0x73, 0x69, 0x62, 0x69, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x72, 0x61, 0x73, 0x6e, 0x6f, -0x79, 0x61, 0x72, 0x73, 0x6b, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x4b, 0x61, 0x6d, 0x63, 0x68, 0x61, 0x74, 0x6b, 0x61, -0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x4d, 0x6f, 0x73, 0x63, 0x6f, 0x77, 0x0, 0x41, 0x75, 0x73, 0x74, 0x72, -0x61, 0x6c, 0x69, 0x61, 0x2f, 0x48, 0x6f, 0x62, 0x61, 0x72, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x55, 0x6c, 0x61, -0x61, 0x6e, 0x62, 0x61, 0x61, 0x74, 0x61, 0x72, 0x0, 0x41, 0x6d, 0x65, 0x72, 0x69, 0x63, 0x61, 0x2f, 0x49, 0x6e, 0x64, -0x69, 0x61, 0x6e, 0x61, 0x70, 0x6f, 0x6c, 0x69, 0x73, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x56, 0x6c, 0x61, 0x64, 0x69, -0x76, 0x6f, 0x73, 0x74, 0x6f, 0x6b, 0x0, 0x45, 0x75, 0x72, 0x6f, 0x70, 0x65, 0x2f, 0x42, 0x65, 0x72, 0x6c, 0x69, 0x6e, -0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, 0x54, 0x61, 0x73, 0x68, 0x6b, 0x65, 0x6e, 0x74, 0x0, 0x41, 0x73, 0x69, 0x61, 0x2f, -0x59, 0x61, 0x6b, 0x75, 0x74, 0x73, 0x6b, 0x0, 0x55, 0x54, 0x43, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x34, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x32, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x31, 0x30, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x38, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x36, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x35, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x33, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x33, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x33, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x32, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x31, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2d, 0x30, 0x30, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x31, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x33, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x34, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x33, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x35, 0x3a, 0x34, -0x35, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x36, 0x3a, 0x33, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x37, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x39, 0x3a, 0x33, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x30, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x31, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x32, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x33, 0x3a, 0x30, -0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x31, 0x34, 0x3a, 0x30, 0x30, 0x0, 0x55, 0x54, 0x43, 0x2b, 0x30, 0x38, 0x3a, 0x33, -0x30, 0x0 -}; -// GENERATED PART ENDS HERE - -QT_END_NAMESPACE - -#endif // QTIMEZONEPRIVATE_DATA_P_H diff --git a/src/corelib/tools/qtools_p.h b/src/corelib/tools/qtools_p.h index 17d2ab852a..d48318b474 100644 --- a/src/corelib/tools/qtools_p.h +++ b/src/corelib/tools/qtools_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2019 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -57,17 +57,17 @@ QT_BEGIN_NAMESPACE namespace QtMiscUtils { -Q_DECL_CONSTEXPR inline char toHexUpper(uint value) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline char toHexUpper(uint value) noexcept { return "0123456789ABCDEF"[value & 0xF]; } -Q_DECL_CONSTEXPR inline char toHexLower(uint value) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline char toHexLower(uint value) noexcept { return "0123456789abcdef"[value & 0xF]; } -Q_DECL_CONSTEXPR inline int fromHex(uint c) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int fromHex(uint c) noexcept { return ((c >= '0') && (c <= '9')) ? int(c - '0') : ((c >= 'A') && (c <= 'F')) ? int(c - 'A' + 10) : @@ -75,12 +75,12 @@ Q_DECL_CONSTEXPR inline int fromHex(uint c) Q_DECL_NOTHROW /* otherwise */ -1; } -Q_DECL_CONSTEXPR inline char toOct(uint value) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline char toOct(uint value) noexcept { return '0' + char(value & 0x7); } -Q_DECL_CONSTEXPR inline int fromOct(uint c) Q_DECL_NOTHROW +Q_DECL_CONSTEXPR inline int fromOct(uint c) noexcept { return ((c >= '0') && (c <= '7')) ? int(c - '0') : -1; } @@ -96,11 +96,11 @@ struct CalculateGrowingBlockSizeResult { size_t elementCount; }; -// implemented in qbytearray.cpp +// Implemented in qarraydata.cpp: size_t Q_CORE_EXPORT Q_DECL_CONST_FUNCTION -qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) Q_DECL_NOTHROW; +qCalculateBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) noexcept; CalculateGrowingBlockSizeResult Q_CORE_EXPORT Q_DECL_CONST_FUNCTION -qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) Q_DECL_NOTHROW ; +qCalculateGrowingBlockSize(size_t elementCount, size_t elementSize, size_t headerSize = 0) noexcept ; QT_END_NAMESPACE diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp index 4c4821802d..d57b39ff1f 100644 --- a/src/corelib/tools/qunicodetables.cpp +++ b/src/corelib/tools/qunicodetables.cpp @@ -8803,42 +8803,42 @@ static const Properties uc_properties[] = { { 12, 0, 0, 0, -1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 12, 0 } }; -Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(uint ucs4) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(uint ucs4) noexcept { return uc_properties + GET_PROP_INDEX(ucs4); } -Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(ushort ucs2) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION static inline const Properties *qGetProp(ushort ucs2) noexcept { return uc_properties + GET_PROP_INDEX_UCS2(ucs2); } -Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) noexcept { return qGetProp(ucs4); } -Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW +Q_DECL_CONST_FUNCTION Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) noexcept { return qGetProp(ucs2); } -Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) Q_DECL_NOTHROW +Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) noexcept { return static_cast<GraphemeBreakClass>(qGetProp(ucs4)->graphemeBreakClass); } -Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) Q_DECL_NOTHROW +Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) noexcept { return static_cast<WordBreakClass>(qGetProp(ucs4)->wordBreakClass); } -Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) Q_DECL_NOTHROW +Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) noexcept { return static_cast<SentenceBreakClass>(qGetProp(ucs4)->sentenceBreakClass); } -Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) Q_DECL_NOTHROW +Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) noexcept { return static_cast<LineBreakClass>(qGetProp(ucs4)->lineBreakClass); } diff --git a/src/corelib/tools/qunicodetables_p.h b/src/corelib/tools/qunicodetables_p.h index 3f2e91a9b2..cb7a211cb6 100644 --- a/src/corelib/tools/qunicodetables_p.h +++ b/src/corelib/tools/qunicodetables_p.h @@ -93,8 +93,8 @@ struct Properties { ushort script : 8; }; -Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) Q_DECL_NOTHROW; -Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) Q_DECL_NOTHROW; +Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4) noexcept; +Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) noexcept; struct LowercaseTraits { @@ -209,20 +209,20 @@ enum LineBreakClass { NumLineBreakClasses }; -Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) Q_DECL_NOTHROW; -inline GraphemeBreakClass graphemeBreakClass(QChar ch) Q_DECL_NOTHROW +Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) noexcept; +inline GraphemeBreakClass graphemeBreakClass(QChar ch) noexcept { return graphemeBreakClass(ch.unicode()); } -Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) Q_DECL_NOTHROW; -inline WordBreakClass wordBreakClass(QChar ch) Q_DECL_NOTHROW +Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) noexcept; +inline WordBreakClass wordBreakClass(QChar ch) noexcept { return wordBreakClass(ch.unicode()); } -Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) Q_DECL_NOTHROW; -inline SentenceBreakClass sentenceBreakClass(QChar ch) Q_DECL_NOTHROW +Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) noexcept; +inline SentenceBreakClass sentenceBreakClass(QChar ch) noexcept { return sentenceBreakClass(ch.unicode()); } -Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) Q_DECL_NOTHROW; -inline LineBreakClass lineBreakClass(QChar ch) Q_DECL_NOTHROW +Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) noexcept; +inline LineBreakClass lineBreakClass(QChar ch) noexcept { return lineBreakClass(ch.unicode()); } } // namespace QUnicodeTables diff --git a/src/corelib/tools/qunicodetools.cpp b/src/corelib/tools/qunicodetools.cpp index c9d0868fef..d14118abf7 100644 --- a/src/corelib/tools/qunicodetools.cpp +++ b/src/corelib/tools/qunicodetools.cpp @@ -542,7 +542,7 @@ static const uchar breakTable[QUnicodeTables::LineBreak_SA][QUnicodeTables::Line } // namespace LB -static void getLineBreaks(const ushort *string, quint32 len, QCharAttributes *attributes) +static void getLineBreaks(const ushort *string, quint32 len, QCharAttributes *attributes, QUnicodeTools::CharAttributeOptions options) { quint32 nestart = 0; LB::NS::Class nelast = LB::NS::XX; @@ -564,6 +564,31 @@ static void getLineBreaks(const ushort *string, quint32 len, QCharAttributes *at QUnicodeTables::LineBreakClass ncls = (QUnicodeTables::LineBreakClass) prop->lineBreakClass; QUnicodeTables::LineBreakClass tcls; + if (options & QUnicodeTools::HangulLineBreakTailoring) { + if (Q_UNLIKELY((ncls >= QUnicodeTables::LineBreak_H2 + && ncls <= QUnicodeTables::LineBreak_JT) + || (ucs4 >= 0x3130 && ucs4 <= 0x318F && ncls == QUnicodeTables::LineBreak_ID)) + ) { + // LB27: use SPACE for line breaking + // "When Korean uses SPACE for line breaking, the classes in rule LB26, + // as well as characters of class ID, are often tailored to AL; see Section 8, Customization." + // In case of Korean syllables: "3130..318F HANGUL COMPATIBILITY JAMO" + ncls = QUnicodeTables::LineBreak_AL; + } else { + if (Q_UNLIKELY(ncls == QUnicodeTables::LineBreak_SA)) { + // LB1: resolve SA to AL, except of those that have Category Mn or Mc be resolved to CM + static const int test = FLAG(QChar::Mark_NonSpacing) | FLAG(QChar::Mark_SpacingCombining); + if (FLAG(prop->category) & test) + ncls = QUnicodeTables::LineBreak_CM; + } + if (Q_UNLIKELY(ncls == QUnicodeTables::LineBreak_CM)) { + // LB10: treat CM that follows SP, BK, CR, LF, NL, or ZW as AL + if (lcls == QUnicodeTables::LineBreak_ZW || lcls >= QUnicodeTables::LineBreak_SP) + ncls = QUnicodeTables::LineBreak_AL; + } + } + } + if (Q_UNLIKELY(ncls == QUnicodeTables::LineBreak_SA)) { // LB1: resolve SA to AL, except of those that have Category Mn or Mc be resolved to CM static const int test = FLAG(QChar::Mark_NonSpacing) | FLAG(QChar::Mark_SpacingCombining); @@ -716,7 +741,7 @@ Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length, if (options & SentenceBreaks) getSentenceBreaks(string, length, attributes); if (options & LineBreaks) - getLineBreaks(string, length, attributes); + getLineBreaks(string, length, attributes, options); if (options & WhiteSpaces) getWhiteSpaces(string, length, attributes); diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/tools/qunicodetools_p.h index 5e2d56a226..ed6fcb5d65 100644 --- a/src/corelib/tools/qunicodetools_p.h +++ b/src/corelib/tools/qunicodetools_p.h @@ -88,6 +88,7 @@ enum CharAttributeOption { SentenceBreaks = 0x04, LineBreaks = 0x08, WhiteSpaces = 0x10, + HangulLineBreakTailoring = 0x20, DefaultOptionsCompat = GraphemeBreaks | LineBreaks | WhiteSpaces, // ### remove DontClearAttributes = 0x1000 diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index 597e7464cb..a49e0af687 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -43,15 +43,15 @@ #include <QtCore/qcontainerfwd.h> #include <QtCore/qglobal.h> #include <QtCore/qalgorithms.h> +#include <QtCore/qcontainertools_impl.h> +#include <QtCore/qhashfunctions.h> -#include <new> -#include <string.h> -#include <stdlib.h> #include <algorithm> -#ifdef Q_COMPILER_INITIALIZER_LISTS #include <initializer_list> -#endif #include <iterator> +#include <new> +#include <string.h> +#include <stdlib.h> QT_BEGIN_NAMESPACE @@ -69,14 +69,18 @@ public: append(other.constData(), other.size()); } -#ifdef Q_COMPILER_INITIALIZER_LISTS QVarLengthArray(std::initializer_list<T> args) - : a(Prealloc), s(0), ptr(reinterpret_cast<T *>(array)) + : QVarLengthArray(args.begin(), args.end()) { - if (args.size()) - append(args.begin(), int(args.size())); } -#endif + + template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> + inline QVarLengthArray(InputIterator first, InputIterator last) + : QVarLengthArray() + { + QtPrivate::reserveIfForwardIterator(this, first, last); + std::copy(first, last, std::back_inserter(*this)); + } inline ~QVarLengthArray() { if (QTypeInfo<T>::isComplex) { @@ -96,7 +100,6 @@ public: return *this; } -#ifdef Q_COMPILER_INITIALIZER_LISTS QVarLengthArray<T, Prealloc> &operator=(std::initializer_list<T> list) { resize(list.size()); @@ -104,7 +107,6 @@ public: QT_MAKE_CHECKED_ARRAY_ITERATOR(this->begin(), this->size())); return *this; } -#endif inline void removeLast() { Q_ASSERT(s > 0); @@ -570,7 +572,7 @@ bool operator!=(const QVarLengthArray<T, Prealloc1> &l, const QVarLengthArray<T, template <typename T, int Prealloc1, int Prealloc2> bool operator<(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(), + noexcept(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end()))) { return std::lexicographical_compare(lhs.begin(), lhs.end(), @@ -579,25 +581,32 @@ bool operator<(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T template <typename T, int Prealloc1, int Prealloc2> inline bool operator>(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return rhs < lhs; } template <typename T, int Prealloc1, int Prealloc2> inline bool operator<=(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return !(lhs > rhs); } template <typename T, int Prealloc1, int Prealloc2> inline bool operator>=(const QVarLengthArray<T, Prealloc1> &lhs, const QVarLengthArray<T, Prealloc2> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return !(lhs < rhs); } +template <typename T, int Prealloc> +uint qHash(const QVarLengthArray<T, Prealloc> &key, uint seed = 0) + noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed))) +{ + return qHashRange(key.cbegin(), key.cend(), seed); +} + QT_END_NAMESPACE #endif // QVARLENGTHARRAY_H diff --git a/src/corelib/tools/qvarlengtharray.qdoc b/src/corelib/tools/qvarlengtharray.qdoc index bc8df82517..e5ba47b8ef 100644 --- a/src/corelib/tools/qvarlengtharray.qdoc +++ b/src/corelib/tools/qvarlengtharray.qdoc @@ -110,6 +110,14 @@ lists. */ +/*! \fn template<class T, int Prealloc> template<typename InputIterator> QVarLengthArray<T, Prealloc>::QVarLengthArray(InputIterator first, InputIterator last) + \since 5.14 + + Constructs an array with the contents in the iterator range [\a first, \a last). + + The value type of \c InputIterator must be convertible to \c T. +*/ + /*! \fn template<class T, int Prealloc> QVarLengthArray<T, Prealloc>::~QVarLengthArray() @@ -895,3 +903,11 @@ \sa indexOf(), lastIndexOf() */ +/*! + template <typename T, int Prealloc> uint qHash(const QVarLengthArray<T, Prealloc> &key, uint seed = 0) + \relates QVarLengthArray + \since 5.14 + + Returns the hash value for \a key, using \a seed to seed the + calculation. +*/ diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index 30fd7b2865..65a5174abf 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -42,18 +42,18 @@ #include <QtCore/qalgorithms.h> #include <QtCore/qiterator.h> -#include <QtCore/qlist.h> #include <QtCore/qrefcount.h> #include <QtCore/qarraydata.h> #include <QtCore/qhashfunctions.h> +#include <QtCore/qcontainertools_impl.h> #include <iterator> +#include <initializer_list> +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) #include <vector> +#endif #include <stdlib.h> #include <string.h> -#ifdef Q_COMPILER_INITIALIZER_LISTS -#include <initializer_list> -#endif #include <algorithm> @@ -66,21 +66,22 @@ class QVector Data *d; public: - inline QVector() Q_DECL_NOTHROW : d(Data::sharedNull()) { } + inline QVector() noexcept : d(Data::sharedNull()) { } explicit QVector(int size); QVector(int size, const T &t); inline QVector(const QVector<T> &v); inline ~QVector() { if (!d->ref.deref()) freeData(d); } QVector<T> &operator=(const QVector<T> &v); -#if defined(Q_COMPILER_RVALUE_REFS) || defined(Q_CLANG_QDOC) - QVector(QVector<T> &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Data::sharedNull(); } - QVector<T> &operator=(QVector<T> &&other) Q_DECL_NOTHROW + QVector(QVector<T> &&other) noexcept : d(other.d) { other.d = Data::sharedNull(); } + QVector<T> &operator=(QVector<T> &&other) noexcept { QVector moved(std::move(other)); swap(moved); return *this; } -#endif - void swap(QVector<T> &other) Q_DECL_NOTHROW { qSwap(d, other.d); } -#ifdef Q_COMPILER_INITIALIZER_LISTS + void swap(QVector<T> &other) noexcept { qSwap(d, other.d); } inline QVector(std::initializer_list<T> args); -#endif + QVector<T> &operator=(std::initializer_list<T> args); + template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator> = true> + inline QVector(InputIterator first, InputIterator last); + explicit QVector(QArrayDataPointerRef<T> ref) noexcept : d(ref.ptr) {} + bool operator==(const QVector<T> &v) const; inline bool operator!=(const QVector<T> &v) const { return !(*this == v); } @@ -94,7 +95,13 @@ public: void reserve(int size); inline void squeeze() { - reallocData(d->size, d->size); + if (d->size < int(d->alloc)) { + if (!d->size) { + *this = QVector<T>(); + return; + } + realloc(d->size); + } if (d->capacityReserved) { // capacity reserved in a read only memory would be useless // this checks avoid writing to such memory. @@ -133,9 +140,7 @@ public: T &operator[](int i); const T &operator[](int i) const; void append(const T &t); -#if defined(Q_COMPILER_RVALUE_REFS) || defined(Q_CLANG_QDOC) void append(T &&t); -#endif inline void append(const QVector<T> &l) { *this += l; } void prepend(T &&t); void prepend(const T &t); @@ -203,29 +208,29 @@ public: typedef std::reverse_iterator<const_iterator> const_reverse_iterator; #if !defined(QT_STRICT_ITERATORS) || defined(Q_CLANG_QDOC) inline iterator begin() { detach(); return d->begin(); } - inline const_iterator begin() const Q_DECL_NOTHROW { return d->constBegin(); } - inline const_iterator cbegin() const Q_DECL_NOTHROW { return d->constBegin(); } - inline const_iterator constBegin() const Q_DECL_NOTHROW { return d->constBegin(); } + inline const_iterator begin() const noexcept { return d->constBegin(); } + inline const_iterator cbegin() const noexcept { return d->constBegin(); } + inline const_iterator constBegin() const noexcept { return d->constBegin(); } inline iterator end() { detach(); return d->end(); } - inline const_iterator end() const Q_DECL_NOTHROW { return d->constEnd(); } - inline const_iterator cend() const Q_DECL_NOTHROW { return d->constEnd(); } - inline const_iterator constEnd() const Q_DECL_NOTHROW { return d->constEnd(); } + inline const_iterator end() const noexcept { return d->constEnd(); } + inline const_iterator cend() const noexcept { return d->constEnd(); } + inline const_iterator constEnd() const noexcept { return d->constEnd(); } #else inline iterator begin(iterator = iterator()) { detach(); return d->begin(); } - inline const_iterator begin(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constBegin(); } - inline const_iterator cbegin(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constBegin(); } - inline const_iterator constBegin(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constBegin(); } + inline const_iterator begin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); } + inline const_iterator cbegin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); } + inline const_iterator constBegin(const_iterator = const_iterator()) const noexcept { return d->constBegin(); } inline iterator end(iterator = iterator()) { detach(); return d->end(); } - inline const_iterator end(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constEnd(); } - inline const_iterator cend(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constEnd(); } - inline const_iterator constEnd(const_iterator = const_iterator()) const Q_DECL_NOTHROW { return d->constEnd(); } + inline const_iterator end(const_iterator = const_iterator()) const noexcept { return d->constEnd(); } + inline const_iterator cend(const_iterator = const_iterator()) const noexcept { return d->constEnd(); } + inline const_iterator constEnd(const_iterator = const_iterator()) const noexcept { return d->constEnd(); } #endif reverse_iterator rbegin() { return reverse_iterator(end()); } reverse_iterator rend() { return reverse_iterator(begin()); } - const_reverse_iterator rbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator rend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } - const_reverse_iterator crbegin() const Q_DECL_NOTHROW { return const_reverse_iterator(end()); } - const_reverse_iterator crend() const Q_DECL_NOTHROW { return const_reverse_iterator(begin()); } + const_reverse_iterator rbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator rend() const noexcept { return const_reverse_iterator(begin()); } + const_reverse_iterator crbegin() const noexcept { return const_reverse_iterator(end()); } + const_reverse_iterator crend() const noexcept { return const_reverse_iterator(begin()); } iterator insert(iterator before, int n, const T &x); inline iterator insert(iterator before, const T &x) { return insert(before, 1, x); } inline iterator insert(iterator before, T &&x); @@ -247,6 +252,13 @@ public: T value(int i) const; T value(int i, const T &defaultValue) const; + void swapItemsAt(int i, int j) { + Q_ASSERT_X(i >= 0 && i < size() && j >= 0 && j < size(), + "QVector<T>::swap", "index out of range"); + detach(); + qSwap(d->begin()[i], d->begin()[j]); + } + // STL compatibility typedef T value_type; typedef value_type* pointer; @@ -258,10 +270,8 @@ public: typedef const_iterator ConstIterator; typedef int size_type; inline void push_back(const T &t) { append(t); } -#if defined(Q_COMPILER_RVALUE_REFS) || defined(Q_CLANG_QDOC) void push_back(T &&t) { append(std::move(t)); } void push_front(T &&t) { prepend(std::move(t)); } -#endif inline void push_front(const T &t) { prepend(t); } void pop_back() { removeLast(); } void pop_front() { removeFirst(); } @@ -288,18 +298,22 @@ public: inline QVector<T> &operator<<(T &&t) { append(std::move(t)); return *this; } - QList<T> toList() const; - static QVector<T> fromList(const QList<T> &list); + QList<T> toList() const; +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) + Q_DECL_DEPRECATED_X("Use QVector<T>(vector.begin(), vector.end()) instead.") static inline QVector<T> fromStdVector(const std::vector<T> &vector) - { QVector<T> tmp; tmp.reserve(int(vector.size())); std::copy(vector.begin(), vector.end(), std::back_inserter(tmp)); return tmp; } + { return QVector<T>(vector.begin(), vector.end()); } + Q_DECL_DEPRECATED_X("Use std::vector<T>(vector.begin(), vector.end()) instead.") inline std::vector<T> toStdVector() const { return std::vector<T>(d->begin(), d->end()); } +#endif private: - // ### Qt6: remove const from int parameters + // ### Qt6: remove methods, they are unused void reallocData(const int size, const int alloc, QArrayData::AllocationOptions options = QArrayData::Default); void reallocData(const int sz) { reallocData(sz, d->alloc); } + void realloc(int alloc, QArrayData::AllocationOptions options = QArrayData::Default); void freeData(Data *d); void defaultConstruct(T *from, T *to); void copyConstruct(const T *srcFrom, const T *srcTo, T *dstFrom); @@ -387,7 +401,7 @@ void QVector<T>::detach() d = Data::unsharableEmpty(); else #endif - reallocData(d->size, int(d->alloc)); + realloc(int(d->alloc)); } Q_ASSERT(isDetached()); } @@ -396,7 +410,7 @@ template <typename T> void QVector<T>::reserve(int asize) { if (asize > int(d->alloc)) - reallocData(d->size, asize); + realloc(asize); if (isDetached() #if !defined(QT_NO_UNSHARABLE_CONTAINERS) && d != Data::unsharableEmpty() @@ -409,21 +423,26 @@ void QVector<T>::reserve(int asize) template <typename T> void QVector<T>::resize(int asize) { - int newAlloc; - const int oldAlloc = int(d->alloc); - QArrayData::AllocationOptions opt; - - if (asize > oldAlloc) { // there is not enough space - newAlloc = asize; - opt = QArrayData::Grow; - } else { - newAlloc = oldAlloc; + if (asize == d->size) + return; + if (asize > int(d->alloc) || !isDetached()) { // there is not enough space + QArrayData::AllocationOptions opt = asize > int(d->alloc) ? QArrayData::Grow : QArrayData::Default; + realloc(qMax(int(d->alloc), asize), opt); } - reallocData(asize, newAlloc, opt); + if (asize < d->size) + destruct(begin() + asize, end()); + else + defaultConstruct(end(), begin() + asize); + d->size = asize; } template <typename T> inline void QVector<T>::clear() -{ resize(0); } +{ + if (!d->size) + return; + destruct(begin(), end()); + d->size = 0; +} template <typename T> inline const T &QVector<T>::at(int i) const { Q_ASSERT_X(i >= 0 && i < d->size, "QVector<T>::at", "index out of range"); @@ -511,11 +530,10 @@ QVector<T>::QVector(int asize, const T &t) } } -#ifdef Q_COMPILER_INITIALIZER_LISTS -# if defined(Q_CC_MSVC) +#if defined(Q_CC_MSVC) QT_WARNING_PUSH QT_WARNING_DISABLE_MSVC(4127) // conditional expression is constant -# endif // Q_CC_MSVC +#endif // Q_CC_MSVC template <typename T> QVector<T>::QVector(std::initializer_list<T> args) @@ -531,10 +549,27 @@ QVector<T>::QVector(std::initializer_list<T> args) d = Data::sharedNull(); } } -# if defined(Q_CC_MSVC) + +template <typename T> +QVector<T> &QVector<T>::operator=(std::initializer_list<T> args) +{ + QVector<T> tmp(args); + tmp.swap(*this); + return *this; +} + +#if defined(Q_CC_MSVC) QT_WARNING_POP -# endif // Q_CC_MSVC -#endif // Q_COMPILER_INITALIZER_LISTS +#endif // Q_CC_MSVC + +template <typename T> +template <typename InputIterator, QtPrivate::IfIsInputIterator<InputIterator>> +QVector<T>::QVector(InputIterator first, InputIterator last) + : QVector() +{ + QtPrivate::reserveIfForwardIterator(this, first, last); + std::copy(first, last, std::back_inserter(*this)); +} template <typename T> void QVector<T>::freeData(Data *x) @@ -654,6 +689,76 @@ void QVector<T>::reallocData(const int asize, const int aalloc, QArrayData::Allo Q_ASSERT(d->size == asize); } +template<typename T> +void QVector<T>::realloc(int aalloc, QArrayData::AllocationOptions options) +{ + Q_ASSERT(aalloc >= d->size); + Data *x = d; + + const bool isShared = d->ref.isShared(); + + QT_TRY { + // allocate memory + x = Data::allocate(aalloc, options); + Q_CHECK_PTR(x); + // aalloc is bigger then 0 so it is not [un]sharedEmpty +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) + Q_ASSERT(x->ref.isSharable() || options.testFlag(QArrayData::Unsharable)); +#endif + Q_ASSERT(!x->ref.isStatic()); + x->size = d->size; + + T *srcBegin = d->begin(); + T *srcEnd = d->end(); + T *dst = x->begin(); + + if (!QTypeInfoQuery<T>::isRelocatable || (isShared && QTypeInfo<T>::isComplex)) { + QT_TRY { + if (isShared || !std::is_nothrow_move_constructible<T>::value) { + // we can not move the data, we need to copy construct it + while (srcBegin != srcEnd) + new (dst++) T(*srcBegin++); + } else { + while (srcBegin != srcEnd) + new (dst++) T(std::move(*srcBegin++)); + } + } QT_CATCH (...) { + // destruct already copied objects + destruct(x->begin(), dst); + QT_RETHROW; + } + } else { + ::memcpy(static_cast<void *>(dst), static_cast<void *>(srcBegin), (srcEnd - srcBegin) * sizeof(T)); + dst += srcEnd - srcBegin; + } + + } QT_CATCH (...) { + Data::deallocate(x); + QT_RETHROW; + } + x->capacityReserved = d->capacityReserved; + + Q_ASSERT(d != x); + if (!d->ref.deref()) { + if (!QTypeInfoQuery<T>::isRelocatable || !aalloc || (isShared && QTypeInfo<T>::isComplex)) { + // data was copy constructed, we need to call destructors + // or if !alloc we did nothing to the old 'd'. + freeData(d); + } else { + Data::deallocate(d); + } + } + d = x; + + Q_ASSERT(d->data()); + Q_ASSERT(uint(d->size) <= d->alloc); +#if !defined(QT_NO_UNSHARABLE_CONTAINERS) + Q_ASSERT(d != Data::unsharableEmpty()); +#endif + Q_ASSERT(d != Data::sharedNull()); + Q_ASSERT(d->alloc >= uint(aalloc)); +} + #if defined(Q_CC_MSVC) QT_WARNING_POP #endif @@ -679,12 +784,12 @@ void QVector<T>::append(const T &t) if (!isDetached() || isTooSmall) { T copy(t); QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default); - reallocData(d->size, isTooSmall ? d->size + 1 : d->alloc, opt); + realloc(isTooSmall ? d->size + 1 : d->alloc, opt); if (QTypeInfo<T>::isComplex) - new (d->end()) T(qMove(copy)); + new (d->end()) T(std::move(copy)); else - *d->end() = qMove(copy); + *d->end() = std::move(copy); } else { if (QTypeInfo<T>::isComplex) @@ -695,21 +800,19 @@ void QVector<T>::append(const T &t) ++d->size; } -#ifdef Q_COMPILER_RVALUE_REFS template <typename T> void QVector<T>::append(T &&t) { const bool isTooSmall = uint(d->size + 1) > d->alloc; if (!isDetached() || isTooSmall) { QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default); - reallocData(d->size, isTooSmall ? d->size + 1 : d->alloc, opt); + realloc(isTooSmall ? d->size + 1 : d->alloc, opt); } new (d->end()) T(std::move(t)); ++d->size; } -#endif template <typename T> void QVector<T>::removeLast() @@ -717,13 +820,11 @@ void QVector<T>::removeLast() Q_ASSERT(!isEmpty()); Q_ASSERT(d->alloc); - if (!d->ref.isShared()) { - --d->size; - if (QTypeInfo<T>::isComplex) - (d->data() + d->size)->~T(); - } else { - reallocData(d->size - 1); - } + if (d->ref.isShared()) + detach(); + --d->size; + if (QTypeInfo<T>::isComplex) + (d->data() + d->size)->~T(); } template <typename T> @@ -735,7 +836,7 @@ typename QVector<T>::iterator QVector<T>::insert(iterator before, size_type n, c if (n != 0) { const T copy(t); if (!isDetached() || d->size + n > int(d->alloc)) - reallocData(d->size, d->size + n, QArrayData::Grow); + realloc(d->size + n, QArrayData::Grow); if (!QTypeInfoQuery<T>::isRelocatable) { T *b = d->end(); T *i = d->end() + n; @@ -768,7 +869,7 @@ typename QVector<T>::iterator QVector<T>::insert(iterator before, T &&t) const auto offset = std::distance(d->begin(), before); if (!isDetached() || d->size + 1 > int(d->alloc)) - reallocData(d->size, d->size + 1, QArrayData::Grow); + realloc(d->size + 1, QArrayData::Grow); if (!QTypeInfoQuery<T>::isRelocatable) { T *i = d->end(); T *j = i + 1; @@ -870,14 +971,14 @@ QVector<T> &QVector<T>::fill(const T &from, int asize) template <typename T> QVector<T> &QVector<T>::operator+=(const QVector &l) { - if (d == Data::sharedNull()) { + if (d->size == 0) { *this = l; } else { uint newSize = d->size + l.d->size; const bool isTooSmall = newSize > d->alloc; if (!isDetached() || isTooSmall) { QArrayData::AllocationOptions opt(isTooSmall ? QArrayData::Grow : QArrayData::Default); - reallocData(d->size, isTooSmall ? newSize : d->alloc, opt); + realloc(isTooSmall ? newSize : d->alloc, opt); } if (d->alloc) { @@ -960,7 +1061,7 @@ Q_OUTOFLINE_TEMPLATE QVector<T> QVector<T>::mid(int pos, int len) const } QVector<T> midResult; - midResult.reallocData(0, len); + midResult.realloc(len); T *srcFrom = d->begin() + pos; T *srcTo = d->begin() + pos + len; midResult.copyConstruct(srcFrom, srcTo, midResult.data()); @@ -968,50 +1069,19 @@ Q_OUTOFLINE_TEMPLATE QVector<T> QVector<T>::mid(int pos, int len) const return midResult; } -template <typename T> -Q_OUTOFLINE_TEMPLATE QList<T> QVector<T>::toList() const -{ - QList<T> result; - result.reserve(size()); - for (int i = 0; i < size(); ++i) - result.append(at(i)); - return result; -} - -template <typename T> -Q_OUTOFLINE_TEMPLATE QVector<T> QList<T>::toVector() const -{ - QVector<T> result(size()); - for (int i = 0; i < size(); ++i) - result[i] = at(i); - return result; -} - -template <typename T> -QVector<T> QVector<T>::fromList(const QList<T> &list) -{ - return list.toVector(); -} - -template <typename T> -QList<T> QList<T>::fromVector(const QVector<T> &vector) -{ - return vector.toList(); -} - Q_DECLARE_SEQUENTIAL_ITERATOR(Vector) Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(Vector) template <typename T> uint qHash(const QVector<T> &key, uint seed = 0) - Q_DECL_NOEXCEPT_EXPR(noexcept(qHashRange(key.cbegin(), key.cend(), seed))) + noexcept(noexcept(qHashRange(key.cbegin(), key.cend(), seed))) { return qHashRange(key.cbegin(), key.cend(), seed); } template <typename T> bool operator<(const QVector<T> &lhs, const QVector<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(), + noexcept(noexcept(std::lexicographical_compare(lhs.begin(), lhs.end(), rhs.begin(), rhs.end()))) { return std::lexicographical_compare(lhs.begin(), lhs.end(), @@ -1020,21 +1090,21 @@ bool operator<(const QVector<T> &lhs, const QVector<T> &rhs) template <typename T> inline bool operator>(const QVector<T> &lhs, const QVector<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return rhs < lhs; } template <typename T> inline bool operator<=(const QVector<T> &lhs, const QVector<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return !(lhs > rhs); } template <typename T> inline bool operator>=(const QVector<T> &lhs, const QVector<T> &rhs) - Q_DECL_NOEXCEPT_EXPR(noexcept(lhs < rhs)) + noexcept(noexcept(lhs < rhs)) { return !(lhs < rhs); } @@ -1046,23 +1116,33 @@ inline bool operator>=(const QVector<T> &lhs, const QVector<T> &rhs) ### QVector<QPointF> respectively. */ -#ifdef Q_CC_MSVC +#if defined(Q_CC_MSVC) && !defined(QT_BUILD_CORE_LIB) QT_BEGIN_INCLUDE_NAMESPACE #include <QtCore/qpoint.h> QT_END_INCLUDE_NAMESPACE - -#ifndef Q_TEMPLATE_EXTERN -#if defined(QT_BUILD_CORE_LIB) -#define Q_TEMPLATE_EXTERN -#else -#define Q_TEMPLATE_EXTERN extern +extern template class Q_CORE_EXPORT QVector<QPointF>; +extern template class Q_CORE_EXPORT QVector<QPoint>; #endif + +QVector<uint> QStringView::toUcs4() const { return QtPrivate::convertToUcs4(*this); } + +QVector<QStringRef> QString::splitRef(const QString &sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const +{ return splitRef(sep, _sb(behavior), cs); } +QVector<QStringRef> QString::splitRef(QChar sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const +{ return splitRef(sep, _sb(behavior), cs); } +#ifndef QT_NO_REGEXP +QVector<QStringRef> QString::splitRef(const QRegExp &sep, Qt::SplitBehavior behavior) const +{ return splitRef(sep, _sb(behavior)); } #endif -Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPointF>; -Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector<QPoint>; +#if QT_CONFIG(regularexpression) +QVector<QStringRef> QString::splitRef(const QRegularExpression &sep, Qt::SplitBehavior behavior) const +{ return splitRef(sep, _sb(behavior)); } #endif +QVector<QStringRef> QStringRef::split(const QString &sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const +{ return split(sep, QString::_sb(behavior), cs); } +QVector<QStringRef> QStringRef::split(QChar sep, Qt::SplitBehavior behavior, Qt::CaseSensitivity cs) const +{ return split(sep, QString::_sb(behavior), cs); } -QVector<uint> QStringView::toUcs4() const { return QtPrivate::convertToUcs4(*this); } QT_END_NAMESPACE diff --git a/src/corelib/tools/qvector.qdoc b/src/corelib/tools/qvector.qdoc index 75b17a4207..4c442511ea 100644 --- a/src/corelib/tools/qvector.qdoc +++ b/src/corelib/tools/qvector.qdoc @@ -243,6 +243,18 @@ lists. */ +/*! \fn template <typename T> template<typename InputIterator> QVector<T>::QVector(InputIterator first, InputIterator last) + \since 5.14 + + Constructs a vector with the contents in the iterator range [\a first, \a last). + + The value type of \c InputIterator must be convertible to \c T. +*/ + +/*! + \fn template <typename T> QVector<T>::QVector(QArrayDataPointerRef<T> ref) + \internal +*/ /*! \fn template <typename T> QVector<T>::~QVector() @@ -263,6 +275,17 @@ \since 5.2 */ +/*! + \fn template <typename T> QVector<T> &QVector<T>::operator=(std::initializer_list<T> args) + + Assigns the collection of values in \a args to this QVector instance. + + This operator is only enabled if the compiler supports C++11 initializer + lists. + + \since 5.14 +*/ + /*! \fn template <typename T> void QVector<T>::swap(QVector<T> &other) \since 4.8 @@ -270,6 +293,16 @@ never fails. */ +/*! \fn template <typename T> void QVector<T>::swapItemsAt(int i, int j) + \since 5.14 + + Exchange the item at index position \a i with the item at index + position \a j. This function assumes that both \a i and \a j are + at least 0 but less than size(). To avoid failure, test that both + \a i and \a j are at least 0 and less than size(). +*/ + + /*! \fn template <typename T> bool QVector<T>::operator==(const QVector<T> &other) const Returns \c true if \a other is equal to this vector; otherwise diff --git a/src/corelib/tools/qversionnumber.cpp b/src/corelib/tools/qversionnumber.cpp index b96e48252e..58e3c15560 100644 --- a/src/corelib/tools/qversionnumber.cpp +++ b/src/corelib/tools/qversionnumber.cpp @@ -235,7 +235,7 @@ QVersionNumber QVersionNumber::normalized() const \sa commonPrefix() */ -bool QVersionNumber::isPrefixOf(const QVersionNumber &other) const Q_DECL_NOTHROW +bool QVersionNumber::isPrefixOf(const QVersionNumber &other) const noexcept { if (segmentCount() > other.segmentCount()) return false; @@ -259,7 +259,7 @@ bool QVersionNumber::isPrefixOf(const QVersionNumber &other) const Q_DECL_NOTHRO \snippet qversionnumber/main.cpp 1 */ -int QVersionNumber::compare(const QVersionNumber &v1, const QVersionNumber &v2) Q_DECL_NOTHROW +int QVersionNumber::compare(const QVersionNumber &v1, const QVersionNumber &v2) noexcept { int commonlen; @@ -482,7 +482,7 @@ QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex if (suffixIndex) *suffixIndex = int(lastGoodEnd - string.begin()); - return QVersionNumber(qMove(seg)); + return QVersionNumber(std::move(seg)); } void QVersionNumber::SegmentStorage::setVector(int len, int maj, int min, int mic) diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h index 1bfb4aab39..d43b86ba51 100644 --- a/src/corelib/tools/qversionnumber.h +++ b/src/corelib/tools/qversionnumber.h @@ -87,7 +87,7 @@ class QVersionNumber }; // set the InlineSegmentMarker and set length to zero - SegmentStorage() Q_DECL_NOTHROW : dummy(1) {} + SegmentStorage() noexcept : dummy(1) {} SegmentStorage(const QVector<int> &seg) { @@ -119,14 +119,13 @@ class QVersionNumber return *this; } -#ifdef Q_COMPILER_RVALUE_REFS - SegmentStorage(SegmentStorage &&other) Q_DECL_NOTHROW + SegmentStorage(SegmentStorage &&other) noexcept : dummy(other.dummy) { other.dummy = 1; } - SegmentStorage &operator=(SegmentStorage &&other) Q_DECL_NOTHROW + SegmentStorage &operator=(SegmentStorage &&other) noexcept { qSwap(dummy, other.dummy); return *this; @@ -139,8 +138,6 @@ class QVersionNumber else pointer_segments = new QVector<int>(std::move(seg)); } -#endif -#ifdef Q_COMPILER_INITIALIZER_LISTS SegmentStorage(std::initializer_list<int> args) { if (dataFitsInline(args.begin(), int(args.size()))) { @@ -149,14 +146,13 @@ class QVersionNumber pointer_segments = new QVector<int>(args); } } -#endif ~SegmentStorage() { if (isUsingPointer()) delete pointer_segments; } - bool isUsingPointer() const Q_DECL_NOTHROW + bool isUsingPointer() const noexcept { return (inline_segments[InlineSegmentMarker] & 1) == 0; } - int size() const Q_DECL_NOTHROW + int size() const noexcept { return isUsingPointer() ? pointer_segments->size() : (inline_segments[InlineSegmentMarker] >> 1); } void setInlineSize(int len) @@ -218,7 +214,7 @@ class QVersionNumber } m_segments; public: - inline QVersionNumber() Q_DECL_NOTHROW + inline QVersionNumber() noexcept : m_segments() {} inline explicit QVersionNumber(const QVector<int> &seg) @@ -227,17 +223,13 @@ public: // compiler-generated copy/move ctor/assignment operators and the destructor are ok -#ifdef Q_COMPILER_RVALUE_REFS explicit QVersionNumber(QVector<int> &&seg) : m_segments(std::move(seg)) {} -#endif -#ifdef Q_COMPILER_INITIALIZER_LISTS inline QVersionNumber(std::initializer_list<int> args) : m_segments(args) {} -#endif inline explicit QVersionNumber(int maj) { m_segments.setSegments(1, maj); } @@ -248,34 +240,34 @@ public: inline explicit QVersionNumber(int maj, int min, int mic) { m_segments.setSegments(3, maj, min, mic); } - Q_REQUIRED_RESULT inline bool isNull() const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline bool isNull() const noexcept { return segmentCount() == 0; } - Q_REQUIRED_RESULT inline bool isNormalized() const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline bool isNormalized() const noexcept { return isNull() || segmentAt(segmentCount() - 1) != 0; } - Q_REQUIRED_RESULT inline int majorVersion() const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline int majorVersion() const noexcept { return segmentAt(0); } - Q_REQUIRED_RESULT inline int minorVersion() const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline int minorVersion() const noexcept { return segmentAt(1); } - Q_REQUIRED_RESULT inline int microVersion() const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline int microVersion() const noexcept { return segmentAt(2); } Q_REQUIRED_RESULT Q_CORE_EXPORT QVersionNumber normalized() const; Q_REQUIRED_RESULT Q_CORE_EXPORT QVector<int> segments() const; - Q_REQUIRED_RESULT inline int segmentAt(int index) const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline int segmentAt(int index) const noexcept { return (m_segments.size() > index) ? m_segments.at(index) : 0; } - Q_REQUIRED_RESULT inline int segmentCount() const Q_DECL_NOTHROW + Q_REQUIRED_RESULT inline int segmentCount() const noexcept { return m_segments.size(); } - Q_REQUIRED_RESULT Q_CORE_EXPORT bool isPrefixOf(const QVersionNumber &other) const Q_DECL_NOTHROW; + Q_REQUIRED_RESULT Q_CORE_EXPORT bool isPrefixOf(const QVersionNumber &other) const noexcept; - Q_REQUIRED_RESULT Q_CORE_EXPORT static int compare(const QVersionNumber &v1, const QVersionNumber &v2) Q_DECL_NOTHROW; + Q_REQUIRED_RESULT Q_CORE_EXPORT static int compare(const QVersionNumber &v1, const QVersionNumber &v2) noexcept; Q_REQUIRED_RESULT Q_CORE_EXPORT static Q_DECL_PURE_FUNCTION QVersionNumber commonPrefix(const QVersionNumber &v1, const QVersionNumber &v2); @@ -299,22 +291,22 @@ Q_DECLARE_TYPEINFO(QVersionNumber, Q_MOVABLE_TYPE); Q_CORE_EXPORT QDebug operator<<(QDebug, const QVersionNumber &version); #endif -Q_REQUIRED_RESULT inline bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool operator> (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept { return QVersionNumber::compare(lhs, rhs) > 0; } -Q_REQUIRED_RESULT inline bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool operator>=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept { return QVersionNumber::compare(lhs, rhs) >= 0; } -Q_REQUIRED_RESULT inline bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool operator< (const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept { return QVersionNumber::compare(lhs, rhs) < 0; } -Q_REQUIRED_RESULT inline bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool operator<=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept { return QVersionNumber::compare(lhs, rhs) <= 0; } -Q_REQUIRED_RESULT inline bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool operator==(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept { return QVersionNumber::compare(lhs, rhs) == 0; } -Q_REQUIRED_RESULT inline bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) Q_DECL_NOTHROW +Q_REQUIRED_RESULT inline bool operator!=(const QVersionNumber &lhs, const QVersionNumber &rhs) noexcept { return QVersionNumber::compare(lhs, rhs) != 0; } QT_END_NAMESPACE diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index dc28e0e0a2..52eddd5d6b 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -18,9 +18,8 @@ HEADERS += \ tools/qcollator.h \ tools/qcollator_p.h \ tools/qcontainerfwd.h \ + tools/qcontainertools_impl.h \ tools/qcryptographichash.h \ - tools/qdatetime.h \ - tools/qdatetime_p.h \ tools/qdoublescanprint_p.h \ tools/qeasingcurve.h \ tools/qfreelist_p.h \ @@ -39,6 +38,7 @@ HEADERS += \ tools/qmargins.h \ tools/qmessageauthenticationcode.h \ tools/qcontiguouscache.h \ + tools/qoffsetstringarray_p.h \ tools/qpair.h \ tools/qpoint.h \ tools/qqueue.h \ @@ -84,7 +84,6 @@ SOURCES += \ tools/qbytearraymatcher.cpp \ tools/qcollator.cpp \ tools/qcryptographichash.cpp \ - tools/qdatetime.cpp \ tools/qeasingcurve.cpp \ tools/qfreelist.cpp \ tools/qhash.cpp \ @@ -152,33 +151,6 @@ qtConfig(icu) { SOURCES += tools/qcollator_posix.cpp } -qtConfig(timezone) { - HEADERS += \ - tools/qtimezone.h \ - tools/qtimezoneprivate_p.h \ - tools/qtimezoneprivate_data_p.h - SOURCES += \ - tools/qtimezone.cpp \ - tools/qtimezoneprivate.cpp - !nacl:darwin: { - SOURCES += tools/qtimezoneprivate_mac.mm - } else: android:!android-embedded: { - SOURCES += tools/qtimezoneprivate_android.cpp - } else: unix: { - SOURCES += tools/qtimezoneprivate_tz.cpp - qtConfig(icu): SOURCES += tools/qtimezoneprivate_icu.cpp - } else: qtConfig(icu): { - SOURCES += tools/qtimezoneprivate_icu.cpp - } else: win32: { - SOURCES += tools/qtimezoneprivate_win.cpp - } -} - -qtConfig(datetimeparser) { - HEADERS += tools/qdatetimeparser_p.h - SOURCES += tools/qdatetimeparser.cpp -} - qtConfig(regularexpression) { QMAKE_USE_PRIVATE += pcre2 |