if (key.isEmpty())
return QString();
- QString result = prefix;
-
QString part1 = key;
part1.replace(QRegExp(QLatin1String("[^A-Za-z]")), QString());
- result.append(part1);
QByteArray hex = QCryptographicHash::hash(key.toUtf8(), QCryptographicHash::Sha1).toHex();
- result.append(QLatin1String(hex.constData()));
+ QString result = (part1 + QString::fromLatin1(hex.constData()));
#if defined(QT_POSIX_IPC)
return QLatin1Char('/') + result;
#else
systemSemaphore.setKey(QString(), 1);
systemSemaphore.setKey(key, 1);
if (systemSemaphore.error() != QSystemSemaphore::NoError) {
- QString function = QLatin1String("QSharedMemoryPrivate::initKey");
- errorString = QSharedMemory::tr("%1: unable to set key on lock").arg(function);
+ errorString = QSharedMemory::tr("%1: unable to set key on lock").arg(QLatin1String("QSharedMemoryPrivate::initKey"));
switch(systemSemaphore.error()) {
case QSystemSemaphore::PermissionDenied:
error = QSharedMemory::PermissionDenied;
d->lockedByMe = true;
return true;
}
- const QString function = QLatin1String("QSharedMemory::lock");
- d->errorString = QSharedMemory::tr("%1: unable to lock").arg(function);
+ d->errorString = QSharedMemory::tr("%1: unable to lock").arg(QLatin1String("QSharedMemory::lock"));
d->error = QSharedMemory::LockError;
return false;
}
d->lockedByMe = false;
if (d->systemSemaphore.release())
return true;
- const QString function = QLatin1String("QSharedMemory::unlock");
- d->errorString = QSharedMemory::tr("%1: unable to unlock").arg(function);
+ d->errorString = QSharedMemory::tr("%1: unable to unlock").arg(QLatin1String("QSharedMemory::unlock"));
d->error = QSharedMemory::LockError;
return false;
}
Q_DECLARE_PRIVATE(QSharedMemory)
public:
- enum AccessMode
- {
+ enum AccessMode {
ReadOnly,
ReadWrite
};
- enum SharedMemoryError
- {
+ enum SharedMemoryError {
NoError,
PermissionDenied,
InvalidSize,
case QVariant::Double:
x->data.d = copy ? *static_cast<const double*>(copy) : 0.0;
break;
- case QMetaType::Float:
+ case QVariant::Float:
x->data.f = copy ? *static_cast<const float*>(copy) : 0.0f;
break;
case QMetaType::QObjectStar:
case QVariant::LongLong:
case QVariant::ULongLong:
case QVariant::Double:
- case QMetaType::Float:
+ case QVariant::Float:
case QMetaType::QObjectStar:
break;
case QVariant::Invalid:
return a->data.b == b->data.b;
case QVariant::Double:
return a->data.d == b->data.d;
- case QMetaType::Float:
+ case QVariant::Float:
return a->data.f == b->data.f;
case QMetaType::QObjectStar:
return a->data.o == b->data.o;
return qlonglong(*static_cast<short *>(d->data.shared->ptr));
case QMetaType::Long:
return qlonglong(*static_cast<long *>(d->data.shared->ptr));
- case QMetaType::Float:
+ case QVariant::Float:
return qRound64(d->data.f);
case QVariant::Double:
return qRound64(d->data.d);
case QMetaType::Char:
case QMetaType::Short:
case QMetaType::Long:
- case QMetaType::Float:
+ case QVariant::Float:
case QMetaType::LongLong:
return qulonglong(qMetaTypeNumber(d));
case QVariant::ULongLong:
case QMetaType::ULong:
*str = QString::number(qMetaTypeUNumber(d));
break;
- case QMetaType::Float:
+ case QVariant::Float:
*str = QString::number(d->data.f, 'g', FLT_DIG);
break;
case QVariant::Double:
case QVariant::Double:
*ba = QByteArray::number(d->data.d, 'g', DBL_DIG);
break;
- case QMetaType::Float:
+ case QVariant::Float:
*ba = QByteArray::number(d->data.f, 'g', FLT_DIG);
break;
case QMetaType::Char:
case QMetaType::Char:
case QMetaType::Short:
case QMetaType::Long:
- case QMetaType::Float:
+ case QVariant::Float:
*b = qMetaTypeNumber(d) != Q_INT64_C(0);
break;
case QVariant::UInt:
}
break;
}
- case QMetaType::Float: {
+ case QVariant::Float: {
float *f = static_cast<float *>(result);
switch (d->type) {
case QVariant::String:
: mutexes(size), recursionMode(recursionMode)
{
for (int index = 0; index < mutexes.count(); ++index) {
- mutexes[index] = 0;
+ mutexes[index] = Q_NULLPTR;
}
}
{
for (int index = 0; index < mutexes.count(); ++index) {
delete mutexes[index];
- mutexes[index] = 0;
+ mutexes[index] = Q_NULLPTR;
}
}
{
Q_ASSERT_X(n >= 0, "QSemaphore::tryAcquire", "parameter 'n' must be non-negative");
QMutexLocker locker(&d->mutex);
- if (timeout < 0) {
+ if (timeout <= 0) {
while (n > d->avail)
d->cond.wait(locker.mutex());
} else {